@fecp/designer 5.1.8 → 5.2.0

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

@@ -7,8 +7,8 @@ import { useAdvancedFilterDialog } from "../advancedFilter/useAdvancedFilterDial
 import { useDataLinkageDialog } from "../dataLinkage/useDataLinkageDialog.mjs";
 import { useJsonDataDrawer } from "../../components/useJsonDataDrawer.mjs";
 import { useDialogDialog } from "../dialog/useDialogDialog.mjs";
+import { useDialogGlobalDialog } from "../dialogGlobal/useDialogGlobalDialog.mjs";
 import { Connection as connection_default, Management as management_default, Link as link_default, ChatLineSquare as chat_line_square_default, Document as document_default } from "../../../../../node_modules/.pnpm/@element-plus_icons-vue@2.3.2_vue@3.5.13_typescript@5.7.3_/node_modules/@element-plus/icons-vue/dist/index.mjs";
-import { demo } from "./demo.mjs";
 import { getEditConfigData } from "../utils/common.mjs";
 /* empty css                */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
@@ -39,57 +39,17 @@ const _sfc_main = {
     const { dataLinkageDialogVisible, openDataLinkageDialog, DataLinkageDialog } = useDataLinkageDialog();
     ref(false);
     const { dialogDialogVisible, openDialogDialog, DialogDialog } = useDialogDialog();
-    const editConfigData = computed(() => {
+    const {
+      dialogGlobalDialogVisible,
+      openDialogGlobalDialog,
+      DialogGlobalDialog
+    } = useDialogGlobalDialog();
+    computed(() => {
       return getEditConfigData();
     });
-    function importText() {
-      console.log("importText", demo);
-      const columns = editConfigData.value.columns;
-      const oldFormData = demo;
-      oldFormData.formItem.forEach((item, index) => {
-        setTimeout(() => {
-          const id = Date.now();
-          const x = index % columns;
-          const y = Math.floor(index / columns);
-          if (item.fieldType != "empty" && item.fieldName != "" && item.label != "") {
-            editConfigData.value.fieldsData.push({
-              x,
-              y,
-              w: 1,
-              h: 1,
-              i: id,
-              isResizable: true,
-              component: {
-                fieldType: item.fieldType,
-                label: item.label,
-                fieldName: item.fieldName,
-                format: "number",
-                labelMode: "default",
-                hasDecimalPlaces: true,
-                decimalPlaces: 2,
-                optionStyle: "default",
-                dateType: "date",
-                suffixButton: "none",
-                suffixDialogName: "选择",
-                id,
-                type: "widgets"
-              },
-              moved: false,
-              id
-            });
-          }
-        }, 5);
-      });
-    }
     return (_ctx, _cache) => {
       const _component_el_icon = ElIcon;
       return openBlock(), createElementBlock("div", _hoisted_1, [
-        createElementVNode("div", {
-          class: "btn-item",
-          onClick: importText
-        }, _cache[11] || (_cache[11] = [
-          createElementVNode("span", null, "测试导入", -1)
-        ])),
         createElementVNode("div", {
           class: "btn-item",
           onClick: _cache[0] || (_cache[0] = (...args) => unref(openDataSourceDialog) && unref(openDataSourceDialog)(...args))
@@ -100,7 +60,7 @@ const _sfc_main = {
             ]),
             _: 1
           }),
-          _cache[12] || (_cache[12] = createElementVNode("span", null, "数据源", -1))
+          _cache[13] || (_cache[13] = createElementVNode("span", null, "数据源", -1))
         ]),
         createVNode(unref(DataSourceDialog), {
           modelValue: unref(dataSourceDialogVisible),
@@ -120,7 +80,7 @@ const _sfc_main = {
             ]),
             _: 1
           }),
-          _cache[13] || (_cache[13] = createElementVNode("span", null, "全局事件", -1))
+          _cache[14] || (_cache[14] = createElementVNode("span", null, "全局事件", -1))
         ]),
         createVNode(PageEvent, {
           modelValue: unref(pageEventDialogVisible),
@@ -143,7 +103,7 @@ const _sfc_main = {
             ]),
             _: 1
           }),
-          _cache[14] || (_cache[14] = createElementVNode("span", null, "联动配置", -1))
+          _cache[15] || (_cache[15] = createElementVNode("span", null, "联动配置", -1))
         ]),
         createVNode(unref(DataLinkageDialog), {
           modelValue: unref(dataLinkageDialogVisible),
@@ -151,7 +111,23 @@ const _sfc_main = {
         }, null, 8, ["modelValue"]),
         createElementVNode("div", {
           class: "btn-item",
-          onClick: _cache[7] || (_cache[7] = (...args) => unref(openDialogDialog) && unref(openDialogDialog)(...args))
+          onClick: _cache[7] || (_cache[7] = (...args) => unref(openDialogGlobalDialog) && unref(openDialogGlobalDialog)(...args))
+        }, [
+          createVNode(_component_el_icon, null, {
+            default: withCtx(() => [
+              createVNode(unref(chat_line_square_default))
+            ]),
+            _: 1
+          }),
+          _cache[16] || (_cache[16] = createElementVNode("span", null, "全局弹层", -1))
+        ]),
+        createVNode(unref(DialogGlobalDialog), {
+          modelValue: unref(dialogGlobalDialogVisible),
+          "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => isRef(dialogGlobalDialogVisible) ? dialogGlobalDialogVisible.value = $event : null)
+        }, null, 8, ["modelValue"]),
+        createElementVNode("div", {
+          class: "btn-item",
+          onClick: _cache[9] || (_cache[9] = (...args) => unref(openDialogDialog) && unref(openDialogDialog)(...args))
         }, [
           createVNode(_component_el_icon, null, {
             default: withCtx(() => [
@@ -159,15 +135,15 @@ const _sfc_main = {
             ]),
             _: 1
           }),
-          _cache[15] || (_cache[15] = createElementVNode("span", null, "弹层配置", -1))
+          _cache[17] || (_cache[17] = createElementVNode("span", null, "自定义弹层", -1))
         ]),
         createVNode(unref(DialogDialog), {
           modelValue: unref(dialogDialogVisible),
-          "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => isRef(dialogDialogVisible) ? dialogDialogVisible.value = $event : null)
+          "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => isRef(dialogDialogVisible) ? dialogDialogVisible.value = $event : null)
         }, null, 8, ["modelValue"]),
         createElementVNode("div", {
           class: "btn-item",
-          onClick: _cache[9] || (_cache[9] = (...args) => unref(openJsonDrawer) && unref(openJsonDrawer)(...args))
+          onClick: _cache[11] || (_cache[11] = (...args) => unref(openJsonDrawer) && unref(openJsonDrawer)(...args))
         }, [
           createVNode(_component_el_icon, null, {
             default: withCtx(() => [
@@ -175,17 +151,17 @@ const _sfc_main = {
             ]),
             _: 1
           }),
-          _cache[16] || (_cache[16] = createElementVNode("span", null, "数据结构", -1))
+          _cache[18] || (_cache[18] = createElementVNode("span", null, "数据结构", -1))
         ]),
         createVNode(unref(JsonDataDrawer), {
           modelValue: unref(jsonDataDrawerVisible),
-          "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => isRef(jsonDataDrawerVisible) ? jsonDataDrawerVisible.value = $event : null)
+          "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => isRef(jsonDataDrawerVisible) ? jsonDataDrawerVisible.value = $event : null)
         }, null, 8, ["modelValue"])
       ]);
     };
   }
 };
-const formHeaderBtn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b3c4bf36"]]);
+const formHeaderBtn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5181fa71"]]);
 export {
   formHeaderBtn as default
 };

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

@@ -1,6 +1,7 @@
 /* empty css                                                                                                                                 */
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                    */
+/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                            */
 /* empty css                                                                                                                                      */
@@ -8,7 +9,7 @@
 import "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/theme-chalk/el-dropdown-menu.css.mjs";
 /* empty css                                                                                                                                        */
 /* empty css                                                                                                                                     */
-import { computed, ref, watch, resolveComponent, createElementBlock, openBlock, createVNode, createElementVNode, withCtx, unref, normalizeStyle, createCommentVNode, withModifiers, normalizeClass, createBlock, toDisplayString, nextTick } from "vue";
+import { computed, ref, watch, resolveComponent, createElementBlock, openBlock, createVNode, createElementVNode, withCtx, unref, normalizeStyle, createCommentVNode, withModifiers, normalizeClass, createBlock, toDisplayString, createTextVNode, nextTick } from "vue";
 import emitter from "../utils/eventBus.mjs";
 import "../../../../../node_modules/.pnpm/grid-layout-plus@1.1.1_vue@3.5.13_typescript@5.7.3_/node_modules/grid-layout-plus/es/index.mjs";
 import { VueDraggable as lo } from "../../../../../node_modules/.pnpm/vue-draggable-plus@0.6.1_@types_sortablejs@1.15.9/node_modules/vue-draggable-plus/dist/vue-draggable-plus.mjs";
@@ -16,7 +17,7 @@ import FormSetting from "./formSetting.vue.mjs";
 import PageHeaderSetting from "./PageHeaderSetting.vue.mjs";
 import PageFooterSetting from "./PageFooterSetting.vue.mjs";
 import ComponentPreviewWrapper from "./components/ComponentPreviewWrapper.vue.mjs";
-import DividerWrapper from "./components/DividerWrapper.vue.mjs";
+import SubTitle from "./components/SubTitle.vue.mjs";
 import H2Wrapper from "./components/H2Wrapper.vue.mjs";
 import SubForm from "./components/SubForm.vue.mjs";
 import ApprovalHistory from "./components/ApprovalHistory.vue.mjs";
@@ -35,6 +36,7 @@ import { ElIcon } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vu
 import { ElDropdown, ElDropdownMenu } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/dropdown/index.mjs";
 import { ElInput } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.mjs";
 import { ElCheckbox } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/checkbox/index.mjs";
+import { ElDivider } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/divider/index.mjs";
 import { ElMessage } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
 const _hoisted_1 = { class: "form-work-area" };
 const _hoisted_2 = { class: "form-grid-container" };
@@ -119,11 +121,12 @@ const _sfc_main = {
       (labelPosition) => {
         const targetHeight = labelPosition === "top" ? 0.75 : 1;
         const fieldTypes = [
-          "divider",
+          "subTitle",
           "h2",
           "subForm",
           "subTable",
-          "approvalHistory"
+          "approvalHistory",
+          "divider"
         ];
         layoutData.value.forEach((item) => {
           var _a;
@@ -218,7 +221,7 @@ const _sfc_main = {
       let finalWH = { w: 1, h: 1 };
       if (component.fieldType == "textarea") {
         finalWH = { w: 1, h: 2 };
-      } else if (component.fieldType == "divider" || component.fieldType == "h2") {
+      } else if (component.fieldType == "subTitle" || component.fieldType == "h2" || component.fieldType == "divider") {
         finalWH = {
           w: editConfigData.value.columns,
           h: 1,
@@ -332,6 +335,7 @@ const _sfc_main = {
       const _component_el_dropdown_menu = ElDropdownMenu;
       const _component_el_dropdown = ElDropdown;
       const _component_Hide = resolveComponent("Hide");
+      const _component_el_divider = ElDivider;
       const _component_el_form = ElForm;
       const _component_el_scrollbar = ElScrollbar;
       return openBlock(), createElementBlock("div", _hoisted_1, [
@@ -513,7 +517,7 @@ const _sfc_main = {
                                 "is-readonly": item.component.readOnly && !item.component.disabled
                               }])
                             }, [
-                              item.component.fieldType == "divider" ? (openBlock(), createBlock(DividerWrapper, {
+                              item.component.fieldType == "subTitle" ? (openBlock(), createBlock(SubTitle, {
                                 key: 0,
                                 "component-data": item.component
                               }, null, 8, ["component-data"])) : item.component.fieldType == "h2" ? (openBlock(), createBlock(H2Wrapper, {
@@ -528,8 +532,16 @@ const _sfc_main = {
                               }, null, 8, ["component-data"])) : item.component.fieldType == "approvalHistory" ? (openBlock(), createBlock(ApprovalHistory, {
                                 key: 4,
                                 "component-data": item.component
-                              }, null, 8, ["component-data"])) : (openBlock(), createBlock(ComponentPreviewWrapper, {
+                              }, null, 8, ["component-data"])) : item.component.fieldType == "divider" ? (openBlock(), createBlock(_component_el_divider, {
                                 key: 5,
+                                "border-style": "dashed"
+                              }, {
+                                default: withCtx(() => _cache[5] || (_cache[5] = [
+                                  createTextVNode(" 此处为分割线，阻止下方组件自动向上补齐，解析时不显示 ")
+                                ])),
+                                _: 1
+                              })) : (openBlock(), createBlock(ComponentPreviewWrapper, {
+                                key: 6,
                                 "component-data": item.component
                               }, null, 8, ["component-data"]))
                             ], 2)
@@ -552,7 +564,7 @@ const _sfc_main = {
     };
   }
 };
-const formWorkArea = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-33c1d321"]]);
+const formWorkArea = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8e0ae4da"]]);
 export {
   formWorkArea as default
 };

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

@@ -5,7 +5,7 @@ import { getCurrentItem } from "../../utils/common.mjs";
 import widgets from "./widgets.vue.mjs";
 import _sfc_main$2 from "./pageHeaderBtn.vue.mjs";
 import _sfc_main$1 from "./pageFooterBtn.vue.mjs";
-import _sfc_main$3 from "./dividerH2.vue.mjs";
+import _sfc_main$3 from "./subTitleH2.vue.mjs";
 import _sfc_main$4 from "./subForm.vue.mjs";
 import _sfc_main$5 from "./subTable.vue.mjs";
 import _sfc_main$6 from "./blank.vue.mjs";
@@ -18,10 +18,10 @@ const _sfc_main = {
       return getCurrentItem();
     });
     const editingProperty = computed(() => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       switch ((_a = currentItem.value) == null ? void 0 : _a.type) {
         case "widgets":
-          if (((_b = currentItem.value) == null ? void 0 : _b.fieldType) == "divider" || ((_c = currentItem.value) == null ? void 0 : _c.fieldType) == "h2") {
+          if (((_b = currentItem.value) == null ? void 0 : _b.fieldType) == "subTitle" || ((_c = currentItem.value) == null ? void 0 : _c.fieldType) == "h2") {
             return _sfc_main$3;
           } else if (((_d = currentItem.value) == null ? void 0 : _d.fieldType) == "subForm") {
             return _sfc_main$4;
@@ -31,6 +31,8 @@ const _sfc_main = {
             return _sfc_main$6;
           } else if (((_g = currentItem.value) == null ? void 0 : _g.fieldType) == "approvalHistory") {
             return _sfc_main$7;
+          } else if (((_h = currentItem.value) == null ? void 0 : _h.fieldType) == "divider") {
+            return null;
           } else {
             return widgets;
           }

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

@@ -0,0 +1,94 @@
+/* empty css                                                                                                                                    */
+/* empty css                                                                                                                                           */
+/* empty css                                                                                                                                                */
+/* empty css                                                                                                                                       */
+/* empty css                                                                                                                                            */
+/* empty css                                                                                                                                        */
+import { computed, ref, createBlock, openBlock, unref, isRef, withCtx, createVNode, createCommentVNode } from "vue";
+import { getCurrentItem } from "../../utils/common.mjs";
+import { ElCollapse, ElCollapseItem } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/collapse/index.mjs";
+import { ElForm, ElFormItem } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.mjs";
+import { ElInput } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.mjs";
+const _sfc_main = {
+  __name: "subTitleH2",
+  setup(__props) {
+    const currentItem = computed(() => {
+      return getCurrentItem();
+    });
+    const activeName = ref(["common"]);
+    return (_ctx, _cache) => {
+      const _component_el_input = ElInput;
+      const _component_el_form_item = ElFormItem;
+      const _component_el_form = ElForm;
+      const _component_el_collapse_item = ElCollapseItem;
+      const _component_el_collapse = ElCollapse;
+      return openBlock(), createBlock(_component_el_collapse, {
+        class: "setting",
+        modelValue: unref(activeName),
+        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => isRef(activeName) ? activeName.value = $event : null)
+      }, {
+        default: withCtx(() => [
+          createVNode(_component_el_collapse_item, {
+            name: "common",
+            title: "基本属性"
+          }, {
+            default: withCtx(() => [
+              (openBlock(), createBlock(_component_el_form, {
+                "label-position": "top",
+                "label-width": "auto",
+                model: unref(currentItem),
+                key: unref(currentItem).id
+              }, {
+                default: withCtx(() => [
+                  createVNode(_component_el_form_item, {
+                    label: "标题",
+                    required: ""
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(_component_el_input, {
+                        modelValue: unref(currentItem).label,
+                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(currentItem).label = $event)
+                      }, null, 8, ["modelValue"])
+                    ]),
+                    _: 1
+                  }),
+                  unref(currentItem).fieldType == "H2" ? (openBlock(), createBlock(_component_el_form_item, {
+                    key: 0,
+                    label: "副标题",
+                    required: ""
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(_component_el_input, {
+                        modelValue: unref(currentItem).subLabel,
+                        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(currentItem).subLabel = $event),
+                        rows: 2,
+                        type: "textarea",
+                        resize: "none"
+                      }, null, 8, ["modelValue"])
+                    ]),
+                    _: 1
+                  })) : createCommentVNode("", true),
+                  createVNode(_component_el_form_item, { label: "权限标识" }, {
+                    default: withCtx(() => [
+                      createVNode(_component_el_input, {
+                        modelValue: unref(currentItem).permission,
+                        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(currentItem).permission = $event)
+                      }, null, 8, ["modelValue"])
+                    ]),
+                    _: 1
+                  })
+                ]),
+                _: 1
+              }, 8, ["model"]))
+            ]),
+            _: 1
+          })
+        ]),
+        _: 1
+      }, 8, ["modelValue"]);
+    };
+  }
+};
+export {
+  _sfc_main as default
+};