Merge branch 'internationalization2' into internationalization

src/components/normal-basic-layout-new/modules/table.vue

@@ -11,7 +11,7 @@
         align="center"
         @handleSelectionChange="handleSelectionChange">
       </el-table-column>
-      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="checkFixed(col.columnname)">
+      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)" :fixed="checkFixed(col.columnname)">
         <template slot-scope="scope">
 
           <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>

src/components/normal-basic-layout-new/modules/tableBook.vue

@@ -11,7 +11,7 @@
         align="center"
         @handleSelectionChange="handleSelectionChange">
       </el-table-column>
-      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title"  :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="checkFixed(col.columnname)">
+      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title"  :min-width="tool.calcTableColWidth($refs.tables,layout,index)" :fixed="checkFixed(col.columnname)">
         <template slot-scope="scope">
 
           <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>

src/style/style.css

@@ -307,7 +307,7 @@ ul{
 .div-line-right{
   margin-right: 10px;
 }
-.el-table__header-wrapper table thead .cell {
+.el-table__header-wrapper table thead .cell, .el-table__fixed-header-wrapper table thead .cell{
   white-space: nowrap !important;
   width: auto !important;
-}
+}

src/utils/tool.js

@@ -232,7 +232,8 @@ export default {
         vm.doLayout()
       },1000)
       let isCheckbox = ths[0].querySelector('.el-checkbox__inner') ? 1 : 0
-
+      console.log(widths);
+      
       if (typeof layout == 'number') {
         return widths[index+isCheckbox] > layout ? widths[index+isCheckbox]:layout
       } else {