super-page-designer 2.0.41 → 2.0.45

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 (83) hide show
  1. package/dist/es/components/design/utils/assemblys-config.js +203 -116
  2. package/dist/es/components/design/utils/chart-design-util.js +9 -9
  3. package/dist/es/components/design/utils/form-design-util.d.ts +1 -1
  4. package/dist/es/components/design/utils/interfaces/page-design-types.d.ts +13 -13
  5. package/dist/es/components/design/utils/page-table-util.js +7 -2
  6. package/dist/es/components/design/views/assemblys/button/button/button-attr-advanced.vue.js +32 -14
  7. package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js +43 -7
  8. package/dist/es/components/design/views/assemblys/button/button/button-attr.vue2.js +7 -7
  9. package/dist/es/components/design/views/assemblys/button/component/condition-dialog.vue.js +16 -11
  10. package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr-advanced.vue.js +5 -1
  11. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr-advanced.vue.js +20 -6
  12. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue2.js +7 -7
  13. package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr-base.vue.js +36 -8
  14. package/dist/es/components/design/views/assemblys/chart/column-line/series/column-line-series-attr-base.vue.js +1 -1
  15. package/dist/es/components/design/views/assemblys/chart/common/common-attr-clickset.vue.js +244 -0
  16. package/dist/es/components/design/views/assemblys/chart/common/common-attr-clickset.vue2.js +4 -0
  17. package/dist/es/components/design/views/assemblys/chart/common/common-attr-data.vue.js +115 -30
  18. package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js +2 -27
  19. package/dist/es/components/design/views/assemblys/chart/common-series/common-attr-dataset-columnline.vue.js +69 -3
  20. package/dist/es/components/design/views/assemblys/chart/pie/pie-attr-base.vue.js +36 -8
  21. package/dist/es/components/design/views/assemblys/chart/pie/pie-attr.vue2.js +11 -5
  22. package/dist/es/components/design/views/assemblys/chart/radar/series/series-attr-dataset.vue.js +69 -4
  23. package/dist/es/components/design/views/assemblys/chart/scatter/series/scatter-series-data.vue.js +115 -34
  24. package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js +35 -10
  25. package/dist/es/components/design/views/assemblys/common/common-advanced-basic.vue.js +29 -3
  26. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js +2 -2
  27. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js +1 -692
  28. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue3.js +692 -1
  29. package/dist/es/components/design/views/assemblys/data/component/column-config.vue.js +371 -168
  30. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue.js +1 -1
  31. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue2.js +18 -33
  32. package/dist/es/components/design/views/assemblys/data/component/configuration-value.vue.js +403 -0
  33. package/dist/es/components/design/views/assemblys/data/component/configuration-value.vue2.js +4 -0
  34. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue.js +1 -1
  35. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue2.js +59 -89
  36. package/dist/es/components/design/views/assemblys/data/component/dynamic-column.vue.js +781 -0
  37. package/dist/es/components/design/views/assemblys/data/component/dynamic-column.vue2.js +4 -0
  38. package/dist/es/components/design/views/assemblys/data/component/formatting.vue.js +534 -0
  39. package/dist/es/components/design/views/assemblys/data/component/formatting.vue2.js +4 -0
  40. package/dist/es/components/design/views/assemblys/data/component/table-children-column.vue.js +26 -10
  41. package/dist/es/components/design/views/assemblys/data/component/variate-select.vue.js +24 -2
  42. package/dist/es/components/design/views/assemblys/data/table/table-attr-base.vue.js +6 -117
  43. package/dist/es/components/design/views/assemblys/data/table/table-design.vue.js +1 -1
  44. package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js +77 -82
  45. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js +296 -73
  46. package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr-advanced.vue.js +4 -1
  47. package/dist/es/components/design/views/assemblys/form/common/condition.vue.js +4 -1
  48. package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js +1 -1
  49. package/dist/es/components/design/views/assemblys/form/common/data-origin-autoset.vue.js +7 -1
  50. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue.js +1 -1
  51. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue2.js +95 -36
  52. package/dist/es/components/design/views/assemblys/form/common/suffixmodule.vue.js +190 -61
  53. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr-advanced.vue.js +4 -1
  54. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr-base.vue.js +55 -25
  55. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-design.vue2.js +11 -2
  56. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr-advanced.vue.js +4 -1
  57. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr-base.vue.js +6 -2
  58. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-design.vue2.js +30 -14
  59. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr-advanced.vue.js +4 -1
  60. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr-advanced.vue.js +4 -1
  61. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr-base.vue.js +6 -2
  62. package/dist/es/components/design/views/assemblys/form/input-number/input-number-design.vue2.js +30 -14
  63. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr-advanced.vue.js +4 -1
  64. package/dist/es/components/design/views/assemblys/form/link/link-attr-advanced.vue.js +4 -1
  65. package/dist/es/components/design/views/assemblys/form/radio/radio-attr-advanced.vue.js +4 -1
  66. package/dist/es/components/design/views/assemblys/form/rich-text/richtext-attr-advanced.vue.js +4 -1
  67. package/dist/es/components/design/views/assemblys/form/select/select-attr-advanced.vue.js +4 -1
  68. package/dist/es/components/design/views/assemblys/form/select/select-attr-base.vue.js +6 -2
  69. package/dist/es/components/design/views/assemblys/form/select/select-design.vue2.js +12 -8
  70. package/dist/es/components/design/views/assemblys/form/switch/switch-attr-advanced.vue.js +4 -1
  71. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr-advanced.vue.js +4 -1
  72. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr-base.vue.js +19 -44
  73. package/dist/es/components/design/views/assemblys/form/textarea/textarea-design.vue2.js +29 -14
  74. package/dist/es/components/design/views/assemblys/object-design.vue.js +8 -3
  75. package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.d.ts +9 -0
  76. package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.js +51 -33
  77. package/dist/es/components/design/views/assemblys/page/page-attr-advanced.vue.js +6 -5
  78. package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.js +1 -1
  79. package/dist/es/components/design/views/design/view/view-design-display.vue.js +7 -2
  80. package/dist/es/style.css +93 -93
  81. package/package.json +4 -4
  82. package/dist/es/components/design/views/assemblys/data/component/select-data-table.vue.js +0 -180
  83. package/dist/es/components/design/views/assemblys/data/component/select-data-table.vue2.js +0 -4
@@ -1,14 +1,11 @@
1
- import { defineComponent, ref, watch, onUnmounted, resolveComponent, openBlock, createBlock, normalizeClass, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, Fragment, renderList } from "vue";
1
+ import { defineComponent, ref, watch, onUnmounted, resolveComponent, openBlock, createBlock, normalizeClass, normalizeStyle, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode, createVNode, renderList } from "vue";
2
2
  import { caculateDetailComponentStyle, removComponentOptionConfigs, caculateComponentProps } from "../../../../utils/form-design-util.js";
3
- import _sfc_main$1 from "../../../design/page-design.vue.js";
3
+ import _sfc_main$1 from "../common/title-suffix-element.vue.js";
4
4
  const _sfc_main = /* @__PURE__ */ defineComponent({
5
5
  __name: "select-design",
6
6
  props: {
7
- configure: {
8
- type: Object,
9
- required: true
10
- },
11
- pageDesign: _sfc_main$1
7
+ pageDesign: {},
8
+ configure: {}
12
9
  },
13
10
  emits: ["handleSelect"],
14
11
  setup(__props, { emit: __emit }) {
@@ -94,7 +91,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
94
91
  designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
95
92
  key: 0,
96
93
  style: normalizeStyle({ ...designHeaderStyle.value, "padding-right": "12px" })
97
- }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
94
+ }, [
95
+ designProperty.value.prefixType ? (openBlock(), createBlock(_sfc_main$1, {
96
+ key: 0,
97
+ configure: _ctx.configure
98
+ }, null, 8, ["configure"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
99
+ createTextVNode(toDisplayString(designProperty.value.title), 1)
100
+ ], 64))
101
+ ], 4)) : createCommentVNode("", true)
98
102
  ]),
99
103
  default: withCtx(() => [
100
104
  createVNode(_component_el_select, {
@@ -25,7 +25,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
25
25
  style: { "margin-top": "6px" }
26
26
  }, {
27
27
  default: withCtx(() => [
28
- createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"])
28
+ createVNode(_sfc_main$1, {
29
+ configure: __props.configure,
30
+ type: "form"
31
+ }, null, 8, ["configure"])
29
32
  ]),
30
33
  _: 1
31
34
  }, 8, ["modelValue"])
@@ -25,7 +25,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
25
25
  style: { "margin-top": "6px" }
26
26
  }, {
27
27
  default: withCtx(() => [
28
- createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"])
28
+ createVNode(_sfc_main$1, {
29
+ configure: __props.configure,
30
+ type: "form"
31
+ }, null, 8, ["configure"])
29
32
  ]),
30
33
  _: 1
31
34
  }, 8, ["modelValue"])
@@ -1,8 +1,9 @@
1
1
  import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createCommentVNode, createTextVNode, withDirectives, vShow } from "vue";
2
2
  import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
3
- import _sfc_main$2 from "../../common/common-attr-size.vue.js";
3
+ import _sfc_main$3 from "../../common/common-attr-size.vue.js";
4
4
  import BindVariable from "../../common/common-variable-bind.vue.js";
5
5
  import _sfc_main$1 from "../../common/common-function-code.vue.js";
6
+ import _sfc_main$2 from "../common/title-suffix.vue.js";
6
7
  const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
7
8
  const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
8
9
  const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -52,7 +53,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
52
53
  default: withCtx(() => [
53
54
  createVNode(_component_el_collapse, {
54
55
  modelValue: openCollapseItems.value,
55
- "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => openCollapseItems.value = $event),
56
+ "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => openCollapseItems.value = $event),
56
57
  style: { "margin-top": "6px" }
57
58
  }, {
58
59
  default: withCtx(() => [
@@ -218,35 +219,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
218
219
  ]),
219
220
  _: 1
220
221
  }),
221
- createVNode(_component_el_form_item, {
222
- label: "清除按钮",
223
- class: "amb-design-attr-item"
224
- }, {
225
- default: withCtx(() => [
226
- createVNode(_component_el_radio_group, {
227
- modelValue: __props.configure.props.base.clearable,
228
- "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.base.clearable = $event),
229
- class: "ml-4"
230
- }, {
231
- default: withCtx(() => [
232
- createVNode(_component_el_radio, { value: true }, {
233
- default: withCtx(() => [
234
- createTextVNode("显示")
235
- ]),
236
- _: 1
237
- }),
238
- createVNode(_component_el_radio, { value: false }, {
239
- default: withCtx(() => [
240
- createTextVNode("隐藏")
241
- ]),
242
- _: 1
243
- })
244
- ]),
245
- _: 1
246
- }, 8, ["modelValue"])
247
- ]),
248
- _: 1
249
- }),
250
222
  createVNode(_component_el_form_item, {
251
223
  label: "行数",
252
224
  class: "amb-design-attr-item"
@@ -254,7 +226,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
254
226
  default: withCtx(() => [
255
227
  createVNode(_component_el_input_number, {
256
228
  modelValue: __props.configure.props.base.rows,
257
- "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.base.rows = $event),
229
+ "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.base.rows = $event),
258
230
  min: 1
259
231
  }, null, 8, ["modelValue"])
260
232
  ]),
@@ -267,7 +239,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
267
239
  default: withCtx(() => [
268
240
  createVNode(_component_el_switch, {
269
241
  modelValue: __props.configure.props.base.showInputNum,
270
- "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.configure.props.base.showInputNum = $event)
242
+ "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.base.showInputNum = $event)
271
243
  }, null, 8, ["modelValue"])
272
244
  ]),
273
245
  _: 1
@@ -279,7 +251,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
279
251
  default: withCtx(() => [
280
252
  createVNode(_component_el_switch, {
281
253
  modelValue: __props.configure.props.base.isOpinion,
282
- "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.configure.props.base.isOpinion = $event)
254
+ "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.configure.props.base.isOpinion = $event)
283
255
  }, null, 8, ["modelValue"])
284
256
  ]),
285
257
  _: 1
@@ -291,7 +263,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
291
263
  default: withCtx(() => [
292
264
  createVNode(_component_el_radio_group, {
293
265
  modelValue: __props.configure.props.base.size,
294
- "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.props.base.size = $event),
266
+ "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.configure.props.base.size = $event),
295
267
  class: "ml-4"
296
268
  }, {
297
269
  default: withCtx(() => [
@@ -326,7 +298,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
326
298
  default: withCtx(() => [
327
299
  createVNode(_component_el_radio_group, {
328
300
  modelValue: __props.configure.props.base.state,
329
- "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.props.base.state = $event),
301
+ "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.props.base.state = $event),
330
302
  class: "ml-4"
331
303
  }, {
332
304
  default: withCtx(() => [
@@ -358,6 +330,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
358
330
  ]),
359
331
  _: 1
360
332
  }),
333
+ withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [
334
+ [vShow, __props.configure.props.base.tittleShow]
335
+ ]),
361
336
  (openBlock(), createBlock(_component_el_collapse_item, {
362
337
  title: "校验",
363
338
  name: "verification",
@@ -373,7 +348,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
373
348
  default: withCtx(() => [
374
349
  createVNode(_component_el_checkbox, {
375
350
  modelValue: __props.configure.props.verification.required,
376
- "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.configure.props.verification.required = $event),
351
+ "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.props.verification.required = $event),
377
352
  label: "必填"
378
353
  }, null, 8, ["modelValue"])
379
354
  ]),
@@ -388,7 +363,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
388
363
  default: withCtx(() => [
389
364
  createVNode(_component_el_checkbox, {
390
365
  modelValue: __props.configure.props.verification.verifyMinLength,
391
- "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => __props.configure.props.verification.verifyMinLength = $event),
366
+ "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.configure.props.verification.verifyMinLength = $event),
392
367
  label: "最小长度",
393
368
  value: "min"
394
369
  }, null, 8, ["modelValue"])
@@ -399,7 +374,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
399
374
  default: withCtx(() => [
400
375
  createVNode(_component_el_input_number, {
401
376
  modelValue: __props.configure.props.verification.minLength,
402
- "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => __props.configure.props.verification.minLength = $event),
377
+ "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => __props.configure.props.verification.minLength = $event),
403
378
  class: "mx-4",
404
379
  min: 0,
405
380
  "controls-position": "right",
@@ -420,7 +395,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
420
395
  default: withCtx(() => [
421
396
  createVNode(_component_el_checkbox, {
422
397
  modelValue: __props.configure.props.verification.verifyMaxLength,
423
- "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => __props.configure.props.verification.verifyMaxLength = $event),
398
+ "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => __props.configure.props.verification.verifyMaxLength = $event),
424
399
  label: "最大长度",
425
400
  value: "max"
426
401
  }, null, 8, ["modelValue"])
@@ -431,7 +406,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
431
406
  default: withCtx(() => [
432
407
  createVNode(_component_el_input_number, {
433
408
  modelValue: __props.configure.props.verification.maxLength,
434
- "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => __props.configure.props.verification.maxLength = $event),
409
+ "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => __props.configure.props.verification.maxLength = $event),
435
410
  class: "mx-4",
436
411
  min: 0,
437
412
  "controls-position": "right",
@@ -452,7 +427,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
452
427
  default: withCtx(() => [
453
428
  createVNode(_component_el_checkbox, {
454
429
  modelValue: __props.configure.props.verification.verifyRegex,
455
- "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => __props.configure.props.verification.verifyRegex = $event),
430
+ "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => __props.configure.props.verification.verifyRegex = $event),
456
431
  label: "正则",
457
432
  value: "regex"
458
433
  }, null, 8, ["modelValue"])
@@ -463,7 +438,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
463
438
  default: withCtx(() => [
464
439
  createVNode(_component_el_input, {
465
440
  modelValue: __props.configure.props.verification.regex,
466
- "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.verification.regex = $event),
441
+ "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => __props.configure.props.verification.regex = $event),
467
442
  class: "mx-4",
468
443
  "controls-position": "right",
469
444
  placeholder: "请输入"
@@ -510,7 +485,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
510
485
  ]),
511
486
  _: 1
512
487
  })),
513
- !isTable.value ? (openBlock(), createBlock(_sfc_main$2, {
488
+ !isTable.value ? (openBlock(), createBlock(_sfc_main$3, {
514
489
  key: __props.configure.uuid,
515
490
  size: __props.configure.props.size
516
491
  }, null, 8, ["size"])) : createCommentVNode("", true)
@@ -1,5 +1,6 @@
1
- import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, createVNode, normalizeClass, normalizeStyle, withCtx, toDisplayString, createCommentVNode } from "vue";
1
+ import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, createVNode, normalizeClass, normalizeStyle, withCtx, createBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode } from "vue";
2
2
  import { caculateDetailComponentStyle, caculateComponentProps } from "../../../../utils/form-design-util.js";
3
+ import _sfc_main$1 from "../common/title-suffix-element.vue.js";
3
4
  const _sfc_main = /* @__PURE__ */ defineComponent({
4
5
  __name: "textarea-design",
5
6
  props: {
@@ -17,16 +18,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
17
18
  const designClass = ref("");
18
19
  const designHeaderStyle = ref({});
19
20
  const designProperty = ref({});
20
- watch(props.configure.style, () => {
21
- caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
22
- props.configure.runtime.style = designStyle.value;
23
- props.configure.runtime.class = designClass.value;
24
- props.configure.runtime.headerStyle = designHeaderStyle.value;
25
- }, { immediate: true });
26
- watch(props.configure.props, () => {
27
- caculateComponentProps(props.configure, designProperty);
28
- props.configure.runtime.props = designProperty.value;
29
- }, { immediate: true });
21
+ watch(
22
+ props.configure.style,
23
+ () => {
24
+ caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
25
+ props.configure.runtime.style = designStyle.value;
26
+ props.configure.runtime.class = designClass.value;
27
+ props.configure.runtime.headerStyle = designHeaderStyle.value;
28
+ },
29
+ { immediate: true }
30
+ );
31
+ watch(
32
+ props.configure.props,
33
+ () => {
34
+ caculateComponentProps(props.configure, designProperty);
35
+ props.configure.runtime.props = designProperty.value;
36
+ },
37
+ { immediate: true }
38
+ );
30
39
  return (_ctx, _cache) => {
31
40
  const _component_el_input = resolveComponent("el-input");
32
41
  const _component_el_form_item = resolveComponent("el-form-item");
@@ -41,14 +50,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
41
50
  designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
42
51
  key: 0,
43
52
  style: normalizeStyle({ ...designHeaderStyle.value, "padding-right": "12px" })
44
- }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
53
+ }, [
54
+ designProperty.value.prefixType ? (openBlock(), createBlock(_sfc_main$1, {
55
+ key: 0,
56
+ configure: __props.configure
57
+ }, null, 8, ["configure"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
58
+ createTextVNode(toDisplayString(designProperty.value.title), 1)
59
+ ], 64))
60
+ ], 4)) : createCommentVNode("", true)
45
61
  ]),
46
62
  default: withCtx(() => [
47
63
  createVNode(_component_el_input, {
48
64
  disabled: designProperty.value.state === "disabled",
49
65
  readonly: designProperty.value.state === "readonly",
50
66
  size: designProperty.value.size,
51
- clearable: designProperty.value.clearable,
52
67
  placeholder: designProperty.value.placeholder,
53
68
  modelValue: designProperty.value.value,
54
69
  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => designProperty.value.value = $event),
@@ -56,7 +71,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
56
71
  maxlength: designProperty.value.maxLength,
57
72
  "show-word-limit": designProperty.value.showInputNum,
58
73
  type: "textarea"
59
- }, null, 8, ["disabled", "readonly", "size", "clearable", "placeholder", "modelValue", "rows", "maxlength", "show-word-limit"])
74
+ }, null, 8, ["disabled", "readonly", "size", "placeholder", "modelValue", "rows", "maxlength", "show-word-limit"])
60
75
  ]),
61
76
  _: 1
62
77
  }, 8, ["required", "class", "label-width", "style"])
@@ -133,13 +133,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
133
133
  }
134
134
  );
135
135
  if (props.configure.props && props.configure.props.verification) {
136
- if (props.configure.props.base) {
136
+ if (props.configure.props.base && props.configure.props.base.title) {
137
137
  watch(
138
138
  () => props.configure.props.base.title,
139
139
  (newVal) => {
140
140
  watchValidate(props.configure, props.configure.props.verification, fieldInfo);
141
141
  }
142
142
  );
143
+ }
144
+ if (props.configure.props.base && props.configure.props.base.prop) {
143
145
  watch(
144
146
  () => props.configure.props.base.prop,
145
147
  (newVal) => {
@@ -167,9 +169,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
167
169
  props.configure.runtime.common.style = designStyle.value;
168
170
  }
169
171
  if (props.configure.props && props.configure.props) {
172
+ watch(props.configure.props.size, (newVal) => {
173
+ caculateNewStyle();
174
+ });
170
175
  watch(
171
- props.configure.props,
172
- () => {
176
+ props.configure.props.position,
177
+ (newVal) => {
173
178
  caculateNewStyle();
174
179
  },
175
180
  { immediate: true }
@@ -11,6 +11,10 @@ declare const _default: import('vue').DefineComponent<{
11
11
  type: NumberConstructor;
12
12
  default: any;
13
13
  };
14
+ fieldList: {
15
+ type: ArrayConstructor;
16
+ default: () => any[];
17
+ };
14
18
  }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
15
19
  save: (...args: any[]) => void;
16
20
  }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -26,11 +30,16 @@ declare const _default: import('vue').DefineComponent<{
26
30
  type: NumberConstructor;
27
31
  default: any;
28
32
  };
33
+ fieldList: {
34
+ type: ArrayConstructor;
35
+ default: () => any[];
36
+ };
29
37
  }>> & {
30
38
  onSave?: (...args: any[]) => any;
31
39
  }, {
32
40
  systemCode: string;
33
41
  systemVersion: number;
34
42
  judgeHeavyList: unknown[];
43
+ fieldList: unknown[];
35
44
  }, {}>;
36
45
  export default _default;
@@ -1,5 +1,5 @@
1
- import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref } from "vue";
2
- import { CirclePlus, Delete, Search, Close } from "@element-plus/icons-vue";
1
+ import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createElementBlock, Fragment, renderList } from "vue";
2
+ import { CirclePlus, Delete } from "@element-plus/icons-vue";
3
3
  import _sfc_main$1 from "../../common/common-select-table.vue.js";
4
4
  import { queryTableFields } from "../../../../utils/page-table-util.js";
5
5
  import { usePageContextStore } from "../../../../../../stores/page-store.js";
@@ -18,6 +18,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
18
18
  systemVersion: {
19
19
  type: Number,
20
20
  default: null
21
+ },
22
+ // 字段列表
23
+ fieldList: {
24
+ type: Array,
25
+ default: () => []
21
26
  }
22
27
  },
23
28
  emits: ["save"],
@@ -35,14 +40,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
35
40
  tableData.value = props.judgeHeavyList;
36
41
  }
37
42
  });
38
- function selectTable(index) {
39
- tableSelectIndex.value = index;
40
- selectTableDialog.value.openDialog();
41
- }
42
- function clearTable(index) {
43
- tableData.value[index].tableAlias = "";
44
- tableData.value[index].tableName = "";
45
- tableData.value[index].modelFields = [];
43
+ function fieldChange(val, row) {
44
+ row.fieldalias = "";
45
+ if (val.length == 0)
46
+ return;
47
+ props.fieldList.forEach((item) => {
48
+ val.forEach((Ttem) => {
49
+ if (item.dbColumnName === Ttem) {
50
+ row.fieldalias += item.alias + ",";
51
+ }
52
+ });
53
+ });
54
+ row.fieldalias = row.fieldalias.substring(0, row.fieldalias.lastIndexOf(","));
46
55
  }
47
56
  function onSelectTable(tableInfo) {
48
57
  let hisKey = tableData.value[tableSelectIndex.value].tableSysCode ? tableData.value[tableSelectIndex.value].tableSysCode : "";
@@ -69,7 +78,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
69
78
  }
70
79
  }
71
80
  function remove() {
72
- tableData.value = tableData.value.filter((item) => item != currentRow.value);
81
+ if (currentRow.value && Object.keys(currentRow.value).length !== 0) {
82
+ tableData.value = tableData.value.filter((item) => item != currentRow.value);
83
+ } else {
84
+ tableData.value.pop();
85
+ }
73
86
  }
74
87
  function handleCurrentChange(val) {
75
88
  currentRow.value = val;
@@ -83,13 +96,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
83
96
  return (_ctx, _cache) => {
84
97
  const _component_el_button = resolveComponent("el-button");
85
98
  const _component_el_row = resolveComponent("el-row");
86
- const _component_el_input = resolveComponent("el-input");
99
+ const _component_el_option = resolveComponent("el-option");
100
+ const _component_el_select = resolveComponent("el-select");
87
101
  const _component_el_table_column = resolveComponent("el-table-column");
102
+ const _component_el_input = resolveComponent("el-input");
88
103
  const _component_el_table = resolveComponent("el-table");
89
104
  const _component_el_dialog = resolveComponent("el-dialog");
90
105
  return openBlock(), createBlock(_component_el_dialog, {
91
106
  "model-value": "",
92
- title: "判重租户字段",
107
+ title: "判重组合字段",
93
108
  "append-to-body": "",
94
109
  onBeforeClose: _cache[1] || (_cache[1] = () => _ctx.$emit("close"))
95
110
  }, {
@@ -155,28 +170,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
155
170
  align: "center"
156
171
  }, {
157
172
  default: withCtx((scope) => [
158
- createVNode(_component_el_input, {
159
- modelValue: scope.row.tableSysCode,
160
- "onUpdate:modelValue": ($event) => scope.row.tableSysCode = $event,
161
- title: scope.row.tableSysCode,
173
+ createVNode(_component_el_select, {
174
+ modelValue: scope.row.duplicateFieldList,
175
+ "onUpdate:modelValue": ($event) => scope.row.duplicateFieldList = $event,
176
+ size: "default",
177
+ filterable: "",
178
+ multiple: "",
162
179
  clearable: "",
163
- readonly: "true"
180
+ placeholder: "请选择",
181
+ onChange: (val) => fieldChange(val, scope.row)
164
182
  }, {
165
- append: withCtx(() => [
166
- createVNode(_component_el_button, {
167
- icon: unref(Search),
168
- onClick: ($event) => selectTable(scope.index),
169
- size: "small"
170
- }, null, 8, ["icon", "onClick"]),
171
- createVNode(_component_el_button, {
172
- icon: unref(Close),
173
- onClick: ($event) => clearTable(scope.index),
174
- title: "Clear",
175
- size: "small"
176
- }, null, 8, ["icon", "onClick"])
183
+ default: withCtx(() => [
184
+ (openBlock(true), createElementBlock(Fragment, null, renderList(__props.fieldList, (field, index) => {
185
+ return openBlock(), createBlock(_component_el_option, {
186
+ key: index,
187
+ label: field.alias + "(" + field.dbColumnName + ")",
188
+ value: field.dbColumnName
189
+ }, null, 8, ["label", "value"]);
190
+ }), 128))
177
191
  ]),
178
192
  _: 2
179
- }, 1032, ["modelValue", "onUpdate:modelValue", "title"])
193
+ }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"])
180
194
  ]),
181
195
  _: 1
182
196
  }),
@@ -187,8 +201,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
187
201
  }, {
188
202
  default: withCtx((scope) => [
189
203
  createVNode(_component_el_input, {
190
- modelValue: scope.row.tableName,
191
- "onUpdate:modelValue": ($event) => scope.row.tableName = $event,
204
+ modelValue: scope.row.fieldalias,
205
+ "onUpdate:modelValue": ($event) => scope.row.fieldalias = $event,
192
206
  type: "textarea",
193
207
  readonly: ""
194
208
  }, null, 8, ["modelValue", "onUpdate:modelValue"])
@@ -202,6 +216,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
202
216
  }, {
203
217
  default: withCtx((scope) => [
204
218
  createVNode(_component_el_input, {
219
+ size: "default",
220
+ clearable: "",
205
221
  modelValue: scope.row.tips,
206
222
  "onUpdate:modelValue": ($event) => scope.row.tips = $event
207
223
  }, null, 8, ["modelValue", "onUpdate:modelValue"])
@@ -215,6 +231,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
215
231
  }, {
216
232
  default: withCtx((scope) => [
217
233
  createVNode(_component_el_input, {
234
+ size: "default",
235
+ clearable: "",
218
236
  modelValue: scope.row.tipsI18nKey,
219
237
  "onUpdate:modelValue": ($event) => scope.row.tipsI18nKey = $event
220
238
  }, null, 8, ["modelValue", "onUpdate:modelValue"])
@@ -16,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
16
16
  const settingFormRuleBaseInputVisile = ref(false);
17
17
  const formNumberOpenCollapseItems = ref(["formNumber", "pagePermissions"]);
18
18
  const WeightFieldInputVisile = ref(false);
19
- const attributeMap = ref([
19
+ ref([
20
20
  {
21
21
  dbColumnName: "FIRST_TASK_ID",
22
22
  label: "该流程的第一个任务的id",
@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
36
36
  value: "AUDIT_REPORT_NO"
37
37
  }
38
38
  ]);
39
- const fieldMap = ref({
39
+ ref({
40
40
  "FIRST_TASK_ID": {
41
41
  dbColumnName: "FIRST_TASK_ID",
42
42
  label: "该流程的第一个任务的id",
@@ -221,16 +221,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
221
221
  WeightFieldInputVisile.value ? (openBlock(), createBlock(_sfc_main$3, {
222
222
  key: 1,
223
223
  judgeHeavyList: _ctx.configure.props.judgeHeavyList,
224
+ fieldList: _ctx.configure.modelFields,
224
225
  onClose: WeightFieldInputClose,
225
226
  onSave: WeightFieldInputSave,
226
227
  systemCode: _ctx.configure.systemCode,
227
228
  systemVersion: _ctx.configure.systemVersion
228
- }, null, 8, ["judgeHeavyList", "systemCode", "systemVersion"])) : createCommentVNode("", true),
229
+ }, null, 8, ["judgeHeavyList", "fieldList", "systemCode", "systemVersion"])) : createCommentVNode("", true),
229
230
  combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
230
231
  key: 2,
231
232
  conditionList: _ctx.configure.props.notIdInitializationList,
232
- fieldNameList: attributeMap.value,
233
- fieldMap: fieldMap.value,
233
+ fieldNameList: _ctx.configure.modelFields,
234
+ fieldMap: _ctx.configure.modelFieldsMap,
234
235
  onClose: closeCombination,
235
236
  onSave: saveCondition
236
237
  }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true)
@@ -44,7 +44,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
44
44
  }
45
45
  }
46
46
  function remove() {
47
- if (Object.keys(currentRow.value).length !== 0) {
47
+ if (currentRow.value && Object.keys(currentRow.value).length !== 0) {
48
48
  tableData.value = tableData.value.filter((item) => item != currentRow.value);
49
49
  } else {
50
50
  tableData.value.pop();
@@ -184,14 +184,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
184
184
  const configureCopy = JSON.parse(JSON.stringify(props.configure));
185
185
  configureCopy.tableRuntimes = {};
186
186
  if (configureCopy.tableUuids) {
187
- configureCopy.tableUuids.forEach((tableUuid) => {
187
+ configureCopy.tableUuids = configureCopy.tableUuids.filter((tableUuid) => {
188
188
  const table = findDesignItemByUuid(configureCopy, tableUuid);
189
189
  if (table) {
190
190
  setTableRuntimesFromConfigure(table, configureCopy);
191
+ return true;
191
192
  }
193
+ return false;
192
194
  });
193
195
  }
194
- http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/save", { id: props.configure.id, designJson: JSON.stringify(configureCopy) }).then((res) => {
196
+ http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/save", {
197
+ id: props.configure.id,
198
+ designJson: JSON.stringify(configureCopy)
199
+ }).then((res) => {
195
200
  console.log(res);
196
201
  ElMessage({
197
202
  message: "保存成功",