umy-ui-table 1.2.7 → 1.2.9

package/lib/ux-table-column.js

@@ -1 +1 @@
-module.exports=function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/dist/",n(n.s=39)}({35:function(e,t){e.exports=require("vxe-table/lib/column")},39:function(e,t,n){"use strict";n.r(t);var r=n(35),o=n.n(r),u=Object.assign({},o.a,{name:"UxTableColumn"});u.install=function(e){e.component(u.name,u)},t.default=u}});
+module.exports=function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/dist/",n(n.s=39)}({35:function(e,t){e.exports=require("tomtaw-vxe-table/lib/column")},39:function(e,t,n){"use strict";n.r(t);var r=n(35),o=n.n(r),u=Object.assign({},o.a,{name:"UxTableColumn"});u.install=function(e){e.component(u.name,u)},t.default=u}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umy-ui-table",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "一个基于 vue 的 PC 端表格UI库，解决万级数据渲染卡顿问题，过万数据点击全选卡顿，等等问题",
   "author": {
     "name": "foriacus"
@@ -41,7 +41,7 @@
     "resize-observer-polyfill": "^1.5.0",
     "throttle-debounce": "^1.0.1",
     "vuedraggable": "^2.23.2",
-    "vxe-table": "^3.24.4",
+    "tomtaw-vxe-table": "^3.25.2",
     "vxe-pc-ui": "3.16.23",
     "@vxe-ui/core": "^3.4.19",
     "xe-utils": ">= 3"

package/packages/ux-grid/mixins/index.js

@@ -85,6 +85,7 @@ export default {
     showSummary: { default: false, type: Boolean }, // 是否需要合计
     summaryMethod: Function, // 自定义的合计计算方法
     fieldSort: { default: true, type: Boolean }, // 字段排序
+    rowConfig: Object, // 新版行配置；已定义字段优先于下方兼容参数（包括 false）
     rowKey: Boolean, // 是否需要为每一行的 VNode 设置 key 属性（非特殊情况下没必要设置）
     columnKey: Boolean, // 是否需要为每一列的 VNode 设置 key 属性（非特殊情况下不需要使用, 常用于拖拽列）
     rowId: String, // 自定义行数据唯一主键的字段名（行数据必须要有唯一主键，默认自动生成）
@@ -113,6 +114,23 @@ export default {
       type: String,
     }, // 分页组件布局，子组件名用逗号分隔
   },
+  computed: {
+    computedRowConfig() {
+      const config = Object.assign({}, this.rowConfig);
+      const legacy = {
+        keyField: this.rowId,
+        useKey: this.rowKey,
+        isCurrent: this.highlightCurrentRow,
+        isHover: this.highlightHoverRow,
+      };
+      Object.keys(legacy).forEach((key) => {
+        if (config[key] === undefined && legacy[key] !== undefined) {
+          config[key] = legacy[key];
+        }
+      });
+      return config;
+    },
+  },
   methods: {
     // 分页器的事件
     handleSizeChange(val) {

package/packages/ux-grid/src/element-renderer.js

@@ -1,6 +1,6 @@
 import XEUtils from "xe-utils";
 import "./setup";
-import { renderer, interceptor } from "vxe-table/lib/ui";
+import { renderer, interceptor } from "tomtaw-vxe-table/lib/ui";
 
 const inputRendererNames = [
   "ElAutocomplete",

package/packages/ux-grid/src/grid-kernel.js

@@ -1,4 +1,4 @@
-import VxeGrid from "vxe-table/lib/grid";
+import VxeGrid from "tomtaw-vxe-table/lib/grid";
 
 // The upstream columns watcher queues loadColumn in nextTick. A wrapper can
 // be destroyed before that callback runs, after its table refs are released.

package/packages/ux-grid/src/interceptor.js

@@ -1,6 +1,6 @@
 // 委托给 vxe-table 内置的 @vxe-ui/core VxeUI.interceptor 单例，
 // 保证与 VxeGrid 内部 preventEvent / dispatchEvent 使用同一个实例
 // （替代原 umy-table 内置的独立 interceptor store，否则拦截器钩子不会生效）
-import { interceptor } from "vxe-table/lib/ui";
+import { interceptor } from "tomtaw-vxe-table/lib/ui";
 
 export default interceptor;

package/packages/ux-grid/src/setup.js

@@ -1,5 +1,5 @@
-import { VxeUI } from "vxe-table/lib/ui";
-import zhCN from "vxe-table/lib/locale/lang/zh-CN";
+import { VxeUI } from "tomtaw-vxe-table/lib/ui";
+import zhCN from "tomtaw-vxe-table/lib/locale/lang/zh-CN";
 import XEUtils from "xe-utils";
 
 // Core setConfig deep-merges arrays by index. Restore pre-existing arrays

package/packages/ux-grid/src/ux-grid.vue

@@ -25,9 +25,8 @@
       :virtual-y-config="computedVirtualYConfig"
       :virtual-x-config="computedVirtualXConfig"
       :stripe="stripe"
-      :row-key="rowKey"
+      :row-config="computedRowConfig"
       :column-key="columnKey"
-      :row-id="rowId"
       :keep-source="keepSource"
       :size="size"
       :edit-config="editConfig"
@@ -45,8 +44,6 @@
       :footer-method="footerMethod"
       :show-header-overflow="showHeaderOverflow"
       :show-footer-overflow="showFooterOverflow"
-      :highlight-current-row="highlightCurrentRow"
-      :highlight-hover-row="highlightHoverRow"
       :row-class-name="rowClassName"
       :cell-class-name="renderCellClassName"
       :header-row-class-name="headerRowClassName"

package/packages/ux-grid/test/contracts.cjs

@@ -26,6 +26,32 @@ const state = Object.assign({ $listeners: {}, $refs: {}, $emit: (...args) => eve
 const tick = async () => { for (let i = 0; i < 8; i++) await Promise.resolve(); };
 
 async function run() {
+  // New row config wins per field; legacy callers retain defaults and false.
+  const rowConfigVm = new Vue({
+    props: context.mixin.props,
+    computed: context.mixin.computed,
+    propsData: { rowId: 'legacyId', rowKey: true, highlightHoverRow: false }
+  });
+  assert.deepStrictEqual(Object.assign({}, rowConfigVm.computedRowConfig), {
+    keyField: 'legacyId', useKey: true, isCurrent: true, isHover: false
+  });
+  const supplied = { keyField: 'newId', useKey: false, isCurrent: false, height: 33 };
+  rowConfigVm.rowConfig = supplied;
+  assert.deepStrictEqual(Object.assign({}, rowConfigVm.computedRowConfig), {
+    keyField: 'newId', useKey: false, isCurrent: false, isHover: false, height: 33
+  });
+  assert.strictEqual(supplied.isHover, undefined, 'must not mutate consumer config');
+  rowConfigVm.rowConfig = { isHover: undefined };
+  rowConfigVm.highlightHoverRow = true;
+  assert.equal(rowConfigVm.computedRowConfig.isHover, true, 'undefined falls back reactively');
+  rowConfigVm.rowConfig = null;
+  assert.equal(rowConfigVm.computedRowConfig.keyField, 'legacyId');
+  rowConfigVm.$destroy();
+  const gridTemplate = read('src/ux-grid.vue').split('</template>')[0];
+  assert(gridTemplate.includes(':row-config="computedRowConfig"'));
+  for (const prop of ['row-id', 'row-key', 'highlight-current-row', 'highlight-hover-row']) {
+    assert(!gridTemplate.includes(':' + prop + '='), 'deprecated prop not forwarded: ' + prop);
+  }
   // Real Vue listener bookkeeping: $off leaves empty arrays, $once removes itself.
   const listenerVm = new Vue({ methods });
   const selectedRows = [{ id: 1 }];

package/packages/ux-table-column/index.js

@@ -1,4 +1,4 @@
-import VxeColumn from 'vxe-table/lib/column';
+import VxeColumn from 'tomtaw-vxe-table/lib/column';
 
 // vxe-table 3.x 的 column 组件，保持 UxTableColumn 名称以兼容 <ux-table-column> 标签
 const UxTableColumn = Object.assign({}, VxeColumn, { name: 'UxTableColumn' });