cloud-web-corejs 1.0.68 → 1.0.69

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.68",
+  "version": "1.0.69",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-bar-mixin.js

@@ -53,7 +53,6 @@ modules = {
       serieClone: {},
       showChart: true,
       colors: [
-
         {
           type: 'linear',
           x: 0.5,
@@ -207,7 +206,7 @@ modules = {
         }
       }
     },
-    chartOption(){
+    chartOption() {
       return this.field.options.echarBarOption
     }
   },
@@ -236,9 +235,36 @@ modules = {
   },
 
   methods: {
-    initOption(){
+    reflush(){
+      this.showChart = false;
+      this.$nextTick(()=>{
+        this.showChart = true
+      })
+    },
+    getColors(){
+      let chartColors = this.field.options.echarBarOption.colors || [];
+      let colors = [...chartColors, ...this.colors];
+      return colors
+    },
+    adjustColor() {
+      let colors = this.getColors();
+      let colorsSize = colors.length;
+      this.field.options.echarBarOption.series.forEach((serie, index) => {
+        if (colorsSize > index) {
+          if (serie.itemStyle) {
+            serie.itemStyle.color = colors[index]
+          } else {
+            serie.itemStyle = {
+              color: colors[index]
+            }
+          }
+        }
+      })
+    },
+    initOption() {
       let echartConfig = this.handleCustomEvent(this.field.options.echartConfig) || {};
       this.field.options.echarBarOption = extendDeeply(this.field.options.echarBarOption, echartConfig);
+      this.adjustColor();
     },
     /*async loadData() {
       if (this.designState) {
@@ -372,7 +398,7 @@ modules = {
       });
     },
     setValue(rows) {
-      this.showChart  = false;
+      this.showChart = false;
       let serieClone = this.serieClone;
       let resDatas = rows || [];
       let axisDatas = [];
@@ -391,14 +417,18 @@ modules = {
           nameDatas.push(resData.name);
         }
       });
-      let colors = this.colors;
+      let colors = this.getColors();
       let colorsSize = colors.length;
       nameDatas.forEach((nameItem, index) => {
         let serie = deepClone(serieClone);
         serie.name = nameItem;
-        if (serie.itemStyle) {
-          if (colorsSize > index) {
+        if (colorsSize > index) {
+          if (serie.itemStyle) {
             serie.itemStyle.color = colors[index]
+          } else {
+            serie.itemStyle = {
+              color: colors[index]
+            }
           }
         }
         let serieDatas = [];
@@ -417,11 +447,11 @@ modules = {
       let chartOptions = this.field.options.echarBarOption;
       chartOptions[this.alignField].data = axisDatas;
       chartOptions.series = newSeries;
-      this.$nextTick(()=>{
-        this.showChart  = true;
+      this.$nextTick(() => {
+        this.showChart = true;
       })
     },
-    getChart(){
+    getChart() {
       return this.$refs.chart;
     }
   }

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-category-mixin.js

@@ -9,6 +9,7 @@ import {CanvasRenderer} from 'echarts/renderers';
 import {LineChart} from 'echarts/charts';
 import {TitleComponent, TooltipComponent, LegendComponent} from 'echarts/components';
 import {THEME_KEY} from 'vue-echarts';
+import {extendDeeply} from "@base/utils/index.js";
 
 use([CanvasRenderer, LineChart, TitleComponent, TooltipComponent, LegendComponent]);
 let modules = {};
@@ -52,87 +53,8 @@ modules = {
       requestAccesses: [],
       requestAccess: null,
       serieClone: {},
-      showChart:true,
-      colors: [
-
-        {
-          type: 'linear',
-          x: 0.5,
-          y: 0.9,
-          r: 0.2,
-          colorStops: [{
-            offset: 1, color: '#08C084' // 0% 处的颜色
-          }, {
-            offset: 0, color: '#97EACE' // 100% 处的颜色
-          }],
-        },
-        {
-          type: 'linear',
-          x: 0.5,
-          y: 0.9,
-          r: 0.2,
-          colorStops: [{
-            offset: 1, color: '#29ABE3' // 0% 处的颜色
-          }, {
-            offset: 0, color: '#AADEF4' // 100% 处的颜色
-          }],
-        },
-        {
-          type: 'linear',
-          x: 0.5,
-          y: 0.9,
-          r: 0.2,
-          colorStops: [{
-            offset: 1, color: '#0044FE' // 0% 处的颜色
-          }, {
-            offset: 0, color: '#97B3FF' // 100% 处的颜色
-          }],
-        },
-        {
-          type: 'linear',
-          x: 0.5,
-          y: 0.9,
-          r: 0.2,
-          colorStops: [{
-            offset: 1, color: '#75018A' // 0% 处的颜色
-          }, {
-            offset: 0, color: '#C492CD' // 100% 处的颜色
-          }],
-        },
-        {
-          type: 'linear',
-          x: 0.5,
-          y: 0.9,
-          r: 0.2,
-          colorStops: [{
-            offset: 1, color: '#BF0104' // 0% 处的颜色
-          }, {
-            offset: 0, color: '#E59697' // 100% 处的颜色
-          }],
-        },
-        {
-          type: 'linear',
-          x: 0.5,
-          y: 0.9,
-          r: 0.2,
-          colorStops: [{
-            offset: 1, color: '#FF8B01' // 0% 处的颜色
-          }, {
-            offset: 0, color: '#FFCF95' // 100% 处的颜色
-          }],
-        },
-        {
-          type: 'linear',
-          x: 0.5,
-          y: 0.9,
-          r: 0.2,
-          colorStops: [{
-            offset: 1, color: '#FAFE09' // 0% 处的颜色
-          }, {
-            offset: 0, color: '#FCFFAF' // 100% 处的颜色
-          }],
-        }
-      ]
+      showChart: true,
+      colors: []
     };
   },
   computed: {
@@ -158,8 +80,8 @@ modules = {
       }
       return '';
     },
-    chartOption(){
-      return this.field.options.echarBarOption
+    chartOption() {
+      return this.field.options.echarCategoryOption
     }
   },
   beforeCreate() {
@@ -174,6 +96,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarCategoryOption.series[0]);
     // this.loadData();
   },
@@ -187,6 +110,38 @@ modules = {
   },
 
   methods: {
+    getColors() {
+      let chartColors = this.field.options.echarCategoryOption.colors || [];
+      let colors = [...chartColors, ...this.colors];
+      return colors
+    },
+    adjustColor() {
+      let colors = this.getColors();
+      let colorsSize = colors.length;
+      this.field.options.echarCategoryOption.series.forEach((serie, index) => {
+        if (colorsSize > index) {
+          if (serie.lineStyle) {
+            serie.lineStyle.color = colors[index]
+          } else {
+            serie.lineStyle = {
+              color: colors[index]
+            }
+          }
+          if (serie.itemStyle) {
+            serie.itemStyle.color = colors[index]
+          } else {
+            serie.itemStyle = {
+              color: colors[index]
+            }
+          }
+        }
+      })
+    },
+    initOption() {
+      let echartConfig = this.handleCustomEvent(this.field.options.echartConfig) || {};
+      this.field.options.echarCategoryOption = extendDeeply(this.field.options.echarCategoryOption, echartConfig);
+      this.adjustColor();
+    },
     /*async loadData() {
       if (this.designState) {
         return;
@@ -315,7 +270,7 @@ modules = {
       });
     },
     setValue(rows) {
-      this.showChart  = false;
+      this.showChart = false;
       let serieClone = this.serieClone;
       let resDatas = rows || [];
       let axisDatas = [];
@@ -334,16 +289,28 @@ modules = {
           nameDatas.push(resData.name);
         }
       });
-      let colors = this.colors;
+      let colors = this.getColors();
       let colorsSize = colors.length;
       nameDatas.forEach((nameItem, index) => {
         let serie = deepClone(serieClone);
         serie.name = nameItem;
-        /*if (serie.lineStyle) {
-          if (colorsSize > index) {
+        if (colorsSize > index) {
+          if (serie.lineStyle) {
             serie.lineStyle.color = colors[index]
+          } else {
+            serie.lineStyle = {
+              color: colors[index]
+            }
+          }
+          if (serie.itemStyle) {
+            serie.itemStyle.color = colors[index]
+          } else {
+            serie.itemStyle = {
+              color: colors[index]
+            }
           }
-        }*/
+        }
+
         delete serie.lineStyle
 
         let serieDatas = [];
@@ -363,11 +330,11 @@ modules = {
       chartOptions.xAxis.data = axisDatas;
       chartOptions.series = newSeries;
 
-      this.$nextTick(()=>{
-        this.showChart  = true;
+      this.$nextTick(() => {
+        this.showChart = true;
       })
     },
-    getChart(){
+    getChart() {
       return this.$refs.chart;
     }
   }

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-pie-mixin.js

@@ -9,6 +9,7 @@ import {CanvasRenderer} from 'echarts/renderers';
 import {PieChart} from 'echarts/charts';
 import {TitleComponent, TooltipComponent, LegendComponent} from 'echarts/components';
 import {THEME_KEY} from 'vue-echarts';
+import {extendDeeply} from "@base/utils/index.js";
 
 use([CanvasRenderer, PieChart, TitleComponent, TooltipComponent, LegendComponent]);
 
@@ -53,6 +54,7 @@ modules = {
       requestAccess: null,
       serieClone: {},
       showChart: true,
+      colors:[]
     };
   },
   computed: {
@@ -79,7 +81,7 @@ modules = {
       return '';
     },
     chartOption() {
-      return this.field.options.echarBarOption
+      return this.field.options.echarPieOption
     }
   },
   beforeCreate() {
@@ -94,6 +96,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarPieOption.series[0]);
     // this.loadData();
   },
@@ -107,6 +110,10 @@ modules = {
   },
 
   methods: {
+    initOption() {
+      let echartConfig = this.handleCustomEvent(this.field.options.echartConfig) || {};
+      this.field.options.echarPieOption = extendDeeply(this.field.options.echarPieOption, echartConfig);
+    },
     /*async loadData() {
       if (this.designState) {
         return;

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

@@ -196,6 +196,24 @@
 
     <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"
@@ -336,6 +354,13 @@ export default {
         this.optionModel.accessName = row.accessName;
         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);
     }
   }
 };

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

@@ -203,11 +203,11 @@
     <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.echarCategoryOption.color"
+    <draggable tag="ul" class="draggable-box" :list="optionModel.echarCategoryOption.colors"
                v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.el-icon-s-operation' }">
-      <li v-for="(colorItem, index) in optionModel.echarCategoryOption.color" :key="index">
+      <li v-for="(colorItem, index) in optionModel.echarCategoryOption.colors" :key="index">
         <i class="el-icon-s-operation"></i>
-        <el-color-picker v-model="optionModel.echarCategoryOption.color[index]"></el-color-picker>
+        <el-color-picker v-model="optionModel.echarCategoryOption.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>
@@ -356,10 +356,10 @@ export default {
   },
   methods: {
     addColor() {
-      this.optionModel.echarCategoryOption.color.push('');
+      this.optionModel.echarCategoryOption.colors.push('');
     },
     deleteColor(index) {
-      this.optionModel.echarCategoryOption.color.splice(index, 1);
+      this.optionModel.echarCategoryOption.colors.splice(index, 1);
     },
     addOption() {
       this.nameSet.push('');

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -1999,10 +1999,11 @@ export const advancedFields = [
             color: "",
             fontWeight: "normal"
           },
-          data: [{
-            value: 1048,
-            name: 'Search Engine'
-          },
+          data: [
+            {
+              value: 1048,
+              name: 'Search Engine'
+            },
             {
               value: 735,
               name: 'Direct'
@@ -2047,6 +2048,7 @@ export const advancedFields = [
       echarBarOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2219,6 +2221,7 @@ export const advancedFields = [
       echarCategoryOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2329,6 +2332,23 @@ export const advancedFields = [
             shadowBlur: 4,
             shadowOffsetY: 6
           },
+          itemStyle: {
+            color: {
+              type: 'linear',
+              x: 0.5,
+              y: 0.5,
+              r: 0.5,
+              colorStops: [{
+                offset: 0, color: '#08C084' // 0% 处的颜色
+              }, {
+                offset: 1, color: '#97EACE' // 100% 处的颜色
+              }],
+            },
+            cap: 'round',
+            shadowColor: '#08C08450',
+            shadowBlur: 4,
+            shadowOffsetY: 6
+          },
           emphasis: {
             scale: 1,
             focus: 'series'
@@ -2363,6 +2383,23 @@ export const advancedFields = [
             shadowBlur: 4,
             shadowOffsetY: 6
           },
+          itemStyle: {
+            color: {
+              type: 'linear',
+              x: 0.5,
+              y: 0.5,
+              r: 0.5,
+              colorStops: [{
+                offset: 0, color: '#FF6116' // 0% 处的颜色
+              }, {
+                offset: 1, color: '#F9A980' // 100% 处的颜色
+              }],
+            },
+            cap: 'round',
+            shadowColor: '#FF611650',
+            shadowBlur: 4,
+            shadowOffsetY: 6
+          },
           emphasis: {
             scale: 1,
             focus: 'series'
@@ -2728,6 +2765,8 @@ export const advancedFields = [
       exportFileName: '导出',
       tableRef: '',
       tableExportParam: "",
+      showImageAtTable: false,
+
       onCreated: "",
       onMounted: "",
       wfFlag: 1,
@@ -2832,6 +2871,7 @@ export const advancedFields = [
       label: "导入",
       columnWidth: "200px",
       size: "",
+      importFileLimitSize: 200,
       // displayStyle: "block",
       disabled: !1,
       hidden: !1,