cloud-web-corejs 1.0.54-dev.64 → 1.0.54-dev.65

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/table-column-dialog.vue

@@ -121,7 +121,7 @@
           <el-table-column :label="i18nt('导出类型')" width="200" prop="formatS">
             <template slot-scope="scope">
               <el-select v-model="scope.row.exportType" clearable>
-                <el-option value="Image" label="图片"></el-option>
+                <el-option value="Image2" label="图片"></el-option>
                 <el-option value="Number" label="数值"></el-option>
               </el-select>
             </template>

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-table-export-button/table-export-button-editor.vue

@@ -9,21 +9,27 @@
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </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="1000"></base-input-number>
+      <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>
-  <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",
@@ -38,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>
 

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="false">
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">显隐规则设置</el-divider>
     </el-form-item>

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,