cloud-web-corejs 1.0.79 → 1.0.81

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

@@ -9,10 +9,18 @@
 -->
 
 <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="showType === 0">
+            <slot></slot>
+          </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 +30,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 +47,15 @@
                 {{ 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="showType === 0">
+            <slot></slot>
+          </template>
+          <template v-else>
+            <span>{{ getShowValue() }}</span>
+          </template>
         </el-form-item>
       </template>
     </div>
@@ -160,8 +174,14 @@ export default {
     },
 
   },
+  data() {
+    return {
+      showType: 0
+    }
+  },
   created() {
     //
+    this.initShowType();
   },
   methods: {
     isSubFormItem() {
@@ -252,7 +272,119 @@ 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 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;
+      }
+      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.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)
+      });
+    },
+    getShowValue() {
+      let fieldModel = this.$parent.fieldModel;
+      let showValue = fieldModel
+      if (this.showType == 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/radio-widget.vue

@@ -6,12 +6,12 @@
                     :disabled="field.options.disabled" :size="field.options.size"
                     @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-radio-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                          :disabled="item.disabled" :border="field.options.border"
                          :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[valueField]"
+        <el-radio v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
                   :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
@@ -73,6 +73,9 @@
       valueField(){
         return this.field.options.valueKey || "value";
       },
+      optionItems(){
+        return this.getOptionItems();
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

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

@@ -18,7 +18,7 @@
                @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[valueField]" :label="getI18nLabel(item[labelField])"
+      <el-option v-for="(item,index) in optionItems" :key="index" :label="getI18nLabel(item[labelField])"
                  :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
@@ -87,6 +87,9 @@ export default {
       let optionItems = this.field.options.optionItems;
       let optionItem = optionItems.find(item => item.value === fieldModel)
       return optionItem && optionItem.label ? optionItem.label : null;
+    },
+    optionItems(){
+      return this.getOptionItems();
     }
 
   },

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

@@ -1,20 +1,29 @@
 <template>
-  <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
-                     :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
-                     :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <span>{{fieldModel}}</span>
+  <form-item-wrapper
+    :designer="designer"
+    :field="field"
+    :rules="rules"
+    :design-state="designState"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <span>{{ showVaule }}</span>
   </form-item-wrapper>
 </template>
 
 <script>
-import FormItemWrapper from './form-item-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
+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";
 
 export default {
   name: "text-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -25,37 +34,40 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-
   },
   components: {
     FormItemWrapper,
   },
-  inject: ['refList', 'globalOptionData', 'globalModel'],
+  inject: ["refList", "globalOptionData", "globalModel"],
   data() {
     return {
       oldFieldValue: null, //field组件change之前的值
       fieldModel: null,
       rules: [],
-    }
+    };
   },
   computed: {
-
-
+    showVaule() {
+      let value = !this.field.options.autoValueEnabled
+        ? this.fieldModel
+        : this.handleCustomEvent(this.field.options.autoValueHanlde);
+      return value;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -64,29 +76,29 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.initFieldModel()
-    this.registerToRefList()
-    this.initEventHandler()
-    this.buildFieldRules()
+    this.initFieldModel();
+    this.registerToRefList();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
-  methods: {
-
-  }
-}
+  methods: {},
+};
 </script>
 
 <style lang="scss" scoped>
 @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
-::v-deep .el-form-item{min-height: 34px;}
+::v-deep .el-form-item {
+  min-height: 34px;
+}
 </style>

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

@@ -17,6 +17,12 @@
                 resultType="Array"
                 :edit="!field.options.disabled"
                 @callback="submitFile"
+                :hideInfo="field.options.hideFileInfo"
+                :hideName="field.options.hideFileName"
+                :showSize="!!field.options.showFileSize"
+                :createBy="!!field.options.showFileCreateBy"
+                :createDate="!!field.options.showFileCreateDate"
+                :widgetSize="field.options.fileShowImageSize"
                 v-else></baseUpload>
   </form-item-wrapper>
 </template>