@fecp/designer 5.3.11 → 5.3.13

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,
@@ -570,19 +574,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",
@@ -647,5 +653,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-fa5e2171"]]);
 exports.default = _Table;

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -539,7 +539,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/lib/packages/vue/src/utils/parseRouteParams.js

@@ -10,7 +10,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];
     }

package/package.json

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