@fecp/designer 5.3.3 → 5.3.5

package/lib/packages/designer/src/packages/form/property/subForm.vue.js

@@ -6,18 +6,18 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                                                                                                       */
 ;/* empty css                                                                                                                                         */
 ;/* empty css                                                                                                                                        */
-;/* empty css                                                                                                                                            */
-;/* empty css                                                                                                                                        */
 ;/* empty css                                                                                                                                              */
 ;/* empty css                                                                                                                                               */
+;/* empty css                                                                                                                                            */
+;/* empty css                                                                                                                                        */
 const vue = require("vue");
 const common = require("../../utils/common.js");
 const TemplateSelector = require("../../../components/TemplateSelector.vue.js");
 const eventBus = require("../../utils/eventBus.js");
 const index = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
-const index$2 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/radio/index.js");
-const index$3 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");
+const index$2 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");
+const index$3 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/radio/index.js");
 const index$4 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/switch/index.js");
 const _sfc_main = {
   __name: "subForm",
@@ -39,10 +39,10 @@ const _sfc_main = {
       }
     }
     return (_ctx, _cache) => {
-      const _component_el_radio_button = index$2.ElRadioButton;
-      const _component_el_radio_group = index$2.ElRadioGroup;
+      const _component_el_input = index$2.ElInput;
       const _component_el_form_item = index$1.ElFormItem;
-      const _component_el_input = index$3.ElInput;
+      const _component_el_radio_button = index$3.ElRadioButton;
+      const _component_el_radio_group = index$3.ElRadioGroup;
       const _component_el_switch = index$4.ElSwitch;
       const _component_el_form = index$1.ElForm;
       const _component_el_collapse_item = index.ElCollapseItem;
@@ -65,11 +65,23 @@ const _sfc_main = {
                 key: vue.unref(currentItem).id
               }, {
                 default: vue.withCtx(() => [
+                  vue.createVNode(_component_el_form_item, {
+                    label: "标题",
+                    required: ""
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createVNode(_component_el_input, {
+                        modelValue: vue.unref(currentItem).label,
+                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.unref(currentItem).label = $event)
+                      }, null, 8, ["modelValue"])
+                    ]),
+                    _: 1
+                  }),
                   vue.createVNode(_component_el_form_item, { label: "标题模式" }, {
                     default: vue.withCtx(() => [
                       vue.createVNode(_component_el_radio_group, {
                         modelValue: vue.unref(currentItem).titleMode,
-                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.unref(currentItem).titleMode = $event),
+                        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.unref(currentItem).titleMode = $event),
                         size: "small",
                         onChange: handleTitleModeChange
                       }, {
@@ -99,18 +111,6 @@ const _sfc_main = {
                     _: 1
                   }),
                   vue.unref(currentItem).titleMode != "none" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-                    vue.createVNode(_component_el_form_item, {
-                      label: "标题",
-                      required: ""
-                    }, {
-                      default: vue.withCtx(() => [
-                        vue.createVNode(_component_el_input, {
-                          modelValue: vue.unref(currentItem).label,
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.unref(currentItem).label = $event)
-                        }, null, 8, ["modelValue"])
-                      ]),
-                      _: 1
-                    }),
                     vue.unref(currentItem).titleMode == "label" ? (vue.openBlock(), vue.createBlock(_component_el_form_item, {
                       key: 0,
                       label: "副标题"

package/lib/packages/designer/src/packages/form/property/subTable.vue.js

@@ -13,10 +13,10 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                                                                                                         */
 ;/* empty css                                                                                                                                         */
 ;/* empty css                                                                                                                                         */
-;/* empty css                                                                                                                                            */
 ;/* empty css                                                                                                                                        */
 ;/* empty css                                                                                                                                              */
 ;/* empty css                                                                                                                                               */
+;/* empty css                                                                                                                                            */
 const vue = require("vue");
 const common = require("../../utils/common.js");
 const TemplateSelector = require("../../../components/TemplateSelector.vue.js");
@@ -25,8 +25,8 @@ const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 const index = require("../../../api/index.js");
 const index$1 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/collapse/index.js");
 const index$2 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
-const index$3 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/radio/index.js");
-const index$4 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");
+const index$3 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");
+const index$4 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/radio/index.js");
 const index$5 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/switch/index.js");
 const index$6 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/select/index.js");
 const index$7 = require("../../../../../../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.js");
@@ -66,10 +66,10 @@ const _sfc_main = {
       }
     }
     return (_ctx, _cache) => {
-      const _component_el_radio_button = index$3.ElRadioButton;
-      const _component_el_radio_group = index$3.ElRadioGroup;
+      const _component_el_input = index$3.ElInput;
       const _component_el_form_item = index$2.ElFormItem;
-      const _component_el_input = index$4.ElInput;
+      const _component_el_radio_button = index$4.ElRadioButton;
+      const _component_el_radio_group = index$4.ElRadioGroup;
       const _component_el_switch = index$5.ElSwitch;
       const _component_el_option = index$6.ElOption;
       const _component_el_select = index$6.ElSelect;
@@ -95,11 +95,23 @@ const _sfc_main = {
                 key: vue.unref(currentItem).id
               }, {
                 default: vue.withCtx(() => [
+                  vue.createVNode(_component_el_form_item, {
+                    label: "标题",
+                    required: ""
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createVNode(_component_el_input, {
+                        modelValue: vue.unref(currentItem).label,
+                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.unref(currentItem).label = $event)
+                      }, null, 8, ["modelValue"])
+                    ]),
+                    _: 1
+                  }),
                   vue.createVNode(_component_el_form_item, { label: "标题模式" }, {
                     default: vue.withCtx(() => [
                       vue.createVNode(_component_el_radio_group, {
                         modelValue: vue.unref(currentItem).titleMode,
-                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.unref(currentItem).titleMode = $event),
+                        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.unref(currentItem).titleMode = $event),
                         size: "small",
                         onChange: handleTitleModeChange
                       }, {
@@ -129,18 +141,6 @@ const _sfc_main = {
                     _: 1
                   }),
                   vue.unref(currentItem).titleMode != "none" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-                    vue.createVNode(_component_el_form_item, {
-                      label: "标题",
-                      required: ""
-                    }, {
-                      default: vue.withCtx(() => [
-                        vue.createVNode(_component_el_input, {
-                          modelValue: vue.unref(currentItem).label,
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.unref(currentItem).label = $event)
-                        }, null, 8, ["modelValue"])
-                      ]),
-                      _: 1
-                    }),
                     vue.unref(currentItem).titleMode == "label" ? (vue.openBlock(), vue.createBlock(_component_el_form_item, {
                       key: 0,
                       label: "副标题"

package/lib/packages/designer/src/packages/formulaEditor/index.vue2.js

@@ -144,6 +144,15 @@ const _sfc_main = {
       )) || { error: false };
       validInfo.value = error ? message : "";
     });
+    vue.watch(
+      () => props.formulaConf,
+      (newVal) => {
+        if (editorCore.value && newVal) {
+          editorCore.value.renderData(newVal);
+        }
+      },
+      { deep: true }
+    );
     const reset = () => {
       var _a;
       currentFormula.value = null;
@@ -226,5 +235,5 @@ const _sfc_main = {
     };
   }
 };
-const FormulaEditor = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-975c8145"]]);
+const FormulaEditor = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-432eb74e"]]);
 exports.default = FormulaEditor;

package/lib/packages/designer/src/packages/table/headerBtn.vue.js

@@ -57,6 +57,8 @@ const useDataSourceDialog = require("../dataSource/useDataSourceDialog.js");
 ;/* empty css                                         */
 ;/* empty css                                           */
 ;/* empty css                                           */
+;/* empty css                                                */
+;/* empty css                                             */
 ;/* empty css                                                                                                                                        */
 ;/* empty css                                    */
 ;/* empty css                                                                                                                                     */

package/lib/packages/designer/src/packages/table/queryModule/DynamicModeConfig.vue.js

@@ -53,7 +53,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,
@@ -67,6 +70,10 @@ const _sfc_main = {
     modelValue: {
       type: Object,
       default: () => ({})
+    },
+    enabled: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -274,7 +281,7 @@ const _sfc_main = {
             })
           ])) : vue.createCommentVNode("", true),
           editConfigData.value.showTitle ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, vue.toDisplayString(editConfigData.value.templateName), 1)) : vue.createCommentVNode("", true),
-          tabConfigs.value.length > 0 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
+          __props.enabled && tabConfigs.value.length > 0 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
             vue.createVNode(_component_el_tabs, {
               modelValue: activeTab.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => activeTab.value = $event),
@@ -293,7 +300,7 @@ const _sfc_main = {
             }, 8, ["modelValue"])
           ])) : vue.createCommentVNode("", true),
           vue.createElementVNode("div", _hoisted_6, [
-            vue.createElementVNode("div", _hoisted_7, [
+            __props.enabled ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
               vue.createVNode(_component_el_input, {
                 placeholder: "请输入关键词搜索...",
                 class: "search-input",
@@ -312,7 +319,7 @@ const _sfc_main = {
                   key: "0"
                 } : void 0
               ]), 1032, ["prefix-icon"])
-            ]),
+            ])) : vue.createCommentVNode("", true),
             vue.createVNode(vue.unref(vueDraggablePlus.VueDraggable), {
               modelValue: editConfigData.value.customBtns.right,
               "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => editConfigData.value.customBtns.right = $event),
@@ -488,5 +495,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fd2bf737"]]);
+const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-69373462"]]);
 exports.default = DynamicModeConfig;

package/lib/packages/designer/src/packages/table/queryModule/index.vue.js

@@ -49,10 +49,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) {
@@ -541,22 +537,21 @@ const _sfc_main = {
               })
             ], 64)) : vue.createCommentVNode("", true)
           ]),
-          queryConfig.value.enabled ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-            queryConfig.value.mode === "fixed" ? (vue.openBlock(), vue.createBlock(FixedModeConfig.default, {
-              key: 0,
-              modelValue: queryConfig.value.filterFields,
-              "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => queryConfig.value.filterFields = $event)
-            }, null, 8, ["modelValue"])) : queryConfig.value.mode === "dynamic" ? (vue.openBlock(), vue.createBlock(DynamicModeConfig.default, {
-              key: 1,
-              modelValue: queryConfig.value.dynamicConfig,
-              "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => queryConfig.value.dynamicConfig = $event)
-            }, null, 8, ["modelValue"])) : vue.createCommentVNode("", true)
-          ], 64)) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, "未开启筛选功能"))
+          queryConfig.value.mode === "fixed" && queryConfig.value.enabled ? (vue.openBlock(), vue.createBlock(FixedModeConfig.default, {
+            key: 0,
+            modelValue: queryConfig.value.filterFields,
+            "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => queryConfig.value.filterFields = $event)
+          }, null, 8, ["modelValue"])) : queryConfig.value.mode === "dynamic" ? (vue.openBlock(), vue.createBlock(DynamicModeConfig.default, {
+            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"])) : vue.createCommentVNode("", true)
         ]),
         queryConfig.value.mode === "fixed" ? (vue.openBlock(), vue.createBlock(tableBtn.default, { key: 0 })) : vue.createCommentVNode("", true)
       ], 64);
     };
   }
 };
-const QueryModule = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e14779e4"]]);
+const QueryModule = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-aa46506b"]]);
 exports.default = QueryModule;

package/lib/packages/vue/src/components/bus/approvalHistory/ApprovalHistory.vue.js

@@ -38,8 +38,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const traceNo = vue.ref("");
     const formData = vue.inject("formData");
     vue.inject("rowHeight");
-    const gridLayout = vue.inject("gridLayout");
+    vue.inject("gridLayout");
     vue.inject("gridLayoutFieldsData");
+    const setFormItemHeight = vue.inject("setFormItemHeight");
     const fieldsData = props.localConfig.fieldsData.map((item) => {
       return item.component;
     });
@@ -65,11 +66,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) => {
@@ -126,5 +127,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _ApprovalHistory = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7be2a6d2"]]);
+const _ApprovalHistory = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ca0519c9"]]);
 exports.default = _ApprovalHistory;