cloud-web-corejs 1.0.54-dev.170 → 1.0.54-dev.172

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

@@ -468,10 +468,10 @@ modules = {
       }
     },
     getOptionKey(){
-      let key =  +"optionItems-"+ this.field.options.name
+      let key =  "optionItems-"+ this.field.options.name
       return key;
     },
-    async initOptionItems(keepSelected) {
+    async initOptionItems(gloatFlag) {
       var t = this;
       if (this.designState) {
         return;
@@ -489,15 +489,13 @@ modules = {
         let scriptCode = this.field.options.formScriptCode || "getList";
         let tableParam = this.tableParam;
         if (formScriptEnabled) {
-          if(tableParam){
-            // tableParam.column.params.optionItems
-            let key =  this.getOptionKey();
-            let optionItems = tableParam.column.params[key];
+          /*if(tableParam){
+            let optionItems = this.getGloatOptionItems()
             if(optionItems!==undefined){
               return
             }
-            tableParam.column.params[key] = null
-          }
+            this.setGloatOptionItems(null)
+          }*/
           let accessParam = this.handleCustomEvent(
             this.field.options.formScriptParam
           );
@@ -524,15 +522,13 @@ modules = {
         } else if (this.field.options.commonAttributeEnabled) {
           let commonAttributeCode = this.field.options.commonAttributeCode;
           if (!commonAttributeCode) return;
-          if(tableParam){
-            // tableParam.column.params.optionItems
-            let key =  this.getOptionKey();
-            let optionItems = tableParam.column.params[key];
+          /*if(tableParam){
+            let optionItems = this.getGloatOptionItems();
             if(optionItems!==undefined){
               return
             }
-            tableParam.column.params[key] = null
-          }
+            this.setGloatOptionItems(null)
+          }*/
           this.$getBaseDicts({
             code: commonAttributeCode,
             success: ({dicts, dictMap}) => {
@@ -547,12 +543,14 @@ modules = {
         }else{
           if(tableParam){
             // tableParam.column.params.optionItems
-            let key =  this.getOptionKey();
-            let optionItems = tableParam.column.params[key];
+            // let key =  this.getOptionKey();
+            // let optionItems = tableParam.column.params[key];
+            let optionItems = this.getGloatOptionItems();
             if(optionItems!==undefined){
               return
             }
-            tableParam.column.params[key] = this.$baseLodash.cloneDeep(this.field.options.optionItems);
+            // tableParam.column.params[key] = this.$baseLodash.cloneDeep(this.field.options.optionItems);
+            this.setGloatOptionItems(this.$baseLodash.cloneDeep(this.field.options.optionItems));
           }
         }
 
@@ -1118,7 +1116,7 @@ modules = {
         ? (this.fieldModel = [])
         : (this.fieldModel = ""));
     },
-    loadRowOptions: function (e) {
+    loadRowGloatOptions: function (e) {
       let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,
@@ -1135,25 +1133,33 @@ modules = {
         this.field.options.valueKey || "value"
       );
       this.field.options.optionItems = optionItems
-      let tableParam = this.tableParam;
+      /*let tableParam = this.tableParam;
       if(tableParam){
-        let key =  this.getOptionKey()
-        tableParam.column.params[key] = optionItems;
-        // tableParam.column.params.optionItems = optionItems;
+        this.setGloatOptionItems(optionItems)
         tableParam.column.params.rowOptionFlag = rowOptionFlag
-      }
+      }*/
+    },
+    getGloatOptionItems: function (e, rowOptionFlag) {
+      let key =  this.getOptionKey()
+      return this.getGlobalParam(key);
+    },
+    setGloatOptionItems: function (optionItems) {
+      let key =  this.getOptionKey()
+      return this.setGlobalParam(key,optionItems);
     },
     reloadOptions: function (e) {
-      this.field.options.optionItems = baseRefUtil.translateOptionItems(
+      let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,
         this.field.options.labelKey || "label",
         this.field.options.valueKey || "value"
       );
+      this.field.options.optionItems = optionItems;
       let tableParam = this.tableParam;
       if(tableParam){
-        let key = this.getOptionKey();
-        tableParam.column.params[key] = optionItems;
+        // let key = this.getOptionKey();
+        // tableParam.column.params[key] = optionItems;
+        this.setGloatOptionItems(optionItems)
         // tableParam.column.params.optionItems = optionItems;
       }
     },
@@ -1170,13 +1176,12 @@ modules = {
       // return this.field.options.optionItems;
       let tableParam = this.tableParam;
       let optionItems = this.field.options.optionItems;
-      if(tableParam){
-        let key =  this.getOptionKey();
-        let rows = tableParam.column.params[key];
+      /*if(tableParam){
+        let rows = this.getGloatOptionItems()
         if(!tableParam.column.params.rowOptionFlag && rows!==undefined){
           optionItems = rows || []
         }
-      }
+      }*/
       return optionItems;
     },
     setUploadHeader: function (e, t) {

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

@@ -17,17 +17,19 @@
           <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-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>
@@ -64,17 +66,19 @@
           <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-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>
@@ -110,7 +114,6 @@ 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,
@@ -318,7 +321,7 @@ export default {
         flag = 1;
       } else if (optionModel.showEncryptTextEnabled) {
         flag = 2;
-      }else if (optionModel.showLinkTextEnabled) {
+      } else if (optionModel.showLinkTextEnabled) {
         flag = 3;
       }
       if (optionModel.userTextRuleEnabled) {
@@ -373,6 +376,7 @@ export default {
     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) {
         let optionModel = this.field.options;
@@ -417,7 +421,24 @@ export default {
 
       return showValue;
     },
-
+    getWidgetClass() {
+      let list = [];
+      let optionModel = this.field.options.widgetTextLinkConfig?.options || {};
+      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.underline) list.push('underLine');
+      if (this.field.options.disabled) list.push('is-disabled');
+      return list
+    },
+    handleClick() {
+      if (this.field.options.disabled) return;
+      let optionModel = this.field.options.widgetTextLinkConfig?.options || {};
+      this.$parent.handleCustomEvent(optionModel.onClick);
+    },
+    getWidgetValue() {
+      let fieldModel = this.$parent.fieldModel;
+      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      return fieldModel;
+    }
   }
 }
 </script>
@@ -539,5 +560,8 @@ export default {
   text-align: right;
 }
 
+.a-link.is-disabled {
+  cursor: no-drop;
+}
 
 </style>

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

@@ -192,7 +192,10 @@ export default {
           this.currentData[labelField] = val;
         }
       }
-    }
+    },
+    fieldModelLabel() {
+      return this.showValue;
+    },
   }
 }
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/textFlag-editor.vue

@@ -3,7 +3,7 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">显示设置</el-divider>
     </el-form-item>
-<!--    <el-form-item :label="i18nt('显示超链接')">
+    <el-form-item :label="i18nt('显示超链接')">
       <el-switch v-model="optionModel.showLinkTextEnabled" @change="changeShowLinkTextEnabled"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('超链接配置')">
@@ -11,7 +11,7 @@
         <span></span>
         <i class="el-icon-edit"></i>
       </a>
-    </el-form-item>-->
+    </el-form-item>
     <el-form-item :label="i18nt('仅显示明文文本')">
       <el-switch v-model="optionModel.showTextEnabled" @change="optionModel.showEncryptTextEnabled=false;optionModel.showLinkTextEnabled=false;"></el-switch>
     </el-form-item>
@@ -229,6 +229,7 @@ export default {
       if(!this.optionModel.widgetTextLinkConfig){
         widget = this.designer.copyNewFieldWidget(this.designer.getFieldWidgetByType("a-link"));
         this.$set(this.optionModel,'widgetTextLinkConfig',widget)
+        widget.options.underline = true;
       }else{
         widget = this.optionModel.widgetTextLinkConfig
       }
@@ -236,7 +237,6 @@ export default {
       widget.options.keyName = keyName;
       widget.options.labelHidden = true
       widget.options.isFormLabel = true
-
       return widget;
     },
     openLinkConfig(){