@fecp/vue 1.1.9 → 1.2.0

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

@@ -1,21 +1,25 @@
 /* empty css                                                                                                                                 */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                    */
-import { 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, mergeProps, toHandlers, 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";
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                       */
 /* empty css                                                                                                                                       */
-/* empty css                                                                                                                                           */
-/* empty css                                                                                                                                     */
+/* empty css                                                                                                                                      */
 /* empty css                                                                                                                                       */
+import "./index.mjs";
+import "../forms/form/index.mjs";
+import "../../utils/formulajs/functionCore.mjs";
 import { useEventFlow } from "../../utils/eventFlow/eventFlowHandler.mjs";
-import { getCurrentVueInstance } from "../../utils/getInstance.mjs";
+/* empty css                            */
+import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
+/* empty css                                                                                                                                           */
+/* empty css                                                                                                                                     */
 import { Decimal } from "../../../../../node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.mjs";
 /* empty css                  */
-import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { VxeColumn } from "../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/column/index.mjs";
 import { ElLink } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/link/index.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";
@@ -72,10 +76,10 @@ const _sfc_main = {
       type: Object,
       default: () => ({})
     },
-    // 数据源配置列表
-    dataSources: {
-      type: Array,
-      default: () => []
+    localConfig: {
+      type: Object,
+      default: () => {
+      }
     },
     // 表格组件引用（用于表格刷新等操作）
     tableRef: {
@@ -86,10 +90,19 @@ const _sfc_main = {
     tableData: {
       type: Array,
       default: () => []
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    isDialog: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
     const props = __props;
+    const instance = getCurrentInstance();
     const visibleFields = computed(() => {
       let fields = props.fieldsData.filter((field) => field.isShow);
       if (props.modeKey && props.modes.length) {
@@ -247,8 +260,8 @@ const _sfc_main = {
     });
     const { getEventHandlers: createEventHandlers } = useEventFlow({
       fields: props.fieldsData,
-      ctx: getCurrentVueInstance(),
-      dataSources: props.dataSources,
+      instance,
+      localConfig: props.localConfig,
       components: {
         table: props.tableRef
       }
@@ -259,16 +272,18 @@ const _sfc_main = {
       const _component_el_icon = ElIcon;
       const _component_el_button = ElButton;
       return openBlock(), createElementBlock("div", _hoisted_1, [
-        __props.selectMode === "multiple" ? (openBlock(), createBlock(unref(VxeColumn), {
+        !__props.readonly && __props.selectMode === "multiple" ? (openBlock(), createBlock(unref(VxeColumn), {
           key: 0,
           type: "checkbox",
           width: 50,
-          fixed: "left"
+          fixed: "left",
+          align: "center"
         })) : createCommentVNode("", true),
-        __props.selectMode === "single" ? (openBlock(), createBlock(unref(VxeColumn), {
+        !__props.readonly && __props.selectMode === "single" ? (openBlock(), createBlock(unref(VxeColumn), {
           key: 1,
           type: "radio",
           width: 50,
+          align: "center",
           fixed: "left"
         })) : createCommentVNode("", true),
         __props.showIndex ? (openBlock(), createBlock(unref(VxeColumn), {
@@ -301,7 +316,7 @@ 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 && !__props.isDialog ? (openBlock(), createBlock(_component_el_link, mergeProps({
                   key: 1,
                   type: "primary"
                 }, toHandlers(getEventHandlers(row, field, field.linkConfig))), {
@@ -328,7 +343,7 @@ const _sfc_main = {
             _: 2
           }, 1032, ["field", "title", "width", "min-width", "fixed", "align", "header-align", "sortable", "show-overflow"]);
         }), 128)),
-        shouldShowOptColumn.value ? (openBlock(), createBlock(unref(VxeColumn), {
+        !__props.readonly && shouldShowOptColumn.value ? (openBlock(), createBlock(unref(VxeColumn), {
           key: 3,
           title: "操作",
           width: optColumnWidth.value,
@@ -356,7 +371,7 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-07b138b8"]]);
+const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4405f869"]]);
 export {
   TableColumn as default
 };

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

@@ -43,7 +43,7 @@ const _sfc_main = {
   emits: ["search", "reset"],
   setup(__props, { expose: __expose, emit: __emit }) {
     useCssVars((_ctx) => ({
-      "082237d9": `${config.value.collapseRows * 90}px`
+      "f2b12ff4": `${config.value.collapseRows * 90}px`
     }));
     const props = __props;
     const emit = __emit;
@@ -77,12 +77,15 @@ const _sfc_main = {
       return fieldCount > maxVisibleFields;
     });
     const isSingleLine = computed(() => {
+      const totalRows = Math.ceil(
+        completeFilterFields.value.length / config.value.columnCount
+      );
+      if (totalRows === 1) {
+        return true;
+      }
       if (isCollapsed.value) {
         return config.value.collapseRows === 1;
       } else {
-        const totalRows = Math.ceil(
-          completeFilterFields.value.length / config.value.columnCount
-        );
         return totalRows === 1;
       }
     });
@@ -300,7 +303,7 @@ const _sfc_main = {
     };
   }
 };
-const TableFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b904d93a"]]);
+const TableFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ae5195b7"]]);
 export {
   TableFilter as default
 };

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

@@ -1,6 +1,6 @@
-import Table$1 from "./Table.vue.mjs";
+import _Table from "./Table.vue.mjs";
 import install from "../../utils/install.mjs";
-const Table = install.withInstall("Table", Table$1);
+const Table = install.withInstall("Table", _Table);
 export {
   Table,
   Table as default

package/es/packages/vue/src/composables/usePageEvents.mjs

@@ -3,11 +3,16 @@ import { onUnmounted, onBeforeUnmount, onMounted } from "vue";
 /* empty css                                                                                                                                  */
 /* empty css                                                                                                                                    */
 /* empty css                                                                                                                                    */
-/* empty css                                                                                                                                        */
 /* empty css                                                                                                                                   */
-/* empty css                                                                                                                                  */
 /* empty css                                                                                                                                    */
+/* empty css                                                                                                                                   */
+import "../components/table/index.mjs";
+import "../components/forms/form/index.mjs";
+import "../utils/formulajs/functionCore.mjs";
 import { useEventFlow } from "../utils/eventFlow/eventFlowHandler.mjs";
+/* empty css                                       */
+/* empty css                                                                                                                                        */
+/* empty css                                                                                                                                  */
 function usePageEvents(getOptions) {
   if (typeof getOptions !== "function") {
     const staticOptions = getOptions;
@@ -15,7 +20,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;
@@ -27,9 +32,12 @@ function usePageEvents(getOptions) {
     }
     const { getEventHandlers: createEventHandlers } = useEventFlow({
       fields: fields || [],
-      ctx,
-      dataSources: (localConfig == null ? void 0 : localConfig.dataSources) || [],
-      components: components || {}
+      instance,
+      localConfig: localConfig || {},
+      components: components || {},
+      metadata: {
+        initSearchData
+      }
     });
     const handler = createEventHandlers(
       {},

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

@@ -1,7 +1,11 @@
 import cloneDeep$1 from "../../../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/cloneDeep.mjs";
+import isEqual$1 from "../../../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/isEqual.mjs";
 function cloneDeep(data) {
   return cloneDeep$1(data);
 }
+function isEqual(data1, data2) {
+  return isEqual$1(data1, data2);
+}
 function removeEmptyValues(data) {
   if (typeof data !== "object" || data === null) {
     return data;
@@ -24,5 +28,6 @@ function removeEmptyValues(data) {
 }
 export {
   cloneDeep,
+  isEqual,
   removeEmptyValues
 };

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

@@ -1,6 +1,7 @@
 import { createDataSource } from "../datasource.mjs";
 import { parseRouteParams } from "../parseRouteParams.mjs";
 import { removeEmptyValues } from "../common.mjs";
+import { openDialog } from "../../components/dialog/index.mjs";
 /* empty css                                                                                                                                 */
 /* empty css                                                                                                                                           */
 /* empty css                                                                                                                                      */
@@ -9,6 +10,15 @@ import { removeEmptyValues } from "../common.mjs";
 import { ElMessage } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
 import { ElMessageBox } from "../../../../../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.mjs";
 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(basic.routeParams, data, fields);
@@ -133,7 +143,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 {
@@ -289,7 +299,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;
   }
@@ -416,6 +428,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;
+  }
+  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,
@@ -425,7 +466,8 @@ const defaultActionHandlers = {
   "table-refresh": handleTableRefresh,
   "form-setValue": handleFormSetValue,
   "form-submit": handleFormSubmit,
-  "custom": handleCustomAction
+  "custom": handleCustomAction,
+  "ui-dialog": handleDialog
 };
 export {
   defaultActionHandlers as default,
@@ -433,6 +475,7 @@ export {
   handleApiCall,
   handleConfirm,
   handleCustomAction,
+  handleDialog,
   handleMessage,
   handlePageGoBack,
   handlePageJump,

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

@@ -1,38 +1,69 @@
 import { createEventFlowParser } from "../eventFlowParser.mjs";
+async function executeEventFlow(params) {
+  const {
+    eventFlow,
+    fields = [],
+    instance = null,
+    localConfig = {},
+    components = {},
+    onSuccess,
+    onError,
+    row,
+    item,
+    metadata
+  } = params;
+  if (!eventFlow) {
+    return;
+  }
+  try {
+    const parser = 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 = 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
+      });
     }
   };
 }
@@ -57,6 +88,7 @@ function useEventFlow(options = {}) {
 }
 export {
   createEventFlowHandler,
+  executeEventFlow,
   getEventHandlers,
   useEventFlow
 };

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

@@ -30,6 +30,7 @@ class EventFlowParser {
       results: []
       // 每个节点的执行结果
     };
+    this.metadata = options.metadata || {};
     this.actionHandlers = {
       ...defaultActionHandlers,
       ...options.customActionHandlers
@@ -260,7 +261,7 @@ class EventFlowParser {
       if (actionResult.shouldShowError !== false) {
         ElMessage.error(errorMessage);
       }
-      return null;
+      throw new Error(errorMessage);
     }
     if ((_b = node.advanced) == null ? void 0 : _b.blockCondition) {
       const shouldBlock = checkFilterMatch(
@@ -289,17 +290,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/es/packages/vue/src/utils/formulajs/calculate.mjs

@@ -1,7 +1,7 @@
 import functionCore from "./functionCore.mjs";
 import "vue";
 function calculate(params) {
-  const { text, value = {} } = params;
+  const { text, marks = [], value = {} } = params;
   if (!text) return new Error("非法公式");
   try {
     let str = text;