super-page-designer 2.1.49 → 2.1.55

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 (72) hide show
  1. package/dist/es/components/design/utils/assemblys-config.js +19 -32
  2. package/dist/es/components/design/utils/chart-design-util.js +17 -0
  3. package/dist/es/components/design/utils/data-table-util.js +26 -28
  4. package/dist/es/components/design/utils/form-design-util.js +0 -1
  5. package/dist/es/components/design/utils/page-service-util.d.ts +2 -2
  6. package/dist/es/components/design/utils/page-service-util.js +7 -5
  7. package/dist/es/components/design/utils/page-table-util.js +33 -10
  8. package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr.vue2.js +5 -5
  9. package/dist/es/components/design/views/assemblys/chart/common/common-attr-data.vue.js +61 -2
  10. package/dist/es/components/design/views/assemblys/chart/common/common-attr-events.vue.js +22 -0
  11. package/dist/es/components/design/views/assemblys/chart/common/common-attr-events.vue2.js +4 -0
  12. package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js +1 -1
  13. package/dist/es/components/design/views/assemblys/chart/common/common-style-yaxis.vue.js +89 -23
  14. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/data-origin.vue.js +7 -1
  15. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/data-origin.vue2.js +706 -0
  16. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/font-style-dialog.vue.js +40 -15
  17. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/row-colmun.vue.js +106 -0
  18. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/row-colmun.vue2.js +4 -0
  19. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/style-table.vue.js +26 -12
  20. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/table-pageination.vue.js +347 -0
  21. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/table-pageination.vue2.js +4 -0
  22. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/table-showcondition.vue.js +69 -31
  23. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-attr-advanced.vue.js +15 -7
  24. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-attr-base.vue.js +466 -304
  25. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-attr-style.vue.js +9 -6
  26. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-design.vue.js +1 -1
  27. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-design.vue2.js +1 -1
  28. package/dist/es/components/design/views/assemblys/common/common-attr-size.vue.js +1 -1
  29. package/dist/es/components/design/views/assemblys/common/common-select-page.vue.js +2 -1
  30. package/dist/es/components/design/views/assemblys/common/common-variable-bind-option.js +4 -4
  31. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.d.ts +9 -0
  32. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js +3 -3
  33. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js +1 -738
  34. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue3.js +738 -1
  35. package/dist/es/components/design/views/assemblys/common/page-permission-select.vue.js +8 -0
  36. package/dist/es/components/design/views/assemblys/common-attr-events.vue.js +2 -2
  37. package/dist/es/components/design/views/assemblys/container/tabs/tabs-design.vue2.js +1 -11
  38. package/dist/es/components/design/views/assemblys/container/tools/tools-design.vue2.js +31 -5
  39. package/dist/es/components/design/views/assemblys/data/component/attr-style.vue.js +46 -52
  40. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue.js +1 -1
  41. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue2.js +16 -28
  42. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue.js +1 -1
  43. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue2.js +9 -2
  44. package/dist/es/components/design/views/assemblys/data/component/formatting-icon-label.vue.js +67 -9
  45. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue.js +1 -7
  46. package/dist/es/components/design/views/assemblys/data/table/table-attr-base.vue.js +23 -9
  47. package/dist/es/components/design/views/assemblys/data/table/table-attr-style.vue.js +7 -2
  48. package/dist/es/components/design/views/assemblys/data/table/table-attr.vue2.js +9 -2
  49. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js +1 -1
  50. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue2.js +31 -28
  51. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-style.vue.js +35 -470
  52. package/dist/es/components/design/views/assemblys/form/common/condition.vue.js +7 -3
  53. package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js +1 -1
  54. package/dist/es/components/design/views/assemblys/form/common/data-linkage.vue.js +2 -2
  55. package/dist/es/components/design/views/assemblys/form/common/hyperlink-mult-config.vue.js +275 -0
  56. package/dist/es/components/design/views/assemblys/form/common/hyperlink-mult-config.vue2.js +4 -0
  57. package/dist/es/components/design/views/assemblys/form/common/suffixmodule.vue.js +16 -9
  58. package/dist/es/components/design/views/assemblys/page/page-attr-advanced.vue.js +49 -2
  59. package/dist/es/components/design/views/assemblys/page/variable-dialog.vue.js +30 -1
  60. package/dist/es/components/design/views/design/page-design.vue.js +1 -1
  61. package/dist/es/components/design/views/design/page-event/config.vue.js +1 -7
  62. package/dist/es/components/design/views/design/page-event/config.vue2.js +7 -1
  63. package/dist/es/components/design/views/design/page-event/config.vue3.js +102 -16
  64. package/dist/es/components/design/views/design/page-event/page-event-content.vue.js +1 -1
  65. package/dist/es/components/design/views/design/view/view-design-display.vue.js +15 -11
  66. package/dist/es/stores/statistics-table-store.js +2 -1
  67. package/dist/es/style.css +115 -115
  68. package/package.json +6 -5
  69. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/link-table.vue.js +0 -205
  70. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/link-table.vue2.js +0 -4
  71. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue2.js +0 -78
  72. /package/dist/es/components/design/views/assemblys/{data/component/row-backgroud-color.vue3.js → chart/statistical-table/component/data-origin.vue3.js} +0 -0
@@ -0,0 +1,347 @@
1
+ import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createElementBlock, Fragment, createTextVNode, renderList, toDisplayString, createCommentVNode } from "vue";
2
+ import BindVariable from "../../../common/common-variable-bind.vue.js";
3
+ const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
4
+ const _hoisted_2 = { style: { "float": "left" } };
5
+ const _hoisted_3 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
6
+ const _sfc_main = /* @__PURE__ */ defineComponent({
7
+ __name: "table-pageination",
8
+ props: {
9
+ pageDesign: {
10
+ type: Object,
11
+ default: () => ({ props: {} })
12
+ },
13
+ configure: {
14
+ type: Object,
15
+ default: () => ({ props: {} })
16
+ },
17
+ serviceFields: {
18
+ type: Array,
19
+ default: () => []
20
+ }
21
+ },
22
+ setup(__props) {
23
+ const props = __props;
24
+ if (!props.configure.pageination) {
25
+ props.configure.pageination = {
26
+ enable: false,
27
+ type: "frontend",
28
+ pageSize: 10,
29
+ pageSizes: "20,30,50,100",
30
+ total: true,
31
+ prev: true,
32
+ next: true,
33
+ pager: true,
34
+ jumper: true
35
+ };
36
+ }
37
+ return (_ctx, _cache) => {
38
+ const _component_el_switch = resolveComponent("el-switch");
39
+ const _component_el_form_item = resolveComponent("el-form-item");
40
+ const _component_el_radio = resolveComponent("el-radio");
41
+ const _component_el_radio_group = resolveComponent("el-radio-group");
42
+ const _component_el_input_number = resolveComponent("el-input-number");
43
+ const _component_el_input = resolveComponent("el-input");
44
+ const _component_el_option = resolveComponent("el-option");
45
+ const _component_el_select = resolveComponent("el-select");
46
+ const _component_el_collapse_item = resolveComponent("el-collapse-item");
47
+ return openBlock(), createBlock(_component_el_collapse_item, {
48
+ title: "分页设置",
49
+ name: "pageination",
50
+ class: "amb-design-attr-group-header"
51
+ }, {
52
+ default: withCtx(() => [
53
+ createElementVNode("div", _hoisted_1, [
54
+ createVNode(_component_el_form_item, {
55
+ label: "启用分页",
56
+ class: "amb-design-attr-item"
57
+ }, {
58
+ default: withCtx(() => [
59
+ createVNode(_component_el_switch, {
60
+ modelValue: __props.configure.pageination.enable,
61
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.pageination.enable = $event),
62
+ "inline-prompt": "",
63
+ "active-text": "是",
64
+ "inactive-text": "否"
65
+ }, null, 8, ["modelValue"])
66
+ ]),
67
+ _: 1
68
+ }),
69
+ __props.configure.pageination.enable ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
70
+ createVNode(_component_el_form_item, {
71
+ label: "分页方式",
72
+ class: "amb-design-attr-item"
73
+ }, {
74
+ default: withCtx(() => [
75
+ createVNode(_component_el_radio_group, {
76
+ modelValue: __props.configure.pageination.type,
77
+ "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.pageination.type = $event),
78
+ class: "ml-4"
79
+ }, {
80
+ default: withCtx(() => [
81
+ createVNode(_component_el_radio, { value: "frontend" }, {
82
+ default: withCtx(() => [
83
+ createTextVNode("前端分页")
84
+ ]),
85
+ _: 1
86
+ }),
87
+ createVNode(_component_el_radio, { value: "backend" }, {
88
+ default: withCtx(() => [
89
+ createTextVNode("后端分页")
90
+ ]),
91
+ _: 1
92
+ })
93
+ ]),
94
+ _: 1
95
+ }, 8, ["modelValue"])
96
+ ]),
97
+ _: 1
98
+ }),
99
+ createVNode(_component_el_form_item, {
100
+ label: "默认行数",
101
+ class: "amb-design-attr-item"
102
+ }, {
103
+ default: withCtx(() => [
104
+ createVNode(_component_el_input_number, {
105
+ modelValue: __props.configure.pageination.pageSize,
106
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.pageination.pageSize = $event),
107
+ min: 1,
108
+ "controls-position": "right"
109
+ }, null, 8, ["modelValue"])
110
+ ]),
111
+ _: 1
112
+ }),
113
+ createVNode(_component_el_form_item, {
114
+ label: "可选行数",
115
+ class: "amb-design-attr-item"
116
+ }, {
117
+ default: withCtx(() => [
118
+ createVNode(_component_el_input, {
119
+ modelValue: __props.configure.pageination.pageSizes,
120
+ "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.pageination.pageSizes = $event)
121
+ }, null, 8, ["modelValue"])
122
+ ]),
123
+ _: 1
124
+ }),
125
+ createVNode(_component_el_form_item, {
126
+ label: "总条目数",
127
+ class: "amb-design-attr-item"
128
+ }, {
129
+ default: withCtx(() => [
130
+ createVNode(_component_el_radio_group, {
131
+ modelValue: __props.configure.pageination.total,
132
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.pageination.total = $event),
133
+ class: "ml-4"
134
+ }, {
135
+ default: withCtx(() => [
136
+ createVNode(_component_el_radio, { value: true }, {
137
+ default: withCtx(() => [
138
+ createTextVNode("显示")
139
+ ]),
140
+ _: 1
141
+ }),
142
+ createVNode(_component_el_radio, { value: false }, {
143
+ default: withCtx(() => [
144
+ createTextVNode("隐藏")
145
+ ]),
146
+ _: 1
147
+ })
148
+ ]),
149
+ _: 1
150
+ }, 8, ["modelValue"])
151
+ ]),
152
+ _: 1
153
+ }),
154
+ __props.configure.pageination.type === "backend" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
155
+ createVNode(_component_el_form_item, {
156
+ label: "当前页",
157
+ class: "amb-design-attr-item"
158
+ }, {
159
+ default: withCtx(() => [
160
+ createVNode(BindVariable, {
161
+ modelValue: __props.configure.pageination.currentPageSet,
162
+ "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.pageination.currentPageSet = $event),
163
+ placeholder: "设置到变量"
164
+ }, null, 8, ["modelValue"])
165
+ ]),
166
+ _: 1
167
+ }),
168
+ createVNode(_component_el_form_item, {
169
+ label: "分页大小",
170
+ class: "amb-design-attr-item"
171
+ }, {
172
+ default: withCtx(() => [
173
+ createVNode(BindVariable, {
174
+ modelValue: __props.configure.pageination.pageSizeSet,
175
+ "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.pageination.pageSizeSet = $event),
176
+ placeholder: "设置到变量"
177
+ }, null, 8, ["modelValue"])
178
+ ]),
179
+ _: 1
180
+ }),
181
+ __props.configure.pageination.total ? (openBlock(), createBlock(_component_el_form_item, {
182
+ key: 0,
183
+ label: "总条数",
184
+ class: "amb-design-attr-item"
185
+ }, {
186
+ default: withCtx(() => [
187
+ __props.configure.props.dataOrigin.dataSource === "variable" ? (openBlock(), createBlock(BindVariable, {
188
+ key: 0,
189
+ modelValue: __props.configure.pageination.totalFrom,
190
+ "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.pageination.totalFrom = $event),
191
+ placeholder: "总条数从变量中获取"
192
+ }, null, 8, ["modelValue"])) : (openBlock(), createBlock(_component_el_select, {
193
+ key: 1,
194
+ modelValue: __props.configure.pageination.totalFrom,
195
+ "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.configure.pageination.totalFrom = $event),
196
+ placeholder: "变量从返回值中获取",
197
+ "allow-create": "",
198
+ filterable: ""
199
+ }, {
200
+ default: withCtx(() => [
201
+ (openBlock(true), createElementBlock(Fragment, null, renderList(__props.serviceFields, (item) => {
202
+ return openBlock(), createBlock(_component_el_option, {
203
+ key: item.value,
204
+ label: item.label,
205
+ value: item.value
206
+ }, {
207
+ default: withCtx(() => [
208
+ createElementVNode("span", _hoisted_2, toDisplayString(item.label), 1),
209
+ createElementVNode("span", _hoisted_3, toDisplayString(item.type), 1)
210
+ ]),
211
+ _: 2
212
+ }, 1032, ["label", "value"]);
213
+ }), 128))
214
+ ]),
215
+ _: 1
216
+ }, 8, ["modelValue"]))
217
+ ]),
218
+ _: 1
219
+ })) : createCommentVNode("", true)
220
+ ], 64)) : createCommentVNode("", true),
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.pageination.prev,
228
+ "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.configure.pageination.prev = $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
+ createVNode(_component_el_form_item, {
251
+ label: "下一页",
252
+ class: "amb-design-attr-item"
253
+ }, {
254
+ default: withCtx(() => [
255
+ createVNode(_component_el_radio_group, {
256
+ modelValue: __props.configure.pageination.next,
257
+ "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.pageination.next = $event),
258
+ class: "ml-4"
259
+ }, {
260
+ default: withCtx(() => [
261
+ createVNode(_component_el_radio, { value: true }, {
262
+ default: withCtx(() => [
263
+ createTextVNode("显示")
264
+ ]),
265
+ _: 1
266
+ }),
267
+ createVNode(_component_el_radio, { value: false }, {
268
+ default: withCtx(() => [
269
+ createTextVNode("隐藏")
270
+ ]),
271
+ _: 1
272
+ })
273
+ ]),
274
+ _: 1
275
+ }, 8, ["modelValue"])
276
+ ]),
277
+ _: 1
278
+ }),
279
+ createVNode(_component_el_form_item, {
280
+ label: "跳转页码",
281
+ class: "amb-design-attr-item"
282
+ }, {
283
+ default: withCtx(() => [
284
+ createVNode(_component_el_radio_group, {
285
+ modelValue: __props.configure.pageination.pager,
286
+ "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.pageination.pager = $event),
287
+ class: "ml-4"
288
+ }, {
289
+ default: withCtx(() => [
290
+ createVNode(_component_el_radio, { value: true }, {
291
+ default: withCtx(() => [
292
+ createTextVNode("显示")
293
+ ]),
294
+ _: 1
295
+ }),
296
+ createVNode(_component_el_radio, { value: false }, {
297
+ default: withCtx(() => [
298
+ createTextVNode("隐藏")
299
+ ]),
300
+ _: 1
301
+ })
302
+ ]),
303
+ _: 1
304
+ }, 8, ["modelValue"])
305
+ ]),
306
+ _: 1
307
+ }),
308
+ createVNode(_component_el_form_item, {
309
+ label: "跳转到指定页",
310
+ class: "amb-design-attr-item"
311
+ }, {
312
+ default: withCtx(() => [
313
+ createVNode(_component_el_radio_group, {
314
+ modelValue: __props.configure.pageination.jumper,
315
+ "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.configure.pageination.jumper = $event),
316
+ class: "ml-4"
317
+ }, {
318
+ default: withCtx(() => [
319
+ createVNode(_component_el_radio, { value: true }, {
320
+ default: withCtx(() => [
321
+ createTextVNode("显示")
322
+ ]),
323
+ _: 1
324
+ }),
325
+ createVNode(_component_el_radio, { value: false }, {
326
+ default: withCtx(() => [
327
+ createTextVNode("隐藏")
328
+ ]),
329
+ _: 1
330
+ })
331
+ ]),
332
+ _: 1
333
+ }, 8, ["modelValue"])
334
+ ]),
335
+ _: 1
336
+ })
337
+ ], 64)) : createCommentVNode("", true)
338
+ ])
339
+ ]),
340
+ _: 1
341
+ });
342
+ };
343
+ }
344
+ });
345
+ export {
346
+ _sfc_main as default
347
+ };
@@ -0,0 +1,4 @@
1
+ import _sfc_main from "./table-pageination.vue.js";
2
+ export {
3
+ _sfc_main as default
4
+ };
@@ -1,8 +1,10 @@
1
- import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, createVNode, withCtx, createTextVNode, unref, withDirectives, vShow } from "vue";
1
+ import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, createVNode, withCtx, createTextVNode, unref, createBlock, createCommentVNode, withDirectives, vShow } from "vue";
2
2
  import { Plus, Delete } from "@element-plus/icons";
3
3
  import BindVariable from "../../../common/common-variable-bind.vue.js";
4
4
  import { getUuidv4 } from "../../../../../utils/common-util.js";
5
5
  import { usePageContextStore } from "../../../../../../../stores/page-store.js";
6
+ import { statisticsTable } from "../../../../../../../stores/statistics-table-store.js";
7
+ import { getModelOptionsByFields } from "../../../../../utils/page-table-util.js";
6
8
  const _hoisted_1 = { style: { "text-align": "center", "margin": "0px -8px", "padding-top": "4px", "padding-left": "2px" } };
7
9
  const _sfc_main = /* @__PURE__ */ defineComponent({
8
10
  __name: "table-showcondition",
@@ -18,11 +20,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
18
20
  },
19
21
  paramTypes: {
20
22
  type: Array,
21
- default: () => ["data", "task", "page", "request"]
23
+ default: () => ["data", "task", "page", "request", "row"]
24
+ },
25
+ configure: {
26
+ type: Object,
27
+ default: () => {
28
+ }
29
+ },
30
+ // 页面信息
31
+ pageDesign: {
32
+ type: Object,
33
+ default: () => {
34
+ }
22
35
  }
23
36
  },
24
37
  setup(__props) {
25
38
  const pageDesignUtil = usePageContextStore();
39
+ const statisticsTableStore = statisticsTable();
26
40
  const props = __props;
27
41
  const tableHeight = ref(300);
28
42
  const tableDatas = ref([]);
@@ -30,6 +44,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
30
44
  tableDatas.value = props.data;
31
45
  }
32
46
  const dialogTableVisible = ref(false);
47
+ let dataFieldNameList;
48
+ const pageType = props.pageDesign ? props.pageDesign.pageType : null;
49
+ if (pageType && (pageType === "form" || pageType === "list")) {
50
+ dataFieldNameList = props.pageDesign.modelFields;
51
+ }
52
+ const dataModelOptions = ref(null);
53
+ if (dataFieldNameList && dataFieldNameList.length > 0) {
54
+ dataModelOptions.value = getModelOptionsByFields(dataFieldNameList);
55
+ }
56
+ const rowModelOptions = ref(null);
57
+ if (props.configure) {
58
+ rowModelOptions.value = getModelOptionsByFields(props.configure.modelFields);
59
+ }
33
60
  function openDialog() {
34
61
  let tempHeight = window.innerHeight - 140 - 176;
35
62
  if (tempHeight > 500) {
@@ -96,18 +123,35 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
96
123
  currentRow.value = val;
97
124
  }
98
125
  function updatePropValue(val, rowObj, fieldName) {
99
- if (fieldName == "propValue") {
126
+ if (fieldName === "propValue") {
100
127
  rowObj.propValue = val;
101
128
  } else {
129
+ let columnList = [];
130
+ let propName;
102
131
  rowObj.propName = val;
103
132
  let dataType = "";
104
133
  if (val && val.startsWith("${")) {
105
- let propName = val.substring(2, val.length - 1);
134
+ propName = val.substring(2, val.length - 1);
106
135
  if (propName.startsWith("page."))
107
136
  ;
108
137
  else if (propName.startsWith("data.")) {
109
138
  propName = propName.substring(5);
110
- dataType = pageDesignUtil.getModelField(propName);
139
+ columnList = dataModelOptions.value;
140
+ if (!columnList || columnList.length === 0) {
141
+ columnList = pageDesignUtil.pageContextVarOptions.dataOptions;
142
+ }
143
+ } else if (propName.startsWith("row.")) {
144
+ propName = propName.substring(4);
145
+ columnList = rowModelOptions.value;
146
+ if (!columnList || columnList.length === 0) {
147
+ columnList = statisticsTableStore.columnList;
148
+ }
149
+ }
150
+ }
151
+ if (columnList && propName) {
152
+ const item = columnList.find((item2) => item2.value == propName);
153
+ if (item) {
154
+ dataType = item.dataType;
111
155
  }
112
156
  }
113
157
  rowObj.dataType = dataType;
@@ -245,9 +289,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
245
289
  default: withCtx((scope) => [
246
290
  createVNode(BindVariable, {
247
291
  modelValue: scope.row.propName,
292
+ dataModelOptions: dataModelOptions.value,
293
+ objModelOptions: rowModelOptions.value,
248
294
  paramTypes: __props.paramTypes,
249
295
  "onUpdate:modelValue": (val) => updatePropValue(val, scope.row, "propName")
250
- }, null, 8, ["modelValue", "paramTypes", "onUpdate:modelValue"])
296
+ }, null, 8, ["modelValue", "dataModelOptions", "objModelOptions", "paramTypes", "onUpdate:modelValue"])
251
297
  ]),
252
298
  _: 1
253
299
  }),
@@ -264,36 +310,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
264
310
  placeholder: "请选择"
265
311
  }, {
266
312
  default: withCtx(() => [
267
- withDirectives(createVNode(_component_el_option, {
313
+ scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number" ? (openBlock(), createBlock(_component_el_option, {
314
+ key: 0,
268
315
  label: "大于",
269
316
  value: "GT"
270
- }, null, 512), [
271
- [
272
- vShow,
273
- scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
274
- ]
275
- ]),
276
- withDirectives(createVNode(_component_el_option, {
317
+ })) : createCommentVNode("", true),
318
+ scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number" ? (openBlock(), createBlock(_component_el_option, {
319
+ key: 1,
277
320
  label: "小于",
278
321
  value: "LT"
279
- }, null, 512), [
280
- [
281
- vShow,
282
- scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
283
- ]
284
- ]),
285
- withDirectives(createVNode(_component_el_option, {
322
+ })) : createCommentVNode("", true),
323
+ scope.row.dataType == "date" || scope.row.dataType == "datetime" ? (openBlock(), createBlock(_component_el_option, {
324
+ key: 2,
286
325
  label: "晚于",
287
326
  value: "GT"
288
- }, null, 512), [
289
- [vShow, scope.row.dataType == "date" || scope.row.dataType == "datetime"]
290
- ]),
291
- withDirectives(createVNode(_component_el_option, {
327
+ })) : createCommentVNode("", true),
328
+ scope.row.dataType == "date" || scope.row.dataType == "datetime" ? (openBlock(), createBlock(_component_el_option, {
329
+ key: 3,
292
330
  label: "早于",
293
331
  value: "LT"
294
- }, null, 512), [
295
- [vShow, scope.row.dataType == "date" || scope.row.dataType == "datetime"]
296
- ]),
332
+ })) : createCommentVNode("", true),
297
333
  createVNode(_component_el_option, {
298
334
  label: "等于",
299
335
  value: "EQ"
@@ -304,7 +340,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
304
340
  }, null, 512), [
305
341
  [
306
342
  vShow,
307
- scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
343
+ scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number"
308
344
  ]
309
345
  ]),
310
346
  withDirectives(createVNode(_component_el_option, {
@@ -313,7 +349,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
313
349
  }, null, 512), [
314
350
  [
315
351
  vShow,
316
- scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
352
+ scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number"
317
353
  ]
318
354
  ]),
319
355
  withDirectives(createVNode(_component_el_option, {
@@ -362,8 +398,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
362
398
  default: withCtx((scope) => [
363
399
  createVNode(BindVariable, {
364
400
  modelValue: scope.row.propValue,
401
+ dataModelOptions: dataModelOptions.value,
402
+ objModelOptions: rowModelOptions.value,
365
403
  "onUpdate:modelValue": (val) => updatePropValue(val, scope.row, "propValue")
366
- }, null, 8, ["modelValue", "onUpdate:modelValue"])
404
+ }, null, 8, ["modelValue", "dataModelOptions", "objModelOptions", "onUpdate:modelValue"])
367
405
  ]),
368
406
  _: 1
369
407
  }),
@@ -1,4 +1,4 @@
1
- import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref } from "vue";
1
+ import { defineComponent, watch, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref } from "vue";
2
2
  import { Plus, Delete } from "@element-plus/icons-vue";
3
3
  import CompositeHeader from "../../data/component/composite-header.vue.js";
4
4
  import _sfc_main$1 from "../../common/common-advanced-basic-showcondition.vue.js";
@@ -25,6 +25,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
25
25
  },
26
26
  setup(__props) {
27
27
  const props = __props;
28
+ watch(
29
+ () => props.configure.props.groupHeaders,
30
+ (val) => {
31
+ debugger;
32
+ },
33
+ { deep: true }
34
+ );
28
35
  const openCollapseItems = ref(["compositeHeader", "amalgamated", "otherSettings", "summarySetting"]);
29
36
  ref([]);
30
37
  ref([]);
@@ -152,7 +159,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
152
159
  default: withCtx((scope) => [
153
160
  createVNode(_component_el_icon, {
154
161
  size: "14",
155
- style: { "color": "#5893EF", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
162
+ style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
156
163
  onClick: ($event) => addData(scope.$index)
157
164
  }, {
158
165
  default: withCtx(() => [
@@ -162,7 +169,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
162
169
  }, 1032, ["onClick"]),
163
170
  createVNode(_component_el_icon, {
164
171
  size: "14",
165
- style: { "color": "#5893EF", "cursor": "pointer" },
172
+ style: { "color": "#5893ef", "cursor": "pointer" },
166
173
  onClick: ($event) => deleteData(scope.$index)
167
174
  }, {
168
175
  default: withCtx(() => [
@@ -182,8 +189,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
182
189
  }, {
183
190
  default: withCtx(() => [
184
191
  createVNode(_component_el_select, {
185
- modelValue: __props.configure.props.highOrder.mergeDefined,
186
- "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.highOrder.mergeDefined = $event),
192
+ modelValue: __props.configure.props.highOrder.mergeRow,
193
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.highOrder.mergeRow = $event),
187
194
  multiple: "",
188
195
  "allow-create": "",
189
196
  filterable: "",
@@ -213,6 +220,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
213
220
  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.highOrder.scopeFunc = $event),
214
221
  title: __props.configure.props.highOrder.scopeFunc,
215
222
  size: "small",
223
+ clearable: "",
216
224
  placeholder: "请选择"
217
225
  }, {
218
226
  default: withCtx(() => [
@@ -246,8 +254,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
246
254
  }, {
247
255
  default: withCtx(() => [
248
256
  createVNode(_component_el_select, {
249
- modelValue: __props.configure.props.highOrder.groupingField,
250
- "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.highOrder.groupingField = $event),
257
+ modelValue: __props.configure.props.highOrder.groupField,
258
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.highOrder.groupField = $event),
251
259
  multiple: "",
252
260
  "allow-create": "",
253
261
  filterable: "",