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

package/es/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/es/ele-pro-form-builder/components/table-util.js

@@ -1,5 +1,5 @@
 import { eachTree } from "../../utils/core";
-import { generateUniqueItemKey, generateChildFormItem } from "../util";
+import { generateUniqueItemKey, generateChildFormItem } from "./build-core";
 function getTableFormItemByTd(tdFormItemId, formItems) {
   let tableFormItem;
   let tdFormItem;
@@ -303,7 +303,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,7 +314,12 @@ function getTableGridEffects(gridData, formItems) {
       if ((rowspanChanged || colspanChanged) && gridItem.itemId == null && gridItem.newRowspan !== 0 && gridItem.newColspan !== 0) {
         const tdKey = generateUniqueItemKey(formItems, addedKeys);
         addedKeys.push(tdKey);
-        const childTd = generateChildFormItem("tableRow", void 0, tdKey);
+        const childTd = generateChildFormItem(
+          "tableRow",
+          void 0,
+          tdKey,
+          componentData
+        );
         const index = gridRow.children.filter(
           (cell, i) => i < gridItemIndex && cell.colspan !== 0 && cell.rowspan !== 0
         ).length;
@@ -391,12 +396,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 = generateUniqueItemKey(formItems);
   const addedKeys = [trKey];
-  const childTr = generateChildFormItem(tableFormItem.type, void 0, trKey);
+  const childTr = generateChildFormItem(
+    tableFormItem.type,
+    void 0,
+    trKey,
+    componentData
+  );
   const gridData = generateTableGrid(tableFormItem.children);
   const { trFormItemIndex, insertIndex } = getTableRowInsertIndex(
     gridData,
@@ -413,7 +423,12 @@ function generateAddTableRowData(tableFormItem, formItems, tdFormItem, position)
     if (gridItem.rowspan !== 0 && gridItem.colspan !== 0) {
       const tdKey = generateUniqueItemKey(formItems, addedKeys);
       addedKeys.push(tdKey);
-      const childTd = generateChildFormItem("tableRow", void 0, tdKey);
+      const childTd = generateChildFormItem(
+        "tableRow",
+        void 0,
+        tdKey,
+        componentData
+      );
       if (childTr.children) {
         childTr.children.push(childTd);
       } else {
@@ -426,13 +441,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)) {
@@ -440,7 +456,8 @@ function generateAddTableColData(tableFormItem, formItems, tdFormItem, position)
       tableFormItem,
       formItems,
       tdFormItem,
-      position
+      position,
+      componentData
     );
   }
   const gridData = generateTableGrid(tableFormItem.children);
@@ -459,25 +476,31 @@ function generateAddTableColData(tableFormItem, formItems, tdFormItem, position)
     if (gridItem.rowspan !== 0 && gridItem.colspan !== 0) {
       const tdKey = generateUniqueItemKey(formItems, addedKeys);
       addedKeys.push(tdKey);
-      const childTd = generateChildFormItem("tableRow", void 0, tdKey);
+      const childTd = 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 {
@@ -487,11 +510,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 {
@@ -508,11 +531,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);
@@ -543,7 +566,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({
@@ -553,7 +576,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);
@@ -584,7 +607,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/es/ele-pro-form-builder/components/template-list.js

@@ -1,4 +1,4 @@
-import { defineComponent, openBlock, createElementBlock, Fragment, renderList, createElementVNode, toDisplayString, createBlock, resolveDynamicComponent, mergeProps, createCommentVNode, unref } from "vue";
+import { defineComponent, openBlock, createElementBlock, Fragment, renderList, createElementVNode, toDisplayString, createBlock, resolveDynamicComponent, createCommentVNode, unref } from "vue";
 import { ElEmpty } from "element-plus";
 import { itemsGenerateNewKey } from "./build-util";
 const _hoisted_1 = { class: "ele-pro-form-builder-template-wrapper" };
@@ -30,10 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createElementVNode("div", _hoisted_3, toDisplayString(item.name), 1),
             createElementVNode("div", _hoisted_4, [
               createElementVNode("div", _hoisted_5, [
-                item.cover ? (openBlock(), createBlock(resolveDynamicComponent(item.cover), mergeProps({
-                  key: 0,
-                  ref_for: true
-                }, item.coverProps || {}), null, 16)) : createCommentVNode("", true)
+                item.cover ? (openBlock(), createBlock(resolveDynamicComponent(item.cover), { key: 0 })) : createCommentVNode("", true)
               ])
             ])
           ], 8, _hoisted_2);

package/es/ele-pro-form-builder/index.d.ts

@@ -1,30 +1,50 @@
 import { ProFormItemProps } from '../ele-pro-form/types';
-import { TemplateFormConfig } from './types';
+import { TemplateFormConfig, HeaderRightToolName } from './types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<{
     modelValue: import('vue').PropType<TemplateFormConfig>;
+    headerTools: {
+        type: import('vue').PropType<boolean | HeaderRightToolName[]>;
+        default: () => boolean;
+    };
     componentData: import('vue').PropType<import('./types').ComponentGroup[]>;
     templateData: import('vue').PropType<import('./types').TemplateItem[]>;
     configFormItems: import('vue').PropType<ProFormItemProps[]>;
-    configFormPresetProps: import('vue').PropType<Record<string, any>>;
+    configFormPresetProps: import('vue').PropType<import('./types').TemplateFormProps>;
+    proFormInitialProps: import('vue').PropType<import('./types').TemplateFormProps>;
     proFormComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
+    codeEditerComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
+    jsonEditerComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
+    htmlEditerComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
     itemTypeData: import('vue').PropType<import('../ele-pro-form/types').ProFormItemTypeData[]>;
+    httpRequest: (ObjectConstructor | FunctionConstructor)[];
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:modelValue": (_config: TemplateFormConfig) => void;
     previewFormSubmit: (_data: Record<string, any>) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: import('vue').PropType<TemplateFormConfig>;
+    headerTools: {
+        type: import('vue').PropType<boolean | HeaderRightToolName[]>;
+        default: () => boolean;
+    };
     componentData: import('vue').PropType<import('./types').ComponentGroup[]>;
     templateData: import('vue').PropType<import('./types').TemplateItem[]>;
     configFormItems: import('vue').PropType<ProFormItemProps[]>;
-    configFormPresetProps: import('vue').PropType<Record<string, any>>;
+    configFormPresetProps: import('vue').PropType<import('./types').TemplateFormProps>;
+    proFormInitialProps: import('vue').PropType<import('./types').TemplateFormProps>;
     proFormComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
+    codeEditerComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
+    jsonEditerComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
+    htmlEditerComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
     itemTypeData: import('vue').PropType<import('../ele-pro-form/types').ProFormItemTypeData[]>;
+    httpRequest: (ObjectConstructor | FunctionConstructor)[];
 }>> & {
     "onUpdate:modelValue"?: ((_config: TemplateFormConfig) => any) | undefined;
     onPreviewFormSubmit?: ((_data: Record<string, any>) => any) | undefined;
-}, {}, {}>;
+}, {
+    headerTools: boolean | HeaderRightToolName[];
+}, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {