vxe-table 3.11.22 → 3.11.24

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.22";
+const version = "3.11.24";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2788,7 +2788,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.22"}`;
+const log_version = `table v${"3.11.24"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5945,6 +5945,9 @@ const Methods = {
         };
       }
       if (isSource) {
+        cacheItem.row = row;
+        cacheItem.items = items;
+        cacheItem.parent = parent;
         cacheItem.level = level;
         cacheItem.index = treeConfig && parent ? -1 : index;
         fullDataRowIdMaps[rowid] = cacheItem;
@@ -10415,21 +10418,46 @@ const Methods = {
       }, evnt);
     }
   },
+  triggerCurrentColumnEvent(evnt, params) {
+    const $xeTable = this;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const {
+      currentMethod
+    } = columnOpts;
+    const {
+      column
+    } = params;
+    if (!currentMethod || currentMethod({
+      column
+    })) {
+      $xeTable.setCurrentColumn(column);
+    }
+  },
   triggerCurrentRowEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       currentRow: oldValue
-    } = this;
+    } = reactData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const {
+      currentMethod
+    } = rowOpts;
     const {
       row: newValue
     } = params;
     const isChange = oldValue !== newValue;
-    this.setCurrentRow(newValue);
-    if (isChange) {
-      this.emitEvent('current-change', {
-        oldValue,
-        newValue,
-        ...params
-      }, evnt);
+    if (!currentMethod || currentMethod({
+      row: newValue
+    })) {
+      $xeTable.setCurrentRow(newValue);
+      if (isChange) {
+        $xeTable.dispatchEvent('current-change', {
+          oldValue,
+          newValue,
+          ...params
+        }, evnt);
+      }
     }
   },
   /**
@@ -10576,7 +10604,7 @@ const Methods = {
       cell
     }, params), evnt);
     if (this.columnOpts.isCurrent || this.highlightCurrentColumn) {
-      return this.setCurrentColumn(column);
+      this.triggerCurrentColumnEvent(evnt, params);
     }
     return this.$nextTick();
   },
@@ -26863,17 +26891,50 @@ render_renderer.mixin({
         row,
         column
       } = params;
-      const digits = props.digits || render_getConfig().numberInput?.digits || 2;
+      const {
+        type
+      } = props;
       let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
-        switch (props.type) {
-          case 'float':
-            cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
-            break;
+        if (type === 'float') {
+          const digits = props.digits || render_getConfig().numberInput.digits || 1;
+          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+        } else if (type === 'amount') {
+          const digits = props.digits || render_getConfig().numberInput.digits || 2;
+          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
+            digits
+          });
         }
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue);
     },
+    renderTableFooter(h, renderOpts, params) {
+      const {
+        props = {}
+      } = renderOpts;
+      const {
+        row,
+        column,
+        _columnIndex
+      } = params;
+      const {
+        type
+      } = props;
+      // 兼容老模式
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row) ? row[_columnIndex] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(cellValue)) {
+        if (type === 'float') {
+          const digits = props.digits || render_getConfig().numberInput.digits || 1;
+          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+        } else if (type === 'amount') {
+          const digits = props.digits || render_getConfig().numberInput.digits || 2;
+          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
+            digits
+          });
+        }
+      }
+      return getFuncText(cellValue, 1);
+    },
     renderTableDefault: defaultEditRender,
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
@@ -27260,7 +27321,7 @@ const Toolbar = VxeToolbar;
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {