cloud-web-corejs 1.0.67 → 1.0.69

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 (32) hide show
  1. package/package.json +1 -1
  2. package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue +3 -2
  3. package/src/components/xform/form-designer/form-widget/field-widget/date-range-widget.vue +1 -0
  4. package/src/components/xform/form-designer/form-widget/field-widget/echart-bar-widget.vue +1 -1
  5. package/src/components/xform/form-designer/form-widget/field-widget/echart-category-widget.vue +1 -1
  6. package/src/components/xform/form-designer/form-widget/field-widget/echart-pie-widget.vue +1 -1
  7. package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js +1 -1
  8. package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-bar-mixin.js +49 -8
  9. package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-category-mixin.js +61 -88
  10. package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-pie-mixin.js +13 -0
  11. package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue +5 -1
  12. package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue +77 -0
  13. package/src/components/xform/form-designer/indexMixin.js +1 -1
  14. package/src/components/xform/form-designer/setting-panel/form-setting.vue +40 -3
  15. package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onAfterConfirmFile-editor.vue +30 -0
  16. package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onClick-editor.vue +2 -2
  17. package/src/components/xform/form-designer/setting-panel/property-editor/field-date-range/date-range-defaultTime-editor.vue +27 -0
  18. package/src/components/xform/form-designer/setting-panel/property-editor/field-echart/echart-bar-editor.vue +185 -69
  19. package/src/components/xform/form-designer/setting-panel/property-editor/field-echart/echart-category-editor.vue +188 -86
  20. package/src/components/xform/form-designer/setting-panel/property-editor/field-echart/echart-pie-editor.vue +84 -39
  21. package/src/components/xform/form-designer/setting-panel/property-editor/placeholder-editor.vue +1 -1
  22. package/src/components/xform/form-designer/setting-panel/property-editor/showRuleFlag-editor.vue +223 -0
  23. package/src/components/xform/form-designer/setting-panel/property-editor/textFlag-editor.vue +62 -0
  24. package/src/components/xform/form-designer/setting-panel/propertyRegister.js +4 -0
  25. package/src/components/xform/form-designer/setting-panel/wfObjConfigDialog.vue +189 -0
  26. package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +330 -37
  27. package/src/store/modules/permission.js +1 -1
  28. package/src/views/bd/setting/form_template/batchWfObjConfigDialog.vue +105 -0
  29. package/src/views/bd/setting/form_template/mixins/batchWfObjConfigDialog.js +4 -0
  30. package/src/views/bd/setting/form_template/mixins/wf_list.js +12 -0
  31. package/src/views/bd/setting/form_template/wfObjConfigDialog.vue +254 -0
  32. package/src/views/bd/setting/form_template/wf_list.vue +127 -0
package/src/components/xform/form-designer/setting-panel/form-setting.vue CHANGED
@@ -11,8 +11,17 @@
11
11
  <el-input type="text" v-model="formConfig.saveScriptCode" placeholder="默认saveUpdatge"></el-input>
12
12
  </el-form-item>
13
13
  <el-form-item :label="i18nt('启用流程')">
14
- <el-switch v-model="formConfig.wfEnabled"></el-switch>
14
+ <el-switch v-model="formConfig.wfEnabled" @change="designer.vueInstance.reportTemplate.objTypeName=null"></el-switch>
15
15
  </el-form-item>
16
+ <el-form-item :label="i18nt('默认流程对象名')">
17
+ <el-input type="text" v-model="designer.vueInstance.reportTemplate.objTypeName"></el-input>
18
+ </el-form-item>
19
+ <!-- <el-form-item label="流程单据定义">
20
+ <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfObjConfigDialog">
21
+ <span>{{ wfObjConfigs.length ? '已维护' : null}}</span>
22
+ <i class="el-icon-edit"></i>
23
+ </a>
24
+ </el-form-item>-->
16
25
  <el-form-item :label="i18nt('加载详情数据')">
17
26
  <el-switch v-model="formConfig.isLoadEntity"></el-switch>
18
27
  </el-form-item>
@@ -290,6 +299,8 @@
290
299
 
291
300
  <formTemplateDialog v-if="showFormTemplateDialog" :visiable.sync="showFormTemplateDialog"
292
301
  @confirm="confirmFormTemplate" multi="false"/>
302
+ <wfObjConfigDialog v-if="showWfObjConfigDialog" :visiable.sync="showWfObjConfigDialog"
303
+ @confirm="confirmWfObjConfigDialog" :formTemplate="designer.vueInstance.reportTemplate"/>
293
304
  </div>
294
305
  </template>
295
306
 
@@ -297,12 +308,15 @@
297
308
  import i18n from '../../../../components/xform/utils/i18n';
298
309
  import {deepClone, insertCustomCssToHead, insertGlobalFunctionsToHtml} from '../../../../components/xform/utils/util';
299
310
  import formTemplateDialog from '../../../../views/bd/setting/form_template/dialog.vue'
311
+ import wfObjConfigDialog from "./wfObjConfigDialog.vue";
312
+
300
313
 
301
314
  export default {
302
315
  name: 'form-setting',
303
316
  mixins: [i18n],
304
317
  components: {
305
- formTemplateDialog
318
+ formTemplateDialog,
319
+ wfObjConfigDialog
306
320
  },
307
321
  props: {
308
322
  designer: Object,
@@ -348,7 +362,9 @@ export default {
348
362
  formScriptParam:null,
349
363
  showFormScriptParamDialog: false,
350
364
  formScriptSuccess:null,
351
- showFormScriptSuccessDialog: false
365
+ showFormScriptSuccessDialog: false,
366
+ wfObjConfigs:[],
367
+ showWfObjConfigDialog:false
352
368
  };
353
369
  },
354
370
  created() {
@@ -369,6 +385,7 @@ export default {
369
385
  this.extractCssClass();
370
386
  this.designer.emitEvent('form-css-updated', deepClone(this.cssClassList));
371
387
  }, 1200);
388
+ this.getListByObjTypeCode();
372
389
  },
373
390
  methods: {
374
391
  showEventCollapse() {
@@ -545,6 +562,26 @@ export default {
545
562
  this.designer.formConfig.formScriptSuccess = this.formScriptSuccess;
546
563
  this.showFormScriptSuccessDialog = false;
547
564
  },
565
+ openWfObjConfigDialog(){
566
+ this.showWfObjConfigDialog = true;
567
+ },
568
+ confirmWfObjConfigDialog(rows){
569
+ this.wfObjConfigs = rows || [];
570
+ },
571
+ getListByObjTypeCode(){
572
+ let reportTemplate = this.designer.vueInstance.reportTemplate
573
+ this.$http({
574
+ url: `/${reportTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
575
+ method: `post`,
576
+ data:{
577
+ stringOne:reportTemplate.objTypeCode
578
+ },
579
+ isLoading: true,
580
+ success: res => {
581
+ this.wfObjConfigs = res.objx || [];
582
+ }
583
+ });
584
+ },
548
585
  }
549
586
  };
550
587
  </script>
package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onAfterConfirmFile-editor.vue ADDED
@@ -0,0 +1,30 @@
1
+ <template>
2
+ <el-form-item label="onAfterConfirmFile" label-width="150px">
3
+ <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('onAfterConfirmFile', eventParams)">
4
+ <span>{{ optionModel.onAfterConfirmFile }}</span>
5
+ <i class="el-icon-edit"></i>
6
+ </a>
7
+ </el-form-item>
8
+ </template>
9
+
10
+ <script>
11
+ import i18n from "../../../../../../components/xform/utils/i18n";
12
+ import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
13
+
14
+ export default {
15
+ name: "onAfterConfirmFile-editor",
16
+ mixins: [i18n, eventMixin],
17
+ props: {
18
+ designer: Object,
19
+ selectedWidget: Object,
20
+ optionModel: Object,
21
+ },
22
+ data() {
23
+ return {
24
+ eventParams: ["attachments", "fileInfos"],
25
+ };
26
+ },
27
+ };
28
+ </script>
29
+
30
+ <style scoped></style>
package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onClick-editor.vue CHANGED
@@ -26,9 +26,9 @@ export default {
26
26
  },
27
27
  computed:{
28
28
  eventParams(){
29
- let eventParams = ["dataId", "formCode"];
29
+ let eventParams = ["dataId", "formCode","event"];
30
30
  if (this.optionModel.rowFlag) {
31
- eventParams.push("row", "index");
31
+ eventParams.push("row", "index","event");
32
32
  }
33
33
  return eventParams;
34
34
  }
package/src/components/xform/form-designer/setting-panel/property-editor/field-date-range/date-range-defaultTime-editor.vue ADDED
@@ -0,0 +1,27 @@
1
+ <template>
2
+
3
+ <el-form-item :label="i18nt('默认时间')">
4
+ <el-time-picker v-model="optionModel.defaultTime" is-range @change="emitDefaultValueChange"
5
+ format="HH:mm:ss" value-format="HH:mm:ss" style="width: 100%">
6
+ </el-time-picker>
7
+ </el-form-item>
8
+ </template>
9
+
10
+ <script>
11
+ import i18n from "../../../../utils/i18n"
12
+ import propertyMixin from "../propertyMixin"
13
+
14
+ export default {
15
+ name: "date-range-defaultTime-editor",
16
+ mixins: [i18n, propertyMixin],
17
+ props: {
18
+ designer: Object,
19
+ selectedWidget: Object,
20
+ optionModel: Object,
21
+ },
22
+ }
23
+ </script>
24
+
25
+ <style scoped>
26
+
27
+ </style>
package/src/components/xform/form-designer/setting-panel/property-editor/field-echart/echart-bar-editor.vue CHANGED
@@ -1,42 +1,69 @@
1
1
  <template>
2
2
  <div>
3
- <el-form-item :label="i18nt('背景颜色')"><el-color-picker v-model="optionModel.echarBarOption.backgroundColor"></el-color-picker></el-form-item>
4
- <el-form-item :label="i18nt('竖展示')"><el-switch v-model="alignX"></el-switch></el-form-item>
5
- <!-- <el-form-item :label="i18nt('designer.setting.dsEnabled')"><el-switch v-model="optionModel.dsEnabled"></el-switch></el-form-item>
6
- <el-form-item v-if="optionModel.dsEnabled" :label="i18nt('请求访问')">
7
- <el-input
8
- class="search-input"
9
- max="200"
10
- v-model="optionModel.accessName"
11
- @clear="
12
- optionModel.accessCode = '';
13
- $forceUpdate();
14
- "
15
- v-el-readonly
16
- clearable
17
- >
18
- <i slot="suffix" class="el-input__icon el-icon-search" @click="showRequestaccessDialog = true"></i>
19
- </el-input>
20
- </el-form-item>-->
21
- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">柱体设置</el-divider></el-form-item>
22
- <el-form-item :label="i18nt('最大宽度')"><el-slider v-model="barMaxWidth"></el-slider></el-form-item>
23
- <el-form-item :label="i18nt('圆角')"><el-slider v-model="barBorderRadius"></el-slider></el-form-item>
24
- <el-form-item :label="i18nt('最小高度')"><el-slider v-model="barMinHeight"></el-slider></el-form-item>
3
+ <el-form-item :label="i18nt('背景颜色')">
4
+ <el-color-picker v-model="optionModel.echarBarOption.backgroundColor"></el-color-picker>
5
+ </el-form-item>
6
+ <el-form-item :label="i18nt('竖展示')">
7
+ <el-switch v-model="alignX"></el-switch>
8
+ </el-form-item>
9
+ <!-- <el-form-item :label="i18nt('designer.setting.dsEnabled')"><el-switch v-model="optionModel.dsEnabled"></el-switch></el-form-item>
10
+ <el-form-item v-if="optionModel.dsEnabled" :label="i18nt('请求访问')">
11
+ <el-input
12
+ class="search-input"
13
+ max="200"
14
+ v-model="optionModel.accessName"
15
+ @clear="
16
+ optionModel.accessCode = '';
17
+ $forceUpdate();
18
+ "
19
+ v-el-readonly
20
+ clearable
21
+ >
22
+ <i slot="suffix" class="el-input__icon el-icon-search" @click="showRequestaccessDialog = true"></i>
23
+ </el-input>
24
+ </el-form-item>-->
25
+ <el-form-item label="自定义图表配置" label-width="150px">
26
+ <a href="javascript:void(0);" class="a-link link-oneLind"
27
+ @click="editEventHandler('echartConfig', ['dataId', 'formCode'])">
28
+ <span>{{ optionModel.echartConfig }}</span>
29
+ <i class="el-icon-edit"></i>
30
+ </a>
31
+ </el-form-item>
32
+ <el-form-item label-width="0">
33
+ <el-divider class="custom-divider-margin-top">柱体设置</el-divider>
34
+ </el-form-item>
35
+ <el-form-item :label="i18nt('最大宽度')">
36
+ <el-slider v-model="barMaxWidth"></el-slider>
37
+ </el-form-item>
38
+ <el-form-item :label="i18nt('圆角')">
39
+ <el-slider v-model="barBorderRadius"></el-slider>
40
+ </el-form-item>
41
+ <el-form-item :label="i18nt('最小高度')">
42
+ <el-slider v-model="barMinHeight"></el-slider>
43
+ </el-form-item>
25
44
 
26
- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">标题设置</el-divider></el-form-item>
27
- <el-form-item :label="i18nt('显示标题')"><el-switch v-model="optionModel.echarBarOption.title.show"></el-switch></el-form-item>
28
- <el-form-item :label="i18nt('标题')"><el-input v-model="optionModel.echarBarOption.title.text"></el-input></el-form-item>
29
- <!-- <el-form-item :label="i18nt('字体颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.textStyle.color"></el-color-picker></el-form-item>
30
- <el-form-item :label="i18nt('字体粗细')">
31
- <el-select v-model="optionModel.echarBarOption.title.textStyle.fontWeight">
32
- <el-option label="正常" value="normal"></el-option>
33
- <el-option label="粗体" value="bold"></el-option>
34
- <el-option label="特粗体" value="bolder"></el-option>
35
- <el-option label="细体" value="lighter"></el-option>
36
- </el-select>
45
+ <el-form-item label-width="0">
46
+ <el-divider class="custom-divider-margin-top">标题设置</el-divider>
47
+ </el-form-item>
48
+ <el-form-item :label="i18nt('显示标题')">
49
+ <el-switch v-model="optionModel.echarBarOption.title.show"></el-switch>
50
+ </el-form-item>
51
+ <el-form-item :label="i18nt('标题')">
52
+ <el-input v-model="optionModel.echarBarOption.title.text"></el-input>
53
+ </el-form-item>
54
+ <!-- <el-form-item :label="i18nt('字体颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.textStyle.color"></el-color-picker></el-form-item>
55
+ <el-form-item :label="i18nt('字体粗细')">
56
+ <el-select v-model="optionModel.echarBarOption.title.textStyle.fontWeight">
57
+ <el-option label="正常" value="normal"></el-option>
58
+ <el-option label="粗体" value="bold"></el-option>
59
+ <el-option label="特粗体" value="bolder"></el-option>
60
+ <el-option label="细体" value="lighter"></el-option>
61
+ </el-select>
62
+ </el-form-item>
63
+ <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.title.textStyle.fontSize"></base-input-number></el-form-item> -->
64
+ <el-form-item :label="i18nt('背景颜色')">
65
+ <el-color-picker v-model="optionModel.echarBarOption.title.backgroundColor"></el-color-picker>
37
66
  </el-form-item>
38
- <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.title.textStyle.fontSize"></base-input-number></el-form-item> -->
39
- <el-form-item :label="i18nt('背景颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.backgroundColor"></el-color-picker></el-form-item>
40
67
  <el-form-item :label="i18nt('字体位置')">
41
68
  <el-select v-model="optionModel.echarBarOption.title.left">
42
69
  <el-option label="居中" value="center"></el-option>
@@ -44,7 +71,9 @@
44
71
  <el-option label="右对齐" value="right"></el-option>
45
72
  </el-select>
46
73
  </el-form-item>
47
- <el-form-item :label="i18nt('副标题')"><el-input v-model="optionModel.echarBarOption.title.subtext"></el-input></el-form-item>
74
+ <el-form-item :label="i18nt('副标题')">
75
+ <el-input v-model="optionModel.echarBarOption.title.subtext"></el-input>
76
+ </el-form-item>
48
77
  <!-- <el-form-item :label="i18nt('字体颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.subtextStyle.color"></el-color-picker></el-form-item>
49
78
  <el-form-item :label="i18nt('字体粗细')">
50
79
  <el-select v-model="optionModel.echarBarOption.title.subtextStyle.fontWeight">
@@ -56,40 +85,96 @@
56
85
  </el-form-item>
57
86
  <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.title.subtextStyle.fontSize"></base-input-number></el-form-item> -->
58
87
 
59
- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">X轴设置</el-divider></el-form-item>
60
- <el-form-item :label="i18nt('显示')"><el-switch v-model="optionModel.echarBarOption.xAxis.show"></el-switch></el-form-item>
61
- <el-form-item :label="i18nt('坐标名')"><el-input v-model="optionModel.echarBarOption.xAxis.name"></el-input></el-form-item>
62
- <el-form-item :label="i18nt('坐标名颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.nameTextStyle.color"></el-color-picker></el-form-item>
63
- <el-form-item :label="i18nt('坐标字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.xAxis.nameTextStyle.fontSize"></base-input-number></el-form-item>
64
- <el-form-item :label="i18nt('数值颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.axisLabel.color"></el-color-picker></el-form-item>
65
- <el-form-item :label="i18nt('数值字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.xAxis.axisLabel.fontSize"></base-input-number></el-form-item>
66
- <el-form-item :label="i18nt('数值角度')"><el-slider v-model="optionModel.echarBarOption.xAxis.axisLabel.rotate"></el-slider></el-form-item>
88
+ <el-form-item label-width="0">
89
+ <el-divider class="custom-divider-margin-top">X轴设置</el-divider>
90
+ </el-form-item>
91
+ <el-form-item :label="i18nt('显示')">
92
+ <el-switch v-model="optionModel.echarBarOption.xAxis.show"></el-switch>
93
+ </el-form-item>
94
+ <el-form-item :label="i18nt('坐标名')">
95
+ <el-input v-model="optionModel.echarBarOption.xAxis.name"></el-input>
96
+ </el-form-item>
97
+ <el-form-item :label="i18nt('坐标名颜色')">
98
+ <el-color-picker v-model="optionModel.echarBarOption.xAxis.nameTextStyle.color"></el-color-picker>
99
+ </el-form-item>
100
+ <el-form-item :label="i18nt('坐标字号')">
101
+ <base-input-number :scale="0"
102
+ v-model="optionModel.echarBarOption.xAxis.nameTextStyle.fontSize"></base-input-number>
103
+ </el-form-item>
104
+ <el-form-item :label="i18nt('数值颜色')">
105
+ <el-color-picker v-model="optionModel.echarBarOption.xAxis.axisLabel.color"></el-color-picker>
106
+ </el-form-item>
107
+ <el-form-item :label="i18nt('数值字号')">
108
+ <base-input-number :scale="0" v-model="optionModel.echarBarOption.xAxis.axisLabel.fontSize"></base-input-number>
109
+ </el-form-item>
110
+ <el-form-item :label="i18nt('数值角度')">
111
+ <el-slider v-model="optionModel.echarBarOption.xAxis.axisLabel.rotate"></el-slider>
112
+ </el-form-item>
67
113
 
68
- <el-form-item :label="i18nt('轴反转')"><el-switch v-model="optionModel.echarBarOption.xAxis.inverse"></el-switch></el-form-item>
114
+ <el-form-item :label="i18nt('轴反转')">
115
+ <el-switch v-model="optionModel.echarBarOption.xAxis.inverse"></el-switch>
116
+ </el-form-item>
69
117
  <!-- <el-form-item :label="i18nt('轴颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.axisLine.lineStyle.color"></el-color-picker></el-form-item> -->
70
- <el-form-item :label="i18nt('分割线显示')"><el-switch v-model="optionModel.echarBarOption.xAxis.splitLine.show"></el-switch></el-form-item>
118
+ <el-form-item :label="i18nt('分割线显示')">
119
+ <el-switch v-model="optionModel.echarBarOption.xAxis.splitLine.show"></el-switch>
120
+ </el-form-item>
71
121
  <!-- <el-form-item :label="i18nt('分割线颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.splitLine.lineStyle.color"></el-color-picker></el-form-item> -->
72
122
 
73
- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">Y轴设置</el-divider></el-form-item>
123
+ <el-form-item label-width="0">
124
+ <el-divider class="custom-divider-margin-top">Y轴设置</el-divider>
125
+ </el-form-item>
74
126
 
75
- <el-form-item :label="i18nt('显示')"><el-switch v-model="optionModel.echarBarOption.yAxis.show"></el-switch></el-form-item>
76
- <el-form-item :label="i18nt('坐标名')"><el-input v-model="optionModel.echarBarOption.yAxis.name"></el-input></el-form-item>
77
- <el-form-item :label="i18nt('坐标名颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.nameTextStyle.color"></el-color-picker></el-form-item>
78
- <el-form-item :label="i18nt('坐标字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.yAxis.nameTextStyle.fontSize"></base-input-number></el-form-item>
79
- <el-form-item :label="i18nt('数值颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLabel.color"></el-color-picker></el-form-item>
80
- <el-form-item :label="i18nt('数值字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.yAxis.axisLabel.fontSize"></base-input-number></el-form-item>
81
- <el-form-item :label="i18nt('数值角度')"><el-slider v-model="optionModel.echarBarOption.yAxis.axisLabel.rotate"></el-slider></el-form-item>
127
+ <el-form-item :label="i18nt('显示')">
128
+ <el-switch v-model="optionModel.echarBarOption.yAxis.show"></el-switch>
129
+ </el-form-item>
130
+ <el-form-item :label="i18nt('坐标名')">
131
+ <el-input v-model="optionModel.echarBarOption.yAxis.name"></el-input>
132
+ </el-form-item>
133
+ <el-form-item :label="i18nt('坐标名颜色')">
134
+ <el-color-picker v-model="optionModel.echarBarOption.yAxis.nameTextStyle.color"></el-color-picker>
135
+ </el-form-item>
136
+ <el-form-item :label="i18nt('坐标字号')">
137
+ <base-input-number :scale="0"
138
+ v-model="optionModel.echarBarOption.yAxis.nameTextStyle.fontSize"></base-input-number>
139
+ </el-form-item>
140
+ <el-form-item :label="i18nt('数值颜色')">
141
+ <el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLabel.color"></el-color-picker>
142
+ </el-form-item>
143
+ <el-form-item :label="i18nt('数值字号')">
144
+ <base-input-number :scale="0" v-model="optionModel.echarBarOption.yAxis.axisLabel.fontSize"></base-input-number>
145
+ </el-form-item>
146
+ <el-form-item :label="i18nt('数值角度')">
147
+ <el-slider v-model="optionModel.echarBarOption.yAxis.axisLabel.rotate"></el-slider>
148
+ </el-form-item>
82
149
 
83
- <el-form-item :label="i18nt('轴显示')"><el-switch v-model="optionModel.echarBarOption.yAxis.axisLine.show"></el-switch></el-form-item>
84
- <el-form-item :label="i18nt('轴反转')"><el-switch v-model="optionModel.echarBarOption.yAxis.inverse"></el-switch></el-form-item>
85
- <el-form-item :label="i18nt('轴颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLine.lineStyle.color"></el-color-picker></el-form-item>
86
- <el-form-item :label="i18nt('分割线显示')"><el-switch v-model="optionModel.echarBarOption.yAxis.splitLine.show"></el-switch></el-form-item>
87
- <el-form-item :label="i18nt('分割线颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.splitLine.lineStyle.color"></el-color-picker></el-form-item>
150
+ <el-form-item :label="i18nt('轴显示')">
151
+ <el-switch v-model="optionModel.echarBarOption.yAxis.axisLine.show"></el-switch>
152
+ </el-form-item>
153
+ <el-form-item :label="i18nt('轴反转')">
154
+ <el-switch v-model="optionModel.echarBarOption.yAxis.inverse"></el-switch>
155
+ </el-form-item>
156
+ <el-form-item :label="i18nt('轴颜色')">
157
+ <el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLine.lineStyle.color"></el-color-picker>
158
+ </el-form-item>
159
+ <el-form-item :label="i18nt('分割线显示')">
160
+ <el-switch v-model="optionModel.echarBarOption.yAxis.splitLine.show"></el-switch>
161
+ </el-form-item>
162
+ <el-form-item :label="i18nt('分割线颜色')">
163
+ <el-color-picker v-model="optionModel.echarBarOption.yAxis.splitLine.lineStyle.color"></el-color-picker>
164
+ </el-form-item>
88
165
 
89
- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">数值设定</el-divider></el-form-item>
90
- <el-form-item :label="i18nt('显示数值')"><el-switch v-model="showSeriesLabel"></el-switch></el-form-item>
91
- <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.series[0].label.fontSize"></base-input-number></el-form-item>
92
- <el-form-item :label="i18nt('颜色')"><el-color-picker v-model="optionModel.echarBarOption.series[0].label.color"></el-color-picker></el-form-item>
166
+ <el-form-item label-width="0">
167
+ <el-divider class="custom-divider-margin-top">数值设定</el-divider>
168
+ </el-form-item>
169
+ <el-form-item :label="i18nt('显示数值')">
170
+ <el-switch v-model="showSeriesLabel"></el-switch>
171
+ </el-form-item>
172
+ <el-form-item :label="i18nt('字体大小')">
173
+ <base-input-number :scale="0" v-model="optionModel.echarBarOption.series[0].label.fontSize"></base-input-number>
174
+ </el-form-item>
175
+ <el-form-item :label="i18nt('颜色')">
176
+ <el-color-picker v-model="optionModel.echarBarOption.series[0].label.color"></el-color-picker>
177
+ </el-form-item>
93
178
  <el-form-item :label="i18nt('字体粗细')">
94
179
  <el-select v-model="optionModel.echarBarOption.series[0].label.fontWeight">
95
180
  <el-option label="正常" value="normal"></el-option>
@@ -99,14 +184,36 @@
99
184
  </el-select>
100
185
  </el-form-item>
101
186
 
102
- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">提示语设置</el-divider></el-form-item>
187
+ <el-form-item label-width="0">
188
+ <el-divider class="custom-divider-margin-top">提示语设置</el-divider>
189
+ </el-form-item>
103
190
  <!-- <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.tooltip.textStyle.fontSize"></base-input-number></el-form-item> -->
104
- <el-form-item :label="i18nt('网格线颜色')"><el-color-picker v-model="optionModel.echarBarOption.tooltip.borderColor"></el-color-picker></el-form-item>
191
+ <el-form-item :label="i18nt('网格线颜色')">
192
+ <el-color-picker v-model="optionModel.echarBarOption.tooltip.borderColor"></el-color-picker>
193
+ </el-form-item>
105
194
 
106
195
  <!-- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">坐标轴边距设置</el-divider></el-form-item>
107
196
 
108
197
  <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">渐变色</el-divider></el-form-item>-->
109
198
 
199
+ <el-form-item label-width="0">
200
+ <el-divider class="custom-divider-margin-top">自定义配色</el-divider>
201
+ </el-form-item>
202
+ <draggable tag="ul" class="draggable-box" :list="optionModel.echarBarOption.colors"
203
+ v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.el-icon-s-operation' }">
204
+ <li v-for="(colorItem, index) in optionModel.echarBarOption.colors" :key="index">
205
+ <i class="el-icon-s-operation"></i>
206
+ <el-color-picker v-model="optionModel.echarBarOption.colors[index]"></el-color-picker>
207
+ <!-- {{colorItem}} -->
208
+ <el-button circle plain size="mini" type="danger" @click="deleteColor(index)" icon="el-icon-minus"
209
+ class="col-delete-button"></el-button>
210
+ </li>
211
+ </draggable>
212
+ <el-button type="text" @click="addColor" icon="el-icon-circle-plus-outline" class="add-option">{{
213
+ i18nt('新增配色')
214
+ }}
215
+ </el-button>
216
+
110
217
  <requestaccessDialog
111
218
  v-if="showRequestaccessDialog"
112
219
  :visiable.sync="showRequestaccessDialog"
@@ -119,13 +226,15 @@
119
226
 
120
227
  <script>
121
228
  import i18n from '../../../../../../components/xform/utils/i18n';
122
- import { deepClone } from '../../../../../../components/xform/utils/util';
229
+ import {deepClone} from '../../../../../../components/xform/utils/util';
123
230
  import Draggable from 'vuedraggable';
124
231
  import requestaccessDialog from '../../../../../../views/user/form/report_requestaccess/dialog.vue';
232
+ import eventMixin
233
+ from "@base/components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
125
234
 
126
235
  export default {
127
236
  name: 'echart-bar-editor',
128
- mixins: [i18n],
237
+ mixins: [eventMixin, i18n],
129
238
  props: {
130
239
  designer: Object,
131
240
  selectedWidget: Object,
@@ -137,7 +246,7 @@ export default {
137
246
  requestaccessDialog
138
247
  },
139
248
  computed: {
140
- reportTemplate: function() {
249
+ reportTemplate: function () {
141
250
  return this.getReportTemplate();
142
251
  },
143
252
  nameSet: {
@@ -243,8 +352,15 @@ export default {
243
352
  if (rows.length) {
244
353
  let row = rows[0];
245
354
  this.optionModel.accessName = row.accessName;
246
- this.optionModel.accessCode = row.accessCode;
355
+ this.optionModel.accessCode = row.accessCode;
247
356
  }
357
+ },
358
+ addColor() {
359
+ if(!this.optionModel.echarBarOption.colors)this.$set(this.optionModel.echarBarOption,'colors',[]);
360
+ this.optionModel.echarBarOption.colors.push('');
361
+ },
362
+ deleteColor(index) {
363
+ this.optionModel.echarBarOption.colors.splice(index, 1);
248
364
  }
249
365
  }
250
366
  };