cloud-web-corejs 1.0.54-dev.27 → 1.0.54-dev.272

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

@@ -9,10 +9,31 @@
 -->
 
 <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 && field.options.widgetTextLinkConfig">
+            <div class="ellipsis">
+              <a class="a-link" :class="getWidgetClass()" @click.native="handleClick">
+              <span>
+                <i :class="field.options.widgetTextLinkConfig.options.prefixIcon"
+                   v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"></i>
+                <span>{{ getWidgetValue() }}</span>
+                <i :class="field.options.widgetTextLinkConfig.options.suffixIcon"
+                   v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"></i>
+              </span>
+              </a>
+            </div>
+          </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 +43,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 +60,28 @@
                 {{ 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 && field.options.widgetTextLinkConfig">
+            <div class="ellipsis">
+              <a class="a-link" :class="getWidgetClass()" @click="handleClick">
+              <span>
+                <i :class="field.options.widgetTextLinkConfig.options.prefixIcon"
+                   v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"></i>
+                <span>{{ getWidgetValue() }}</span>
+                <i :class="field.options.widgetTextLinkConfig.options.suffixIcon"
+                   v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"></i>
+              </span>
+              </a>
+            </div>
+          </template>
+          <template v-else>
+            <span>{{ getShowValue() }}</span>
+          </template>
         </el-form-item>
       </template>
     </div>
@@ -102,6 +142,11 @@ export default {
     rules: Array,
   },
   inject: ["getFormConfig", "getSubFormFieldFlag", "getSubFormName", "tableParam", "formItemProp", "getObjectFieldFlag", "getObjectName"],
+  data(){
+    return {
+      encryptFormula:null
+    }
+  },
   computed: {
     formConfig: function () {
       return this.getFormConfig()
@@ -136,6 +181,9 @@ export default {
     },
 
     labelAlign() {
+      if (!this?.field?.options?.labelAlign) {
+        return ""
+      }
       if (!!this.field.options.labelAlign) {
         return this.field.options.labelAlign
       }
@@ -162,6 +210,7 @@ export default {
   },
   created() {
     //
+    this.initShowType();
   },
   methods: {
     isSubFormItem() {
@@ -252,8 +301,209 @@ export default {
     },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;
-    }
+    },
+    getProcessText(text,pattern) {
 
+      if (pattern == '' || pattern === null || pattern === undefined) {
+        return text;
+      }
+
+      let result = '';
+
+      // 处理固定模式
+      if (pattern === '-') {
+        result = '-';
+      }
+      else if (pattern === '*') {
+        result = '*****';
+      }
+      // 处理自定义模式
+      else if (pattern.includes('*')) {
+        text = text ?? ""
+        const parts = pattern.split('*');
+
+        // 处理 A*B 模式
+        if (parts.length === 2 && parts[0] && parts[1]) {
+          const a = parseInt(parts[0]);
+          const b = parseInt(parts[1]);
+
+          if (!isNaN(a) && !isNaN(b) && a >= 0 && b >= 0) {
+            if (text.length >= a + b) {
+              const prefix = text.substring(0, a);
+              const suffix = text.substring(text.length - b);
+              const stars = '*'.repeat(text.length - a - b);
+              result = prefix + stars + suffix;
+            } else {
+              result = '*****';
+            }
+          } else {
+            // result = '无效模式：A和B必须是数字';
+            result = text;
+          }
+        }
+        // 处理 A* 模式
+        else if (parts.length === 2 && parts[0] && !parts[1]) {
+          const a = parseInt(parts[0]);
+
+          if (!isNaN(a) && a >= 0) {
+            if (text.length >= a) {
+              const prefix = text.substring(0, a);
+              const stars = '*'.repeat(text.length - a);
+              result = prefix + stars;
+            } else {
+              result = '*****';
+            }
+          } else {
+            // result = '无效模式：A必须是数字';
+            result = text;
+          }
+        }
+        // 处理 *B 模式
+        else if (parts.length === 2 && !parts[0] && parts[1]) {
+          const b = parseInt(parts[1]);
+
+          if (!isNaN(b) && b >= 0) {
+            if (text.length >= b) {
+              const suffix = text.substring(text.length - b);
+              const stars = '*'.repeat(text.length - b);
+              result = stars + suffix;
+            } else {
+              result = '*****';
+            }
+          } else {
+            // result = '无效模式：B必须是数字';
+            result = text;
+          }
+        }
+        // 处理无效模式
+        else {
+          result = '*****';
+        }
+      }
+      // 处理其他无效模式
+      else {
+        result = '*****';
+      }
+
+      return result;
+    },
+    initShowType() {
+      if (!!this.designer) return
+      let that = this.$parent
+      let formRef = that.getFormRef ? that.getFormRef() : that;
+
+      if(!formRef)return
+      //详情页，新增页面不加密
+      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)
+            if(flag1 && flag2){
+              this.encryptFormula = item.encryptFormula
+              let flag5 = this.compareToList(roleCodes, roleCodeList)
+              if(flag5){
+                //匹配角色
+                if(type == 2)flag = 2//type=2时加密
+              }else {
+                //角色不匹配
+                if(type == 1)flag = 2
+              }
+            }
+          }
+        })
+      }
+      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;
+      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      let showValue = fieldModel
+      if (widgetTextFlag == 2) {
+        showValue = this.getProcessText(showValue,this.encryptFormula)
+      }
+
+      return showValue;
+    },
+    getWidgetClass() {
+      let list = [];
+      let optionModel = this.field.options.widgetTextLinkConfig?.options || {};
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
+      if (optionModel.underline) list.push('underLine');
+      if (this.field.options.disabled) list.push('is-disabled');
+      return list
+    },
+    handleClick(event) {
+      if(this.field.options.disabled) return;
+      this.$parent.handleButtonWidgetClick(event, true)
+      if (!this.designState && this.field.options.widgetTextLinkConfig?.options.href) {
+        window.open(this.field.options.widgetTextLinkConfig?.options.href);
+      }
+    },
+    getWidgetValue() {
+      let fieldModel = this.$parent.fieldModel;
+      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      return fieldModel;
+    }
   }
 }
 </script>
@@ -375,5 +625,8 @@ export default {
   text-align: right;
 }
 
+.a-link.is-disabled {
+  cursor: no-drop;
+}
 
 </style>

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,12 @@ 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({
+        target: this,
         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,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;
     }
   }
 };