cloud-web-corejs 1.0.109 → 1.0.111

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

@@ -142,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()
@@ -297,6 +302,91 @@ 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
@@ -321,13 +411,13 @@ export default {
       let optionModel = this.field.options;
 
       let flag = 0;//0 原本组件，1明文文本，2密文文本
-      if (optionModel.showTextEnabled) {
+      /*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 => {
@@ -351,10 +441,16 @@ export default {
             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;
+            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
+              }
             }
           }
         })
@@ -383,44 +479,7 @@ export default {
       if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
       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
-              }
-            }
-
-          }
-        }
-
+        showValue = this.getProcessText(showValue,this.encryptFormula)
       }
 
       return showValue;
@@ -428,7 +487,7 @@ export default {
     getWidgetClass() {
       let list = [];
       let optionModel = this.field.options.widgetTextLinkConfig?.options || {};
-      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
       if (optionModel.underline) list.push('underLine');
       if (this.field.options.disabled) list.push('is-disabled');
       return list

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

@@ -59,7 +59,7 @@
     data() {
       return {
         oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        fieldModel: undefined,
         rules: [],
       }
     },

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

@@ -3,8 +3,12 @@
                      :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">
-    <status-tag ref="statusTag" :statusType="field.options.statusType" :param="statusParam"
-                :value="fieldModel"></status-tag>
+    <template v-for="(item,index) in field.options.statusParam">
+      <span
+        v-if="fieldModel===item.value"
+        :key="index" class="list-tag"
+        :class="item.type">{{ getI18nLabel(item.label) }}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -56,7 +60,8 @@ export default {
       fieldModel: null,
       rules: [],
       isH5: false,
-      option: {}
+      option: {},
+      statusParam: [],
     }
   },
   watch: {
@@ -64,16 +69,6 @@ export default {
       this.handleChangeEvent(val);
     }
   },
-  computed: {
-    statusParam() {
-      return this.field.options.statusParam ? this.field.options.statusParam.map(item => {
-        return {
-          ...item,
-          label: this.getI18nLabel(item.label)
-        }
-      }) : [];
-    }
-  },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
@@ -90,6 +85,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+    // this.initStatusParam();
   },
 
   mounted() {
@@ -114,12 +110,17 @@ export default {
     },
     refreshWidget() {
       this.initStatusForDesign();
-      this.$refs.statusTag.init();
+      // this.$refs.statusTag.init();
     },
-    getFieldModelLabel(){
-      return this.$refs.statusTag.getShowLabel();
+    getFieldModelLabel() {
+      let label = null;
+      let fieldModel = this.fieldModel;
+      let item = this.field.options.statusParam.find(item => item.value === fieldModel)
+      if (item) {
+        label = this.getI18nLabel(item.label);
+      }
+      return label;
     }
-
   }
 }
 </script>

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

@@ -11,7 +11,7 @@
     :sub-form-col-index="subFormColIndex"
     :sub-form-row-id="subFormRowId"
   >
-    <span>{{ showVaule }}</span>
+    <span :class="field.options.colorClass">{{ showVaule }}</span>
   </form-item-wrapper>
 </template>