ele-admin-plus 1.3.0 → 1.4.0-beta.1

package/lib/ele-pro-form-builder/components/body-form.cjs

@@ -1,20 +1,21 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const core = require("../../utils/core");
+const common = require("../../utils/common");
 const util = require("../../ele-pro-form/util");
 const EleProForm = require("../../ele-pro-form/index");
 const buildUtil = require("./build-util");
 const ComponentName = require("./component-name");
 const BuilderTools = require("./builder-tools");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...{ name: "BodyForm" },
   __name: "body-form",
   props: {
     formProps: {},
     currentFormItemId: {},
     currentScreen: {},
     componentData: {},
-    proFormComponent: {},
+    proFormComponent: { type: [String, Object, Function] },
     itemTypeData: {},
     httpRequest: {}
   },
@@ -44,7 +45,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleAddChildrenItem = (formItem, action) => {
       var _a;
       if (formItem.key != null) {
-        core.eachTree((_a = props.formProps) == null ? void 0 : _a.items, (item, cIndex, parent) => {
+        common.eachTree((_a = props.formProps) == null ? void 0 : _a.items, (item, cIndex, parent) => {
           var _a2;
           if (item.key === formItem.key) {
             const result = buildUtil.generateAddChildData(
@@ -86,7 +87,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       () => props.currentFormItemId,
       (currentFormItemId) => {
         var _a;
-        core.eachTree((_a = props.formProps) == null ? void 0 : _a.items, (item, _cIndex, parent) => {
+        common.eachTree((_a = props.formProps) == null ? void 0 : _a.items, (item, _cIndex, parent) => {
           if (item.key === currentFormItemId) {
             if (item.type && ["tabPane", "collapseItem"].includes(item.type) && parent && parent.prop) {
               setBuilderFormDataFieldValue(parent.prop, item.prop);
@@ -105,7 +106,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         });
         util.mergeValue(
           formData,
-          util.getFormInitValue((_a = props.formProps) == null ? void 0 : _a.items, props.itemTypeData),
+          util.getFormInitValue((_a = props.formProps) == null ? void 0 : _a.items, props.itemTypeData, true),
           cachebuilderFormData
         );
       },
@@ -127,10 +128,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           ref_key: "proFormRef",
           ref: proFormRef,
           model: formData,
-          searchExpand: formData.searchExpand,
-          "onUpdate:searchExpand": _cache[0] || (_cache[0] = ($event) => formData.searchExpand = $event),
           activeItemKey: _ctx.currentFormItemId,
           editable: true,
+          screenSize: _ctx.currentScreen,
           footer: false,
           validateOnRuleChange: false,
           scrollToError: false,
@@ -169,7 +169,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               ])
             };
           })
-        ]), 1040, ["model", "searchExpand", "activeItemKey", "itemTypeData", "httpRequest"])),
+        ]), 1040, ["model", "activeItemKey", "screenSize", "itemTypeData", "httpRequest"])),
         !_ctx.formProps || !_ctx.formProps.items || !_ctx.formProps.items.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElEmpty), {
           key: 0,
           imageSize: 80,

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

@@ -1,15 +1,16 @@
 import { UserComponent } from '../../ele-app/types';
-import { ProFormItemKey, ProFormItemProps, ProFormItemTypeData } from '../../ele-pro-form/types';
-import { TemplateFormConfig, ComponentGroup, UpdateItemsResult } from '../types';
+import { EleProFormProps } from '../../ele-app/plus';
+import { ProFormItemKey, ProFormItemProps, ProFormItemTypeData, ScreenSize } from '../../ele-pro-form/types';
+import { ComponentGroup, UpdateItemsResult } from '../types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 表单属性 */
-    formProps?: TemplateFormConfig;
+    formProps?: EleProFormProps;
     /** 选中的表单项 id */
     currentFormItemId?: ProFormItemKey;
     /** 当前选中屏幕尺寸 */
-    currentScreen?: string;
+    currentScreen?: ScreenSize;
     /** 组件库数据 */
     componentData?: ComponentGroup[];
     /** 高级表单组件 */
@@ -25,11 +26,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     updateFormItems: (items: ProFormItemProps[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 表单属性 */
-    formProps?: TemplateFormConfig;
+    formProps?: EleProFormProps;
     /** 选中的表单项 id */
     currentFormItemId?: ProFormItemKey;
     /** 当前选中屏幕尺寸 */
-    currentScreen?: string;
+    currentScreen?: ScreenSize;
     /** 组件库数据 */
     componentData?: ComponentGroup[];
     /** 高级表单组件 */
@@ -40,8 +41,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     httpRequest?: any;
 }>>> & Readonly<{
     onUpdateItems?: ((result: UpdateItemsResult) => any) | undefined;
-    onOpenTableTool?: ((formItemId: string, el: HTMLElement) => any) | undefined;
     "onUpdate:currentFormItemId"?: ((formItemId?: string | number | symbol | undefined) => any) | undefined;
+    onOpenTableTool?: ((formItemId: string, el: HTMLElement) => any) | undefined;
     onUpdateFormItems?: ((items: ProFormItemProps[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/lib/ele-pro-form-builder/components/body-header.cjs

@@ -1,24 +1,28 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const icons = require("../../icons");
+const index = require("../../icons/index");
 const util = require("../util");
 const PreviewModal = require("./preview-modal");
 const ImportModal = require("./import-modal");
+const CodePreview = require("./code-preview");
 const _hoisted_1 = { class: "ele-pro-form-builder-header" };
 const _hoisted_2 = { class: "ele-pro-form-builder-screen-radio" };
 const _hoisted_3 = { class: "ele-pro-form-builder-header-left" };
 const _hoisted_4 = { class: "ele-pro-form-builder-header-tools" };
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...{ name: "BodyHeader" },
   __name: "body-header",
   props: {
     currentScreen: {},
     undoDisabled: { type: Boolean },
     redoDisabled: { type: Boolean },
     formProps: {},
-    headerTools: {},
-    proFormComponent: {},
-    jsonEditerComponent: {},
+    headerTools: { type: [Boolean, Array] },
+    proFormComponent: { type: [String, Object, Function] },
+    jsonEditerComponent: { type: [String, Object, Function] },
+    codeViewerComponent: { type: [String, Object, Function] },
+    componentData: {},
     itemTypeData: {},
     httpRequest: {}
   },
@@ -30,6 +34,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const previewVisible = vue.ref(false);
     const importVisible = vue.ref(false);
     const isImport = vue.ref(false);
+    const codeVisible = vue.ref(false);
+    const headerRightToolNames = vue.computed(() => {
+      if (typeof props.headerTools === "undefined" || props.headerTools === true) {
+        return util.defaultHeaderRightTools;
+      }
+      if (!props.headerTools) {
+        return [];
+      }
+      return props.headerTools;
+    });
     const handleUpdateScreen = (size) => {
       emit("update:currentScreen", size);
     };
@@ -63,6 +77,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleImportData = (data) => {
       emit("importData", data);
     };
+    const handleOpenCode = () => {
+      codeVisible.value = true;
+    };
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
         vue.createElementVNode("div", _hoisted_2, [
@@ -96,7 +113,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             onClick: handleUndo
           }, {
             default: vue.withCtx(() => [
-              vue.createVNode(vue.unref(icons.RollbackOutlined))
+              vue.createVNode(vue.unref(index.RollbackOutlined))
             ]),
             _: 1
           }, 8, ["class"]),
@@ -110,62 +127,78 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             onClick: handleRedo
           }, {
             default: vue.withCtx(() => [
-              vue.createVNode(vue.unref(icons.RecoverOutlined))
+              vue.createVNode(vue.unref(index.RecoverOutlined))
             ]),
             _: 1
           }, 8, ["class"])
         ]),
         vue.createElementVNode("div", _hoisted_4, [
-          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.headerTools || [], (toolName) => {
+          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(headerRightToolNames.value, (toolName) => {
             return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: toolName }, [
               toolName === "import" ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
                 key: 0,
                 text: true,
-                icon: vue.unref(icons.UploadOutlined),
+                icon: vue.unref(index.UploadOutlined),
                 onClick: handleOpenImport
               }, {
-                default: vue.withCtx(() => _cache[2] || (_cache[2] = [
+                default: vue.withCtx(() => _cache[3] || (_cache[3] = [
                   vue.createTextVNode(" 导入 ")
                 ])),
-                _: 1
+                _: 1,
+                __: [3]
               }, 8, ["icon"])) : toolName === "export" ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
                 key: 1,
                 text: true,
-                icon: vue.unref(icons.DownloadOutlined),
+                icon: vue.unref(index.DownloadOutlined),
                 onClick: handleOpenExport
               }, {
-                default: vue.withCtx(() => _cache[3] || (_cache[3] = [
+                default: vue.withCtx(() => _cache[4] || (_cache[4] = [
                   vue.createTextVNode(" 导出 ")
                 ])),
-                _: 1
+                _: 1,
+                __: [4]
               }, 8, ["icon"])) : toolName === "clear" ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
                 key: 2,
                 text: true,
                 type: "danger",
-                icon: vue.unref(icons.DeleteOutlined),
+                icon: vue.unref(index.DeleteOutlined),
                 onClick: handleClear
               }, {
-                default: vue.withCtx(() => _cache[4] || (_cache[4] = [
+                default: vue.withCtx(() => _cache[5] || (_cache[5] = [
                   vue.createTextVNode(" 清空 ")
                 ])),
-                _: 1
+                _: 1,
+                __: [5]
               }, 8, ["icon"])) : toolName === "preview" ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
                 key: 3,
                 text: true,
                 type: "primary",
-                icon: vue.unref(icons.EyeOutlined),
+                icon: vue.unref(index.EyeOutlined),
                 onClick: handleOpenPreview
               }, {
-                default: vue.withCtx(() => _cache[5] || (_cache[5] = [
+                default: vue.withCtx(() => _cache[6] || (_cache[6] = [
                   vue.createTextVNode(" 预览 ")
                 ])),
-                _: 1
+                _: 1,
+                __: [6]
+              }, 8, ["icon"])) : toolName === "code" ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
+                key: 4,
+                text: true,
+                type: "primary",
+                icon: vue.unref(index.CodeOutlined),
+                onClick: handleOpenCode
+              }, {
+                default: vue.withCtx(() => _cache[7] || (_cache[7] = [
+                  vue.createTextVNode(" 生成代码 ")
+                ])),
+                _: 1,
+                __: [7]
               }, 8, ["icon"])) : vue.createCommentVNode("", true)
             ], 64);
           }), 128)),
           vue.renderSlot(_ctx.$slots, "headerTools")
         ]),
-        _ctx.headerTools && _ctx.headerTools.includes("preview") ? (vue.openBlock(), vue.createBlock(PreviewModal, {
+        headerRightToolNames.value && headerRightToolNames.value.includes("preview") ? (vue.openBlock(), vue.createBlock(PreviewModal, {
           key: 0,
           modelValue: previewVisible.value,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => previewVisible.value = $event),
@@ -184,7 +217,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             };
           })
         ]), 1032, ["modelValue", "formProps", "proFormComponent", "itemTypeData", "httpRequest"])) : vue.createCommentVNode("", true),
-        _ctx.headerTools && (_ctx.headerTools.includes("import") || _ctx.headerTools.includes("export")) ? (vue.openBlock(), vue.createBlock(ImportModal, {
+        headerRightToolNames.value && (headerRightToolNames.value.includes("import") || headerRightToolNames.value.includes("export")) ? (vue.openBlock(), vue.createBlock(ImportModal, {
           key: 1,
           modelValue: importVisible.value,
           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => importVisible.value = $event),
@@ -192,7 +225,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           isImport: isImport.value,
           jsonEditerComponent: _ctx.jsonEditerComponent,
           onImportData: handleImportData
-        }, null, 8, ["modelValue", "config", "isImport", "jsonEditerComponent"])) : vue.createCommentVNode("", true)
+        }, null, 8, ["modelValue", "config", "isImport", "jsonEditerComponent"])) : vue.createCommentVNode("", true),
+        headerRightToolNames.value && headerRightToolNames.value.includes("code") ? (vue.openBlock(), vue.createBlock(CodePreview, {
+          key: 2,
+          modelValue: codeVisible.value,
+          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => codeVisible.value = $event),
+          config: _ctx.formProps,
+          componentData: _ctx.componentData,
+          codeViewerComponent: _ctx.codeViewerComponent
+        }, null, 8, ["modelValue", "config", "componentData", "codeViewerComponent"])) : vue.createCommentVNode("", true)
       ]);
     };
   }

package/lib/ele-pro-form-builder/components/body-header.d.ts

@@ -1,25 +1,30 @@
 import { UserComponent } from '../../ele-app/types';
-import { ProFormItemTypeData } from '../../ele-pro-form/types';
-import { TemplateFormConfig, HeaderRightToolName } from '../types';
+import { EleProFormProps } from '../../ele-app/plus';
+import { ProFormItemTypeData, ScreenSize } from '../../ele-pro-form/types';
+import { HeaderRightToolName, ComponentGroup } from '../types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & {
     headerTools?(_: {}): any;
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 当前选中屏幕尺寸 */
-    currentScreen?: string;
+    currentScreen?: ScreenSize;
     /** 是否禁用撤销 */
     undoDisabled?: boolean;
     /** 是否禁用恢复 */
     redoDisabled?: boolean;
     /** 表单属性 */
-    formProps?: TemplateFormConfig;
+    formProps?: EleProFormProps;
     /** 顶栏右侧操作按钮顺序 */
-    headerTools?: HeaderRightToolName[];
+    headerTools?: boolean | HeaderRightToolName[];
     /** 高级表单组件 */
     proFormComponent?: UserComponent;
     /** JSON 编辑器组件 */
     jsonEditerComponent?: UserComponent;
+    /** 代码查看器组件 */
+    codeViewerComponent?: UserComponent;
+    /** 组件库数据 */
+    componentData?: ComponentGroup[];
     /** 高级表单组件类型数据 */
     itemTypeData?: ProFormItemTypeData[];
     /** 远程数据源请求工具 */
@@ -30,30 +35,34 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     redo: () => void;
     clear: () => void;
     previewFormSubmit: (data: Record<string, any>) => void;
-    importData: (data: TemplateFormConfig) => void;
+    importData: (data: EleProFormProps) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 当前选中屏幕尺寸 */
-    currentScreen?: string;
+    currentScreen?: ScreenSize;
     /** 是否禁用撤销 */
     undoDisabled?: boolean;
     /** 是否禁用恢复 */
     redoDisabled?: boolean;
     /** 表单属性 */
-    formProps?: TemplateFormConfig;
+    formProps?: EleProFormProps;
     /** 顶栏右侧操作按钮顺序 */
-    headerTools?: HeaderRightToolName[];
+    headerTools?: boolean | HeaderRightToolName[];
     /** 高级表单组件 */
     proFormComponent?: UserComponent;
     /** JSON 编辑器组件 */
     jsonEditerComponent?: UserComponent;
+    /** 代码查看器组件 */
+    codeViewerComponent?: UserComponent;
+    /** 组件库数据 */
+    componentData?: ComponentGroup[];
     /** 高级表单组件类型数据 */
     itemTypeData?: ProFormItemTypeData[];
     /** 远程数据源请求工具 */
     httpRequest?: any;
 }>>> & Readonly<{
     onClear?: (() => any) | undefined;
+    onImportData?: ((data: EleProFormProps) => any) | undefined;
     onPreviewFormSubmit?: ((data: Record<string, any>) => any) | undefined;
-    onImportData?: ((data: TemplateFormConfig) => any) | undefined;
     "onUpdate:currentScreen"?: ((size?: string | undefined) => any) | undefined;
     onUndo?: (() => any) | undefined;
     onRedo?: (() => any) | undefined;

package/lib/ele-pro-form-builder/components/build-core.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const core = require("../../utils/core");
+const common = require("../../utils/common");
 const util = require("../../ele-pro-form/util");
-const itemTypeData = require("../../ele-pro-form/components/item-type-data");
+const renderUtil = require("../../ele-pro-form/components/render-util");
 const fixedChildTypes = [
   { type: "tabs", childType: "tabPane" },
   { type: "collapse", childType: "collapseItem" },
@@ -13,12 +13,13 @@ const fixedChildTypes = [
   { type: "tableRow", childType: "tableCell" }
 ];
 function generateItemKey() {
-  return `f${core.uuid(15, 36).toLowerCase()}`;
+  return `f${common.uuid(15, 36).toLowerCase()}`;
 }
 function generateUniqueItemKey(items, keys) {
   let itemKey = generateItemKey();
-  while (true) {
-    if (!core.findTree(items, (d) => d.key === itemKey) && (!keys || !keys.includes(itemKey))) {
+  const flag = true;
+  while (flag) {
+    if (!common.findTree(items, (d) => d.key === itemKey) && (!keys || !keys.includes(itemKey))) {
       break;
     }
     itemKey = generateItemKey();
@@ -31,6 +32,22 @@ function getComponentItemByType(type, componentData) {
   }
   return componentData.map((groupItem) => groupItem.items).flat().find((item) => item.type === type);
 }
+function deepCloneObject(data, excludeUndefined) {
+  if (!data) {
+    return {};
+  }
+  const result = JSON.parse(JSON.stringify(data));
+  if (!excludeUndefined) {
+    const keys = Object.keys(data);
+    const resultKeys = Object.keys(result);
+    keys.forEach((key) => {
+      if (!resultKeys.includes(key)) {
+        result[key] = void 0;
+      }
+    });
+  }
+  return result;
+}
 function generateChildFormItem(parentType, childNo, childKey, componentData) {
   var _a, _b;
   let child;
@@ -48,7 +65,7 @@ function generateChildFormItem(parentType, childNo, childKey, componentData) {
     child.prop = childKey;
   }
   const componentItem = getComponentItemByType(child.type, componentData);
-  const initialProps = (componentItem == null ? void 0 : componentItem.initialProps) ? JSON.parse(JSON.stringify(componentItem.initialProps)) : void 0;
+  const initialProps = (componentItem == null ? void 0 : componentItem.initialProps) ? deepCloneObject(componentItem.initialProps) : void 0;
   if (initialProps) {
     child.props = initialProps;
   }
@@ -67,7 +84,7 @@ function generateChildFormItem(parentType, childNo, childKey, componentData) {
   }
   return child;
 }
-function generateBuildFormItem(type, formItems, componentData, itemTypeData$1) {
+function generateBuildFormItem(type, formItems, componentData, itemTypeData) {
   const componentItem = getComponentItemByType(type, componentData);
   if (!componentItem) {
     return;
@@ -81,12 +98,10 @@ function generateBuildFormItem(type, formItems, componentData, itemTypeData$1) {
     type: componentItem.type,
     required: false,
     ...componentItem.initialData || {},
-    props: componentItem.initialProps ? JSON.parse(JSON.stringify(componentItem.initialProps)) : void 0
+    props: componentItem.initialProps ? deepCloneObject(componentItem.initialProps) : void 0
   };
-  const typeData = item.type ? [...itemTypeData$1 || [], ...itemTypeData.defaultItemTypeData].find(
-    (d) => d.type === item.type
-  ) : void 0;
-  if (!item.type || item.type === "div" || util.isContainerType(item, itemTypeData$1) && !(typeData == null ? void 0 : typeData.renderLabelText)) {
+  const typeData = renderUtil.getItemTypeData(item, itemTypeData);
+  if (!item.type || item.type === "div" || util.isContainerType(item, itemTypeData) && !(typeData == null ? void 0 : typeData.renderLabelText)) {
     item.label = "";
   }
   if (item.type === "table") {
@@ -139,7 +154,7 @@ function generateBuildFormItem(type, formItems, componentData, itemTypeData$1) {
   return item;
 }
 function getFormDataAndItems(item, componentData) {
-  const data = item ? JSON.parse(JSON.stringify(item)) : item;
+  const data = item ? deepCloneObject(item) : item;
   if (!data) {
     return { data: {}, items: [] };
   }
@@ -186,6 +201,7 @@ function getPropertyPath(data, excludeKeys, prefix) {
   }
   return keys;
 }
+exports.deepCloneObject = deepCloneObject;
 exports.fixedChildTypes = fixedChildTypes;
 exports.generateBuildFormItem = generateBuildFormItem;
 exports.generateChildFormItem = generateChildFormItem;

package/lib/ele-pro-form-builder/components/build-core.d.ts

@@ -24,6 +24,12 @@ export declare function generateUniqueItemKey(items?: ProFormItemProps[], keys?:
  * @param componentData 组件库数据
  */
 export declare function getComponentItemByType(type: string | undefined, componentData?: ComponentGroup[]): import('../types').ComponentItem | undefined;
+/**
+ * 深度克隆对象
+ * @param data 对象
+ * @param excludeUndefined 排除未定义值
+ */
+export declare function deepCloneObject<T extends Record<string, any>>(data?: T, excludeUndefined?: boolean): T;
 /**
  * 生成子级表单项数据
  * @param parentType 父组件类型

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const core = require("../../utils/core");
+const common = require("../../utils/common");
 const buildCore = require("./build-core");
 const tableUtil = require("./table-util");
 function generateAddChildData(triggerItem, triggerParent, triggerItemIndex, actionType, formItems, position, componentData) {
@@ -41,7 +41,7 @@ function generateAddChildData(triggerItem, triggerParent, triggerItemIndex, acti
       updateItems: [],
       deleteItemIds: []
     };
-    core.eachTree(formItems, (trItem, _trIndex, tableItem) => {
+    common.eachTree(formItems, (trItem, _trIndex, tableItem) => {
       if (triggerParent && trItem.key === triggerParent.key && tableItem) {
         const { addItems, updateItems, deleteItemIds } = (actionType === "addTableCol" ? tableUtil.generateAddTableColData : tableUtil.generateAddTableRowData)(tableItem, formItems, triggerItem, position, componentData);
         result.addItems = addItems;
@@ -73,7 +73,7 @@ function itemsGenerateNewKey(items, formItems, overwriteProp) {
     return;
   }
   const addedKeys = [];
-  core.eachTree(Array.isArray(items) ? items : [items], (item) => {
+  common.eachTree(Array.isArray(items) ? items : [items], (item) => {
     const itemKey = buildCore.generateUniqueItemKey(formItems, addedKeys);
     addedKeys.push(itemKey);
     item.key = itemKey;
@@ -88,9 +88,9 @@ function generateCopyItemData(formItemId, formItems) {
     updateItems: [],
     deleteItemIds: []
   };
-  core.eachTree(formItems, (item, index, parent) => {
+  common.eachTree(formItems, (item, index, parent) => {
     if (item.key === formItemId) {
-      const newItem = JSON.parse(JSON.stringify(item));
+      const newItem = buildCore.deepCloneObject(item);
       itemsGenerateNewKey(newItem, formItems, true);
       result.addItems.push({
         item: newItem,

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

@@ -17,7 +17,6 @@ export declare function generateAddChildData(triggerItem: ProFormItemProps, trig
  * @param items 表单项数据
  * @param formItems 当前的全部表单项数据
  * @param overwriteProp prop 是否也重新生成
- * @param generateTypeName 是否生成类型名称到数据
  */
 export declare function itemsGenerateNewKey(items?: ProFormItemProps[] | ProFormItemProps, formItems?: ProFormItemProps[], overwriteProp?: boolean): void;
 /**

package/lib/ele-pro-form-builder/components/builder-tools.cjs

@@ -1,8 +1,9 @@
 "use strict";
 const vue = require("vue");
-const icons = require("../../icons");
+const index = require("../../icons/index");
 const ToolButton = require("./tool-button");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...{ name: "BuilderTools" },
   __name: "builder-tools",
   props: {
     itemType: {}
@@ -35,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           buttonProps: {
             size: "small",
             type: "primary",
-            icon: vue.unref(icons.InsertRowOutlined)
+            icon: vue.unref(index.InsertRowOutlined)
           },
           tooltip: _ctx.itemType === "tableCell" ? "插入行" : "新增行",
           onClick: handleAddTableRow
@@ -45,7 +46,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           buttonProps: {
             size: "small",
             type: "primary",
-            icon: vue.unref(icons.InsertColumnOutlined)
+            icon: vue.unref(index.InsertColumnOutlined)
           },
           tooltip: _ctx.itemType === "tableCell" ? "插入列" : "新增列",
           onClick: handleAddTableCol
@@ -66,7 +67,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           buttonProps: {
             size: "small",
             type: "primary",
-            icon: vue.unref(icons.PlusSquareDashOutlined)
+            icon: vue.unref(index.PlusSquareDashOutlined)
           },
           tooltip: {
             tabs: "添加选项卡",
@@ -79,7 +80,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             carouselItem: "插入走马灯",
             descriptions: "添加描述列表",
             descriptionsItem: "插入描述列表"
-          }[_ctx.itemType] || "添加",
+          }[_ctx.itemType],
           onClick: handleAdd
         }, null, 8, ["buttonProps", "tooltip"])) : vue.createCommentVNode("", true),
         _ctx.itemType !== "tableCell" ? (vue.openBlock(), vue.createBlock(ToolButton, {
@@ -87,7 +88,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           buttonProps: {
             size: "small",
             type: "primary",
-            icon: vue.unref(icons.CopyOutlined)
+            icon: vue.unref(index.CopyOutlined)
           },
           tooltip: "复制",
           onClick: handleCopy
@@ -97,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           buttonProps: {
             size: "small",
             type: "danger",
-            icon: vue.unref(icons.DeleteOutlined)
+            icon: vue.unref(index.DeleteOutlined)
           },
           tooltip: "删除",
           onClick: handleDelete
@@ -107,7 +108,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           buttonProps: {
             size: "small",
             type: "primary",
-            icon: vue.unref(icons.AppstoreAddOutlined),
+            icon: vue.unref(index.AppstoreAddOutlined),
             style: { fontSize: "14px" }
           },
           tooltip: "更多",