@fecp/designer 5.4.106 → 5.4.107

package/lib/node_modules/vxe-table/es/table/module/validator/hook.js

@@ -106,20 +106,19 @@ function validRuleValue(rule, val, required) {
   }
   return true;
 }
-function checkRuleStatus(rule, row, val) {
-  const { required, field } = rule;
-  const currVal = field ? index.default.get(row, field) : val;
-  const isEmptyVal = index.default.isArray(currVal) ? !currVal.length : utils.eqEmptyValue(currVal);
+function checkRuleStatus(rule, val) {
+  const { required } = rule;
+  const isEmptyVal = index.default.isArray(val) ? !val.length : utils.eqEmptyValue(val);
   if (required) {
     if (isEmptyVal) {
       return false;
     }
-    if (!validRuleValue(rule, currVal, required)) {
+    if (!validRuleValue(rule, val, required)) {
       return false;
     }
   } else {
     if (!isEmptyVal) {
-      if (!validRuleValue(rule, currVal, required)) {
+      if (!validRuleValue(rule, val, required)) {
         return false;
       }
     }
@@ -134,6 +133,7 @@ hooks.add("tableValidatorModule", {
     const { computeValidOpts, computeTreeOpts, computeEditOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
     let validatorMethods = {};
     let validatorPrivateMethods = {};
+    let validRuleErr;
     const handleValidError = (params) => {
       return new Promise((resolve) => {
         const validOpts = computeValidOpts.value;
@@ -142,7 +142,7 @@ hooks.add("tableValidatorModule", {
           resolve();
         } else {
           $xeTable.handleEdit(params, { type: "valid-error", trigger: "call" }).then(() => {
-            resolve($xeTable.showValidTooltip(params));
+            resolve(validatorPrivateMethods.showValidTooltip(params));
           });
         }
       });
@@ -187,8 +187,8 @@ hooks.add("tableValidatorModule", {
       }
       const rowValidErrs = [];
       internalData._lastCallTime = Date.now();
-      internalData.validRuleErr = false;
-      $xeTable.clearValidate();
+      validRuleErr = false;
+      validatorMethods.clearValidate();
       const validErrMaps = {};
       if (editRules) {
         const columns = cols && cols.length ? cols : $xeTable.getColumns();
@@ -203,11 +203,11 @@ hooks.add("tableValidatorModule", {
           if ($xeTable.isAggregateRecord(row)) {
             return;
           }
-          if (isFull || !internalData.validRuleErr) {
+          if (isFull || !validRuleErr) {
             const colVailds = [];
             columns.forEach((column) => {
               const field = index.default.isString(column) ? column : column.field;
-              if ((isFull || !internalData.validRuleErr) && index.default.has(editRules, field)) {
+              if ((isFull || !validRuleErr) && index.default.has(editRules, field)) {
                 colVailds.push(validatorPrivateMethods.validCellRules("all", row, column).catch(({ rule, rules }) => {
                   const rest = {
                     rule,
@@ -230,7 +230,7 @@ hooks.add("tableValidatorModule", {
                   };
                   validRest[field].push(rest);
                   if (!isFull) {
-                    internalData.validRuleErr = true;
+                    validRuleErr = true;
                     return Promise.reject(rest);
                   }
                 }));
@@ -437,18 +437,18 @@ hooks.add("tableValidatorModule", {
                   }
                   if (customValid) {
                     if (index.default.isError(customValid)) {
-                      internalData.validRuleErr = true;
+                      validRuleErr = true;
                       errorRules.push(new Rule({ type: "custom", trigger, content: customValid.message, rule: new Rule(rule) }));
                     } else if (customValid.catch) {
                       syncValidList.push(customValid.catch((e) => {
-                        internalData.validRuleErr = true;
+                        validRuleErr = true;
                         errorRules.push(new Rule({ type: "custom", trigger, content: e && e.message ? e.message : rule.content || rule.message, rule: new Rule(rule) }));
                       }));
                     }
                   }
                 } else {
-                  if (!checkRuleStatus(rule, row, cellValue)) {
-                    internalData.validRuleErr = true;
+                  if (!checkRuleStatus(rule, cellValue)) {
+                    validRuleErr = true;
                     errorRules.push(new Rule(rule));
                   }
                 }
@@ -486,15 +486,15 @@ hooks.add("tableValidatorModule", {
         }
         if (editConfig && editRules && actived.row) {
           const { row, column, cell } = actived.args;
-          if ($xeTable.hasCellRules(type, row, column)) {
-            return $xeTable.validCellRules(type, row, column).then(() => {
+          if (validatorPrivateMethods.hasCellRules(type, row, column)) {
+            return validatorPrivateMethods.validCellRules(type, row, column).then(() => {
               if (editOpts.mode === "row") {
                 validatorMethods.clearValidate(row, column);
               }
             }).catch(({ rule }) => {
               if (!rule.trigger || type === rule.trigger) {
                 const rest = { rule, row, column, cell };
-                $xeTable.showValidTooltip(rest);
+                validatorPrivateMethods.showValidTooltip(rest);
                 return Promise.reject(rest);
               }
               return Promise.resolve();

package/lib/node_modules/vxe-table/es/table/src/body.js

@@ -37,9 +37,8 @@ const TableBodyComponent = comp.defineVxeComponent({
     const refBodyEmptyBlock = vue.ref();
     const isVMScrollProcess = () => {
       const { delayHover } = tableProps;
-      const { isDragResize } = tableReactData;
-      const { lastSTime } = tableInternalData;
-      return !!(isDragResize || lastSTime && Date.now() < lastSTime + delayHover);
+      const { lastScrollTime, isDragResize } = tableReactData;
+      return !!(isDragResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
     };
     const renderLine = (rowid, params, cellHeight) => {
       const { column } = params;
@@ -97,7 +96,7 @@ const TableBodyComponent = comp.defineVxeComponent({
       const $xeGantt = $xeTable.xeGantt;
       const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
       const { tableData, tableColumn, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
-      const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore, keepUpdateFieldMaps } = tableInternalData;
+      const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore } = tableInternalData;
       const cellOpts = computeCellOpts.value;
       const validOpts = computeValidOpts.value;
       const checkboxOpts = computeCheckboxOpts.value;
@@ -117,7 +116,7 @@ const TableBodyComponent = comp.defineVxeComponent({
       const areaOpts = computeAreaOpts.value;
       const cellOffsetWidth = computeCellOffsetWidth.value;
       const { selectCellToRow } = areaOpts;
-      const { field, type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, padding, verticalAlign, slots } = column;
+      const { type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, padding, verticalAlign, slots } = column;
       const { verticalAlign: allVerticalAlign } = cellOpts;
       const { actived } = editStore;
       const rowRest = fullAllDataRowIdData[rowid] || {};
@@ -147,7 +146,7 @@ const TableBodyComponent = comp.defineVxeComponent({
       const cellAlign = align || (compConf ? compConf.tableCellAlign : "") || allAlign;
       const cellVerticalAlign = index.default.eqNull(verticalAlign) ? allVerticalAlign : verticalAlign;
       const errorValidItem = validErrorMaps[`${rowid}:${colid}`];
-      const showValidTip = editRules && validOpts.showErrorMessage && (validOpts.message === "default" ? height || tableData.length > 1 : validOpts.message === "inline");
+      const showValidTip = editRules && validOpts.showMessage && (validOpts.message === "default" ? height || tableData.length > 1 : validOpts.message === "inline");
       const tdAttrs = { colid };
       const cellParams = {
         $table: $xeTable,
@@ -259,8 +258,8 @@ const TableBodyComponent = comp.defineVxeComponent({
           fixedHiddenColumn = false;
         }
       }
-      if (!fixedHiddenColumn && editConfig && (editOpts.showStatus || editOpts.showUpdateStatus) && keepUpdateFieldMaps[field]) {
-        isDirty = $xeTable.isUpdateByRow(row, field);
+      if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
+        isDirty = $xeTable.isUpdateByRow(row, column.field);
       }
       const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
       let cellHeight = util.getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
@@ -318,14 +317,6 @@ const TableBodyComponent = comp.defineVxeComponent({
         if (treeConfig) {
           tdVNs.push(...renderLine(rowid, cellParams, cellHeight));
         }
-        const clVNs = [];
-        if (!isVNPreEmptyStatus) {
-          clVNs.push(vue.h("div", {
-            colid,
-            rowid,
-            class: "vxe-cell--wrapper vxe-body-cell--wrapper"
-          }, column.renderCell(cellParams)));
-        }
         tdVNs.push(vue.h("div", {
           key: "tc",
           class: ["vxe-cell", {
@@ -335,7 +326,13 @@ const TableBodyComponent = comp.defineVxeComponent({
           }],
           style: tcStyle,
           title: showTitle ? $xeTable.getCellLabel(row, column) : null
-        }, clVNs));
+        }, isVNPreEmptyStatus ? [] : [
+          vue.h("div", {
+            colid,
+            rowid,
+            class: "vxe-cell--wrapper vxe-body-cell--wrapper"
+          }, column.renderCell(cellParams))
+        ]));
         if (showValidTip && errorValidItem) {
           const errRule = errorValidItem.rule;
           const validSlot = slots ? slots.valid : null;
@@ -405,7 +402,6 @@ const TableBodyComponent = comp.defineVxeComponent({
           "col--dirty": isDirty,
           "col--active": editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === "row")),
           "col--valid-error": !!errorValidItem,
-          "show--valid-bg": errorValidItem && validOpts.showErrorBackground,
           "col--current": currentColumn === column
         },
         dom.getPropClass(compCellClassName, cellParams),
@@ -417,7 +413,7 @@ const TableBodyComponent = comp.defineVxeComponent({
       const $xeGrid = $xeTable.xeGrid;
       const $xeGantt = $xeTable.xeGantt;
       const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps;
-      const { hasFixedColumn, treeExpandedFlag, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, rowExpandHeightFlag, isRowGroupStatus } = tableReactData;
+      const { hasFixedColumn, treeExpandedFlag, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, rowExpandHeightFlag, isRowGroupStatus } = tableReactData;
       const { fullAllDataRowIdData, fullColumnIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData;
       const checkboxOpts = computeCheckboxOpts.value;
       const radioOpts = computeRadioOpts.value;
@@ -511,18 +507,11 @@ const TableBodyComponent = comp.defineVxeComponent({
         const tdVNs = tableColumn.map((column, $columnIndex) => {
           return renderTdColumn(seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         });
-        rows.push(vue.h("tr", Object.assign({ class: trClass, rowid, style: rowStyle ? index.default.isFunction(rowStyle) ? rowStyle(params) : rowStyle : null, key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex }, trOn), tdVNs));
+        rows.push(vue.h("tr", Object.assign({ class: trClass, rowid, style: rowStyle ? index.default.isFunction(rowStyle) ? rowStyle(params) : rowStyle : null, key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex }, trOn), tdVNs));
         if (isExpandRow) {
           const expandOpts = computeExpandOpts.value;
           const { height: expandHeight, padding, mode: expandMode } = expandOpts;
           if (expandMode === "fixed") {
-            const currExpHeight = rowRest.expandHeight;
-            let expHeight = 0;
-            if (rowExpandHeightFlag) {
-              if (currExpHeight || expandHeight) {
-                expHeight = (currExpHeight || expandHeight || 0) + 1;
-              }
-            }
             rows.push(vue.h("tr", {
               class: "vxe-body--row-expanded-place",
               key: `expand_${rowid}`,
@@ -532,7 +521,7 @@ const TableBodyComponent = comp.defineVxeComponent({
                 class: "vxe-body--row-expanded-place-column",
                 colspan: tableColumn.length,
                 style: {
-                  height: `${expHeight}px`
+                  height: `${rowExpandHeightFlag ? rowRest.expandHeight || expandHeight : 0}px`
                 }
               })
             ]));

package/lib/node_modules/vxe-table/es/table/src/column.js

@@ -129,7 +129,7 @@ const columnProps = {
   // 内容渲染配置项
   contentRender: Object,
   // 聚合函数
-  aggFunc: [Boolean, String],
+  aggFunc: [String, Boolean],
   // 将单元格复制到剪贴板
   copyMethod: Function,
   // 将剪贴单元格的值清除

package/lib/node_modules/vxe-table/es/table/src/columnInfo.js

@@ -150,8 +150,6 @@ class ColumnInfo {
       sortNumber: 0,
       renderSortNumber: 0,
       renderAggFn: "",
-      renderAggDigits: null,
-      renderAggFormat: null,
       renderFixed: "",
       renderVisible: false,
       renderWidth: 0,

package/lib/node_modules/vxe-table/es/table/src/emits.js

@@ -66,7 +66,6 @@ const tableEmits = [
   "column-dragover",
   "column-dragend",
   "enter-append-row",
-  "tab-append-row",
   "edit-actived",
   "edit-activated",
   "edit-disabled",

package/lib/node_modules/vxe-table/es/table/src/footer.js

@@ -113,10 +113,10 @@ const TableFooterComponent = comp.defineVxeComponent({
           };
         }
         tfOns.onClick = (evnt) => {
-          $xeTable.triggerFooterCellClickEvent(evnt, cellParams);
+          $xeTable.dispatchEvent("footer-cell-click", Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
         };
         tfOns.onDblclick = (evnt) => {
-          $xeTable.triggerFooterCellDblclickEvent(evnt, cellParams);
+          $xeTable.dispatchEvent("footer-cell-dblclick", Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
         };
         let isMergeCell = false;
         if (mergeFootFlag && mergeFooterList.length) {

package/lib/node_modules/vxe-table/es/table/src/group.js

@@ -33,10 +33,9 @@ const VxeColgroupComponent = comp.defineVxeComponent({
       util.destroyColumn($xeTable, columnConfig);
     });
     const renderVN = () => {
-      const defaultSlot = slots.default;
       return vue.h("div", {
         ref: refElem
-      }, defaultSlot ? defaultSlot() : []);
+      }, slots.default ? slots.default() : []);
     };
     const $xeColgroup = { columnConfig };
     vue.provide("$xeColgroup", $xeColgroup);

package/lib/node_modules/vxe-table/es/table/src/props.js

@@ -214,8 +214,6 @@ const tableProps = {
   rowConfig: Object,
   // 数据聚合配置项
   aggregateConfig: Object,
-  // 聚合函数计算精度配置项
-  aggregateAccuracyConfig: Object,
   /**
    * 已废弃，被 aggregateConfig 替换
    * @deprecated
@@ -276,8 +274,6 @@ const tableProps = {
   fnrConfig: Object,
   // 编辑配置项
   editConfig: Object,
-  // 数据状态监听配置项
-  editDirtyConfig: Object,
   // 校验配置项
   validConfig: Object,
   // 校验规则配置项