cloud-web-corejs 1.0.54-dev.9 → 1.0.54-dev.91

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -11,14 +11,17 @@
             <el-input type="text" v-model="formConfig.saveScriptCode" placeholder="默认saveUpdatge"></el-input>
           </el-form-item>
           <el-form-item :label="i18nt('启用流程')">
-            <el-switch v-model="formConfig.wfEnabled"></el-switch>
+            <el-switch v-model="formConfig.wfEnabled" @change="designer.vueInstance.reportTemplate.objTypeName=null"></el-switch>
           </el-form-item>
-          <el-form-item label="流程单据定义">
+          <el-form-item :label="i18nt('默认流程单据类型名称')">
+            <el-input type="text" v-model="designer.vueInstance.reportTemplate.objTypeName"></el-input>
+          </el-form-item>
+<!--          <el-form-item label="流程单据定义">
             <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfObjConfigDialog">
               <span>{{ wfObjConfigs.length ? '已维护' : null}}</span>
               <i class="el-icon-edit"></i>
             </a>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item :label="i18nt('加载详情数据')">
             <el-switch v-model="formConfig.isLoadEntity"></el-switch>
           </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -13,6 +13,12 @@
         </el-form-item>-->
     <!-- <el-form-item :label="i18nt('designer.setting.showIndex')"><el-switch v-model="optionModel.showIndex"></el-switch></el-form-item>
     <el-form-item :label="i18nt('designer.setting.showCheckBox')"><el-switch v-model="optionModel.showCheckBox"></el-switch></el-form-item> -->
+    <el-form-item label="启用数据行合并">
+      <el-switch v-model="optionModel.mergeRowEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('合并行唯一字段')">
+      <el-input v-model="optionModel.mergeRowKey"></el-input>
+    </el-form-item>
     <el-form-item label="查询列表">
       <el-switch v-model="optionModel.isQueryTable"></el-switch>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/onCheckboxChange-editor.vue

@@ -21,7 +21,7 @@ export default {
   },
   data() {
     return {
-      eventParams: ['{ checked, row, rowIndex, $rowIndex, column, columnIndex, $columnIndex, $event }'],
+      eventParams: ['param'],
     }
   }
 }

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -63,6 +63,11 @@
               <el-switch v-model="scope.row.sortable"></el-switch>
             </template>
           </el-table-column>
+          <el-table-column :label="i18nt('明细行')" width="70" prop="sortable">
+            <template slot-scope="scope">
+              <el-switch v-model="scope.row.isItemLine"></el-switch>
+            </template>
+          </el-table-column>
           <el-table-column :label="i18nt('designer.setting.fixedColumn')" width="100" prop="fixed">
             <template slot-scope="scope">
               <el-select v-model="scope.row.fixed" clearable>
@@ -118,6 +123,14 @@
                          :disabled="!scope.row.editFormatS"></el-button>
             </template>
           </el-table-column>
+          <el-table-column :label="i18nt('导出类型')" width="200" prop="formatS">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.exportType" clearable>
+                <el-option value="Image2" label="图片"></el-option>
+                <el-option value="Number" label="数值"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column label="格式化配置" width="90" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button size="mini" plain="" round="" icon="el-icon-edit"

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onAfterConfirmFile-editor.vue

@@ -0,0 +1,32 @@
+<template>
+  <el-form-item label="onAfterConfirmFile" label-width="150px">
+    <a href="javascript:void(0);" class="a-link link-oneLind"
+       @click="editEventHandler('onAfterConfirmFile', eventParams)">
+      <span>{{ optionModel.onAfterConfirmFile }}</span>
+      <i class="el-icon-edit"></i>
+    </a>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+export default {
+  name: "onAfterConfirmFile-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: ["dataId", "formCode", "attachments", "fileInfos"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onClick-editor.vue

@@ -26,9 +26,9 @@ export default {
   },
   computed:{
     eventParams(){
-      let eventParams = ["dataId", "formCode"];
+      let eventParams = ["dataId", "formCode","event"];
       if (this.optionModel.rowFlag) {
-        eventParams.push("row", "index");
+        eventParams.push("row", "index","event");
       }
       return eventParams;
     }

package/src/components/xform/form-designer/setting-panel/property-editor/field-date-range/date-range-defaultTime-editor.vue

@@ -0,0 +1,27 @@
+<template>
+
+  <el-form-item :label="i18nt('默认时间')">
+    <el-time-picker v-model="optionModel.defaultTime" is-range @change="emitDefaultValueChange"
+                    format="HH:mm:ss" value-format="HH:mm:ss" style="width: 100%">
+    </el-time-picker>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n"
+import propertyMixin from "../propertyMixin"
+
+export default {
+  name: "date-range-defaultTime-editor",
+  mixins: [i18n, propertyMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-echart/echart-bar-editor.vue

@@ -1,42 +1,69 @@
 <template>
   <div>
-    <el-form-item :label="i18nt('背景颜色')"><el-color-picker v-model="optionModel.echarBarOption.backgroundColor"></el-color-picker></el-form-item>
-    <el-form-item :label="i18nt('竖展示')"><el-switch v-model="alignX"></el-switch></el-form-item>
-<!--    <el-form-item :label="i18nt('designer.setting.dsEnabled')"><el-switch v-model="optionModel.dsEnabled"></el-switch></el-form-item>
-    <el-form-item v-if="optionModel.dsEnabled" :label="i18nt('请求访问')">
-      <el-input
-        class="search-input"
-        max="200"
-        v-model="optionModel.accessName"
-        @clear="
-		  optionModel.accessCode = '';
-          $forceUpdate();
-        "
-        v-el-readonly
-        clearable
-      >
-        <i slot="suffix" class="el-input__icon el-icon-search" @click="showRequestaccessDialog = true"></i>
-      </el-input>
-    </el-form-item>-->
-    <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">柱体设置</el-divider></el-form-item>
-    <el-form-item :label="i18nt('最大宽度')"><el-slider v-model="barMaxWidth"></el-slider></el-form-item>
-    <el-form-item :label="i18nt('圆角')"><el-slider v-model="barBorderRadius"></el-slider></el-form-item>
-    <el-form-item :label="i18nt('最小高度')"><el-slider v-model="barMinHeight"></el-slider></el-form-item>
+    <el-form-item :label="i18nt('背景颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.backgroundColor"></el-color-picker>
+    </el-form-item>
+    <el-form-item :label="i18nt('竖展示')">
+      <el-switch v-model="alignX"></el-switch>
+    </el-form-item>
+    <!--    <el-form-item :label="i18nt('designer.setting.dsEnabled')"><el-switch v-model="optionModel.dsEnabled"></el-switch></el-form-item>
+        <el-form-item v-if="optionModel.dsEnabled" :label="i18nt('请求访问')">
+          <el-input
+            class="search-input"
+            max="200"
+            v-model="optionModel.accessName"
+            @clear="
+          optionModel.accessCode = '';
+              $forceUpdate();
+            "
+            v-el-readonly
+            clearable
+          >
+            <i slot="suffix" class="el-input__icon el-icon-search" @click="showRequestaccessDialog = true"></i>
+          </el-input>
+        </el-form-item>-->
+    <el-form-item label="自定义图表配置" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('echartConfig', ['dataId', 'formCode'])">
+        <span>{{ optionModel.echartConfig }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">柱体设置</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('最大宽度')">
+      <el-slider v-model="barMaxWidth"></el-slider>
+    </el-form-item>
+    <el-form-item :label="i18nt('圆角')">
+      <el-slider v-model="barBorderRadius"></el-slider>
+    </el-form-item>
+    <el-form-item :label="i18nt('最小高度')">
+      <el-slider v-model="barMinHeight"></el-slider>
+    </el-form-item>
 
-    <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">标题设置</el-divider></el-form-item>
-    <el-form-item :label="i18nt('显示标题')"><el-switch v-model="optionModel.echarBarOption.title.show"></el-switch></el-form-item>
-    <el-form-item :label="i18nt('标题')"><el-input v-model="optionModel.echarBarOption.title.text"></el-input></el-form-item>
-   <!-- <el-form-item :label="i18nt('字体颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.textStyle.color"></el-color-picker></el-form-item>
-    <el-form-item :label="i18nt('字体粗细')">
-      <el-select v-model="optionModel.echarBarOption.title.textStyle.fontWeight">
-        <el-option label="正常" value="normal"></el-option>
-        <el-option label="粗体" value="bold"></el-option>
-        <el-option label="特粗体" value="bolder"></el-option>
-        <el-option label="细体" value="lighter"></el-option>
-      </el-select>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">标题设置</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示标题')">
+      <el-switch v-model="optionModel.echarBarOption.title.show"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('标题')">
+      <el-input v-model="optionModel.echarBarOption.title.text"></el-input>
+    </el-form-item>
+    <!-- <el-form-item :label="i18nt('字体颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.textStyle.color"></el-color-picker></el-form-item>
+     <el-form-item :label="i18nt('字体粗细')">
+       <el-select v-model="optionModel.echarBarOption.title.textStyle.fontWeight">
+         <el-option label="正常" value="normal"></el-option>
+         <el-option label="粗体" value="bold"></el-option>
+         <el-option label="特粗体" value="bolder"></el-option>
+         <el-option label="细体" value="lighter"></el-option>
+       </el-select>
+     </el-form-item>
+     <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.title.textStyle.fontSize"></base-input-number></el-form-item> -->
+    <el-form-item :label="i18nt('背景颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.title.backgroundColor"></el-color-picker>
     </el-form-item>
-    <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.title.textStyle.fontSize"></base-input-number></el-form-item> -->
-    <el-form-item :label="i18nt('背景颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.backgroundColor"></el-color-picker></el-form-item>
     <el-form-item :label="i18nt('字体位置')">
       <el-select v-model="optionModel.echarBarOption.title.left">
         <el-option label="居中" value="center"></el-option>
@@ -44,7 +71,9 @@
         <el-option label="右对齐" value="right"></el-option>
       </el-select>
     </el-form-item>
-    <el-form-item :label="i18nt('副标题')"><el-input v-model="optionModel.echarBarOption.title.subtext"></el-input></el-form-item>
+    <el-form-item :label="i18nt('副标题')">
+      <el-input v-model="optionModel.echarBarOption.title.subtext"></el-input>
+    </el-form-item>
     <!-- <el-form-item :label="i18nt('字体颜色')"><el-color-picker v-model="optionModel.echarBarOption.title.subtextStyle.color"></el-color-picker></el-form-item>
     <el-form-item :label="i18nt('字体粗细')">
       <el-select v-model="optionModel.echarBarOption.title.subtextStyle.fontWeight">
@@ -56,40 +85,96 @@
     </el-form-item>
     <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.title.subtextStyle.fontSize"></base-input-number></el-form-item> -->
 
-    <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">X轴设置</el-divider></el-form-item>
-    <el-form-item :label="i18nt('显示')"><el-switch v-model="optionModel.echarBarOption.xAxis.show"></el-switch></el-form-item>
-    <el-form-item :label="i18nt('坐标名')"><el-input v-model="optionModel.echarBarOption.xAxis.name"></el-input></el-form-item>
-    <el-form-item :label="i18nt('坐标名颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.nameTextStyle.color"></el-color-picker></el-form-item>
-    <el-form-item :label="i18nt('坐标字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.xAxis.nameTextStyle.fontSize"></base-input-number></el-form-item>
-    <el-form-item :label="i18nt('数值颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.axisLabel.color"></el-color-picker></el-form-item>
-    <el-form-item :label="i18nt('数值字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.xAxis.axisLabel.fontSize"></base-input-number></el-form-item>
-    <el-form-item :label="i18nt('数值角度')"><el-slider v-model="optionModel.echarBarOption.xAxis.axisLabel.rotate"></el-slider></el-form-item>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">X轴设置</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示')">
+      <el-switch v-model="optionModel.echarBarOption.xAxis.show"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('坐标名')">
+      <el-input v-model="optionModel.echarBarOption.xAxis.name"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('坐标名颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.xAxis.nameTextStyle.color"></el-color-picker>
+    </el-form-item>
+    <el-form-item :label="i18nt('坐标字号')">
+      <base-input-number :scale="0"
+                         v-model="optionModel.echarBarOption.xAxis.nameTextStyle.fontSize"></base-input-number>
+    </el-form-item>
+    <el-form-item :label="i18nt('数值颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.xAxis.axisLabel.color"></el-color-picker>
+    </el-form-item>
+    <el-form-item :label="i18nt('数值字号')">
+      <base-input-number :scale="0" v-model="optionModel.echarBarOption.xAxis.axisLabel.fontSize"></base-input-number>
+    </el-form-item>
+    <el-form-item :label="i18nt('数值角度')">
+      <el-slider v-model="optionModel.echarBarOption.xAxis.axisLabel.rotate"></el-slider>
+    </el-form-item>
 
-    <el-form-item :label="i18nt('轴反转')"><el-switch v-model="optionModel.echarBarOption.xAxis.inverse"></el-switch></el-form-item>
+    <el-form-item :label="i18nt('轴反转')">
+      <el-switch v-model="optionModel.echarBarOption.xAxis.inverse"></el-switch>
+    </el-form-item>
     <!-- <el-form-item :label="i18nt('轴颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.axisLine.lineStyle.color"></el-color-picker></el-form-item> -->
-    <el-form-item :label="i18nt('分割线显示')"><el-switch v-model="optionModel.echarBarOption.xAxis.splitLine.show"></el-switch></el-form-item>
+    <el-form-item :label="i18nt('分割线显示')">
+      <el-switch v-model="optionModel.echarBarOption.xAxis.splitLine.show"></el-switch>
+    </el-form-item>
     <!-- <el-form-item :label="i18nt('分割线颜色')"><el-color-picker v-model="optionModel.echarBarOption.xAxis.splitLine.lineStyle.color"></el-color-picker></el-form-item> -->
 
-    <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">Y轴设置</el-divider></el-form-item>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">Y轴设置</el-divider>
+    </el-form-item>
 
-    <el-form-item :label="i18nt('显示')"><el-switch v-model="optionModel.echarBarOption.yAxis.show"></el-switch></el-form-item>
-        <el-form-item :label="i18nt('坐标名')"><el-input v-model="optionModel.echarBarOption.yAxis.name"></el-input></el-form-item>
-        <el-form-item :label="i18nt('坐标名颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.nameTextStyle.color"></el-color-picker></el-form-item>
-        <el-form-item :label="i18nt('坐标字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.yAxis.nameTextStyle.fontSize"></base-input-number></el-form-item>
-        <el-form-item :label="i18nt('数值颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLabel.color"></el-color-picker></el-form-item>
-        <el-form-item :label="i18nt('数值字号')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.yAxis.axisLabel.fontSize"></base-input-number></el-form-item>
-        <el-form-item :label="i18nt('数值角度')"><el-slider v-model="optionModel.echarBarOption.yAxis.axisLabel.rotate"></el-slider></el-form-item>
+    <el-form-item :label="i18nt('显示')">
+      <el-switch v-model="optionModel.echarBarOption.yAxis.show"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('坐标名')">
+      <el-input v-model="optionModel.echarBarOption.yAxis.name"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('坐标名颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.yAxis.nameTextStyle.color"></el-color-picker>
+    </el-form-item>
+    <el-form-item :label="i18nt('坐标字号')">
+      <base-input-number :scale="0"
+                         v-model="optionModel.echarBarOption.yAxis.nameTextStyle.fontSize"></base-input-number>
+    </el-form-item>
+    <el-form-item :label="i18nt('数值颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLabel.color"></el-color-picker>
+    </el-form-item>
+    <el-form-item :label="i18nt('数值字号')">
+      <base-input-number :scale="0" v-model="optionModel.echarBarOption.yAxis.axisLabel.fontSize"></base-input-number>
+    </el-form-item>
+    <el-form-item :label="i18nt('数值角度')">
+      <el-slider v-model="optionModel.echarBarOption.yAxis.axisLabel.rotate"></el-slider>
+    </el-form-item>
 
-        <el-form-item :label="i18nt('轴显示')"><el-switch v-model="optionModel.echarBarOption.yAxis.axisLine.show"></el-switch></el-form-item>
-        <el-form-item :label="i18nt('轴反转')"><el-switch v-model="optionModel.echarBarOption.yAxis.inverse"></el-switch></el-form-item>
-        <el-form-item :label="i18nt('轴颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLine.lineStyle.color"></el-color-picker></el-form-item>
-        <el-form-item :label="i18nt('分割线显示')"><el-switch v-model="optionModel.echarBarOption.yAxis.splitLine.show"></el-switch></el-form-item>
-        <el-form-item :label="i18nt('分割线颜色')"><el-color-picker v-model="optionModel.echarBarOption.yAxis.splitLine.lineStyle.color"></el-color-picker></el-form-item>
+    <el-form-item :label="i18nt('轴显示')">
+      <el-switch v-model="optionModel.echarBarOption.yAxis.axisLine.show"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('轴反转')">
+      <el-switch v-model="optionModel.echarBarOption.yAxis.inverse"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('轴颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.yAxis.axisLine.lineStyle.color"></el-color-picker>
+    </el-form-item>
+    <el-form-item :label="i18nt('分割线显示')">
+      <el-switch v-model="optionModel.echarBarOption.yAxis.splitLine.show"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('分割线颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.yAxis.splitLine.lineStyle.color"></el-color-picker>
+    </el-form-item>
 
-    <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">数值设定</el-divider></el-form-item>
-    <el-form-item :label="i18nt('显示数值')"><el-switch v-model="showSeriesLabel"></el-switch></el-form-item>
-    <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.series[0].label.fontSize"></base-input-number></el-form-item>
-    <el-form-item :label="i18nt('颜色')"><el-color-picker v-model="optionModel.echarBarOption.series[0].label.color"></el-color-picker></el-form-item>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">数值设定</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示数值')">
+      <el-switch v-model="showSeriesLabel"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('字体大小')">
+      <base-input-number :scale="0" v-model="optionModel.echarBarOption.series[0].label.fontSize"></base-input-number>
+    </el-form-item>
+    <el-form-item :label="i18nt('颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.series[0].label.color"></el-color-picker>
+    </el-form-item>
     <el-form-item :label="i18nt('字体粗细')">
       <el-select v-model="optionModel.echarBarOption.series[0].label.fontWeight">
         <el-option label="正常" value="normal"></el-option>
@@ -99,14 +184,36 @@
       </el-select>
     </el-form-item>
 
-    <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">提示语设置</el-divider></el-form-item>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">提示语设置</el-divider>
+    </el-form-item>
     <!-- <el-form-item :label="i18nt('字体大小')"><base-input-number :scale="0" v-model="optionModel.echarBarOption.tooltip.textStyle.fontSize"></base-input-number></el-form-item> -->
-    <el-form-item :label="i18nt('网格线颜色')"><el-color-picker v-model="optionModel.echarBarOption.tooltip.borderColor"></el-color-picker></el-form-item>
+    <el-form-item :label="i18nt('网格线颜色')">
+      <el-color-picker v-model="optionModel.echarBarOption.tooltip.borderColor"></el-color-picker>
+    </el-form-item>
 
     <!-- <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">坐标轴边距设置</el-divider></el-form-item>
 
     <el-form-item label-width="0"><el-divider class="custom-divider-margin-top">渐变色</el-divider></el-form-item>-->
 
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">自定义配色</el-divider>
+    </el-form-item>
+    <draggable tag="ul" class="draggable-box" :list="optionModel.echarBarOption.colors"
+               v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.el-icon-s-operation' }">
+      <li v-for="(colorItem, index) in optionModel.echarBarOption.colors" :key="index">
+        <i class="el-icon-s-operation"></i>
+        <el-color-picker v-model="optionModel.echarBarOption.colors[index]"></el-color-picker>
+        <!-- {{colorItem}} -->
+        <el-button circle plain size="mini" type="danger" @click="deleteColor(index)" icon="el-icon-minus"
+                   class="col-delete-button"></el-button>
+      </li>
+    </draggable>
+    <el-button type="text" @click="addColor" icon="el-icon-circle-plus-outline" class="add-option">{{
+        i18nt('新增配色')
+      }}
+    </el-button>
+
     <requestaccessDialog
       v-if="showRequestaccessDialog"
       :visiable.sync="showRequestaccessDialog"
@@ -119,13 +226,15 @@
 
 <script>
 import i18n from '../../../../../../components/xform/utils/i18n';
-import { deepClone } from '../../../../../../components/xform/utils/util';
+import {deepClone} from '../../../../../../components/xform/utils/util';
 import Draggable from 'vuedraggable';
 import requestaccessDialog from '../../../../../../views/user/form/report_requestaccess/dialog.vue';
+import eventMixin
+  from "@base/components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: 'echart-bar-editor',
-  mixins: [i18n],
+  mixins: [eventMixin, i18n],
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -137,7 +246,7 @@ export default {
     requestaccessDialog
   },
   computed: {
-    reportTemplate: function() {
+    reportTemplate: function () {
       return this.getReportTemplate();
     },
     nameSet: {
@@ -243,8 +352,15 @@ export default {
       if (rows.length) {
         let row = rows[0];
         this.optionModel.accessName = row.accessName;
-		this.optionModel.accessCode = row.accessCode;
+        this.optionModel.accessCode = row.accessCode;
       }
+    },
+    addColor() {
+      if(!this.optionModel.echarBarOption.colors)this.$set(this.optionModel.echarBarOption,'colors',[]);
+      this.optionModel.echarBarOption.colors.push('');
+    },
+    deleteColor(index) {
+      this.optionModel.echarBarOption.colors.splice(index, 1);
     }
   }
 };