@fecp/designer 5.4.18 → 5.4.20

package/es/packages/mobile/src/components/base/card/Card.vue.mjs

@@ -6,13 +6,13 @@
 /* empty css                                                        */
 /* empty css                                                       */
 import { createBlock, openBlock, withCtx, createVNode, renderSlot } from "vue";
-/* empty css           */
-import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 /* empty css                                                           */
 /* empty css                                                                  */
 /* empty css                                                        */
 /* empty css                                                      */
 /* empty css                                                       */
+/* empty css           */
+import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { SwipeCell } from "../../../../../../node_modules/vant/es/swipe-cell/index.mjs";
 import { showConfirmDialog } from "../../../../../../node_modules/vant/es/dialog/function-call.mjs";
 import "../../../../../../node_modules/vant/es/dialog/index.mjs";

package/es/packages/vue/src/components/dialog/DialogRenderer.vue2.mjs

@@ -3,17 +3,27 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                   */
 /* empty css                                                                  */
 /* empty css                                                                  */
-import { ref, computed, watch, createBlock, openBlock, withCtx, createElementVNode, normalizeStyle, normalizeClass, createElementBlock, Fragment, createCommentVNode, unref, resolveDynamicComponent, toDisplayString, createVNode, createTextVNode, renderList, defineAsyncComponent } from "vue";
+import { ref, computed, watch, createBlock, openBlock, resolveDynamicComponent, mergeProps, withCtx, createElementVNode, normalizeStyle, normalizeClass, createElementBlock, Fragment, createCommentVNode, unref, normalizeProps, toDisplayString, createVNode, createTextVNode, renderList } from "vue";
 import { Table } from "../table/index.mjs";
 import { Form } from "../forms/form/index.mjs";
 import { parseRouteParams } from "../../utils/parseRouteParams.mjs";
 import { calculate } from "../../utils/formulajs/calculate.mjs";
 import { useEventFlow, executeEventFlow } from "../../utils/eventFlow/eventFlowHandler.mjs";
-/* empty css                                                                 */
 /* empty css                                                                   */
+/* empty css                                                                 */
 /* empty css                                                                   */
 /* empty css                    */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
+/* empty css                                                  */
+/* empty css                                                        */
+/* empty css                                                   */
+/* empty css                                                  */
+/* empty css                                                     */
+/* empty css                                                    */
+/* empty css                                                               */
+/* empty css                                                     */
+/* empty css                                                   */
+/* empty css                                                    */
 /* empty css                                                                 */
 /* empty css                                                                       */
 import { ElDialog } from "../../../../../node_modules/element-plus/es/components/dialog/index.mjs";
@@ -115,6 +125,9 @@ const _sfc_main = {
       },
       (val) => {
         dialogVisible.value = val;
+        if (val) {
+          loadComponentByPath(currentDialogConfig.value.componentPath);
+        }
       },
       {
         immediate: true
@@ -123,19 +136,27 @@ const _sfc_main = {
     watch(dialogVisible, (val) => {
       emit("update:modelValue", val);
     });
-    const loadComponent = (path) => {
-      if (!path) return null;
-      try {
-        const component = defineAsyncComponent(
-          () => import(
-            /* @vite-ignore */
-            path
-          )
-        );
-        return component;
-      } catch (error) {
-        console.error("组件加载失败:", error);
-        return null;
+    const componentParams = computed(() => {
+      var _a;
+      const params = parseRouteParams(
+        ((_a = currentDialogConfig.value) == null ? void 0 : _a.componentParams) || [],
+        props.formData,
+        props.fieldsList
+      );
+      return params;
+    });
+    const currentComponent = ref(null);
+    const loadComponentByPath = (path) => {
+      const route = ctx.$router.getRoutes().find((item) => item.path === path);
+      if (!route) return;
+      const comp = route.components.default;
+      if (!comp) return;
+      if (typeof comp === "function") {
+        comp().then((module) => {
+          currentComponent.value = module.default;
+        });
+      } else {
+        currentComponent.value = comp;
       }
     };
     const handleSubmit = (data) => {
@@ -306,7 +327,12 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       const _component_el_button = ElButton;
       const _component_el_dialog = ElDialog;
-      return openBlock(), createBlock(_component_el_dialog, {
+      return __props.dialogConfig.componentIsDialog ? (openBlock(), createBlock(resolveDynamicComponent(currentComponent.value), mergeProps({ key: 0 }, componentParams.value, {
+        formData: __props.formData,
+        onClose: handleClose,
+        onSubmit: handleSubmit
+      }), null, 16, ["formData"])) : (openBlock(), createBlock(_component_el_dialog, {
+        key: 1,
         modelValue: dialogVisible.value,
         "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dialogVisible.value = $event),
         width: dialogWidth.value,
@@ -401,22 +427,17 @@ const _sfc_main = {
                 ref_key: "dialogFormRef",
                 ref: dialogFormRef
               }, null, 8, ["templateKey", "modelValue", "initFormMode"])) : ((_d = __props.dialogConfig) == null ? void 0 : _d.contentSource) === "component" ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
-                loadComponent(__props.dialogConfig.componentPath) ? (openBlock(), createBlock(resolveDynamicComponent(loadComponent(__props.dialogConfig.componentPath)), {
-                  key: 0,
-                  "dialog-params": __props.dialogConfig.dialogParams,
-                  onClose: handleClose,
-                  onSubmit: handleSubmit
-                }, null, 40, ["dialog-params"])) : (openBlock(), createElementBlock("div", _hoisted_2, " 组件加载失败，请检查组件路径: " + toDisplayString((_e = __props.dialogConfig) == null ? void 0 : _e.componentPath), 1))
+                currentComponent.value ? (openBlock(), createBlock(resolveDynamicComponent(currentComponent.value), normalizeProps(mergeProps({ key: 0 }, componentParams.value)), null, 16)) : (openBlock(), createElementBlock("div", _hoisted_2, " 组件加载失败，请检查组件路径: " + toDisplayString((_e = __props.dialogConfig) == null ? void 0 : _e.componentPath), 1))
               ], 64)) : (openBlock(), createElementBlock("div", _hoisted_3, "请配置弹层内容"))
             ], 6)
           ];
         }),
         _: 1
-      }, 8, ["modelValue", "width"]);
+      }, 8, ["modelValue", "width"]));
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8b571a63"]]);
+const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6b46adf3"]]);
 export {
   DialogRenderer as default
 };

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -26,6 +26,16 @@ import { useEventFlow } from "../../../utils/eventFlow/eventFlowHandler.mjs";
 /* empty css                                                                      */
 /* empty css                               */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
+/* empty css                                                     */
+/* empty css                                                           */
+/* empty css                                                      */
+/* empty css                                                     */
+/* empty css                                                        */
+/* empty css                                                       */
+/* empty css                                                                  */
+/* empty css                                                        */
+/* empty css                                                      */
+/* empty css                                                       */
 import api from "../../../api/index.mjs";
 /* empty css                                                                    */
 /* empty css                                                                          */

package/es/packages/vue/src/components/forms/subForm/SubForm.vue.mjs

@@ -3,6 +3,7 @@ import { Form } from "../form/index.mjs";
 import { SubTitle } from "../subTitle/index.mjs";
 import { H2 } from "../h2/index.mjs";
 import { cloneDeep } from "../../../utils/common.mjs";
+import { parseRouteParams } from "../../../utils/parseRouteParams.mjs";
 const _hoisted_1 = {
   key: 0,
   style: { "height": "60px", "position": "relative" }
@@ -53,11 +54,33 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const setFormItemHeight = inject("setFormItemHeight");
     const subFormData = computed({
       get: () => {
+        if (props.config.dataSourceFrom == "self") {
+          return cloneDeep(subFormParams.value);
+        }
         return cloneDeep(formData.value);
       },
       set: (val) => {
-        formData.value = { ...formData.value, ...val };
+        if (props.config.dataSourceFrom != "self") {
+          formData.value = { ...formData.value, ...val };
+        }
+      }
+    });
+    const fieldList = computed(() => {
+      return [
+        ...props.localConfig.fieldsData.map((item) => item.component),
+        ...props.localConfig.hiddenFields
+      ];
+    });
+    const subFormParams = computed(() => {
+      if (props.config.dataSourceFrom == "self") {
+        const params = parseRouteParams(
+          props.config.subFormParams,
+          formData.value,
+          fieldList.value
+        );
+        return params;
       }
+      return {};
     });
     const templateKey = computed(() => {
       if (props.config.formSource == "dynamic") {
@@ -126,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           templateKey: unref(templateKey),
           isSubForm: "",
           onLayoutUpdated: subFormLoaded,
-          canPageEvent: __props.config.triggerSubFormPageEvent,
+          canPageEvent: __props.config.dataSourceFrom == "self",
           initFormMode: __props.formMode,
           modelValue: unref(subFormData),
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(subFormData) ? subFormData.value = $event : null)

package/es/packages/vue/src/components/forms/text/Text.vue.mjs

@@ -3,10 +3,20 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                    */
 /* empty css                                                                     */
 import { computed, getCurrentInstance, inject, createElementBlock, openBlock, createVNode, createCommentVNode, mergeProps, toHandlers, createSlots, withCtx, createElementVNode, toDisplayString, createBlock, createTextVNode, unref } from "vue";
-/* empty css                                                                    */
 /* empty css                                                                      */
+/* empty css                                                                    */
 /* empty css                                                                      */
 import { openDialog } from "../../dialog/index.mjs";
+/* empty css                                                     */
+/* empty css                                                           */
+/* empty css                                                      */
+/* empty css                                                     */
+/* empty css                                                        */
+/* empty css                                                       */
+/* empty css                                                                  */
+/* empty css                                                        */
+/* empty css                                                      */
+/* empty css                                                       */
 import api from "../../../api/index.mjs";
 /* empty css                                                                      */
 /* empty css                                                                          */

package/es/packages/vue/src/components/riskSch/RiskSchRenderer.vue.mjs

@@ -0,0 +1,87 @@
+import { ref, watch, onMounted, createBlock, openBlock, resolveDynamicComponent, unref, isRef } from "vue";
+const path = "/bus/module/comm/risk/components/RiskInterceptResult";
+const _sfc_main = /* @__PURE__ */ Object.assign({
+  inheritAttrs: false
+}, {
+  __name: "RiskSchRenderer",
+  props: {
+    // 是否显示
+    modelValue: {
+      type: Boolean,
+      default: false
+    },
+    ctx: {
+      type: Object,
+      default: {}
+    },
+    schNo: {
+      type: String,
+      default: ""
+    },
+    busNo: {
+      type: String,
+      default: ""
+    },
+    paramList: {
+      type: Object,
+      default: {}
+    }
+  },
+  emits: ["update:modelValue", "confirm", "cancel"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const dialogVisible = ref(false);
+    watch(
+      () => {
+        return props.modelValue;
+      },
+      (val) => {
+        dialogVisible.value = val;
+      },
+      {
+        immediate: true
+      }
+    );
+    watch(dialogVisible, (val) => {
+      emit("update:modelValue", val);
+    });
+    function confirm(data) {
+      emit("confirm", data);
+    }
+    function cancel(data) {
+      emit("cancel", data);
+    }
+    const currentComponent = ref(null);
+    const loadComponentByPath = (path2) => {
+      const route = props.ctx.$router.getRoutes().find((item) => item.path === path2);
+      if (!route) return;
+      const comp = route.components.default;
+      if (!comp) return;
+      if (typeof comp === "function") {
+        comp().then((module) => {
+          currentComponent.value = module.default;
+        });
+      } else {
+        currentComponent.value = comp;
+      }
+    };
+    onMounted(() => {
+      loadComponentByPath(path);
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(resolveDynamicComponent(unref(currentComponent)), {
+        modelValue: unref(dialogVisible),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(dialogVisible) ? dialogVisible.value = $event : null),
+        schNo: __props.schNo,
+        busNo: __props.busNo,
+        paramList: __props.paramList,
+        onConfirm: confirm,
+        onCancel: cancel
+      }, null, 40, ["modelValue", "schNo", "busNo", "paramList"]);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

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

@@ -0,0 +1,71 @@
+import { createVNode, render } from "vue";
+import _sfc_main from "./RiskSchRenderer.vue.mjs";
+/* empty css                                                  */
+/* empty css                                                        */
+/* empty css                                                   */
+/* empty css                                                  */
+/* empty css                                                     */
+/* empty css                                                    */
+/* empty css                                                               */
+/* empty css                                                     */
+/* empty css                                                   */
+/* empty css                                                    */
+import { closeDialog } from "../../../../../node_modules/vant/es/dialog/function-call.mjs";
+import "../../../../../node_modules/vant/es/dialog/index.mjs";
+let currentDialogInstance = null;
+let isCleaningUp = false;
+const cleanupDialog = () => {
+  if (isCleaningUp) return;
+  isCleaningUp = true;
+  setTimeout(() => {
+    var _a;
+    try {
+      if ((_a = currentDialogInstance == null ? void 0 : currentDialogInstance.container) == null ? void 0 : _a.parentNode) {
+        currentDialogInstance.container.parentNode.removeChild(
+          currentDialogInstance.container
+        );
+      }
+      if (currentDialogInstance == null ? void 0 : currentDialogInstance.vnode) {
+        render(null, currentDialogInstance.container);
+      }
+      currentDialogInstance = null;
+    } catch (error) {
+      console.error("Dialog cleanup error:", error);
+    } finally {
+      isCleaningUp = false;
+    }
+  }, 300);
+};
+function openRiskSch(option, instance, ctx) {
+  return new Promise((resolve, reject) => {
+    if (currentDialogInstance) {
+      closeDialog();
+    }
+    const container = document.createElement("div");
+    document.body.appendChild(container);
+    const vnode = createVNode(_sfc_main, {
+      modelValue: true,
+      ...option,
+      ctx,
+      "onUpdate:modelValue": (val) => {
+        if (!val) {
+          cleanupDialog();
+        }
+      },
+      onConfirm: (data) => {
+        cleanupDialog();
+        resolve(data);
+      },
+      onCancel: () => {
+        cleanupDialog();
+        reject(new Error("用户取消"));
+      }
+    });
+    vnode.appContext = instance.appContext;
+    render(vnode, container);
+    currentDialogInstance = { vnode, container };
+  });
+}
+export {
+  openRiskSch
+};

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

@@ -28,6 +28,16 @@ import { useEventFlow } from "../../utils/eventFlow/eventFlowHandler.mjs";
 /* empty css                                                                   */
 /* empty css                            */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
+/* empty css                                                  */
+/* empty css                                                        */
+/* empty css                                                   */
+/* empty css                                                  */
+/* empty css                                                     */
+/* empty css                                                    */
+/* empty css                                                               */
+/* empty css                                                     */
+/* empty css                                                   */
+/* empty css                                                    */
 /* empty css                                                                 */
 /* empty css                                                                       */
 import getJsonAsyncUtil from "../../utils/getJsonAsyncUtil.mjs";

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

@@ -7,8 +7,8 @@ import "../../../../../node_modules/vxe-table/es/components.mjs";
 import { CopyDocument as copy_document_default } from "../../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
 import { checkFilterMatch } from "../../utils/parseFilterConfig.mjs";
 import { removeEmptyValues } from "../../utils/common.mjs";
-/* empty css                                                                 */
 /* empty css                                                                   */
+/* empty css                                                                 */
 /* empty css                                                                   */
 /* empty css                                                                   */
 /* empty css                                                                  */
@@ -18,6 +18,16 @@ import "../../utils/formulajs/functionCore.mjs";
 import { useEventFlow } from "../../utils/eventFlow/eventFlowHandler.mjs";
 /* empty css                            */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
+/* empty css                                                  */
+/* empty css                                                        */
+/* empty css                                                   */
+/* empty css                                                  */
+/* empty css                                                     */
+/* empty css                                                    */
+/* empty css                                                               */
+/* empty css                                                     */
+/* empty css                                                   */
+/* empty css                                                    */
 /* empty css                                                                 */
 /* empty css                                                                       */
 import { Decimal } from "../../../../../node_modules/decimal.js/decimal.mjs";

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

@@ -1,7 +1,7 @@
 import { onUnmounted, onBeforeUnmount, onMounted } from "vue";
 /* empty css                                                          */
-/* empty css                                                              */
 /* empty css                                                                */
+/* empty css                                                              */
 /* empty css                                                                */
 /* empty css                                                                */
 /* empty css                                                               */
@@ -11,6 +11,16 @@ import "../components/forms/form/index.mjs";
 import "../utils/formulajs/functionCore.mjs";
 import { useEventFlow } from "../utils/eventFlow/eventFlowHandler.mjs";
 /* empty css                                       */
+/* empty css                                               */
+/* empty css                                                     */
+/* empty css                                                */
+/* empty css                                               */
+/* empty css                                                  */
+/* empty css                                                 */
+/* empty css                                                            */
+/* empty css                                                  */
+/* empty css                                                */
+/* empty css                                                 */
 /* empty css                                                              */
 /* empty css                                                                    */
 function usePageEvents(getOptions) {

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

@@ -2,8 +2,8 @@ import { reactive } from "vue";
 import { parseRouteParams } from "./parseRouteParams.mjs";
 import "../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                          */
-/* empty css                                                              */
 /* empty css                                                                */
+/* empty css                                                              */
 /* empty css                                                                */
 import { ElLoading } from "../../../../node_modules/element-plus/es/components/loading/index.mjs";
 import { ElMessage } from "../../../../node_modules/element-plus/es/components/message/index.mjs";

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

@@ -3,6 +3,7 @@ import { parseRouteParams, parseSingleParamValue } from "../parseRouteParams.mjs
 import { removeEmptyValues } from "../common.mjs";
 import "../../../../../node_modules/element-plus/es/index.mjs";
 import { openDialog } from "../../components/dialog/index.mjs";
+import { openRiskSch } from "../../components/riskSch/index.mjs";
 import api from "../../api/index.mjs";
 /* empty css                                                             */
 /* empty css                                                                 */
@@ -630,6 +631,7 @@ async function handleDialog(node, data, fields, context) {
   }
 }
 async function handleRiskSchDialog(node, data, fields, context) {
+  var _a, _b, _c;
   const basic = node.basic || {};
   if (!(basic == null ? void 0 : basic.schNo)) {
     console.error("风险拦截校验: 缺少 schNo 配置");
@@ -639,16 +641,51 @@ async function handleRiskSchDialog(node, data, fields, context) {
     console.error("风险拦截校验: 缺少 busNo 配置");
     return;
   }
+  if (basic == null ? void 0 : basic.formValidate) {
+    const formComponent = (_a = context.components) == null ? void 0 : _a.form;
+    const validateMethod = (_c = (_b = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.validate;
+    try {
+      if (typeof validateMethod === "function") {
+        await validateMethod();
+      } else {
+        console.error("未找到表单组件的 validate 方法");
+        return {
+          success: false,
+          message: "表单组件未正确配置或 validate 方法未暴露",
+          shouldShowError: true
+        };
+      }
+    } catch (error) {
+      return {
+        success: false,
+        message: "表单验证失败！",
+        shouldShowError: false
+      };
+    }
+  }
   const schNo = basic.schNo;
-  console.log("🚀 ~ handleRiskSchDialog ~ schNo:", schNo);
   const paramList = parseRouteParams(basic == null ? void 0 : basic.params, data, fields);
-  console.log("🚀 ~ handleRiskSchDialog ~ paramList:", paramList);
   const busNo = parseSingleParamValue(basic.busNo, data, fields);
-  console.log("🚀 ~ handleRiskSchDialog ~ busNo:", busNo);
-  return {
-    success: true,
-    message: "风险拦截校验通过"
-  };
+  try {
+    await openRiskSch(
+      { schNo, busNo, paramList },
+      context.instance,
+      context.ctx
+    );
+    return {
+      success: true,
+      message: "用户已确认",
+      shouldShowError: false
+    };
+  } catch (error) {
+    return {
+      success: false,
+      message: "用户已取消",
+      confirmed: false,
+      shouldShowError: false
+      // 用户取消不提示错误
+    };
+  }
 }
 async function handleUpload(node, data, fields, context) {
   const basic = node.basic || {};

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.4.18";
+const version = "5.4.20";
 const packageJson = {
   version
 };