@fecp/designer 5.4.19 → 5.4.20

package/es/designer/src/packages/event/pageEvent.vue.mjs

@@ -10,7 +10,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
 /* empty css                                                               */
 /* empty css                                                               */
 /* empty css                                                             */
-import { useModel, computed, ref, watch, createBlock, openBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, normalizeClass, createTextVNode, toDisplayString, createCommentVNode, normalizeStyle } from "vue";
+import { useModel, computed, ref, watch, resolveComponent, createBlock, openBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, normalizeClass, createTextVNode, toDisplayString, createCommentVNode, normalizeStyle } from "vue";
 import _sfc_main$1 from "../eventFlow/index.vue.mjs";
 import defaultProcessData from "../eventFlow/defaultProcessData.mjs";
 import { getEditConfigData, cloneDeep } from "../utils/common.mjs";
@@ -20,6 +20,7 @@ import { getEditConfigData, cloneDeep } from "../utils/common.mjs";
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElDialog } from "../../../../node_modules/element-plus/es/components/dialog/index.mjs";
 import { ElContainer, ElAside, ElHeader, ElMain } from "../../../../node_modules/element-plus/es/components/container/index.mjs";
+import { ElIcon } from "../../../../node_modules/element-plus/es/components/icon/index.mjs";
 import { ElTabs, ElTabPane } from "../../../../node_modules/element-plus/es/components/tabs/index.mjs";
 import { ElButton } from "../../../../node_modules/element-plus/es/components/button/index.mjs";
 import { ElMessage } from "../../../../node_modules/element-plus/es/components/message/index.mjs";
@@ -94,6 +95,9 @@ const _sfc_main = {
         throw errors;
       }
     };
+    const handleRemoveEvent = (index) => {
+      pageEvents.value[index].eventFlow = createEventFlow();
+    };
     const onConfirm = async () => {
       try {
         if (activeTab.value === "eventFlow") {
@@ -109,6 +113,8 @@ const _sfc_main = {
     };
     return (_ctx, _cache) => {
       const _component_el_header = ElHeader;
+      const _component_Delete = resolveComponent("Delete");
+      const _component_el_icon = ElIcon;
       const _component_el_main = ElMain;
       const _component_el_container = ElContainer;
       const _component_el_aside = ElAside;
@@ -184,7 +190,16 @@ const _sfc_main = {
                                     createElementVNode("span", null, toDisplayString(event.name), 1)
                                   ]),
                                   createElementVNode("span", _hoisted_4, toDisplayString(event.description), 1)
-                                ])
+                                ]),
+                                createVNode(_component_el_icon, {
+                                  class: "delete-icon",
+                                  onClick: ($event) => handleRemoveEvent(index)
+                                }, {
+                                  default: withCtx(() => [
+                                    createVNode(_component_Delete)
+                                  ]),
+                                  _: 2
+                                }, 1032, ["onClick"])
                               ])
                             ], 10, _hoisted_1);
                           }), 128))
@@ -253,7 +268,7 @@ const _sfc_main = {
     };
   }
 };
-const PageEvent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-eb92bfe7"]]);
+const PageEvent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6bd0ac6f"]]);
 export {
   PageEvent as default
 };

package/es/designer/src/packages/eventFlow/dialog/action/Dialog.vue.mjs

@@ -2,24 +2,18 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                */
 /* empty css                                                                    */
 /* empty css                                                                        */
-/* empty css                                                                     */
-/* empty css                                                                  */
-/* empty css                                                                     */
-/* empty css                                                                           */
-/* empty css                                                                     */
-/* empty css                                                                        */
 /* empty css                                                                    */
 /* empty css                                                                          */
 /* empty css                                                                           */
-import { ref, watch, computed, createElementBlock, openBlock, Fragment, createVNode, createBlock, createCommentVNode, withCtx, createTextVNode, renderList, unref } from "vue";
+import { ref, watch, computed, createElementBlock, openBlock, Fragment, createVNode, createBlock, createCommentVNode, withCtx, createTextVNode, unref } from "vue";
 import { getEditConfigData } from "../../../utils/common.mjs";
 import FieldSetMapping from "../../../../components/FieldSetMapping.vue2.mjs";
 import OnlyFLowConfigButton from "../../../../components/OnlyFLowConfigButton.vue2.mjs";
-import _sfc_main$1 from "../../../../components/FormulaEditorInput.vue.mjs";
+import _sfc_main$2 from "../../../../components/FormulaEditorInput.vue.mjs";
 import api from "../../../../api/index.mjs";
+import _sfc_main$1 from "../../../../components/DialogSelect.vue.mjs";
 import { ElFormItem } from "../../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElRadioGroup, ElRadioButton } from "../../../../../../node_modules/element-plus/es/components/radio/index.mjs";
-import { ElSelect, ElOption } from "../../../../../../node_modules/element-plus/es/components/select/index.mjs";
 import { ElInput } from "../../../../../../node_modules/element-plus/es/components/input/index.mjs";
 const _sfc_main = {
   __name: "Dialog",
@@ -120,8 +114,6 @@ const _sfc_main = {
       const _component_el_radio_button = ElRadioButton;
       const _component_el_radio_group = ElRadioGroup;
       const _component_el_form_item = ElFormItem;
-      const _component_el_option = ElOption;
-      const _component_el_select = ElSelect;
       const _component_el_input = ElInput;
       return openBlock(), createElementBlock(Fragment, null, [
         createVNode(_component_el_form_item, { label: "弹层来源" }, {
@@ -152,27 +144,15 @@ const _sfc_main = {
         }),
         createVNode(_component_el_form_item, { label: "选择弹层" }, {
           default: withCtx(() => [
-            createVNode(_component_el_select, {
+            createVNode(_sfc_main$1, {
               modelValue: __props.formData.dialogId,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.formData.dialogId = $event),
-              placeholder: "请选择弹层",
-              filterable: "",
               size: "small",
               loading: loading.value,
-              clearable: "",
-              onChange: handleDialogChange
-            }, {
-              default: withCtx(() => [
-                (openBlock(true), createElementBlock(Fragment, null, renderList(dialogOptions.value, (dialog) => {
-                  return openBlock(), createBlock(_component_el_option, {
-                    key: dialog.id,
-                    label: dialog.name,
-                    value: dialog.id
-                  }, null, 8, ["label", "value"]);
-                }), 128))
-              ]),
-              _: 1
-            }, 8, ["modelValue", "loading"])
+              onChange: handleDialogChange,
+              dialogOptions: dialogOptions.value,
+              isGlobal: __props.formData.dialogSource == "global"
+            }, null, 8, ["modelValue", "loading", "dialogOptions", "isGlobal"])
           ]),
           _: 1
         }),
@@ -220,7 +200,7 @@ const _sfc_main = {
             }),
             createVNode(_component_el_form_item, { label: "选取后反显格式" }, {
               default: withCtx(() => [
-                createVNode(unref(_sfc_main$1), {
+                createVNode(unref(_sfc_main$2), {
                   title: "反显格式配置",
                   formulaConf: __props.formData.displayFormat,
                   "onUpdate:formulaConf": _cache[4] || (_cache[4] = ($event) => __props.formData.displayFormat = $event),

package/es/designer/src/packages/form/aside/index.mjs

@@ -102,6 +102,7 @@ const components = [
         titleMode: "none",
         dataSourceFrom: "main",
         formSource: "select",
+        subFormParams: [],
         ...defaultProperty
       },
       {

package/es/designer/src/packages/form/property/subForm.vue.mjs

@@ -3,7 +3,6 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                    */
 /* empty css                                                                         */
 /* empty css                                                                */
-/* empty css                                                                  */
 /* empty css                                                                 */
 /* empty css                                                                       */
 /* empty css                                                                        */
@@ -14,11 +13,11 @@ import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import TemplateSelector from "../../../components/TemplateSelector.vue.mjs";
 import emitter from "../../utils/eventBus.mjs";
 import ValueSelector from "../../../components/ValueSelector.vue.mjs";
+import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElInput } from "../../../../../node_modules/element-plus/es/components/input/index.mjs";
 import { ElRadioGroup, ElRadioButton } from "../../../../../node_modules/element-plus/es/components/radio/index.mjs";
-import { ElSwitch } from "../../../../../node_modules/element-plus/es/components/switch/index.mjs";
 const _sfc_main = {
   __name: "subForm",
   setup(__props) {
@@ -43,7 +42,6 @@ const _sfc_main = {
       const _component_el_form_item = ElFormItem;
       const _component_el_radio_button = ElRadioButton;
       const _component_el_radio_group = ElRadioGroup;
-      const _component_el_switch = ElSwitch;
       const _component_el_form = ElForm;
       const _component_el_collapse_item = ElCollapseItem;
       const _component_el_collapse = ElCollapse;
@@ -173,10 +171,7 @@ const _sfc_main = {
                             ])),
                             _: 1
                           }),
-                          createVNode(_component_el_radio_button, {
-                            value: "self",
-                            disabled: ""
-                          }, {
+                          createVNode(_component_el_radio_button, { value: "self" }, {
                             default: withCtx(() => _cache[20] || (_cache[20] = [
                               createTextVNode("子表单自加载")
                             ])),
@@ -188,15 +183,18 @@ const _sfc_main = {
                     ]),
                     _: 1
                   }),
-                  createVNode(_component_el_form_item, { label: "执行子表单全局事件" }, {
+                  unref(currentItem).dataSourceFrom == "self" ? (openBlock(), createBlock(_component_el_form_item, {
+                    key: 1,
+                    label: "表单参数"
+                  }, {
                     default: withCtx(() => [
-                      createVNode(_component_el_switch, {
-                        modelValue: unref(currentItem).triggerSubFormPageEvent,
-                        "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => unref(currentItem).triggerSubFormPageEvent = $event)
+                      createVNode(ParamsConfig, {
+                        modelValue: unref(currentItem).subFormParams,
+                        "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => unref(currentItem).subFormParams = $event)
                       }, null, 8, ["modelValue"])
                     ]),
                     _: 1
-                  }),
+                  })) : createCommentVNode("", true),
                   createVNode(_component_el_form_item, { label: "权限标识" }, {
                     default: withCtx(() => [
                       createVNode(_component_el_input, {
@@ -233,7 +231,7 @@ const _sfc_main = {
                     _: 1
                   }),
                   unref(currentItem).formSource == "select" ? (openBlock(), createBlock(_component_el_form_item, {
-                    key: 1,
+                    key: 2,
                     label: "选择子表单"
                   }, {
                     default: withCtx(() => [
@@ -249,7 +247,7 @@ const _sfc_main = {
                     ]),
                     _: 1
                   })) : unref(currentItem).formSource == "dynamic" ? (openBlock(), createBlock(_component_el_form_item, {
-                    key: 2,
+                    key: 3,
                     label: "表单标识"
                   }, {
                     default: withCtx(() => [

package/es/designer/src/packages/form/property/widgets.vue.mjs

@@ -23,14 +23,15 @@ import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import OptionConfig from "../../../components/OptionConfig.vue.mjs";
 import components from "../aside/index.mjs";
 import EventConfigButton from "../../../components/EventConfigButton.vue.mjs";
-import _sfc_main$2 from "../../../components/DataSourceSelect.vue.mjs";
+import _sfc_main$3 from "../../../components/DataSourceSelect.vue.mjs";
 import ConditionConfigButton from "../../../components/ConditionConfigButton.vue2.mjs";
 import DefaultValueEditor from "../components/DefaultValueEditor.vue.mjs";
 import emitter from "../../utils/eventBus.mjs";
 import FieldSetMapping from "../../../components/FieldSetMapping.vue2.mjs";
 import OnlyFLowConfigButton from "../../../components/OnlyFLowConfigButton.vue2.mjs";
-import _sfc_main$1 from "../../../components/FormulaEditorInput.vue.mjs";
+import _sfc_main$2 from "../../../components/FormulaEditorInput.vue.mjs";
 import api from "../../../api/index.mjs";
+import _sfc_main$1 from "../../../components/DialogSelect.vue.mjs";
 /* empty css              */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
@@ -123,9 +124,23 @@ const _sfc_main = {
       ];
     });
     const fieldTypes = computed(() => {
+      const fieldTypeArr = [
+        "text",
+        "textarea",
+        "number",
+        "date",
+        "select",
+        "multipleSelection",
+        "radio",
+        "checkbox",
+        "switch"
+      ];
       const basicComponents = components.find((c) => c.name === "basic");
-      const advancedComponents = components.find((c) => c.name === "advanced");
-      return [...basicComponents == null ? void 0 : basicComponents.children, ...advancedComponents == null ? void 0 : advancedComponents.children];
+      return [
+        ...basicComponents == null ? void 0 : basicComponents.children.filter(
+          (item) => fieldTypeArr.includes(item.fieldType)
+        )
+      ];
     });
     function handleFieldTypeChange(fieldType) {
       const item = currentItem.value;
@@ -602,26 +617,13 @@ const _sfc_main = {
                       ]),
                       createElementVNode("div", _hoisted_4, [
                         _cache[69] || (_cache[69] = createElementVNode("span", { class: "field-label" }, "选择弹层", -1)),
-                        createVNode(_component_el_select, {
+                        createVNode(_sfc_main$1, {
                           modelValue: unref(currentItem).suffixDialogId,
                           "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => unref(currentItem).suffixDialogId = $event),
-                          placeholder: "请选择弹层",
-                          filterable: "",
                           loading: unref(dialogLoading),
-                          clearable: "",
-                          style: { "width": "100%" }
-                        }, {
-                          default: withCtx(() => [
-                            (openBlock(true), createElementBlock(Fragment, null, renderList(unref(dialogOptions), (dialog) => {
-                              return openBlock(), createBlock(_component_el_option, {
-                                key: dialog.id,
-                                label: dialog.name,
-                                value: dialog.id
-                              }, null, 8, ["label", "value"]);
-                            }), 128))
-                          ]),
-                          _: 1
-                        }, 8, ["modelValue", "loading"])
+                          dialogOptions: unref(dialogOptions),
+                          isGlobal: unref(currentItem).dialogSource == "global"
+                        }, null, 8, ["modelValue", "loading", "dialogOptions", "isGlobal"])
                       ]),
                       unref(currentItem).dialogSource == "global" && unref(currentItem).suffixDialogId ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                         createElementVNode("div", _hoisted_5, [
@@ -657,7 +659,7 @@ const _sfc_main = {
                         unref(currentItem).selectionMode != "none" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                           createElementVNode("div", _hoisted_6, [
                             _cache[74] || (_cache[74] = createElementVNode("span", { class: "field-label" }, "反显格式", -1)),
-                            createVNode(unref(_sfc_main$1), {
+                            createVNode(unref(_sfc_main$2), {
                               title: "反显格式配置",
                               formulaConf: unref(currentItem).displayFormat,
                               "onUpdate:formulaConf": _cache[22] || (_cache[22] = ($event) => unref(currentItem).displayFormat = $event),
@@ -828,7 +830,7 @@ const _sfc_main = {
                   unref(currentItem).fieldType === "cascader" ? (openBlock(), createElementBlock(Fragment, { key: 7 }, [
                     createVNode(_component_el_form_item, { label: "数据源" }, {
                       default: withCtx(() => [
-                        createVNode(_sfc_main$2, {
+                        createVNode(_sfc_main$3, {
                           modelValue: unref(currentItem).optionConfig.dataSourceValue,
                           "onUpdate:modelValue": _cache[34] || (_cache[34] = ($event) => unref(currentItem).optionConfig.dataSourceValue = $event)
                         }, null, 8, ["modelValue"])
@@ -1139,7 +1141,7 @@ const _sfc_main = {
                         }, null, 8, ["condition", "onConfirm"])
                       ])) : createCommentVNode("", true),
                       unref(currentItem).validationType === "custom" ? (openBlock(), createElementBlock("div", _hoisted_20, [
-                        createVNode(_sfc_main$2, {
+                        createVNode(_sfc_main$3, {
                           modelValue: unref(currentItem).validationDataSource,
                           "onUpdate:modelValue": _cache[52] || (_cache[52] = ($event) => unref(currentItem).validationDataSource = $event)
                         }, null, 8, ["modelValue"])
@@ -1166,7 +1168,7 @@ const _sfc_main = {
     };
   }
 };
-const widgets = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ff94357a"]]);
+const widgets = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-aadaa1e2"]]);
 export {
   widgets as default
 };

package/es/designer/src/packages/table/headerBtn.vue.mjs

@@ -75,6 +75,8 @@ import "../../axios/config.mjs";
 import "../../../../_virtual/FileSaver.min.mjs";
 import "../../../../_virtual/index.mjs";
 /* empty css                                                                */
+import { useDialogDialog } from "../dialog/useDialogDialog.mjs";
+import { useDialogGlobalDialog } from "../dialogGlobal/useDialogGlobalDialog.mjs";
 /* empty css                                                                       */
 /* empty css                                     */
 /* empty css                                                  */
@@ -101,8 +103,6 @@ import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs
 import PageEvent from "../event/pageEvent.vue.mjs";
 import { useModeDialog } from "../mode/useModeDialog.mjs";
 import { useJsonDataDrawer } from "../../components/useJsonDataDrawer.mjs";
-import { useDialogDialog } from "../dialog/useDialogDialog.mjs";
-import { useDialogGlobalDialog } from "../dialogGlobal/useDialogGlobalDialog.mjs";
 /* empty css                */
 import { ElIcon } from "../../../../node_modules/element-plus/es/components/icon/index.mjs";
 const _hoisted_1 = { class: "header-btns" };