super-page-designer 2.1.41 → 2.1.44

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 (46) hide show
  1. package/dist/es/components/design/utils/assemblys-config.js +45 -13
  2. package/dist/es/components/design/utils/form-design-util.js +1 -0
  3. package/dist/es/components/design/utils/page-design-util.d.ts +1 -1
  4. package/dist/es/components/design/utils/page-design-util.js +3 -2
  5. package/dist/es/components/design/utils/page-table-util.js +4 -2
  6. package/dist/es/components/design/views/assemblys/chart/common/common-attr-data.vue.js +9 -8
  7. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/data-origin.vue.js +1 -7
  8. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-attr-base.vue.js +92 -77
  9. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-design.vue.js +1 -1
  10. package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-design.vue2.js +13 -9
  11. package/dist/es/components/design/views/assemblys/common/common-attr-size.vue.js +5 -6
  12. package/dist/es/components/design/views/assemblys/container/card/card-design.vue2.js +6 -0
  13. package/dist/es/components/design/views/assemblys/container/collapse/collapse-design.vue2.js +10 -0
  14. package/dist/es/components/design/views/assemblys/container/container/container-design.vue2.js +6 -0
  15. package/dist/es/components/design/views/assemblys/container/flex/flex-design.vue2.js +6 -0
  16. package/dist/es/components/design/views/assemblys/container/form/form-design.vue2.js +6 -0
  17. package/dist/es/components/design/views/assemblys/container/tabs/tabs-design.vue2.js +10 -0
  18. package/dist/es/components/design/views/assemblys/container/tools/tools-design.vue2.js +7 -4
  19. package/dist/es/components/design/views/assemblys/data/component/column-config.vue.js +3 -3
  20. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue2.js +1 -1
  21. package/dist/es/components/design/views/assemblys/data/component/table-children-column.vue.js +1 -1
  22. package/dist/es/components/design/views/assemblys/data/table/table-attr-base.vue.js +2 -2
  23. package/dist/es/components/design/views/assemblys/data/table/table-design.vue.js +1 -1
  24. package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js +2 -2
  25. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js +1 -1
  26. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue2.js +50 -35
  27. package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js +1 -1
  28. package/dist/es/components/design/views/assemblys/form/common/data-origin-autoset.vue.js +4 -2
  29. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue.js +1 -1
  30. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue2.js +8 -2
  31. package/dist/es/components/design/views/assemblys/form/common/dataorigin-input-table.vue.js +1 -152
  32. package/dist/es/components/design/views/assemblys/form/common/dataorigin-input-table.vue2.js +152 -1
  33. package/dist/es/components/design/views/assemblys/form/common/verification.vue.js +4 -3
  34. package/dist/es/components/design/views/assemblys/form/custom/custom-attr-base.vue.js +8 -29
  35. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue.js +1 -1
  36. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue2.js +16 -7
  37. package/dist/es/components/design/views/assemblys/object-design.vue.js +15 -0
  38. package/dist/es/components/design/views/assemblys/page/create-workflow-dialog.vue.d.ts +6 -0
  39. package/dist/es/components/design/views/assemblys/page/create-workflow-dialog.vue.js +95 -0
  40. package/dist/es/components/design/views/assemblys/page/create-workflow-dialog.vue2.js +4 -0
  41. package/dist/es/components/design/views/assemblys/page/page-attr-base.vue.js +61 -22
  42. package/dist/es/components/design/views/design/view/components/quick-add-dialog.vue.js +1 -1
  43. package/dist/es/style.css +122 -122
  44. package/package.json +4 -4
  45. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/data-origin.vue2.js +0 -542
  46. package/dist/es/components/design/views/assemblys/chart/statistical-table/component/data-origin.vue3.js +0 -1
@@ -56,7 +56,7 @@ const tableOperateColumnConf = {
56
56
  sortable: false,
57
57
  displayOrder: 3,
58
58
  visible: true,
59
- alignTittle: "center",
59
+ alignTitle: "center",
60
60
  alignContent: "center",
61
61
  listColumnFixed: "right"
62
62
  },
@@ -113,7 +113,7 @@ const tableIndexColumnConf = {
113
113
  sortable: true,
114
114
  visible: true,
115
115
  displayOrder: 1,
116
- alignTittle: "center",
116
+ alignTitle: "center",
117
117
  alignContent: "center"
118
118
  },
119
119
  format: {},
@@ -160,6 +160,26 @@ const tableIndexColumnConf = {
160
160
  tittleClass: ""
161
161
  }
162
162
  };
163
+ const statisticsTableIndexColumnConf = {
164
+ uuid: "",
165
+ name: "",
166
+ props: {
167
+ base: {
168
+ name: "序号",
169
+ prop: "$index",
170
+ sortable: true,
171
+ displayOrder: 1,
172
+ headerAlign: "center",
173
+ align: "center"
174
+ },
175
+ format: {},
176
+ size: {},
177
+ dataOrigin: {
178
+ sortField: [{ name: "", type: "" }]
179
+ }
180
+ },
181
+ style: {}
182
+ };
163
183
  const tableSelectionColumnConf = {
164
184
  uuid: "",
165
185
  name: "",
@@ -171,7 +191,7 @@ const tableSelectionColumnConf = {
171
191
  sortable: true,
172
192
  visible: true,
173
193
  displayOrder: 0,
174
- alignTittle: "center",
194
+ alignTitle: "center",
175
195
  alignContent: "center"
176
196
  },
177
197
  size: {},
@@ -237,7 +257,7 @@ function getTableColumnConf(fieldInfo) {
237
257
  visible: true,
238
258
  displayOrder: fieldInfo ? fieldInfo.displayOrder : 1,
239
259
  sortable: true,
240
- alignTittle: "center",
260
+ alignTitle: "center",
241
261
  alignContent: "center",
242
262
  listColumnFixed: "false"
243
263
  },
@@ -291,14 +311,14 @@ function getStatisticsTableColumn(fieldInfo) {
291
311
  name: fieldInfo ? fieldInfo.alias : "",
292
312
  displayOrder: fieldInfo ? fieldInfo.displayOrder : 1,
293
313
  sortable: true,
294
- alignTittle: "center",
295
- alignContent: "center",
296
- listColumnFixed: "false"
314
+ headerAlign: "center",
315
+ align: "center",
316
+ fixed: false
297
317
  },
298
318
  dataOrigin: {
299
319
  sortField: [{ name: "", type: "" }]
300
320
  },
301
- format: { type: "", icon: "", suffixModule: { staticStates: [] }, jumpPageAdditional: { staticStates: [] } }
321
+ format: {}
302
322
  },
303
323
  style: {}
304
324
  };
@@ -1307,7 +1327,7 @@ const assemblyGroups = [
1307
1327
  modelFields: [],
1308
1328
  props: {
1309
1329
  base: {
1310
- alignTittle: "left",
1330
+ alignTitle: "left",
1311
1331
  alignContent: "left",
1312
1332
  selection: true,
1313
1333
  showIndex: true,
@@ -2848,14 +2868,16 @@ const assemblyGroups = [
2848
2868
  name: "statistical-table",
2849
2869
  label: "统计表格",
2850
2870
  icon: dataTable,
2851
- items: [getTableIndexConf()],
2871
+ items: [getStatisticsTableIndexConf()],
2852
2872
  modelFields: [],
2853
2873
  props: {
2854
2874
  base: {
2855
- alignTittle: "left",
2856
- alignContent: "left",
2875
+ headerAlign: "left",
2876
+ align: "left",
2877
+ fixed: false,
2857
2878
  showIndex: true,
2858
- stripe: true
2879
+ stripe: true,
2880
+ sortable: false
2859
2881
  },
2860
2882
  size: {},
2861
2883
  highOrder: {},
@@ -2993,6 +3015,9 @@ function getTableOperateConf() {
2993
3015
  function getTableIndexConf() {
2994
3016
  return getCopyColumn(tableIndexColumnConf);
2995
3017
  }
3018
+ function getStatisticsTableIndexConf() {
3019
+ return getCopyColumn(statisticsTableIndexColumnConf);
3020
+ }
2996
3021
  function getTableSelectionConf() {
2997
3022
  return getCopyColumn(tableSelectionColumnConf);
2998
3023
  }
@@ -3295,6 +3320,11 @@ function getFormComponentOptions() {
3295
3320
  }
3296
3321
  }
3297
3322
  }
3323
+ function getListComponentOptions() {
3324
+ const options = getFormComponentOptions();
3325
+ options.push({ name: "custom", label: "自定义" });
3326
+ return options;
3327
+ }
3298
3328
  function getComponentEventOptions(componentName) {
3299
3329
  if (componentName && componentName === "page") {
3300
3330
  return pageConf.events;
@@ -3320,8 +3350,10 @@ export {
3320
3350
  getDesignEvents,
3321
3351
  getFormComponentOptions,
3322
3352
  getInitialInformationByName,
3353
+ getListComponentOptions,
3323
3354
  getPageConf,
3324
3355
  getStatisticsTableColumn,
3356
+ getStatisticsTableIndexConf,
3325
3357
  getTableColumnConf,
3326
3358
  getTableIndexConf,
3327
3359
  getTableOperateConf,
@@ -356,6 +356,7 @@ function watchValidate(configure, verification, fieldInfo) {
356
356
  const prop = configure.props.base.prop;
357
357
  if (prop) {
358
358
  if (verification) {
359
+ debugger;
359
360
  if (verification.required) {
360
361
  watchRequiredValidate(configure, fieldInfo);
361
362
  }
@@ -1,5 +1,5 @@
1
1
  export declare function queryWorkflowsRequest(tableName: any, systemCode: any, publishVersion: any): any;
2
- export declare function createWorkflowRequest(tableName: any, pageName: any, systemCode: any, publishVersion: any): any;
2
+ export declare function createWorkflowRequest(tableName: any, systemCode: any, publishVersion: any, defCode: any, defName: any): any;
3
3
  export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any, publishVersion: any): any;
4
4
  export declare function getPublishVersionsByCode(systemCode: any): any;
5
5
  export declare function deleteDesignItem(items: any, sourceItem: any, isShowChildrenTip: any, isDeleteSourceItem: boolean): void;
@@ -12,12 +12,13 @@ function queryWorkflowsRequest(tableName, systemCode, publishVersion) {
12
12
  params
13
13
  );
14
14
  }
15
- function createWorkflowRequest(tableName, pageName, systemCode, publishVersion) {
15
+ function createWorkflowRequest(tableName, systemCode, publishVersion, defCode, defName) {
16
16
  const params = {
17
17
  appCode: systemCode,
18
18
  publishVersion,
19
19
  tableName,
20
- pageName
20
+ defCode,
21
+ defName
21
22
  };
22
23
  return http.post(
23
24
  window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/workflow-definitions/create",
@@ -87,7 +87,7 @@ function getListView(configureCopy, pageDesign, tableConfigureStr) {
87
87
  // 默认排序字段
88
88
  defaultSortField: JSON.stringify(configureCopy.props.dataOrigin.sortField),
89
89
  // 标题显示位置
90
- titleAlign: configureCopy.props.base ? configureCopy.props.base.alignTittle : null,
90
+ titleAlign: configureCopy.props.base ? configureCopy.props.base.alignTitle : null,
91
91
  // 内容显示位置
92
92
  contAlign: configureCopy.props.base ? configureCopy.props.base.alignContent : null,
93
93
  // 显示效果
@@ -173,7 +173,7 @@ function getListColumns(configure, pageDesign) {
173
173
  // 内容显示位置
174
174
  contAlign: item.props.base ? item.props.base.alignContent : null,
175
175
  // 标题显示位置
176
- titleAlign: item.props.base ? item.props.base.alignTittle : null,
176
+ titleAlign: item.props.base ? item.props.base.alignTitle : null,
177
177
  // 国际化key,如果配置了该列则使用该列的key去查询国际化配置,如果没用配置就以“headerName”字段的值为准
178
178
  i18nKey: item.props.base.name
179
179
  /**
@@ -295,6 +295,8 @@ function getControlName(item) {
295
295
  return getOrgTreeControlName(item);
296
296
  case "inputNumber":
297
297
  return "inputNumber";
298
+ case "custom":
299
+ return "custom:" + item.props.base.customComponent;
298
300
  default:
299
301
  return "input";
300
302
  }
@@ -1,4 +1,4 @@
1
- import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createElementBlock, Fragment, renderList, toDisplayString, createTextVNode, withDirectives, vShow } from "vue";
1
+ import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createElementBlock, Fragment, renderList, toDisplayString, createTextVNode, withDirectives, vShow, createCommentVNode } from "vue";
2
2
  import _sfc_main$1 from "../../common/page-permission-select.vue.js";
3
3
  import { usePageContextStore } from "../../../../../../stores/page-store.js";
4
4
  import { queryServiceReturnFields } from "../../../../utils/page-service-util.js";
@@ -138,7 +138,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
138
138
  createElementVNode("div", _hoisted_1, [
139
139
  createVNode(_component_el_form_item, {
140
140
  label: "选择服务",
141
- style: { "margin-top": "4px" }
141
+ class: "amb-design-attr-item"
142
142
  }, {
143
143
  default: withCtx(() => [
144
144
  createVNode(_sfc_main$1, {
@@ -152,7 +152,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
152
152
  }),
153
153
  createVNode(_component_el_form_item, {
154
154
  label: "数据集",
155
- style: { "margin-top": "-10px", "margin-bottom": "-15px" }
155
+ class: "amb-design-attr-item"
156
156
  }, {
157
157
  default: withCtx(() => [
158
158
  createVNode(_component_el_select, {
@@ -193,7 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
193
193
  }),
194
194
  createVNode(_component_el_form_item, {
195
195
  label: "立即查询",
196
- style: { "margin-top": "15px", "margin-bottom": "-15px" }
196
+ class: "amb-design-attr-item"
197
197
  }, {
198
198
  default: withCtx(() => [
199
199
  createVNode(_component_el_switch, {
@@ -205,7 +205,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
205
205
  }),
206
206
  createVNode(_component_el_form_item, {
207
207
  label: "是否导出",
208
- style: { "margin-top": "15px", "margin-bottom": "-15px" }
208
+ class: "amb-design-attr-item"
209
209
  }, {
210
210
  default: withCtx(() => [
211
211
  createVNode(_component_el_switch, {
@@ -215,12 +215,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
215
215
  ]),
216
216
  _: 1
217
217
  }),
218
- createVNode(_component_el_radio_group, {
218
+ __props.chartType == "pie" ? (openBlock(), createBlock(_component_el_radio_group, {
219
+ key: 0,
219
220
  modelValue: __props.configure.props.yaxisSource,
220
221
  "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.yaxisSource = $event)
221
222
  }, {
222
223
  default: withCtx(() => [
223
- withDirectives(createVNode(_component_el_form_item, { style: { "margin-top": "15px", "margin-bottom": "-15px" } }, {
224
+ withDirectives(createVNode(_component_el_form_item, { class: "amb-design-attr-item" }, {
224
225
  label: withCtx(() => [
225
226
  createVNode(_component_el_radio, { value: "variable" }, {
226
227
  default: withCtx(() => [
@@ -322,7 +323,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
322
323
  ])
323
324
  ]),
324
325
  _: 1
325
- }, 8, ["modelValue"])
326
+ }, 8, ["modelValue"])) : createCommentVNode("", true)
326
327
  ])
327
328
  ]),
328
329
  _: 1
@@ -1,7 +1 @@
1
- import _sfc_main from "./data-origin.vue2.js";
2
- import "./data-origin.vue3.js";
3
- import _export_sfc from "../../../../../../../_virtual/_plugin-vue_export-helper.js";
4
- const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7143edf0"]]);
5
- export {
6
- DataOrigin as default
7
- };
1
+
@@ -1,21 +1,25 @@
1
1
  import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode, toDisplayString } from "vue";
2
2
  import { getFormComponentOptions, getStatisticsTableColumn } from "../../../../utils/assemblys-config.js";
3
- import DataOrigin from "./component/data-origin.vue.js";
4
- import _sfc_main$6 from "../../common/common-attr-size.vue.js";
5
- import _sfc_main$2 from "../../form/common/data-linkage.vue.js";
6
- import "@element-plus/icons-vue";
3
+ import "@element-plus/icons";
7
4
  import "agilebuilder-ui/src/utils/request";
5
+ import "@vueuse/core";
6
+ import "@element-plus/icons-vue";
8
7
  import { getUuidv4 } from "../../../../utils/common-util.js";
9
8
  import "../../../../../../stores/page-store.js";
10
9
  import "../../../../../../stores/table-store.js";
11
10
  import "../../../../../../stores/statistics-table-store.js";
12
11
  import "../../common/common-variable-bind.vue3.js";
12
+ import "element-plus";
13
+ import { getCustomFuncs } from "../../../../utils/page-event-util.js";
14
+ import "./component/data-origin.vue.js";
15
+ import _sfc_main$2 from "../common/common-attr-data.vue.js";
16
+ import _sfc_main$7 from "../../common/common-attr-size.vue.js";
17
+ import _sfc_main$3 from "../../form/common/data-linkage.vue.js";
13
18
  import { addColumnToGroupHeaders, getColumnsWithGroupHeader } from "../../../../utils/data-table-util.js";
14
19
  import _sfc_main$1 from "../../common/common-function-code.vue.js";
15
- import _sfc_main$3 from "../../data/component/formatting-icon-label.vue.js";
16
- import _sfc_main$4 from "./component/style-table.vue.js";
17
- import _sfc_main$5 from "./component/link-table.vue.js";
18
- import { getCustomFuncs } from "../../../../utils/page-event-util.js";
20
+ import _sfc_main$4 from "../../data/component/formatting-icon-label.vue.js";
21
+ import _sfc_main$5 from "./component/style-table.vue.js";
22
+ import _sfc_main$6 from "./component/link-table.vue.js";
19
23
  import eventBus from "../../../../utils/eventBus.js";
20
24
  const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
21
25
  const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -36,20 +40,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
36
40
  },
37
41
  setup(__props) {
38
42
  const props = __props;
39
- const openCollapseItems = ref([
40
- "base",
41
- "appearance",
42
- "dataOrigin",
43
- "linkage",
44
- "attrSize"
45
- ]);
43
+ const openCollapseItems = ref(["base", "appearance", "dataOrigin", "linkage", "attrSize", "columnModel", "dataSet"]);
46
44
  if (!props.configure.items) {
47
- props.configure.items = [{
48
- uuid: getUuidv4(),
49
- field: "",
50
- alias: "",
51
- format: {}
52
- }];
45
+ props.configure.items = [
46
+ {
47
+ uuid: getUuidv4(),
48
+ field: "",
49
+ alias: "",
50
+ format: {}
51
+ }
52
+ ];
53
53
  }
54
54
  function columnStyleChange(data, index) {
55
55
  props.configure.items[index].style = data;
@@ -63,15 +63,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
63
63
  displayOrder: index + 2
64
64
  };
65
65
  let newObj = getStatisticsTableColumn(fieldInfo);
66
- console.log("%c描述-154519", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", newObj.runtime);
67
- console.log("%c描述-154528", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", newObj);
68
66
  props.configure.items.splice(index + 1, 0, newObj);
69
67
  if (props.configure.props.base.isEnableGroupHeader) {
70
- addColumnToGroupHeaders(
71
- props.configure.items[columnDataIndex.value + 1],
72
- null,
73
- props.configure.props.groupHeaders
74
- );
68
+ addColumnToGroupHeaders(props.configure.items[columnDataIndex.value + 1], null, props.configure.props.groupHeaders);
75
69
  listColumns.value = getColumnsWithGroupHeader(props.configure);
76
70
  eventBus.$emit("synchroGroupHeadersData");
77
71
  }
@@ -121,6 +115,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
121
115
  }
122
116
  sourceFields.value = newFields;
123
117
  }
118
+ function columnItemChange(value, row) {
119
+ row.props.base.prop = value;
120
+ row.props.base.name = sourceFields.value.find((item) => item.value === value).label;
121
+ }
124
122
  watch(
125
123
  props.configure,
126
124
  () => {
@@ -275,18 +273,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
275
273
  ]),
276
274
  _: 1
277
275
  }),
278
- createVNode(DataOrigin, {
279
- title: "数据",
280
- pageDesign: __props.pageDesign,
281
- configure: __props.configure,
282
- remote: false
283
- }, null, 8, ["pageDesign", "configure"]),
284
- createVNode(_sfc_main$2, {
276
+ createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]),
277
+ createVNode(_sfc_main$3, {
285
278
  configureProps: __props.configure.props
286
279
  }, null, 8, ["configureProps"]),
287
280
  createVNode(_component_el_collapse_item, {
288
281
  title: "列模型",
289
- name: "base",
282
+ name: "columnModel",
290
283
  class: "amb-design-attr-group-header"
291
284
  }, {
292
285
  default: withCtx(() => [
@@ -474,7 +467,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
474
467
  ]),
475
468
  _: 2
476
469
  }, 1024)) : createCommentVNode("", true),
477
- props2.row.props.format && props2.row.props.format.type === "icon" ? (openBlock(), createBlock(_sfc_main$3, {
470
+ props2.row.props.format && props2.row.props.format.type === "icon" ? (openBlock(), createBlock(_sfc_main$4, {
478
471
  key: 7,
479
472
  setting: props2.row.props.format
480
473
  }, null, 8, ["setting"])) : createCommentVNode("", true),
@@ -684,31 +677,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
684
677
  ]),
685
678
  _: 2
686
679
  }, 1024)) : createCommentVNode("", true),
687
- createVNode(_component_el_divider, null, {
688
- default: withCtx(() => [
689
- createTextVNode("内容样式")
690
- ]),
691
- _: 1
692
- }),
693
- createVNode(_sfc_main$4, {
694
- configure: __props.configure,
695
- showCondition: true,
696
- paramTypes: ["data", "task", "page", "request", "row"],
697
- data: props2.row.props.Contentstyle,
698
- onDataChange: (data) => columnStyleChange(data, props2.$index)
699
- }, null, 8, ["configure", "data", "onDataChange"]),
700
- createVNode(_component_el_divider, null, {
701
- default: withCtx(() => [
702
- createTextVNode("链接设置")
703
- ]),
704
- _: 1
705
- }),
706
- createVNode(_sfc_main$5, {
707
- pageDesign: __props.pageDesign,
708
- paramTypes: ["data", "task", "page", "request", "row"],
709
- data: props2.row.props.link,
710
- onDataChange: (data) => linkChange(data, props2.$index)
711
- }, null, 8, ["pageDesign", "data", "onDataChange"]),
712
680
  props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createBlock(_component_el_form_item, {
713
681
  key: 16,
714
682
  label: "自定义颜色",
@@ -739,14 +707,35 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
739
707
  ]),
740
708
  _: 2
741
709
  }, 1024)) : createCommentVNode("", true),
710
+ createVNode(_component_el_divider, null, {
711
+ default: withCtx(() => [
712
+ createTextVNode("列属性")
713
+ ]),
714
+ _: 1
715
+ }),
716
+ createVNode(_component_el_form_item, {
717
+ label: "列宽",
718
+ class: "amb-design-attr-item"
719
+ }, {
720
+ default: withCtx(() => [
721
+ createVNode(_component_el_input_number, {
722
+ modelValue: props2.row.props.base.width,
723
+ "onUpdate:modelValue": ($event) => props2.row.props.base.width = $event,
724
+ class: "mx-4",
725
+ min: 0,
726
+ "controls-position": "right"
727
+ }, null, 8, ["modelValue", "onUpdate:modelValue"])
728
+ ]),
729
+ _: 2
730
+ }, 1024),
742
731
  createVNode(_component_el_form_item, {
743
732
  label: "标题对齐",
744
733
  class: "amb-design-attr-item"
745
734
  }, {
746
735
  default: withCtx(() => [
747
736
  createVNode(_component_el_radio_group, {
748
- modelValue: props2.row.props.base.alignTittle,
749
- "onUpdate:modelValue": ($event) => props2.row.props.base.alignTittle = $event,
737
+ modelValue: props2.row.props.base.headerAlign,
738
+ "onUpdate:modelValue": ($event) => props2.row.props.base.headerAlign = $event,
750
739
  class: "ml-4"
751
740
  }, {
752
741
  default: withCtx(() => [
@@ -780,8 +769,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
780
769
  }, {
781
770
  default: withCtx(() => [
782
771
  createVNode(_component_el_radio_group, {
783
- modelValue: props2.row.props.base.alignContent,
784
- "onUpdate:modelValue": ($event) => props2.row.props.base.alignContent = $event,
772
+ modelValue: props2.row.props.base.align,
773
+ "onUpdate:modelValue": ($event) => props2.row.props.base.align = $event,
785
774
  class: "ml-4"
786
775
  }, {
787
776
  default: withCtx(() => [
@@ -815,12 +804,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
815
804
  }, {
816
805
  default: withCtx(() => [
817
806
  createVNode(_component_el_radio_group, {
818
- modelValue: props2.row.props.base.listColumnFixed,
819
- "onUpdate:modelValue": ($event) => props2.row.props.base.listColumnFixed = $event,
807
+ modelValue: props2.row.props.base.fixed,
808
+ "onUpdate:modelValue": ($event) => props2.row.props.base.fixed = $event,
820
809
  class: "ml-4"
821
810
  }, {
822
811
  default: withCtx(() => [
823
- createVNode(_component_el_radio, { value: "false" }, {
812
+ createVNode(_component_el_radio, { value: false }, {
824
813
  default: withCtx(() => [
825
814
  createTextVNode("否")
826
815
  ]),
@@ -981,7 +970,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
981
970
  }, 1032, ["modelValue", "onUpdate:modelValue"])
982
971
  ]),
983
972
  _: 2
984
- }, 1024)) : createCommentVNode("", true)
973
+ }, 1024)) : createCommentVNode("", true),
974
+ createVNode(_component_el_divider, null, {
975
+ default: withCtx(() => [
976
+ createTextVNode("内容样式")
977
+ ]),
978
+ _: 1
979
+ }),
980
+ createVNode(_sfc_main$5, {
981
+ configure: __props.configure,
982
+ showCondition: true,
983
+ paramTypes: ["data", "task", "page", "request", "row"],
984
+ data: props2.row.props.Contentstyle,
985
+ onDataChange: (data) => columnStyleChange(data, props2.$index)
986
+ }, null, 8, ["configure", "data", "onDataChange"]),
987
+ createVNode(_component_el_divider, null, {
988
+ default: withCtx(() => [
989
+ createTextVNode("链接设置")
990
+ ]),
991
+ _: 1
992
+ }),
993
+ createVNode(_sfc_main$6, {
994
+ pageDesign: __props.pageDesign,
995
+ paramTypes: ["data", "task", "page", "request", "row"],
996
+ data: props2.row.props.link,
997
+ onDataChange: (data) => linkChange(data, props2.$index)
998
+ }, null, 8, ["pageDesign", "data", "onDataChange"])
985
999
  ]),
986
1000
  _: 1
987
1001
  }),
@@ -993,7 +1007,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
993
1007
  createVNode(_component_el_select, {
994
1008
  modelValue: scope.row.props.base.prop,
995
1009
  "onUpdate:modelValue": ($event) => scope.row.props.base.prop = $event,
996
- placeholder: "Select"
1010
+ placeholder: "Select",
1011
+ onChange: ($event) => columnItemChange($event, scope.row)
997
1012
  }, {
998
1013
  default: withCtx(() => [
999
1014
  (openBlock(true), createElementBlock(Fragment, null, renderList(sourceFields.value, (item) => {
@@ -1011,7 +1026,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
1011
1026
  }), 128))
1012
1027
  ]),
1013
1028
  _: 2
1014
- }, 1032, ["modelValue", "onUpdate:modelValue"])
1029
+ }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"])
1015
1030
  ]),
1016
1031
  _: 1
1017
1032
  }),
@@ -1037,7 +1052,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
1037
1052
  default: withCtx((scope) => [
1038
1053
  createVNode(_component_el_icon, {
1039
1054
  size: "14",
1040
- style: { "color": "#5893EF", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
1055
+ style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
1041
1056
  onClick: ($event) => addData(scope.row, scope.$index)
1042
1057
  }, {
1043
1058
  default: withCtx(() => [
@@ -1047,7 +1062,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
1047
1062
  }, 1032, ["onClick"]),
1048
1063
  createVNode(_component_el_icon, {
1049
1064
  size: "14",
1050
- style: { "color": "#5893EF", "cursor": "pointer" },
1065
+ style: { "color": "#5893ef", "cursor": "pointer" },
1051
1066
  onClick: ($event) => deleteData(scope.row, scope.$index)
1052
1067
  }, {
1053
1068
  default: withCtx(() => [
@@ -1067,8 +1082,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
1067
1082
  }, {
1068
1083
  default: withCtx(() => [
1069
1084
  createVNode(_component_el_select, {
1070
- modelValue: __props.configure.props.base.modelCustom,
1071
- "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.modelCustom = $event),
1085
+ modelValue: __props.configure.props.modelCustom,
1086
+ "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.modelCustom = $event),
1072
1087
  clearable: ""
1073
1088
  }, {
1074
1089
  default: withCtx(() => [
@@ -1158,7 +1173,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
1158
1173
  ]),
1159
1174
  _: 1
1160
1175
  }),
1161
- createVNode(_sfc_main$6, {
1176
+ createVNode(_sfc_main$7, {
1162
1177
  size: __props.configure.props.size,
1163
1178
  showMaxHeight: true,
1164
1179
  showCalcHeight: true
@@ -2,7 +2,7 @@ import _sfc_main from "./statisticalTable-design.vue2.js";
2
2
  import "./statisticalTable-design.vue3.js";
3
3
  import "./statisticalTable-design.vue4.js";
4
4
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
5
- const statisticalTableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ad6b7f2d"]]);
5
+ const statisticalTableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a74e7ce8"]]);
6
6
  export {
7
7
  statisticalTableDesign as default
8
8
  };
@@ -52,11 +52,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
52
52
  if (defineProps["base"]["layout"]) {
53
53
  tempProps["layout"] = defineProps["base"]["layout"].join(",");
54
54
  }
55
- if (defineProps["base"]["alignTittle"]) {
56
- tempProps["alignTittle"] = defineProps["base"]["alignTittle"];
55
+ if (defineProps["base"]["headerAlign"]) {
56
+ tempProps["headerAlign"] = defineProps["base"]["headerAlign"];
57
57
  }
58
- if (defineProps["base"]["alignContent"]) {
59
- tempProps["alignContent"] = defineProps["base"]["alignContent"];
58
+ if (defineProps["base"]["align"]) {
59
+ tempProps["align"] = defineProps["base"]["align"];
60
60
  }
61
61
  if (tempProps != {}) {
62
62
  for (const tempPropsKey in tempProps) {
@@ -97,15 +97,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
97
97
  caculateComponentProps(props.configure, designProperty);
98
98
  getRestsParameter();
99
99
  props.configure.runtime.props = designProperty.value;
100
+ props.configure.runtime.props.modelCustom = props.configure.props.modelCustom;
100
101
  updateDataConfig();
101
102
  },
102
103
  { immediate: true }
103
104
  );
104
- watch(props.configure.items, (newVal) => {
105
- statisticsTableStore.addFieldList(newVal);
106
- props.configure.runtime.items = props.configure.items;
107
- console.log("%c描述-152233", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.items);
108
- }, { immediate: true });
105
+ watch(
106
+ props.configure.items,
107
+ (newVal) => {
108
+ statisticsTableStore.addFieldList(newVal);
109
+ props.configure.runtime.items = props.configure.items;
110
+ },
111
+ { immediate: true }
112
+ );
109
113
  watch(
110
114
  () => props.configure.props.isChangeGroupHeader,
111
115
  () => {