@fecp/designer 5.4.40 → 5.4.43

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.4.40";
+const version = "5.4.43";
 const packageJson = {
   version
 };

package/es/designer.css

@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-7d6fc890] {
+.fec-form[data-v-68afecc6] {
   height: 100%;
 }
-[data-v-7d6fc890] .vgl-item {
+[data-v-68afecc6] .vgl-item {
   transition: none;
 }
-[data-v-7d6fc890] .vgl-item > .el-form-item {
+[data-v-68afecc6] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-7d6fc890] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-68afecc6] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-7d6fc890] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-68afecc6] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-7d6fc890] .vgl-item > .el-container {
+[data-v-68afecc6] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

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

@@ -148,10 +148,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       () => props.modelValue,
       (newVal, oldVal) => {
         if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
-          formData.value = {
-            ...formData.value,
-            ...setFormData(props.modelValue, true)
-          };
+          loadFormData(true);
         }
       }
     );
@@ -212,7 +209,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     function layoutUpdated(layoutData) {
       emit("layoutUpdated", layoutData);
     }
-    const loadFormData = () => {
+    const loadFormData = (flag) => {
       const defaultData = {};
       const rules = {};
       if (fieldsData.value) {
@@ -224,13 +221,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             }
             defaultData[component.fieldName] = defaultValue;
           }
-          if (component.fieldName) {
-            const fieldRules = generateFieldRules(component, formData, [
-              ...fieldsData.value,
-              ...hiddenFields.value
-            ]);
-            if (fieldRules.length > 0) {
-              rules[component.fieldName] = fieldRules;
+          if (!flag) {
+            if (component.fieldName) {
+              const fieldRules = generateFieldRules(component, formData, [
+                ...fieldsData.value,
+                ...hiddenFields.value
+              ]);
+              if (fieldRules.length > 0) {
+                rules[component.fieldName] = fieldRules;
+              }
             }
           }
         });
@@ -251,7 +250,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         });
       }
       formData.value = { ...defaultData, ...setFormData(props.modelValue, true) };
-      formRules.value = rules;
+      if (!flag) {
+        formRules.value = rules;
+      }
     };
     const loadFieldDataSources = async () => {
       var _a, _b;
@@ -1075,7 +1076,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7d6fc890"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-68afecc6"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/forms/number/Number.vue.mjs

@@ -99,6 +99,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         textValue.value = "";
         return;
       }
+      debugger;
       let displayValue = props.modelValue;
       switch (props.format) {
         case "wan":
@@ -117,7 +118,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           displayValue = numMulti(displayValue, 1e4);
           break;
       }
-      textValue.value = formatMoney(displayValue, precision.value, ".", ",", true);
+      if (props.format == "yuan" || props.format == "wan" || props.format == "million") {
+        textValue.value = formatMoney(
+          displayValue,
+          precision.value,
+          ".",
+          ",",
+          true
+        );
+      }
       if (!showThousandsSeparator.value) {
         textValue.value = delcommafy(textValue.value);
       }

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

package/lib/designer.css

@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-7d6fc890] {
+.fec-form[data-v-68afecc6] {
   height: 100%;
 }
-[data-v-7d6fc890] .vgl-item {
+[data-v-68afecc6] .vgl-item {
   transition: none;
 }
-[data-v-7d6fc890] .vgl-item > .el-form-item {
+[data-v-68afecc6] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-7d6fc890] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-68afecc6] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-7d6fc890] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-68afecc6] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-7d6fc890] .vgl-item > .el-container {
+[data-v-68afecc6] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

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

@@ -150,10 +150,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       () => props.modelValue,
       (newVal, oldVal) => {
         if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
-          formData.value = {
-            ...formData.value,
-            ...setFormData(props.modelValue, true)
-          };
+          loadFormData(true);
         }
       }
     );
@@ -214,7 +211,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     function layoutUpdated(layoutData) {
       emit("layoutUpdated", layoutData);
     }
-    const loadFormData = () => {
+    const loadFormData = (flag) => {
       const defaultData = {};
       const rules = {};
       if (fieldsData.value) {
@@ -226,13 +223,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             }
             defaultData[component.fieldName] = defaultValue;
           }
-          if (component.fieldName) {
-            const fieldRules = validation.generateFieldRules(component, formData, [
-              ...fieldsData.value,
-              ...hiddenFields.value
-            ]);
-            if (fieldRules.length > 0) {
-              rules[component.fieldName] = fieldRules;
+          if (!flag) {
+            if (component.fieldName) {
+              const fieldRules = validation.generateFieldRules(component, formData, [
+                ...fieldsData.value,
+                ...hiddenFields.value
+              ]);
+              if (fieldRules.length > 0) {
+                rules[component.fieldName] = fieldRules;
+              }
             }
           }
         });
@@ -253,7 +252,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         });
       }
       formData.value = { ...defaultData, ...setFormData(props.modelValue, true) };
-      formRules.value = rules;
+      if (!flag) {
+        formRules.value = rules;
+      }
     };
     const loadFieldDataSources = async () => {
       var _a, _b;
@@ -1077,5 +1078,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7d6fc890"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-68afecc6"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/number/Number.vue.js

@@ -101,6 +101,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         textValue.value = "";
         return;
       }
+      debugger;
       let displayValue = props.modelValue;
       switch (props.format) {
         case "wan":
@@ -119,7 +120,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           displayValue = numMulti(displayValue, 1e4);
           break;
       }
-      textValue.value = formatMoney(displayValue, precision.value, ".", ",", true);
+      if (props.format == "yuan" || props.format == "wan" || props.format == "million") {
+        textValue.value = formatMoney(
+          displayValue,
+          precision.value,
+          ".",
+          ",",
+          true
+        );
+      }
       if (!showThousandsSeparator.value) {
         textValue.value = delcommafy(textValue.value);
       }

package/package.json

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