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

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

@@ -1,7 +1,9 @@
-import { defineComponent, ref, reactive, watch, nextTick, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createElementBlock, Fragment, renderList, unref, normalizeClass, resolveDynamicComponent, normalizeStyle, mergeProps, createSlots, renderSlot, normalizeProps, guardReactiveProps } from "vue";
-import { setValue, mergeValue } from "../../ele-pro-form/util";
+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 { 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, getFormInitValue } from "../util";
+import { screenItems } from "../util";
 const _hoisted_1 = { class: "ele-pro-form-builder-screen-radio" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "preview-modal",
@@ -9,7 +11,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     modelValue: { type: Boolean },
     formProps: {},
     proFormComponent: {},
-    itemTypeData: {}
+    itemTypeData: {},
+    httpRequest: {}
   },
   emits: ["update:modelValue", "previewFormSubmit"],
   setup(__props, { emit: __emit }) {
@@ -59,21 +62,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     );
     return (_ctx, _cache) => {
-      const _component_ElIcon = resolveComponent("ElIcon");
-      const _component_EleModal = resolveComponent("EleModal");
-      return openBlock(), createBlock(_component_EleModal, {
-        width: 800,
+      return openBlock(), createBlock(EleModal, {
+        width: 960,
         maxable: true,
         draggable: false,
         position: "center",
         closeOnClickModal: false,
+        destroyOnClose: true,
         modelValue: _ctx.modelValue,
         "onUpdate:modelValue": handleUpdateModelValue
       }, {
         header: withCtx(() => [
           createElementVNode("div", _hoisted_1, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(unref(screenItems), (item) => {
-              return openBlock(), createBlock(_component_ElIcon, {
+              return openBlock(), createBlock(unref(ElIcon), {
                 key: item.value,
                 class: normalizeClass([
                   "ele-pro-form-builder-header-tool",
@@ -93,10 +95,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ])
         ]),
         default: withCtx(() => [
-          (openBlock(), createBlock(resolveDynamicComponent(_ctx.proFormComponent || EleProForm), mergeProps({
-            footer: true,
-            validateOnRuleChange: false
-          }, previewFormProps.value, {
+          (openBlock(), createBlock(resolveDynamicComponent(_ctx.proFormComponent || EleProForm), mergeProps({ validateOnRuleChange: false }, previewFormProps.value, {
             ref_key: "previewFormRef",
             ref: previewFormRef,
             model: formData,
@@ -104,6 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:searchExpand": _cache[0] || (_cache[0] = ($event) => formData.searchExpand = $event),
             editable: false,
             itemTypeData: _ctx.itemTypeData,
+            httpRequest: _ctx.httpRequest,
             class: [
               "ele-pro-form-builder-preview-form",
               { "is-pc": previewScreen.value === "pc" },
@@ -122,7 +122,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ])
               };
             })
-          ]), 1040, ["model", "searchExpand", "itemTypeData", "class"]))
+          ]), 1040, ["model", "searchExpand", "itemTypeData", "httpRequest", "class"]))
         ]),
         _: 3
       }, 8, ["modelValue"]);

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

@@ -14,13 +14,22 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_TypePropsToRu
     componentData?: ComponentGroup[];
     /** 高级表单组件 */
     proFormComponent?: UserComponent;
+    /** 代码编辑器组件 */
+    codeEditerComponent?: UserComponent;
+    /** JSON 编辑器组件 */
+    jsonEditerComponent?: UserComponent;
+    /** 富文本编辑器组件 */
+    htmlEditerComponent?: UserComponent;
     /** 高级表单组件类型数据 */
     itemTypeData?: ProFormItemTypeData[];
+    /** 远程数据源请求工具 */
+    httpRequest?: any;
 }>, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:currentFormItemId": (formItemId?: string | undefined) => void;
     updateItem: (formItemId: string | number | symbol, field: string, value: any) => void;
     updateItems: (result: UpdateItemsResult) => void;
     sortItemChildren: (childIds: string[], formItemId: string | number | symbol) => void;
+    openComponentPicker: (formItemId: string) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 选中的表单项 id */
     currentFormItemId?: ProFormItemKey;
@@ -32,13 +41,22 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_TypePropsToRu
     componentData?: ComponentGroup[];
     /** 高级表单组件 */
     proFormComponent?: UserComponent;
+    /** 代码编辑器组件 */
+    codeEditerComponent?: UserComponent;
+    /** JSON 编辑器组件 */
+    jsonEditerComponent?: UserComponent;
+    /** 富文本编辑器组件 */
+    htmlEditerComponent?: UserComponent;
     /** 高级表单组件类型数据 */
     itemTypeData?: ProFormItemTypeData[];
+    /** 远程数据源请求工具 */
+    httpRequest?: any;
 }>>> & {
-    onUpdateItems?: ((result: UpdateItemsResult) => any) | undefined;
     "onUpdate:currentFormItemId"?: ((formItemId?: string | undefined) => any) | undefined;
+    onUpdateItems?: ((result: UpdateItemsResult) => any) | undefined;
     onUpdateItem?: ((formItemId: string | number | symbol, field: string, value: any) => any) | undefined;
     onSortItemChildren?: ((childIds: string[], formItemId: string | number | symbol) => any) | undefined;
+    onOpenComponentPicker?: ((formItemId: string) => any) | undefined;
 }, {}, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/es/ele-pro-form-builder/components/props-form.js

@@ -1,10 +1,14 @@
-import { defineComponent, ref, reactive, watch, openBlock, createElementBlock, Fragment, createBlock, resolveDynamicComponent, createSlots, withCtx, createVNode, mergeProps, renderList, renderSlot, normalizeProps, guardReactiveProps, unref, createCommentVNode } from "vue";
-import { ElEmpty } from "element-plus";
+import { defineComponent, ref, reactive, watch, openBlock, createElementBlock, Fragment, createBlock, resolveDynamicComponent, createSlots, withCtx, createVNode, mergeProps, unref, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode } from "vue";
+import { ElInput, ElEmpty } from "element-plus";
 import { findTree } from "../../utils/core";
 import EleProForm from "../../ele-pro-form/index";
-import { getFormDataAndItems } from "../util";
+import { getFormDataAndItems, fixedChildTypes } from "./build-core";
 import { generateAddChildData } from "./build-util";
 import OptionsEdit from "./options-edit";
+import EventEdit from "./event-edit";
+import HtmlEdit from "./html-edit";
+import IfEdit from "./if-edit";
+import SourceEdit from "./source-edit";
 import ChildrenEdit from "./children-edit";
 import StyleEdit from "./style-edit";
 import JsonInput from "./json-input";
@@ -16,16 +20,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configFormPresetProps: {},
     componentData: {},
     proFormComponent: {},
-    itemTypeData: {}
+    codeEditerComponent: {},
+    jsonEditerComponent: {},
+    htmlEditerComponent: {},
+    itemTypeData: {},
+    httpRequest: {}
   },
-  emits: ["update:currentFormItemId", "updateItem", "updateItems", "sortItemChildren"],
+  emits: ["update:currentFormItemId", "updateItem", "updateItems", "sortItemChildren", "openComponentPicker"],
   setup(__props, { emit: __emit }) {
-    const ownSlots = [
-      "proFormBuilderOptionsEdit",
-      "proFormBuilderChildrenEdit",
-      "proFormBuilderStyleEdit",
-      "proFormBuilderJsonInput"
-    ];
     const props = __props;
     const emit = __emit;
     const propsProFormRef = ref(null);
@@ -37,8 +39,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         emit("updateItem", props.currentFormItemId, field, value);
       }
     };
-    const handleUpdateChildLabel = (label, child) => {
-      emit("updateItem", child.key, "label", label);
+    const handleUpdateChildLabel = (label, child, field) => {
+      emit("updateItem", child.key, field, label);
     };
     const handleSortChildren = (children) => {
       if (props.currentFormItemId != null) {
@@ -58,14 +60,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const handleAddChildren = (parent) => {
       var _a;
-      const result = generateAddChildData(
-        parent,
-        void 0,
-        void 0,
-        void 0,
-        (_a = props.formProps) == null ? void 0 : _a.items
-      );
-      emit("updateItems", result);
+      if (parent.type && fixedChildTypes.some((d) => d.type === parent.type)) {
+        const result = generateAddChildData(
+          parent,
+          void 0,
+          void 0,
+          void 0,
+          (_a = props.formProps) == null ? void 0 : _a.items,
+          void 0,
+          props.componentData
+        );
+        emit("updateItems", result);
+      } else {
+        emit("openComponentPicker", parent.key);
+      }
     };
     const handleUpdateCurrentFormItemId = (formItemId) => {
       emit("update:currentFormItemId", formItemId);
@@ -129,41 +137,108 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           model: propsFormData,
           items: propsFormItems.value,
           itemTypeData: _ctx.itemTypeData,
+          httpRequest: _ctx.httpRequest,
           class: "ele-pro-form-builder-props-form",
           onUpdateValue: handleUpdateItem
-        }, createSlots({
-          proFormBuilderOptionsEdit: withCtx(({ item, modelValue, updateValue }) => [
-            createVNode(OptionsEdit, mergeProps(item.props || {}, {
-              modelValue,
-              "onUpdate:modelValue": updateValue
-            }), null, 16, ["modelValue", "onUpdate:modelValue"])
-          ]),
-          proFormBuilderChildrenEdit: withCtx(({ item }) => [
-            (openBlock(), createBlock(ChildrenEdit, mergeProps({ key: _ctx.currentFormItemId }, item.props || {}, {
-              formItem: currentFormItem.value,
-              componentData: _ctx.componentData,
-              onUpdateChildLabel: handleUpdateChildLabel,
-              onSortChildren: handleSortChildren,
-              onDeleteChildren: handleDeleteChildren,
-              onAddChildren: handleAddChildren,
-              "onUpdate:currentFormItemId": handleUpdateCurrentFormItemId
-            }), null, 16, ["formItem", "componentData"]))
-          ]),
-          proFormBuilderStyleEdit: withCtx(({ item, modelValue, updateValue }) => [
-            (openBlock(), createBlock(StyleEdit, mergeProps({ key: _ctx.currentFormItemId }, item.props || {}, {
-              modelValue,
-              "onUpdate:modelValue": updateValue
-            }), null, 16, ["modelValue", "onUpdate:modelValue"]))
-          ]),
-          proFormBuilderJsonInput: withCtx(({ item, modelValue, updateValue }) => [
-            (openBlock(), createBlock(JsonInput, mergeProps({ key: _ctx.currentFormItemId }, item.props || {}, {
-              modelValue,
-              "onUpdate:modelValue": updateValue
-            }), null, 16, ["modelValue", "onUpdate:modelValue"]))
-          ]),
-          _: 2
-        }, [
-          renderList(Object.keys(_ctx.$slots).filter((k) => !ownSlots.includes(k)), (name) => {
+        }, createSlots({ _: 2 }, [
+          !_ctx.$slots.proFormBuilderOptionsEdit ? {
+            name: "proFormBuilderOptionsEdit",
+            fn: withCtx(({ item, modelValue, updateValue }) => [
+              createVNode(OptionsEdit, mergeProps({ codeEditerComponent: _ctx.codeEditerComponent }, item.props || {}, {
+                modelValue,
+                "onUpdate:modelValue": updateValue
+              }), null, 16, ["codeEditerComponent", "modelValue", "onUpdate:modelValue"])
+            ]),
+            key: "0"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderEventEdit ? {
+            name: "proFormBuilderEventEdit",
+            fn: withCtx(({ item, modelValue, updateValue }) => [
+              createVNode(EventEdit, mergeProps({ codeEditerComponent: _ctx.codeEditerComponent }, item.props || {}, {
+                modelValue,
+                "onUpdate:modelValue": updateValue
+              }), null, 16, ["codeEditerComponent", "modelValue", "onUpdate:modelValue"])
+            ]),
+            key: "1"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderHtmlEdit ? {
+            name: "proFormBuilderHtmlEdit",
+            fn: withCtx(({ item, modelValue, updateValue }) => [
+              createVNode(HtmlEdit, mergeProps({ htmlEditerComponent: _ctx.htmlEditerComponent }, item.props || {}, {
+                modelValue,
+                "onUpdate:modelValue": updateValue
+              }), null, 16, ["htmlEditerComponent", "modelValue", "onUpdate:modelValue"])
+            ]),
+            key: "2"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderIfEdit ? {
+            name: "proFormBuilderIfEdit",
+            fn: withCtx(({ item, modelValue, updateValue }) => [
+              createVNode(IfEdit, mergeProps({ codeEditerComponent: _ctx.codeEditerComponent }, item.props || {}, {
+                modelValue,
+                "onUpdate:modelValue": updateValue
+              }), null, 16, ["codeEditerComponent", "modelValue", "onUpdate:modelValue"])
+            ]),
+            key: "3"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderSourceEdit ? {
+            name: "proFormBuilderSourceEdit",
+            fn: withCtx(({ item, model, updatePropValue }) => [
+              createVNode(SourceEdit, mergeProps({ jsonEditerComponent: _ctx.jsonEditerComponent }, item.props || {}, {
+                modelValue: model,
+                "onUpdate:modelValue": (val) => updatePropValue("", val)
+              }), null, 16, ["jsonEditerComponent", "modelValue", "onUpdate:modelValue"])
+            ]),
+            key: "4"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderChildrenEdit ? {
+            name: "proFormBuilderChildrenEdit",
+            fn: withCtx(({ item }) => [
+              (openBlock(), createBlock(ChildrenEdit, mergeProps({ key: _ctx.currentFormItemId }, item.props || {}, {
+                formItem: currentFormItem.value,
+                componentData: _ctx.componentData,
+                onUpdateChildLabel: handleUpdateChildLabel,
+                onSortChildren: handleSortChildren,
+                onDeleteChildren: handleDeleteChildren,
+                onAddChildren: handleAddChildren,
+                "onUpdate:currentFormItemId": handleUpdateCurrentFormItemId
+              }), null, 16, ["formItem", "componentData"]))
+            ]),
+            key: "5"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderStyleEdit ? {
+            name: "proFormBuilderStyleEdit",
+            fn: withCtx(({ item, modelValue, updateValue }) => [
+              (openBlock(), createBlock(StyleEdit, mergeProps({ key: _ctx.currentFormItemId }, item.props || {}, {
+                modelValue,
+                "onUpdate:modelValue": updateValue
+              }), null, 16, ["modelValue", "onUpdate:modelValue"]))
+            ]),
+            key: "6"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderJsonInput ? {
+            name: "proFormBuilderJsonInput",
+            fn: withCtx(({ item, modelValue, updateValue }) => [
+              (openBlock(), createBlock(JsonInput, mergeProps({ key: _ctx.currentFormItemId }, item.props || {}, {
+                modelValue,
+                "onUpdate:modelValue": updateValue
+              }), null, 16, ["modelValue", "onUpdate:modelValue"]))
+            ]),
+            key: "7"
+          } : void 0,
+          !_ctx.$slots.proFormBuilderIconInput ? {
+            name: "proFormBuilderIconInput",
+            fn: withCtx(({ modelValue, updateValue }) => [
+              createVNode(unref(ElInput), {
+                size: "small",
+                clearable: true,
+                modelValue,
+                "onUpdate:modelValue": updateValue
+              }, null, 8, ["modelValue", "onUpdate:modelValue"])
+            ]),
+            key: "8"
+          } : void 0,
+          renderList(Object.keys(_ctx.$slots), (name) => {
             return {
               name,
               fn: withCtx((slotProps) => [
@@ -171,7 +246,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             };
           })
-        ]), 1064, ["model", "items", "itemTypeData"])),
+        ]), 1064, ["model", "items", "itemTypeData", "httpRequest"])),
         !currentFormItem.value ? (openBlock(), createBlock(unref(ElEmpty), {
           key: 0,
           imageSize: 58,

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

@@ -0,0 +1,31 @@
+import { UserComponent } from '../../ele-app/types';
+
+declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<{
+    /** 数据 */
+    modelValue?: Record<string, any>;
+    /** 弹窗标题 */
+    title?: string;
+    /** JSON 编辑器组件 */
+    jsonEditerComponent?: UserComponent;
+}>, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    "update:modelValue": (data?: Record<string, any> | undefined) => void;
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
+    /** 数据 */
+    modelValue?: Record<string, any>;
+    /** 弹窗标题 */
+    title?: string;
+    /** JSON 编辑器组件 */
+    jsonEditerComponent?: UserComponent;
+}>>> & {
+    "onUpdate:modelValue"?: ((data?: Record<string, any> | undefined) => any) | undefined;
+}, {}, {}>;
+export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};

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

@@ -0,0 +1,111 @@
+import { defineComponent, ref, openBlock, createElementBlock, Fragment, createVNode, unref, withCtx, createTextVNode, toDisplayString, createElementVNode, createBlock, resolveDynamicComponent } from "vue";
+import { ElButton } from "element-plus";
+import { omit } from "../../utils/core";
+import EleModal from "../../ele-modal/index";
+import CodeEditer from "./code-editer";
+const _hoisted_1 = { class: "ele-pro-form-builder-code-edit-wrapper" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "source-edit",
+  props: {
+    modelValue: {},
+    title: {},
+    jsonEditerComponent: {}
+  },
+  emits: ["update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const visible = ref(false);
+    const jsonContent = ref("");
+    const openModal = () => {
+      jsonContent.value = JSON.stringify(
+        omit(props.modelValue || {}, ["key", "children"]),
+        void 0,
+        2
+      );
+      visible.value = true;
+    };
+    const handleCancel = () => {
+      visible.value = false;
+      jsonContent.value = "";
+    };
+    const handleSave = () => {
+      if (jsonContent.value) {
+        let result;
+        try {
+          result = JSON.parse(jsonContent.value);
+        } catch (e) {
+          console.error(e);
+        }
+        if (result) {
+          handleCancel();
+          emit("update:modelValue", result);
+        }
+      }
+    };
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock(Fragment, null, [
+        createVNode(unref(ElButton), {
+          size: "small",
+          style: { width: "100%" },
+          onClick: openModal
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString(_ctx.title), 1)
+          ]),
+          _: 1
+        }),
+        createVNode(EleModal, {
+          width: 800,
+          maxable: true,
+          position: "center",
+          title: _ctx.title,
+          modelValue: visible.value,
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => visible.value = $event),
+          closeOnClickModal: false,
+          destroyOnClose: true,
+          bodyStyle: {
+            height: "520px",
+            minHeight: "100%",
+            maxHeight: "100%",
+            padding: "8px 16px"
+          }
+        }, {
+          footer: withCtx(() => [
+            createVNode(unref(ElButton), {
+              size: "default",
+              onClick: handleCancel
+            }, {
+              default: withCtx(() => [
+                createTextVNode("取消")
+              ]),
+              _: 1
+            }),
+            createVNode(unref(ElButton), {
+              type: "primary",
+              size: "default",
+              onClick: handleSave
+            }, {
+              default: withCtx(() => [
+                createTextVNode(" 保存 ")
+              ]),
+              _: 1
+            })
+          ]),
+          default: withCtx(() => [
+            createElementVNode("div", _hoisted_1, [
+              (openBlock(), createBlock(resolveDynamicComponent(_ctx.jsonEditerComponent || CodeEditer), {
+                modelValue: jsonContent.value,
+                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => jsonContent.value = $event)
+              }, null, 8, ["modelValue"]))
+            ])
+          ]),
+          _: 1
+        }, 8, ["title", "modelValue"])
+      ], 64);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/es/ele-pro-form-builder/components/table-tool-menu.d.ts

@@ -1,16 +1,21 @@
 import { ProFormItemProps } from '../../ele-pro-form/types';
-import { UpdateItemsResult } from '../types';
+import { ComponentGroup, UpdateItemsResult } from '../types';
 
 declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<{
     /** 全部表单项 */
     formItems?: ProFormItemProps[];
+    /** 组件库数据 */
+    componentData?: ComponentGroup[];
 }>, {
     openMenu: (formItemId: string, triggerEl?: HTMLElement) => void;
+    hideMenu: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     updateItems: (result: UpdateItemsResult) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 全部表单项 */
     formItems?: ProFormItemProps[];
+    /** 组件库数据 */
+    componentData?: ComponentGroup[];
 }>>> & {
     onUpdateItems?: ((result: UpdateItemsResult) => any) | undefined;
 }, {}, {}>;

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

@@ -4,7 +4,8 @@ import { getTableFormItemByTd, generateAddTableColData, generateAddTableRowData,
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "table-tool-menu",
   props: {
-    formItems: {}
+    formItems: {},
+    componentData: {}
   },
   emits: ["updateItems"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -24,7 +25,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!tableFormItem || !tdFormItem) {
         return;
       }
-      const result = (actionType === "addTableCol" ? generateAddTableColData : generateAddTableRowData)(tableFormItem, props.formItems, tdFormItem, position);
+      const result = (actionType === "addTableCol" ? generateAddTableColData : generateAddTableRowData)(
+        tableFormItem,
+        props.formItems,
+        tdFormItem,
+        position,
+        props.componentData
+      );
       handleUpdateItems(result);
     };
     const handleSplitCell = (formItemId) => {
@@ -38,7 +45,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const result = getTableSplitEffects(
         tableFormItem,
         props.formItems,
-        tdFormItem
+        tdFormItem,
+        props.componentData
       );
       handleUpdateItems(result);
     };
@@ -53,7 +61,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const result = getTableDeleteRowEffects(
         tableFormItem,
         props.formItems,
-        trItemIndex
+        trItemIndex,
+        props.componentData
       );
       handleUpdateItems(result);
     };
@@ -68,7 +77,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const result = getTableDeleteColEffects(
         tableFormItem,
         props.formItems,
-        tdFormItem
+        tdFormItem,
+        props.componentData
       );
       handleUpdateItems(result);
     };
@@ -80,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!tableFormItem || !tdFormItem) {
         return;
       }
-      const result = (actionType === "mergeBelowCell" ? getTableMergeBelowEffects : getTableMergeRightEffects)(tableFormItem, props.formItems, tdFormItem);
+      const result = (actionType === "mergeBelowCell" ? getTableMergeBelowEffects : getTableMergeRightEffects)(tableFormItem, props.formItems, tdFormItem, props.componentData);
       handleUpdateItems(result);
     };
     const hideTableToolDropdown = () => {
@@ -122,7 +132,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       });
     };
-    __expose({ openMenu });
+    const hideMenu = () => {
+      hideTableToolDropdown();
+    };
+    __expose({
+      openMenu,
+      hideMenu
+    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleDropdown, {
         triggerKeys: [],