vxe-table 3.17.9 → 3.18.0-beta.0

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.9";
+const version = "3.18.0-beta.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.9"}`;
+const log_version = `table v${"3.18.0-beta.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6053,8 +6053,11 @@ function cacheColumnMap($xeTable) {
       }
       fullColFieldData[field] = rest;
     } else {
-      if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
+      if (storage && !type) {
+        errLog('vxe.error.reqSupportProp', ['storage', `${column.getTitle() || type || ''} -> field=?`]);
+      }
+      if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+        errLog('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`]);
       }
     }
     if (!hasFixed && fixed) {
@@ -14521,18 +14524,22 @@ const Methods = {
    * @param {Row} row 行对象
    */
   setCurrentRow(row) {
-    const {
-      $el,
-      rowOpts
-    } = this;
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    const rowOpts = $xeTable.computeRowOpts;
     this.clearCurrentRow();
     // this.clearCurrentColumn()
     this.currentRow = row;
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
-      if ($el) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll(`[rowid="${getRowid(this, row)}"]`), elem => addClass(elem, 'row--current'));
+      if (el) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
       }
     }
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateCurrentRow(row);
+    }
     return this.$nextTick();
   },
   isCheckedByRadioRow(row) {
@@ -14585,15 +14592,20 @@ const Methods = {
    * 用于当前行，手动清空当前高亮的状态
    */
   clearCurrentRow() {
-    const {
-      $el
-    } = this;
-    this.currentRow = null;
-    this.hoverRow = null;
-    if ($el) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    reactData.currentRow = null;
+    internalData.hoverRow = null;
+    if (el) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
     }
-    return this.$nextTick();
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateCurrentRow();
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 用于单选行，手动清空用户的选择
@@ -14664,24 +14676,31 @@ const Methods = {
     this.setHoverRow(row);
   },
   setHoverRow(row) {
-    const {
-      $el
-    } = this;
-    const rowid = getRowid(this, row);
-    this.clearHoverRow();
-    if ($el) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    $xeTable.clearHoverRow();
+    if (el) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--hover'));
+    }
+    internalData.hoverRow = row;
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateHoverRow(row);
     }
-    this.hoverRow = row;
   },
   clearHoverRow() {
-    const {
-      $el
-    } = this;
-    if ($el) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
+    }
+    internalData.hoverRow = null;
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateHoverRow();
     }
-    this.hoverRow = null;
   },
   triggerHeaderCellClickEvent(evnt, params) {
     const $xeTable = this;
@@ -18598,6 +18617,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   } = tableProps;
   const {
     tableData,
+    tableColumn,
     dragRow,
     overflowX,
     overflowY,
@@ -18840,9 +18860,9 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   let isVNPreEmptyStatus = false;
   if (!isMergeCell) {
     if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-      if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+      if (overflowY && scrollYLoad && !treeConfig && tableData.length > 16 && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
         isVNPreEmptyStatus = true;
-      } else if (overflowX && scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      } else if (overflowX && scrollXLoad && tableColumn.length > 10 && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }
@@ -19522,7 +19542,8 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     dragCol,
     scrollXLoad,
     scrollYLoad,
-    overflowX
+    overflowX,
+    tableColumn
   } = tableReactData;
   const {
     fullColumnIdData,
@@ -19620,7 +19641,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     let isVNPreEmptyStatus = false;
     if (isOptimizeMode && overflowX && !isGroup) {
       if (!dragCol || dragCol.id !== colid) {
-        if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
           isVNPreEmptyStatus = true;
         }
       }
@@ -20100,7 +20121,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
     if (isOptimizeMode && overflowX && !isMergeCell) {
-      if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }
@@ -30598,7 +30619,7 @@ function toolbar_createInternalData() {
     connectTable: null
   };
 }
-/* harmony default export */ var src_toolbar = (/* define-vxe-component start */defineVxeComponent({
+/* harmony default export */ var toolbar = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeToolbar',
   mixins: [toolbar_globalMixins.sizeMixin],
   props: {
@@ -31540,30 +31561,6 @@ function grid_createInternalData() {
   name: 'VxeGrid',
   mixins: [grid_globalMixins.sizeMixin],
   props: {
-    // 以下仅用于类型
-    round: {
-      type: Boolean,
-      default: () => grid_getConfig().table.round
-    },
-    height: [Number, String],
-    minHeight: {
-      type: [Number, String],
-      default: () => grid_getConfig().table.minHeight
-    },
-    maxHeight: [Number, String],
-    seqConfig: Object,
-    sortConfig: Object,
-    filterConfig: Object,
-    editConfig: [Boolean, Object],
-    loading: Boolean,
-    validConfig: Object,
-    editRules: Object,
-    animat: {
-      type: Boolean,
-      default: () => grid_getConfig().table.animat
-    },
-    // 以上仅用于类型
-    // eslint-disable-next-line @typescript-eslint/ban-types
     ...tableProps,
     layouts: Array,
     columns: Array,
@@ -32904,7 +32901,10 @@ function grid_createInternalData() {
     zoom() {
       const $xeGrid = this;
       const reactData = $xeGrid.reactData;
-      return $xeGrid[reactData.isZMax ? 'revert' : 'maximize']();
+      if (reactData.isZMax) {
+        return $xeGrid.revert();
+      }
+      return $xeGrid.maximize();
     },
     isMaximized() {
       const $xeGrid = this;
@@ -33142,9 +33142,8 @@ function grid_createInternalData() {
         toolbarConfig
       } = props;
       const toolbarSlot = slots.toolbar;
-      const hasToolbar = !!(toolbarSlot || isEnableConf(toolbarConfig) || toolbar);
       const toolbarOpts = $xeGrid.computeToolbarOpts;
-      if (hasToolbar) {
+      if (toolbarConfig && isEnableConf(toolbarOpts) || toolbarSlot) {
         return h('div', {
           key: 'toolbar',
           ref: 'refToolbarWrapper',
@@ -33152,7 +33151,7 @@ function grid_createInternalData() {
         }, toolbarSlot ? toolbarSlot.call($xeGrid, {
           $grid: $xeGrid,
           $gantt: null
-        }) : [h(src_toolbar, {
+        }) : [h(toolbar, {
           props: Object.assign({}, toolbarOpts, {
             slots: undefined
           }),
@@ -34829,15 +34828,15 @@ const Table = VxeTable;
 ;// CONCATENATED MODULE: ./packages/toolbar/index.ts
 
 
-const VxeToolbar = Object.assign({}, src_toolbar, {
+const VxeToolbar = Object.assign({}, toolbar, {
   install(app) {
-    app.component(src_toolbar.name, src_toolbar);
+    app.component(toolbar.name, toolbar);
   }
 });
 if (core_.VxeUI.dynamicApp) {
-  core_.VxeUI.dynamicApp.component(src_toolbar.name, src_toolbar);
+  core_.VxeUI.dynamicApp.component(toolbar.name, toolbar);
 }
-core_.VxeUI.component(src_toolbar);
+core_.VxeUI.component(toolbar);
 const Toolbar = VxeToolbar;
 /* harmony default export */ var packages_toolbar = ((/* unused pure expression or super */ null && (VxeToolbar)));
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
@@ -34862,6 +34861,7 @@ const Toolbar = VxeToolbar;
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
       modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
+      reqSupportProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
@@ -34899,7 +34899,8 @@ const Toolbar = VxeToolbar;
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
       errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
-      useNew: '不建议使用 {0}，请使用 {1}'
+      useNew: '不建议使用 {0}，请使用 {1}',
+      errorVersion: '版本不匹配，当前版本 {0}，最低支持版本为 {1}'
     },
     table: {
       emptyText: '暂无数据',