@fecp/designer 5.4.104 → 5.4.107

package/lib/node_modules/vxe-table/es/table/render/index.js

@@ -1,25 +1,24 @@
 "use strict";
 const vue = require("vue");
-require("../../../../xe-utils/es/index.esm.js");
+const index = require("../../../../../_virtual/index2.js");
 require("../../ui/index.js");
 const util = require("../src/util.js");
 const utils = require("../../ui/src/utils.js");
 const vn = require("../../ui/src/vn.js");
 const log = require("../../ui/src/log.js");
 const index_esm = require("../../../../@vxe-ui/core/es/index.esm.js");
-const ctor = require("../../../../xe-utils/es/ctor.js");
 const { getConfig, renderer, getI18n, getComponent } = index_esm.VxeUI;
 const componentDefaultModelProp = "modelValue";
 const defaultCompProps = {};
 function handleDefaultValue(value, defaultVal, initVal) {
-  return ctor.default.eqNull(value) ? ctor.default.eqNull(defaultVal) ? initVal : defaultVal : value;
+  return index.default.eqNull(value) ? index.default.eqNull(defaultVal) ? initVal : defaultVal : value;
 }
 function parseDate(value, props) {
-  return value && props.valueFormat ? ctor.default.toStringDate(value, props.valueFormat) : value;
+  return value && props.valueFormat ? index.default.toStringDate(value, props.valueFormat) : value;
 }
 function getFormatDate(value, props, defaultFormat) {
   const { dateConfig = {} } = props;
-  return ctor.default.toDateString(parseDate(value, props), dateConfig.labelFormat || defaultFormat);
+  return index.default.toDateString(parseDate(value, props), dateConfig.labelFormat || defaultFormat);
 }
 function getLabelFormatDate(value, props) {
   return getFormatDate(value, props, getI18n(`vxe.input.date.labelFormat.${props.type || "date"}`));
@@ -63,10 +62,10 @@ function getInputImmediateModel(renderOpts) {
   return immediate;
 }
 function getCellEditProps(renderOpts, params, value, defaultProps) {
-  return ctor.default.assign({ immediate: getInputImmediateModel(renderOpts) }, defaultCompProps, defaultProps, renderOpts.props, { [componentDefaultModelProp]: value });
+  return index.default.assign({ immediate: getInputImmediateModel(renderOpts) }, defaultCompProps, defaultProps, renderOpts.props, { [componentDefaultModelProp]: value });
 }
 function getCellEditFilterProps(renderOpts, params, value, defaultProps) {
-  return ctor.default.assign({}, defaultCompProps, defaultProps, renderOpts.props, { [componentDefaultModelProp]: value });
+  return index.default.assign({}, defaultCompProps, defaultProps, renderOpts.props, { [componentDefaultModelProp]: value });
 }
 function isImmediateCell(renderOpts, params) {
   return params.$type === "cell" || getInputImmediateModel(renderOpts);
@@ -91,7 +90,7 @@ function getNativeElementOns(renderOpts, params, eFns) {
   const isSameEvent = changeEvent === modelEvent;
   const ons = {};
   if (events) {
-    ctor.default.objectEach(events, (func, key) => {
+    index.default.objectEach(events, (func, key) => {
       ons[vn.getOnName(key)] = function(...args) {
         func(params, ...args);
       };
@@ -134,9 +133,9 @@ function getComponentOns(renderOpts, params, eFns, eventOns) {
   const changeEvent = vn.getChangeEvent(renderOpts);
   const { model: modelFunc, change: changeFunc, blur: blurFunc, clear: clearFunc } = eFns || {};
   const ons = {};
-  ctor.default.objectEach(events, (func, key) => {
+  index.default.objectEach(events, (func, key) => {
     ons[vn.getOnName(key)] = function(...args) {
-      if (!ctor.default.isFunction(func)) {
+      if (!index.default.isFunction(func)) {
         log.errLog("vxe.error.errFunc", [func]);
       }
       func(params, ...args);
@@ -304,10 +303,10 @@ function getNativeFilterOns(renderOpts, params, option) {
       }
     },
     change() {
-      updateFilterChangeOption(params, !ctor.default.eqNull(option.data), option);
+      updateFilterChangeOption(params, !index.default.eqNull(option.data), option);
     },
     blur() {
-      updateFilterChangeOption(params, !ctor.default.eqNull(option.data), option);
+      updateFilterChangeOption(params, !index.default.eqNull(option.data), option);
     }
   });
 }
@@ -432,13 +431,13 @@ function oldFilterRender(renderOpts, params) {
 }
 function handleFilterMethod({ option, row, column }) {
   const { data } = option;
-  const cellValue = ctor.default.get(row, column.field);
+  const cellValue = index.default.get(row, column.field);
   return cellValue == data;
 }
 function handleInputFilterMethod({ option, row, column }) {
   const { data } = option;
-  const cellValue = ctor.default.get(row, column.field);
-  return ctor.default.toValueString(cellValue).indexOf(data) > -1;
+  const cellValue = index.default.get(row, column.field);
+  return index.default.toValueString(cellValue).indexOf(data) > -1;
 }
 function nativeSelectEditRender(renderOpts, params) {
   return [
@@ -476,7 +475,7 @@ function handleSelectCellValue(cellValue, renderOpts) {
   const valueProp = optionProps.value || "value";
   if (!(cellValue === null || cellValue === void 0)) {
     let vals = [];
-    if (ctor.default.isArray(cellValue)) {
+    if (index.default.isArray(cellValue)) {
       vals = cellValue;
     } else {
       if (props.multiple && `${cellValue}`.indexOf(",") > -1) {
@@ -485,24 +484,24 @@ function handleSelectCellValue(cellValue, renderOpts) {
         vals = [cellValue];
       }
     }
-    return ctor.default.map(vals, optionGroups ? (value) => {
+    return index.default.map(vals, optionGroups ? (value) => {
       const groupOptions = optionGroupProps.options || "options";
-      for (let index = 0; index < optionGroups.length; index++) {
-        selectItem = ctor.default.find(optionGroups[index][groupOptions], (item) => item[valueProp] == value);
+      for (let index$1 = 0; index$1 < optionGroups.length; index$1++) {
+        selectItem = index.default.find(optionGroups[index$1][groupOptions], (item) => item[valueProp] == value);
         if (selectItem) {
           break;
         }
       }
       return selectItem ? selectItem[labelProp] : value;
     } : (value) => {
-      selectItem = ctor.default.find(options, (item) => item[valueProp] == value);
+      selectItem = index.default.find(options, (item) => item[valueProp] == value);
       return selectItem ? selectItem[labelProp] : value;
     }).join(", ");
   }
   return "";
 }
 function getSelectCellValue(renderOpts, { row, column }) {
-  const cellValue = ctor.default.get(row, column.field);
+  const cellValue = index.default.get(row, column.field);
   return handleSelectCellValue(cellValue, renderOpts);
 }
 function handleExportSelectMethod(params) {
@@ -516,18 +515,18 @@ function handleTreeSelectCellValue(cellValue, renderOpts) {
   const childrenProp = optionProps.children || "children";
   if (!(cellValue === null || cellValue === void 0)) {
     const keyMaps = {};
-    ctor.default.eachTree(options, (item) => {
-      keyMaps[ctor.default.get(item, valueProp)] = item;
+    index.default.eachTree(options, (item) => {
+      keyMaps[index.default.get(item, valueProp)] = item;
     }, { children: childrenProp });
-    return ctor.default.map(ctor.default.isArray(cellValue) ? cellValue : [cellValue], (value) => {
+    return index.default.map(index.default.isArray(cellValue) ? cellValue : [cellValue], (value) => {
       const item = keyMaps[value];
-      return item ? ctor.default.get(item, labelProp) : item;
+      return item ? index.default.get(item, labelProp) : item;
     }).join(", ");
   }
   return "";
 }
 function getTreeSelectCellValue(renderOpts, { row, column }) {
-  const cellValue = ctor.default.get(row, column.field);
+  const cellValue = index.default.get(row, column.field);
   return handleTreeSelectCellValue(cellValue, renderOpts);
 }
 function handleExportTreeSelectMethod(params) {
@@ -538,16 +537,16 @@ function handleNumberCell(renderOpts, params) {
   const { props = {}, showNegativeStatus } = renderOpts;
   const { row, column } = params;
   const { type } = props;
-  let cellValue = ctor.default.get(row, column.field);
+  let cellValue = index.default.get(row, column.field);
   let isNegative = false;
   if (!utils.isEmptyValue(cellValue)) {
     const numberInputConfig = getConfig().numberInput || {};
     if (type === "float") {
       const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
       const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
-      cellValue = ctor.default.toFixed(ctor.default.floor(cellValue, digits), digits);
+      cellValue = index.default.toFixed(index.default.floor(cellValue, digits), digits);
       if (!autoFill) {
-        cellValue = ctor.default.toNumber(cellValue);
+        cellValue = index.default.toNumber(cellValue);
       }
       if (showNegativeStatus) {
         if (cellValue < 0) {
@@ -558,13 +557,13 @@ function handleNumberCell(renderOpts, params) {
       const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
       const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
       const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
-      cellValue = ctor.default.toNumber(cellValue);
+      cellValue = index.default.toNumber(cellValue);
       if (showNegativeStatus) {
         if (cellValue < 0) {
           isNegative = true;
         }
       }
-      cellValue = ctor.default.commafy(cellValue, { digits });
+      cellValue = index.default.commafy(cellValue, { digits });
       if (!autoFill) {
         const [iStr, dStr] = cellValue.split(".");
         if (dStr) {
@@ -577,10 +576,10 @@ function handleNumberCell(renderOpts, params) {
       }
     } else {
       if (type === "integer") {
-        cellValue = ctor.default.toInteger(cellValue);
+        cellValue = index.default.toInteger(cellValue);
       }
       if (showNegativeStatus) {
-        if (ctor.default.toNumber(cellValue) < 0) {
+        if (index.default.toNumber(cellValue) < 0) {
           isNegative = true;
         }
       }
@@ -610,10 +609,10 @@ function handleSetSelectValue(renderOpts, params) {
   if (field) {
     const { options, optionGroups, optionProps = {}, optionGroupProps = {}, props } = renderOpts;
     if (utils.isEmptyValue(cellValue)) {
-      ctor.default.set(row, field, props && props.multiple ? [] : null);
+      index.default.set(row, field, props && props.multiple ? [] : null);
       return;
     }
-    const isMultiVal = ctor.default.indexOf(`${cellValue}`, ",") > -1;
+    const isMultiVal = index.default.indexOf(`${cellValue}`, ",") > -1;
     const labelProp = optionProps.label || "label";
     const valueProp = optionProps.value || "value";
     const labelMpas = {};
@@ -626,7 +625,7 @@ function handleSetSelectValue(renderOpts, params) {
           if (isMultiVal) {
             labelMpas[item[labelProp]] = item;
           } else if (item[labelProp] == cellValue) {
-            ctor.default.set(row, field, item[valueProp]);
+            index.default.set(row, field, item[valueProp]);
             return;
           }
         }
@@ -638,19 +637,19 @@ function handleSetSelectValue(renderOpts, params) {
           if (isMultiVal) {
             labelMpas[item[labelProp]] = item;
           } else if (item[labelProp] == cellValue) {
-            ctor.default.set(row, field, item[valueProp]);
+            index.default.set(row, field, item[valueProp]);
             return;
           }
         }
       }
     }
     if (isMultiVal) {
-      ctor.default.set(row, field, (isMultiVal ? cellValue.split(",") : [cellValue]).map((label) => {
+      index.default.set(row, field, (isMultiVal ? cellValue.split(",") : [cellValue]).map((label) => {
         const item = labelMpas[label];
         return item ? item[valueProp] : label;
       }));
     } else {
-      ctor.default.set(row, field, cellValue);
+      index.default.set(row, field, cellValue);
     }
   }
 }
@@ -666,15 +665,15 @@ function handleSetTreeSelectValue(renderOpts, params) {
     const labelProp = optionProps.label || "label";
     const valueProp = optionProps.value || "value";
     const childrenProp = optionProps.children || "children";
-    const matchRest = ctor.default.findTree(options || [], (item) => ctor.default.get(item, labelProp) === cellValue, { children: childrenProp });
+    const matchRest = index.default.findTree(options || [], (item) => index.default.get(item, labelProp) === cellValue, { children: childrenProp });
     if (matchRest) {
       const selectItem = matchRest.item;
       if (selectItem) {
-        ctor.default.set(row, field, selectItem[valueProp]);
+        index.default.set(row, field, selectItem[valueProp]);
         return;
       }
     }
-    ctor.default.set(row, field, cellValue);
+    index.default.set(row, field, cellValue);
   }
 }
 renderer.mixin({
@@ -717,7 +716,7 @@ renderer.mixin({
       const { row, column } = params;
       const inputConfig = getConfig().input || {};
       const digits = props.digits || inputConfig.digits || 2;
-      let cellValue = ctor.default.get(row, column.field);
+      let cellValue = index.default.get(row, column.field);
       if (cellValue) {
         switch (props.type) {
           case "date":
@@ -728,7 +727,7 @@ renderer.mixin({
             cellValue = getLabelFormatDate(cellValue, props);
             break;
           case "float":
-            cellValue = ctor.default.toFixed(ctor.default.floor(cellValue, digits), digits);
+            cellValue = index.default.toFixed(index.default.floor(cellValue, digits), digits);
             break;
         }
       }
@@ -745,7 +744,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod,
     tableExportMethod(params) {
       const { row, column } = params;
-      const cellValue = ctor.default.get(row, column.field);
+      const cellValue = index.default.get(row, column.field);
       return cellValue;
     }
   },
@@ -757,22 +756,22 @@ renderer.mixin({
       const { props = {} } = renderOpts;
       const { row, column, _columnIndex } = params;
       const { type } = props;
-      const itemValue = ctor.default.isArray(row) ? row[_columnIndex] : ctor.default.get(row, column.field);
-      if (ctor.default.isNumber(itemValue)) {
+      const itemValue = index.default.isArray(row) ? row[_columnIndex] : index.default.get(row, column.field);
+      if (index.default.isNumber(itemValue)) {
         const numberInputConfig = getConfig().numberInput || {};
         if (type === "float") {
           const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
           const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
-          let amountLabel = ctor.default.toFixed(ctor.default.floor(itemValue, digits), digits);
+          let amountLabel = index.default.toFixed(index.default.floor(itemValue, digits), digits);
           if (!autoFill) {
-            amountLabel = ctor.default.toNumber(amountLabel);
+            amountLabel = index.default.toNumber(amountLabel);
           }
           return amountLabel;
         } else if (type === "amount") {
           const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
           const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
           const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
-          let amountLabel = ctor.default.commafy(ctor.default.toNumber(itemValue), { digits });
+          let amountLabel = index.default.commafy(index.default.toNumber(itemValue), { digits });
           if (!autoFill) {
             const [iStr, dStr] = amountLabel.split(".");
             if (dStr) {
@@ -795,7 +794,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod,
     tableExportMethod(params) {
       const { row, column } = params;
-      const cellValue = ctor.default.get(row, column.field);
+      const cellValue = index.default.get(row, column.field);
       return cellValue;
     }
   },
@@ -805,7 +804,7 @@ renderer.mixin({
     renderTableCell(renderOpts, params) {
       const { props = {} } = renderOpts;
       const { row, column } = params;
-      let cellValue = ctor.default.get(row, column.field);
+      let cellValue = index.default.get(row, column.field);
       if (cellValue) {
         if (props.type !== "time") {
           cellValue = getLabelFormatDate(cellValue, props);
@@ -830,16 +829,16 @@ renderer.mixin({
       const seProps = {};
       const seOs = {};
       if (startField && endField) {
-        seProps.startValue = ctor.default.get(row, startField);
-        seProps.endValue = ctor.default.get(row, endField);
+        seProps.startValue = index.default.get(row, startField);
+        seProps.endValue = index.default.get(row, endField);
         seOs["onUpdate:startValue"] = (value) => {
           if (startField) {
-            ctor.default.set(row, startField, value);
+            index.default.set(row, startField, value);
           }
         };
         seOs["onUpdate:endValue"] = (value) => {
           if (endField) {
-            ctor.default.set(row, endField, value);
+            index.default.set(row, endField, value);
           }
         };
       }
@@ -865,12 +864,12 @@ renderer.mixin({
       let startValue = "";
       let endValue = "";
       if (startField && endField) {
-        startValue = ctor.default.get(row, startField);
-        endValue = ctor.default.get(row, endField);
+        startValue = index.default.get(row, startField);
+        endValue = index.default.get(row, endField);
       } else {
-        const cellValue = ctor.default.get(row, column.field);
+        const cellValue = index.default.get(row, column.field);
         if (cellValue) {
-          if (ctor.default.isArray(cellValue)) {
+          if (index.default.isArray(cellValue)) {
             startValue = cellValue[0];
             endValue = cellValue[1];
           } else {
@@ -892,7 +891,7 @@ renderer.mixin({
     renderTableEdit: defaultEditRender,
     renderTableCell(renderOpts, params) {
       const { row, column } = params;
-      const cellValue = ctor.default.get(row, column.field);
+      const cellValue = index.default.get(row, column.field);
       return getCellLabelVNs(renderOpts, params, cellValue);
     }
   },
@@ -952,7 +951,7 @@ renderer.mixin({
       const { href } = props || {};
       const cellLabel = $table.getCellLabel(row, column);
       return [
-        vue.h(getDefaultComponent(renderOpts), Object.assign(Object.assign(Object.assign({}, props || {}), { content: cellLabel, href: ctor.default.toFormatString(href, params) }), getComponentOns(renderOpts, params)))
+        vue.h(getDefaultComponent(renderOpts), Object.assign(Object.assign(Object.assign({}, props || {}), { content: cellLabel, href: index.default.toFormatString(href, params) }), getComponentOns(renderOpts, params)))
       ];
     }
   },
@@ -1027,7 +1026,7 @@ renderer.mixin({
     },
     renderTableCell(renderOpts, params) {
       const { row, column } = params;
-      const cellValue = ctor.default.get(row, column.field);
+      const cellValue = index.default.get(row, column.field);
       return vue.h("span", {
         class: "vxe-color-picker--readonly"
       }, [
@@ -1052,7 +1051,7 @@ renderer.mixin({
     },
     renderTableCell(renderOpts, params) {
       const { row, column } = params;
-      const cellValue = ctor.default.get(row, column.field);
+      const cellValue = index.default.get(row, column.field);
       return vue.h("i", {
         class: cellValue
       });
@@ -1122,7 +1121,7 @@ renderer.mixin({
       const { props = {} } = renderOpts;
       const { row, column } = params;
       const digits = props.digits || ((_a = getConfig().input) === null || _a === void 0 ? void 0 : _a.digits) || 2;
-      let cellValue = ctor.default.get(row, column.field);
+      let cellValue = index.default.get(row, column.field);
       if (cellValue) {
         switch (props.type) {
           case "date":
@@ -1132,7 +1131,7 @@ renderer.mixin({
             cellValue = getLabelFormatDate(cellValue, props);
             break;
           case "float":
-            cellValue = ctor.default.toFixed(ctor.default.floor(cellValue, digits), digits);
+            cellValue = index.default.toFixed(index.default.floor(cellValue, digits), digits);
             break;
         }
       }

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

@@ -2,14 +2,13 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const comp = require("../../ui/src/comp.js");
-require("../../../../xe-utils/es/index.esm.js");
+const index = require("../../../../../_virtual/index2.js");
 require("../../ui/index.js");
 const util = require("./util.js");
 const dom = require("../../ui/src/dom.js");
 const utils = require("../../ui/src/utils.js");
 const vn = require("../../ui/src/vn.js");
 const index_esm = require("../../../../@vxe-ui/core/es/index.esm.js");
-const ctor = require("../../../../xe-utils/es/ctor.js");
 const { getI18n, renderer, renderEmptyElement } = index_esm.VxeUI;
 const sourceType = "table";
 const renderType = "body";
@@ -38,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;
@@ -98,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;
@@ -118,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] || {};
@@ -134,21 +132,21 @@ const TableBodyComponent = comp.defineVxeComponent({
       const isEdit = utils.isEnableConf(editRender);
       const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
       let fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
-      const isCellPadding = ctor.default.eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
-      const cellOverflow = ctor.default.eqNull(showOverflow) ? allShowOverflow : showOverflow;
+      const isCellPadding = index.default.eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
+      const cellOverflow = index.default.eqNull(showOverflow) ? allShowOverflow : showOverflow;
       const showEllipsis = cellOverflow === "ellipsis";
       const showTitle = cellOverflow === "title";
       const showTooltip = cellOverflow === true || cellOverflow === "tooltip";
       const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis;
-      const showResizable = ctor.default.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
+      const showResizable = index.default.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
       const isCsHeight = !!customCellHeight;
       const isRsHeight = resizeHeight > 0;
       let isDirty;
       const tdOns = {};
       const cellAlign = align || (compConf ? compConf.tableCellAlign : "") || allAlign;
-      const cellVerticalAlign = ctor.default.eqNull(verticalAlign) ? allVerticalAlign : verticalAlign;
+      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,
@@ -260,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);
@@ -290,8 +288,8 @@ const TableBodyComponent = comp.defineVxeComponent({
       if (hasEllipsis && resizeWidthFlag) {
         let mergeColWidth = 0;
         if (mergeColspan > 1) {
-          for (let index = 1; index < mergeColspan; index++) {
-            const nextColumn = visibleColumn[columnIndex + index];
+          for (let index2 = 1; index2 < mergeColspan; index2++) {
+            const nextColumn = visibleColumn[columnIndex + index2];
             if (nextColumn) {
               mergeColWidth += nextColumn.renderWidth;
             }
@@ -319,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", {
@@ -336,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;
@@ -406,19 +402,18 @@ 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),
         dom.getPropClass(className, cellParams),
         dom.getPropClass(allCellClassName, cellParams)
-      ], key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex }, tdAttrs), { style: Object.assign({}, ctor.default.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, ctor.default.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle) }), tdOns), isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
+      ], key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex }, tdAttrs), { style: Object.assign({}, index.default.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, index.default.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle) }), tdOns), isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
     };
     const renderRows = (fixedType, isOptimizeMode, tableData, tableColumn) => {
       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;
@@ -512,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 ? ctor.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}`,
@@ -533,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`
                 }
               })
             ]));
@@ -548,7 +536,7 @@ const TableBodyComponent = comp.defineVxeComponent({
             const { showOverflow } = expandColumn || {};
             const colid = expandColumn.id;
             const colRest = fullColumnIdData[colid] || {};
-            const hasEllipsis = ctor.default.eqNull(showOverflow) ? isAllOverflow : showOverflow;
+            const hasEllipsis = index.default.eqNull(showOverflow) ? isAllOverflow : showOverflow;
             let columnIndex = -1;
             let $columnIndex = -1;
             let _columnIndex = -1;