n20-common-lib 2.5.44 → 2.5.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.44",
+  "version": "2.5.45",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/el-table.scss

@@ -51,7 +51,6 @@
 }
 
 .el-table {
-
   /* 排序 */
   .caret-wrapper {
     display: inline-flex;
@@ -196,23 +195,20 @@ th.vxe-header--column {
   color: #333;
 }
 
-
-.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived)>.vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived)>.vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived)>.vxe-cell {
+.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived) > .vxe-cell {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: wrap !important;
 }
 
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis>.vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis>.vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis>.vxe-cell {
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis > .vxe-cell {
   max-height: 100%;
 }
 
-
-
 .vxe-header--column {
   .vxe-cell {
     justify-content: center !important;
@@ -229,4 +225,4 @@ th.vxe-header--column {
   .icon-mini {
     background-image: url('../../components/TableSetSize/mini.png');
   }
-}
+}

package/src/components/TablePro/index.vue

@@ -12,7 +12,7 @@
       show-header-overflow
       :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig }"
       :column-config="{ resizable: true, useKey: true, ...$attrs.columnConfig }"
-      :scroll-y="{ enabled: true, oSize: 20, gt: 30 }"
+      :scroll-y="scrollY"
       :sort-config="{
         multiple: false,
         remote: true,
@@ -38,7 +38,7 @@
           :field="item.prop"
           type="checkbox"
           width="50"
-          fixed="left"
+          :fixed="item.fixed || item.fixed === '' ? item.fixed : 'left'"
         >
           <template #header="{ $table, checked, indeterminate, disabled }">
             <span class="custom-checkbox" @click.stop="toggleAll($table, disabled)">
@@ -56,32 +56,34 @@
           </template>
         </vxe-column>
         <vxe-colgroup
-          :title="item.label"
           v-else-if="item.children && item.children.length > 0"
           :key="'vxe-colgroup-' + i"
+          :title="item.label"
         >
           <vxe-column
             v-for="(subItem, i) in item.children"
             :key="'vxe-table-' + i"
-            :className="item.wrap ? 'vxe-table-custom-wrap' : ''"
+            :class-name="subItem.wrap ? 'vxe-table-custom-wrap' : ''"
             :formatter="subItem.formatter ? subItem.formatter : 'formatName'"
             :filters="subItem.filters"
             :filter-render="subItem.filterRender"
             :title="subItem.label"
             :field="subItem.prop"
             v-bind="subItem"
+            :show-overflow="!subItem.wrap"
           />
         </vxe-colgroup>
         <vxe-column
           v-else
-          :className="item.wrap ? 'vxe-table-custom-wrap' : ''"
           :key="'vxe-table-' + i"
+          :class-name="item.wrap ? 'vxe-table-custom-wrap' : ''"
           :formatter="item.formatter ? item.formatter : 'formatName'"
           :filters="item.filters"
           :filter-render="item.filterRender"
           :title="item.label"
           :field="item.prop"
           v-bind="item"
+          :show-overflow="!item.wrap"
         />
       </template>
       <template #empty>
@@ -104,6 +106,12 @@ export default {
     empty
   },
   props: {
+    scrollY: {
+      type: Object,
+      default: () => {
+        return { enabled: true, oSize: 20, gt: 30 }
+      }
+    },
     data: {
       type: Array,
       default: undefined