ele-admin-plus 1.3.0-beta.2 → 1.3.0-beta.3

package/lib/ele-pro-form-builder/components/table-util.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const core = require("../../utils/core");
-const util = require("../util");
+const buildCore = require("./build-core");
 function getTableFormItemByTd(tdFormItemId, formItems) {
   let tableFormItem;
   let tdFormItem;
@@ -305,7 +305,7 @@ function deleteTableGridCol(gridData, deleteColIndex) {
   computeTableGridSpan(gridData);
   return deleteItemIds;
 }
-function getTableGridEffects(gridData, formItems) {
+function getTableGridEffects(gridData, formItems, componentData) {
   const addItems = [];
   const updateItems = [];
   const addedKeys = [];
@@ -314,9 +314,14 @@ function getTableGridEffects(gridData, formItems) {
       const rowspanChanged = gridItem.newRowspan != null && gridItem.oldRowspan != null && gridItem.newRowspan !== gridItem.oldRowspan;
       const colspanChanged = gridItem.newColspan != null && gridItem.oldColspan != null && gridItem.newColspan !== gridItem.oldColspan;
       if ((rowspanChanged || colspanChanged) && gridItem.itemId == null && gridItem.newRowspan !== 0 && gridItem.newColspan !== 0) {
-        const tdKey = util.generateUniqueItemKey(formItems, addedKeys);
+        const tdKey = buildCore.generateUniqueItemKey(formItems, addedKeys);
         addedKeys.push(tdKey);
-        const childTd = util.generateChildFormItem("tableRow", void 0, tdKey);
+        const childTd = buildCore.generateChildFormItem(
+          "tableRow",
+          void 0,
+          tdKey,
+          componentData
+        );
         const index = gridRow.children.filter(
           (cell, i) => i < gridItemIndex && cell.colspan !== 0 && cell.rowspan !== 0
         ).length;
@@ -393,12 +398,17 @@ function getTableColInsertIndex(gridData, tdFormItem, position) {
   }
   return { insertIndex: defaultIndex };
 }
-function generateAddTableRowData(tableFormItem, formItems, tdFormItem, position) {
+function generateAddTableRowData(tableFormItem, formItems, tdFormItem, position, componentData) {
   var _a;
   const addItems = [];
-  const trKey = util.generateUniqueItemKey(formItems);
+  const trKey = buildCore.generateUniqueItemKey(formItems);
   const addedKeys = [trKey];
-  const childTr = util.generateChildFormItem(tableFormItem.type, void 0, trKey);
+  const childTr = buildCore.generateChildFormItem(
+    tableFormItem.type,
+    void 0,
+    trKey,
+    componentData
+  );
   const gridData = generateTableGrid(tableFormItem.children);
   const { trFormItemIndex, insertIndex } = getTableRowInsertIndex(
     gridData,
@@ -413,9 +423,14 @@ function generateAddTableRowData(tableFormItem, formItems, tdFormItem, position)
   computeTableGridSpan(gridData, true);
   gridData[insertIndex].children.forEach((gridItem) => {
     if (gridItem.rowspan !== 0 && gridItem.colspan !== 0) {
-      const tdKey = util.generateUniqueItemKey(formItems, addedKeys);
+      const tdKey = buildCore.generateUniqueItemKey(formItems, addedKeys);
       addedKeys.push(tdKey);
-      const childTd = util.generateChildFormItem("tableRow", void 0, tdKey);
+      const childTd = buildCore.generateChildFormItem(
+        "tableRow",
+        void 0,
+        tdKey,
+        componentData
+      );
       if (childTr.children) {
         childTr.children.push(childTd);
       } else {
@@ -428,13 +443,14 @@ function generateAddTableRowData(tableFormItem, formItems, tdFormItem, position)
     parentItemId: tableFormItem.key,
     index: insertIndex
   });
-  return {
-    addItems,
-    updateItems: getTableGridEffects(gridData).updateItems,
-    deleteItemIds: []
-  };
+  const updateItems = getTableGridEffects(
+    gridData,
+    void 0,
+    componentData
+  ).updateItems;
+  return { addItems, updateItems, deleteItemIds: [] };
 }
-function generateAddTableColData(tableFormItem, formItems, tdFormItem, position) {
+function generateAddTableColData(tableFormItem, formItems, tdFormItem, position, componentData) {
   var _a;
   const addItems = [];
   if (!((_a = tableFormItem.children) == null ? void 0 : _a.length)) {
@@ -442,7 +458,8 @@ function generateAddTableColData(tableFormItem, formItems, tdFormItem, position)
       tableFormItem,
       formItems,
       tdFormItem,
-      position
+      position,
+      componentData
     );
   }
   const gridData = generateTableGrid(tableFormItem.children);
@@ -459,27 +476,33 @@ function generateAddTableColData(tableFormItem, formItems, tdFormItem, position)
   gridData.forEach((gridRow) => {
     const gridItem = gridRow.children[insertIndex];
     if (gridItem.rowspan !== 0 && gridItem.colspan !== 0) {
-      const tdKey = util.generateUniqueItemKey(formItems, addedKeys);
+      const tdKey = buildCore.generateUniqueItemKey(formItems, addedKeys);
       addedKeys.push(tdKey);
-      const childTd = util.generateChildFormItem("tableRow", void 0, tdKey);
+      const childTd = buildCore.generateChildFormItem(
+        "tableRow",
+        void 0,
+        tdKey,
+        componentData
+      );
       const index = gridRow.children.filter(
         (cell, i) => i < insertIndex && cell.colspan !== 0 && cell.rowspan !== 0
       ).length;
       addItems.push({ item: childTd, parentItemId: gridRow.itemId, index });
     }
   });
-  return {
-    addItems,
-    updateItems: getTableGridEffects(gridData).updateItems,
-    deleteItemIds: []
-  };
+  const updateItems = getTableGridEffects(
+    gridData,
+    void 0,
+    componentData
+  ).updateItems;
+  return { addItems, updateItems, deleteItemIds: [] };
 }
-function getTableSplitEffects(tableFormItem, formItems, tdFormItem) {
+function getTableSplitEffects(tableFormItem, formItems, tdFormItem, componentData) {
   const gridData = generateTableGrid(tableFormItem.children);
   splitTableGridCell(gridData, tdFormItem.key);
-  return getTableGridEffects(gridData, formItems);
+  return getTableGridEffects(gridData, formItems, componentData);
 }
-function getTableDeleteRowEffects(tableFormItem, formItems, deleteRowIndex) {
+function getTableDeleteRowEffects(tableFormItem, formItems, deleteRowIndex, componentData) {
   const gridData = generateTableGrid(tableFormItem.children);
   if (!gridData.length || gridData.length === 1) {
     return {
@@ -489,11 +512,11 @@ function getTableDeleteRowEffects(tableFormItem, formItems, deleteRowIndex) {
     };
   }
   const deleteItemIds = deleteTableGridRow(gridData, deleteRowIndex);
-  const result = getTableGridEffects(gridData, formItems);
+  const result = getTableGridEffects(gridData, formItems, componentData);
   result.deleteItemIds = deleteItemIds;
   return result;
 }
-function getTableDeleteColEffects(tableFormItem, formItems, tdFormItem) {
+function getTableDeleteColEffects(tableFormItem, formItems, tdFormItem, componentData) {
   const gridData = generateTableGrid(tableFormItem.children);
   if (!gridData.length || !gridData[0].children.length || gridData[0].children.length === 1) {
     return {
@@ -510,11 +533,11 @@ function getTableDeleteColEffects(tableFormItem, formItems, tdFormItem) {
     return { addItems: [], updateItems: [], deleteItemIds: [] };
   }
   const deleteItemIds = deleteTableGridCol(gridData, deleteColIndex);
-  const result = getTableGridEffects(gridData, formItems);
+  const result = getTableGridEffects(gridData, formItems, componentData);
   result.deleteItemIds = deleteItemIds;
   return result;
 }
-function getTableMergeRightEffects(tableFormItem, formItems, tdFormItem) {
+function getTableMergeRightEffects(tableFormItem, formItems, tdFormItem, componentData) {
   var _a, _b, _c, _d;
   const gridData = generateTableGrid(tableFormItem.children);
   const { tdFormItemIndex, insertIndex, trFormItemIndex } = getTableColInsertIndex(gridData, tdFormItem);
@@ -545,7 +568,7 @@ function getTableMergeRightEffects(tableFormItem, formItems, tdFormItem) {
     deleteItemIds.push(itemId);
   });
   computeTableGridSpan(gridData);
-  const result = getTableGridEffects(gridData, formItems);
+  const result = getTableGridEffects(gridData, formItems, componentData);
   result.deleteItemIds = deleteItemIds;
   targetChildren.forEach((child) => {
     result.addItems.push({
@@ -555,7 +578,7 @@ function getTableMergeRightEffects(tableFormItem, formItems, tdFormItem) {
   });
   return result;
 }
-function getTableMergeBelowEffects(tableFormItem, formItems, tdFormItem) {
+function getTableMergeBelowEffects(tableFormItem, formItems, tdFormItem, componentData) {
   var _a, _b, _c, _d;
   const gridData = generateTableGrid(tableFormItem.children);
   const { tdFormItemIndex, insertIndex, trFormItemIndex } = getTableRowInsertIndex(gridData, tdFormItem);
@@ -586,7 +609,7 @@ function getTableMergeBelowEffects(tableFormItem, formItems, tdFormItem) {
     deleteItemIds.push(itemId);
   });
   computeTableGridSpan(gridData);
-  const result = getTableGridEffects(gridData, formItems);
+  const result = getTableGridEffects(gridData, formItems, componentData);
   result.deleteItemIds = deleteItemIds;
   targetChildren.forEach((child) => {
     result.addItems.push({

package/lib/ele-pro-form-builder/components/table-util.d.ts

@@ -1,5 +1,5 @@
 import { ProFormItemKey, ProFormItemProps } from '../../ele-pro-form/types';
-import { TableGridData, TableGridRow, UpdateItemsResult } from '../types';
+import { ComponentGroup, TableGridData, TableGridRow, UpdateItemsResult } from '../types';
 
 /**
  * 获取单元格对应的表格表单项
@@ -60,8 +60,9 @@ export declare function deleteTableGridCol(gridData: TableGridRow[], deleteColIn
  * 获取表格数据添加和删除以及拆分后导致跨行跨列变化的影响
  * @param gridData 表格封装后的数据
  * @param formItems 当前的全部表单项数据
+ * @param componentData 组件库数据
  */
-export declare function getTableGridEffects(gridData: TableGridRow[], formItems?: ProFormItemProps[]): UpdateItemsResult;
+export declare function getTableGridEffects(gridData: TableGridRow[], formItems?: ProFormItemProps[], componentData?: ComponentGroup[]): UpdateItemsResult;
 /**
  * 添加表格行时获取插入的位置索引
  * @param gridData 表格封装后的数据
@@ -98,48 +99,55 @@ export declare function getTableColInsertIndex(gridData: TableGridRow[], tdFormI
  * @param formItems 当前的全部表单项数据
  * @param tdFormItem 指定位置对应的单元格表单项
  * @param position 指定位置的上方或下方添加, 默认下方
+ * @param componentData 组件库数据
  */
-export declare function generateAddTableRowData(tableFormItem: ProFormItemProps, formItems?: ProFormItemProps[], tdFormItem?: ProFormItemProps, position?: -1): UpdateItemsResult;
+export declare function generateAddTableRowData(tableFormItem: ProFormItemProps, formItems?: ProFormItemProps[], tdFormItem?: ProFormItemProps, position?: -1, componentData?: ComponentGroup[]): UpdateItemsResult;
 /**
  * 表格添加列时生成需要的数据
  * @param tableFormItem 表格表单项
  * @param formItems 当前的全部表单项数据
  * @param tdFormItem 指定位置对应的单元格表单项
  * @param position 指定位置的左侧或右侧添加, 默认右侧
+ * @param componentData 组件库数据
  */
-export declare function generateAddTableColData(tableFormItem: ProFormItemProps, formItems?: ProFormItemProps[], tdFormItem?: ProFormItemProps, position?: -1): UpdateItemsResult;
+export declare function generateAddTableColData(tableFormItem: ProFormItemProps, formItems?: ProFormItemProps[], tdFormItem?: ProFormItemProps, position?: -1, componentData?: ComponentGroup[]): UpdateItemsResult;
 /**
  * 获取表格拆分单元格的影响数据
  * @param tableFormItem 表格表单项
  * @param formItems 当前的全部表单项数据
  * @param tdFormItem 单元格表单项
+ * @param componentData 组件库数据
  */
-export declare function getTableSplitEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps): UpdateItemsResult;
+export declare function getTableSplitEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps, componentData?: ComponentGroup[]): UpdateItemsResult;
 /**
  * 获取表格删除整行的影响数据
  * @param tableFormItem 表格表单项
  * @param formItems 当前的全部表单项数据
  * @param deleteRowIndex 要删除的行索引
+ * @param componentData 组件库数据
  */
-export declare function getTableDeleteRowEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, deleteRowIndex: number): UpdateItemsResult;
+export declare function getTableDeleteRowEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, deleteRowIndex: number, componentData?: ComponentGroup[]): UpdateItemsResult;
 /**
  * 获取表格删除整列的影响数据
  * @param tableFormItem 表格表单项
  * @param formItems 当前的全部表单项数据
  * @param tdFormItem 要删除所在列的单元格表单项
+ * @param componentData 组件库数据
  */
-export declare function getTableDeleteColEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps): UpdateItemsResult;
+export declare function getTableDeleteColEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps, componentData?: ComponentGroup[]): UpdateItemsResult;
 /**
  * 获取表格合并右侧的影响数据
  * @param tableFormItem 表格表单项
  * @param formItems 当前的全部表单项数据
  * @param tdFormItem 单元格表单项
+ * @param componentData 组件库数据
  */
-export declare function getTableMergeRightEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps): UpdateItemsResult;
+export declare function getTableMergeRightEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps, componentData?: ComponentGroup[]): UpdateItemsResult;
 /**
  * 获取表格合并下方的影响数据
  * @param tableFormItem 表格表单项
  * @param formItems 当前的全部表单项数据
  * @param tdFormItem 单元格表单项
+ * @param componentData 组件库数据
  */
-export declare function getTableMergeBelowEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps): UpdateItemsResult;
+export declare function getTableMergeBelowEffects(tableFormItem: ProFormItemProps, formItems: ProFormItemProps[] | undefined, tdFormItem: ProFormItemProps, componentData?: ComponentGroup[]): UpdateItemsResult;

package/lib/ele-pro-form-builder/components/template-list.cjs

@@ -31,10 +31,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             vue.createElementVNode("div", _hoisted_3, vue.toDisplayString(item.name), 1),
             vue.createElementVNode("div", _hoisted_4, [
               vue.createElementVNode("div", _hoisted_5, [
-                item.cover ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(item.cover), vue.mergeProps({
-                  key: 0,
-                  ref_for: true
-                }, item.coverProps || {}), null, 16)) : vue.createCommentVNode("", true)
+                item.cover ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(item.cover), { key: 0 })) : vue.createCommentVNode("", true)
               ])
             ])
           ], 8, _hoisted_2);