@fecp/designer 5.4.106 → 5.4.107

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

@@ -78,7 +78,6 @@ function createInternalData() {
     fullDataRowIdData: {},
     // 数据集（仅可视）
     visibleDataRowIdData: {},
-    keepUpdateFieldMaps: {},
     footerFullDataRowData: {},
     // 渲染中缓存数据
     sourceDataRowIdData: {},
@@ -89,22 +88,16 @@ function createInternalData() {
     mergeHeaderMaps: {},
     // 已合并单元格数据集合
     mergeHeaderCellMaps: {},
-    mergeHeaderRowMaps: {},
-    mergeHeaderColMaps: {},
     // 合并单元格的数据
     mergeBodyList: [],
     mergeBodyMaps: {},
     // 已合并单元格数据集合
     mergeBodyCellMaps: {},
-    mergeBodyRowMaps: {},
-    mergeBodyColMaps: {},
     // 合并表尾的数据
     mergeFooterList: [],
     mergeFooterMaps: {},
     // 已合并表尾数据集合
     mergeFooterCellMaps: {},
-    mergeFooterRowMaps: {},
-    mergeFooterColMaps: {},
     // 已展开的行集合
     rowExpandedMaps: {},
     // 懒加载中的展开行的集合
@@ -132,254 +125,10 @@ function createInternalData() {
     tFooterHeight: 0,
     teleportToWrapperElem: null,
     popupToWrapperElem: null,
-    lastSTime: 0,
     inited: false,
     tooltipTimeout: null,
     initStatus: false,
     isActivated: false
-    // _sToTime: null
-  };
-}
-function createReactData() {
-  return {
-    updateColFlag: 0,
-    // 低性能的静态列
-    staticColumns: [],
-    // 渲染的列分组
-    tableGroupColumn: [],
-    // 可视区渲染的列
-    tableColumn: [],
-    // 渲染中的数据
-    tableData: [],
-    // 是否启用了横向 X 可视渲染方式加载
-    scrollXLoad: false,
-    // 是否启用了纵向 Y 可视渲染方式加载
-    scrollYLoad: false,
-    // 是否存在纵向滚动条
-    overflowY: true,
-    // 是否存在横向滚动条
-    overflowX: false,
-    // 纵向滚动条的宽度
-    scrollbarWidth: 0,
-    // 横向滚动条的高度
-    scrollbarHeight: 0,
-    // 行高
-    rowHeight: 0,
-    // 表格父容器的高度
-    parentHeight: 0,
-    // 是否使用分组表头
-    isGroup: false,
-    isAllOverflow: false,
-    // 复选框属性，是否全选
-    isAllSelected: false,
-    // 复选框属性，有选中且非全选状态
-    isIndeterminate: false,
-    // 当前行
-    currentRow: null,
-    // 单选框属性，选中列
-    currentColumn: null,
-    // 单选框属性，选中行
-    selectRadioRow: null,
-    // 表尾合计数据
-    footerTableData: [],
-    // 行分组列信息
-    rowGroupColumn: null,
-    // 展开列信息
-    expandColumn: null,
-    checkboxColumn: null,
-    radioColumn: null,
-    // 树节点列信息
-    treeNodeColumn: null,
-    hasFixedColumn: false,
-    // 刷新列标识，当列筛选被改变时，触发表格刷新数据
-    upDataFlag: 0,
-    // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
-    reColumnFlag: 0,
-    // 初始化标识
-    initStore: {
-      filter: false,
-      import: false,
-      export: false,
-      custom: false
-    },
-    // 自定义列相关的信息
-    customStore: {
-      btnEl: null,
-      isAll: false,
-      isIndeterminate: false,
-      activeBtn: false,
-      activeWrapper: false,
-      visible: false,
-      maxHeight: null,
-      popupTop: 0,
-      oldSortMaps: {},
-      oldFixedMaps: {},
-      oldVisibleMaps: {}
-    },
-    customColumnList: [],
-    // 当前选中的筛选列
-    filterStore: {
-      isAllSelected: false,
-      isIndeterminate: false,
-      style: null,
-      column: null,
-      visible: false,
-      maxHeight: null
-    },
-    // 存放列相关的信息
-    columnStore: {
-      leftList: [],
-      centerList: [],
-      rightList: [],
-      resizeList: [],
-      pxList: [],
-      pxMinList: [],
-      autoMinList: [],
-      scaleList: [],
-      scaleMinList: [],
-      autoList: [],
-      remainList: []
-    },
-    // 存放快捷菜单的信息
-    ctxMenuStore: {
-      selected: null,
-      visible: false,
-      showChild: false,
-      selectChild: null,
-      list: [],
-      style: null
-    },
-    // 存放可编辑相关信息
-    editStore: {
-      indexs: {
-        columns: []
-      },
-      titles: {
-        columns: []
-      },
-      // 选中源
-      selected: {
-        row: null,
-        column: null
-      },
-      // 已复制源
-      copyed: {
-        cut: false,
-        rows: [],
-        columns: []
-      },
-      // 激活
-      actived: {
-        row: null,
-        column: null
-      },
-      // 当前被强制聚焦单元格，只会在鼠标点击后算聚焦
-      focused: {
-        row: null,
-        column: null
-      }
-    },
-    // 存放 tooltip 相关信息
-    tooltipStore: {
-      row: null,
-      column: null,
-      content: null,
-      visible: false,
-      type: null,
-      currOpts: {}
-    },
-    // 存放数据校验相关信息
-    validStore: {
-      visible: false
-    },
-    validErrorMaps: {},
-    // 导入相关信息
-    importStore: {
-      inited: false,
-      file: null,
-      type: "",
-      modeList: [],
-      typeList: [],
-      filename: "",
-      visible: false
-    },
-    importParams: {
-      mode: "",
-      types: null,
-      message: true
-    },
-    // 导出相关信息
-    exportStore: {
-      inited: false,
-      name: "",
-      modeList: [],
-      typeList: [],
-      columns: [],
-      isPrint: false,
-      hasFooter: false,
-      hasMerge: false,
-      hasTree: false,
-      hasColgroup: false,
-      visible: false
-    },
-    exportParams: {
-      filename: "",
-      sheetName: "",
-      mode: "",
-      type: "",
-      isColgroup: false,
-      isMerge: false,
-      isAllExpand: false,
-      useStyle: false,
-      original: false,
-      message: true,
-      isHeader: false,
-      isTitle: false,
-      isFooter: false
-    },
-    visiblwRowsFlag: 1,
-    isRowGroupStatus: false,
-    rowGroupList: [],
-    aggHandleFields: [],
-    aggHandleAggColumns: [],
-    rowGroupExpandedFlag: 1,
-    rowExpandedFlag: 1,
-    treeExpandedFlag: 1,
-    updateCheckboxFlag: 1,
-    pendingRowFlag: 1,
-    insertRowFlag: 1,
-    removeRowFlag: 1,
-    mergeHeadFlag: 1,
-    mergeBodyFlag: 1,
-    mergeFootFlag: 1,
-    rowHeightStore: {
-      large: 52,
-      default: 48,
-      medium: 44,
-      small: 40,
-      mini: 36
-    },
-    scrollVMLoading: false,
-    scrollYHeight: 0,
-    scrollYTop: 0,
-    isScrollYBig: false,
-    scrollXLeft: 0,
-    scrollXWidth: 0,
-    isScrollXBig: false,
-    lazScrollLoading: false,
-    rowExpandHeightFlag: 1,
-    calcCellHeightFlag: 1,
-    resizeHeightFlag: 1,
-    resizeWidthFlag: 1,
-    isCustomStatus: false,
-    isCrossDragRow: false,
-    dragRow: null,
-    isCrossDragCol: false,
-    dragCol: null,
-    dragTipText: "",
-    isDragResize: false,
-    isRowLoading: false,
-    isColLoading: false
   };
 }
 const getAllConvertColumns = (columns, parentColumn) => {
@@ -517,13 +266,6 @@ function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
 function getRowUniqueId() {
   return index.default.uniqueId("row_");
 }
-function createRowId(rowOpts, row, keyField) {
-  const { createKeyMethod } = rowOpts;
-  if (createKeyMethod) {
-    return createKeyMethod({ row, keyField });
-  }
-  return getRowUniqueId();
-}
 function hasDeepKey(rowKey) {
   return rowKey.indexOf(".") > -1;
 }
@@ -539,13 +281,11 @@ function getRowid($xeTable, row) {
 function createHandleUpdateRowId($xeTable) {
   const internalData = $xeTable.internalData;
   const { isCurrDeepKey, currKeyField } = internalData;
-  const { computeRowOpts } = $xeTable.getComputeMaps();
-  const rowOpts = computeRowOpts.value;
   const updateRId = isCurrDeepKey ? updateDeepRowKey : updateFastRowKey;
   return {
     rowKey: currKeyField,
     handleUpdateRowId(row) {
-      return row ? updateRId(rowOpts, row, currKeyField) : "";
+      return row ? updateRId(row, currKeyField) : "";
     }
   };
 }
@@ -566,11 +306,10 @@ function encodeRowid(rowVal) {
 function getDeepRowIdByKey(row, rowKey) {
   return index.default.get(row, rowKey);
 }
-function updateDeepRowKey(rowOpts, row, rowKey) {
+function updateDeepRowKey(row, rowKey) {
   let rowid = encodeRowid(getDeepRowIdByKey(row, rowKey));
   if (utils.eqEmptyValue(rowid)) {
-    const newRowid = createRowId(rowOpts, row, rowKey);
-    rowid = "" + newRowid;
+    rowid = getRowUniqueId();
     index.default.set(row, rowKey, rowid);
   }
   return rowid;
@@ -578,12 +317,11 @@ function updateDeepRowKey(rowOpts, row, rowKey) {
 function getFastRowIdByKey(row, rowKey) {
   return row[rowKey];
 }
-function updateFastRowKey(rowOpts, row, rowKey) {
+function updateFastRowKey(row, rowKey) {
   let rowid = encodeRowid(getFastRowIdByKey(row, rowKey));
   if (utils.eqEmptyValue(rowid)) {
-    const newRowid = createRowId(rowOpts, row, rowKey);
-    rowid = "" + newRowid;
-    row[rowKey] = newRowid;
+    rowid = getRowUniqueId();
+    row[rowKey] = rowid;
   }
   return rowid;
 }
@@ -820,10 +558,12 @@ function clearTableAllStatus($xeTable) {
   return clearTableDefaultStatus($xeTable);
 }
 function rowToVisible($xeTable, row) {
+  const tableProps = $xeTable.props;
   const reactData = $xeTable.reactData;
   const internalData = $xeTable.internalData;
   const { computeLeftFixedWidth, computeRightFixedWidth, computeRowOpts, computeCellOpts, computeDefaultRowHeight } = $xeTable.getComputeMaps();
-  const { scrollYLoad, scrollYTop, isAllOverflow } = reactData;
+  const { showOverflow } = tableProps;
+  const { scrollYLoad, scrollYTop } = reactData;
   const { elemStore, afterFullData, fullAllDataRowIdData, isResizeCellHeight } = internalData;
   const rowOpts = computeRowOpts.value;
   const cellOpts = computeCellOpts.value;
@@ -847,7 +587,7 @@ function rowToVisible($xeTable, row) {
     } else {
       if (scrollYLoad) {
         const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-        if (!isCustomCellHeight && isAllOverflow) {
+        if (!isCustomCellHeight && showOverflow) {
           return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * defaultRowHeight);
         }
         const rowRest = fullAllDataRowIdData[rowid] || {};
@@ -862,7 +602,7 @@ function rowToVisible($xeTable, row) {
   }
   return Promise.resolve();
 }
-function colToVisible($xeTable, isForce, column, row) {
+function colToVisible($xeTable, column, row) {
   const reactData = $xeTable.reactData;
   const internalData = $xeTable.internalData;
   const { computeLeftFixedWidth, computeRightFixedWidth } = $xeTable.getComputeMaps();
@@ -888,30 +628,26 @@ function colToVisible($xeTable, isForce, column, row) {
     if (tdElem) {
       const tdOffsetLeft = tdElem.offsetLeft + (scrollXLoad ? scrollXLeft : 0);
       const cellWidth = tdElem.clientWidth;
-      if (isForce || !(tdOffsetLeft <= bodyScrollLeft + leftFixedWidth && tdOffsetLeft + cellWidth > bodyScrollLeft + leftFixedWidth) && !(tdOffsetLeft >= bodyScrollLeft + leftFixedWidth && tdOffsetLeft < bodyScrollLeft + bodyWidth - rightFixedWidth)) {
-        if (tdOffsetLeft < bodyScrollLeft + leftFixedWidth) {
-          return $xeTable.scrollTo(tdOffsetLeft - leftFixedWidth - 1);
-        } else if (tdOffsetLeft + cellWidth - bodyScrollLeft > bodyWidth - rightFixedWidth) {
-          return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
-        }
+      if (tdOffsetLeft < bodyScrollLeft + leftFixedWidth) {
+        return $xeTable.scrollTo(tdOffsetLeft - leftFixedWidth - 1);
+      } else if (tdOffsetLeft + cellWidth - bodyScrollLeft > bodyWidth - rightFixedWidth) {
+        return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
       }
     } else {
       if (scrollXLoad) {
-        let tdOffsetLeft = 0;
+        let scrollLeft = 0;
         const cellWidth = column.renderWidth;
         for (let i = 0; i < visibleColumn.length; i++) {
           const currCol = visibleColumn[i];
           if (currCol === column || currCol.id === column.id) {
             break;
           }
-          tdOffsetLeft += currCol.renderWidth;
+          scrollLeft += currCol.renderWidth;
         }
-        if (isForce || !(tdOffsetLeft <= bodyScrollLeft + leftFixedWidth && tdOffsetLeft + cellWidth > bodyScrollLeft + leftFixedWidth) && !(tdOffsetLeft >= bodyScrollLeft + leftFixedWidth && tdOffsetLeft < bodyScrollLeft + bodyWidth - rightFixedWidth)) {
-          if (tdOffsetLeft < bodyScrollLeft) {
-            return $xeTable.scrollTo(tdOffsetLeft - leftFixedWidth - 1);
-          }
-          return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
+        if (scrollLeft < bodyScrollLeft) {
+          return $xeTable.scrollTo(scrollLeft - leftFixedWidth - 1);
         }
+        return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
       }
     }
   }
@@ -927,8 +663,6 @@ exports.createColumn = createColumn;
 exports.createHandleGetRowId = createHandleGetRowId;
 exports.createHandleUpdateRowId = createHandleUpdateRowId;
 exports.createInternalData = createInternalData;
-exports.createReactData = createReactData;
-exports.createRowId = createRowId;
 exports.destroyColumn = destroyColumn;
 exports.encodeRowid = encodeRowid;
 exports.getCalcHeight = getCalcHeight;
@@ -952,4 +686,6 @@ exports.rowToVisible = rowToVisible;
 exports.setCellValue = setCellValue;
 exports.toFilters = toFilters;
 exports.toTreePathSeq = toTreePathSeq;
+exports.updateDeepRowKey = updateDeepRowKey;
+exports.updateFastRowKey = updateFastRowKey;
 exports.watchColumn = watchColumn;

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

@@ -8,13 +8,6 @@ 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 { getConfig, getIcon, getI18n, renderer, commands, createEvent, useFns } = index_esm.VxeUI;
-function createReactData() {
-  return {
-    isRefresh: false,
-    connectFlag: 0,
-    columns: []
-  };
-}
 function createInternalData() {
   return {
     connectTable: null
@@ -66,7 +59,11 @@ const VxeToolbarComponent = comp.defineVxeComponent({
     const $xeGantt = vue.inject("$xeGantt", null);
     const $xeGGWrapper = $xeGrid || $xeGantt;
     const { computeSize } = useFns.useSize(props);
-    const reactData = vue.reactive(createReactData());
+    const reactData = vue.reactive({
+      isRefresh: false,
+      connectFlag: 0,
+      columns: []
+    });
     const internalData = createInternalData();
     const refElem = vue.ref();
     const refMaps = {
@@ -574,8 +571,7 @@ const VxeToolbarComponent = comp.defineVxeComponent({
         }
       }
     });
-    vue.onBeforeUnmount(() => {
-      index.default.assign(reactData, createReactData());
+    vue.onUnmounted(() => {
       index.default.assign(internalData, createInternalData());
     });
     return $xeToolbar;

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

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const index_esm = require("../../../@vxe-ui/core/es/index.esm.js");
 const utils = require("./src/utils.js");
-const version = "4.18.10";
+const version = "4.17.47";
 index_esm.VxeUI.version = version;
 index_esm.VxeUI.tableVersion = version;
 index_esm.VxeUI.setConfig({
@@ -41,12 +41,6 @@ index_esm.VxeUI.setConfig({
       isSyncAutoWidth: true,
       minHeight: 18
     },
-    currentRowConfig: {
-      strict: true
-    },
-    currentColumnConfig: {
-      strict: true
-    },
     radioConfig: {
       // trigger: 'default'
       strict: true
@@ -68,8 +62,7 @@ index_esm.VxeUI.setConfig({
       strict: true
     },
     tooltipConfig: {
-      enterable: true,
-      defaultPlacement: "top"
+      enterable: true
     },
     headerTooltipConfig: {
       enterable: true
@@ -78,7 +71,7 @@ index_esm.VxeUI.setConfig({
       enterable: true
     },
     validConfig: {
-      showErrorMessage: true,
+      showMessage: true,
       autoClear: true,
       autoPos: true,
       message: "inline",
@@ -157,8 +150,7 @@ index_esm.VxeUI.setConfig({
       // transfer: false,
       destroyOnClose: true,
       multiple: true,
-      showIcon: true,
-      maxHeight: 280
+      showIcon: true
     },
     floatingFilterConfig: {
       // enabled: false

package/lib/node_modules/vxe-table/es/ui/src/dom.js

@@ -151,27 +151,6 @@ function triggerEvent(targetElem, type) {
     targetElem.dispatchEvent(new Event(type));
   }
 }
-let wtlFrame;
-function wheelScrollLeftTo(scrollLeft, cb) {
-  if (wtlFrame) {
-    cancelAnimationFrame(wtlFrame);
-  }
-  wtlFrame = requestAnimationFrame(() => {
-    cb(scrollLeft);
-    wtlFrame = null;
-  });
-}
-let wtaFrame;
-function wheelScrollTopTo(diffNum, cb) {
-  if (wtaFrame) {
-    cancelAnimationFrame(wtaFrame);
-  }
-  wtaFrame = requestAnimationFrame(() => {
-    const offsetTop = diffNum;
-    cb(offsetTop);
-    wtaFrame = null;
-  });
-}
 exports.addClass = addClass;
 exports.checkTargetElement = checkTargetElement;
 exports.getAbsolutePos = getAbsolutePos;
@@ -194,5 +173,3 @@ exports.setScrollTop = setScrollTop;
 exports.toCssUnit = toCssUnit;
 exports.triggerEvent = triggerEvent;
 exports.updateCellTitle = updateCellTitle;
-exports.wheelScrollLeftTo = wheelScrollLeftTo;
-exports.wheelScrollTopTo = wheelScrollTopTo;

package/lib/node_modules/vxe-table/es/ui/src/log.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const index_esm = require("../../../../@vxe-ui/core/es/index.esm.js");
 const { log } = index_esm.VxeUI;
-const version = `table v${"4.18.10"}`;
+const version = `table v${"4.17.47"}`;
 const warnLog = log.create("warn", version);
 const errLog = log.create("error", version);
 exports.errLog = errLog;

package/lib/packages/mobile/src/components/dataDisplay/table/Table.vue.js

@@ -5,9 +5,9 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                  */
 ;/* empty css                                               */
 const vue = require("vue");
-require("../../../../node_modules/vxe-table/es/components.js");
+require("../../../../../../node_modules/vxe-table/es/components.js");
 const dataSourceUtil = require("../../../utils/dataSourceUtil.js");
-;/* empty css                                                */
+;/* empty css                                                      */
 const formatterUtil = require("../../../utils/formatterUtil.js");
 ;/* empty css                                                     */
 ;/* empty css                                                */
@@ -19,7 +19,7 @@ const formatterUtil = require("../../../utils/formatterUtil.js");
 ;/* empty css                                                 */
 ;/* empty css            */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
-const index$4 = require("../../../../node_modules/vxe-table/es/grid/index.js");
+const index$4 = require("../../../../../../node_modules/vxe-table/es/grid/index.js");
 const index = require("../../../../node_modules/vant/es/swipe-cell/index.js");
 const index$1 = require("../../../../node_modules/vant/es/button/index.js");
 const functionCall = require("../../../../node_modules/vant/es/dialog/function-call.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.4.106",
+  "version": "5.4.107",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [