cloud-web-corejs 1.0.68 → 1.0.70

package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue

@@ -81,7 +81,10 @@ export default {
         },
         confirm: (rows, fileInfos) => {
           this.fieldModel = rows;
-          this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          let eventParamNames = ['attachments', 'fileInfos'];
+          let eventParamValues = [rows, fileInfos];
+          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
         }
       };
     }

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/form-widget/field-widget/table-export-button-widget.vue

@@ -79,7 +79,8 @@ export default {
       let opt = {
         title: this.field.options.exportFileName || null,
         targetRef: this.field.options.tableRef || null,
-        pageSize: (this.field.options.exportPageSize || null)
+        pageSize: (this.field.options.exportPageSize || null),
+        showImageAtTable: this.field.options.showImageAtTable || null
       };
       let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
       let options = {...opt, ...tableExportParam, type: type};

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue

@@ -146,10 +146,12 @@ export default {
       }
     },
     submitFile(rows, fileInfos) {
-      this.handlLineCode(fileInfos);
-      this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+      // this.handlLineCode(fileInfos);
+      let eventParamNames = ['attachments', 'fileInfos'];
+      let eventParamValues = [rows, fileInfos];
+      this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
     },
-    handlLineCode(fileInfos) {
+    /*handlLineCode(fileInfos) {
       let allPromise = [];
       fileInfos.forEach(async fileInfo => {
         await this.processFile(fileInfo.file, (lineCode) => {
@@ -176,7 +178,7 @@ export default {
     async processImage(base64, callback) {
       try {
         // 使用 ZXing 3.x 的 API
-        const result = await decode(base64,(result, err) => {
+        const result = await decode(base64, (result, err) => {
           if (err) {
             this.handleError(`条码识别失败: ${err}`);
             callback && callback(null)
@@ -205,7 +207,7 @@ export default {
       // const imageData = Uint8Array.from(atob(base64), c => c.charCodeAt(0));
       // const source = new ZXing.ImageLuminanceSource(imageData, base64.length);
 
-     decode(base64, (result, err) => {
+      decode(base64, (result, err) => {
         if (err) {
           this.handleError(`条码识别失败: ${err}`);
           callback && callback(null)
@@ -220,7 +222,7 @@ export default {
     handleError(errorMessage) {
       this.error = errorMessage;
       this.loading = false;
-    },
+    },*/
   }
 }
 </script>

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

@@ -13,7 +13,7 @@
           <el-form-item :label="i18nt('启用流程')">
             <el-switch v-model="formConfig.wfEnabled" @change="designer.vueInstance.reportTemplate.objTypeName=null"></el-switch>
           </el-form-item>
-          <el-form-item :label="i18nt('默认流程对象名')">
+          <el-form-item :label="i18nt('默认流程单据类型名称')">
             <el-input type="text" v-model="designer.vueInstance.reportTemplate.objTypeName"></el-input>
           </el-form-item>
 <!--          <el-form-item label="流程单据定义">

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/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

@@ -1,6 +1,7 @@
 <template>
   <el-form-item label="onAfterConfirmFile" label-width="150px">
-    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('onAfterConfirmFile', eventParams)">
+    <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>
@@ -9,7 +10,8 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "onAfterConfirmFile-editor",
@@ -21,7 +23,7 @@ export default {
   },
   data() {
     return {
-      eventParams: ["attachments", "fileInfos"],
+      eventParams: ["dataId", "formCode", "attachments", "fileInfos"],
     };
   },
 };

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/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -6,6 +6,9 @@
     <el-form-item label="导入数据表名">
       <el-input v-model="optionModel.importEntity"></el-input>
     </el-form-item>
+    <el-form-item label="文件大小限制（M）">
+      <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
+    </el-form-item>
     <el-form-item label="选择导入模板文件">
       <el-input
         class="search-input"

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/table-export-button-editor.vue

@@ -9,18 +9,27 @@
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
-  <el-form-item label="导出参数" label-width="150px">
-    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('tableExportParam', eventParams)">
-      <span>{{ optionModel.tableExportParam }}</span>
-      <i class="el-icon-edit"></i>
-    </a>
-  </el-form-item>
+    <el-form-item label="导出列表显示图片">
+      <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
+    </el-form-item>
+    <el-form-item label="导出每页查询数量">
+      <base-input-number v-model="optionModel.exportPageSize"
+                         :max="optionModel.showImageAtTable?150:1000"></base-input-number>
+    </el-form-item>
+    <el-form-item label="导出参数" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('tableExportParam', eventParams)">
+        <span>{{ optionModel.tableExportParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
   </div>
 </template>
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "table-export-button-editor",
@@ -35,6 +44,16 @@ export default {
       eventParams: [],
     };
   },
+  methods: {
+    changeShowImageAtTable(val) {
+      if (val) {
+        let exportPageSize = this.optionModel.exportPageSize || 0;
+        if (exportPageSize > 150) {
+          this.optionModel.exportPageSize = 150
+        }
+      }
+    }
+  }
 };
 </script>