@fecp/designer 5.4.25 → 5.4.27

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.4.25";
+const version = "5.4.27";
 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-3d101d10] {
+.dialog-header-content[data-v-9cd09319] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
 }
-.dialog-content-wrapper[data-v-3d101d10] {
+.dialog-content-wrapper[data-v-9cd09319] {
   min-height: 500px;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
 }
-.empty-content[data-v-3d101d10] {
+.empty-content[data-v-9cd09319] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -5727,13 +5727,13 @@ body,
   color: #909399;
   font-size: 14px;
 }
-.component-error[data-v-3d101d10] {
+.component-error[data-v-9cd09319] {
   padding: 40px 20px;
   text-align: center;
   color: #f56c6c;
   font-size: 14px;
 }
-.fec-dialog-table[data-v-3d101d10] .table-pagination {
+.fec-dialog-table[data-v-9cd09319] .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-e700f77b] {
+.fec-form[data-v-5d68b9c4] {
   height: 100%;
 }
-[data-v-e700f77b] .vgl-item {
+[data-v-5d68b9c4] .vgl-item {
   transition: none;
 }
-[data-v-e700f77b] .vgl-item > .el-form-item {
+[data-v-5d68b9c4] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-e700f77b] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-5d68b9c4] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-e700f77b] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-5d68b9c4] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-e700f77b] .vgl-item > .el-container {
+[data-v-5d68b9c4] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

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

@@ -180,7 +180,8 @@ const _sfc_main = {
           const calcResult = calculate({
             text: displayFormat == null ? void 0 : displayFormat.text,
             marks: [],
-            value: row
+            value: row,
+            fieldsList: props.fieldsList
           });
           return calcResult;
         });
@@ -445,7 +446,7 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3d101d10"]]);
+const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9cd09319"]]);
 export {
   DialogRenderer as default
 };

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

@@ -811,6 +811,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       );
       relevantConfigs.dataLink.forEach((item) => {
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
+          debugger;
           const fieldAssignments = item.fieldAssignments || [];
           fieldAssignments.forEach((assignment) => {
             var _a2, _b;
@@ -821,7 +822,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               const calcResult = calculate({
                 text: formulaText,
                 marks: [],
-                value: formData.value
+                value: formData.value,
+                fieldsList: fields
               });
               formData.value[field.fieldName] = calcResult;
             }
@@ -1063,7 +1065,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e700f77b"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5d68b9c4"]]);
 export {
   _Form as default
 };

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, marks = [], value = {} } = params;
+  const { text, marks = [], value = {}, fieldsList = [] } = params;
   if (!text) return new Error("非法公式");
   try {
     let str = text;
@@ -23,13 +23,30 @@ function calculate(params) {
         const [key, subKey] = enCode.split(".");
         if (value[key]) data = value[key].map((o) => o[subKey]);
       }
-      if (data !== void 0) {
+      if (!data) {
+        const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
+        if (fieldItem) {
+          switch (fieldItem.fieldType) {
+            case "number":
+              data = 0;
+              break;
+            case "switch":
+              data = false;
+              break;
+            default:
+              data = "";
+          }
+        } else {
+          throw new Error("字段：" + item.fieldName + " 未定义");
+        }
+      }
+      if (typeof data != "string") {
         data = JSON.stringify(data);
-        const actualStart = startIndex + offset;
-        const actualEnd = endIndex + offset;
-        str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
-        offset += data.toString().length - (endIndex - startIndex);
       }
+      const actualStart = startIndex + offset;
+      const actualEnd = endIndex + offset;
+      str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
+      offset += data.toString().length - (endIndex - startIndex);
     }
     const result = functionCore.executeFunction(str);
     return result;

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.25";
+const version = "5.4.27";
 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-3d101d10] {
+.dialog-header-content[data-v-9cd09319] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
 }
-.dialog-content-wrapper[data-v-3d101d10] {
+.dialog-content-wrapper[data-v-9cd09319] {
   min-height: 500px;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
 }
-.empty-content[data-v-3d101d10] {
+.empty-content[data-v-9cd09319] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -5727,13 +5727,13 @@ body,
   color: #909399;
   font-size: 14px;
 }
-.component-error[data-v-3d101d10] {
+.component-error[data-v-9cd09319] {
   padding: 40px 20px;
   text-align: center;
   color: #f56c6c;
   font-size: 14px;
 }
-.fec-dialog-table[data-v-3d101d10] .table-pagination {
+.fec-dialog-table[data-v-9cd09319] .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-e700f77b] {
+.fec-form[data-v-5d68b9c4] {
   height: 100%;
 }
-[data-v-e700f77b] .vgl-item {
+[data-v-5d68b9c4] .vgl-item {
   transition: none;
 }
-[data-v-e700f77b] .vgl-item > .el-form-item {
+[data-v-5d68b9c4] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-e700f77b] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-5d68b9c4] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-e700f77b] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-5d68b9c4] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-e700f77b] .vgl-item > .el-container {
+[data-v-5d68b9c4] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

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

@@ -182,7 +182,8 @@ const _sfc_main = {
           const calcResult = calculate.calculate({
             text: displayFormat == null ? void 0 : displayFormat.text,
             marks: [],
-            value: row
+            value: row,
+            fieldsList: props.fieldsList
           });
           return calcResult;
         });
@@ -447,5 +448,5 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3d101d10"]]);
+const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-9cd09319"]]);
 exports.default = DialogRenderer;

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

@@ -813,6 +813,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       );
       relevantConfigs.dataLink.forEach((item) => {
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
+          debugger;
           const fieldAssignments = item.fieldAssignments || [];
           fieldAssignments.forEach((assignment) => {
             var _a2, _b;
@@ -823,7 +824,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               const calcResult = calculate.calculate({
                 text: formulaText,
                 marks: [],
-                value: formData.value
+                value: formData.value,
+                fieldsList: fields
               });
               formData.value[field.fieldName] = calcResult;
             }
@@ -1065,5 +1067,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e700f77b"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5d68b9c4"]]);
 exports.default = _Form;

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, marks = [], value = {} } = params;
+  const { text, marks = [], value = {}, fieldsList = [] } = params;
   if (!text) return new Error("非法公式");
   try {
     let str = text;
@@ -25,13 +25,30 @@ function calculate(params) {
         const [key, subKey] = enCode.split(".");
         if (value[key]) data = value[key].map((o) => o[subKey]);
       }
-      if (data !== void 0) {
+      if (!data) {
+        const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
+        if (fieldItem) {
+          switch (fieldItem.fieldType) {
+            case "number":
+              data = 0;
+              break;
+            case "switch":
+              data = false;
+              break;
+            default:
+              data = "";
+          }
+        } else {
+          throw new Error("字段：" + item.fieldName + " 未定义");
+        }
+      }
+      if (typeof data != "string") {
         data = JSON.stringify(data);
-        const actualStart = startIndex + offset;
-        const actualEnd = endIndex + offset;
-        str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
-        offset += data.toString().length - (endIndex - startIndex);
       }
+      const actualStart = startIndex + offset;
+      const actualEnd = endIndex + offset;
+      str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
+      offset += data.toString().length - (endIndex - startIndex);
     }
     const result = functionCore.default.executeFunction(str);
     return result;

package/package.json

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