vxe-table 3.15.20 → 3.15.22

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.20";
+const version = "3.15.22";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.20"}`;
+const log_version = `table v${"3.15.22"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5913,6 +5913,7 @@ function updateAfterDataIndex($xeTable) {
   const {
     fullDataRowIdData,
     fullAllDataRowIdData,
+    afterFullData,
     afterTreeFullData
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
@@ -5956,8 +5957,20 @@ function updateAfterDataIndex($xeTable) {
     }, {
       children: transform ? treeOpts.mapChildrenField : childrenField
     });
+    if (transform) {
+      afterFullData.forEach((row, index) => {
+        const rowid = handleGetRowId(row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        const seq = index + 1;
+        if (rowRest) {
+          if (!treeConfig) {
+            rowRest.seq = seq;
+          }
+          rowRest._index = index;
+        }
+      });
+    }
     internalData.afterFullRowMaps = fullMaps;
-    updateAfterListIndex($xeTable);
   } else {
     updateAfterListIndex($xeTable);
   }
@@ -7552,7 +7565,8 @@ function removeBodyMerges($xeTable, merges) {
   const {
     mergeBodyList,
     fullColumnIdData,
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    mergeBodyMaps
   } = internalData;
   const rest = [];
   if (merges) {
@@ -7593,6 +7607,9 @@ function removeBodyMerges($xeTable, merges) {
         const item = rItems[0];
         if (item) {
           rest.push(rItems[0]);
+          if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          }
         }
       }
     });
@@ -7603,7 +7620,8 @@ function removeFooterMerges($xeTable, merges) {
   const internalData = $xeTable;
   const {
     mergeFooterList,
-    fullColumnIdData
+    fullColumnIdData,
+    mergeFooterMaps
   } = internalData;
   const rest = [];
   if (merges) {
@@ -7632,6 +7650,9 @@ function removeFooterMerges($xeTable, merges) {
         const item = rItems[0];
         if (item) {
           rest.push(item);
+          if (mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          }
         }
       }
     });
@@ -29447,6 +29468,7 @@ const {
           const gCommandOpts = toolbar_commands.get(code);
           const params = {
             code,
+            button: null,
             tool: item,
             $table: $table,
             $grid: $xeGrid,
@@ -31702,7 +31724,7 @@ const blurEvent = 'blur';
  * @param modelFunc
  * @param changeFunc
  */
-function getComponentOns(renderOpts, params, eFns) {
+function getComponentOns(renderOpts, params, eFns, eventOns) {
   const {
     events
   } = renderOpts;
@@ -31746,7 +31768,7 @@ function getComponentOns(renderOpts, params, eFns) {
       }
     };
   }
-  return ons;
+  return eventOns ? Object.assign(ons, eventOns) : ons;
 }
 function getEditOns(renderOpts, params) {
   const {
@@ -32464,6 +32486,89 @@ render_renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleFilterMethod
   },
+  VxeDateRangePicker: {
+    tableAutoFocus: 'input',
+    renderTableEdit(h, renderOpts, params) {
+      const {
+        startField,
+        endField
+      } = renderOpts;
+      const {
+        $table,
+        row,
+        column
+      } = params;
+      const {
+        model
+      } = column;
+      const cellValue = getCellValue(row, column);
+      const seProps = {};
+      const seOs = {};
+      if (startField && endField) {
+        seProps.startValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, startField);
+        seProps.endValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, endField);
+        seOs['update:startValue'] = value => {
+          if (startField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, startField, value);
+          }
+        };
+        seOs['update:endValue'] = value => {
+          if (endField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, endField, value);
+          }
+        };
+      }
+      return [h(getDefaultComponent(renderOpts), {
+        props: getCellEditProps(renderOpts, params, cellValue, seProps),
+        on: getComponentOns(renderOpts, params, {
+          model(cellValue) {
+            model.update = true;
+            model.value = cellValue;
+            setCellValue(row, column, cellValue);
+          },
+          change() {
+            $table.updateStatus(params);
+          },
+          blur() {
+            $table.handleCellRuleUpdateStatus('blur', params);
+          }
+        }, seOs)
+      })];
+    },
+    renderTableCell(h, renderOpts, params) {
+      const {
+        startField,
+        endField
+      } = renderOpts;
+      const {
+        row,
+        column
+      } = params;
+      let startValue = '';
+      let endValue = '';
+      if (startField && endField) {
+        startValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, startField);
+        endValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, endField);
+      } else {
+        const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+        if (cellValue) {
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(cellValue)) {
+            startValue = cellValue[0];
+            endValue = cellValue[1];
+          } else {
+            const strs = `${cellValue}`.split(',');
+            startValue = strs[0];
+            endValue = strs[1];
+          }
+        }
+      }
+      let cellLabel = '';
+      if (startValue && endValue) {
+        cellLabel = `${startValue} ~ ${endValue}`;
+      }
+      return getCellLabelVNs(h, renderOpts, params, cellLabel);
+    }
+  },
   VxeTextarea: {
     tableAutoFocus: 'textarea',
     renderTableEdit: defaultEditRender
@@ -33105,6 +33210,9 @@ const Toolbar = VxeToolbar;
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',