@fecp/designer 5.3.12 → 5.3.14

package/lib/packages/vue/src/components/forms/formItem/FormItem.vue.js

@@ -129,8 +129,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         ref_key: "innerComponentRef",
         ref: innerComponentRef,
         config: __props.config,
-        localConfig: __props.localConfig
-      }, null, 8, ["config", "localConfig"])) : __props.config.fieldType == "approvalHistory" ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.ApprovalHistory), {
+        localConfig: __props.localConfig,
+        formMode: __props.formMode
+      }, null, 8, ["config", "localConfig", "formMode"])) : __props.config.fieldType == "approvalHistory" ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.ApprovalHistory), {
         key: 4,
         ref_key: "innerComponentRef",
         ref: innerComponentRef,
@@ -189,5 +190,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1fbcd248"]]);
+const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bac36800"]]);
 exports.default = _FormItem;

package/lib/packages/vue/src/components/forms/subTable/SubTable.vue.js

@@ -7,6 +7,7 @@ const Table = require("../../table/Table.vue.js");
 const index$2 = require("../subTitle/index.js");
 const index = require("../h2/index.js");
 const parseRouteParams = require("../../../utils/parseRouteParams.js");
+const parseFilterConfig = require("../../../utils/parseFilterConfig.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/button/index.js");
 const _hoisted_1 = {
   key: 0,
@@ -24,27 +25,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     localConfig: {
       type: Object,
       required: true
+    },
+    formMode: {
+      type: String,
+      default: ""
     }
-    //   subFormId: {
-    //     type: String,
-    //     required: true,
-    //   },
-    //   subFormKey: {
-    //     type: String,
-    //     default: "",
-    //   },
-    //   subFormName: {
-    //     type: String,
-    //     default: "",
-    //   },
-    //   dataSourceFrom: {
-    //     type: String,
-    //     default: "",
-    //   },
-    //   triggerSubFormPageEvent: {
-    //     type: Boolean,
-    //     default: false,
-    //   },
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -52,6 +37,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     vue.inject("rowHeight");
     vue.inject("gridLayout");
     const setFormItemHeight = vue.inject("setFormItemHeight");
+    const handleEvent = vue.inject("handleEvent");
+    const btnRollbackEvent = vue.computed(() => {
+      const btnRollback = props.config.btnRollback || [];
+      const data = {};
+      for (const item of btnRollback) {
+        const handleFunc = () => {
+          handleEvent.value(
+            formData.value,
+            {},
+            { eventFlow: item.callbackEventConfig }
+          );
+        };
+        data[item.id] = handleFunc;
+      }
+      return data;
+    });
     const subTableData = vue.computed(() => {
       if (props.config.dataSourceFrom == "main") {
         return formData.value[props.config.fieldName];
@@ -76,8 +77,34 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return {};
     });
     const subTableOption = vue.ref({});
-    const customBtns = vue.computed(() => {
-      return subTableOption.value.customBtns || {};
+    const subTableFieldsData = vue.computed(() => {
+      var _a, _b;
+      return [
+        ...((_a = subTableOption.value) == null ? void 0 : _a.fieldsData) || [],
+        ...((_b = subTableOption.value) == null ? void 0 : _b.hiddenFields) || []
+      ];
+    });
+    const leftButtons = vue.computed(() => {
+      var _a, _b;
+      return (((_b = (_a = subTableOption.value) == null ? void 0 : _a.customBtns) == null ? void 0 : _b.left) || []).filter((item) => {
+        if (!item.showCondition) return true;
+        return parseFilterConfig.checkFilterMatch(
+          item.showCondition,
+          initHiddenData.value,
+          subTableFieldsData.value
+        );
+      });
+    });
+    const rightButtons = vue.computed(() => {
+      var _a, _b;
+      return (((_b = (_a = subTableOption.value) == null ? void 0 : _a.customBtns) == null ? void 0 : _b.right) || []).filter((item) => {
+        if (!item.showCondition) return true;
+        return parseFilterConfig.checkFilterMatch(
+          item.showCondition,
+          initHiddenData.value,
+          subTableFieldsData.value
+        );
+      });
     });
     function subTableLoaded(subOption) {
       subTableOption.value = subOption;
@@ -116,7 +143,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             config: __props.config
           }, vue.createSlots({
             default: vue.withCtx(() => [
-              (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(customBtns).right, (btn) => {
+              __props.formMode != "query" ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(vue.unref(rightButtons), (btn) => {
                 return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
                   btn.btnType == "custom" ? (vue.openBlock(), vue.createBlock(_component_el_button, {
                     key: btn.id,
@@ -130,14 +157,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                     _: 2
                   }, 1032, ["onClick"])) : vue.createCommentVNode("", true)
                 ], 64);
-              }), 256))
+              }), 256)) : vue.createCommentVNode("", true)
             ]),
             _: 2
           }, [
-            vue.unref(customBtns).left ? {
+            vue.unref(leftButtons) ? {
               name: "left",
               fn: vue.withCtx(() => [
-                (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(customBtns).left, (btn) => {
+                __props.formMode != "query" ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(vue.unref(leftButtons), (btn) => {
                   return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
                     btn.btnType == "custom" ? (vue.openBlock(), vue.createBlock(_component_el_button, {
                       key: btn.id,
@@ -151,7 +178,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                       _: 2
                     }, 1032, ["onClick"])) : vue.createCommentVNode("", true)
                   ], 64);
-                }), 256))
+                }), 256)) : vue.createCommentVNode("", true)
               ]),
               key: "0"
             } : void 0
@@ -167,13 +194,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           isSubTable: "",
           onLoaded: subTableLoaded,
           mode: __props.config.subTableMode,
+          titleMode: __props.config.titleMode,
           hasPagination: __props.config.isSubTablePagination,
           height: __props.config.subTableHeight,
           tableData: vue.unref(subTableData),
           initHiddenData: vue.unref(initHiddenData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
-          readonly: __props.config.isSubTableReadOnly
-        }, null, 8, ["templateKey", "mode", "hasPagination", "height", "tableData", "initHiddenData", "canLoadBySearchData", "readonly"])
+          readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
+          btnRollbackEvent: vue.unref(btnRollbackEvent)
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "height", "tableData", "initHiddenData", "canLoadBySearchData", "readonly", "btnRollbackEvent"])
       ], 64);
     };
   }

package/lib/packages/vue/src/components/table/CustomButtons.vue.js

@@ -6,6 +6,7 @@ const vue = require("vue");
 require("../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/components.js");
 const index$1 = require("../../../../../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.js");
 const getInstance = require("../../utils/getInstance.js");
+const parseFilterConfig = require("../../utils/parseFilterConfig.js");
 ;/* empty css                    */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.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/icon/index.js");
@@ -37,6 +38,10 @@ const _sfc_main = {
     isSubTable: {
       type: Boolean,
       default: false
+    },
+    hiddenFormData: {
+      type: Object,
+      default: {}
     }
   },
   emits: ["click"],
@@ -44,11 +49,32 @@ const _sfc_main = {
     const ctx = getInstance.getCurrentVueInstance();
     const props = __props;
     const emit = __emit;
+    const fieldsData = vue.computed(() => {
+      var _a, _b;
+      return [
+        ...((_a = props.localConfig) == null ? void 0 : _a.fieldsData) || [],
+        ...((_b = props.localConfig) == null ? void 0 : _b.hiddenFields) || []
+      ];
+    });
     const leftButtons = vue.computed(() => {
-      return props.customBtns.left || [];
+      return (props.customBtns.left || []).filter((item) => {
+        if (!item.showCondition) return true;
+        return parseFilterConfig.checkFilterMatch(
+          item.showCondition,
+          props.hiddenFormData,
+          fieldsData.value
+        );
+      });
     });
     const rightButtons = vue.computed(() => {
-      return props.customBtns.right || [];
+      return (props.customBtns.right || []).filter((item) => {
+        if (!item.showCondition) return true;
+        return parseFilterConfig.checkFilterMatch(
+          item.showCondition,
+          props.hiddenFormData,
+          fieldsData.value
+        );
+      });
     });
     const hasButtons = vue.computed(() => {
       return leftButtons.value.length > 0 || rightButtons.value.length > 0;
@@ -139,5 +165,5 @@ const _sfc_main = {
     };
   }
 };
-const CustomButtons = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-4a702348"]]);
+const CustomButtons = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d1552802"]]);
 exports.default = CustomButtons;

package/lib/packages/vue/src/components/table/DynamicQuery.vue.js

@@ -25,6 +25,7 @@ const index$c = require("../forms/multipleSelection/index.js");
 const index$e = require("../forms/date/index.js");
 const index$d = require("../forms/number/index.js");
 const common = require("../../utils/common.js");
+const parseFilterConfig = require("../../utils/parseFilterConfig.js");
 ;/* empty css                   */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.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/icon/index.js");
@@ -81,6 +82,10 @@ const _sfc_main = {
     readOnly: {
       type: Boolean,
       default: false
+    },
+    hiddenFormData: {
+      type: Object,
+      default: {}
     }
   },
   emits: ["click", "search"],
@@ -101,9 +106,23 @@ const _sfc_main = {
       activeTab.value = ((_b = (_a = dynamicConfig.value) == null ? void 0 : _a.tabConfigs) == null ? void 0 : _b.length) > 0 ? (_c = dynamicConfig.value) == null ? void 0 : _c.tabActive : "";
       return ((_d = dynamicConfig.value) == null ? void 0 : _d.tabConfigs) || [];
     });
+    const fieldsData = vue.computed(() => {
+      var _a, _b;
+      return [
+        ...((_a = props.localConfig) == null ? void 0 : _a.fieldsData) || [],
+        ...((_b = props.localConfig) == null ? void 0 : _b.hiddenFields) || []
+      ];
+    });
     const rightButtons = vue.computed(() => {
       var _a;
-      return ((_a = props.localConfig) == null ? void 0 : _a.customBtns.right) || [];
+      return (((_a = props.localConfig) == null ? void 0 : _a.customBtns.right) || []).filter((item) => {
+        if (!item.showCondition) return true;
+        return parseFilterConfig.checkFilterMatch(
+          item.showCondition,
+          props.hiddenFormData,
+          fieldsData.value
+        );
+      });
     });
     const getBtnIcon = (btnType) => {
       const iconMap = {
@@ -433,5 +452,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-cc8f1fb6"]]);
+const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bb55debf"]]);
 exports.default = DynamicQuery;

package/lib/packages/vue/src/components/table/Table.vue.js

@@ -50,6 +50,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       type: String,
       default: ""
     },
+    titleMode: {
+      type: String,
+      default: ""
+    },
     // 表格数据
     tableData: {
       type: Array,
@@ -96,6 +100,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     initHiddenData: {
       type: Object,
       default: {}
+    },
+    btnRollbackEvent: {
+      type: Object,
+      default: {}
     }
   },
   emits: [
@@ -289,7 +297,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     };
     const handleFlowEvent = vue.ref(null);
-    const handleCustomBtnClick = ({ btn, event, type }) => {
+    const handleCustomBtnClick = async ({ btn, event, type }) => {
       var _a, _b;
       switch (btn.btnType) {
         case "refresh":
@@ -302,12 +310,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           handlePersonalize();
           break;
         default:
-          (_b = handleFlowEvent.value) == null ? void 0 : _b.call(
+          await ((_b = handleFlowEvent.value) == null ? void 0 : _b.call(
             handleFlowEvent,
             hiddenFormData.value,
             btn,
             (_a = btn.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
-          );
+          ));
+          const handleFunc = props.btnRollbackEvent[btn.id];
+          if (handleFunc && typeof handleFunc == "function") {
+            handleFunc();
+          }
       }
     };
     const handleSortChange = ({ property, order }) => {
@@ -570,19 +582,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                 "custom-btns": localConfig.value.customBtns,
                 localConfig: localConfig.value,
                 readonly: __props.readonly,
-                isSubTable: __props.isSubTable,
-                onClick: handleCustomBtnClick
-              }, null, 8, ["custom-btns", "localConfig", "readonly", "isSubTable"])
+                isSubTable: __props.titleMode == "label",
+                onClick: handleCustomBtnClick,
+                hiddenFormData: hiddenFormData.value
+              }, null, 8, ["custom-btns", "localConfig", "readonly", "isSubTable", "hiddenFormData"])
             ], 64)) : vue.createCommentVNode("", true),
             localConfig.value.queryConfig.mode == "dynamic" ? (vue.openBlock(), vue.createBlock(DynamicQuery.default, {
               key: 1,
               readonly: __props.readonly,
-              isSubTable: __props.isSubTable,
+              isSubTable: __props.titleMode == "label",
               localConfig: localConfig.value,
               "fields-data": fieldsData.value,
               onSearch: handleFilterSearch,
-              onClick: handleCustomBtnClick
-            }, null, 8, ["readonly", "isSubTable", "localConfig", "fields-data"])) : vue.createCommentVNode("", true),
+              onClick: handleCustomBtnClick,
+              hiddenFormData: hiddenFormData.value
+            }, null, 8, ["readonly", "isSubTable", "localConfig", "fields-data", "hiddenFormData"])) : vue.createCommentVNode("", true),
             vue.createElementVNode("div", _hoisted_1, [
               vue.createVNode(vue.unref(index$1.VxeTable), {
                 ref_key: "tableRef",
@@ -618,7 +632,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                       "table-data": displayData.value,
                       readonly: __props.readonly,
                       isDialog: __props.isDialog,
-                      hiddenFormData: hiddenFormData.value
+                      hiddenFormData: hiddenFormData.value,
+                      btnRollbackEvent: __props.btnRollbackEvent
                     }, vue.createSlots({ _: 2 }, [
                       vue.renderList(fieldsData.value, (field) => {
                         return {
@@ -628,7 +643,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                           ])
                         };
                       })
-                    ]), 1032, ["fields-data", "show-index", "select-mode", "is-opt-btns", "opt-btns", "mode-key", "modes", "data-source-options", "dictionary-options", "localConfig", "table-ref", "table-data", "readonly", "isDialog", "hiddenFormData"])
+                    ]), 1032, ["fields-data", "show-index", "select-mode", "is-opt-btns", "opt-btns", "mode-key", "modes", "data-source-options", "dictionary-options", "localConfig", "table-ref", "table-data", "readonly", "isDialog", "hiddenFormData", "btnRollbackEvent"])
                   ];
                 }),
                 _: 3
@@ -647,5 +662,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-be17662c"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3c129bed"]]);
 exports.default = _Table;

package/lib/packages/vue/src/components/table/TableColumn.vue.js

@@ -105,6 +105,10 @@ const _sfc_main = {
     hiddenFormData: {
       type: Object,
       default: {}
+    },
+    btnRollbackEvent: {
+      type: Object,
+      default: {}
     }
   },
   setup(__props) {
@@ -271,7 +275,7 @@ const _sfc_main = {
       );
       return Math.max(maxVisibleBtns, 1) * btnWidth + padding;
     });
-    const { getEventHandlers: createEventHandlers } = eventFlowHandler.useEventFlow({
+    const { handleEvent } = eventFlowHandler.useEventFlow({
       fields: props.fieldsData,
       instance,
       localConfig: props.localConfig,
@@ -279,13 +283,17 @@ const _sfc_main = {
         table: props.tableRef
       }
     });
-    const getEventHandlers = (row, item, eventConfig) => {
-      return createEventHandlers(
-        item,
+    async function handleButtonClick(row, btn, eventConfig) {
+      await handleEvent(
         { ...row, ...common.removeEmptyValues(props.hiddenFormData) },
-        eventConfig
+        btn,
+        eventConfig == null ? void 0 : eventConfig.find((item) => item.name == "Click")
       );
-    };
+      const handleFunc = props.btnRollbackEvent[btn.id];
+      if (handleFunc && typeof handleFunc == "function") {
+        handleFunc();
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_link = index$1.ElLink;
       const _component_el_icon = index$2.ElIcon;
@@ -335,15 +343,16 @@ const _sfc_main = {
                 field
               }, () => [
                 field.prefix ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_2, vue.toDisplayString(field.prefix), 1)) : vue.createCommentVNode("", true),
-                field.isLink ? (vue.openBlock(), vue.createBlock(_component_el_link, vue.mergeProps({
+                field.isLink ? (vue.openBlock(), vue.createBlock(_component_el_link, {
                   key: 1,
-                  type: "primary"
-                }, vue.toHandlers(getEventHandlers(row, field, field.linkConfig))), {
+                  type: "primary",
+                  onClick: ($event) => handleButtonClick(row, field, field.linkConfig)
+                }, {
                   default: vue.withCtx(() => [
                     vue.createTextVNode(vue.toDisplayString(formatCellValue(row, field)), 1)
                   ]),
                   _: 2
-                }, 1040)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
+                }, 1032, ["onClick"])) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
                   vue.createTextVNode(vue.toDisplayString(formatCellValue(row, field)), 1)
                 ], 64)),
                 field.suffix ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_3, vue.toDisplayString(field.suffix), 1)) : vue.createCommentVNode("", true),
@@ -371,17 +380,18 @@ const _sfc_main = {
         }, {
           default: vue.withCtx(({ row }) => [
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getVisibleOptBtns(row), (btn) => {
-              return vue.openBlock(), vue.createBlock(_component_el_button, vue.mergeProps({
+              return vue.openBlock(), vue.createBlock(_component_el_button, {
                 key: btn.id,
                 type: "primary",
                 link: "",
-                disabled: isBtnDisabled(row, btn)
-              }, vue.toHandlers(getEventHandlers(row, btn, btn.eventConfig))), {
+                disabled: isBtnDisabled(row, btn),
+                onClick: ($event) => handleButtonClick(row, btn, btn.eventConfig)
+              }, {
                 default: vue.withCtx(() => [
                   vue.createTextVNode(vue.toDisplayString(btn.label), 1)
                 ]),
                 _: 2
-              }, 1040, ["disabled"]);
+              }, 1032, ["disabled", "onClick"]);
             }), 128))
           ]),
           _: 1
@@ -390,5 +400,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2352d631"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-77ad8323"]]);
 exports.default = TableColumn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.3.12",
+  "version": "5.3.14",
   "main": "lib/packages/designer/index.js",
   "module": "es/packages/designer/index.mjs",
   "files": [