@fecp/designer 5.4.30 → 5.4.33

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.4.30";
+const version = "5.4.33";
 const packageJson = {
   version
 };

package/es/designer.css

@@ -5708,18 +5708,18 @@ body,
 :root,:host{--van-overlay-z-index: 1;--van-overlay-background: rgba(0, 0, 0, .7)}.van-overlay{position:fixed;top:0;left:0;z-index:var(--van-overlay-z-index);width:100%;height:100%;background:var(--van-overlay-background)}
 :root,:host{--van-popup-background: var(--van-background-2);--van-popup-transition: transform var(--van-duration-base);--van-popup-round-radius: 16px;--van-popup-close-icon-size: 22px;--van-popup-close-icon-color: var(--van-gray-5);--van-popup-close-icon-margin: 16px;--van-popup-close-icon-z-index: 1}.van-overflow-hidden{overflow:hidden!important}.van-popup{position:fixed;max-height:100%;overflow-y:auto;box-sizing:border-box;background:var(--van-popup-background);transition:var(--van-popup-transition);-webkit-overflow-scrolling:touch}.van-popup--center{top:50%;left:0;right:0;width:-webkit-fit-content;width:fit-content;max-width:calc(100vw - var(--van-padding-md) * 2);margin:0 auto;transform:translateY(-50%)}.van-popup--center.van-popup--round{border-radius:var(--van-popup-round-radius)}.van-popup--top{top:0;left:0;width:100%}.van-popup--top.van-popup--round{border-radius:0 0 var(--van-popup-round-radius) var(--van-popup-round-radius)}.van-popup--right{top:50%;right:0;transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:var(--van-popup-round-radius) 0 0 var(--van-popup-round-radius)}.van-popup--bottom{bottom:0;left:0;width:100%}.van-popup--bottom.van-popup--round{border-radius:var(--van-popup-round-radius) var(--van-popup-round-radius) 0 0}.van-popup--left{top:50%;left:0;transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 var(--van-popup-round-radius) var(--van-popup-round-radius) 0}.van-popup-slide-top-enter-active,.van-popup-slide-left-enter-active,.van-popup-slide-right-enter-active,.van-popup-slide-bottom-enter-active{transition-timing-function:var(--van-ease-out)}.van-popup-slide-top-leave-active,.van-popup-slide-left-leave-active,.van-popup-slide-right-leave-active,.van-popup-slide-bottom-leave-active{transition-timing-function:var(--van-ease-in)}.van-popup-slide-top-enter-from,.van-popup-slide-top-leave-active{transform:translate3d(0,-100%,0)}.van-popup-slide-right-enter-from,.van-popup-slide-right-leave-active{transform:translate3d(100%,-50%,0)}.van-popup-slide-bottom-enter-from,.van-popup-slide-bottom-leave-active{transform:translate3d(0,100%,0)}.van-popup-slide-left-enter-from,.van-popup-slide-left-leave-active{transform:translate3d(-100%,-50%,0)}.van-popup__close-icon{position:absolute;z-index:var(--van-popup-close-icon-z-index);color:var(--van-popup-close-icon-color);font-size:var(--van-popup-close-icon-size)}.van-popup__close-icon--top-left{top:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--top-right{top:var(--van-popup-close-icon-margin);right:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-left{bottom:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-right{right:var(--van-popup-close-icon-margin);bottom:var(--van-popup-close-icon-margin)}
 :root,:host{--van-dialog-width: 320px;--van-dialog-small-screen-width: 90%;--van-dialog-font-size: var(--van-font-size-lg);--van-dialog-transition: var(--van-duration-base);--van-dialog-radius: 16px;--van-dialog-background: var(--van-background-2);--van-dialog-header-font-weight: var(--van-font-bold);--van-dialog-header-line-height: 24px;--van-dialog-header-padding-top: 26px;--van-dialog-header-isolated-padding: var(--van-padding-lg) 0;--van-dialog-message-padding: var(--van-padding-lg);--van-dialog-message-font-size: var(--van-font-size-md);--van-dialog-message-line-height: var(--van-line-height-md);--van-dialog-message-max-height: 60vh;--van-dialog-has-title-message-text-color: var(--van-gray-7);--van-dialog-has-title-message-padding-top: var(--van-padding-xs);--van-dialog-button-height: 48px;--van-dialog-round-button-height: 36px;--van-dialog-confirm-button-text-color: var(--van-primary-color)}.van-dialog{top:45%;width:var(--van-dialog-width);overflow:hidden;font-size:var(--van-dialog-font-size);background:var(--van-dialog-background);border-radius:var(--van-dialog-radius);-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:var(--van-dialog-transition);transition-property:transform,opacity}@media (max-width: 321px){.van-dialog{width:var(--van-dialog-small-screen-width)}}.van-dialog__header{color:var(--van-text-color);padding-top:var(--van-dialog-header-padding-top);font-weight:var(--van-dialog-header-font-weight);line-height:var(--van-dialog-header-line-height);text-align:center}.van-dialog__header--isolated{padding:var(--van-dialog-header-isolated-padding)}.van-dialog__content--isolated{display:flex;align-items:center;min-height:104px}.van-dialog__message{color:var(--van-text-color);flex:1;max-height:var(--van-dialog-message-max-height);padding:26px var(--van-dialog-message-padding);overflow-y:auto;font-size:var(--van-dialog-message-font-size);line-height:var(--van-dialog-message-line-height);white-space:pre-wrap;text-align:center;word-wrap:break-word;-webkit-overflow-scrolling:touch}.van-dialog__message--has-title{padding-top:var(--van-dialog-has-title-message-padding-top);color:var(--van-dialog-has-title-message-text-color)}.van-dialog__message--left{text-align:left}.van-dialog__message--right{text-align:right}.van-dialog__message--justify{text-align:justify}.van-dialog__footer{display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.van-dialog__confirm,.van-dialog__cancel{flex:1;height:var(--van-dialog-button-height);margin:0;border:0;border-radius:0}.van-dialog__confirm,.van-dialog__confirm:active{color:var(--van-dialog-confirm-button-text-color)}.van-dialog--round-button .van-dialog__footer{position:relative;height:auto;padding:var(--van-padding-xs) var(--van-padding-lg) var(--van-padding-md)}.van-dialog--round-button .van-dialog__message{padding-bottom:var(--van-padding-md);color:var(--van-text-color)}.van-dialog--round-button .van-dialog__confirm,.van-dialog--round-button .van-dialog__cancel{height:var(--van-dialog-round-button-height)}.van-dialog--round-button .van-dialog__confirm{color:var(--van-white)}.van-dialog--round-button .van-action-bar-button--first{border-top-left-radius:var(--van-radius-max);border-bottom-left-radius:var(--van-radius-max)}.van-dialog--round-button .van-action-bar-button--last{border-top-right-radius:var(--van-radius-max);border-bottom-right-radius:var(--van-radius-max)}.van-dialog-bounce-enter-from{transform:translate3d(0,-50%,0) scale(.7);opacity:0}.van-dialog-bounce-leave-active{transform:translate3d(0,-50%,0) scale(.9);opacity:0}
-.dialog-header-content[data-v-9cd09319] {
+.dialog-header-content[data-v-600f4264] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
 }
-.dialog-content-wrapper[data-v-9cd09319] {
+.dialog-content-wrapper[data-v-600f4264] {
   min-height: 500px;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
 }
-.empty-content[data-v-9cd09319] {
+.empty-content[data-v-600f4264] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -5727,13 +5727,13 @@ body,
   color: #909399;
   font-size: 14px;
 }
-.component-error[data-v-9cd09319] {
+.component-error[data-v-600f4264] {
   padding: 40px 20px;
   text-align: center;
   color: #f56c6c;
   font-size: 14px;
 }
-.fec-dialog-table[data-v-9cd09319] .table-pagination {
+.fec-dialog-table[data-v-600f4264] .table-pagination {
   padding: 8px 0 0 0;
 }.text-field-wrapper[data-v-185ddd14] {
   width: 100%;
@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-4eb26904] {
+.fec-form[data-v-d272bf0a] {
   height: 100%;
 }
-[data-v-4eb26904] .vgl-item {
+[data-v-d272bf0a] .vgl-item {
   transition: none;
 }
-[data-v-4eb26904] .vgl-item > .el-form-item {
+[data-v-d272bf0a] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-4eb26904] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-d272bf0a] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-4eb26904] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-d272bf0a] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-4eb26904] .vgl-item > .el-container {
+[data-v-d272bf0a] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;
@@ -6295,7 +6295,7 @@ body,
   margin-bottom: 0 !important;
   flex: 1;
 }
-.fec-layout-card[data-v-3ce25014] {
+.fec-layout-card[data-v-2872569c] {
   margin-bottom: 8px;
   border-radius: 4px;
   background-color: #fff;
@@ -6303,16 +6303,16 @@ body,
   display: flex;
   flex-direction: column;
 }
-.fec-layout-card .header[data-v-3ce25014] {
+.fec-layout-card .header[data-v-2872569c] {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.fec-layout-card .header .title[data-v-3ce25014] {
+.fec-layout-card .header .title[data-v-2872569c] {
   display: flex;
   align-items: center;
 }
-.fec-layout-card .header .title .icon[data-v-3ce25014] {
+.fec-layout-card .header .title .icon[data-v-2872569c] {
   color: #fff;
   width: 30px;
   height: 30px;
@@ -6323,12 +6323,12 @@ body,
   font-size: 20px;
   margin-right: 12px;
 }
-.fec-layout-card .header .title > span[data-v-3ce25014] {
+.fec-layout-card .header .title > span[data-v-2872569c] {
   font-size: 17px;
   font-weight: bold;
   color: #1a1a1a;
 }
-.fec-layout-card .content[data-v-3ce25014] {
+.fec-layout-card .content[data-v-2872569c] {
   flex-grow: 1;
   padding-top: 12px;
 }

package/es/packages/vue/src/components/bus/contract/Contract.vue.mjs

@@ -2,6 +2,7 @@ import { ref, inject, computed, onMounted, createElementBlock, openBlock, create
 import "../../forms/h2/index.mjs";
 import { getCurrentVueInstance } from "../../../utils/getInstance.mjs";
 import { parseRouteParams, parseSingleParamValue } from "../../../utils/parseRouteParams.mjs";
+import { loadComponentByPath } from "../../../utils/common.mjs";
 const _hoisted_1 = { class: "contract-content" };
 const path = "/tech/ctr/components/DocCtrInfoComponent";
 const _sfc_main = /* @__PURE__ */ Object.assign({
@@ -54,21 +55,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return props.config.mode;
     });
     const currentComponent = ref(null);
-    const loadComponentByPath = (path2) => {
-      const route = 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);
+      loadComponentByPath(path, ctx.$router, currentComponent);
     });
     function loaded(dom) {
       const foundItem = props.localConfig.fieldsData.find(

package/es/packages/vue/src/components/bus/document/Document.vue.mjs

@@ -2,6 +2,7 @@ import { ref, inject, computed, onMounted, createElementBlock, openBlock, Fragme
 import { SubTitle } from "../../forms/subTitle/index.mjs";
 import { H2 } from "../../forms/h2/index.mjs";
 import { getCurrentVueInstance } from "../../../utils/getInstance.mjs";
+import { loadComponentByPath } from "../../../utils/common.mjs";
 const _hoisted_1 = {
   key: 0,
   style: { "height": "60px", "position": "relative" }
@@ -98,21 +99,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       });
     });
     const currentComponent = ref(null);
-    const loadComponentByPath = (path2) => {
-      const route = 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);
+      loadComponentByPath(path, ctx.$router, currentComponent);
     });
     function loaded(dom) {
       const foundItem = props.localConfig.fieldsData.find(

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

@@ -12,6 +12,7 @@ import { useEventFlow, executeEventFlow } from "../../utils/eventFlow/eventFlowH
 /* empty css                                                                   */
 /* empty css                                                                 */
 /* empty css                                                                   */
+import { loadComponentByPath } from "../../utils/common.mjs";
 /* empty css                    */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 /* empty css                                                  */
@@ -119,6 +120,7 @@ const _sfc_main = {
       });
       return { ...paramsObj };
     });
+    const currentComponent = ref(null);
     watch(
       () => {
         return props.modelValue;
@@ -126,7 +128,11 @@ const _sfc_main = {
       (val) => {
         dialogVisible.value = val;
         if (val) {
-          loadComponentByPath(currentDialogConfig.value.componentPath);
+          loadComponentByPath(
+            currentDialogConfig.value.componentPath,
+            props.componentCtx.$router,
+            currentComponent.value
+          );
         }
       },
       {
@@ -145,20 +151,6 @@ const _sfc_main = {
       );
       return params;
     });
-    const currentComponent = ref(null);
-    function loadComponentByPath(path) {
-      const route = props.componentCtx.$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) => {
       emit("confirm", data);
     };
@@ -168,6 +160,7 @@ const _sfc_main = {
     const dialogTableRef = ref();
     const handleConfirm = () => {
       var _a, _b, _c, _d, _e, _f, _g;
+      debugger;
       const contentSource = (_a = currentDialogConfig.value) == null ? void 0 : _a.contentSource;
       if (contentSource === "table") {
         if (tableSelectionRows.value.length == 0) {
@@ -446,7 +439,7 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9cd09319"]]);
+const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-600f4264"]]);
 export {
   DialogRenderer as default
 };

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

@@ -145,7 +145,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     );
     const loadConfig = async () => {
-      if (!props.templateKey && props.initOption && Object.keys(props.initOption).length == 0) {
+      if (!props.templateKey && (!props.initOption || Object.keys(props.initOption).length == 0)) {
         return;
       }
       configLoading.value = true;
@@ -1064,7 +1064,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4eb26904"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d272bf0a"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/layout/layoutCard/LayoutCard.vue.mjs

@@ -8,6 +8,7 @@ import api from "../../../api/index.mjs";
 import { getCurrentVueInstance } from "../../../utils/getInstance.mjs";
 import { Form } from "../../forms/form/index.mjs";
 import { Table } from "../../table/index.mjs";
+import { loadComponentByPath } from "../../../utils/common.mjs";
 /* empty css                 */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElButton } from "../../../../../../node_modules/element-plus/es/components/button/index.mjs";
@@ -67,7 +68,7 @@ const _sfc_main = {
     });
     function moreClick() {
       if (props.morePageRoute) {
-        loadComponentByPath(props.morePageRoute);
+        loadComponentByPath(props.morePageRoute, ctx.$router, currentComponent);
         dialogVisible.value = true;
       } else if (props.morePageTemplateKey) {
         api.findByTemplateKey(ctx.$http, {
@@ -87,19 +88,6 @@ const _sfc_main = {
         });
       }
     }
-    function 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;
-      }
-    }
     return (_ctx, _cache) => {
       const _component_el_icon = ElIcon;
       const _component_el_button = ElButton;
@@ -156,7 +144,7 @@ const _sfc_main = {
     };
   }
 };
-const _LayoutCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3ce25014"]]);
+const _LayoutCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2872569c"]]);
 export {
   _LayoutCard as default
 };

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

@@ -1,4 +1,5 @@
 import { ref, watch, onMounted, createBlock, openBlock, resolveDynamicComponent, unref, isRef } from "vue";
+import { loadComponentByPath } from "../../utils/common.mjs";
 const path = "/bus/module/comm/risk/components/RiskInterceptResult";
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -53,21 +54,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       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);
+      loadComponentByPath(path, props.ctx.$router, currentComponent);
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(resolveDynamicComponent(unref(currentComponent)), {

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

@@ -67,10 +67,24 @@ const setFormDataByFieldMapping = (value, multiple, options, fieldMapping, formD
     });
   }
 };
+const loadComponentByPath = (path, router, currentComponent) => {
+  const route = router == null ? void 0 : 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;
+  }
+};
 export {
   cloneDeep,
   handleSearchData,
   isEqual,
+  loadComponentByPath,
   removeEmptyValues,
   setFormDataByFieldMapping
 };

package/es/packages/vue/src/utils/formulajs/calculate.mjs

@@ -23,26 +23,35 @@ function calculate(params) {
         const [key, subKey] = enCode.split(".");
         if (value[key]) data = value[key].map((o) => o[subKey]);
       }
-      if (!data) {
-        const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
-        if (fieldItem) {
-          switch (fieldItem.fieldType) {
-            case "number":
+      const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
+      if (fieldItem) {
+        switch (fieldItem.fieldType) {
+          case "number":
+            if (!data) {
               data = 0;
-              break;
-            case "switch":
+            } else {
+              Number(data);
+            }
+            break;
+          case "switch":
+            data = false;
+            if (!data) {
               data = false;
-              break;
-            default:
+            } else if ("true" == data + "") {
+              Number(data);
+            } else {
+              data = false;
+            }
+            break;
+          default:
+            if (!data) {
               data = "";
-          }
-        } else {
-          throw new Error("字段：" + item.fieldName + " 未定义");
+            }
         }
+      } else {
+        throw new Error("字段：" + item.fieldName + " 未定义");
       }
-      if (typeof data != "string") {
-        data = JSON.stringify(data);
-      }
+      data = JSON.stringify(data);
       const actualStart = startIndex + offset;
       const actualEnd = endIndex + offset;
       str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);

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.30";
+const version = "5.4.33";
 const packageJson = {
   version
 };

package/lib/designer.css

@@ -5708,18 +5708,18 @@ body,
 :root,:host{--van-overlay-z-index: 1;--van-overlay-background: rgba(0, 0, 0, .7)}.van-overlay{position:fixed;top:0;left:0;z-index:var(--van-overlay-z-index);width:100%;height:100%;background:var(--van-overlay-background)}
 :root,:host{--van-popup-background: var(--van-background-2);--van-popup-transition: transform var(--van-duration-base);--van-popup-round-radius: 16px;--van-popup-close-icon-size: 22px;--van-popup-close-icon-color: var(--van-gray-5);--van-popup-close-icon-margin: 16px;--van-popup-close-icon-z-index: 1}.van-overflow-hidden{overflow:hidden!important}.van-popup{position:fixed;max-height:100%;overflow-y:auto;box-sizing:border-box;background:var(--van-popup-background);transition:var(--van-popup-transition);-webkit-overflow-scrolling:touch}.van-popup--center{top:50%;left:0;right:0;width:-webkit-fit-content;width:fit-content;max-width:calc(100vw - var(--van-padding-md) * 2);margin:0 auto;transform:translateY(-50%)}.van-popup--center.van-popup--round{border-radius:var(--van-popup-round-radius)}.van-popup--top{top:0;left:0;width:100%}.van-popup--top.van-popup--round{border-radius:0 0 var(--van-popup-round-radius) var(--van-popup-round-radius)}.van-popup--right{top:50%;right:0;transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:var(--van-popup-round-radius) 0 0 var(--van-popup-round-radius)}.van-popup--bottom{bottom:0;left:0;width:100%}.van-popup--bottom.van-popup--round{border-radius:var(--van-popup-round-radius) var(--van-popup-round-radius) 0 0}.van-popup--left{top:50%;left:0;transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 var(--van-popup-round-radius) var(--van-popup-round-radius) 0}.van-popup-slide-top-enter-active,.van-popup-slide-left-enter-active,.van-popup-slide-right-enter-active,.van-popup-slide-bottom-enter-active{transition-timing-function:var(--van-ease-out)}.van-popup-slide-top-leave-active,.van-popup-slide-left-leave-active,.van-popup-slide-right-leave-active,.van-popup-slide-bottom-leave-active{transition-timing-function:var(--van-ease-in)}.van-popup-slide-top-enter-from,.van-popup-slide-top-leave-active{transform:translate3d(0,-100%,0)}.van-popup-slide-right-enter-from,.van-popup-slide-right-leave-active{transform:translate3d(100%,-50%,0)}.van-popup-slide-bottom-enter-from,.van-popup-slide-bottom-leave-active{transform:translate3d(0,100%,0)}.van-popup-slide-left-enter-from,.van-popup-slide-left-leave-active{transform:translate3d(-100%,-50%,0)}.van-popup__close-icon{position:absolute;z-index:var(--van-popup-close-icon-z-index);color:var(--van-popup-close-icon-color);font-size:var(--van-popup-close-icon-size)}.van-popup__close-icon--top-left{top:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--top-right{top:var(--van-popup-close-icon-margin);right:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-left{bottom:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-right{right:var(--van-popup-close-icon-margin);bottom:var(--van-popup-close-icon-margin)}
 :root,:host{--van-dialog-width: 320px;--van-dialog-small-screen-width: 90%;--van-dialog-font-size: var(--van-font-size-lg);--van-dialog-transition: var(--van-duration-base);--van-dialog-radius: 16px;--van-dialog-background: var(--van-background-2);--van-dialog-header-font-weight: var(--van-font-bold);--van-dialog-header-line-height: 24px;--van-dialog-header-padding-top: 26px;--van-dialog-header-isolated-padding: var(--van-padding-lg) 0;--van-dialog-message-padding: var(--van-padding-lg);--van-dialog-message-font-size: var(--van-font-size-md);--van-dialog-message-line-height: var(--van-line-height-md);--van-dialog-message-max-height: 60vh;--van-dialog-has-title-message-text-color: var(--van-gray-7);--van-dialog-has-title-message-padding-top: var(--van-padding-xs);--van-dialog-button-height: 48px;--van-dialog-round-button-height: 36px;--van-dialog-confirm-button-text-color: var(--van-primary-color)}.van-dialog{top:45%;width:var(--van-dialog-width);overflow:hidden;font-size:var(--van-dialog-font-size);background:var(--van-dialog-background);border-radius:var(--van-dialog-radius);-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:var(--van-dialog-transition);transition-property:transform,opacity}@media (max-width: 321px){.van-dialog{width:var(--van-dialog-small-screen-width)}}.van-dialog__header{color:var(--van-text-color);padding-top:var(--van-dialog-header-padding-top);font-weight:var(--van-dialog-header-font-weight);line-height:var(--van-dialog-header-line-height);text-align:center}.van-dialog__header--isolated{padding:var(--van-dialog-header-isolated-padding)}.van-dialog__content--isolated{display:flex;align-items:center;min-height:104px}.van-dialog__message{color:var(--van-text-color);flex:1;max-height:var(--van-dialog-message-max-height);padding:26px var(--van-dialog-message-padding);overflow-y:auto;font-size:var(--van-dialog-message-font-size);line-height:var(--van-dialog-message-line-height);white-space:pre-wrap;text-align:center;word-wrap:break-word;-webkit-overflow-scrolling:touch}.van-dialog__message--has-title{padding-top:var(--van-dialog-has-title-message-padding-top);color:var(--van-dialog-has-title-message-text-color)}.van-dialog__message--left{text-align:left}.van-dialog__message--right{text-align:right}.van-dialog__message--justify{text-align:justify}.van-dialog__footer{display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.van-dialog__confirm,.van-dialog__cancel{flex:1;height:var(--van-dialog-button-height);margin:0;border:0;border-radius:0}.van-dialog__confirm,.van-dialog__confirm:active{color:var(--van-dialog-confirm-button-text-color)}.van-dialog--round-button .van-dialog__footer{position:relative;height:auto;padding:var(--van-padding-xs) var(--van-padding-lg) var(--van-padding-md)}.van-dialog--round-button .van-dialog__message{padding-bottom:var(--van-padding-md);color:var(--van-text-color)}.van-dialog--round-button .van-dialog__confirm,.van-dialog--round-button .van-dialog__cancel{height:var(--van-dialog-round-button-height)}.van-dialog--round-button .van-dialog__confirm{color:var(--van-white)}.van-dialog--round-button .van-action-bar-button--first{border-top-left-radius:var(--van-radius-max);border-bottom-left-radius:var(--van-radius-max)}.van-dialog--round-button .van-action-bar-button--last{border-top-right-radius:var(--van-radius-max);border-bottom-right-radius:var(--van-radius-max)}.van-dialog-bounce-enter-from{transform:translate3d(0,-50%,0) scale(.7);opacity:0}.van-dialog-bounce-leave-active{transform:translate3d(0,-50%,0) scale(.9);opacity:0}
-.dialog-header-content[data-v-9cd09319] {
+.dialog-header-content[data-v-600f4264] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
 }
-.dialog-content-wrapper[data-v-9cd09319] {
+.dialog-content-wrapper[data-v-600f4264] {
   min-height: 500px;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
 }
-.empty-content[data-v-9cd09319] {
+.empty-content[data-v-600f4264] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -5727,13 +5727,13 @@ body,
   color: #909399;
   font-size: 14px;
 }
-.component-error[data-v-9cd09319] {
+.component-error[data-v-600f4264] {
   padding: 40px 20px;
   text-align: center;
   color: #f56c6c;
   font-size: 14px;
 }
-.fec-dialog-table[data-v-9cd09319] .table-pagination {
+.fec-dialog-table[data-v-600f4264] .table-pagination {
   padding: 8px 0 0 0;
 }.text-field-wrapper[data-v-185ddd14] {
   width: 100%;
@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-4eb26904] {
+.fec-form[data-v-d272bf0a] {
   height: 100%;
 }
-[data-v-4eb26904] .vgl-item {
+[data-v-d272bf0a] .vgl-item {
   transition: none;
 }
-[data-v-4eb26904] .vgl-item > .el-form-item {
+[data-v-d272bf0a] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-4eb26904] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-d272bf0a] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-4eb26904] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-d272bf0a] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-4eb26904] .vgl-item > .el-container {
+[data-v-d272bf0a] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;
@@ -6295,7 +6295,7 @@ body,
   margin-bottom: 0 !important;
   flex: 1;
 }
-.fec-layout-card[data-v-3ce25014] {
+.fec-layout-card[data-v-2872569c] {
   margin-bottom: 8px;
   border-radius: 4px;
   background-color: #fff;
@@ -6303,16 +6303,16 @@ body,
   display: flex;
   flex-direction: column;
 }
-.fec-layout-card .header[data-v-3ce25014] {
+.fec-layout-card .header[data-v-2872569c] {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.fec-layout-card .header .title[data-v-3ce25014] {
+.fec-layout-card .header .title[data-v-2872569c] {
   display: flex;
   align-items: center;
 }
-.fec-layout-card .header .title .icon[data-v-3ce25014] {
+.fec-layout-card .header .title .icon[data-v-2872569c] {
   color: #fff;
   width: 30px;
   height: 30px;
@@ -6323,12 +6323,12 @@ body,
   font-size: 20px;
   margin-right: 12px;
 }
-.fec-layout-card .header .title > span[data-v-3ce25014] {
+.fec-layout-card .header .title > span[data-v-2872569c] {
   font-size: 17px;
   font-weight: bold;
   color: #1a1a1a;
 }
-.fec-layout-card .content[data-v-3ce25014] {
+.fec-layout-card .content[data-v-2872569c] {
   flex-grow: 1;
   padding-top: 12px;
 }

package/lib/packages/vue/src/components/bus/contract/Contract.vue.js

@@ -4,6 +4,7 @@ const vue = require("vue");
 require("../../forms/h2/index.js");
 const getInstance = require("../../../utils/getInstance.js");
 const parseRouteParams = require("../../../utils/parseRouteParams.js");
+const common = require("../../../utils/common.js");
 const _hoisted_1 = { class: "contract-content" };
 const path = "/tech/ctr/components/DocCtrInfoComponent";
 const _sfc_main = /* @__PURE__ */ Object.assign({
@@ -56,21 +57,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return props.config.mode;
     });
     const currentComponent = vue.ref(null);
-    const loadComponentByPath = (path2) => {
-      const route = 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((module2) => {
-          currentComponent.value = module2.default;
-        });
-      } else {
-        currentComponent.value = comp;
-      }
-    };
     vue.onMounted(() => {
-      loadComponentByPath(path);
+      common.loadComponentByPath(path, ctx.$router, currentComponent);
     });
     function loaded(dom) {
       const foundItem = props.localConfig.fieldsData.find(

package/lib/packages/vue/src/components/bus/document/Document.vue.js

@@ -4,6 +4,7 @@ const vue = require("vue");
 const index$1 = require("../../forms/subTitle/index.js");
 const index = require("../../forms/h2/index.js");
 const getInstance = require("../../../utils/getInstance.js");
+const common = require("../../../utils/common.js");
 const _hoisted_1 = {
   key: 0,
   style: { "height": "60px", "position": "relative" }
@@ -100,21 +101,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       });
     });
     const currentComponent = vue.ref(null);
-    const loadComponentByPath = (path2) => {
-      const route = 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((module2) => {
-          currentComponent.value = module2.default;
-        });
-      } else {
-        currentComponent.value = comp;
-      }
-    };
     vue.onMounted(() => {
-      loadComponentByPath(path);
+      common.loadComponentByPath(path, ctx.$router, currentComponent);
     });
     function loaded(dom) {
       const foundItem = props.localConfig.fieldsData.find(

package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js

@@ -14,6 +14,7 @@ const eventFlowHandler = require("../../utils/eventFlow/eventFlowHandler.js");
 ;/* empty css                                                                   */
 ;/* empty css                                                                 */
 ;/* empty css                                                                   */
+const common = require("../../utils/common.js");
 ;/* empty css                    */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");
 ;/* empty css                                                  */
@@ -121,6 +122,7 @@ const _sfc_main = {
       });
       return { ...paramsObj };
     });
+    const currentComponent = vue.ref(null);
     vue.watch(
       () => {
         return props.modelValue;
@@ -128,7 +130,11 @@ const _sfc_main = {
       (val) => {
         dialogVisible.value = val;
         if (val) {
-          loadComponentByPath(currentDialogConfig.value.componentPath);
+          common.loadComponentByPath(
+            currentDialogConfig.value.componentPath,
+            props.componentCtx.$router,
+            currentComponent.value
+          );
         }
       },
       {
@@ -147,20 +153,6 @@ const _sfc_main = {
       );
       return params;
     });
-    const currentComponent = vue.ref(null);
-    function loadComponentByPath(path) {
-      const route = props.componentCtx.$router.getRoutes().find((item) => item.path === path);
-      if (!route) return;
-      const comp = route.components.default;
-      if (!comp) return;
-      if (typeof comp === "function") {
-        comp().then((module2) => {
-          currentComponent.value = module2.default;
-        });
-      } else {
-        currentComponent.value = comp;
-      }
-    }
     const handleSubmit = (data) => {
       emit("confirm", data);
     };
@@ -170,6 +162,7 @@ const _sfc_main = {
     const dialogTableRef = vue.ref();
     const handleConfirm = () => {
       var _a, _b, _c, _d, _e, _f, _g;
+      debugger;
       const contentSource = (_a = currentDialogConfig.value) == null ? void 0 : _a.contentSource;
       if (contentSource === "table") {
         if (tableSelectionRows.value.length == 0) {
@@ -448,5 +441,5 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-9cd09319"]]);
+const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-600f4264"]]);
 exports.default = DialogRenderer;

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -147,7 +147,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     );
     const loadConfig = async () => {
-      if (!props.templateKey && props.initOption && Object.keys(props.initOption).length == 0) {
+      if (!props.templateKey && (!props.initOption || Object.keys(props.initOption).length == 0)) {
         return;
       }
       configLoading.value = true;
@@ -1066,5 +1066,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-4eb26904"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d272bf0a"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/layout/layoutCard/LayoutCard.vue.js

@@ -10,6 +10,7 @@ const index$4 = require("../../../api/index.js");
 const getInstance = require("../../../utils/getInstance.js");
 const index$5 = require("../../forms/form/index.js");
 const index$6 = require("../../table/index.js");
+const common = require("../../../utils/common.js");
 ;/* empty css                 */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/button/index.js");
@@ -69,7 +70,7 @@ const _sfc_main = {
     });
     function moreClick() {
       if (props.morePageRoute) {
-        loadComponentByPath(props.morePageRoute);
+        common.loadComponentByPath(props.morePageRoute, ctx.$router, currentComponent);
         dialogVisible.value = true;
       } else if (props.morePageTemplateKey) {
         index$4.default.findByTemplateKey(ctx.$http, {
@@ -89,19 +90,6 @@ const _sfc_main = {
         });
       }
     }
-    function 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((module2) => {
-          currentComponent.value = module2.default;
-        });
-      } else {
-        currentComponent.value = comp;
-      }
-    }
     return (_ctx, _cache) => {
       const _component_el_icon = index$1.ElIcon;
       const _component_el_button = index.ElButton;
@@ -158,5 +146,5 @@ const _sfc_main = {
     };
   }
 };
-const _LayoutCard = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3ce25014"]]);
+const _LayoutCard = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2872569c"]]);
 exports.default = _LayoutCard;

package/lib/packages/vue/src/components/riskSch/RiskSchRenderer.vue.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
+const common = require("../../utils/common.js");
 const path = "/bus/module/comm/risk/components/RiskInterceptResult";
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -55,21 +56,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       emit("cancel", data);
     }
     const currentComponent = vue.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((module2) => {
-          currentComponent.value = module2.default;
-        });
-      } else {
-        currentComponent.value = comp;
-      }
-    };
     vue.onMounted(() => {
-      loadComponentByPath(path);
+      common.loadComponentByPath(path, props.ctx.$router, currentComponent);
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(currentComponent)), {

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

@@ -69,8 +69,22 @@ const setFormDataByFieldMapping = (value, multiple, options, fieldMapping, formD
     });
   }
 };
+const loadComponentByPath = (path, router, currentComponent) => {
+  const route = router == null ? void 0 : router.getRoutes().find((item) => item.path === path);
+  if (!route) return;
+  const comp = route.components.default;
+  if (!comp) return;
+  if (typeof comp === "function") {
+    comp().then((module2) => {
+      currentComponent.value = module2.default;
+    });
+  } else {
+    currentComponent.value = comp;
+  }
+};
 exports.cloneDeep = cloneDeep;
 exports.handleSearchData = handleSearchData;
 exports.isEqual = isEqual;
+exports.loadComponentByPath = loadComponentByPath;
 exports.removeEmptyValues = removeEmptyValues;
 exports.setFormDataByFieldMapping = setFormDataByFieldMapping;

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

@@ -25,26 +25,35 @@ function calculate(params) {
         const [key, subKey] = enCode.split(".");
         if (value[key]) data = value[key].map((o) => o[subKey]);
       }
-      if (!data) {
-        const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
-        if (fieldItem) {
-          switch (fieldItem.fieldType) {
-            case "number":
+      const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
+      if (fieldItem) {
+        switch (fieldItem.fieldType) {
+          case "number":
+            if (!data) {
               data = 0;
-              break;
-            case "switch":
+            } else {
+              Number(data);
+            }
+            break;
+          case "switch":
+            data = false;
+            if (!data) {
               data = false;
-              break;
-            default:
+            } else if ("true" == data + "") {
+              Number(data);
+            } else {
+              data = false;
+            }
+            break;
+          default:
+            if (!data) {
               data = "";
-          }
-        } else {
-          throw new Error("字段：" + item.fieldName + " 未定义");
+            }
         }
+      } else {
+        throw new Error("字段：" + item.fieldName + " 未定义");
       }
-      if (typeof data != "string") {
-        data = JSON.stringify(data);
-      }
+      data = JSON.stringify(data);
       const actualStart = startIndex + offset;
       const actualEnd = endIndex + offset;
       str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);

package/package.json

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