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

package/es/ele-pro-form-builder/components/options-code.js

@@ -1,19 +1,14 @@
-import { defineComponent, ref, onMounted, openBlock, createElementBlock, toDisplayString, createCommentVNode, createElementVNode, createBlock, resolveDynamicComponent } from "vue";
-import { codeStringPrefix } from "../../ele-pro-form/components/render-util";
+import { defineComponent, ref, onMounted, createElementBlock, openBlock, createBlock, resolveDynamicComponent } from "vue";
 import CodeEditer from "./code-editer";
 const _hoisted_1 = { class: "ele-pro-form-builder-code-edit-wrapper" };
-const _hoisted_2 = {
-  key: 0,
-  class: "ele-pro-form-builder-code-edit-header"
-};
-const _hoisted_3 = { class: "ele-pro-form-builder-code-edit-body" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{ name: "OptionsCode" },
   __name: "options-code",
   props: {
     data: {},
-    codeTips: {},
     codePlaceholder: {},
-    codeEditerComponent: {}
+    codePrefix: {},
+    codeEditerComponent: { type: [String, Object, Function] }
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -23,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (code == null || !code) {
         return;
       }
-      return `${codeStringPrefix}${code}`;
+      return `${props.codePrefix}${code}`;
     };
     onMounted(() => {
       if (props.data == null || typeof props.data !== "string") {
@@ -31,8 +26,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       const data = props.data.trim();
-      if (data.startsWith(codeStringPrefix)) {
-        codeContent.value = data.slice(codeStringPrefix.length);
+      const codePrefix = props.codePrefix;
+      if (data.startsWith(codePrefix)) {
+        codeContent.value = data.slice(codePrefix.length);
         return;
       }
       codeContent.value = (data || props.codePlaceholder) ?? "";
@@ -42,13 +38,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
-        _ctx.codeTips ? (openBlock(), createElementBlock("div", _hoisted_2, toDisplayString(_ctx.codeTips), 1)) : createCommentVNode("", true),
-        createElementVNode("div", _hoisted_3, [
-          (openBlock(), createBlock(resolveDynamicComponent(_ctx.codeEditerComponent || CodeEditer), {
-            modelValue: codeContent.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => codeContent.value = $event)
-          }, null, 8, ["modelValue"]))
-        ])
+        (openBlock(), createBlock(resolveDynamicComponent(_ctx.codeEditerComponent || CodeEditer), {
+          modelValue: codeContent.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => codeContent.value = $event)
+        }, null, 8, ["modelValue"]))
       ]);
     };
   }

package/es/ele-pro-form-builder/components/options-edit.d.ts

@@ -18,6 +18,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     codeTips?: string;
     /** 默认提示示例代码 */
     codePlaceholder?: string;
+    /** 代码字符串前缀 */
+    codePrefix?: string;
     /** 代码编辑器组件 */
     codeEditerComponent?: UserComponent;
 }>>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
@@ -39,6 +41,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     codeTips?: string;
     /** 默认提示示例代码 */
     codePlaceholder?: string;
+    /** 代码字符串前缀 */
+    codePrefix?: string;
     /** 代码编辑器组件 */
     codeEditerComponent?: UserComponent;
 }>>> & Readonly<{

package/es/ele-pro-form-builder/components/options-edit.js

@@ -1,11 +1,14 @@
-import { defineComponent, ref, openBlock, createElementBlock, Fragment, createVNode, unref, withCtx, createTextVNode, toDisplayString, createBlock, createCommentVNode } from "vue";
-import { ElButton } from "element-plus";
-import { codeStringPrefix } from "../../ele-pro-form/components/render-util";
+import { defineComponent, ref, computed, createElementBlock, openBlock, Fragment, createVNode, unref, withCtx, createTextVNode, toDisplayString, createBlock, createCommentVNode, createElementVNode } from "vue";
+import { ElButton, ElIcon } from "element-plus";
+import { QuestionCircleOutlined } from "../../icons/index";
+import { codeStringPrefix } from "../../ele-pro-form/components/render-core";
 import EleModal from "../../ele-modal/index";
 import EleTabBar from "../../ele-tab-bar/index";
 import OptionsTable from "./options-table";
 import OptionsCode from "./options-code";
+const _hoisted_1 = { class: "ele-pro-form-builder-code-edit-tip" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{ name: "OptionsEdit" },
   __name: "options-edit",
   props: {
     modelValue: {},
@@ -15,7 +18,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     codeOptions: { type: Boolean },
     codeTips: {},
     codePlaceholder: {},
-    codeEditerComponent: {}
+    codePrefix: {},
+    codeEditerComponent: { type: [String, Object, Function] }
   },
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
@@ -24,8 +28,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const visible = ref(false);
     const optionsType = ref("optionsTable");
     const editerRef = ref(null);
+    const codePrefixStr = computed(() => {
+      return props.codePrefix ?? codeStringPrefix;
+    });
     const openModal = () => {
-      if (props.modelValue != null && typeof props.modelValue === "string" && props.modelValue.startsWith(codeStringPrefix)) {
+      if (props.modelValue != null && typeof props.modelValue === "string" && props.modelValue.startsWith(codePrefixStr.value)) {
         optionsType.value = "optionsCode";
       } else {
         optionsType.value = "optionsTable";
@@ -45,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock(Fragment, null, [
         createVNode(unref(ElButton), {
           size: "small",
-          style: { width: "100%" },
+          class: "ele-pro-form-builder-props-fluid-btn",
           onClick: openModal
         }, {
           default: withCtx(() => [
@@ -79,7 +86,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => _cache[2] || (_cache[2] = [
                 createTextVNode("取消")
               ])),
-              _: 1
+              _: 1,
+              __: [2]
             }),
             createVNode(unref(ElButton), {
               type: "primary",
@@ -89,7 +97,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => _cache[3] || (_cache[3] = [
                 createTextVNode(" 保存 ")
               ])),
-              _: 1
+              _: 1,
+              __: [3]
             })
           ]),
           default: withCtx(() => [
@@ -103,7 +112,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ],
               type: "plain",
               class: "ele-pro-form-builder-options-tabs"
-            }, null, 8, ["modelValue"])) : createCommentVNode("", true),
+            }, {
+              label: withCtx(({ label, item }) => [
+                createElementVNode("span", null, toDisplayString(label), 1),
+                optionsType.value === "optionsCode" && item.value === "optionsCode" && _ctx.codeTips ? (openBlock(), createBlock(unref(ElIcon), {
+                  key: 0,
+                  class: "ele-pro-form-builder-code-edit-icon"
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(QuestionCircleOutlined)),
+                    createElementVNode("div", _hoisted_1, toDisplayString(_ctx.codeTips), 1)
+                  ]),
+                  _: 1
+                })) : createCommentVNode("", true)
+              ]),
+              _: 1
+            }, 8, ["modelValue"])) : createCommentVNode("", true),
             !_ctx.codeOptions || optionsType.value === "optionsTable" ? (openBlock(), createBlock(OptionsTable, {
               key: 1,
               ref_key: "editerRef",
@@ -116,10 +140,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ref_key: "editerRef",
               ref: editerRef,
               data: _ctx.modelValue,
-              codeTips: _ctx.codeTips,
               codePlaceholder: _ctx.codePlaceholder,
+              codePrefix: codePrefixStr.value,
               codeEditerComponent: _ctx.codeEditerComponent
-            }, null, 8, ["data", "codeTips", "codePlaceholder", "codeEditerComponent"])) : createCommentVNode("", true)
+            }, null, 8, ["data", "codePlaceholder", "codePrefix", "codeEditerComponent"])) : createCommentVNode("", true)
           ]),
           _: 1
         }, 8, ["title", "modelValue"])

package/es/ele-pro-form-builder/components/options-table.js

@@ -1,11 +1,11 @@
-import { defineComponent, ref, computed, onMounted, openBlock, createBlock, normalizeClass, withCtx, createElementBlock, createVNode, unref, createCommentVNode } from "vue";
-import { ElSwitch, ElInput } from "element-plus";
-import { eachTree, mapTree } from "../../utils/core";
+import { defineComponent, ref, computed, onMounted, createBlock, openBlock, normalizeClass, withCtx, createElementBlock, createCommentVNode, createVNode, unref } from "vue";
+import { ElInput, ElSwitch } from "element-plus";
+import { eachTree, mapTree } from "../../utils/common";
 import EleTreeTable from "../../ele-tree-table/index";
 import EleSelect from "../../ele-select/index";
-import { DeleteOutlined, PlusOutlined, AppstoreAddOutlined } from "../../icons";
+import { DeleteOutlined, AppstoreAddOutlined, PlusOutlined } from "../../icons/index";
 import { getValue, setValue } from "../../ele-pro-form/util";
-import { getPropertyPath, generateItemKey } from "./build-core";
+import { deepCloneObject, getPropertyPath, generateItemKey } from "./build-core";
 import ToolButton from "./tool-button";
 const _hoisted_1 = {
   key: 4,
@@ -25,6 +25,7 @@ const _hoisted_4 = {
 };
 const actionColKey = "optionsEditTreeTableAction";
 const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{ name: "OptionsTable" },
   __name: "options-table",
   props: {
     data: {},
@@ -101,9 +102,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const getResult = () => {
-      let result = JSON.parse(
-        JSON.stringify(tableData.value)
-      );
+      let result = deepCloneObject(tableData.value);
       if (props.columns === "tableData") {
         result = mapTree(result, (row) => {
           const temp = {};
@@ -121,7 +120,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     onMounted(() => {
       tableData.value = [];
-      const userData = props.data == null || typeof props.data === "string" ? [] : JSON.parse(JSON.stringify(props.data));
+      const userData = props.data == null || typeof props.data === "string" ? [] : deepCloneObject(props.data);
       const actionCol = {
         key: actionColKey,
         label: "",
@@ -245,6 +244,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           _ctx.columns === "tableColumns" && column.prop === "align" ? (openBlock(), createBlock(EleSelect, {
             key: 0,
             size: "default",
+            placeholder: "",
             clearable: true,
             modelValue: row[column.prop],
             "onUpdate:modelValue": ($event) => row[column.prop] = $event,
@@ -258,19 +258,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["modelValue", "onUpdate:modelValue"])) : _ctx.columns === "tableColumns" && column.prop === "fixed" ? (openBlock(), createBlock(EleSelect, {
             key: 1,
             size: "default",
+            placeholder: "",
             clearable: true,
             modelValue: row[column.prop],
             "onUpdate:modelValue": ($event) => row[column.prop] = $event,
             options: [
               { label: "不固定", value: false },
-              { label: "固定在左侧", value: "left" },
-              { label: "固定在右侧", value: "right" }
+              { label: "左侧", value: "left" },
+              { label: "右侧", value: "right" }
             ],
             popperOptions: { strategy: "fixed" },
             class: "ele-fluid"
           }, null, 8, ["modelValue", "onUpdate:modelValue"])) : _ctx.columns === "tableColumns" && column.prop === "type" ? (openBlock(), createBlock(EleSelect, {
             key: 2,
             size: "default",
+            placeholder: "",
             clearable: true,
             modelValue: row[column.prop],
             "onUpdate:modelValue": ($event) => row[column.prop] = $event,
@@ -285,6 +287,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["modelValue", "onUpdate:modelValue"])) : _ctx.columns === "tableColumns" && column.prop === "sortable" ? (openBlock(), createBlock(EleSelect, {
             key: 3,
             size: "default",
+            placeholder: "",
             clearable: true,
             modelValue: row[column.prop],
             "onUpdate:modelValue": ($event) => row[column.prop] = $event,
@@ -304,6 +307,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ])) : column.prop ? (openBlock(), createBlock(unref(ElInput), {
             key: 5,
             size: "default",
+            placeholder: "",
             clearable: true,
             modelValue: row[column.prop],
             "onUpdate:modelValue": ($event) => row[column.prop] = $event
@@ -312,7 +316,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               buttonProps: {
                 type: "danger",
                 plain: true,
-                circle: true,
                 icon: unref(DeleteOutlined)
               },
               tooltip: "删除数据",
@@ -323,7 +326,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               buttonProps: {
                 type: "primary",
                 plain: true,
-                circle: true,
                 icon: unref(PlusOutlined)
               },
               tooltip: "新增子级",
@@ -343,7 +345,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               buttonProps: {
                 type: "danger",
                 plain: true,
-                circle: true,
                 icon: unref(DeleteOutlined)
               },
               tooltip: "删除属性",
@@ -355,7 +356,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               buttonProps: {
                 type: "primary",
                 plain: true,
-                circle: true,
                 icon: unref(AppstoreAddOutlined)
               },
               tooltip: "新增属性",
@@ -365,7 +365,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               buttonProps: {
                 type: "primary",
                 plain: true,
-                circle: true,
                 icon: unref(PlusOutlined)
               },
               tooltip: "新增数据",

package/es/ele-pro-form-builder/components/outline-list.d.ts

@@ -20,8 +20,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     deleteItem: (formItemId: string | number | symbol) => void;
     copyItem: (formItemId: string | number | symbol) => void;
     addChildren: (triggerItem: ProFormItemProps, action?: AddChildrenItemAction | undefined) => void;
+    updateItemChildren: (children: ProFormItemProps[], parentKey?: string | number | symbol | undefined) => void;
     openTableTool: (item: ProFormItemProps, event: MouseEvent) => void;
-    updateItemChildren: (children: ProFormItemProps[], parent?: ProFormItemProps | undefined) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 表单项 */
     items: ProFormItemProps[];
@@ -36,13 +36,13 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     /** 高级表单组件类型数据 */
     itemTypeData?: ProFormItemTypeData[];
 }>>> & Readonly<{
-    "onUpdate:currentFormItemId"?: ((formItemId?: string | number | symbol | undefined) => any) | undefined;
     onToggleItemCollapse?: ((formItemId: string | number | symbol) => any) | undefined;
     onDeleteItem?: ((formItemId: string | number | symbol) => any) | undefined;
     onCopyItem?: ((formItemId: string | number | symbol) => any) | undefined;
     onAddChildren?: ((triggerItem: ProFormItemProps, action?: AddChildrenItemAction | undefined) => any) | undefined;
+    onUpdateItemChildren?: ((children: ProFormItemProps[], parentKey?: string | number | symbol | undefined) => any) | undefined;
+    "onUpdate:currentFormItemId"?: ((formItemId?: string | number | symbol | undefined) => any) | undefined;
     onOpenTableTool?: ((item: ProFormItemProps, event: MouseEvent) => any) | undefined;
-    onUpdateItemChildren?: ((children: ProFormItemProps[], parent?: ProFormItemProps | undefined) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;

package/es/ele-pro-form-builder/components/outline-list.js

@@ -1,8 +1,9 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, withModifiers, createVNode, toDisplayString, createElementBlock } from "vue";
+import { defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createVNode, withModifiers, createElementBlock, toDisplayString } from "vue";
 import VueDraggable from "vuedraggable";
 import { ElIcon } from "element-plus";
-import { ArrowDown, DeleteOutlined, CopyOutlined, InsertRowOutlined, InsertColumnOutlined, AppstoreAddOutlined, PlusSquareDashOutlined, DragOutlined } from "../../icons";
+import { ArrowDown, DeleteOutlined, CopyOutlined, InsertRowOutlined, InsertColumnOutlined, AppstoreAddOutlined, PlusSquareDashOutlined, PlusOutlined, DragOutlined } from "../../icons/index";
 import { isContainerType } from "../../ele-pro-form/util";
+import { fixedChildTypes } from "./build-core";
 import ComponentName from "./component-name";
 const _hoisted_1 = ["title", "onClick"];
 const _hoisted_2 = { class: "ele-pro-form-builder-outline-item-content" };
@@ -22,10 +23,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     componentData: {},
     itemTypeData: {}
   },
-  emits: ["update:currentFormItemId", "toggleItemCollapse", "deleteItem", "copyItem", "addChildren", "openTableTool", "updateItemChildren"],
+  emits: ["update:currentFormItemId", "toggleItemCollapse", "deleteItem", "copyItem", "addChildren", "updateItemChildren", "openTableTool"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const handleOpenTableTool = (item, e) => {
+      emit("openTableTool", item, e);
+    };
     const handleUpdateCurrentFormItemId = (itemId) => {
       emit("update:currentFormItemId", itemId);
     };
@@ -41,14 +45,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleAddChildren = (triggerItem, action) => {
       emit("addChildren", triggerItem, action);
     };
-    const handleOpenTableTool = (item, e) => {
-      emit("openTableTool", item, e);
+    const handleUpdateItemChildren = (children, parentKey) => {
+      emit("updateItemChildren", children, parentKey);
     };
     const handleUpdateModelValue = (data) => {
-      handleUpdateItemChildren(data, props.parent);
-    };
-    const handleUpdateItemChildren = (children, parent) => {
-      emit("updateItemChildren", children, parent);
+      var _a;
+      if (props.parent != null && props.parent.key == null) {
+        return;
+      }
+      handleUpdateItemChildren(data, (_a = props.parent) == null ? void 0 : _a.key);
     };
     const itemIsContainerType = (item) => {
       return isContainerType(item, props.itemTypeData);
@@ -65,6 +70,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         itemKey: "key",
         modelValue: _ctx.items,
         forceFallback: true,
+        fallbackOnBody: true,
         setData: () => void 0,
         group: "ProFormBuilderOutlineSortGroup",
         handle: ".ele-pro-form-builder-outline-item-handle",
@@ -182,15 +188,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               itemIsContainerType(element) && element.type !== "table" && element.type !== "tableRow" ? (openBlock(), createBlock(unref(ElIcon), {
                 key: 6,
                 class: "ele-pro-form-builder-outline-item-tool",
-                title: "添加子级",
+                title: {
+                  tabs: "添加选项卡",
+                  tabPane: "插入选项卡",
+                  collapse: "添加折叠面板",
+                  collapseItem: "插入折叠面板",
+                  row: "添加栅格列",
+                  col: "插入栅格列",
+                  carousel: "添加走马灯",
+                  carouselItem: "插入走马灯",
+                  descriptions: "添加描述列表",
+                  descriptionsItem: "插入描述列表"
+                }[element.type] || "添加子级",
                 onClick: withModifiers(($event) => handleAddChildren(element), ["stop"])
               }, {
                 default: withCtx(() => [
-                  createVNode(unref(PlusSquareDashOutlined))
+                  element.type && unref(fixedChildTypes).some((d) => d.type === element.type) ? (openBlock(), createBlock(unref(PlusSquareDashOutlined), { key: 0 })) : (openBlock(), createBlock(unref(PlusOutlined), {
+                    key: 1,
+                    style: { "transform": "scale(1.1)" }
+                  }))
                 ]),
                 _: 2
-              }, 1032, ["onClick"])) : createCommentVNode("", true),
+              }, 1032, ["title", "onClick"])) : createCommentVNode("", true),
               createVNode(unref(ElIcon), {
+                title: "",
                 class: "ele-pro-form-builder-outline-item-handle",
                 onClick: _cache[0] || (_cache[0] = withModifiers(() => {
                 }, ["stop"]))

package/es/ele-pro-form-builder/components/outline-tree.d.ts

@@ -13,7 +13,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
 }>>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:currentFormItemId": (formItemId?: string | number | symbol | undefined) => void;
     updateItems: (result: UpdateItemsResult) => void;
-    updateItemChildren: (children: ProFormItemProps[], parent?: ProFormItemProps | undefined) => void;
+    updateItemChildren: (children: ProFormItemProps[], parentKey?: string | number | symbol | undefined) => void;
     openTableTool: (formItemId: string, el: HTMLElement) => void;
     openComponentPicker: (formItemId: string) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
@@ -27,9 +27,9 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     itemTypeData?: ProFormItemTypeData[];
 }>>> & Readonly<{
     onUpdateItems?: ((result: UpdateItemsResult) => any) | undefined;
-    "onUpdate:currentFormItemId"?: ((formItemId?: string | number | symbol | undefined) => any) | undefined;
+    onUpdateItemChildren?: ((children: ProFormItemProps[], parentKey?: string | number | symbol | undefined) => any) | undefined;
     onOpenTableTool?: ((formItemId: string, el: HTMLElement) => any) | undefined;
-    onUpdateItemChildren?: ((children: ProFormItemProps[], parent?: ProFormItemProps | undefined) => any) | undefined;
+    "onUpdate:currentFormItemId"?: ((formItemId?: string | number | symbol | undefined) => any) | undefined;
     onOpenComponentPicker?: ((formItemId: string) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/ele-pro-form-builder/components/outline-tree.js

@@ -1,10 +1,11 @@
-import { defineComponent, ref, watch, openBlock, createElementBlock, createBlock, createCommentVNode, unref } from "vue";
+import { defineComponent, ref, watch, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, unref } from "vue";
 import { ElEmpty } from "element-plus";
-import { findTree } from "../../utils/core";
+import { findTree } from "../../utils/common";
 import { fixedChildTypes } from "./build-core";
 import { generateCopyItemData, generateAddChildData } from "./build-util";
 import OutlineList from "./outline-list";
 const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{ name: "OutlineTree" },
   __name: "outline-tree",
   props: {
     formItems: {},
@@ -16,7 +17,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const outlineWrapperRef = ref(null);
     const collapseItemIds = ref([]);
     const handleUpdateCurrentFormItemId = (itemId) => {
       emit("update:currentFormItemId", itemId);
@@ -59,8 +59,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       );
       emit("openTableTool", item.key, triggerEl);
     };
-    const handleUpdateItemChildren = (children, parent) => {
-      emit("updateItemChildren", children, parent);
+    const handleUpdateItemChildren = (children, parentKey) => {
+      emit("updateItemChildren", children, parentKey);
     };
     const handleToggleItemCollapse = (formItemId) => {
       const index = collapseItemIds.value.indexOf(formItemId);
@@ -82,11 +82,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       { deep: true }
     );
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        ref_key: "outlineWrapperRef",
-        ref: outlineWrapperRef,
-        class: "ele-pro-form-builder-outline-wrapper"
-      }, [
+      return openBlock(), createElementBlock(Fragment, null, [
         _ctx.formItems ? (openBlock(), createBlock(OutlineList, {
           key: 0,
           items: _ctx.formItems,
@@ -107,7 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           imageSize: 58,
           class: "ele-pro-form-builder-form-empty"
         })) : createCommentVNode("", true)
-      ], 512);
+      ], 64);
     };
   }
 });

package/es/ele-pro-form-builder/components/preview-modal.d.ts

@@ -1,13 +1,13 @@
 import { ProFormItemTypeData } from '../../ele-pro-form/types';
 import { UserComponent } from '../../ele-app/types';
-import { TemplateFormConfig } from '../types';
+import { EleProFormProps } from '../../ele-app/plus';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 弹窗是否打开 */
     modelValue?: boolean;
     /** 表单属性 */
-    formProps?: TemplateFormConfig;
+    formProps?: EleProFormProps;
     /** 高级表单组件 */
     proFormComponent?: UserComponent;
     /** 高级表单组件类型数据 */
@@ -21,7 +21,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     /** 弹窗是否打开 */
     modelValue?: boolean;
     /** 表单属性 */
-    formProps?: TemplateFormConfig;
+    formProps?: EleProFormProps;
     /** 高级表单组件 */
     proFormComponent?: UserComponent;
     /** 高级表单组件类型数据 */

package/es/ele-pro-form-builder/components/preview-modal.js

@@ -1,16 +1,18 @@
-import { defineComponent, ref, reactive, watch, nextTick, openBlock, createBlock, withCtx, createElementVNode, createElementBlock, Fragment, renderList, unref, normalizeClass, resolveDynamicComponent, normalizeStyle, mergeProps, createSlots, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, reactive, watch, nextTick, createBlock, openBlock, withCtx, resolveDynamicComponent, mergeProps, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, createElementBlock, Fragment, unref, normalizeClass, normalizeStyle } from "vue";
 import { ElIcon } from "element-plus";
 import EleModal from "../../ele-modal/index";
 import { setValue, mergeValue, getFormInitValue } from "../../ele-pro-form/util";
 import EleProForm from "../../ele-pro-form/index";
 import { screenItems } from "../util";
+import { deepCloneObject } from "./build-core";
 const _hoisted_1 = { class: "ele-pro-form-builder-screen-radio" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{ name: "PreviewModal" },
   __name: "preview-modal",
   props: {
     modelValue: { type: Boolean },
     formProps: {},
-    proFormComponent: {},
+    proFormComponent: { type: [String, Object, Function] },
     itemTypeData: {},
     httpRequest: {}
   },
@@ -38,7 +40,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       mergeValue(
         formData,
-        getFormInitValue((_a = previewFormProps.value) == null ? void 0 : _a.items, props.itemTypeData)
+        getFormInitValue((_a = previewFormProps.value) == null ? void 0 : _a.items, props.itemTypeData, true)
       );
     };
     const handleUpdatePreviewScreen = (size) => {
@@ -48,14 +50,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       () => props.modelValue,
       (visible) => {
         if (visible) {
-          previewFormProps.value = JSON.parse(
-            JSON.stringify(props.formProps || { items: [] })
+          previewFormProps.value = deepCloneObject(
+            props.formProps || { items: [] }
           );
           handlePreviewFormReset();
           nextTick(() => {
+            var _a, _b;
+            (_b = (_a = previewFormRef.value) == null ? void 0 : _a.clearValidate) == null ? void 0 : _b.call(_a);
             nextTick(() => {
-              var _a, _b;
-              (_b = (_a = previewFormRef.value) == null ? void 0 : _a.clearValidate) == null ? void 0 : _b.call(_a);
+              var _a2, _b2;
+              (_b2 = (_a2 = previewFormRef.value) == null ? void 0 : _a2.clearValidate) == null ? void 0 : _b2.call(_a2);
             });
           });
         }
@@ -63,12 +67,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleModal, {
-        width: 960,
+        width: 980,
         maxable: true,
         draggable: false,
         position: "center",
         closeOnClickModal: false,
         destroyOnClose: true,
+        modalBodyClass: [
+          "ele-pro-form-builder-preview",
+          previewScreen.value === "pad" ? "is-pad" : previewScreen.value === "phone" ? "is-phone" : "is-pc"
+        ].join(" "),
         modelValue: _ctx.modelValue,
         "onUpdate:modelValue": handleUpdateModelValue
       }, {
@@ -99,17 +107,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ref_key: "previewFormRef",
             ref: previewFormRef,
             model: formData,
-            searchExpand: formData.searchExpand,
-            "onUpdate:searchExpand": _cache[0] || (_cache[0] = ($event) => formData.searchExpand = $event),
             editable: false,
+            screenSize: previewScreen.value,
             itemTypeData: _ctx.itemTypeData,
             httpRequest: _ctx.httpRequest,
-            class: [
-              "ele-pro-form-builder-preview-form",
-              { "is-pc": previewScreen.value === "pc" },
-              { "is-pad": previewScreen.value === "pad" },
-              { "is-phone": previewScreen.value === "phone" }
-            ],
+            class: "ele-pro-form-builder-preview-form",
             onUpdateValue: setPreviewFormDataFieldValue,
             onSubmit: handlePreviewFormSubmit,
             onReset: handlePreviewFormReset
@@ -122,10 +124,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ])
               };
             })
-          ]), 1040, ["model", "searchExpand", "itemTypeData", "httpRequest", "class"]))
+          ]), 1040, ["model", "screenSize", "itemTypeData", "httpRequest"]))
         ]),
         _: 3
-      }, 8, ["modelValue"]);
+      }, 8, ["modalBodyClass", "modelValue"]);
     };
   }
 });