@fecp/designer 5.3.3 → 5.3.5

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

@@ -566,21 +566,23 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                 onSearch: handleFilterSearch,
                 onReset: handleFilterReset
               }, null, 8, ["query-config", "fields-data"]),
-              !__props.readonly && !__props.isSubTable ? (vue.openBlock(), vue.createBlock(CustomButtons.default, {
-                key: 0,
+              vue.createVNode(CustomButtons.default, {
                 "custom-btns": localConfig.value.customBtns,
                 localConfig: localConfig.value,
+                readonly: __props.readonly,
+                isSubTable: __props.isSubTable,
                 onClick: handleCustomBtnClick
-              }, null, 8, ["custom-btns", "localConfig"])) : vue.createCommentVNode("", true)
+              }, null, 8, ["custom-btns", "localConfig", "readonly", "isSubTable"])
             ], 64)) : vue.createCommentVNode("", true),
             localConfig.value.queryConfig.mode == "dynamic" ? (vue.openBlock(), vue.createBlock(DynamicQuery.default, {
               key: 1,
+              readonly: __props.readonly,
               isSubTable: __props.isSubTable,
               localConfig: localConfig.value,
               "fields-data": fieldsData.value,
               onSearch: handleFilterSearch,
               onClick: handleCustomBtnClick
-            }, null, 8, ["isSubTable", "localConfig", "fields-data"])) : vue.createCommentVNode("", true),
+            }, null, 8, ["readonly", "isSubTable", "localConfig", "fields-data"])) : vue.createCommentVNode("", true),
             vue.createElementVNode("div", _hoisted_1, [
               vue.createVNode(vue.unref(index$1.VxeTable), {
                 ref_key: "tableRef",
@@ -645,5 +647,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d0a13549"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8f3c46b5"]]);
 exports.default = _Table;

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

@@ -10,8 +10,8 @@ const index = require("../../api/index.js");
 ;/* empty css                                                                                                                                      */
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                                                                                                                       */
-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/message/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/message-box/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/message-box/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/message/index.js");
 async function handlePageJump(node, data, fields, context) {
   const dialogDoms = document.querySelectorAll(".el-modal-dialog");
   if ((dialogDoms == null ? void 0 : dialogDoms.length) > 0) {
@@ -93,7 +93,7 @@ async function handlePageGoBack(node, data, fields, context) {
   };
   if (config.showConfirm) {
     try {
-      await index$3.ElMessageBox.confirm(
+      await index$2.ElMessageBox.confirm(
         config.confirmMessage,
         config.confirmTitle,
         {
@@ -199,7 +199,7 @@ async function handleConfirm(node, data, fields, context) {
     cancelAction: basic.cancelAction || "stop"
   };
   try {
-    await index$3.ElMessageBox.confirm(
+    await index$2.ElMessageBox.confirm(
       config.message,
       config.title,
       {
@@ -241,17 +241,17 @@ async function handleMessage(node, data, fields, context) {
     const message = node.basic.message || "操作成功";
     switch (messageType) {
       case "success":
-        index$2.ElMessage.success(message);
+        index$3.ElMessage.success(message);
         break;
       case "warning":
-        index$2.ElMessage.warning(message);
+        index$3.ElMessage.warning(message);
         break;
       case "error":
-        index$2.ElMessage.error(message);
+        index$3.ElMessage.error(message);
         break;
       case "info":
       default:
-        index$2.ElMessage.info(message);
+        index$3.ElMessage.info(message);
         break;
     }
   }
@@ -264,7 +264,7 @@ async function handleTableRefresh(node, data, fields, context) {
   var _a, _b, _c;
   console.log("[EventFlow] 执行表格刷新:", node.basic);
   const basic = node.basic || {};
-  const refreshOptions = {
+  const refreshOptions2 = {
     resetSort: basic.resetSort !== false,
     // 默认 true
     resetFilter: basic.resetFilter !== false,
@@ -272,11 +272,11 @@ async function handleTableRefresh(node, data, fields, context) {
     resetPagination: basic.resetPagination !== false
     // 默认 true
   };
-  console.log("[EventFlow] 刷新选项:", refreshOptions);
+  console.log("[EventFlow] 刷新选项:", refreshOptions2);
   const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
   const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
   if (typeof refreshMethod === "function") {
-    await refreshMethod(refreshOptions);
+    await refreshMethod(refreshOptions2);
     return {
       success: true,
       message: "表格已刷新"
@@ -290,6 +290,83 @@ async function handleTableRefresh(node, data, fields, context) {
     };
   }
 }
+async function handleTableChildRefresh(node, data, fields, context) {
+  var _a, _b, _c, _d;
+  console.log("[EventFlow] 执行子表格刷新:", node.basic);
+  const basic = node.basic || {};
+  const formComponent = (_a = context.components) == null ? void 0 : _a.form;
+  const getFormItemRefMethod = (_c = (_b = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.getFormItemRef;
+  if (typeof getFormItemRefMethod === "function") {
+    const subTableRef = getFormItemRefMethod(String(basic.selectSubTableFieldId));
+    context.components.table = {
+      $: {
+        exposed: {
+          refresh: (_d = subTableRef == null ? void 0 : subTableRef.subTableRef) == null ? void 0 : _d.refresh
+        }
+      }
+    };
+    return await handleTableRefresh(node, data, fields, context);
+  } else {
+    console.error("[EventFlow] 未找到表单组件的 getFormItemRef 方法");
+    return {
+      success: false,
+      message: "表单组件未正确配置或 getFormItemRef 方法未暴露",
+      shouldShowError: true
+    };
+  }
+}
+async function handleTableRowDelete(node, data, fields, context) {
+  var _a, _b, _c;
+  console.log("[EventFlow] 执行表格行删除:", node.basic);
+  const basic = node.basic || {};
+  if (basic.showConfirmDeleteMessage) {
+    try {
+      await index$2.ElMessageBox.confirm(
+        "此操作将永久删除该记录, 是否继续",
+        "确认操作",
+        {
+          type: "warning",
+          draggable: true,
+          showClose: false
+        }
+      );
+    } catch (error) {
+      return {
+        success: false,
+        message: "用户已取消",
+        confirmed: false,
+        shouldShowError: false
+        // 用户取消不提示错误
+      };
+    }
+  }
+  const result = await handleApiCall(node, data, fields, context);
+  if (!result.success) {
+    return result;
+  }
+  if (basic.resetTableAfterDelete) {
+    const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
+    const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
+    if (typeof refreshMethod === "function") {
+      await refreshMethod(refreshOptions);
+      return {
+        success: true,
+        message: "表格已刷新"
+      };
+    } else {
+      console.error("[EventFlow] 未找到表格组件的 refresh 方法");
+      return {
+        success: false,
+        message: "表格组件未正确配置或 refresh 方法未暴露",
+        shouldShowError: true
+      };
+    }
+  }
+  return {
+    success: true,
+    message: "列表数据已删除"
+  };
+}
 async function handleCustomAction(node, data, fields, context) {
   console.log("[EventFlow] 执行自定义动作:", node.basic);
   return {
@@ -492,6 +569,8 @@ const defaultActionHandlers = {
   "ui-confirm": handleConfirm,
   "ui-message": handleMessage,
   "table-refresh": handleTableRefresh,
+  "table-row-delete": handleTableRowDelete,
+  "table-child-refresh": handleTableChildRefresh,
   "form-setValue": handleFormSetValue,
   "form-submit": handleFormSubmit,
   "custom": handleCustomAction,
@@ -506,4 +585,6 @@ exports.handleDialog = handleDialog;
 exports.handleMessage = handleMessage;
 exports.handlePageGoBack = handlePageGoBack;
 exports.handlePageJump = handlePageJump;
+exports.handleTableChildRefresh = handleTableChildRefresh;
 exports.handleTableRefresh = handleTableRefresh;
+exports.handleTableRowDelete = handleTableRowDelete;

package/lib/packages/vue/src/utils/parseFilterConfig.js

@@ -73,4 +73,48 @@ function checkConditionMatch(condition, data, fields) {
       return dataValue == parsedValue;
   }
 }
+function checkFieldInFilterConfig(filterConfig, fieldId) {
+  if (!fieldId) {
+    return true;
+  }
+  return checkFieldInGroup(filterConfig, fieldId);
+}
+function checkFieldInGroup(group, targetFieldId) {
+  const { conditions, groups } = group;
+  if (conditions && conditions.length > 0) {
+    const foundInConditions = conditions.some((cond) => cond.field === targetFieldId);
+    if (foundInConditions) {
+      return true;
+    }
+  }
+  if (groups && groups.length > 0) {
+    return groups.some((g) => checkFieldInGroup(g, targetFieldId));
+  }
+  return false;
+}
+function checkFieldInResultConfig(resultConfig, fieldId, fields = []) {
+  var _a, _b;
+  if (!fieldId || !Array.isArray(resultConfig)) {
+    return true;
+  }
+  let fieldName = fieldId;
+  if (fields && fields.length > 0) {
+    const field = fields.find((f) => f.id == fieldId);
+    if (field) {
+      fieldName = field.fieldName;
+    }
+  }
+  for (const item of resultConfig) {
+    if ((_b = (_a = item.formula) == null ? void 0 : _a.value) == null ? void 0 : _b.text) {
+      const formulaText = item.formula.value.text;
+      const fieldPattern = new RegExp(`\\{${fieldName}\\}`, "i");
+      if (fieldPattern.test(formulaText)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+exports.checkFieldInFilterConfig = checkFieldInFilterConfig;
+exports.checkFieldInResultConfig = checkFieldInResultConfig;
 exports.checkFilterMatch = checkFilterMatch;

package/package.json

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