vxe-table 3.19.34 → 3.19.36

package/es/table/module/edit/mixin.js

@@ -88,7 +88,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
 }
 // function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
 // }
-function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
+function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -101,6 +101,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     if (!XEUtils.isArray(records)) {
         records = [records];
     }
+    let targetRow = targetRowOrRowid;
+    if (XEUtils.isString(targetRowOrRowid) || XEUtils.isNumber(targetRowOrRowid)) {
+        const rowRest = fullAllDataRowIdData[targetRowOrRowid];
+        if (rowRest) {
+            targetRow = rowRest.row;
+        }
+    }
     const newRecords = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)));
     let treeRecords = [];
     if (treeConfig && transform) {
@@ -312,16 +319,25 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         };
     });
 }
-function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInsertNextRow) {
+function handleInsertChildRowAt($xeTable, records, parentRowOrParentId, targetRowOrRowid, isInsertNextRow) {
     const props = $xeTable;
+    const internalData = $xeTable;
     const { treeConfig } = props;
+    const { fullAllDataRowIdData } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const { transform, rowField, parentField } = treeOpts;
     if (treeConfig && transform) {
         if (!XEUtils.isArray(records)) {
             records = [records];
         }
-        return handleInsertRowAt($xeTable, records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow);
+        let parentRow = parentRowOrParentId;
+        if (XEUtils.isString(parentRowOrParentId) || XEUtils.isNumber(parentRowOrParentId)) {
+            const rowRest = fullAllDataRowIdData[parentRowOrParentId];
+            if (rowRest) {
+                parentRow = rowRest.row;
+            }
+        }
+        return handleInsertRowAt($xeTable, records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRowOrRowid, isInsertNextRow);
     }
     else {
         errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
@@ -509,24 +525,22 @@ export default {
          * 如果 row 为空则从插入到顶部
          * 如果 row 为 -1 则从插入到底部
          * 如果 row 为有效行则插入到该行的位置
-         * @param {Object/Array} records 新的数据
-         * @param {Row} targetRow 指定行
          * @returns
          */
-        _insertAt(records, targetRow) {
-            return handleInsertRowAt(this, records, targetRow);
+        _insertAt(records, targetRowOrRowid) {
+            return handleInsertRowAt(this, records, targetRowOrRowid);
         },
-        _insertNextAt(records, targetRow) {
-            return handleInsertRowAt(this, records, targetRow, true);
+        _insertNextAt(records, targetRowOrRowid) {
+            return handleInsertRowAt(this, records, targetRowOrRowid, true);
         },
-        _insertChild(records, parentRow) {
-            return handleInsertChildRowAt(this, records, parentRow, null);
+        _insertChild(records, parentRowOrParentId) {
+            return handleInsertChildRowAt(this, records, parentRowOrParentId, null);
         },
-        _insertChildAt(records, parentRow, targetRow) {
-            return handleInsertChildRowAt(this, records, parentRow, targetRow);
+        _insertChildAt(records, parentRowOrParentId, targetRowOrRowid) {
+            return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid);
         },
-        _insertChildNextAt(records, parentRow, targetRow) {
-            return handleInsertChildRowAt(this, records, parentRow, targetRow, true);
+        _insertChildNextAt(records, parentRowOrParentId, targetRowOrRowid) {
+            return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid, true);
         },
         /**
          * 删除指定行数据

package/es/table/src/cell.js

@@ -217,11 +217,17 @@ function renderTitleContent(h, params, content) {
 }
 function getFooterContent(h, params) {
     const { $table, column, row } = params;
+    const tableProps = $table;
+    const { editConfig } = tableProps;
     const { slots, editRender, cellRender } = column;
-    const renderOpts = editRender || cellRender;
-    if (slots && slots.footer) {
-        return $table.callSlot(slots.footer, params, h);
+    const footerSlot = slots ? slots.footer : null;
+    if (footerSlot) {
+        return $table.callSlot(footerSlot, params, h);
     }
+    const isEnableEdit = editConfig && isEnableConf(editConfig);
+    const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
+    const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
+    const renderOpts = editRenderOpts || cellRenderOpts;
     const itemValue = $table.getFooterCellLabel(row, column);
     if (renderOpts) {
         const compConf = renderer.get(renderOpts.name);
@@ -266,7 +272,9 @@ function renderCellHandle(h, params) {
         case 'html':
             return isDeepCell ? Cell.renderDeepHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
     }
-    if (editConfig && isEnableConf(editOpts) && editRender) {
+    const isEnableEdit = editConfig && isEnableConf(editConfig);
+    const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
+    if (editRenderOpts) {
         return editOpts.mode === 'cell' ? (isDeepCell ? Cell.renderDeepCellEdit(h, params) : Cell.renderCellEdit(h, params)) : (isDeepCell ? Cell.renderDeepRowEdit(h, params) : Cell.renderRowEdit(h, params));
     }
     return isDeepCell ? Cell.renderDeepCell(h, params) : Cell.renderDefaultCell(h, params);
@@ -275,7 +283,6 @@ function renderHeaderHandle(h, params) {
     const { column, $table } = params;
     const tableProps = $table;
     const { editConfig } = tableProps;
-    const editOpts = $table.computeEditOpts;
     const { type, filters, sortable, editRender } = column;
     switch (type) {
         case 'seq':
@@ -296,7 +303,9 @@ function renderHeaderHandle(h, params) {
             }
             break;
     }
-    if (editConfig && isEnableConf(editOpts) && editRender) {
+    const isEnableEdit = editConfig && isEnableConf(editConfig);
+    const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
+    if (editRenderOpts) {
         return Cell.renderEditHeader(h, params);
     }
     else if (filters && sortable) {
@@ -331,11 +340,17 @@ export const Cell = {
      */
     renderHeaderTitle(h, params) {
         const { $table, column } = params;
+        const tableProps = $table;
+        const { editConfig } = tableProps;
         const { slots, editRender, cellRender } = column;
-        const renderOpts = editRender || cellRender;
-        if (slots && slots.header) {
-            return renderTitleContent(h, params, $table.callSlot(slots.header, params, h));
+        const headerSlot = slots ? slots.header : null;
+        if (headerSlot) {
+            return renderTitleContent(h, params, $table.callSlot(headerSlot, params, h));
         }
+        const isEnableEdit = editConfig && isEnableConf(editConfig);
+        const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
+        const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
+        const renderOpts = editRenderOpts || cellRenderOpts;
         if (renderOpts) {
             const compConf = renderer.get(renderOpts.name);
             const rtHeader = compConf ? (compConf.renderTableHeader || compConf.renderHeader) : null;
@@ -356,7 +371,9 @@ export const Cell = {
         const { isRowGroupStatus } = tableReactData;
         const { editConfig } = tableProps;
         const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column;
-        const renderOpts = editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null);
+        const isEnableEdit = editConfig && isEnableConf(editConfig);
+        const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
+        const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
         const defaultSlot = slots ? slots.default : null;
         const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
         const gvSlot = slots ? (slots.groupValues || slots['group-values']) : null;
@@ -427,25 +444,24 @@ export const Cell = {
             if (defaultSlot) {
                 return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
             }
+            const renderOpts = editRenderOpts || cellRenderOpts;
             // formatter > (renderTableCell | renderTableDefault)
             if (renderOpts && !formatter) {
                 const compConf = renderer.get(renderOpts.name);
-                const rtDefault = compConf ? (compConf.renderTableDefault || compConf.renderDefault) : null;
-                const rtCell = compConf ? (compConf.renderTableCell || compConf.renderCell) : null;
-                const renderFn = editRender ? rtCell : rtDefault;
+                const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault);
                 if (renderFn) {
-                    return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))));
+                    return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))));
                 }
             }
             cellValue = $table.getCellLabel(row, column);
         }
-        const cellPlaceholder = editRender ? editRender.placeholder : '';
+        const cellPlaceholder = editRenderOpts ? editRenderOpts.placeholder : '';
         return renderCellBaseVNs(h, params, [
             h('span', {
                 class: 'vxe-cell--label'
             }, [
                 // 如果设置占位符
-                editRender && eqEmptyValue(cellValue)
+                editRenderOpts && eqEmptyValue(cellValue)
                     ? h('span', {
                         class: 'vxe-cell--placeholder'
                     }, formatText(getFuncText(cellPlaceholder), 1))
@@ -1088,6 +1104,8 @@ export const Cell = {
         const { editConfig, editRules } = tableProps;
         const editOpts = $table.computeEditOpts;
         const { sortable, filters, editRender } = column;
+        const isEnableEdit = editConfig && isEnableConf(editConfig);
+        const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         let isRequired = false;
         if (editRules) {
             const columnRules = XEUtils.get(editRules, column.field);
@@ -1096,7 +1114,7 @@ export const Cell = {
             }
         }
         let editIconVNs = [];
-        if (isEnableConf(editConfig)) {
+        if (isEnableEdit) {
             const { showAsterisk, showIcon, icon } = editOpts;
             editIconVNs = [
                 isRequired && showAsterisk
@@ -1108,7 +1126,7 @@ export const Cell = {
                         })
                     ])
                     : renderEmptyElement($table),
-                isEnableConf(editRender) && showIcon
+                editRenderOpts && showIcon
                     ? h('i', {
                         class: 'vxe-cell--edit-icon'
                     }, XEUtils.isFunction(icon)
@@ -1128,11 +1146,15 @@ export const Cell = {
     // 行格编辑模式
     renderRowEdit(h, params) {
         const { $table, column } = params;
+        const tableProps = $table;
         const tableReactData = $table;
+        const { editConfig } = tableProps;
         const { editStore } = tableReactData;
         const { actived } = editStore;
         const { editRender } = column;
-        return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row);
+        const isEnableEdit = editConfig && isEnableConf(editConfig);
+        const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
+        return Cell.runRenderer(h, params, !!(editRenderOpts && actived && actived.row === params.row));
     },
     renderDeepRowEdit(h, params) {
         return Cell.renderDeepNodeBtn(h, params, Cell.renderRowEdit(h, params));
@@ -1140,29 +1162,37 @@ export const Cell = {
     // 单元格编辑模式
     renderCellEdit(h, params) {
         const { $table, column } = params;
+        const tableProps = $table;
         const tableReactData = $table;
+        const { editConfig } = tableProps;
         const { editStore } = tableReactData;
         const { actived } = editStore;
         const { editRender } = column;
-        return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row && actived.column === params.column);
+        const isEnableEdit = editConfig && isEnableConf(editConfig);
+        const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
+        return Cell.runRenderer(h, params, !!(editRenderOpts && actived && actived.row === params.row && actived.column === params.column));
     },
     renderDeepCellEdit(h, params) {
         return Cell.renderDeepNodeBtn(h, params, Cell.renderCellEdit(h, params));
     },
     runRenderer(h, params, _vm, isEdit) {
         const { $table, row, column } = params;
+        const tableProps = $table;
         const tableReactData = $table;
+        const { editConfig } = tableProps;
         const { isRowGroupStatus } = tableReactData;
         const { slots, field, editRender, formatter } = column;
-        const compConf = renderer.get(editRender.name);
-        const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null;
+        const isEnableEdit = editConfig && isEnableConf(editConfig);
+        const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         const defaultSlot = slots ? slots.default : null;
         const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
         const cellParams = Object.assign({ $type: '', isEdit }, params);
-        if (isEdit) {
+        if (isEdit && editRenderOpts) {
             if (slots && slots.edit) {
                 return $table.callSlot(slots.edit, cellParams, h);
             }
+            const compConf = renderer.get(editRender.name);
+            const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null;
             if (rtEdit) {
                 return getSlotVNs(rtEdit.call($table, h, editRender, cellParams));
             }

package/es/table/src/methods.js

@@ -5594,19 +5594,6 @@ const tableMethods = {
         const { treeConfig } = props;
         const { tableFullData, tableFullTreeData } = internalData;
         if (treeConfig) {
-            const treeOpts = $xeTable.computeTreeOpts;
-            const { transform, mapChildrenField, rowField, parentField } = treeOpts;
-            const childrenField = treeOpts.children || treeOpts.childrenField;
-            if (transform) {
-                return XEUtils.toArrayTree(XEUtils.toTreeArray(tableFullTreeData, {
-                    children: mapChildrenField
-                }), {
-                    key: rowField,
-                    parentKey: parentField,
-                    children: childrenField,
-                    mapChildren: mapChildrenField
-                });
-            }
             return tableFullTreeData.slice(0);
         }
         return tableFullData.slice(0);

package/es/table/src/props.js

@@ -290,6 +290,8 @@ export const tableProps = {
     virtualYConfig: Object,
     // 滚动条配置项
     scrollbarConfig: Object,
+    // 可撤销配置项
+    undoHistoryConfig: Object,
     // （即将废弃）优化相关
     animat: { type: Boolean, default: () => getConfig().table.animat },
     // （可能会被废弃的参数，不要使用）

package/es/table/src/table.js

@@ -1463,6 +1463,11 @@ export default {
             }
             return [];
         },
+        computeUndoHistoryOpts() {
+            const $xeTable = this;
+            const props = $xeTable;
+            return Object.assign({}, getConfig().table.undoHistoryConfig, props.undoHistoryConfig);
+        },
         tabsResizeFlag() {
             const $xeTable = this;
             const $xeTabs = $xeTable.$xeTabs;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.34";
+export const version = "3.19.36";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -255,6 +255,9 @@ VxeUI.setConfig({
                 // position: 'right',
                 visible: true
             }
+        },
+        undoHistoryConfig: {
+            isEditRow: true
         }
     },
     grid: {

package/es/ui/src/log.js

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