cloud-web-corejs 1.0.54-dev.34 → 1.0.54-dev.341

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

@@ -4,8 +4,8 @@
     :display-style="field.options.displayStyle"
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
-    <el-button type="primary" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
-               :disabled="field.options.disabled">{{$t1('导入')}}
+    <el-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>
 
@@ -61,14 +61,16 @@ export default {
 
   methods: {
     importHandle() {
-      let scriptCode = this.field.options.importScriptCode;
-      let entity = this.field.options.importEntity;
-      let importAttachCode = this.field.options.importAttachCode;
-      // let importCodes = this.field.options.importCodes;
+      let multi = this.field.options.importMultiple || false;
+      let multiSize = this.field.options.importMultiSize || 1;
       this.getFormRef().openImportDialog({
+        target: this,
         importOption: this.field.options,
-        callback: () => {
-          // this.getWidgetRef(tableTarget).searchEvent();
+        importFrontOnly: false,
+        multi,
+        multiSize,
+        callback: (resultData, file, done) => {
+
         }
       });
     }

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

@@ -0,0 +1,81 @@
+<template>
+  <static-content-wrapper
+    :designer="designer" :field="field" :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :parent-widget="parentWidget" :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList">
+    <el-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
+    </el-button>
+  </static-content-wrapper>
+
+</template>
+<script>
+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 StaticContentWrapper
+  from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
+
+export default {
+  name: "import2-button-widget",
+  components: {StaticContentWrapper},
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+    designState: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      exportOption: {}
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+  created() {
+
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+
+  methods: {
+    importHandle() {
+      this.getFormRef().openImportDialog({
+        target: this,
+        importOption: this.field.options,
+        importFrontOnly: true,
+        callback: (resultData, file, done) => {
+
+        }
+      });
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+
+</style>

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/mixins/vabsearch-mixin.js

@@ -0,0 +1,176 @@
+import FormItemWrapper from '@base/components/xform/form-designer/form-widget/field-widget/form-item-wrapper'
+import emitter from '@base/components/xform/utils/emitter'
+import i18n from "@base/components/xform/utils/i18n";
+import {deepClone} from "@base/components/xform/utils/util";
+import fieldMixin from "@base/components/xform/form-designer/form-widget/field-widget/fieldMixin";
+
+export default {
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false
+    },
+    columnConfig: {
+      type: Object,
+      default: null
+    },
+    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
+      type: String,
+      default: ''
+    }
+  },
+  components: {
+    FormItemWrapper
+  },
+  data() {
+    let multipleChoices = this.field.options.multipleChoices || false;
+    let defaultValue = !multipleChoices ? null : [];
+    return {
+      oldFieldValue: defaultValue, //field组件change之前的值
+      fieldModel: defaultValue,
+      showValue2: null,
+      rules: [],
+      showSearchialog: false,
+      dialogContent: null,
+      showSysSearchialog: false,
+      systemDialogParam: {},
+      showVformDialog: false,
+      code: null,
+      formDialogOption: {}
+    }
+  },
+  watch: {
+    fieldModel(val) {
+      this.handleChangeEvent(val);
+    },
+    showValue(val) {
+      this.setShowValue(val);
+    }
+  },
+  computed: {
+    showValue() {
+      let currentData = this.currentData;
+      let fieldKeyName = this.fieldKeyName;
+      let vabSearchName = this.field.options.vabSearchName;
+      let multipleChoices = this.field.options.multipleChoices || false;
+      let labelField = this.field.options.vabSearchName || fieldKeyName;
+      let value = null;
+      if (!multipleChoices) {
+        value = currentData[labelField] ?? null;
+      } else {
+        if (this.fieldModel) {
+          value = this.fieldModel.map(item => item[labelField]).join(",");
+        }
+      }
+      this.showValue2 = value;
+      return value
+    },
+    tableRow() {
+      let tableParam = this.tableParam;
+      return tableParam && tableParam.row ? tableParam.row : null;
+    },
+    currentData() {
+      let tableParam = this.tableParam;
+      return tableParam && tableParam.row ? tableParam.row : this.formModel;
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    if (this.field.options.readonly == undefined) {
+      this.$set(this.field.options, "readonly", true);
+    }
+    this.initFieldModel()
+    this.registerToRefList()
+    this.initEventHandler()
+    this.buildFieldRules()
+
+    this.handleOnCreated()
+    // this.initValue();
+  },
+
+  mounted() {
+    this.handleOnMounted()
+
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+  methods: {
+    setShowValue(val = null) {
+      let multipleChoices = this.field.options.multipleChoices || false;
+      if (!multipleChoices) {
+        let fieldKeyName = this.fieldKeyName;
+        let labelField = this.field.options.vabSearchName || fieldKeyName;
+        // this.$set(this.currentData, labelField, val)
+
+        this.currentData[labelField] = val
+        this.showValue2 = val;
+      }
+    },
+    setValue: function (e) {
+      if (this.field.formItemFlag) {
+        let data = this.tableRow || this.formModel;
+        var t = deepClone(this.fieldModel);
+        this.fieldModel = e,
+          this.initFileList(),
+          this.syncUpdateFormModel(e),
+          this.emitFieldDataChange(e, t);
+      }
+    },
+    clearHandle() {
+      let multipleChoices = this.field.options.multipleChoices || false;
+      let defaultValue = !multipleChoices ? null : [];
+      this.setShowValue(null)
+      this.setValue(defaultValue)
+      if (this.field.options.onSearchClear) {
+        let tableParam = this.tableParam;
+        let eventParamNames = [];
+        let eventParamValues = [];
+        if (tableParam) {
+          eventParamNames = ['rowData', 'rowIndex'];
+          eventParamValues = [tableParam.row, tableParam.rowIndex];
+        }
+        this.handleCustomEvent(this.field.options.onSearchClear, eventParamNames, eventParamValues)
+
+        /* var e = new Function(this.field.options.onSearchClear);
+         e.call(this);*/
+      }
+      this.handleClearSearchDialog();
+    },
+    changeShowValue2(val) {
+      if (this.field.options.readonly === false) {
+        let multipleChoices = this.field.options.multipleChoices || false;
+        if (!multipleChoices) {
+          let fieldKeyName = this.fieldKeyName;
+          let vabSearchName = this.field.options.vabSearchName;
+          let labelField = this.field.options.vabSearchName || fieldKeyName;
+          this.currentData[labelField] = val;
+        }
+      }
+    },
+    fieldModelLabel() {
+      return this.showValue;
+    },
+  }
+}