From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 4427e05..fb07d01 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -30,8 +30,6 @@
     </el-dialog>
 
     <avue-input v-model="text" :disabled="disabled" :placeholder="title" @click="!disabled && (visible=true)"></avue-input>
-    <!--<avue-input-table ref="referTable"  :props="props"  :column="column" :on-load="onLoad" v-model="value"  :placeholder="title" ></avue-input-table>
-  -->
   </div>
 </template>
 
@@ -86,9 +84,13 @@
     this.getParams();
   },
   mounted() {
-    if(this.referConfig.options.page){
-      this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
-      this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
+    if(this.referConfig.options.tableConfig.page){
+      this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+      this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
+    }else if(!validatenull(this.referConfig.options.limit)){
+      this.page.pageSize=this.referConfig.options.limit
+    }else if(!validatenull(this.referConfig.options.tableConfig.limit)){
+      this.page.pageSize=this.referConfig.options.tableConfig.limit
     }
   },
   computed:{
@@ -120,9 +122,15 @@
         queryParams['referBo'] = this.options['referBo'] || this.options['referType'];
       }
       queryParams['referType'] = queryParams['referBo']
-      if (this.options.remoteSort && this.options.initSort) {
+      if (this.options.initSort) {
         queryParams['order'] = this.options.initSort.type;//鏂规硶
         queryParams['sort'] = this.options.initSort.field;//瀛楁
+      }
+      if(this.options.sortField){
+        queryParams['sort'] = this.options.sortField;//瀛楁
+      }
+      if(this.options.sortType){
+        queryParams['order'] = this.options.sortType;//鏂规硶
       }
       if (this.options.conditionParams) {
         //璇存槑鏄墿灞曞睘鎬�
@@ -248,24 +256,48 @@
         if(isMutiValue){
           var valueFieldArray = _that.props.value.split(",");
           valueFieldArray.forEach((_itemField,_indexField)=>{
-            value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+            let itemValue=item[_itemField];
+            if(itemValue==undefined || itemValue == null){
+              itemValue=item['data'][_itemField]
+            }
+            value.push( itemValue + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
           })
         }else {
-          value.push(item[_that.props.value] || item['data'][_that.props.value]);
+          let itemValue=item[_that.props.value];
+          if(itemValue==undefined || itemValue == null){
+            itemValue=item['data'][_that.props.value]
+          }
+          value.push(itemValue);
         }
         if(isMutiRaw) {
           var rawFieldArray = _that.props.label.split(",");
           rawFieldArray.forEach((_itemField,_indexField)=>{
-            text.push((item[_itemField] || item['data'][_itemField]) + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+            let itemText=item[_itemField];
+            if(itemText==undefined || itemText == null){
+              itemText=item['data'][_itemField]
+            }
+            text.push(itemText + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
           })
         }else{
-          text.push(item[_that.props.label] || item['data'][_that.props.label]);
+          let itemText=item[_that.props.label];
+          if(itemText==undefined || itemText == null){
+            itemText=item['data'][_that.props.label]
+          }
+          text.push(itemText);
         }
       })
 
+      let mapFields =this.referConfig.fieldMap || {};
+      try {
+        if(!validatenull(this.options.mapFields)){
+          mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
+        }
+      }catch (e) {
+
+      }
       this.value=value.join(',');
       this.text=text.join(',')
-      this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:this.referConfig.fieldMap});
+      this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});
       this.visible=false;
     },
     searchReset() {

--
Gitblit v1.9.3