@fecp/designer 5.3.12 → 5.3.14

package/es/packages/vue/src/components/forms/subTable/SubTable.vue.mjs

@@ -5,6 +5,7 @@ import _Table from "../../table/Table.vue.mjs";
 import { SubTitle } from "../subTitle/index.mjs";
 import { H2 } from "../h2/index.mjs";
 import { parseRouteParams } from "../../../utils/parseRouteParams.mjs";
+import { checkFilterMatch } from "../../../utils/parseFilterConfig.mjs";
 import { ElButton } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/button/index.mjs";
 const _hoisted_1 = {
   key: 0,
@@ -22,27 +23,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;
@@ -50,6 +35,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     inject("rowHeight");
     inject("gridLayout");
     const setFormItemHeight = inject("setFormItemHeight");
+    const handleEvent = inject("handleEvent");
+    const btnRollbackEvent = 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 = computed(() => {
       if (props.config.dataSourceFrom == "main") {
         return formData.value[props.config.fieldName];
@@ -74,8 +75,34 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return {};
     });
     const subTableOption = ref({});
-    const customBtns = computed(() => {
-      return subTableOption.value.customBtns || {};
+    const subTableFieldsData = computed(() => {
+      var _a, _b;
+      return [
+        ...((_a = subTableOption.value) == null ? void 0 : _a.fieldsData) || [],
+        ...((_b = subTableOption.value) == null ? void 0 : _b.hiddenFields) || []
+      ];
+    });
+    const leftButtons = 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 checkFilterMatch(
+          item.showCondition,
+          initHiddenData.value,
+          subTableFieldsData.value
+        );
+      });
+    });
+    const rightButtons = 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 checkFilterMatch(
+          item.showCondition,
+          initHiddenData.value,
+          subTableFieldsData.value
+        );
+      });
     });
     function subTableLoaded(subOption) {
       subTableOption.value = subOption;
@@ -114,7 +141,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             config: __props.config
           }, createSlots({
             default: withCtx(() => [
-              (openBlock(true), createElementBlock(Fragment, null, renderList(unref(customBtns).right, (btn) => {
+              __props.formMode != "query" ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(unref(rightButtons), (btn) => {
                 return openBlock(), createElementBlock(Fragment, null, [
                   btn.btnType == "custom" ? (openBlock(), createBlock(_component_el_button, {
                     key: btn.id,
@@ -128,14 +155,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                     _: 2
                   }, 1032, ["onClick"])) : createCommentVNode("", true)
                 ], 64);
-              }), 256))
+              }), 256)) : createCommentVNode("", true)
             ]),
             _: 2
           }, [
-            unref(customBtns).left ? {
+            unref(leftButtons) ? {
               name: "left",
               fn: withCtx(() => [
-                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(customBtns).left, (btn) => {
+                __props.formMode != "query" ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(unref(leftButtons), (btn) => {
                   return openBlock(), createElementBlock(Fragment, null, [
                     btn.btnType == "custom" ? (openBlock(), createBlock(_component_el_button, {
                       key: btn.id,
@@ -149,7 +176,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                       _: 2
                     }, 1032, ["onClick"])) : createCommentVNode("", true)
                   ], 64);
-                }), 256))
+                }), 256)) : createCommentVNode("", true)
               ]),
               key: "0"
             } : void 0
@@ -165,13 +192,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: unref(subTableData),
           initHiddenData: 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: unref(btnRollbackEvent)
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "height", "tableData", "initHiddenData", "canLoadBySearchData", "readonly", "btnRollbackEvent"])
       ], 64);
     };
   }

package/es/packages/vue/src/components/table/CustomButtons.vue.mjs

@@ -4,6 +4,7 @@ import { computed, createElementBlock, openBlock, createCommentVNode, createBloc
 import "../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/components.mjs";
 import { ArrowLeftBold as arrow_left_bold_default, Search as search_default, Edit as edit_default, Delete as delete_default, Plus as plus_default, Setting as setting_default, Download as download_default, Refresh as refresh_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 { getCurrentVueInstance } from "../../utils/getInstance.mjs";
+import { checkFilterMatch } from "../../utils/parseFilterConfig.mjs";
 /* empty css                    */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElIcon } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/icon/index.mjs";
@@ -35,6 +36,10 @@ const _sfc_main = {
     isSubTable: {
       type: Boolean,
       default: false
+    },
+    hiddenFormData: {
+      type: Object,
+      default: {}
     }
   },
   emits: ["click"],
@@ -42,11 +47,32 @@ const _sfc_main = {
     const ctx = getCurrentVueInstance();
     const props = __props;
     const emit = __emit;
+    const fieldsData = computed(() => {
+      var _a, _b;
+      return [
+        ...((_a = props.localConfig) == null ? void 0 : _a.fieldsData) || [],
+        ...((_b = props.localConfig) == null ? void 0 : _b.hiddenFields) || []
+      ];
+    });
     const leftButtons = computed(() => {
-      return props.customBtns.left || [];
+      return (props.customBtns.left || []).filter((item) => {
+        if (!item.showCondition) return true;
+        return checkFilterMatch(
+          item.showCondition,
+          props.hiddenFormData,
+          fieldsData.value
+        );
+      });
     });
     const rightButtons = computed(() => {
-      return props.customBtns.right || [];
+      return (props.customBtns.right || []).filter((item) => {
+        if (!item.showCondition) return true;
+        return checkFilterMatch(
+          item.showCondition,
+          props.hiddenFormData,
+          fieldsData.value
+        );
+      });
     });
     const hasButtons = computed(() => {
       return leftButtons.value.length > 0 || rightButtons.value.length > 0;
@@ -137,7 +163,7 @@ const _sfc_main = {
     };
   }
 };
-const CustomButtons = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4a702348"]]);
+const CustomButtons = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d1552802"]]);
 export {
   CustomButtons as default
 };

package/es/packages/vue/src/components/table/DynamicQuery.vue.mjs

@@ -23,6 +23,7 @@ import { MultipleSelection } from "../forms/multipleSelection/index.mjs";
 import { Date } from "../forms/date/index.mjs";
 import { Number } from "../forms/number/index.mjs";
 import { handleSearchData } from "../../utils/common.mjs";
+import { checkFilterMatch } from "../../utils/parseFilterConfig.mjs";
 /* empty css                   */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElIcon } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/icon/index.mjs";
@@ -79,6 +80,10 @@ const _sfc_main = {
     readOnly: {
       type: Boolean,
       default: false
+    },
+    hiddenFormData: {
+      type: Object,
+      default: {}
     }
   },
   emits: ["click", "search"],
@@ -99,9 +104,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 = computed(() => {
+      var _a, _b;
+      return [
+        ...((_a = props.localConfig) == null ? void 0 : _a.fieldsData) || [],
+        ...((_b = props.localConfig) == null ? void 0 : _b.hiddenFields) || []
+      ];
+    });
     const rightButtons = 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 checkFilterMatch(
+          item.showCondition,
+          props.hiddenFormData,
+          fieldsData.value
+        );
+      });
     });
     const getBtnIcon = (btnType) => {
       const iconMap = {
@@ -431,7 +450,7 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-cc8f1fb6"]]);
+const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bb55debf"]]);
 export {
   DynamicQuery as default
 };

package/es/packages/vue/src/components/table/Table.vue.mjs

@@ -48,6 +48,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       type: String,
       default: ""
     },
+    titleMode: {
+      type: String,
+      default: ""
+    },
     // 表格数据
     tableData: {
       type: Array,
@@ -94,6 +98,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     initHiddenData: {
       type: Object,
       default: {}
+    },
+    btnRollbackEvent: {
+      type: Object,
+      default: {}
     }
   },
   emits: [
@@ -287,7 +295,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     };
     const handleFlowEvent = ref(null);
-    const handleCustomBtnClick = ({ btn, event, type }) => {
+    const handleCustomBtnClick = async ({ btn, event, type }) => {
       var _a, _b;
       switch (btn.btnType) {
         case "refresh":
@@ -300,12 +308,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 }) => {
@@ -568,19 +580,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)) : createCommentVNode("", true),
             localConfig.value.queryConfig.mode == "dynamic" ? (openBlock(), createBlock(DynamicQuery, {
               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"])) : createCommentVNode("", true),
+              onClick: handleCustomBtnClick,
+              hiddenFormData: hiddenFormData.value
+            }, null, 8, ["readonly", "isSubTable", "localConfig", "fields-data", "hiddenFormData"])) : createCommentVNode("", true),
             createElementVNode("div", _hoisted_1, [
               createVNode(unref(VxeTable), {
                 ref_key: "tableRef",
@@ -616,7 +630,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
                     }, createSlots({ _: 2 }, [
                       renderList(fieldsData.value, (field) => {
                         return {
@@ -626,7 +641,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
@@ -645,7 +660,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-be17662c"]]);
+const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3c129bed"]]);
 export {
   _Table as default
 };

package/es/packages/vue/src/components/table/TableColumn.vue.mjs

@@ -1,7 +1,7 @@
 /* empty css                                                                                                                                 */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                    */
-import { getCurrentInstance, computed, createElementBlock, openBlock, createBlock, createCommentVNode, unref, Fragment, renderList, withCtx, renderSlot, toDisplayString, mergeProps, toHandlers, createTextVNode, createVNode } from "vue";
+import { getCurrentInstance, computed, createElementBlock, openBlock, createBlock, createCommentVNode, unref, Fragment, renderList, withCtx, renderSlot, toDisplayString, createTextVNode, createVNode } from "vue";
 import "../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/components.mjs";
 import { CopyDocument as copy_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 { checkFilterMatch } from "../../utils/parseFilterConfig.mjs";
@@ -103,6 +103,10 @@ const _sfc_main = {
     hiddenFormData: {
       type: Object,
       default: {}
+    },
+    btnRollbackEvent: {
+      type: Object,
+      default: {}
     }
   },
   setup(__props) {
@@ -269,7 +273,7 @@ const _sfc_main = {
       );
       return Math.max(maxVisibleBtns, 1) * btnWidth + padding;
     });
-    const { getEventHandlers: createEventHandlers } = useEventFlow({
+    const { handleEvent } = useEventFlow({
       fields: props.fieldsData,
       instance,
       localConfig: props.localConfig,
@@ -277,13 +281,17 @@ const _sfc_main = {
         table: props.tableRef
       }
     });
-    const getEventHandlers = (row, item, eventConfig) => {
-      return createEventHandlers(
-        item,
+    async function handleButtonClick(row, btn, eventConfig) {
+      await handleEvent(
         { ...row, ...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 = ElLink;
       const _component_el_icon = ElIcon;
@@ -333,15 +341,16 @@ const _sfc_main = {
                 field
               }, () => [
                 field.prefix ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(field.prefix), 1)) : createCommentVNode("", true),
-                field.isLink ? (openBlock(), createBlock(_component_el_link, mergeProps({
+                field.isLink ? (openBlock(), createBlock(_component_el_link, {
                   key: 1,
-                  type: "primary"
-                }, toHandlers(getEventHandlers(row, field, field.linkConfig))), {
+                  type: "primary",
+                  onClick: ($event) => handleButtonClick(row, field, field.linkConfig)
+                }, {
                   default: withCtx(() => [
                     createTextVNode(toDisplayString(formatCellValue(row, field)), 1)
                   ]),
                   _: 2
-                }, 1040)) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+                }, 1032, ["onClick"])) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
                   createTextVNode(toDisplayString(formatCellValue(row, field)), 1)
                 ], 64)),
                 field.suffix ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(field.suffix), 1)) : createCommentVNode("", true),
@@ -369,17 +378,18 @@ const _sfc_main = {
         }, {
           default: withCtx(({ row }) => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(getVisibleOptBtns(row), (btn) => {
-              return openBlock(), createBlock(_component_el_button, mergeProps({
+              return openBlock(), createBlock(_component_el_button, {
                 key: btn.id,
                 type: "primary",
                 link: "",
-                disabled: isBtnDisabled(row, btn)
-              }, toHandlers(getEventHandlers(row, btn, btn.eventConfig))), {
+                disabled: isBtnDisabled(row, btn),
+                onClick: ($event) => handleButtonClick(row, btn, btn.eventConfig)
+              }, {
                 default: withCtx(() => [
                   createTextVNode(toDisplayString(btn.label), 1)
                 ]),
                 _: 2
-              }, 1040, ["disabled"]);
+              }, 1032, ["disabled", "onClick"]);
             }), 128))
           ]),
           _: 1
@@ -388,7 +398,7 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2352d631"]]);
+const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-77ad8323"]]);
 export {
   TableColumn as default
 };