cloud-web-corejs 1.0.54-dev.17 → 1.0.54-dev.171

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

@@ -9,10 +9,29 @@
 -->
 
 <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">
+          <template v-if="isShowWidget()">
+            <slot></slot>
+          </template>
+<!--          <template v-else-if="field.options.widgetTextFlag===3">
+            <aLinkWidget
+              :field="field"
+              :form-model="$parent.formModel"
+              :designer="designer"
+              :key="field.options.widgetTextLinkConfig.id"
+              :parent-list="parentList"
+              :index-of-parent-list="indexOfParentList"
+              :parent-widget="parentWidget"
+            ></aLinkWidget>
+          </template>-->
+          <template v-else>
+            <span>{{ getShowValue() }}</span>
+          </template>
+        </template>
       </template>
       <template v-else>
         <el-form-item v-if="!!field.formItemFlag && (!field.options.hidden || (designState === true))"
@@ -22,7 +41,8 @@
                       :class="[selected ? 'selected' : '', labelAlign, customClass, field.options.required ? 'required' : '']"
                       @click.native.stop="selectField(field)">
 
-          <span v-if="!!field.options.labelIconClass" slot="label" class="custom-label" :style="{'color':field.options.labelColor}">
+          <span v-if="!!field.options.labelIconClass" slot="label" class="custom-label"
+                :style="{'color':field.options.labelColor}">
             <template v-if="field.options.labelIconPosition === 'front'">
               <template v-if="!!field.options.labelTooltip">
                 <el-tooltip :content="field.options.labelTooltip" effect="light">
@@ -38,10 +58,26 @@
                 {{ label }}<i :class="field.options.labelIconClass"></i></template>
             </template>
           </span>
-          <span v-if="!!field.options.labelColor" slot="label"  :style="{'color':field.options.labelColor}">
+          <span v-if="!!field.options.labelColor" slot="label" :style="{'color':field.options.labelColor}">
             {{ label }}
           </span>
-          <slot></slot>
+          <template v-if="isShowWidget()">
+            <slot></slot>
+          </template>
+<!--          <template v-else-if="field.options.widgetTextFlag===3">
+            <aLinkWidget
+              :field="field"
+              :form-model="$parent.formModel"
+              :designer="designer"
+              :key="field.options.widgetTextLinkConfig.id"
+              :parent-list="parentList"
+              :index-of-parent-list="indexOfParentList"
+              :parent-widget="parentWidget"
+            ></aLinkWidget>
+          </template>-->
+          <template v-else>
+            <span>{{ getShowValue() }}</span>
+          </template>
         </el-form-item>
       </template>
     </div>
@@ -74,6 +110,7 @@ import {getSubFormNameByFieldId} from "../../../../../components/xform/utils/uti
 
 export default {
   name: "form-item-wrapper",
+  // components: {aLinkWidget: () => import("@base/components/xform/form-designer/form-widget/field-widget/a-text-widget.vue")},
   mixins: [i18n],
   props: {
     field: Object,
@@ -162,6 +199,7 @@ export default {
   },
   created() {
     //
+    this.initShowType();
   },
   methods: {
     isSubFormItem() {
@@ -252,7 +290,133 @@ export default {
     },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;
-    }
+    },
+    initShowType() {
+      if (!!this.designer) return
+      let that = this.$parent
+      let formRef = that.getFormRef ? that.getFormRef() : that;
+
+      //详情页，新增页面不加密
+      let fJson = formRef.formJson;
+      let formConfig = fJson.formConfig;
+      if (formConfig.isLoadEntity && !formRef.dataId) return
+
+      let bdService = formRef.bdService;
+      let companyCode = this.$store.getters.companyCode;
+      let loginAccount = this.$store.getters.loginAccount;
+
+      let userSaleOrgDTOs = formRef.userSaleOrgDTOs;
+      let userRoleDTOs = formRef.userRoleDTOs;
+
+      let saleOrgCodeList = userSaleOrgDTOs.map(item => item.sn);
+      let roleCodeList = userRoleDTOs.map(item => item.roleCode);
+
+      let optionModel = this.field.options;
+
+      let flag = 0;//0 原本组件，1明文文本，2密文文本
+      if (optionModel.showTextEnabled) {
+        flag = 1;
+      } else if (optionModel.showEncryptTextEnabled) {
+        flag = 2;
+      }else if (optionModel.showLinkTextEnabled) {
+        flag = 3;
+      }
+      if (optionModel.userTextRuleEnabled) {
+        let userTextRuleConfig = optionModel.userTextRuleConfig || [];
+        userTextRuleConfig.forEach(item => {
+          let type = item.type ?? null;
+          if (type !== null && type !== "") {
+            let companyCodeStr = item.companyCodes;
+            let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
+            /*
+
+                        let loginAccountStr = item.loginAccounts;
+                        let loginAccounts = loginAccountStr ? loginAccountStr.split(",").filter(item => !!item) : [];
+
+                        let saleOrgCodeStr = item.saleOrgCodes;
+                        let saleOrgCodes = saleOrgCodeStr ? saleOrgCodeStr.split(",").filter(item => !!item) : [];
+            */
+
+            let roleCodeStr = item.roleCodes;
+            let roleCodes = roleCodeStr ? roleCodeStr.split(",").filter(item => !!item) : [];
+
+            let flag1 = !item.serveName || item.serveName == bdService;
+            let flag2 = !companyCodes.length || companyCodes.includes(companyCode)
+            // let flag3 = !loginAccounts.length || loginAccounts.includes(loginAccount)
+            // let flag4 = this.compareToList(saleOrgCodes, saleOrgCodeList)
+            let flag5 = this.compareToList(roleCodes, roleCodeList)
+            let result = flag1 && flag2 && flag5;
+            if (result) {
+              flag = type;
+            }
+          }
+        })
+      }
+      this.field.options.widgetTextFlag = flag
+      // this.showType = flag;
+    },
+    compareToList(list1, list2) {
+      if (!list1.length) {
+        return true;
+      }
+      if (!list2.length) {
+        return false;
+      }
+      return list1.some(item => {
+        return list2.some(item2 => item == item2)
+      });
+    },
+    isShowWidget() {
+      let widgetTextFlag = this.field.options.widgetTextFlag;
+      return widgetTextFlag === undefined || widgetTextFlag === null || widgetTextFlag === 0
+    },
+    getShowValue() {
+      let widgetTextFlag = this.field.options.widgetTextFlag;
+      let fieldModel = this.$parent.fieldModel;
+      let showValue = fieldModel
+      if (widgetTextFlag == 2) {
+        let optionModel = this.field.options;
+        showValue = "*******";
+        if ((optionModel.textRule1 || optionModel.textRule2 || optionModel.textRule3)) {
+          if (fieldModel && !optionModel.textRule1) {
+            let size = fieldModel.length;
+            let optionModel = this.field.options;
+
+            let str1 = "";
+            let str2 = "";
+            let flag2 = optionModel.textRule2 && optionModel.textRule2Number;
+            let flag3 = optionModel.textRule3 && optionModel.textRule3Number;
+            if (flag2) {
+              if (size >= optionModel.textRule2Number) {
+                str1 = fieldModel.slice(0, optionModel.textRule2Number)
+              }
+            }
+            if (flag3) {
+              if (size >= optionModel.textRule3Number) {
+                str2 = fieldModel.slice(-optionModel.textRule3Number)
+              }
+            }
+            if (flag2 && flag3) {
+              if (size >= optionModel.textRule2Number + optionModel.textRule3Number) {
+                showValue = str1 + "*****" + str2;
+              }
+            } else if (flag2) {
+              if (str1) {
+                showValue = str1 + "*****"
+              }
+            } else if (flag3) {
+              if (str2) {
+                showValue = "*****" + str2
+              }
+            }
+
+          }
+        }
+
+      }
+
+      return showValue;
+    },
 
   }
 }

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

@@ -5,7 +5,7 @@
     :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('导入')}}
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>
 
@@ -61,14 +61,11 @@ 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;
       this.getFormRef().openImportDialog({
         importOption: this.field.options,
-        callback: () => {
-          // this.getWidgetRef(tableTarget).searchEvent();
+        importFrontOnly: false,
+        callback: (resultData, file, done) => {
+
         }
       });
     }

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

@@ -0,0 +1,80 @@
+<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="primary" 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({
+        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;
     }
   }
 };