@fecp/designer 5.4.39 → 5.4.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/es/designer/package.json.mjs +1 -1
  2. package/es/designer/src/components/DocumentParam.vue.mjs +1 -1
  3. package/es/designer/src/components/ParamsConfig.vue2.mjs +1 -1
  4. package/es/designer/src/layout/aside/HiddenFieldDialog.vue.mjs +1 -1
  5. package/es/designer/src/packages/advancedFilter/ValueInput.vue2.mjs +1 -1
  6. package/es/designer/src/packages/dataLinkage/index.vue.mjs +1 -1
  7. package/es/designer/src/packages/dialogGlobal/index.vue.mjs +1 -1
  8. package/es/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.mjs +1 -1
  9. package/es/designer/src/packages/form/property/approvalHistory.vue.mjs +1 -1
  10. package/es/designer/src/packages/form/property/contract.vue.mjs +1 -1
  11. package/es/designer/src/packages/form/property/subForm.vue.mjs +1 -1
  12. package/es/designer/src/packages/prod/index.vue.mjs +1 -1
  13. package/es/designer/src/packages/table/headerBtn.vue.mjs +1 -1
  14. package/es/designer.css +6 -6
  15. package/es/packages/vue/src/components/dialog/DialogRenderer.vue2.mjs +1 -1
  16. package/es/packages/vue/src/components/forms/form/Form.vue.mjs +16 -15
  17. package/es/packages/vue/src/components/forms/text/Text.vue.mjs +1 -1
  18. package/es/packages/vue/src/components/table/TableColumn.vue.mjs +1 -1
  19. package/es/packages/vue/src/composables/usePageEvents.mjs +1 -1
  20. package/es/packages/vue/src/utils/datasource.mjs +1 -1
  21. package/es/packages/vue/src/utils/formulajs/calculate.mjs +1 -3
  22. package/lib/designer/package.json.js +1 -1
  23. package/lib/designer/src/components/DocumentParam.vue.js +1 -1
  24. package/lib/designer/src/components/ParamsConfig.vue2.js +1 -1
  25. package/lib/designer/src/layout/aside/HiddenFieldDialog.vue.js +1 -1
  26. package/lib/designer/src/packages/advancedFilter/ValueInput.vue2.js +1 -1
  27. package/lib/designer/src/packages/dataLinkage/index.vue.js +1 -1
  28. package/lib/designer/src/packages/dialogGlobal/index.vue.js +1 -1
  29. package/lib/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.js +1 -1
  30. package/lib/designer/src/packages/form/property/approvalHistory.vue.js +1 -1
  31. package/lib/designer/src/packages/form/property/contract.vue.js +1 -1
  32. package/lib/designer/src/packages/form/property/subForm.vue.js +1 -1
  33. package/lib/designer/src/packages/prod/index.vue.js +1 -1
  34. package/lib/designer/src/packages/table/headerBtn.vue.js +1 -1
  35. package/lib/designer.css +6 -6
  36. package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js +1 -1
  37. package/lib/packages/vue/src/components/forms/form/Form.vue.js +16 -15
  38. package/lib/packages/vue/src/components/forms/text/Text.vue.js +1 -1
  39. package/lib/packages/vue/src/components/table/TableColumn.vue.js +1 -1
  40. package/lib/packages/vue/src/composables/usePageEvents.js +1 -1
  41. package/lib/packages/vue/src/utils/datasource.js +1 -1
  42. package/lib/packages/vue/src/utils/formulajs/calculate.js +1 -3
  43. package/package.json +1 -1
@@ -1,4 +1,4 @@
1
- const version = "5.4.39";
1
+ const version = "5.4.41";
2
2
  const packageJson = {
3
3
  version
4
4
  };
@@ -9,7 +9,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
9
9
  /* empty css */
10
10
  import { computed, ref, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
11
11
  import { Plus as plus_default, Delete as delete_default } from "../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
12
- import ValueSelector from "./ValueSelector.vue2.mjs";
12
+ import ValueSelector from "./ValueSelector.vue.mjs";
13
13
  import api from "../api/index.mjs";
14
14
  /* empty css */
15
15
  import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
@@ -4,7 +4,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
4
4
  /* empty css */
5
5
  import { computed, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
6
6
  import { Plus as plus_default, Delete as delete_default } from "../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
7
- import ValueSelector from "./ValueSelector.vue2.mjs";
7
+ import ValueSelector from "./ValueSelector.vue.mjs";
8
8
  /* empty css */
9
9
  import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
10
10
  import { ElButton } from "../../../node_modules/element-plus/es/components/button/index.mjs";
@@ -16,7 +16,7 @@ import { Plus as plus_default, RefreshRight as refresh_right_default, Delete as
16
16
  import { getEditConfigData, getEditingType, cloneDeep, getEditConfigDataFields } from "../../packages/utils/common.mjs";
17
17
  import { defaultProperty } from "../../packages/form/aside/index.mjs";
18
18
  import { defaultProperty as defaultProperty$1 } from "../../packages/table/aside/index.mjs";
19
- import ValueSelector from "../../components/ValueSelector.vue2.mjs";
19
+ import ValueSelector from "../../components/ValueSelector.vue.mjs";
20
20
  /* empty css */
21
21
  import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
22
22
  import { ElDialog } from "../../../../node_modules/element-plus/es/components/dialog/index.mjs";
@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.mjs";
14
14
  import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs";
15
15
  import { computed, watch, ref, createElementBlock, unref, openBlock, createBlock, isRef, createVNode, createElementVNode, withCtx, Fragment, renderList } from "vue";
16
16
  import { useVModel } from "../../../../node_modules/@vueuse/core/dist/index.mjs";
17
- import ValueSelector from "../../components/ValueSelector.vue2.mjs";
17
+ import ValueSelector from "../../components/ValueSelector.vue.mjs";
18
18
  import api from "../../api/index.mjs";
19
19
  import { getEditConfigDataSources } from "../utils/common.mjs";
20
20
  import { createDataSource } from "../utils/datasource.mjs";
@@ -30,7 +30,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs
30
30
  /* empty css */
31
31
  /* empty css */
32
32
  import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
33
- /* empty css */
33
+ /* empty css */
34
34
  import "../../axios/config.mjs";
35
35
  import "../../../../_virtual/FileSaver.min.mjs";
36
36
  import "../../../../_virtual/index.mjs";
@@ -84,7 +84,7 @@ import widgets from "../table/property/widgets.vue.mjs";
84
84
  import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
85
85
  /* empty css */
86
86
  /* empty css */
87
- /* empty css */
87
+ /* empty css */
88
88
  /* empty css */
89
89
  /* empty css */
90
90
  /* empty css */
@@ -4,7 +4,7 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
4
4
  /* empty css */
5
5
  import { createElementBlock, openBlock, Fragment, createVNode, withCtx } from "vue";
6
6
  import RiskSchemeSelector from "../../../../components/RiskSchemeSelector.vue2.mjs";
7
- import ValueSelector from "../../../../components/ValueSelector.vue2.mjs";
7
+ import ValueSelector from "../../../../components/ValueSelector.vue.mjs";
8
8
  import ParamsConfig from "../../../../components/ParamsConfig.vue2.mjs";
9
9
  import { ElFormItem } from "../../../../../../node_modules/element-plus/es/components/form/index.mjs";
10
10
  import { ElSwitch } from "../../../../../../node_modules/element-plus/es/components/switch/index.mjs";
@@ -11,7 +11,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
11
11
  import { computed, ref, watch, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, createCommentVNode, createTextVNode, Fragment } from "vue";
12
12
  import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
13
13
  import emitter from "../../utils/eventBus.mjs";
14
- import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
14
+ import ValueSelector from "../../../components/ValueSelector.vue.mjs";
15
15
  import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
16
16
  import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";
17
17
  import { ElInput } from "../../../../../node_modules/element-plus/es/components/input/index.mjs";
@@ -17,7 +17,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
17
17
  import { computed, ref, createBlock, openBlock, withCtx, createVNode, createTextVNode, createElementBlock, Fragment, renderList } from "vue";
18
18
  import { getCurrentItem } from "../../utils/common.mjs";
19
19
  import "../../utils/eventBus.mjs";
20
- import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
20
+ import ValueSelector from "../../../components/ValueSelector.vue.mjs";
21
21
  import api from "../../../api/index.mjs";
22
22
  import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
23
23
  /* empty css */
@@ -12,7 +12,7 @@ import { computed, ref, createBlock, openBlock, unref, isRef, withCtx, createVNo
12
12
  import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
13
13
  import TemplateSelector from "../../../components/TemplateSelector.vue.mjs";
14
14
  import emitter from "../../utils/eventBus.mjs";
15
- import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
15
+ import ValueSelector from "../../../components/ValueSelector.vue.mjs";
16
16
  import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
17
17
  import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
18
18
  import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";
@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/es/index.mjs";
14
14
  import { useModel, ref, watch, computed, createBlock, openBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, createTextVNode, unref } from "vue";
15
15
  import { Plus as plus_default } from "../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
16
16
  import { getEditConfigData, getEditConfigDataFields, setEditConfigData } from "../utils/common.mjs";
17
- import ValueSelector from "../../components/ValueSelector.vue2.mjs";
17
+ import ValueSelector from "../../components/ValueSelector.vue.mjs";
18
18
  import api from "../../api/index.mjs";
19
19
  /* empty css */
20
20
  import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
@@ -45,7 +45,7 @@ import { Connection as connection_default, Grid as grid_default, ChatLineSquare
45
45
  /* empty css */
46
46
  import "../../store/index.mjs";
47
47
  /* empty css */
48
- /* empty css */
48
+ /* empty css */
49
49
  /* empty css */
50
50
  /* empty css */
51
51
  /* empty css */
package/es/designer.css CHANGED
@@ -5904,27 +5904,27 @@ body,
5904
5904
  width: 80px;
5905
5905
  font-size: var(--el-font-size-extra-small);
5906
5906
  }
5907
- .fec-form[data-v-382ea560] {
5907
+ .fec-form[data-v-68afecc6] {
5908
5908
  height: 100%;
5909
5909
  }
5910
- [data-v-382ea560] .vgl-item {
5910
+ [data-v-68afecc6] .vgl-item {
5911
5911
  transition: none;
5912
5912
  }
5913
- [data-v-382ea560] .vgl-item > .el-form-item {
5913
+ [data-v-68afecc6] .vgl-item > .el-form-item {
5914
5914
  width: 100%;
5915
5915
  padding: 12px 8px 0 8px;
5916
5916
  height: calc(100% - 15px);
5917
5917
  display: flex;
5918
5918
  }
5919
- [data-v-382ea560] .vgl-item > .el-form-item.el-form-item--label-top {
5919
+ [data-v-68afecc6] .vgl-item > .el-form-item.el-form-item--label-top {
5920
5920
  flex-direction: column;
5921
5921
  }
5922
- [data-v-382ea560] .vgl-item > .el-form-item .el-form-item__label {
5922
+ [data-v-68afecc6] .vgl-item > .el-form-item .el-form-item__label {
5923
5923
  line-height: 20px;
5924
5924
  display: flex;
5925
5925
  align-items: center;
5926
5926
  }
5927
- [data-v-382ea560] .vgl-item > .el-container {
5927
+ [data-v-68afecc6] .vgl-item > .el-container {
5928
5928
  height: auto !important;
5929
5929
  }.cell-content .cell-text[data-v-3e5372d4] {
5930
5930
  display: inline-block;
@@ -9,8 +9,8 @@ import { Form } from "../forms/form/index.mjs";
9
9
  import { parseRouteParams } from "../../utils/parseRouteParams.mjs";
10
10
  import { calculate } from "../../utils/formulajs/calculate.mjs";
11
11
  import { useEventFlow, executeEventFlow } from "../../utils/eventFlow/eventFlowHandler.mjs";
12
- /* empty css */
13
12
  /* empty css */
13
+ /* empty css */
14
14
  /* empty css */
15
15
  import { loadComponentByPath } from "../../utils/common.mjs";
16
16
  /* empty css */
@@ -148,10 +148,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
148
148
  () => props.modelValue,
149
149
  (newVal, oldVal) => {
150
150
  if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
151
- formData.value = {
152
- ...formData.value,
153
- ...setFormData(props.modelValue, true)
154
- };
151
+ loadFormData(true);
155
152
  }
156
153
  }
157
154
  );
@@ -212,7 +209,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
212
209
  function layoutUpdated(layoutData) {
213
210
  emit("layoutUpdated", layoutData);
214
211
  }
215
- const loadFormData = () => {
212
+ const loadFormData = (flag) => {
216
213
  const defaultData = {};
217
214
  const rules = {};
218
215
  if (fieldsData.value) {
@@ -224,13 +221,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
224
221
  }
225
222
  defaultData[component.fieldName] = defaultValue;
226
223
  }
227
- if (component.fieldName) {
228
- const fieldRules = generateFieldRules(component, formData, [
229
- ...fieldsData.value,
230
- ...hiddenFields.value
231
- ]);
232
- if (fieldRules.length > 0) {
233
- rules[component.fieldName] = fieldRules;
224
+ if (!flag) {
225
+ if (component.fieldName) {
226
+ const fieldRules = generateFieldRules(component, formData, [
227
+ ...fieldsData.value,
228
+ ...hiddenFields.value
229
+ ]);
230
+ if (fieldRules.length > 0) {
231
+ rules[component.fieldName] = fieldRules;
232
+ }
234
233
  }
235
234
  }
236
235
  });
@@ -251,7 +250,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
251
250
  });
252
251
  }
253
252
  formData.value = { ...defaultData, ...setFormData(props.modelValue, true) };
254
- formRules.value = rules;
253
+ if (!flag) {
254
+ formRules.value = rules;
255
+ }
255
256
  };
256
257
  const loadFieldDataSources = async () => {
257
258
  var _a, _b;
@@ -631,7 +632,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
631
632
  return ((_b = (_a2 = subFormRef == null ? void 0 : subFormRef.subFormRef) == null ? void 0 : _a2.validate) == null ? void 0 : _b.call(_a2)) || Promise.resolve();
632
633
  });
633
634
  subFormPromises.push((_a = formRef.value) == null ? void 0 : _a.validate());
634
- return Promise.all(subFormPromises);
635
+ return Promise.all(subFormPromises).then(() => getFormData());
635
636
  };
636
637
  const resetFields = () => {
637
638
  var _a, _b;
@@ -1075,7 +1076,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
1075
1076
  };
1076
1077
  }
1077
1078
  });
1078
- const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-382ea560"]]);
1079
+ const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-68afecc6"]]);
1079
1080
  export {
1080
1081
  _Form as default
1081
1082
  };
@@ -3,8 +3,8 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
3
3
  /* empty css */
4
4
  /* empty css */
5
5
  import { computed, getCurrentInstance, inject, createElementBlock, openBlock, createVNode, createCommentVNode, mergeProps, toHandlers, createSlots, withCtx, createElementVNode, toDisplayString, createBlock, createTextVNode, unref } from "vue";
6
- /* empty css */
7
6
  /* empty css */
7
+ /* empty css */
8
8
  /* empty css */
9
9
  import { openDialog } from "../../dialog/index.mjs";
10
10
  /* empty css */
@@ -7,8 +7,8 @@ import "../../../../../node_modules/vxe-table/es/components.mjs";
7
7
  import { CopyDocument as copy_document_default } from "../../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
8
8
  import { checkFilterMatch } from "../../utils/parseFilterConfig.mjs";
9
9
  import { removeEmptyValues } from "../../utils/common.mjs";
10
- /* empty css */
11
10
  /* empty css */
11
+ /* empty css */
12
12
  /* empty css */
13
13
  /* empty css */
14
14
  /* empty css */
@@ -1,7 +1,7 @@
1
1
  import { onUnmounted, onBeforeUnmount, onMounted } from "vue";
2
2
  /* empty css */
3
- /* empty css */
4
3
  /* empty css */
4
+ /* empty css */
5
5
  /* empty css */
6
6
  /* empty css */
7
7
  /* empty css */
@@ -2,8 +2,8 @@ import { reactive } from "vue";
2
2
  import { parseRouteParams } from "./parseRouteParams.mjs";
3
3
  import "../../../../node_modules/element-plus/es/index.mjs";
4
4
  /* empty css */
5
- /* empty css */
6
5
  /* empty css */
6
+ /* empty css */
7
7
  /* empty css */
8
8
  import { ElLoading } from "../../../../node_modules/element-plus/es/components/loading/index.mjs";
9
9
  import { ElMessage } from "../../../../node_modules/element-plus/es/components/message/index.mjs";
@@ -23,7 +23,7 @@ function calculate(params) {
23
23
  const [key, subKey] = enCode.split(".");
24
24
  if (value[key]) data = value[key].map((o) => o[subKey]);
25
25
  }
26
- const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
26
+ const fieldItem = fieldsList.find((item) => item.fieldName == enCode);
27
27
  if (fieldItem) {
28
28
  switch (fieldItem.fieldType) {
29
29
  case "number":
@@ -48,8 +48,6 @@ function calculate(params) {
48
48
  data = "";
49
49
  }
50
50
  }
51
- } else {
52
- throw new Error("字段:" + item.fieldName + " 未定义");
53
51
  }
54
52
  data = JSON.stringify(data);
55
53
  const actualStart = startIndex + offset;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
3
- const version = "5.4.39";
3
+ const version = "5.4.41";
4
4
  const packageJson = {
5
5
  version
6
6
  };
@@ -11,7 +11,7 @@ require("../../../node_modules/element-plus/es/index.js");
11
11
  ;/* empty css */
12
12
  const vue = require("vue");
13
13
  const index$2 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
14
- const ValueSelector = require("./ValueSelector.vue2.js");
14
+ const ValueSelector = require("./ValueSelector.vue.js");
15
15
  const index = require("../api/index.js");
16
16
  ;/* empty css */
17
17
  const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
@@ -6,7 +6,7 @@ require("../../../node_modules/element-plus/es/index.js");
6
6
  ;/* empty css */
7
7
  const vue = require("vue");
8
8
  const index$1 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
9
- const ValueSelector = require("./ValueSelector.vue2.js");
9
+ const ValueSelector = require("./ValueSelector.vue.js");
10
10
  ;/* empty css */
11
11
  const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
12
12
  const index = require("../../../node_modules/element-plus/es/components/button/index.js");
@@ -18,7 +18,7 @@ const index$2 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
18
18
  const common = require("../../packages/utils/common.js");
19
19
  const index$5 = require("../../packages/form/aside/index.js");
20
20
  const index$6 = require("../../packages/table/aside/index.js");
21
- const ValueSelector = require("../../components/ValueSelector.vue2.js");
21
+ const ValueSelector = require("../../components/ValueSelector.vue.js");
22
22
  ;/* empty css */
23
23
  const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
24
24
  const index = require("../../../../node_modules/element-plus/es/components/dialog/index.js");
@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.js");
16
16
  require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js");
17
17
  const vue = require("vue");
18
18
  const index = require("../../../../node_modules/@vueuse/core/dist/index.js");
19
- const ValueSelector = require("../../components/ValueSelector.vue2.js");
19
+ const ValueSelector = require("../../components/ValueSelector.vue.js");
20
20
  const index$1 = require("../../api/index.js");
21
21
  const common = require("../utils/common.js");
22
22
  const datasource = require("../utils/datasource.js");
@@ -32,7 +32,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js
32
32
  ;/* empty css */
33
33
  ;/* empty css */
34
34
  const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
35
- ;/* empty css */
35
+ ;/* empty css */
36
36
  require("../../axios/config.js");
37
37
  require("../../../../_virtual/FileSaver.min.js");
38
38
  require("../../../../_virtual/index.js");
@@ -86,7 +86,7 @@ const widgets = require("../table/property/widgets.vue.js");
86
86
  require("../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.js");
87
87
  ;/* empty css */
88
88
  ;/* empty css */
89
- ;/* empty css */
89
+ ;/* empty css */
90
90
  ;/* empty css */
91
91
  ;/* empty css */
92
92
  ;/* empty css */
@@ -6,7 +6,7 @@ require("../../../../../../node_modules/element-plus/es/index.js");
6
6
  ;/* empty css */
7
7
  const vue = require("vue");
8
8
  const RiskSchemeSelector = require("../../../../components/RiskSchemeSelector.vue2.js");
9
- const ValueSelector = require("../../../../components/ValueSelector.vue2.js");
9
+ const ValueSelector = require("../../../../components/ValueSelector.vue.js");
10
10
  const ParamsConfig = require("../../../../components/ParamsConfig.vue2.js");
11
11
  const index = require("../../../../../../node_modules/element-plus/es/components/form/index.js");
12
12
  const index$1 = require("../../../../../../node_modules/element-plus/es/components/switch/index.js");
@@ -13,7 +13,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
13
13
  const vue = require("vue");
14
14
  const common = require("../../utils/common.js");
15
15
  const eventBus = require("../../utils/eventBus.js");
16
- const ValueSelector = require("../../../components/ValueSelector.vue2.js");
16
+ const ValueSelector = require("../../../components/ValueSelector.vue.js");
17
17
  const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
18
18
  const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
19
19
  const index$2 = require("../../../../../node_modules/element-plus/es/components/input/index.js");
@@ -19,7 +19,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
19
19
  const vue = require("vue");
20
20
  const common = require("../../utils/common.js");
21
21
  require("../../utils/eventBus.js");
22
- const ValueSelector = require("../../../components/ValueSelector.vue2.js");
22
+ const ValueSelector = require("../../../components/ValueSelector.vue.js");
23
23
  const index = require("../../../api/index.js");
24
24
  const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
25
25
  ;/* empty css */
@@ -14,7 +14,7 @@ const vue = require("vue");
14
14
  const common = require("../../utils/common.js");
15
15
  const TemplateSelector = require("../../../components/TemplateSelector.vue.js");
16
16
  const eventBus = require("../../utils/eventBus.js");
17
- const ValueSelector = require("../../../components/ValueSelector.vue2.js");
17
+ const ValueSelector = require("../../../components/ValueSelector.vue.js");
18
18
  const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
19
19
  const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
20
20
  const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/es/index.js");
16
16
  const vue = require("vue");
17
17
  const index$6 = require("../../../../node_modules/@element-plus/icons-vue/dist/index.js");
18
18
  const common = require("../utils/common.js");
19
- const ValueSelector = require("../../components/ValueSelector.vue2.js");
19
+ const ValueSelector = require("../../components/ValueSelector.vue.js");
20
20
  const index = require("../../api/index.js");
21
21
  ;/* empty css */
22
22
  const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
@@ -47,7 +47,7 @@ const index$1 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
47
47
  ;/* empty css */
48
48
  require("../../store/index.js");
49
49
  ;/* empty css */
50
- ;/* empty css */
50
+ ;/* empty css */
51
51
  ;/* empty css */
52
52
  ;/* empty css */
53
53
  ;/* empty css */
package/lib/designer.css CHANGED
@@ -5904,27 +5904,27 @@ body,
5904
5904
  width: 80px;
5905
5905
  font-size: var(--el-font-size-extra-small);
5906
5906
  }
5907
- .fec-form[data-v-382ea560] {
5907
+ .fec-form[data-v-68afecc6] {
5908
5908
  height: 100%;
5909
5909
  }
5910
- [data-v-382ea560] .vgl-item {
5910
+ [data-v-68afecc6] .vgl-item {
5911
5911
  transition: none;
5912
5912
  }
5913
- [data-v-382ea560] .vgl-item > .el-form-item {
5913
+ [data-v-68afecc6] .vgl-item > .el-form-item {
5914
5914
  width: 100%;
5915
5915
  padding: 12px 8px 0 8px;
5916
5916
  height: calc(100% - 15px);
5917
5917
  display: flex;
5918
5918
  }
5919
- [data-v-382ea560] .vgl-item > .el-form-item.el-form-item--label-top {
5919
+ [data-v-68afecc6] .vgl-item > .el-form-item.el-form-item--label-top {
5920
5920
  flex-direction: column;
5921
5921
  }
5922
- [data-v-382ea560] .vgl-item > .el-form-item .el-form-item__label {
5922
+ [data-v-68afecc6] .vgl-item > .el-form-item .el-form-item__label {
5923
5923
  line-height: 20px;
5924
5924
  display: flex;
5925
5925
  align-items: center;
5926
5926
  }
5927
- [data-v-382ea560] .vgl-item > .el-container {
5927
+ [data-v-68afecc6] .vgl-item > .el-container {
5928
5928
  height: auto !important;
5929
5929
  }.cell-content .cell-text[data-v-3e5372d4] {
5930
5930
  display: inline-block;
@@ -11,8 +11,8 @@ const index$2 = require("../forms/form/index.js");
11
11
  const parseRouteParams = require("../../utils/parseRouteParams.js");
12
12
  const calculate = require("../../utils/formulajs/calculate.js");
13
13
  const eventFlowHandler = require("../../utils/eventFlow/eventFlowHandler.js");
14
- ;/* empty css */
15
14
  ;/* empty css */
15
+ ;/* empty css */
16
16
  ;/* empty css */
17
17
  const common = require("../../utils/common.js");
18
18
  ;/* empty css */
@@ -150,10 +150,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
150
150
  () => props.modelValue,
151
151
  (newVal, oldVal) => {
152
152
  if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
153
- formData.value = {
154
- ...formData.value,
155
- ...setFormData(props.modelValue, true)
156
- };
153
+ loadFormData(true);
157
154
  }
158
155
  }
159
156
  );
@@ -214,7 +211,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
214
211
  function layoutUpdated(layoutData) {
215
212
  emit("layoutUpdated", layoutData);
216
213
  }
217
- const loadFormData = () => {
214
+ const loadFormData = (flag) => {
218
215
  const defaultData = {};
219
216
  const rules = {};
220
217
  if (fieldsData.value) {
@@ -226,13 +223,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
226
223
  }
227
224
  defaultData[component.fieldName] = defaultValue;
228
225
  }
229
- if (component.fieldName) {
230
- const fieldRules = validation.generateFieldRules(component, formData, [
231
- ...fieldsData.value,
232
- ...hiddenFields.value
233
- ]);
234
- if (fieldRules.length > 0) {
235
- rules[component.fieldName] = fieldRules;
226
+ if (!flag) {
227
+ if (component.fieldName) {
228
+ const fieldRules = validation.generateFieldRules(component, formData, [
229
+ ...fieldsData.value,
230
+ ...hiddenFields.value
231
+ ]);
232
+ if (fieldRules.length > 0) {
233
+ rules[component.fieldName] = fieldRules;
234
+ }
236
235
  }
237
236
  }
238
237
  });
@@ -253,7 +252,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
253
252
  });
254
253
  }
255
254
  formData.value = { ...defaultData, ...setFormData(props.modelValue, true) };
256
- formRules.value = rules;
255
+ if (!flag) {
256
+ formRules.value = rules;
257
+ }
257
258
  };
258
259
  const loadFieldDataSources = async () => {
259
260
  var _a, _b;
@@ -633,7 +634,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
633
634
  return ((_b = (_a2 = subFormRef == null ? void 0 : subFormRef.subFormRef) == null ? void 0 : _a2.validate) == null ? void 0 : _b.call(_a2)) || Promise.resolve();
634
635
  });
635
636
  subFormPromises.push((_a = formRef.value) == null ? void 0 : _a.validate());
636
- return Promise.all(subFormPromises);
637
+ return Promise.all(subFormPromises).then(() => getFormData());
637
638
  };
638
639
  const resetFields = () => {
639
640
  var _a, _b;
@@ -1077,5 +1078,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
1077
1078
  };
1078
1079
  }
1079
1080
  });
1080
- const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-382ea560"]]);
1081
+ const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-68afecc6"]]);
1081
1082
  exports.default = _Form;
@@ -5,8 +5,8 @@ require("../../../../../../node_modules/element-plus/es/index.js");
5
5
  ;/* empty css */
6
6
  ;/* empty css */
7
7
  const vue = require("vue");
8
- ;/* empty css */
9
8
  ;/* empty css */
9
+ ;/* empty css */
10
10
  ;/* empty css */
11
11
  const index$3 = require("../../dialog/index.js");
12
12
  ;/* empty css */
@@ -9,8 +9,8 @@ require("../../../../../node_modules/vxe-table/es/components.js");
9
9
  const index$3 = require("../../../../../node_modules/@element-plus/icons-vue/dist/index.js");
10
10
  const parseFilterConfig = require("../../utils/parseFilterConfig.js");
11
11
  const common = require("../../utils/common.js");
12
- ;/* empty css */
13
12
  ;/* empty css */
13
+ ;/* empty css */
14
14
  ;/* empty css */
15
15
  ;/* empty css */
16
16
  ;/* empty css */
@@ -2,8 +2,8 @@
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  const vue = require("vue");
4
4
  ;/* empty css */
5
- ;/* empty css */
6
5
  ;/* empty css */
6
+ ;/* empty css */
7
7
  ;/* empty css */
8
8
  ;/* empty css */
9
9
  ;/* empty css */
@@ -4,8 +4,8 @@ const vue = require("vue");
4
4
  const parseRouteParams = require("./parseRouteParams.js");
5
5
  require("../../../../node_modules/element-plus/es/index.js");
6
6
  ;/* empty css */
7
- ;/* empty css */
8
7
  ;/* empty css */
8
+ ;/* empty css */
9
9
  ;/* empty css */
10
10
  const index = require("../../../../node_modules/element-plus/es/components/loading/index.js");
11
11
  const index$1 = require("../../../../node_modules/element-plus/es/components/message/index.js");
@@ -25,7 +25,7 @@ function calculate(params) {
25
25
  const [key, subKey] = enCode.split(".");
26
26
  if (value[key]) data = value[key].map((o) => o[subKey]);
27
27
  }
28
- const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
28
+ const fieldItem = fieldsList.find((item) => item.fieldName == enCode);
29
29
  if (fieldItem) {
30
30
  switch (fieldItem.fieldType) {
31
31
  case "number":
@@ -50,8 +50,6 @@ function calculate(params) {
50
50
  data = "";
51
51
  }
52
52
  }
53
- } else {
54
- throw new Error("字段:" + item.fieldName + " 未定义");
55
53
  }
56
54
  data = JSON.stringify(data);
57
55
  const actualStart = startIndex + offset;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fecp/designer",
3
- "version": "5.4.39",
3
+ "version": "5.4.41",
4
4
  "main": "lib/designer/index.js",
5
5
  "module": "es/designer/index.mjs",
6
6
  "files": [