vxe-table 3.19.34 → 3.19.36

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.34";
+const version = "3.19.36";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2260,6 +2260,9 @@ core_.VxeUI.setConfig({
         // position: 'right',
         visible: true
       }
+    },
+    undoHistoryConfig: {
+      isEditRow: true
     }
   },
   grid: {
@@ -2715,7 +2718,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.34"}`;
+const log_version = `table v${"3.19.36"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3991,15 +3994,23 @@ function getFooterContent(h, params) {
     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 = cell_renderer.get(renderOpts.name);
@@ -4061,7 +4072,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);
@@ -4075,7 +4088,6 @@ function renderHeaderHandle(h, params) {
   const {
     editConfig
   } = tableProps;
-  const editOpts = $table.computeEditOpts;
   const {
     type,
     filters,
@@ -4099,7 +4111,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) {
     return Cell.renderSortAndFilterHeader(h, params);
@@ -4136,15 +4150,23 @@ const Cell = {
       $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 = cell_renderer.get(renderOpts.name);
       const rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
@@ -4181,7 +4203,9 @@ const Cell = {
       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;
@@ -4274,26 +4298,25 @@ 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 = cell_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'
+            $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) ? h('span', {
+    editRenderOpts && eqEmptyValue(cellValue) ? h('span', {
       class: 'vxe-cell--placeholder'
     }, formatText(getFuncText(cellPlaceholder), 1)) : h('span', formatText(cellValue, 1))])]);
   },
@@ -5111,6 +5134,8 @@ const Cell = {
       filters,
       editRender
     } = column;
+    const isEnableEdit = editConfig && isEnableConf(editConfig);
+    const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
     let isRequired = false;
     if (editRules) {
       const columnRules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, column.field);
@@ -5119,7 +5144,7 @@ const Cell = {
       }
     }
     let editIconVNs = [];
-    if (isEnableConf(editConfig)) {
+    if (isEnableEdit) {
       const {
         showAsterisk,
         showIcon,
@@ -5129,7 +5154,7 @@ const Cell = {
         class: 'vxe-cell--required-icon'
       }, [h('i', {
         class: 'vxe-cell--required-icon'
-      })]) : renderEmptyElement($table), isEnableConf(editRender) && showIcon ? h('i', {
+      })]) : renderEmptyElement($table), editRenderOpts && showIcon ? h('i', {
         class: 'vxe-cell--edit-icon'
       }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(icon) ? getSlotVNs(icon({})) : [h('i', {
         class: icon || cell_getIcon().TABLE_EDIT
@@ -5143,7 +5168,11 @@ const Cell = {
       $table,
       column
     } = params;
+    const tableProps = $table;
     const tableReactData = $table;
+    const {
+      editConfig
+    } = tableProps;
     const {
       editStore
     } = tableReactData;
@@ -5153,7 +5182,9 @@ const Cell = {
     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));
@@ -5164,7 +5195,11 @@ const Cell = {
       $table,
       column
     } = params;
+    const tableProps = $table;
     const tableReactData = $table;
+    const {
+      editConfig
+    } = tableProps;
     const {
       editStore
     } = tableReactData;
@@ -5174,7 +5209,9 @@ const Cell = {
     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));
@@ -5185,7 +5222,11 @@ const Cell = {
       row,
       column
     } = params;
+    const tableProps = $table;
     const tableReactData = $table;
+    const {
+      editConfig
+    } = tableProps;
     const {
       isRowGroupStatus
     } = tableReactData;
@@ -5195,18 +5236,20 @@ const Cell = {
       editRender,
       formatter
     } = column;
-    const compConf = cell_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 = cell_renderer.get(editRender.name);
+      const rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
       if (rtEdit) {
         return getSlotVNs(rtEdit.call($table, h, editRender, cellParams));
       }
@@ -5832,6 +5875,8 @@ const tableProps = {
   virtualYConfig: Object,
   // 滚动条配置项
   scrollbarConfig: Object,
+  // 可撤销配置项
+  undoHistoryConfig: Object,
   // （即将废弃）优化相关
   animat: {
     type: Boolean,
@@ -6311,7 +6356,7 @@ if(!rowRest){return false;}const row=rowRest.row;const oRow=sourceDataRowIdData[
      * 如果存在排序，继续处理
      */getTableData(){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{tableData,footerTableData}=reactData;const{tableFullData,afterFullData,tableFullTreeData}=internalData;return{fullData:props.treeConfig?tableFullTreeData.slice(0):tableFullData.slice(0),visibleData:afterFullData.slice(0),tableData:tableData.slice(0),footerData:footerTableData.slice(0)};},/**
      * 获取表格的全量数据，如果是 tree-config 则返回带层级的树结构
-     */getFullData(){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;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 external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableFullTreeData,{children:mapChildrenField}),{key:rowField,parentKey:parentField,children:childrenField,mapChildren:mapChildrenField});}return tableFullTreeData.slice(0);}return tableFullData.slice(0);},/**
+     */getFullData(){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{tableFullData,tableFullTreeData}=internalData;if(treeConfig){return tableFullTreeData.slice(0);}return tableFullData.slice(0);},/**
      * 处理数据加载默认行为
      * 默认执行一次，除非被重置
      */handleLoadDefaults(){const $xeTable=this;handleLoadDefaults($xeTable);},/**
@@ -12450,7 +12495,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;
@@ -12481,6 +12526,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
     records = [records];
   }
+  let targetRow = targetRowOrRowid;
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(targetRowOrRowid) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetRowOrRowid)) {
+    const rowRest = fullAllDataRowIdData[targetRowOrRowid];
+    if (rowRest) {
+      targetRow = rowRest.row;
+    }
+  }
   const newRecords = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? {
     [mapChildrenField]: [],
     [childrenField]: []
@@ -12747,11 +12799,15 @@ 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,
@@ -12762,9 +12818,16 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
       records = [records];
     }
+    let parentRow = parentRowOrParentId;
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(parentRowOrParentId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(parentRowOrParentId)) {
+      const rowRest = fullAllDataRowIdData[parentRowOrParentId];
+      if (rowRest) {
+        parentRow = rowRest.row;
+      }
+    }
     return handleInsertRowAt($xeTable, records.map(item => Object.assign({}, item, {
       [parentField]: parentRow[rowField]
-    })), targetRow, isInsertNextRow);
+    })), targetRowOrRowid, isInsertNextRow);
   } else {
     errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
   }
@@ -12990,24 +13053,22 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
      * 如果 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);
     },
     /**
      * 删除指定行数据
@@ -18796,6 +18857,11 @@ function renderBody(h, $xeTable) {
       }
       return [];
     },
+    computeUndoHistoryOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.undoHistoryConfig, props.undoHistoryConfig);
+    },
     tabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;