cloud-web-corejs 1.0.54-dev.167 → 1.0.54-dev.169

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -1118,7 +1118,16 @@ modules = {
         ? (this.fieldModel = [])
         : (this.fieldModel = ""));
     },
-    loadOptions: function (e) {
+    loadRowOptions: function (e) {
+      let optionItems = baseRefUtil.translateOptionItems(
+        e,
+        this.field.type,
+        this.field.options.labelKey || "label",
+        this.field.options.valueKey || "value"
+      );
+      this.field.options.optionItems = optionItems
+    },
+    loadOptions: function (e,rowOptionFlag) {
       let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,
@@ -1131,6 +1140,7 @@ modules = {
         let key =  this.getOptionKey()
         tableParam.column.params[key] = optionItems;
         // tableParam.column.params.optionItems = optionItems;
+        tableParam.column.params.rowOptionFlag = rowOptionFlag
       }
     },
     reloadOptions: function (e) {
@@ -1163,7 +1173,7 @@ modules = {
       if(tableParam){
         let key =  this.getOptionKey();
         let rows = tableParam.column.params[key];
-        if(rows!==undefined){
+        if(!tableParam.column.params.rowOptionFlag && rows!==undefined){
           optionItems = rows || []
         }
       }
@@ -1293,6 +1303,21 @@ modules = {
       let name = this.parentWidget?.options?.name ?? null;
       return name ? this.getWidgetRef(name) : null;
     },
+    setWidgetTextFlag(val){
+      this.widgetTextFlag = val;
+    },
+    showWidget(){
+      this.widgetTextFlag = 0;
+    },
+    showText(){
+      this.widgetTextFlag = 1;
+    },
+    showEncryptText(){
+      this.widgetTextFlag = 2;
+    },
+    showAText(){
+      this.widgetTextFlag = 3;
+    },
   },
 };
 

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

@@ -14,9 +14,20 @@
     <div>
       <template v-if="formItemProp=='false'">
         <template v-if="!field.options.hidden">
-          <template v-if="showType === 0">
+          <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>
@@ -50,9 +61,20 @@
           <span v-if="!!field.options.labelColor" slot="label" :style="{'color':field.options.labelColor}">
             {{ label }}
           </span>
-          <template v-if="showType === 0">
+          <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>
@@ -88,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,
@@ -174,11 +197,6 @@ export default {
     },
 
   },
-  data() {
-    return {
-      showType: 0
-    }
-  },
   created() {
     //
     this.initShowType();
@@ -274,9 +292,15 @@ export default {
       return !this.designState && label ? this.$t2(label, path, param) : label;
     },
     initShowType() {
-      if (!!this.designer)return
+      if (!!this.designer) return
       let that = this.$parent
-      let formRef = that.getFormRef?that.getFormRef():that;
+      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;
@@ -294,6 +318,8 @@ export default {
         flag = 1;
       } else if (optionModel.showEncryptTextEnabled) {
         flag = 2;
+      }else if (optionModel.showLinkTextEnabled) {
+        flag = 3;
       }
       if (optionModel.userTextRuleEnabled) {
         let userTextRuleConfig = optionModel.userTextRuleConfig || [];
@@ -302,14 +328,14 @@ export default {
           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 loginAccountStr = item.loginAccounts;
+                        let loginAccounts = loginAccountStr ? loginAccountStr.split(",").filter(item => !!item) : [];
 
-            let saleOrgCodeStr = item.saleOrgCodes;
-            let saleOrgCodes = saleOrgCodeStr ? saleOrgCodeStr.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) : [];
@@ -319,14 +345,15 @@ export default {
             // let flag3 = !loginAccounts.length || loginAccounts.includes(loginAccount)
             // let flag4 = this.compareToList(saleOrgCodes, saleOrgCodeList)
             let flag5 = this.compareToList(roleCodes, roleCodeList)
-            let result = flag1 && flag2 && flag5 ;
+            let result = flag1 && flag2 && flag5;
             if (result) {
               flag = type;
             }
           }
         })
       }
-      this.showType = flag;
+      this.field.options.widgetTextFlag = flag
+      // this.showType = flag;
     },
     compareToList(list1, list2) {
       if (!list1.length) {
@@ -339,10 +366,15 @@ export default {
         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 (this.showType == 2) {
+      if (widgetTextFlag == 2) {
         let optionModel = this.field.options;
         showValue = "*******";
         if ((optionModel.textRule1 || optionModel.textRule2 || optionModel.textRule3)) {