vxe-table 3.11.30 → 3.11.31

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.30";
+const version = "3.11.31";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2790,7 +2790,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.30"}`;
+const log_version = `table v${"3.11.31"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5802,7 +5802,6 @@ const Methods = {
    */
   loadData(datas) {
     const {
-      inited,
       initStatus
     } = this;
     return this.loadTableData(datas).then(() => {
@@ -5811,9 +5810,6 @@ const Methods = {
       if (!initStatus) {
         this.handleLoadDefaults();
       }
-      if (!inited) {
-        this.handleInitDefaults();
-      }
       return this.recalculate();
     });
   },
@@ -5822,18 +5818,12 @@ const Methods = {
    * @param {Array} datas 数据
    */
   reloadData(datas) {
-    const {
-      inited
-    } = this;
     return this.clearAll().then(() => {
       this.inited = true;
       this.initStatus = true;
       return this.loadTableData(datas);
     }).then(() => {
       this.handleLoadDefaults();
-      if (!inited) {
-        this.handleInitDefaults();
-      }
       return this.recalculate();
     });
   },
@@ -9560,29 +9550,84 @@ const Methods = {
    * @param {Array/Row} rows 行数据
    * @param {Boolean} value 是否选中
    */
-  setCheckboxRow(rows, value) {
+  setCheckboxRow(rows, checked) {
+    const $xeTable = this;
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
-    return this.handleCheckedCheckboxRow(rows, value, true);
+    return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
+  },
+  setCheckboxRowKey(keys, checked) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    if (keys && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(keys)) {
+      keys = [keys];
+    }
+    const rows = [];
+    keys.forEach(rowid => {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        rows.push(rowRest.row);
+      }
+    });
+    return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
   },
   isCheckedByCheckboxRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       selectCheckboxMaps
-    } = this;
+    } = reactData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
-    } = this.checkboxOpts;
+    } = checkboxOpts;
     if (checkField) {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
     }
-    return !!selectCheckboxMaps[getRowid(this, row)];
+    return !!selectCheckboxMaps[getRowid($xeTable, row)];
+  },
+  isCheckedByCheckboxRowKey(rowid) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      selectCheckboxMaps
+    } = reactData;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const {
+      checkField
+    } = checkboxOpts;
+    if (checkField) {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rowRest.row, checkField);
+      }
+      return false;
+    }
+    return !!selectCheckboxMaps[rowid];
   },
   isIndeterminateByCheckboxRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       treeIndeterminateMaps
-    } = this;
-    return !!treeIndeterminateMaps[getRowid(this, row)] && !this.isCheckedByCheckboxRow(row);
+    } = reactData;
+    return !!treeIndeterminateMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+  },
+  isIndeterminateByCheckboxRowKey(rowid) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      treeIndeterminateMaps
+    } = reactData;
+    return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
   },
   /**
    * 切换选中
@@ -10490,7 +10535,26 @@ const Methods = {
     return this.$nextTick();
   },
   isCheckedByRadioRow(row) {
-    return this.selectRadioRow === row;
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      selectRadioRow
+    } = reactData;
+    if (row && selectRadioRow) {
+      return $xeTable.eqRow(selectRadioRow, row);
+    }
+    return false;
+  },
+  isCheckedByRadioRowKey(key) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      selectRadioRow
+    } = reactData;
+    if (selectRadioRow) {
+      return key === getRowid($xeTable, selectRadioRow);
+    }
+    return false;
   },
   handleCheckedRadioRow(row, isForce) {
     const {
@@ -10512,7 +10576,24 @@ const Methods = {
    * @param {Row} row 行对象
    */
   setRadioRow(row) {
-    return this.handleCheckedRadioRow(row, true);
+    const $xeTable = this;
+    return $xeTable.handleCheckedRadioRow(row, true);
+  },
+  /**
+   * 用于单选行，设置某一行为选中状态
+   * @param key 行主键
+   */
+  setRadioRowKey(rowid) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (rowRest) {
+      return $xeTable.handleCheckedRadioRow(rowRest.row, true);
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 用于当前行，手动清空当前高亮的状态
@@ -10667,6 +10748,7 @@ const Methods = {
    * 如果是双击模式，则单击后选中状态
    */
   triggerCellClickEvent(evnt, params) {
+    const $xeTable = this;
     const {
       highlightCurrentRow,
       editStore,
@@ -10756,6 +10838,20 @@ const Methods = {
         }
       }
     }
+    // 如果是双击编辑模式
+    if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
+      if (actived.row && actived.column) {
+        if (editOpts.mode === 'row') {
+          if (!$xeTable.eqRow(actived.row, row)) {
+            $xeTable.handleClearEdit(evnt);
+          }
+        } else if (editOpts.mode === 'cell') {
+          if (!$xeTable.eqRow(actived.row, row) || actived.column.id !== column.id) {
+            $xeTable.handleClearEdit(evnt);
+          }
+        }
+      }
+    }
     this.emitEvent('cell-click', params, evnt);
   },
   /**
@@ -11435,66 +11531,67 @@ const Methods = {
     reactData.isDragColMove = false;
   },
   setPendingRow(rows, status) {
-    const pendingMaps = {
-      ...this.pendingRowMaps
-    };
-    const pendingList = [...this.pendingRowList];
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
     if (status) {
       rows.forEach(row => {
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         if (rowid && !pendingMaps[rowid]) {
-          pendingList.push(row);
           pendingMaps[rowid] = row;
         }
       });
     } else {
       rows.forEach(row => {
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         if (rowid && pendingMaps[rowid]) {
-          const pendingIndex = this.findRowIndexOf(pendingList, row);
-          if (pendingIndex > -1) {
-            pendingList.splice(pendingIndex, 1);
-          }
           delete pendingMaps[rowid];
         }
       });
     }
-    this.pendingRowMaps = pendingMaps;
-    this.pendingRowList = pendingList;
-    return this.$nextTick();
+    reactData.pendingRowMaps = pendingMaps;
+    return $xeTable.$nextTick();
   },
   togglePendingRow(rows) {
-    const pendingMaps = {
-      ...this.pendingRowMaps
-    };
-    const pendingList = [...this.pendingRowList];
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
     rows.forEach(row => {
-      const rowid = getRowid(this, row);
+      const rowid = getRowid($xeTable, row);
       if (rowid) {
         if (pendingMaps[rowid]) {
-          const pendingIndex = this.findRowIndexOf(pendingList, row);
-          if (pendingIndex > -1) {
-            pendingList.splice(pendingIndex, 1);
-          }
           delete pendingMaps[rowid];
         } else {
-          pendingList.push(row);
           pendingMaps[rowid] = row;
         }
       }
     });
-    this.pendingRowMaps = pendingMaps;
-    this.pendingRowList = pendingList;
-    return this.$nextTick();
+    reactData.pendingRowMaps = pendingMaps;
+    return $xeTable.$nextTick();
   },
   getPendingRecords() {
-    return this.pendingRowList.slice(0);
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      pendingRowMaps
+    } = reactData;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const insertRecords = [];
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(pendingRowMaps, (row, rowid) => {
+      if (fullAllDataRowIdData[rowid]) {
+        insertRecords.push(row);
+      }
+    });
+    return insertRecords;
   },
   hasPendingByRow(row) {
     const {
@@ -11505,7 +11602,6 @@ const Methods = {
   },
   clearPendingRow() {
     this.pendingRowMaps = {};
-    this.pendingRowList = [];
     return this.$nextTick();
   },
   sort(sortConfs, sortOrder) {
@@ -12645,6 +12741,8 @@ const Methods = {
       }
       internalData.lastScrollTop = scrollTop;
     }
+    reactData.isDragColMove = false;
+    reactData.isDragRowMove = false;
     reactData.lastScrollTime = Date.now();
     const evntParams = {
       scrollTop,
@@ -13879,7 +13977,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     hasFixedColumn,
     fullAllDataRowIdData,
     rowOpts,
-    pendingRowList,
     pendingRowMaps,
     columnOpts,
     isDragColMove
@@ -13972,7 +14069,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
       'row--radio': radioOpts.highlight && $xeTable.selectRadioRow === row,
       'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-      'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
+      'row--pending': !!pendingRowMaps[rowid]
     }, rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowClassName) ? rowClassName(params) : rowClassName : ''];
     const tdVNs = tableColumn.map((column, $columnIndex) => {
       return renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
@@ -23111,8 +23208,6 @@ function handleUupdateResize(_vm) {
       reColumnFlag: 0,
       // 已标记的对象集
       pendingRowMaps: {},
-      // 已标记的行
-      pendingRowList: [],
       // 自定义列相关的信息
       customStore: {
         btnEl: null,
@@ -23629,6 +23724,19 @@ function handleUupdateResize(_vm) {
         y: overflowY && scrollYLoad
       };
     },
+    computeTableStyle() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        tableData
+      } = reactData;
+      const columnOpts = $xeTable.computeColumnOpts;
+      const stys = {};
+      if (columnOpts.drag) {
+        stys['--vxe-ui-table-drag-column-move-delay'] = `${Math.max(0.06, Math.min(0.3, tableData.length / 800))}s`;
+      }
+      return stys;
+    },
     tabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
@@ -23638,7 +23746,6 @@ function handleUupdateResize(_vm) {
   watch: {
     data(value) {
       const {
-        inited,
         initStatus
       } = this;
       this.loadTableData(value).then(() => {
@@ -23647,9 +23754,6 @@ function handleUupdateResize(_vm) {
         if (!initStatus) {
           this.handleLoadDefaults();
         }
-        if (!inited) {
-          this.handleInitDefaults();
-        }
         // const checkboxColumn = this.tableFullColumn.find(column => column.type === 'checkbox')
         // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
@@ -23953,8 +24057,8 @@ function handleUupdateResize(_vm) {
         this.inited = true;
         this.initStatus = true;
         this.handleLoadDefaults();
-        this.handleInitDefaults();
       }
+      this.handleInitDefaults();
       this.updateStyle();
     });
     table_globalEvents.on(this, 'paste', this.handleGlobalPasteEvent);
@@ -24107,6 +24211,7 @@ function handleUupdateResize(_vm) {
     const vSize = computeSize;
     const virtualScrollBars = $xeTable.computeVirtualScrollBars;
     const isArea = mouseConfig && mouseOpts.area;
+    const tableStyle = $xeTable.computeTableStyle;
     return h('div', {
       ref: 'refElem',
       class: ['vxe-table', 'vxe-table--render-default', `tid_${tId}`, vSize ? `size--${vSize}` : '', `border--${tableBorder}`, {
@@ -24139,9 +24244,7 @@ function handleUupdateResize(_vm) {
         'is--virtual-x': scrollXLoad,
         'is--virtual-y': scrollYLoad
       }],
-      style: {
-        '--vxe-ui-table-drag-column-move-delay': `${Math.max(0.05, Math.min(0.3, tableData.length / 800))}s`
-      },
+      style: tableStyle,
       attrs: {
         spellcheck: false
       },
@@ -25636,6 +25739,11 @@ Object.keys(table.methods).forEach(name => {
         tableProps.editConfig = Object.assign({}, editConfig);
       }
       return tableProps;
+    },
+    computePageConfFlag() {
+      const $xeGrid = this;
+      const pagerOpts = $xeGrid.computePagerOpts;
+      return `${pagerOpts.currentPage}${pagerOpts.pageSize}`;
     }
   },
   watch: {
@@ -25655,7 +25763,7 @@ Object.keys(table.methods).forEach(name => {
     proxyConfig() {
       this.initProxy();
     },
-    pagerConfig() {
+    computePageConfFlag() {
       this.initPages();
     }
   },
@@ -26523,7 +26631,9 @@ Object.keys(table.methods).forEach(name => {
       const {
         proxyConfig
       } = this;
+      const $xeTable = this.$refs.xTable;
       if (proxyConfig) {
+        $xeTable.clearScroll();
         this.commitProxy('reload').then(rest => {
           this.$emit('proxy-query', {
             ...rest,