@fecp/designer 5.3.3 → 5.3.5

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

@@ -11,10 +11,10 @@
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                         */
-/* empty css                                                                                                                                            */
 /* empty css                                                                                                                                        */
 /* empty css                                                                                                                                              */
 /* empty css                                                                                                                                               */
+/* empty css                                                                                                                                            */
 import { computed, ref, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, createCommentVNode, createTextVNode, Fragment, renderList } from "vue";
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import TemplateSelector from "../../../components/TemplateSelector.vue.mjs";
@@ -23,8 +23,8 @@ import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 import api from "../../../api/index.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 { ElRadioGroup, ElRadioButton } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/radio/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 { ElRadioGroup, ElRadioButton } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/radio/index.mjs";
 import { ElSwitch } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/switch/index.mjs";
 import { ElSelect, ElOption } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/select/index.mjs";
 import { ElInputNumber } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input-number/index.mjs";
@@ -64,10 +64,10 @@ const _sfc_main = {
       }
     }
     return (_ctx, _cache) => {
+      const _component_el_input = ElInput;
+      const _component_el_form_item = ElFormItem;
       const _component_el_radio_button = ElRadioButton;
       const _component_el_radio_group = ElRadioGroup;
-      const _component_el_form_item = ElFormItem;
-      const _component_el_input = ElInput;
       const _component_el_switch = ElSwitch;
       const _component_el_option = ElOption;
       const _component_el_select = ElSelect;
@@ -93,11 +93,23 @@ const _sfc_main = {
                 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
+                  }),
                   createVNode(_component_el_form_item, { label: "标题模式" }, {
                     default: withCtx(() => [
                       createVNode(_component_el_radio_group, {
                         modelValue: unref(currentItem).titleMode,
-                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(currentItem).titleMode = $event),
+                        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(currentItem).titleMode = $event),
                         size: "small",
                         onChange: handleTitleModeChange
                       }, {
@@ -127,18 +139,6 @@ const _sfc_main = {
                     _: 1
                   }),
                   unref(currentItem).titleMode != "none" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                    createVNode(_component_el_form_item, {
-                      label: "标题",
-                      required: ""
-                    }, {
-                      default: withCtx(() => [
-                        createVNode(_component_el_input, {
-                          modelValue: unref(currentItem).label,
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(currentItem).label = $event)
-                        }, null, 8, ["modelValue"])
-                      ]),
-                      _: 1
-                    }),
                     unref(currentItem).titleMode == "label" ? (openBlock(), createBlock(_component_el_form_item, {
                       key: 0,
                       label: "副标题"

package/es/packages/designer/src/packages/formulaEditor/index.vue2.mjs

@@ -142,6 +142,15 @@ const _sfc_main = {
       )) || { error: false };
       validInfo.value = error ? message : "";
     });
+    watch(
+      () => props.formulaConf,
+      (newVal) => {
+        if (editorCore.value && newVal) {
+          editorCore.value.renderData(newVal);
+        }
+      },
+      { deep: true }
+    );
     const reset = () => {
       var _a;
       currentFormula.value = null;
@@ -224,7 +233,7 @@ const _sfc_main = {
     };
   }
 };
-const FormulaEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-975c8145"]]);
+const FormulaEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-432eb74e"]]);
 export {
   FormulaEditor as default
 };

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

@@ -55,6 +55,8 @@ import { useDataSourceDialog } from "../dataSource/useDataSourceDialog.mjs";
 /* empty css                                         */
 /* empty css                                           */
 /* empty css                                           */
+/* empty css                                                */
+/* empty css                                             */
 /* empty css                                                                                                                                        */
 /* empty css                                    */
 /* empty css                                                                                                                                     */

package/es/packages/designer/src/packages/table/queryModule/DynamicModeConfig.vue.mjs

@@ -51,7 +51,10 @@ const _hoisted_5 = {
   class: "tab-display-section"
 };
 const _hoisted_6 = { class: "search-display-section" };
-const _hoisted_7 = { class: "search-input-group" };
+const _hoisted_7 = {
+  key: 0,
+  class: "search-input-group"
+};
 const _hoisted_8 = ["onMouseenter", "onClick"];
 const _hoisted_9 = {
   key: 0,
@@ -65,6 +68,10 @@ const _sfc_main = {
     modelValue: {
       type: Object,
       default: () => ({})
+    },
+    enabled: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -272,7 +279,7 @@ const _sfc_main = {
             })
           ])) : createCommentVNode("", true),
           editConfigData.value.showTitle ? (openBlock(), createElementBlock("div", _hoisted_4, toDisplayString(editConfigData.value.templateName), 1)) : createCommentVNode("", true),
-          tabConfigs.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_5, [
+          __props.enabled && tabConfigs.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_5, [
             createVNode(_component_el_tabs, {
               modelValue: activeTab.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => activeTab.value = $event),
@@ -291,7 +298,7 @@ const _sfc_main = {
             }, 8, ["modelValue"])
           ])) : createCommentVNode("", true),
           createElementVNode("div", _hoisted_6, [
-            createElementVNode("div", _hoisted_7, [
+            __props.enabled ? (openBlock(), createElementBlock("div", _hoisted_7, [
               createVNode(_component_el_input, {
                 placeholder: "请输入关键词搜索...",
                 class: "search-input",
@@ -310,7 +317,7 @@ const _sfc_main = {
                   key: "0"
                 } : void 0
               ]), 1032, ["prefix-icon"])
-            ]),
+            ])) : createCommentVNode("", true),
             createVNode(unref(lo), {
               modelValue: editConfigData.value.customBtns.right,
               "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => editConfigData.value.customBtns.right = $event),
@@ -486,7 +493,7 @@ const _sfc_main = {
     };
   }
 };
-const DynamicModeConfig = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fd2bf737"]]);
+const DynamicModeConfig = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-69373462"]]);
 export {
   DynamicModeConfig as default
 };

package/es/packages/designer/src/packages/table/queryModule/index.vue.mjs

@@ -47,10 +47,6 @@ const _hoisted_5 = { class: "tab-config-list" };
 const _hoisted_6 = { class: "drag-handle" };
 const _hoisted_7 = { class: "add-field-label" };
 const _hoisted_8 = { class: "add-field-label" };
-const _hoisted_9 = {
-  key: 1,
-  class: "empty-state"
-};
 const _sfc_main = {
   __name: "index",
   setup(__props) {
@@ -539,24 +535,23 @@ const _sfc_main = {
               })
             ], 64)) : createCommentVNode("", true)
           ]),
-          queryConfig.value.enabled ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-            queryConfig.value.mode === "fixed" ? (openBlock(), createBlock(FixedModeConfig, {
-              key: 0,
-              modelValue: queryConfig.value.filterFields,
-              "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => queryConfig.value.filterFields = $event)
-            }, null, 8, ["modelValue"])) : queryConfig.value.mode === "dynamic" ? (openBlock(), createBlock(DynamicModeConfig, {
-              key: 1,
-              modelValue: queryConfig.value.dynamicConfig,
-              "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => queryConfig.value.dynamicConfig = $event)
-            }, null, 8, ["modelValue"])) : createCommentVNode("", true)
-          ], 64)) : (openBlock(), createElementBlock("div", _hoisted_9, "未开启筛选功能"))
+          queryConfig.value.mode === "fixed" && queryConfig.value.enabled ? (openBlock(), createBlock(FixedModeConfig, {
+            key: 0,
+            modelValue: queryConfig.value.filterFields,
+            "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => queryConfig.value.filterFields = $event)
+          }, null, 8, ["modelValue"])) : queryConfig.value.mode === "dynamic" ? (openBlock(), createBlock(DynamicModeConfig, {
+            key: 1,
+            modelValue: queryConfig.value.dynamicConfig,
+            "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => queryConfig.value.dynamicConfig = $event),
+            enabled: queryConfig.value.enabled
+          }, null, 8, ["modelValue", "enabled"])) : createCommentVNode("", true)
         ]),
         queryConfig.value.mode === "fixed" ? (openBlock(), createBlock(TableBtn, { key: 0 })) : createCommentVNode("", true)
       ], 64);
     };
   }
 };
-const QueryModule = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e14779e4"]]);
+const QueryModule = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-aa46506b"]]);
 export {
   QueryModule as default
 };

package/es/packages/vue/src/components/bus/approvalHistory/ApprovalHistory.vue.mjs

@@ -36,8 +36,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const traceNo = ref("");
     const formData = inject("formData");
     inject("rowHeight");
-    const gridLayout = inject("gridLayout");
+    inject("gridLayout");
     inject("gridLayoutFieldsData");
+    const setFormItemHeight = inject("setFormItemHeight");
     const fieldsData = props.localConfig.fieldsData.map((item) => {
       return item.component;
     });
@@ -63,11 +64,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
-      const titleHeight = config.titleMode != "none" ? 60 : 0;
+      const titleHeight = props.config.titleMode != "none" ? 60 : 0;
       if (foundItem) {
         foundItem.fixedH = true;
         foundItem.h = dom.offsetHeight + titleHeight;
-        gridLayout.value.resizeEvent();
+        setFormItemHeight(props.config.id, dom.offsetHeight + titleHeight);
       }
     }
     return (_ctx, _cache) => {
@@ -124,7 +125,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _ApprovalHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7be2a6d2"]]);
+const _ApprovalHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ca0519c9"]]);
 export {
   _ApprovalHistory as default
 };