@fecp/designer 5.3.11 → 5.3.13

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,
@@ -568,19 +572,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",
@@ -645,7 +651,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-fa5e2171"]]);
 export {
   _Table as default
 };

package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -537,7 +537,6 @@ async function handleDialog(node, data, fields, context) {
     const dialogList = context.localConfig.dialogs || [];
     dialog = dialogList.find((item) => item.id == (basic == null ? void 0 : basic.dialogId));
     dialog.subFormMode = basic.subFormMode;
-    dialog.selectionMode = basic.selectionMode;
   }
   if (!dialog) {
     console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));

package/es/packages/vue/src/utils/parseRouteParams.mjs

@@ -8,7 +8,7 @@ function parseSingleParamValue(value, data, fields) {
   }
   const type = value.type;
   if (type === "field") {
-    const field = fields.find((f) => f.id === value.value);
+    const field = fields.find((f) => f.id == value.value);
     if (field) {
       return data[field.fieldName];
     }