cloud-web-corejs 1.0.54-dev.15 → 1.0.54-dev.151

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

@@ -9,10 +9,12 @@
 -->
 
 <template>
-  <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}">
+  <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}" v-show="!field.options.hidden || (designState === true)">
     <div>
       <template v-if="formItemProp=='false'">
-        <slot></slot>
+        <template v-if="!field.options.hidden">
+          <slot></slot>
+        </template>
       </template>
       <template v-else>
         <el-form-item v-if="!!field.formItemFlag && (!field.options.hidden || (designState === true))"

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

@@ -3,7 +3,7 @@ import i18n from '../../../../../../components/xform/utils/i18n';
 import fieldMixin from '../../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin';
 
 import {deepClone} from '../../../../../../components/xform/utils/util';
-
+import {extendDeeply} from "@base/utils/index.js";
 import {use} from 'echarts/core';
 import {CanvasRenderer} from 'echarts/renderers';
 import {BarChart} from 'echarts/charts';
@@ -53,7 +53,6 @@ modules = {
       serieClone: {},
       showChart: true,
       colors: [
-
         {
           type: 'linear',
           x: 0.5,
@@ -206,6 +205,9 @@ modules = {
           delete chartOptions.yAxis.data;
         }
       }
+    },
+    chartOption() {
+      return this.field.options.echarBarOption
     }
   },
   beforeCreate() {
@@ -220,6 +222,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarBarOption.series[0]);
   },
 
@@ -232,6 +235,37 @@ modules = {
   },
 
   methods: {
+    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) {
         this.showChart = true;
@@ -364,7 +398,7 @@ modules = {
       });
     },
     setValue(rows) {
-      this.showChart  = false;
+      this.showChart = false;
       let serieClone = this.serieClone;
       let resDatas = rows || [];
       let axisDatas = [];
@@ -383,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 = [];
@@ -409,9 +447,12 @@ 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() {
+      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: {
@@ -157,6 +79,9 @@ modules = {
         return height;
       }
       return '';
+    },
+    chartOption() {
+      return this.field.options.echarCategoryOption
     }
   },
   beforeCreate() {
@@ -171,6 +96,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarCategoryOption.series[0]);
     // this.loadData();
   },
@@ -184,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;
@@ -312,7 +270,7 @@ modules = {
       });
     },
     setValue(rows) {
-      this.showChart  = false;
+      this.showChart = false;
       let serieClone = this.serieClone;
       let resDatas = rows || [];
       let axisDatas = [];
@@ -331,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 = [];
@@ -360,9 +330,12 @@ modules = {
       chartOptions.xAxis.data = axisDatas;
       chartOptions.series = newSeries;
 
-      this.$nextTick(()=>{
-        this.showChart  = true;
+      this.$nextTick(() => {
+        this.showChart = true;
       })
+    },
+    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: {
@@ -77,6 +79,9 @@ modules = {
         return height;
       }
       return '';
+    },
+    chartOption() {
+      return this.field.options.echarPieOption
     }
   },
   beforeCreate() {
@@ -91,6 +96,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarPieOption.series[0]);
     // this.loadData();
   },
@@ -104,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;
@@ -188,6 +198,9 @@ modules = {
       this.$nextTick(() => {
         this.showChart = true;
       })
+    },
+    getChart() {
+      return this.$refs.chart;
     }
   }
 };

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

@@ -4,7 +4,21 @@
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
     <el-button icon="el-icon-plus" type="warning" class="el-button-tag" v-if="designState"></el-button>
-    <projectTagView v-else v-model="fieldModel" :readonly="field.options.readonly"></projectTagView>
+    <div v-else>
+      <el-tag
+        v-for="(tag,index) in fieldModel"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="!field.options.disabled && field.options.tabDeleteEnabled"
+        @close="deleteCallback(index)"
+      >
+        {{ tag[field.options.tagLabelField] }}
+      </el-tag>
+      <el-button icon="el-icon-plus" type="warning" class="el-button-tag" @click="openProjectTagDialog"
+                 v-if="!field.options.disabled"></el-button>
+    </div>
+
   </form-item-wrapper>
 </template>
 
@@ -13,7 +27,6 @@ import FormItemWrapper from './form-item-wrapper'
 import emitter from '../../../../../components/xform/utils/emitter'
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import projectTagView from "../../../../../components/projectTag/view.vue";
 
 export default {
   name: "project-tag-widget",
@@ -45,7 +58,6 @@ export default {
     }
   },
   components: {
-    projectTagView,
     FormItemWrapper,
   },
   inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
@@ -124,6 +136,58 @@ export default {
       });
 
     },
+    openProjectTagDialog() {
+      if (this.field.options.onClick) {
+        this.handleCustomEvent(this.field.options.onClick);
+        return
+      }
+      let formCode = this.field.options.tagFormCode;
+      let tagLabelField = this.field.options.tagLabelField;
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let tagFormLabelField = this.field.options.tagFormLabelField;
+      let tagFormUniqueField = this.field.options.tagFormUniqueField;
+      /*let checkRows = this.fieldModel.map(item => {
+        return {
+          [tagFormUniqueField]: item[tagUniqueField] ?? null,
+          [tagFormLabelField]: item[tagLabelField] ?? null,
+        }
+      })*/
+      let tagFormParam = this.handleCustomEvent(this.field.options.tagFormParam)
+      this.getFormRef().openSearchDialog({
+        formCode,
+        param: tagFormParam,
+        // rows: checkRows,
+        multiple: true,
+        confirm: (rows) => {
+          if (!this.field.options.tagConfirmCallback) {
+            let tagFillConfig = this.field.options.tagFillConfig || [];
+            let items = rows.map(item => {
+              let newData = {
+                [tagUniqueField]: item[tagFormUniqueField],
+                [tagLabelField]: item[tagFormLabelField],
+              }
+              tagFillConfig.forEach(item1 => {
+                newData[item1.targetField] = item[item1.sourceField]
+              })
+              return newData
+            });
+            this.addTagData(items);
+          } else {
+            this.handleCustomEvent(this.field.options.tagConfirmCallback, ['rows'], [rows])
+          }
+        }
+      });
+    },
+    addTagData(rows) {
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let keys = this.fieldModel.map(item => item[tagUniqueField]);
+      let items = rows.filter(item => !keys.includes(item[tagUniqueField]))
+      this.fieldModel.push(...items);
+    },
+    deleteCallback(index) {
+      this.fieldModel.splice(index, 1)
+      this.handleCustomEvent(this.field.options.tagDeleteCallback)
+    }
   }
 }
 </script>

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

@@ -11,9 +11,9 @@
                          :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio-button>
       </template>
       <template v-else>
-        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
-                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio>
+                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
     </el-radio-group>
   </form-item-wrapper>
@@ -67,7 +67,12 @@
       }
     },
     computed: {
-
+      labelField(){
+        return this.field.options.labelKey || "label";
+      },
+      valueField(){
+        return this.field.options.valueKey || "value";
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +83,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItems()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -18,8 +18,8 @@
                @change="handleChangeEvent"
                :style="'width:'+field.options.widgetWidth+' !important;'"
                :class="{'custom-width':field.options.widgetWidth!=null}">
-      <el-option v-for="item in field.options.optionItems" :key="item.value" :label="getI18nLabel(item.label)"
-                 :value="item.value" :disabled="item.disabled">
+      <el-option v-for="item in field.options.optionItems" :key="item[valueField]" :label="getI18nLabel(item[labelField])"
+                 :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
     <span v-else>{{ fieldModelLabel }}</span>
@@ -73,6 +73,12 @@ export default {
     }
   },
   computed: {
+    labelField(){
+      return this.field.options.labelKey || "label";
+    },
+    valueField(){
+      return this.field.options.valueKey || "value";
+    },
     allowDefaultFirstOption() {
       return (!!this.field.options.filterable && !!this.field.options.allowCreate)
     },

package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue

@@ -76,7 +76,12 @@ export default {
       if (this.designState) {
         return
       }
-      let opt = {title: this.field.options.exportFileName || null, targetRef: this.field.options.tableRef || null};
+      let opt = {
+        title: this.field.options.exportFileName || null,
+        targetRef: this.field.options.tableRef || 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};
       let tableRef = options?.targetRef;