Merge branch 'ch/ETA_2.4.1' of eta_front/eta_mobile_front into debug

src/views/sheetList/components/BalanceSheet.vue

@@ -530,10 +530,11 @@ tr {
 }
 .table-wrapper {
   max-width: calc(100vw - 20px);
-  height: calc(100vh - 400px);
+  max-height: calc(100vh - 400px);
   margin: 0 auto;
   // margin-right: -5px;
   overflow: auto;
+  -webkit-overflow-scrolling: touch; /* ios滚动条 */
 }
 table {
   width: 100%;

src/views/sheetList/components/MixedSheet.vue

@@ -530,10 +530,11 @@ tr {
 }
 .table-wrapper {
   max-width: calc(100vw - 20px);
-  height: calc(100vh - 400px);
+  max-height: calc(100vh - 400px);
   margin: 0 auto;
   // margin-right: -5px;
   overflow: auto;
+  -webkit-overflow-scrolling: touch; /* ios滚动条 */
 }
 table {
   width: 100%;

src/views/sheetList/components/SharedSheet.vue

@@ -110,120 +110,6 @@
     }
   }
 }
-</style>
-<style scoped lang="scss">
-.table td,th {
-  width: 104px;
-  min-width: 104px;
-  height: 35px;
-  background: #fff;
-  text-align: center;
-  word-break: break-all;
-  border: none;
-  outline-color: #dcdfe6;
-  outline-style: solid;
-  outline-width: 1px;
-  word-wrap: break-word;
-  word-break: break-all;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  position: relative;
-
-  &.td-chose::after {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    content: "";
-    display: block;
-    outline: 0;
-    border: 2px solid #0033FF;
-    box-shadow: 0 0 5px rgba(73, 177, 249, .5)
-  }
-  // &.td-col-select::after {
-  //   position: absolute;
-  //   top: 0;
-  //   left: 0;
-  //   right: 0;
-  //   bottom: 0;
-  //   content: "";
-  //   display: block;
-  //   outline: 0;
-  //   border: 1px solid rgb(24, 173, 24);
-  //   border-bottom: none;
-  //   border-top: none;
-  // }
-  // &.td-row-select::after {
-  //   position: absolute;
-  //   top: 0;
-  //   left: 0;
-  //   right: 0;
-  //   bottom: 0;
-  //   content: "";
-  //   display: block;
-  //   outline: 0;
-  //   border: 1px solid rgb(24, 173, 24);
-  //   border-left: none;
-  //   border-right: none;
-  // }
-  &.insert {
-    background: #FFEFDD;
-  }
-  .edbname-td {
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-  &.fix-col {
-    position:sticky;
-    left: 0;
-    z-index: 98; // 表格右键操作弹窗为99
-  }
-}
-
-.th-tg {
-  background: #EBEEF5;
-  &:hover {
-    cursor: pointer;
-    background: #ddd;
-    /* border: 2px solid #409eff; */
-  }
-  &.sm {
-    width: 36px;
-    min-width: 36px;
-    max-width: 36px;
-  }
-}
-//整行选中
-tr {
-  // position: relative;
-  // &.choose-all::after {
-  //   position: absolute;
-  //   top: 0;
-  //   left: 0;
-  //   right: 0;
-  //   bottom: 0;
-  //   content: "";
-  //   display: block;
-  //   outline: 0;
-  //   border: 2px solid #5897fb;
-  //   box-shadow: 0 0 5px rgba(73, 177, 249, .5)
-  // }
-  &.fix {
-    position:sticky;
-    top: 0;
-    z-index: 98; // 表格右键操作弹窗为99
-  }
-} 
-
-.el-icon-sort {
-  color: #409eff;
-  cursor: pointer;
-  font-size: 16px;
-}
-
 </style>
 <style lang='scss' scoped>
 ::-webkit-scrollbar {
@@ -250,60 +136,7 @@ tr {
   margin: 0 auto;
   // margin-right: -5px;
   overflow: auto;
-}
-table {
-  width: 100%;
-  font-size: 14px;
-  color: #333;
-  td,
-  th {
-    // min-width: 120px;
-    word-break: break-all;
-    word-wrap: break-word;
-    line-height: 1.2em;
-    border: 1px solid #dcdfe6;
-    // height: 40px;
-    text-align: center;
-    border-left: none;
-    border-top: none;
-    &:first-child {
-			border-left: 1px solid #dcdfe6;
-		}
-  }
-
-  .data-cell{
-    color: #333;
-    &.one-bg {
-      background-color: #EFEEF1;
-    }
-    &.two-bg {
-      background-color: #fff;
-    }
-  }
-
-  .thead-sticky {
-    position: sticky;
-    top: 0;
-  }
-
-  .head-column {
-    background-color: #505B78;
-    color: #fff;
-  }
-  .split-word {
-    span { display: inline; }
-  }
-}
-
-.no-water{
-  td,
-  th {
-    background-color: #fff;
-  }
-  .head-column {
-    background-color: #505B78;
-    color: #fff;
-  }
+  -webkit-overflow-scrolling: touch; /* ios滚动条 */
 }
 
 .pc-sty table {
@@ -322,9 +155,4 @@ table {
     height: 40px;
   }
 }
-.background-watermark{
-  background-repeat: no-repeat;
-  background-position: center center;
-  background-size: 100%;
-}
 </style>

src/views/sheetList/components/TimelineSheet.vue

@@ -530,10 +530,11 @@ tr {
 }
 .table-wrapper {
   max-width: calc(100vw - 20px);
-  height: calc(100vh - 400px);
+  max-height: calc(100vh - 400px);
   margin: 0 auto;
   // margin-right: -5px;
   overflow: auto;
+  -webkit-overflow-scrolling: touch; /* ios滚动条 */
 }
 table {
   width: 100%;