super-page-designer 2.0.41-beta2 → 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 (126) hide show
  1. package/dist/es/assets/design-attr.css.js +1 -0
  2. package/dist/es/assets/fonts/iconfont.css.js +1 -0
  3. package/dist/es/components/design/utils/assemblys-config.js +190 -116
  4. package/dist/es/components/design/utils/chart-design-util.js +11 -10
  5. package/dist/es/components/design/utils/form-design-util.js +2 -1
  6. package/dist/es/components/design/views/assemblys/button/button/button-attr-advanced.vue.js +4 -4
  7. package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js +2 -2
  8. package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue.js +1 -1
  9. package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue3.js +1 -0
  10. package/dist/es/components/design/views/assemblys/button/component/condition-dialog.vue.js +16 -11
  11. package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue.js +1 -1
  12. package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue3.js +1 -0
  13. package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue.js +1 -1
  14. package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue3.js +1 -0
  15. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue.js +1 -1
  16. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue3.js +1 -0
  17. package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr-base.vue.js +36 -8
  18. package/dist/es/components/design/views/assemblys/chart/common/common-attr-clickset.vue.js +244 -0
  19. package/dist/es/components/design/views/assemblys/chart/common/common-attr-clickset.vue2.js +4 -0
  20. package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js +2 -27
  21. package/dist/es/components/design/views/assemblys/chart/gauge/series/styles/style-axislabel.vue.js +2 -1
  22. package/dist/es/components/design/views/assemblys/chart/pie/pie-attr-base.vue.js +36 -8
  23. package/dist/es/components/design/views/assemblys/chart/pie/pie-attr.vue2.js +11 -5
  24. package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js +2 -1
  25. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js +2 -2
  26. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js +1 -688
  27. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue3.js +692 -0
  28. package/dist/es/components/design/views/assemblys/common/page-permission-select.vue.js +9 -5
  29. package/dist/es/components/design/views/assemblys/common/state-button.vue.js +1 -1
  30. package/dist/es/components/design/views/assemblys/common/state-button.vue3.js +1 -0
  31. package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue.js +1 -1
  32. package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue3.js +1 -0
  33. package/dist/es/components/design/views/assemblys/data/component/column-config.vue.js +371 -168
  34. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue.js +1 -1
  35. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue3.js +1 -0
  36. package/dist/es/components/design/views/assemblys/data/component/configuration-value.vue.js +1 -1
  37. package/dist/es/components/design/views/assemblys/data/component/data-origin-tree.vue.js +1 -1
  38. package/dist/es/components/design/views/assemblys/data/component/data-origin-tree.vue3.js +1 -0
  39. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue.js +2 -2
  40. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue2.js +59 -86
  41. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue3.js +1 -0
  42. package/dist/es/components/design/views/assemblys/data/component/querySetting.vue.js +1 -1
  43. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue.js +1 -1
  44. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue3.js +1 -0
  45. package/dist/es/components/design/views/assemblys/data/component/variate-select.vue.js +2 -1
  46. package/dist/es/components/design/views/assemblys/data/table/table-attr-base.vue.js +6 -117
  47. package/dist/es/components/design/views/assemblys/data/table/table-attr.vue.js +1 -1
  48. package/dist/es/components/design/views/assemblys/data/table/table-attr.vue3.js +1 -0
  49. package/dist/es/components/design/views/assemblys/data/table/table-design.vue.js +3 -3
  50. package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js +28 -50
  51. package/dist/es/components/design/views/assemblys/data/table/table-design.vue3.js +1 -0
  52. package/dist/es/components/design/views/assemblys/data/table/table-design.vue4.js +1 -0
  53. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js +3 -2
  54. package/dist/es/components/design/views/assemblys/data/tree/tree-attr-base.vue.js +5 -2
  55. package/dist/es/components/design/views/assemblys/data/tree/tree-attr.vue.js +1 -1
  56. package/dist/es/components/design/views/assemblys/data/tree/tree-attr.vue3.js +1 -0
  57. package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr.vue.js +1 -1
  58. package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr.vue3.js +1 -0
  59. package/dist/es/components/design/views/assemblys/form/common/attr-event.vue.js +1 -1
  60. package/dist/es/components/design/views/assemblys/form/common/attr-event.vue3.js +1 -0
  61. package/dist/es/components/design/views/assemblys/form/common/attr-header.vue.js +1 -1
  62. package/dist/es/components/design/views/assemblys/form/common/attr-header.vue3.js +1 -0
  63. package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js +1 -1
  64. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue.js +1 -1
  65. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue3.js +1 -0
  66. package/dist/es/components/design/views/assemblys/form/common/dimension-input.vue.js +1 -0
  67. package/dist/es/components/design/views/assemblys/form/common/icon-set-dialog.vue.js +1 -1
  68. package/dist/es/components/design/views/assemblys/form/common/icon-set-dialog.vue3.js +1 -0
  69. package/dist/es/components/design/views/assemblys/form/common/suffixmodule.vue.js +155 -35
  70. package/dist/es/components/design/views/assemblys/form/custom/custom-attr-base.vue.js +1 -1
  71. package/dist/es/components/design/views/assemblys/form/custom/custom-attr.vue.js +1 -1
  72. package/dist/es/components/design/views/assemblys/form/custom/custom-attr.vue3.js +1 -0
  73. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue.js +1 -1
  74. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue3.js +1 -0
  75. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr.vue.js +1 -1
  76. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr.vue3.js +1 -0
  77. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr.vue.js +1 -1
  78. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr.vue3.js +1 -0
  79. package/dist/es/components/design/views/assemblys/form/divider/divider-attr.vue.js +1 -1
  80. package/dist/es/components/design/views/assemblys/form/divider/divider-attr.vue3.js +1 -0
  81. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue.js +1 -1
  82. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue3.js +1 -0
  83. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue.js +1 -1
  84. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue3.js +1 -0
  85. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue.js +1 -1
  86. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue3.js +1 -0
  87. package/dist/es/components/design/views/assemblys/form/label/label-attr.vue.js +1 -1
  88. package/dist/es/components/design/views/assemblys/form/label/label-attr.vue3.js +1 -0
  89. package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue.js +1 -1
  90. package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue3.js +1 -0
  91. package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue.js +1 -1
  92. package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue3.js +1 -0
  93. package/dist/es/components/design/views/assemblys/form/select/select-attr.vue.js +1 -1
  94. package/dist/es/components/design/views/assemblys/form/select/select-attr.vue3.js +1 -0
  95. package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue.js +1 -1
  96. package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue3.js +1 -0
  97. package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue.js +1 -1
  98. package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue3.js +1 -0
  99. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr-base.vue.js +13 -42
  100. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue.js +1 -1
  101. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue3.js +1 -0
  102. package/dist/es/components/design/views/assemblys/form/textarea/textarea-design.vue2.js +1 -2
  103. package/dist/es/components/design/views/assemblys/object-design.vue.js +5 -4
  104. package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.d.ts +9 -0
  105. package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.js +51 -33
  106. package/dist/es/components/design/views/assemblys/page/page-attr-advanced.vue.js +6 -5
  107. package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.js +1 -1
  108. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr-base.vue.js +1 -1
  109. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue.js +1 -1
  110. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue3.js +1 -0
  111. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr-base.vue.js +1 -1
  112. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue.js +1 -1
  113. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue3.js +1 -0
  114. package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue.js +1 -1
  115. package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue3.js +1 -0
  116. package/dist/es/components/design/views/design/page-design.vue.js +4 -2
  117. package/dist/es/components/design/views/design/page-event/config.vue.js +1 -1
  118. package/dist/es/components/design/views/design/page-event/config.vue2.js +1 -0
  119. package/dist/es/components/design/views/design/page-event/config.vue3.js +2 -1
  120. package/dist/es/components/design/views/design/view/page-switch.vue.js +1 -1
  121. package/dist/es/components/design/views/design/view/page-switch.vue3.js +1 -0
  122. package/dist/es/components/design/views/design/view/view-design-display.vue.js +1 -1
  123. package/dist/es/index.js +2 -2
  124. package/dist/es/stores/page-store.js +2 -1
  125. package/dist/es/style.css +214 -214
  126. package/package.json +5 -5
@@ -0,0 +1 @@
1
+
@@ -55,8 +55,123 @@ const tableOperateColumnConf = {
55
55
  prop: "operation",
56
56
  columnWidth: 150,
57
57
  sortable: true,
58
+ displayOrder: 3,
58
59
  visible: true,
59
60
  alignTittle: "center",
61
+ alignContent: "center",
62
+ listColumnFixed: "right"
63
+ },
64
+ size: {},
65
+ editLine: {},
66
+ scan: {},
67
+ preSuffix: {},
68
+ verification: {},
69
+ dataOrigin: {
70
+ sortField: [{ name: "", type: "" }],
71
+ staticState: [{ label: "选项1", vaule: 1 }],
72
+ displayQuantity: 20
73
+ },
74
+ defaultValue: {},
75
+ inParameter: {},
76
+ title: {},
77
+ definition: {},
78
+ uploadConfig: {},
79
+ singleWidth: {},
80
+ suffixModule: {},
81
+ querySetting: {},
82
+ formatting: {
83
+ type: "",
84
+ suffixModule: {
85
+ jumpPageAdditional: [],
86
+ icon: ""
87
+ }
88
+ }
89
+ },
90
+ events: [
91
+ { name: "show", label: "列表显示", tip: "列表显示回调方法" },
92
+ { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
93
+ ],
94
+ style: {
95
+ titleFont: {},
96
+ contentFont: {},
97
+ width: {},
98
+ background: {},
99
+ conentPadding: {},
100
+ tittlePadding: {},
101
+ border: {},
102
+ shadow: {},
103
+ tittleClass: ""
104
+ }
105
+ };
106
+ const tableIndexColumnConf = {
107
+ uuid: getUuidv4(),
108
+ name: "",
109
+ props: {
110
+ base: {
111
+ name: "序号",
112
+ prop: "$index",
113
+ columnWidth: 80,
114
+ sortable: true,
115
+ visible: true,
116
+ displayOrder: 1,
117
+ alignTittle: "center",
118
+ alignContent: "center"
119
+ },
120
+ size: {},
121
+ editLine: {},
122
+ scan: {},
123
+ preSuffix: {},
124
+ verification: {},
125
+ dataOrigin: {
126
+ sortField: [{ name: "", type: "" }],
127
+ staticState: [{ label: "选项1", vaule: 1 }],
128
+ displayQuantity: 20
129
+ },
130
+ defaultValue: {},
131
+ inParameter: {},
132
+ title: {},
133
+ definition: {},
134
+ uploadConfig: {},
135
+ singleWidth: {},
136
+ suffixModule: {},
137
+ querySetting: {},
138
+ formatting: {
139
+ type: "",
140
+ suffixModule: {
141
+ jumpPageAdditional: [],
142
+ icon: ""
143
+ }
144
+ }
145
+ },
146
+ events: [
147
+ { name: "show", label: "列表显示", tip: "列表显示回调方法" },
148
+ { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
149
+ ],
150
+ style: {
151
+ titleFont: {},
152
+ contentFont: {},
153
+ width: {},
154
+ background: {},
155
+ tableCell: [{ type: "", model: "" }],
156
+ conentPadding: {},
157
+ tittlePadding: {},
158
+ border: {},
159
+ shadow: {},
160
+ tittleClass: ""
161
+ }
162
+ };
163
+ const tableSelectionColumnConf = {
164
+ uuid: getUuidv4(),
165
+ name: "",
166
+ props: {
167
+ base: {
168
+ name: "复选框组件",
169
+ prop: "$selection",
170
+ columnWidth: 100,
171
+ sortable: true,
172
+ visible: true,
173
+ displayOrder: 0,
174
+ alignTittle: "center",
60
175
  alignContent: "center"
61
176
  },
62
177
  size: {},
@@ -101,6 +216,64 @@ const tableOperateColumnConf = {
101
216
  tittleClass: ""
102
217
  }
103
218
  };
219
+ function getTableColumnConf(fieldInfo) {
220
+ return {
221
+ uuid: getUuidv4(),
222
+ isTable: true,
223
+ // 是否是表格组件
224
+ name: "",
225
+ edit: fieldInfo ? fieldInfo.edit : false,
226
+ dataType: fieldInfo ? fieldInfo.dataType : "",
227
+ props: {
228
+ base: {
229
+ prop: fieldInfo ? fieldInfo.dbColumnName : "",
230
+ name: fieldInfo ? fieldInfo.alias : "",
231
+ tittleShow: false,
232
+ visible: true,
233
+ displayOrder: fieldInfo ? fieldInfo.displayOrder : 1,
234
+ sortable: true,
235
+ alignTittle: "center",
236
+ alignContent: "center"
237
+ },
238
+ size: {},
239
+ editLine: { plugType: "" },
240
+ scan: {},
241
+ preSuffix: {},
242
+ verification: {},
243
+ dataOrigin: {
244
+ sortField: [{ name: "", type: "" }],
245
+ staticState: [{ label: "选项1", vaule: 1 }],
246
+ displayQuantity: 20
247
+ },
248
+ defaultValue: {},
249
+ inParameter: {},
250
+ title: {},
251
+ definition: {},
252
+ uploadConfig: {},
253
+ singleWidth: {},
254
+ suffixModule: {},
255
+ querySetting: {},
256
+ orgFields: [{ type: "", model: "" }],
257
+ format: { type: "", icon: "", suffixModule: { staticStates: [] }, jumpPageAdditional: { staticStates: [] } }
258
+ },
259
+ events: [
260
+ { name: "setValue", label: "弹框赋值回调", tip: "格式化配置超链接赋值回调" },
261
+ { name: "closePopup", label: "关闭弹框回调", tip: "格式化配置超链接关闭弹框回调" }
262
+ ],
263
+ style: {
264
+ titleFont: {},
265
+ contentFont: {},
266
+ width: {},
267
+ background: {},
268
+ tableCell: [{ value: "", label: "" }],
269
+ conentPadding: {},
270
+ tittlePadding: {},
271
+ border: {},
272
+ shadow: {},
273
+ tittleClass: ""
274
+ }
275
+ };
276
+ }
104
277
  const assemblyGroups = [{
105
278
  name: "container",
106
279
  label: "容器",
@@ -1062,121 +1235,8 @@ const assemblyGroups = [{
1062
1235
  }
1063
1236
  ],
1064
1237
  items: [
1065
- {
1066
- uuid: getUuidv4(),
1067
- name: "",
1068
- props: {
1069
- base: {
1070
- name: "复选框组件",
1071
- prop: "$selection",
1072
- tittleShow: true,
1073
- columnWidth: 100,
1074
- visible: true,
1075
- sortable: true,
1076
- displayOrder: 0,
1077
- alignTittle: "center",
1078
- alignContent: "center"
1079
- },
1080
- size: {},
1081
- editLine: {},
1082
- scan: {},
1083
- preSuffix: {},
1084
- verification: {},
1085
- dataOrigin: {
1086
- sortField: [{ name: "", type: "" }],
1087
- staticState: [{ label: "选项1", vaule: 1 }],
1088
- displayQuantity: 20
1089
- },
1090
- defaultValue: {},
1091
- inParameter: {},
1092
- title: {},
1093
- definition: {},
1094
- uploadConfig: {},
1095
- singleWidth: {},
1096
- suffixModule: {},
1097
- querySetting: {},
1098
- formatting: {
1099
- type: "",
1100
- suffixModule: {
1101
- jumpPageAdditional: [],
1102
- icon: ""
1103
- }
1104
- }
1105
- },
1106
- events: [
1107
- { name: "show", label: "列表显示", tip: "列表显示回调方法" },
1108
- { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
1109
- ],
1110
- style: {
1111
- titleFont: {},
1112
- contentFont: {},
1113
- width: {},
1114
- background: {},
1115
- conentPadding: {},
1116
- tittlePadding: {},
1117
- border: {},
1118
- shadow: {},
1119
- tittleClass: ""
1120
- }
1121
- },
1122
- {
1123
- uuid: getUuidv4(),
1124
- name: "",
1125
- props: {
1126
- base: {
1127
- name: "序号",
1128
- prop: "$index",
1129
- tittleShow: true,
1130
- columnWidth: 80,
1131
- visible: true,
1132
- sortable: true,
1133
- displayOrder: 1,
1134
- alignTittle: "center",
1135
- alignContent: "center"
1136
- },
1137
- size: {},
1138
- editLine: {},
1139
- scan: {},
1140
- preSuffix: {},
1141
- verification: {},
1142
- dataOrigin: {
1143
- sortField: [{ name: "", type: "" }],
1144
- staticState: [{ label: "选项1", vaule: 1 }],
1145
- displayQuantity: 20
1146
- },
1147
- defaultValue: {},
1148
- inParameter: {},
1149
- title: {},
1150
- definition: {},
1151
- uploadConfig: {},
1152
- singleWidth: {},
1153
- suffixModule: {},
1154
- querySetting: {},
1155
- formatting: {
1156
- type: "",
1157
- suffixModule: {
1158
- jumpPageAdditional: [],
1159
- icon: ""
1160
- }
1161
- }
1162
- },
1163
- events: [
1164
- { name: "show", label: "列表显示", tip: "列表显示回调方法" },
1165
- { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
1166
- ],
1167
- style: {
1168
- titleFont: {},
1169
- contentFont: {},
1170
- width: {},
1171
- background: {},
1172
- tableCell: [{ type: "", model: "" }],
1173
- conentPadding: {},
1174
- tittlePadding: {},
1175
- border: {},
1176
- shadow: {},
1177
- tittleClass: ""
1178
- }
1179
- },
1238
+ tableSelectionColumnConf,
1239
+ tableIndexColumnConf,
1180
1240
  tableOperateColumnConf
1181
1241
  ],
1182
1242
  modelFields: [],
@@ -2377,6 +2437,16 @@ function getTableOperateConf() {
2377
2437
  conf.uuid = getUuidv4();
2378
2438
  return conf;
2379
2439
  }
2440
+ function getTableIndexConf() {
2441
+ const conf = deepCopy(tableIndexColumnConf);
2442
+ conf.uuid = getUuidv4();
2443
+ return conf;
2444
+ }
2445
+ function getTableSelectionConf() {
2446
+ const conf = deepCopy(tableSelectionColumnConf);
2447
+ conf.uuid = getUuidv4();
2448
+ return conf;
2449
+ }
2380
2450
  const standardButtonOperations = [
2381
2451
  {
2382
2452
  label: "表单标准功能",
@@ -2543,7 +2613,8 @@ function getDesignComponentByName(name) {
2543
2613
  return null;
2544
2614
  }
2545
2615
  function getDesignEvents(name) {
2546
- if (!name) return [];
2616
+ if (!name)
2617
+ return [];
2547
2618
  for (let i = 0; i < assemblyGroups.length; i++) {
2548
2619
  let items = assemblyGroups[i].items;
2549
2620
  for (let j = 0; j < items.length; j++) {
@@ -2622,6 +2693,9 @@ export {
2622
2693
  getDesignEvents,
2623
2694
  getFormComponentOptions,
2624
2695
  getPageConf,
2696
+ getTableColumnConf,
2697
+ getTableIndexConf,
2625
2698
  getTableOperateConf,
2699
+ getTableSelectionConf,
2626
2700
  standardButtonOperations
2627
2701
  };
@@ -142,7 +142,8 @@ function generateChartOption(configure, chartOption) {
142
142
  const isGauge = configure.name == "chart-gauge";
143
143
  const isRadar = configure.name == "chart-radar";
144
144
  const isScatter = configure.name == "chart-scatter";
145
- if (thisProps.title) ;
145
+ if (thisProps.title)
146
+ ;
146
147
  if (thisProps.subTitle) {
147
148
  tempOption.title[0].subtext = thisProps.subTitle;
148
149
  if (thisStyle.subtitleTextAlign) {
@@ -489,16 +490,16 @@ function generateSeriesJson(serieConfigure) {
489
490
  label: {},
490
491
  itemStyle: {},
491
492
  lineStyle: {},
492
- emphasis: {
493
- disabled: true,
494
- itemStyle: {
495
- color: "#E3E8C0",
496
- borderWidth: 1,
497
- borderType: "dashed",
498
- borderColor: "#878773"
499
- }
500
- }
493
+ emphasis: {}
501
494
  };
495
+ if (serieConfigure.type === "bar") {
496
+ tempSerie.emphasis.itemStyle = {
497
+ color: "#E3E8C0",
498
+ borderWidth: 1,
499
+ borderType: "dashed",
500
+ borderColor: "#878773"
501
+ };
502
+ }
502
503
  if (itemStyle.enableLabel != void 0) {
503
504
  tempSerie.label.show = itemStyle.enableLabel;
504
505
  if (itemStyle.labelPosition) {
@@ -227,7 +227,8 @@ function caculateComponentProps(configure, property) {
227
227
  }
228
228
  const optionConf = getComponentOptionConfigs(configure, pageDesign);
229
229
  if (optionConf) {
230
- if (dataOrigin) pageDesign.initOptionConfigs.push(optionConf);
230
+ if (dataOrigin)
231
+ pageDesign.initOptionConfigs.push(optionConf);
231
232
  tempProps["optionconfigInfo"] = optionConf;
232
233
  if (optionConf.props && optionConf.props.monitorFields) {
233
234
  for (let fieldName of optionConf.props.monitorFields) {
@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
22
22
  setup(__props) {
23
23
  const props = __props;
24
24
  const openCollapseItems = ref(["base"]);
25
- const attributeMap = ref([
25
+ ref([
26
26
  {
27
27
  dbColumnName: "FIRST_TASK_ID",
28
28
  label: "该流程的第一个任务的id",
@@ -42,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
42
42
  value: "AUDIT_REPORT_NO"
43
43
  }
44
44
  ]);
45
- const fieldMap = ref({
45
+ ref({
46
46
  FIRST_TASK_ID: {
47
47
  dbColumnName: "FIRST_TASK_ID",
48
48
  label: "该流程的第一个任务的id",
@@ -279,8 +279,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
279
279
  combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
280
280
  key: 2,
281
281
  conditionList: __props.configure.props.base.showCondition,
282
- fieldNameList: attributeMap.value,
283
- fieldMap: fieldMap.value,
282
+ fieldNameList: __props.pageDesign.modelFields,
283
+ fieldMap: __props.pageDesign.modelFieldsMap,
284
284
  onSave: saveCondition,
285
285
  onClose: closeCombinationDialog
286
286
  }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),
@@ -1,7 +1,7 @@
1
1
  import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
2
2
  import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
3
3
  import "../../../../../../stores/page-store.js";
4
- /* empty css */
4
+ import "../../form/common/dimension-input.vue.js";
5
5
  import _sfc_main$2 from "../../common/common-icon-bind.vue.js";
6
6
  import http from "agilebuilder-ui/src/utils/request";
7
7
  import _sfc_main$1 from "../../common/common-function-code.vue.js";
@@ -588,7 +588,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
588
588
  _: 1
589
589
  }),
590
590
  createVNode(_component_el_form_item, {
591
- label: "是否启用必填",
591
+ label: "必填验证",
592
592
  class: "amb-design-attr-item"
593
593
  }, {
594
594
  default: withCtx(() => [
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./buttongroup-attr.vue2.js";
2
- /* empty css */
2
+ import "./buttongroup-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -10,6 +10,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
10
10
  type: Object,
11
11
  default: () => {
12
12
  }
13
+ },
14
+ pageDesign: {
15
+ type: Object,
16
+ default: () => {
17
+ }
13
18
  }
14
19
  },
15
20
  emits: ["close"],
@@ -61,13 +66,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
61
66
  });
62
67
  const conditionList = ref(null);
63
68
  function saveCondition(table) {
64
- props.configure.props.base.condition[tableSelectIndex.value]["sqlFilterCondition"] = JSON.stringify(table);
69
+ props.configure.props.base.condition[tableSelectIndex.value]["conditionList"] = JSON.stringify(table);
65
70
  }
66
71
  function closeCombination() {
67
72
  combinationVisible.value = false;
68
73
  }
69
74
  function opencombinationDialog(row, index) {
70
- conditionList.value = row.sqlFilterCondition;
75
+ conditionList.value = row.conditionList;
71
76
  tableSelectIndex.value = index;
72
77
  combinationVisible.value = true;
73
78
  }
@@ -157,9 +162,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
157
162
  default: withCtx((scope) => [
158
163
  createVNode(_component_el_input, {
159
164
  "model-value": unref(formatConditionList)(
160
- scope.row.sqlFilterCondition,
161
- _ctx.pageDesign.modelFields,
162
- _ctx.pageDesign.modelFieldsMap
165
+ scope.row.conditionList,
166
+ __props.pageDesign.modelFields,
167
+ __props.pageDesign.modelFieldsMap
163
168
  ),
164
169
  size: "default",
165
170
  onClick: ($event) => opencombinationDialog(scope.row, scope.$index)
@@ -175,8 +180,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
175
180
  default: withCtx((scope) => [
176
181
  createVNode(_component_el_input, {
177
182
  size: "default",
178
- modelValue: scope.row.name,
179
- "onUpdate:modelValue": ($event) => scope.row.name = $event
183
+ modelValue: scope.row.toolTips,
184
+ "onUpdate:modelValue": ($event) => scope.row.toolTips = $event
180
185
  }, null, 8, ["modelValue", "onUpdate:modelValue"])
181
186
  ]),
182
187
  _: 1
@@ -189,8 +194,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
189
194
  default: withCtx((scope) => [
190
195
  createVNode(_component_el_input, {
191
196
  size: "default",
192
- modelValue: scope.row.type,
193
- "onUpdate:modelValue": ($event) => scope.row.type = $event
197
+ modelValue: scope.row.labelI18nKey,
198
+ "onUpdate:modelValue": ($event) => scope.row.labelI18nKey = $event
194
199
  }, null, 8, ["modelValue", "onUpdate:modelValue"])
195
200
  ]),
196
201
  _: 1
@@ -201,8 +206,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
201
206
  combinationVisible.value ? (openBlock(), createBlock(_sfc_main$1, {
202
207
  key: 0,
203
208
  conditionList: conditionList.value,
204
- fieldNameList: _ctx.pageDesign.modelFields,
205
- fieldMap: _ctx.pageDesign.modelFieldsMap,
209
+ fieldNameList: __props.pageDesign.modelFields,
210
+ fieldMap: __props.pageDesign.modelFieldsMap,
206
211
  onSave: saveCondition,
207
212
  onClose: closeCombination
208
213
  }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true)
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./journal-set-dialog.vue2.js";
2
- /* empty css */
2
+ import "./journal-set-dialog.vue3.js";
3
3
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
4
4
  const JournalSetDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-665d3bf4"]]);
5
5
  export {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./dropdown-attr.vue2.js";
2
- /* empty css */
2
+ import "./dropdown-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./printlabel-attr.vue2.js";
2
- /* empty css */
2
+ import "./printlabel-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -1,18 +1,25 @@
1
- import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode } from "vue";
1
+ import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode } from "vue";
2
2
  import _sfc_main$1 from "../common/common-attr-base.vue.js";
3
3
  import _sfc_main$2 from "../common/common-attr-serieslist.vue.js";
4
4
  import _sfc_main$4 from "../common/common-attr-groupby.vue.js";
5
5
  import _sfc_main$5 from "../common/common-attr-sortby.vue.js";
6
- import _sfc_main$6 from "../../form/common/data-linkage.vue.js";
7
- import _sfc_main$7 from "../common/common-attr-assistant.vue.js";
8
- import _sfc_main$8 from "../../common/common-attr-size.vue.js";
6
+ import _sfc_main$8 from "../../form/common/data-linkage.vue.js";
7
+ import _sfc_main$9 from "../common/common-attr-assistant.vue.js";
8
+ import _sfc_main$a from "../../common/common-attr-size.vue.js";
9
9
  import _sfc_main$3 from "../common/common-attr-data.vue.js";
10
+ import _sfc_main$6 from "../common/common-attr-clickset.vue.js";
11
+ import _sfc_main$7 from "../../form/common/suffixmodule.vue.js";
12
+ const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
10
13
  const _sfc_main = /* @__PURE__ */ defineComponent({
11
14
  __name: "column-line-attr-base",
12
15
  props: {
13
16
  configure: {
14
17
  type: Object,
15
18
  required: true
19
+ },
20
+ pageDesign: {
21
+ type: Object,
22
+ default: () => ({ props: {} })
16
23
  }
17
24
  },
18
25
  setup(__props) {
@@ -25,9 +32,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
25
32
  "propsSort",
26
33
  "propsDrill",
27
34
  "propsAssistant",
28
- "linkage"
35
+ "linkage",
36
+ "clicklinkage",
37
+ "clickTrigger"
29
38
  ]);
30
39
  return (_ctx, _cache) => {
40
+ const _component_el_collapse_item = resolveComponent("el-collapse-item");
31
41
  const _component_el_collapse = resolveComponent("el-collapse");
32
42
  const _component_el_form = resolveComponent("el-form");
33
43
  return openBlock(), createBlock(_component_el_form, {
@@ -52,11 +62,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
52
62
  createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"]),
53
63
  createVNode(_sfc_main$4, { configure: __props.configure }, null, 8, ["configure"]),
54
64
  createVNode(_sfc_main$5, { configure: __props.configure }, null, 8, ["configure"]),
55
- createVNode(_sfc_main$6, {
65
+ createVNode(_sfc_main$6, { configure: __props.configure }, null, 8, ["configure"]),
66
+ createVNode(_component_el_collapse_item, {
67
+ title: "Click跳转配置",
68
+ name: "clicklinkage",
69
+ class: "amb-design-attr-group-header"
70
+ }, {
71
+ default: withCtx(() => [
72
+ createElementVNode("div", _hoisted_1, [
73
+ (openBlock(), createBlock(_sfc_main$7, {
74
+ key: __props.configure.uuid,
75
+ configure: __props.configure,
76
+ pageDesign: __props.pageDesign,
77
+ isButton: false
78
+ }, null, 8, ["configure", "pageDesign"]))
79
+ ])
80
+ ]),
81
+ _: 1
82
+ }),
83
+ createVNode(_sfc_main$8, {
56
84
  configureProps: __props.configure.props
57
85
  }, null, 8, ["configureProps"]),
58
- createVNode(_sfc_main$7, { configure: __props.configure }, null, 8, ["configure"]),
59
- createVNode(_sfc_main$8, {
86
+ createVNode(_sfc_main$9, { configure: __props.configure }, null, 8, ["configure"]),
87
+ createVNode(_sfc_main$a, {
60
88
  size: __props.configure.props.size
61
89
  }, null, 8, ["size"])
62
90
  ]),