@fecp/designer 5.4.38 → 5.4.40

package/es/designer/package.json.mjs

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

package/es/designer/src/components/DocumentParam.vue.mjs

@@ -9,7 +9,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                            */
 import { computed, ref, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
 import { Plus as plus_default, Delete as delete_default } from "../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
-import ValueSelector from "./ValueSelector.vue2.mjs";
+import ValueSelector from "./ValueSelector.vue.mjs";
 import api from "../api/index.mjs";
 /* empty css                    */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";

package/es/designer/src/components/ParamsConfig.vue2.mjs

@@ -4,7 +4,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                            */
 import { computed, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
 import { Plus as plus_default, Delete as delete_default } from "../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
-import ValueSelector from "./ValueSelector.vue2.mjs";
+import ValueSelector from "./ValueSelector.vue.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";

package/es/designer/src/layout/aside/HiddenFieldDialog.vue.mjs

@@ -16,7 +16,7 @@ import { Plus as plus_default, RefreshRight as refresh_right_default, Delete as
 import { getEditConfigData, getEditingType, cloneDeep, getEditConfigDataFields } from "../../packages/utils/common.mjs";
 import { defaultProperty } from "../../packages/form/aside/index.mjs";
 import { defaultProperty as defaultProperty$1 } from "../../packages/table/aside/index.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 /* empty css                        */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElDialog } from "../../../../node_modules/element-plus/es/components/dialog/index.mjs";

package/es/designer/src/packages/advancedFilter/ValueInput.vue2.mjs

@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs";
 import { computed, watch, ref, createElementBlock, unref, openBlock, createBlock, isRef, createVNode, createElementVNode, withCtx, Fragment, renderList } from "vue";
 import { useVModel } from "../../../../node_modules/@vueuse/core/dist/index.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 import api from "../../api/index.mjs";
 import { getEditConfigDataSources } from "../utils/common.mjs";
 import { createDataSource } from "../utils/datasource.mjs";

package/es/designer/src/packages/dataLinkage/index.vue.mjs

@@ -30,7 +30,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs
 /* empty css                                                              */
 /* empty css                                         */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
-/* empty css                                  */
+/* empty css                                   */
 import "../../axios/config.mjs";
 import "../../../../_virtual/FileSaver.min.mjs";
 import "../../../../_virtual/index.mjs";

package/es/designer/src/packages/dialogGlobal/index.vue.mjs

@@ -84,7 +84,7 @@ import widgets from "../table/property/widgets.vue.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
 /* empty css                                                              */
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 /* empty css                                                            */
 /* empty css                                                            */
 /* empty css                             */

package/es/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.mjs

@@ -4,7 +4,7 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                     */
 import { createElementBlock, openBlock, Fragment, createVNode, withCtx } from "vue";
 import RiskSchemeSelector from "../../../../components/RiskSchemeSelector.vue2.mjs";
-import ValueSelector from "../../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../../components/ValueSelector.vue.mjs";
 import ParamsConfig from "../../../../components/ParamsConfig.vue2.mjs";
 import { ElFormItem } from "../../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElSwitch } from "../../../../../../node_modules/element-plus/es/components/switch/index.mjs";

package/es/designer/src/packages/form/property/approvalHistory.vue.mjs

@@ -11,7 +11,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 import { computed, ref, watch, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, createCommentVNode, createTextVNode, Fragment } from "vue";
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import emitter from "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElInput } from "../../../../../node_modules/element-plus/es/components/input/index.mjs";

package/es/designer/src/packages/form/property/contract.vue.mjs

@@ -17,7 +17,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 import { computed, ref, createBlock, openBlock, withCtx, createVNode, createTextVNode, createElementBlock, Fragment, renderList } from "vue";
 import { getCurrentItem } from "../../utils/common.mjs";
 import "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import api from "../../../api/index.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 /* empty css               */

package/es/designer/src/packages/form/property/subForm.vue.mjs

@@ -12,7 +12,7 @@ import { computed, ref, createBlock, openBlock, unref, isRef, withCtx, createVNo
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import TemplateSelector from "../../../components/TemplateSelector.vue.mjs";
 import emitter from "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";

package/es/designer/src/packages/prod/index.vue.mjs

@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/es/index.mjs";
 import { useModel, ref, watch, computed, createBlock, openBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, createTextVNode, unref } from "vue";
 import { Plus as plus_default } from "../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
 import { getEditConfigData, getEditConfigDataFields, setEditConfigData } from "../utils/common.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 import api from "../../api/index.mjs";
 /* empty css            */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";

package/es/designer/src/packages/table/headerBtn.vue.mjs

@@ -45,7 +45,7 @@ import { Connection as connection_default, Grid as grid_default, ChatLineSquare
 /* empty css                                                              */
 import "../../store/index.mjs";
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 /* empty css                                 */
 /* empty css                                                            */
 /* empty css                                                               */

package/es/designer.css

@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-3312177d] {
+.fec-form[data-v-7d6fc890] {
   height: 100%;
 }
-[data-v-3312177d] .vgl-item {
+[data-v-7d6fc890] .vgl-item {
   transition: none;
 }
-[data-v-3312177d] .vgl-item > .el-form-item {
+[data-v-7d6fc890] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-3312177d] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-7d6fc890] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-3312177d] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-7d6fc890] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-3312177d] .vgl-item > .el-container {
+[data-v-7d6fc890] .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

@@ -146,11 +146,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     );
     watch(
       () => props.modelValue,
-      () => {
-        formData.value = {
-          ...formData.value,
-          ...setFormData(props.modelValue, true)
-        };
+      (newVal, oldVal) => {
+        if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
+          formData.value = {
+            ...formData.value,
+            ...setFormData(props.modelValue, true)
+          };
+        }
       }
     );
     const loadConfig = async () => {
@@ -629,7 +631,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         return ((_b = (_a2 = subFormRef == null ? void 0 : subFormRef.subFormRef) == null ? void 0 : _a2.validate) == null ? void 0 : _b.call(_a2)) || Promise.resolve();
       });
       subFormPromises.push((_a = formRef.value) == null ? void 0 : _a.validate());
-      return Promise.all(subFormPromises);
+      return Promise.all(subFormPromises).then(() => getFormData());
     };
     const resetFields = () => {
       var _a, _b;
@@ -1073,7 +1075,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3312177d"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7d6fc890"]]);
 export {
   _Form as default
 };

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

@@ -23,7 +23,7 @@ function calculate(params) {
         const [key, subKey] = enCode.split(".");
         if (value[key]) data = value[key].map((o) => o[subKey]);
       }
-      const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
+      const fieldItem = fieldsList.find((item) => item.fieldName == enCode);
       if (fieldItem) {
         switch (fieldItem.fieldType) {
           case "number":
@@ -48,8 +48,6 @@ function calculate(params) {
               data = "";
             }
         }
-      } else {
-        throw new Error("字段：" + item.fieldName + " 未定义");
       }
       data = JSON.stringify(data);
       const actualStart = startIndex + offset;

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

package/lib/designer/src/components/DocumentParam.vue.js

@@ -11,7 +11,7 @@ require("../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                            */
 const vue = require("vue");
 const index$2 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
-const ValueSelector = require("./ValueSelector.vue2.js");
+const ValueSelector = require("./ValueSelector.vue.js");
 const index = require("../api/index.js");
 ;/* empty css                    */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");

package/lib/designer/src/components/ParamsConfig.vue2.js

@@ -6,7 +6,7 @@ require("../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                            */
 const vue = require("vue");
 const index$1 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
-const ValueSelector = require("./ValueSelector.vue2.js");
+const ValueSelector = require("./ValueSelector.vue.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");

package/lib/designer/src/layout/aside/HiddenFieldDialog.vue.js

@@ -18,7 +18,7 @@ const index$2 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 const common = require("../../packages/utils/common.js");
 const index$5 = require("../../packages/form/aside/index.js");
 const index$6 = require("../../packages/table/aside/index.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 ;/* empty css                        */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../node_modules/element-plus/es/components/dialog/index.js");

package/lib/designer/src/packages/advancedFilter/ValueInput.vue2.js

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js");
 const vue = require("vue");
 const index = require("../../../../node_modules/@vueuse/core/dist/index.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 const index$1 = require("../../api/index.js");
 const common = require("../utils/common.js");
 const datasource = require("../utils/datasource.js");

package/lib/designer/src/packages/dataLinkage/index.vue.js

@@ -32,7 +32,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js
 ;/* empty css                                                              */
 ;/* empty css                                         */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
-;/* empty css                                  */
+;/* empty css                                   */
 require("../../axios/config.js");
 require("../../../../_virtual/FileSaver.min.js");
 require("../../../../_virtual/index.js");

package/lib/designer/src/packages/dialogGlobal/index.vue.js

@@ -86,7 +86,7 @@ const widgets = require("../table/property/widgets.vue.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.js");
 ;/* empty css                                                              */
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 ;/* empty css                                                            */
 ;/* empty css                                                            */
 ;/* empty css                             */

package/lib/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.js

@@ -6,7 +6,7 @@ require("../../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                     */
 const vue = require("vue");
 const RiskSchemeSelector = require("../../../../components/RiskSchemeSelector.vue2.js");
-const ValueSelector = require("../../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../../components/ValueSelector.vue.js");
 const ParamsConfig = require("../../../../components/ParamsConfig.vue2.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$1 = require("../../../../../../node_modules/element-plus/es/components/switch/index.js");

package/lib/designer/src/packages/form/property/approvalHistory.vue.js

@@ -13,7 +13,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 const vue = require("vue");
 const common = require("../../utils/common.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$2 = require("../../../../../node_modules/element-plus/es/components/input/index.js");

package/lib/designer/src/packages/form/property/contract.vue.js

@@ -19,7 +19,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 const vue = require("vue");
 const common = require("../../utils/common.js");
 require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 const index = require("../../../api/index.js");
 const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 ;/* empty css               */

package/lib/designer/src/packages/form/property/subForm.vue.js

@@ -14,7 +14,7 @@ const vue = require("vue");
 const common = require("../../utils/common.js");
 const TemplateSelector = require("../../../components/TemplateSelector.vue.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");

package/lib/designer/src/packages/prod/index.vue.js

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/es/index.js");
 const vue = require("vue");
 const index$6 = require("../../../../node_modules/@element-plus/icons-vue/dist/index.js");
 const common = require("../utils/common.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 const index = require("../../api/index.js");
 ;/* empty css            */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");

package/lib/designer/src/packages/table/headerBtn.vue.js

@@ -47,7 +47,7 @@ const index$1 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 ;/* empty css                                                              */
 require("../../store/index.js");
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 ;/* empty css                                 */
 ;/* empty css                                                            */
 ;/* empty css                                                               */

package/lib/designer.css

@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-3312177d] {
+.fec-form[data-v-7d6fc890] {
   height: 100%;
 }
-[data-v-3312177d] .vgl-item {
+[data-v-7d6fc890] .vgl-item {
   transition: none;
 }
-[data-v-3312177d] .vgl-item > .el-form-item {
+[data-v-7d6fc890] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-3312177d] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-7d6fc890] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-3312177d] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-7d6fc890] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-3312177d] .vgl-item > .el-container {
+[data-v-7d6fc890] .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

@@ -148,11 +148,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     );
     vue.watch(
       () => props.modelValue,
-      () => {
-        formData.value = {
-          ...formData.value,
-          ...setFormData(props.modelValue, true)
-        };
+      (newVal, oldVal) => {
+        if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
+          formData.value = {
+            ...formData.value,
+            ...setFormData(props.modelValue, true)
+          };
+        }
       }
     );
     const loadConfig = async () => {
@@ -631,7 +633,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         return ((_b = (_a2 = subFormRef == null ? void 0 : subFormRef.subFormRef) == null ? void 0 : _a2.validate) == null ? void 0 : _b.call(_a2)) || Promise.resolve();
       });
       subFormPromises.push((_a = formRef.value) == null ? void 0 : _a.validate());
-      return Promise.all(subFormPromises);
+      return Promise.all(subFormPromises).then(() => getFormData());
     };
     const resetFields = () => {
       var _a, _b;
@@ -1075,5 +1077,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3312177d"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7d6fc890"]]);
 exports.default = _Form;

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

@@ -25,7 +25,7 @@ function calculate(params) {
         const [key, subKey] = enCode.split(".");
         if (value[key]) data = value[key].map((o) => o[subKey]);
       }
-      const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
+      const fieldItem = fieldsList.find((item) => item.fieldName == enCode);
       if (fieldItem) {
         switch (fieldItem.fieldType) {
           case "number":
@@ -50,8 +50,6 @@ function calculate(params) {
               data = "";
             }
         }
-      } else {
-        throw new Error("字段：" + item.fieldName + " 未定义");
       }
       data = JSON.stringify(data);
       const actualStart = startIndex + offset;

package/package.json

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