@fecp/vue 1.1.8 → 1.2.0

package/lib/packages/vue/src/composables/usePageEvents.js

@@ -5,11 +5,16 @@ const vue = require("vue");
 ;/* empty css                                                                                                                                  */
 ;/* empty css                                                                                                                                    */
 ;/* empty css                                                                                                                                    */
-;/* empty css                                                                                                                                        */
 ;/* empty css                                                                                                                                   */
-;/* empty css                                                                                                                                  */
 ;/* empty css                                                                                                                                    */
+;/* empty css                                                                                                                                   */
+require("../components/table/index.js");
+require("../components/forms/form/index.js");
+require("../utils/formulajs/functionCore.js");
 const eventFlowHandler = require("../utils/eventFlow/eventFlowHandler.js");
+;/* empty css                                       */
+;/* empty css                                                                                                                                        */
+;/* empty css                                                                                                                                  */
 function usePageEvents(getOptions) {
   if (typeof getOptions !== "function") {
     const staticOptions = getOptions;
@@ -17,7 +22,7 @@ function usePageEvents(getOptions) {
   }
   const executeEvent = async (eventName) => {
     const options = getOptions();
-    const { pageEventConfig, ctx, formData, localConfig, components, fields } = options;
+    const { pageEventConfig, instance, formData, localConfig, components, fields, initSearchData } = options;
     if (!pageEventConfig || !Array.isArray(pageEventConfig) || pageEventConfig.length === 0) {
       console.log(`页面事件 ${eventName} 未配置或配置未加载完成，跳过执行`);
       return;
@@ -29,9 +34,12 @@ function usePageEvents(getOptions) {
     }
     const { getEventHandlers: createEventHandlers } = eventFlowHandler.useEventFlow({
       fields: fields || [],
-      ctx,
-      dataSources: (localConfig == null ? void 0 : localConfig.dataSources) || [],
-      components: components || {}
+      instance,
+      localConfig: localConfig || {},
+      components: components || {},
+      metadata: {
+        initSearchData
+      }
     });
     const handler = createEventHandlers(
       {},

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

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const cloneDeep$1 = require("../../../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/cloneDeep.js");
+const isEqual$1 = require("../../../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/isEqual.js");
 function cloneDeep(data) {
   return cloneDeep$1.default(data);
 }
+function isEqual(data1, data2) {
+  return isEqual$1.default(data1, data2);
+}
 function removeEmptyValues(data) {
   if (typeof data !== "object" || data === null) {
     return data;
@@ -25,4 +29,5 @@ function removeEmptyValues(data) {
   return result;
 }
 exports.cloneDeep = cloneDeep;
+exports.isEqual = isEqual;
 exports.removeEmptyValues = removeEmptyValues;

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

@@ -3,14 +3,24 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const datasource = require("../datasource.js");
 const parseRouteParams = require("../parseRouteParams.js");
 const common = require("../common.js");
+const index = require("../../components/dialog/index.js");
 ;/* empty css                                                                                                                                 */
 ;/* empty css                                                                                                                                           */
 ;/* empty css                                                                                                                                      */
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                                                                                                                       */
-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/message/index.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/message-box/index.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/message/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");
 async function handlePageJump(node, data, fields, context) {
+  const dialogDoms = document.querySelectorAll(".el-modal-dialog");
+  for (let i in dialogDoms) {
+    if (!dialogDoms[i].style.display) {
+      return {
+        success: true,
+        message: "页面存在弹层，跳过页面跳转"
+      };
+    }
+  }
   const basic = node.basic || {};
   const transitionType = basic.transitionType || "page";
   const params = parseRouteParams.parseRouteParams(basic.routeParams, data, fields);
@@ -80,7 +90,7 @@ async function handlePageGoBack(node, data, fields, context) {
   };
   if (config.showConfirm) {
     try {
-      await index$1.ElMessageBox.confirm(
+      await index$2.ElMessageBox.confirm(
         config.confirmMessage,
         config.confirmTitle,
         {
@@ -135,7 +145,7 @@ async function handleApiCall(node, data, fields, context, params) {
       message: "数据源配置不完整，缺少 dataSourceId"
     };
   }
-  const dataSources = context.dataSources || [];
+  const dataSources = context.localConfig.dataSources || [];
   const dataSourceConfig = dataSources.find((ds) => ds.id === basic.dataSourceId);
   if (!dataSourceConfig) {
     return {
@@ -186,7 +196,7 @@ async function handleConfirm(node, data, fields, context) {
     cancelAction: basic.cancelAction || "stop"
   };
   try {
-    await index$1.ElMessageBox.confirm(
+    await index$2.ElMessageBox.confirm(
       config.message,
       config.title,
       {
@@ -228,17 +238,17 @@ async function handleMessage(node, data, fields, context) {
     const message = node.basic.message || "操作成功";
     switch (messageType) {
       case "success":
-        index.ElMessage.success(message);
+        index$1.ElMessage.success(message);
         break;
       case "warning":
-        index.ElMessage.warning(message);
+        index$1.ElMessage.warning(message);
         break;
       case "error":
-        index.ElMessage.error(message);
+        index$1.ElMessage.error(message);
         break;
       case "info":
       default:
-        index.ElMessage.info(message);
+        index$1.ElMessage.info(message);
         break;
     }
   }
@@ -291,7 +301,9 @@ async function handleFormSetValue(node, data, fields, context) {
     console.error("form-setValue: 缺少 dataSourceId 配置");
     return;
   }
-  const result = await handleApiCall(node, data, fields, context);
+  const metadata = context.metadata || {};
+  const initSearchData = (metadata == null ? void 0 : metadata.initSearchData) || {};
+  const result = await handleApiCall(node, data, fields, context, initSearchData);
   if (!result.success) {
     return result;
   }
@@ -418,6 +430,35 @@ async function handleFormSubmit(node, data, fields, context) {
     };
   }
 }
+async function handleDialog(node, data, fields, context) {
+  const basic = node.basic || {};
+  if (!(basic == null ? void 0 : basic.dialogId)) {
+    console.error("ui-dialog: 缺少 dialogId 配置");
+    return;
+  }
+  const dialogList = context.localConfig.dialogs || [];
+  const dialog = dialogList.find((item) => item.id == (basic == null ? void 0 : basic.dialogId));
+  if (!dialog) {
+    console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));
+    return;
+  }
+  index.openDialog(
+    null,
+    dialog,
+    context.instance,
+    context.ctx,
+    fields,
+    data
+  ).then((result) => {
+    console.log("确定", result);
+  }).catch(() => {
+    console.log("取消");
+  });
+  return {
+    success: true,
+    message: `弹层 ${dialog.name} 已打开`
+  };
+}
 const defaultActionHandlers = {
   "page-jump": handlePageJump,
   "page-go-back": handlePageGoBack,
@@ -427,13 +468,15 @@ const defaultActionHandlers = {
   "table-refresh": handleTableRefresh,
   "form-setValue": handleFormSetValue,
   "form-submit": handleFormSubmit,
-  "custom": handleCustomAction
+  "custom": handleCustomAction,
+  "ui-dialog": handleDialog
 };
 exports.default = defaultActionHandlers;
 exports.defaultActionHandlers = defaultActionHandlers;
 exports.handleApiCall = handleApiCall;
 exports.handleConfirm = handleConfirm;
 exports.handleCustomAction = handleCustomAction;
+exports.handleDialog = handleDialog;
 exports.handleMessage = handleMessage;
 exports.handlePageGoBack = handlePageGoBack;
 exports.handlePageJump = handlePageJump;

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

@@ -1,40 +1,71 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const eventFlowParser = require("../eventFlowParser.js");
+async function executeEventFlow(params) {
+  const {
+    eventFlow,
+    fields = [],
+    instance = null,
+    localConfig = {},
+    components = {},
+    onSuccess,
+    onError,
+    row,
+    item,
+    metadata
+  } = params;
+  if (!eventFlow) {
+    return;
+  }
+  try {
+    const parser = eventFlowParser.createEventFlowParser({
+      eventFlow,
+      fields,
+      data: row,
+      instance,
+      localConfig,
+      components,
+      metadata
+    });
+    const result = await parser.start();
+    console.log("事件流执行完成:", result);
+    parser.destroy();
+    if (onSuccess) {
+      onSuccess(result, row, item);
+    }
+    return result;
+  } catch (error) {
+    console.error("事件流执行失败:", error);
+    if (onError) {
+      onError(error, row, item);
+    }
+    throw error;
+  }
+}
 function createEventFlowHandler(options = {}) {
   const {
     fields = [],
-    ctx = null,
+    instance = null,
     onSuccess,
     onError,
-    dataSources = [],
-    components = {}
+    localConfig = {},
+    components = {},
+    metadata = {}
   } = options;
   return async function handleEvent(row, item, eventConfig) {
     if (eventConfig && eventConfig.eventFlow) {
-      try {
-        const parser = eventFlowParser.createEventFlowParser({
-          eventFlow: eventConfig.eventFlow,
-          fields,
-          data: row,
-          ctx,
-          dataSources,
-          components
-        });
-        const result = await parser.start();
-        console.log("事件流执行完成:", result);
-        parser.destroy();
-        if (onSuccess) {
-          onSuccess(result, row, item);
-        }
-        return result;
-      } catch (error) {
-        console.error("事件流执行失败:", error);
-        if (onError) {
-          onError(error, row, item);
-        }
-        throw error;
-      }
+      return await executeEventFlow({
+        eventFlow: eventConfig.eventFlow,
+        fields,
+        instance,
+        localConfig,
+        components,
+        onSuccess,
+        onError,
+        row,
+        item,
+        metadata
+      });
     }
   };
 }
@@ -58,5 +89,6 @@ function useEventFlow(options = {}) {
   };
 }
 exports.createEventFlowHandler = createEventFlowHandler;
+exports.executeEventFlow = executeEventFlow;
 exports.getEventHandlers = getEventHandlers;
 exports.useEventFlow = useEventFlow;

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

@@ -32,6 +32,7 @@ class EventFlowParser {
       results: []
       // 每个节点的执行结果
     };
+    this.metadata = options.metadata || {};
     this.actionHandlers = {
       ...actionHandlers.defaultActionHandlers,
       ...options.customActionHandlers
@@ -262,7 +263,7 @@ class EventFlowParser {
       if (actionResult.shouldShowError !== false) {
         index.ElMessage.error(errorMessage);
       }
-      return null;
+      throw new Error(errorMessage);
     }
     if ((_b = node.advanced) == null ? void 0 : _b.blockCondition) {
       const shouldBlock = parseFilterConfig.checkFilterMatch(
@@ -291,17 +292,19 @@ class EventFlowParser {
    * 执行动作
    */
   async executeAction(node) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const handler = this.actionHandlers[node.actionType];
     if (!handler) {
       throw new Error(`未找到动作处理器: ${node.actionType}`);
     }
     const context = {
       parser: this,
-      ctx: (_a = this.options) == null ? void 0 : _a.ctx,
-      customActions: (_b = this.options) == null ? void 0 : _b.customActions,
-      dataSources: (_c = this.options) == null ? void 0 : _c.dataSources,
-      components: this.components
+      instance: (_a = this.options) == null ? void 0 : _a.instance,
+      ctx: (_c = (_b = this.options) == null ? void 0 : _b.instance) == null ? void 0 : _c.proxy,
+      customActions: (_d = this.options) == null ? void 0 : _d.customActions,
+      localConfig: (_e = this.options) == null ? void 0 : _e.localConfig,
+      components: this.components,
+      metadata: (_f = this.options) == null ? void 0 : _f.metadata
     };
     return await handler(node, this.data, this.fields, context);
   }

package/lib/packages/vue/src/utils/formulajs/calculate.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const functionCore = require("./functionCore.js");
 require("vue");
 function calculate(params) {
-  const { text, value = {} } = params;
+  const { text, marks = [], value = {} } = params;
   if (!text) return new Error("非法公式");
   try {
     let str = text;