vxe-table 4.17.20 → 4.17.21

package/es/table/render/index.js

@@ -532,9 +532,8 @@ function oldSelectEditRender(renderOpts, params) {
         h(getOldComponent(renderOpts), Object.assign(Object.assign({}, getCellEditProps(renderOpts, params, cellValue, { options, optionProps, optionGroups, optionGroupProps })), getEditOns(renderOpts, params)))
     ];
 }
-function getSelectCellValue(renderOpts, { row, column }) {
+function handleSelectCellValue(cellValue, renderOpts) {
     const { options, optionGroups, optionProps = {}, optionGroupProps = {}, props = {} } = renderOpts;
-    const cellValue = XEUtils.get(row, column.field);
     let selectItem;
     const labelProp = optionProps.label || 'label';
     const valueProp = optionProps.value || 'value';
@@ -571,13 +570,16 @@ function getSelectCellValue(renderOpts, { row, column }) {
     }
     return '';
 }
+function getSelectCellValue(renderOpts, { row, column }) {
+    const cellValue = XEUtils.get(row, column.field);
+    return handleSelectCellValue(cellValue, renderOpts);
+}
 function handleExportSelectMethod(params) {
     const { row, column, options } = params;
     return options.original ? getCellValue(row, column) : getSelectCellValue(column.editRender || column.cellRender, params);
 }
-function getTreeSelectCellValue(renderOpts, { row, column }) {
+function handleTreeSelectCellValue(cellValue, renderOpts) {
     const { options, optionProps = {} } = renderOpts;
-    const cellValue = XEUtils.get(row, column.field);
     const labelProp = optionProps.label || 'label';
     const valueProp = optionProps.value || 'value';
     const childrenProp = optionProps.children || 'children';
@@ -593,6 +595,10 @@ function getTreeSelectCellValue(renderOpts, { row, column }) {
     }
     return '';
 }
+function getTreeSelectCellValue(renderOpts, { row, column }) {
+    const cellValue = XEUtils.get(row, column.field);
+    return handleTreeSelectCellValue(cellValue, renderOpts);
+}
 function handleExportTreeSelectMethod(params) {
     const { row, column, options } = params;
     return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
@@ -654,6 +660,91 @@ function handleNumberCell(renderOpts, params) {
         }
         : {});
 }
+function handleFormatSelect(renderOpts, params) {
+    const { cellValue } = params;
+    return handleSelectCellValue(cellValue, renderOpts);
+}
+function handleSetSelectValue(renderOpts, params) {
+    const { row, column, cellValue } = params;
+    const { field } = column;
+    if (field) {
+        const { options, optionGroups, optionProps = {}, optionGroupProps = {}, props } = renderOpts;
+        if (isEmptyValue(cellValue)) {
+            XEUtils.set(row, field, props && props.multiple ? [] : null);
+            return;
+        }
+        const isMultiVal = XEUtils.indexOf(`${cellValue}`, ',') > -1;
+        const labelProp = optionProps.label || 'label';
+        const valueProp = optionProps.value || 'value';
+        const labelMpas = {};
+        if (optionGroups && optionGroups.length) {
+            const groupOptions = optionGroupProps.options || 'options';
+            for (let i = 0; i < optionGroups.length; i++) {
+                const opts = optionGroups[i][groupOptions] || {};
+                for (let j = 0; j < opts.length; j++) {
+                    const item = opts[j];
+                    if (isMultiVal) {
+                        labelMpas[item[labelProp]] = item;
+                        /* eslint-disable eqeqeq */
+                    }
+                    else if (item[labelProp] == cellValue) {
+                        XEUtils.set(row, field, item[valueProp]);
+                        return;
+                    }
+                }
+            }
+        }
+        else {
+            if (options) {
+                for (let i = 0; i < options.length; i++) {
+                    const item = options[i];
+                    if (isMultiVal) {
+                        labelMpas[item[labelProp]] = item;
+                        /* eslint-disable eqeqeq */
+                    }
+                    else if (item[labelProp] == cellValue) {
+                        XEUtils.set(row, field, item[valueProp]);
+                        return;
+                    }
+                }
+            }
+        }
+        if (isMultiVal) {
+            XEUtils.set(row, field, (isMultiVal
+                ? cellValue.split(',')
+                : [cellValue]).map((label) => {
+                const item = labelMpas[label];
+                return item ? item[valueProp] : label;
+            }));
+        }
+        else {
+            XEUtils.set(row, field, cellValue);
+        }
+    }
+}
+function handleFormatTreeSelect(renderOpts, params) {
+    const { cellValue } = params;
+    return handleTreeSelectCellValue(cellValue, renderOpts);
+}
+function handleSetTreeSelectValue(renderOpts, params) {
+    const { row, column, cellValue } = params;
+    const { field } = column;
+    if (field) {
+        const { options, optionProps = {} } = renderOpts;
+        const labelProp = optionProps.label || 'label';
+        const valueProp = optionProps.value || 'value';
+        const childrenProp = optionProps.children || 'children';
+        const matchRest = XEUtils.findTree(options || [], item => XEUtils.get(item, labelProp) === cellValue, { children: childrenProp });
+        if (matchRest) {
+            const selectItem = matchRest.item;
+            if (selectItem) {
+                XEUtils.set(row, field, selectItem[valueProp]);
+                return;
+            }
+        }
+        XEUtils.set(row, field, cellValue);
+    }
+}
 /**
  * 表格 - 渲染器
  */
@@ -681,6 +772,9 @@ renderer.mixin({
                 return h('select', Object.assign(Object.assign({ key: oIndex, class: 'vxe-default-select' }, getNativeAttrs(renderOpts)), getNativeFilterOns(renderOpts, params, option)), renderOpts.optionGroups ? renderNativeOptgroups(renderOpts, params, renderNativeOptions) : renderNativeOptions(renderOpts.options, renderOpts, params));
             });
         },
+        tableCellFormatter: handleFormatSelect,
+        tableCellCopyMethod: handleFormatSelect,
+        tableCellPasteMethod: handleSetSelectValue,
         tableFilterDefaultMethod: handleFilterMethod,
         tableExportMethod: handleExportSelectMethod
     },
@@ -907,6 +1001,9 @@ renderer.mixin({
             const optionValue = option.data;
             return h(getDefaultComponent(renderOpts), Object.assign(Object.assign({}, getCellEditFilterProps(renderOpts, params, optionValue, { options, optionProps, optionGroups, optionGroupProps })), getFloatingFilterOns(renderOpts, params, option)));
         },
+        tableCellFormatter: handleFormatSelect,
+        tableCellCopyMethod: handleFormatSelect,
+        tableCellPasteMethod: handleSetSelectValue,
         tableFilterDefaultMethod: handleFilterMethod,
         tableExportMethod: handleExportSelectMethod
     },
@@ -944,6 +1041,9 @@ renderer.mixin({
         renderTableDefault(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
         },
+        tableCellFormatter: handleFormatSelect,
+        tableCellCopyMethod: handleFormatSelect,
+        tableCellPasteMethod: handleSetSelectValue,
         tableFilterDefaultMethod: handleFilterMethod,
         tableExportMethod: handleExportSelectMethod
     },
@@ -953,6 +1053,9 @@ renderer.mixin({
         renderTableCell(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
         },
+        tableCellFormatter: handleFormatTreeSelect,
+        tableCellCopyMethod: handleFormatTreeSelect,
+        tableCellPasteMethod: handleSetTreeSelectValue,
         tableExportMethod: handleExportTreeSelectMethod
     },
     /**
@@ -968,6 +1071,9 @@ renderer.mixin({
         renderTableDefault(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
         },
+        tableCellFormatter: handleFormatTreeSelect,
+        tableCellCopyMethod: handleFormatTreeSelect,
+        tableCellPasteMethod: handleSetTreeSelectValue,
         tableExportMethod: handleExportTreeSelectMethod
     },
     VxeTableSelect: {
@@ -976,6 +1082,9 @@ renderer.mixin({
         renderTableCell(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
         },
+        tableCellFormatter: handleFormatTreeSelect,
+        tableCellCopyMethod: handleFormatTreeSelect,
+        tableCellPasteMethod: handleSetTreeSelectValue,
         tableExportMethod: handleExportTreeSelectMethod
     },
     VxeColorPicker: {

package/es/table/src/cell.js

@@ -465,7 +465,7 @@ export const Cell = {
         const { rowGroupExpandedFlag } = tableReactData;
         const { rowGroupExpandedMaps } = tableInternalData;
         const aggregateOpts = computeAggregateOpts.value;
-        const { mode, padding, indent } = aggregateOpts;
+        const { mode, padding, indent, showIcon, iconOpen, iconClose } = aggregateOpts;
         const rowid = getRowid($table, row);
         const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
         return h('div', {
@@ -478,7 +478,7 @@ export const Cell = {
                 }
                 : undefined
         }, [
-            row.isAggregate
+            showIcon && row.isAggregate
                 ? h('span', {
                     class: 'vxe-row-group--node-btn',
                     onClick(evnt) {
@@ -486,7 +486,7 @@ export const Cell = {
                     }
                 }, [
                     h('i', {
-                        class: isExpand ? getIcon().TABLE_ROW_GROUP_OPEN : getIcon().TABLE_ROW_GROUP_CLOSE
+                        class: isExpand ? (iconOpen || getIcon().TABLE_ROW_GROUP_OPEN) : (iconClose || getIcon().TABLE_ROW_GROUP_CLOSE)
                     })
                 ])
                 : renderEmptyElement($table),

package/es/table/src/table.js

@@ -33,6 +33,7 @@ const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
+const sourceType = 'table';
 let crossTableDragRowObj = null;
 export default defineVxeComponent({
     name: 'VxeTable',
@@ -5091,10 +5092,15 @@ export default defineVxeComponent({
                 if (!column) {
                     return null;
                 }
-                const { formatter } = column;
+                const { editConfig } = props;
+                const { formatter, editRender, cellRender } = column;
+                // formatter > tableCellFormatter
+                const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null));
+                const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
+                const tcFormatter = compConf ? compConf.tableCellFormatter : null;
                 const cellValue = getCellValue(row, column);
                 let cellLabel = cellValue;
-                if (formatter) {
+                if (formatter || tcFormatter) {
                     let formatData;
                     const { fullAllDataRowIdData } = internalData;
                     const rowid = getRowid($xeTable, row);
@@ -5112,24 +5118,30 @@ export default defineVxeComponent({
                         }
                     }
                     const formatParams = {
+                        $table: $xeTable,
                         cellValue,
                         row,
                         rowIndex: $xeTable.getRowIndex(row),
                         column,
                         columnIndex: $xeTable.getColumnIndex(column)
                     };
-                    if (XEUtils.isString(formatter)) {
-                        const gFormatOpts = formats.get(formatter);
-                        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
-                        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
-                    }
-                    else if (XEUtils.isArray(formatter)) {
-                        const gFormatOpts = formats.get(formatter[0]);
-                        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
-                        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
+                    if (formatter) {
+                        if (XEUtils.isString(formatter)) {
+                            const gFormatOpts = formats.get(formatter);
+                            const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
+                            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
+                        }
+                        else if (XEUtils.isArray(formatter)) {
+                            const gFormatOpts = formats.get(formatter[0]);
+                            const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null;
+                            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
+                        }
+                        else {
+                            cellLabel = `${formatter(formatParams)}`;
+                        }
                     }
-                    else {
-                        cellLabel = formatter(formatParams);
+                    else if (renderOpts && tcFormatter) {
+                        cellLabel = `${tcFormatter(renderOpts, formatParams)}`;
                     }
                     if (formatData) {
                         formatData[colid] = { value: cellValue, label: cellLabel };
@@ -5176,6 +5188,7 @@ export default defineVxeComponent({
                         }
                     }
                     const footerFormatParams = {
+                        $table: $xeTable,
                         cellValue: itemValue,
                         itemValue,
                         row,
@@ -11355,7 +11368,7 @@ export default defineVxeComponent({
                     internalData.lastScrollTop = scrollTop;
                 }
                 reactData.lastScrollTime = Date.now();
-                const evntParams = Object.assign({ scrollTop,
+                const evntParams = Object.assign({ source: sourceType, scrollTop,
                     scrollLeft,
                     bodyHeight,
                     bodyWidth,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.17.20";
+export const version = "4.17.21";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -279,9 +279,10 @@ VxeUI.setConfig({
             showResponseMsg: true,
             showActionMsg: true,
             response: {
-                list: null,
+                list: 'list',
                 result: 'result',
                 total: 'page.total',
+                footerData: 'footerData',
                 message: 'message'
             }
             // beforeItem: null,

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.17.20"}`;
+const version = `table v${"4.17.21"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);