askbot-dragon 0.7.94 → 0.7.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "0.7.94",
+  "version": "0.7.97",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/ConversationContainer.vue

@@ -13,7 +13,10 @@
       </div>
     </div> -->
 
-     <form-template :formList="formList2" @submitClick="submitClick"></form-template>
+     <form-template
+         :formList="formList2"
+         @submitClick="submitClick"
+     ></form-template>
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
         松开发送
@@ -486,7 +489,7 @@ export default {
         }
       },
       formList2: {
-        formActionId: '',
+        formActionId: '11',
         form: {
           id: 3,
           name: '表单1',
@@ -1773,7 +1776,10 @@ export default {
                 "workOrderFieldId":"4b2bea06e70b4a63a02df141f685f310"
               },
               "value":[
-
+                ["嗨嗨嗨", "哈哈哈", "嘿嘿嘿", "嘻嘻嘻"],
+                ["嗨嗨嗨"],
+                ["嗨嗨嗨", "哈哈哈"],
+                ["嗨嗨嗨", "哈哈哈", "嘿嘿嘿"],
               ],
               "display":true,
               "required":false,
@@ -2320,7 +2326,7 @@ export default {
     },
     closeVoice() {
       console.debug('我是close事件')
-    }
+    },
   },
   mounted() {
     this.timer = setInterval(() => {

package/src/components/formTemplate.vue

@@ -112,43 +112,15 @@
             </el-checkbox-group>
           </div>
           <div v-else-if="item.formField.type==='SELECT' || item.formField.type==='OPTION'" >
-<!--            <el-select
-                    v-model=item.value
-                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
-                    style="width: 100%"
-                    filterable
-                    v-if="item.formField.extInfo && item.formField.extInfo.option"
-            >
-              <el-option
-                      v-for="(items,index) in item.formField.extInfo.option"
-                      :key="index"
-                      :label="items.label"
-                      :value="items.value">
-              </el-option>
-            </el-select>
-            <el-select
-                    v-model=item.value
-                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
-                    style="width: 100%"
-                    filterable
-                    v-else-if="item.formField.extInfo && item.formField.extInfo.options"
-            >
-              <el-option
-                      v-for="(items,index) in item.formField.extInfo.options"
-                      :key="index"
-                      :label="items.label"
-                      :value="items.value">
-              </el-option>
-            </el-select>-->
             <el-select
                 v-model=item.value
                 :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
                 style="width: 100%"
                 filterable
-                v-if="item.formField.extInfo && item.formField.extInfo.option"
+                v-if="item.fieldId==='workorder_clientId' || item.fieldId === 'workorder_statusId' || item.fieldId === 'workorder_priority'"
             >
               <el-option
-                  v-for="(items,index) in item.formField.extInfo.option"
+                  v-for="(items,index) in item.formField.extInfo.option?item.formField.extInfo.option:item.formField.extInfo.options"
                   :key="index"
                   :label="items.label"
                   :value="items.value">
@@ -168,8 +140,8 @@
           </div>
           <template v-else-if="item.formField.type==='CASCADER'">
             <div class="cascader-input" @click="openDrawer(item,'pc_cascader')">
-              <template v-if="checkDatas[item.fieldId] && (Array.isArray(checkDatas[item.fieldId]) && checkDatas[item.fieldId].length > 0)">
-                <span v-for="(cas,casIndex) in checkDatas[item.fieldId]" :key="casIndex">
+              <template v-if="extInfoFieldValue[item.fieldId] && (Array.isArray(extInfoFieldValue[item.fieldId]) && extInfoFieldValue[item.fieldId].length > 0)">
+                <span v-for="(cas,casIndex) in extInfoFieldValue[item.fieldId]" :key="casIndex">
                   {{casIndex==0?cas.label:'/'+cas.label}}
                 </span>
               </template>
@@ -207,7 +179,7 @@
                       name="file"
                       action="/open/media/file/upload"
                       :multiple="item.formField.extInfo&&item.formField.extInfo.limitNum&&item.formField.extInfo.limitNum>1?true:false"
-                      :file-list="fileListList[item.fieldId]"
+                      :file-list="extInfoFieldValue[item.fieldId]"
                       :limit="item.formField.extInfo.limitNum?Number(item.formField.extInfo.limitNum):(item.formField.extInfo.limit ? Number(item.formField.extInfo.limit) : 1)"
                       :before-upload="(file=>{return beforeAvatarUpload(file,item.formField.type)})"
                       :on-exceed="exceedUpload"
@@ -242,7 +214,7 @@
               </template>
               <div
                 @click="lodeMore(item)"
-                v-if="dataQuery[item.fieldId] && dataQuery[item.fieldId].hasNextPage"
+                v-if="refNextPage[item.fieldId] && refNextPage[item.fieldId].hasNextPage"
                 style="width:100%;height:30px;display:flex;align-items: center;justify-content: center;color:#606266">
                   加载更多
               </div>
@@ -325,7 +297,7 @@
               clickable
               name="datetimePicker"
               :required="item.required || isRequiredFn(item.formField)"
-              :value=timeValue[item.fieldId]
+              :value=extInfoFieldValue[item.fieldId]
               :label=item.formField.name
               :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
               @click="timeClick(item.fieldId,item,'DATE_TIME')"
@@ -351,7 +323,7 @@
                 clickable
                 name="datetimePicker"
                 :required="item.required || isRequiredFn(item.formField)"
-                :value=timeValue[item.fieldId]
+                :value=extInfoFieldValue[item.fieldId]
                 :label=item.formField.name
                 :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
                 @click="timeClick(item.fieldId,item,'TIME')"
@@ -377,7 +349,7 @@
               clickable
               name="datetimePicker"
               :required="item.required || isRequiredFn(item.formField)"
-              :value=timeValue[item.fieldId]
+              :value=extInfoFieldValue[item.fieldId]
               :label=item.formField.name
               :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
               @click="timeClick(item.fieldId,item,'DATE')"
@@ -469,7 +441,7 @@
                 :required="item.required || isRequiredFn(item.formField)"
                 :disabled="disableds"
                 @click-right-icon.stop="SelectClear(item.fieldId)"
-                :right-icon="selectValues[item.fieldId]? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
+                :right-icon="item.value || (Array.isArray(item.value) && item.value.length > 0)? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
             />
             <van-popup v-model="selectPicker" position="bottom" :style="{ height: '300px' }">
               <select-popup
@@ -491,7 +463,7 @@
             <van-field
               readonly
               clickable
-              :value="Array.isArray(selectValues[item.fieldId])?selectValues[item.fieldId].join(','):selectValues[item.fieldId]"
+              :value="Array.isArray(extInfoFieldValue[item.fieldId])?extInfoFieldValue[item.fieldId].join(','):extInfoFieldValue[item.fieldId]"
               :label="item.formField.name"
               name="picker"
               :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
@@ -499,7 +471,7 @@
               @click-right-icon.stop="SelectClear(item.fieldId)"
               :required="item.required || isRequiredFn(item.formField)"
               :disabled="disableds"
-              :right-icon="selectValues[item.fieldId]? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
+              :right-icon="extInfoFieldValue[item.fieldId]? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
             />
             <van-popup v-model="refShowPicker" position="bottom" :style="{ height: '300px' }">
               <select-popup
@@ -514,6 +486,9 @@
                     label:'name'
                   }"
               >
+                <template slot="popup-footer" v-if="refNextPage[item.fieldId] && refNextPage[item.fieldId].hasNextPage">
+                  <span @click="lodeMore(item)">加载更多</span>
+                </template>
               </select-popup>
             </van-popup>
           </div>
@@ -522,7 +497,7 @@
               readonly
               clickable
               name="area"
-              :value="checkDatas[item.fieldId] && Array.isArray(checkDatas[item.fieldId])?checkDatas[item.fieldId].map(e=>e.label).join(','):''"
+              :value="extInfoFieldValue[item.fieldId] && Array.isArray(extInfoFieldValue[item.fieldId])?extInfoFieldValue[item.fieldId].map(e=>e.label).join('/'):''"
               :label=item.formField.name
               :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
               @click="openDrawer(item,'cascader')"
@@ -543,7 +518,7 @@
           <div @click="checkUpload(item.fieldId,item.formField.extInfo)" class="form-field-item-file">
             <div class="fileName"><span style="color: red" v-if="item.required || isRequiredFn(item.formField)">*</span>{{item.formField.name}}</div>
             <van-uploader
-                v-model="fileListList[item.fieldId]"
+                v-model="extInfoFieldValue[item.fieldId]"
                 :before-read="(file=>{return beforeRead(file,item.formField.type)})"
                 :max-count='item.formField.extInfo&&item.formField.extInfo.limitNum ? item.formField.extInfo.limitNum : (item.formField.extInfo.limit ? item.formField.extInfo.limit : 1)'
                 :after-read="afterRead"
@@ -583,7 +558,7 @@
     <el-drawer
         :withHeader="false"
         :visible.sync="drawer"
-        size="60%"
+        size="400px"
         direction="btt">
       <div class="drawer-container">
        <tree ref="drawerTree"
@@ -603,6 +578,7 @@
           :options="options"
           :defaultValue="defaultValue"
           @onConfim="confirmSelect"
+          @onclose= "selectPopUp = false"
           :multiple="detailField.formField.extInfo && detailField.formField.extInfo.selectType ==='多选'?true:false"
           ref="selectPopup"
           :props="{
@@ -724,11 +700,12 @@ export default {
       refTemplateList:{},
       refList:{},
       dataQuery:{},
+      refNextPage:{},
       drawer:false,
       detailField:{
         formField:{}
       },
-      checkDatas:[],
+      extInfoFieldValue:{},
       selectPopUp:false,
       options:[],
       defaultValue:[],
@@ -800,6 +777,15 @@ export default {
             item.value = item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:''
           }
         }
+        if (!item.relationDisplay){
+          item.value = []
+          this.extInfoFieldValue[item.fieldId] = []
+          this.selectValues[item.fieldId] = []
+          this.extInfoFieldValue[item.fieldId] = []
+          if (item.formField.extInfo.extInfoFieldValue){
+            item.formField.extInfo.extInfoFieldValue = ''
+          }
+        }
       })
       let newArr = arr.filter(item=>item.relationDisplay)
       console.debug('arr',arr,newArr)
@@ -937,8 +923,8 @@ export default {
       }
       else{
         let length = 0
-        if (this.fileListList[this.filedId]){
-          length = this.fileListList[this.filedId].length
+        if (this.extInfoFieldValue[this.filedId]){
+          length = this.extInfoFieldValue[this.filedId].length
         }
         if (file.length<=this.limitNum-length){
           for (let i=0;i<file.length;i++){
@@ -1042,12 +1028,12 @@ export default {
         imageInfo.url = ossFileUrl(this.ossConfig, res.name)
         imageInfo.status='success'
         imageInfo.name=res.name
-        for (let j=0;j<this.fileListList[this.filedId].length;j++){
-          if (this.fileListList[this.filedId][j].content&&this.fileListList[this.filedId][j].content===content){
-            this.fileListList[this.filedId][j].name=res.name
-            this.fileListList[this.filedId][j].status='success'
-            this.fileListList[this.filedId][j].url=imageInfo.url
-            delete this.fileListList[this.filedId][j].content
+        for (let j=0;j<this.extInfoFieldValue[this.filedId].length;j++){
+          if (this.extInfoFieldValue[this.filedId][j].content&&this.extInfoFieldValue[this.filedId][j].content===content){
+            this.extInfoFieldValue[this.filedId][j].name=res.name
+            this.extInfoFieldValue[this.filedId][j].status='success'
+            this.extInfoFieldValue[this.filedId][j].url=imageInfo.url
+            delete this.extInfoFieldValue[this.filedId][j].content
           }
         }
         this.fileUpload=false
@@ -1153,10 +1139,7 @@ export default {
 
         }
         if (type ==='FILE' || type == 'ATTACHMENT' || type == 'IMAGE' || type == 'VIDEO'){
-          if (this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue){
-            this.fileListList[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue
-          }
-          else if (this.formList.form.formFieldRelation[i].value){
+          if (this.formList.form.formFieldRelation[i].value){
             if (this.formList.form.formFieldRelation[i].value===null||this.formList.form.formFieldRelation[i].value===''){
               this.formList.form.formFieldRelation[i].value=[]
             }
@@ -1172,14 +1155,14 @@ export default {
                       valueList[file].url = this.formList.form.formFieldRelation[i].value[file]
                     }
                     if (type === 'object'&&JSON.stringify(this.formList.form.formFieldRelation[i].value[file])!=='{}') {
-                      this.fileListList[this.formList.form.formFieldRelation[i].fieldId]=this.formList.form.formFieldRelation[i].value
+                      this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]=this.formList.form.formFieldRelation[i].value
                     }
                     else {
-                      this.fileListList[this.formList.form.formFieldRelation[i].fieldId]=[]
+                      this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]=[]
                     }
                   }
                   if (bool){
-                    this.fileListList[this.formList.form.formFieldRelation[i].fieldId]=valueList
+                    this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]=valueList
                   }
               }
             }
@@ -1190,7 +1173,7 @@ export default {
             let name = this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue.map(item=>{
               return item.name
             })
-            this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = name
+            this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = name
           }
         }
       }
@@ -1198,12 +1181,11 @@ export default {
         let type = this.formList.form.formFieldRelation[i].formField.type
         let extInfo = this.formList.form.formFieldRelation[i].formField.extInfo
         if (type === 'CASCADER') {
-          let fieldValue = this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue?
-              this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue:
-              (this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue?
-                  this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue:[])
-
-          this.checkDatas[this.formList.form.formFieldRelation[i].fieldId] = fieldValue
+          let fieldValue = this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue ?
+              this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue :[]
+          if (!this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]){
+            this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = fieldValue
+          }
           if (this.formList.form.formFieldRelation[i].value){
             this.formList.form.formFieldRelation[i].value = this.formList.form.formFieldRelation[i].formField.defaultValue?
                 this.formList.form.formFieldRelation[i].formField.defaultValue:[];
@@ -1222,17 +1204,17 @@ export default {
             if (!this.formList.form.formFieldRelation[i].formField.extInfo.mold ||
                 this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'TIME' ||
                 this.getMoldTime(this.formList.form.formFieldRelation[i].formField.formField) == 'TIME'){
-              this.timeValue[this.formList.form.formFieldRelation[i].fieldId]=dateTime.Format('hh:mm')
+              this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]=dateTime.Format('hh:mm')
             }
             else if (this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATA_TIME' ||
                 this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATE_TIME' ||
                 this.getMoldTime(this.formList.form.formFieldRelation[i].formField.formField) == 'DATE_TIME'){
-              this.timeValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime.Format('yyyy-MM-dd hh:mm')
+              this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime.Format('yyyy-MM-dd hh:mm')
             }
             else if (this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATA' ||
                 this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATE' ||
                 this.getMoldTime(this.formList.form.formFieldRelation[i].formField.formField) == 'DATE'){
-              this.timeValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime.Format('yyyy-MM-dd')
+              this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime.Format('yyyy-MM-dd')
             }
           }
         }
@@ -1284,6 +1266,9 @@ export default {
           }
         }
       }
+      if (this.formList.extInfo && this.formList.extInfo.extInfoFieldValue){
+        this.extInfoFieldValue = this.formList.extInfo.extInfoFieldValue
+      }
       this.formShow = this.formList
     },
     addZero(i) {
@@ -1329,18 +1314,18 @@ export default {
       if (type == 'DATE'){
         this.datePicker = false
         this.timeDetailData.value = value;
-        this.timeValue[id] =this.formatDate(value);
+        this.extInfoFieldValue[id] =this.formatDate(value);
       }
       else if (type == 'TIME'){
         this.timePicker = false;
-        this.timeValue[id] = value;
+        this.extInfoFieldValue[id] = value;
         console.debug('timeDetailData',this.timeDetailData)
         this.timeDetailData.value = forMatTime(value)
       }
       else if (type == 'DATE_TIME'){
         this.dateTimePicker = false;
         this.timeDetailData.value = value
-        this.timeValue[id] =this.formatDate(value) +" "+ this.addZero(value.getHours()) + ':' + this.addZero(value.getMinutes())
+        this.extInfoFieldValue[id] =this.formatDate(value) +" "+ this.addZero(value.getHours()) + ':' + this.addZero(value.getMinutes())
       }
       /*for (let i = 0; i < this.formShow.form.formFieldRelation.length; i++) {
         if (this.formShow.form.formFieldRelation[i].fieldId=== id) {
@@ -1380,6 +1365,9 @@ export default {
     //下拉的选择器
     onConfirmSelect(value, item) {
       console.log('value',value,this.selectDetail)
+      if (!value){
+        return
+      }
       this.selectValues[this.selectDetail.fieldId] = value;
       for (let i = 0; i < this.formShow.form.formFieldRelation.length; i++) {
         if (this.formShow.form.formFieldRelation[i].fieldId === this.selectDetail.fieldId) {
@@ -1443,9 +1431,13 @@ export default {
             }
           })
         }
-        if (this.fileListList[this.formShow.form.formFieldRelation[i].fieldId]) {
+        if (this.extInfoFieldValue[this.formShow.form.formFieldRelation[i].fieldId] &&
+            (this.formShow.form.formFieldRelation[i].formField.type == 'FILE' ||
+            this.formShow.form.formFieldRelation[i].formField.type == 'IMAGE' ||
+            this.formShow.form.formFieldRelation[i].formField.type == 'VIDEO' ||
+            this.formShow.form.formFieldRelation[i].formField.type == 'ATTACHMENT')) {
           let value=[]
-          this.fileListList[this.formShow.form.formFieldRelation[i].fieldId].forEach(item=>{
+          this.extInfoFieldValue[this.formShow.form.formFieldRelation[i].fieldId].forEach(item=>{
             let file = {}
             file.name = item.name
             file.url = item.url
@@ -1454,7 +1446,6 @@ export default {
           this.formShow.form.formFieldRelation[i].value = value.map(item=>{
             return item.name
           })
-          this.formShow.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue = value
         }
         if(this.formShow.form.formFieldRelation[i].display &&
             (this.formShow.form.formFieldRelation[i].required || this.isRequiredFn(this.formShow.form.formFieldRelation[i].formField)) &&
@@ -1466,12 +1457,17 @@ export default {
             strVal = value.replace(/\n/g,'');
           }
           let bool = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n') && !strVal
-            if(!this.formShow.form.formFieldRelation[i].value || bool|| (this.formShow.form.formFieldRelation[i].value&&this.formShow.form.formFieldRelation[i].value.length===0)) {
+            if(!this.formShow.form.formFieldRelation[i].value || bool || (this.formShow.form.formFieldRelation[i].value&&this.formShow.form.formFieldRelation[i].value.length===0)) {
               this.$message.error('请完善'+ this.formShow.form.formFieldRelation[i].formField.name)
               return
             }
         }
       }
+      let extInfo = {
+        extInfoFieldValue:this.extInfoFieldValue
+      }
+        this.$set(this.formShow,'extInfo',extInfo)
+      console.debug('form',this.formShow)
         this.$emit('submitClick',this.formShow)
         this.disableds = true
         this.submitValue = '已提交'
@@ -1545,7 +1541,9 @@ export default {
     SelectClear(fieldId) {
       if(this.disableds === false){
         let i = this.formShow.form.formFieldRelation.findIndex(item => { console.log(item.fieldId); return item.fieldId == fieldId })
-        this.selectValues[this.formShow.form.formFieldRelation[i].fieldId] = ''
+        this.selectValues[this.formShow.form.formFieldRelation[i].fieldId] = '';
+        this.formShow.form.formFieldRelation[i].value = "";
+        this.extInfoFieldValue[this.formShow.form.formFieldRelation[i].fieldId] = ""
         this.$forceUpdate()
       }
     },
@@ -1771,27 +1769,27 @@ export default {
           imgInfo.name = data.file.name
           imgInfo.uid = data.file.uid
         }
-        if (!this.fileListList[this.filedId])
+        if (!this.extInfoFieldValue[this.filedId])
         {
-          this.fileListList[this.filedId] = []
+          this.extInfoFieldValue[this.filedId] = []
         }
-        this.fileListList[this.filedId].push(imgInfo)
+        this.extInfoFieldValue[this.filedId].push(imgInfo)
         this.loading.close()
       }).catch((err) => {
         console.debug("upload err", err);
       });
     },
     successUpload(response,file,fileList){
-      if (!this.fileListList[this.filedId]){
-        this.fileListList[this.filedId] = []
+      if (!this.extInfoFieldValue[this.filedId]){
+        this.extInfoFieldValue[this.filedId] = []
       }
       for (let i=0;i<fileList.length;i++){
-        if (!this.fileListList[this.filedId][i]){
-          this.fileListList[this.filedId][i]={}
+        if (!this.extInfoFieldValue[this.filedId][i]){
+          this.extInfoFieldValue[this.filedId][i]={}
         }
-        this.fileListList[this.filedId][i].url=fileList[i].url
-        this.fileListList[this.filedId][i].name=fileList[i].name
-        this.fileListList[this.filedId][i].status=fileList[i].status
+        this.extInfoFieldValue[this.filedId][i].url=fileList[i].url
+        this.extInfoFieldValue[this.filedId][i].name=fileList[i].name
+        this.extInfoFieldValue[this.filedId][i].status=fileList[i].status
       }
     },
     uploadProgress(){
@@ -1803,17 +1801,17 @@ export default {
       });
     },
     handleRemove(file) {
-      if (this.fileListList[this.filedId]){
-        for (let i=0;i<this.fileListList[this.filedId].length;i++)
+      if (this.extInfoFieldValue[this.filedId]){
+        for (let i=0;i<this.extInfoFieldValue[this.filedId].length;i++)
         {
-          if (this.fileListList[this.filedId][i].uid){
-            if (this.fileListList[this.filedId][i].uid===file.uid){
-              this.fileListList[this.filedId].splice(i,1)
+          if (this.extInfoFieldValue[this.filedId][i].uid){
+            if (this.extInfoFieldValue[this.filedId][i].uid===file.uid){
+              this.extInfoFieldValue[this.filedId].splice(i,1)
               return
             }
           }
-          else if (this.fileListList[this.filedId][i].url===file.url){
-            this.fileListList[this.filedId].splice(i,1)
+          else if (this.extInfoFieldValue[this.filedId][i].url===file.url){
+            this.extInfoFieldValue[this.filedId].splice(i,1)
             return
           }
         }
@@ -1894,7 +1892,7 @@ export default {
       let fields = field.formField.type === 'REF' ? field.formField.extInfo.ref.field : field.formField.extInfo.ref.vars
       if (visible) {
         if (
-          !this.refTemplateList[field.fieldId] || this.dataQuery[field.fieldId].hasNextPage
+          !this.refTemplateList[field.fieldId] || this.refNextPage[field.fieldId].hasNextPage
         ) {
           this.$set(this.refTemplateList, field.fieldId, [])
           !this.dataQuery[field.fieldId] &&   this.$set(this.dataQuery,field.fieldId, {
@@ -1907,7 +1905,14 @@ export default {
             sortInfos: [],
             templateId: ''
           })
-          this.getTemplateList(field.formField.extInfo.ref.source, fields, field)
+          let param = {
+            templateId:field.formField.extInfo.ref.source,
+            fieldId:fields,
+            field:field,
+            dataQuery:this.dataQuery,
+            refNextPage:this.refNextPage
+          }
+          this.$emit('getTemplateList',param)
         }
       }
     },
@@ -1936,66 +1941,7 @@ export default {
           }
         })
       }
-      if (!item.formField.extInfo.extInfoFieldValue){
-        this.$set(item.formField.extInfo,'extInfoFieldValue',[])
-      }
-      item.formField.extInfo.extInfoFieldValue = arr
-      console.log(arr,item);
-    },
-    getTemplateList(templateId, fieldId, field) {
-      let url = '/order-api/data-template/data/page'
-      this.dataQuery[field.fieldId].templateId = templateId
-      // let dataQuery = {
-      //   filterId: '',
-      //   keywords: '',
-      //   pageInfo: {
-      //     pageNo: 1,
-      //     pageSize: 20
-      //   },
-      //   sortInfos: [],
-      //   templateId: templateId
-      // }
-      this.$http.post(url, this.dataQuery[field.fieldId]).then(res => {
-        if (res.data.code === '0') {
-          let list = res.data.data.data
-          this.dataQuery[field.fieldId].hasNextPage = res.data.data.hasNextPage
-          // this.isHasNext[field.id] = res.data.data.hasNextPage
-          let templateList = []
-          templateList = list.map(res => {
-            let info = {}
-            for (let key in res.fieldValues) {
-              if (Array.isArray(fieldId)) {
-                let vals = ''
-                let values = ''
-                fieldId.forEach(val => {
-                  vals += val
-                  if (res.fieldValues[val]) {
-                    values += res.fieldValues[val]
-                  }
-                })
-                info[vals] = values
-                info.id = res.id
-                info.name = values
-              } else {
-                if (fieldId === key) {
-                  info[key] = res.fieldValues[key]
-                  info.id = res.id
-                  info.name = res.fieldValues[key]
-                }
-              }
-            }
-            return info
-          })
-          this.$nextTick(() =>{
-            this.$set(this.refTemplateList,field.fieldId,[
-              ...this.refTemplateList[field.fieldId],
-              ...templateList
-            ])
-            console.log('refTemplateList',this.refTemplateList[field.fieldId])
-          })
-
-        }
-      })
+      this.extInfoFieldValue[item.fieldId] = arr
     },
     lodeMore(item) {
       this.dataQuery[item.fieldId].pageInfo.pageNo += 1
@@ -2004,7 +1950,6 @@ export default {
     //打开级联/下拉抽屉选择
     openDrawer(field,type){
       this.detailField = field;
-      console.debug('type',type)
       if (type == 'cascader' || type === 'pc_cascader'){
         if (type == 'cascader'){
           this.showArea = true;
@@ -2013,16 +1958,19 @@ export default {
           this.drawer = true;
         }
         this.$nextTick(()=>{
-          let arr =  this.checkDatas[field.fieldId]?this.checkDatas[field.fieldId]:[]
-          console.debug('drawerTree',this.$refs.drawerTree)
+          let arr =  this.extInfoFieldValue[field.fieldId]?this.extInfoFieldValue[field.fieldId]:[]
           let drawerTree = this.$refs.drawerTree
-          if (drawerTree){
-            drawerTree.forEach(item=>{
-              item.$refs.dataTree.setCheckedNodes (arr);
-              item.checked = this.checkDatas[field.fieldId] && this.checkDatas[field.fieldId][0]?this.checkDatas[field.fieldId][0].value:'';
-            })
+          if (drawerTree) {
+            if (Array.isArray(drawerTree)) {
+              drawerTree.forEach(item => {
+                item.$refs.dataTree.setCheckedNodes(arr);
+                item.checked = this.extInfoFieldValue[field.fieldId] && this.extInfoFieldValue[field.fieldId][0] ? this.extInfoFieldValue[field.fieldId][0].value : '';
+              })
+            } else {
+              drawerTree.$refs.dataTree.setCheckedNodes(arr);
+              drawerTree.checked = this.extInfoFieldValue[field.fieldId] && this.extInfoFieldValue[field.fieldId][0] ? this.extInfoFieldValue[field.fieldId][0].value : '';
+            }
           }
-
         })
       }
       else if (type === 'select'){
@@ -2043,7 +1991,7 @@ export default {
     //保存级联数据
     saveData(checkList,checkDatas){
       this.$set(this.detailField,'value',checkList);
-      this.checkDatas[this.detailField.fieldId] = checkDatas;
+      this.extInfoFieldValue[this.detailField.fieldId] = checkDatas;
       this.$set(this.detailField.formField.extInfo,'extInfoFieldValue',checkDatas);
       console.debug('checkDatas',this.detailField.formField.extInfo,checkList)
       this.$forceUpdate();
@@ -2064,22 +2012,18 @@ export default {
         this.refShowPicker = false;
         return
       }
-      if (!this.detailField.formField.extInfo.extInfoFieldValue){
-        this.$set(this.detailField.formField.extInfo,'extInfoFieldValue',[])
-      }
       this.detailField.value = list;
       let val = ''
       if (Array.isArray(option)){
         val = option.map(item=>{
-          return item.name
+          return item.id
         })
-        this.detailField.formField.extInfo.extInfoFieldValue = option
+        this.extInfoFieldValue[this.detailField.fieldId] = option
       }
       else {
-        val = option.name
-        this.detailField.formField.extInfo.extInfoFieldValue = [option]
+        val = option.id
+        this.extInfoFieldValue[this.detailField.fieldId] = [option]
       }
-      this.selectValues[this.detailField.fieldId] = val;
       this.refShowPicker = false;
     },
     // 一个重复的方法 兼容 状态优先级 的关联控件，

package/src/components/popup.vue

@@ -182,6 +182,7 @@ export default {
     align-items: center;
     justify-content: center;
     height: 48px;
+    cursor: pointer;
     .setColor {
       color: #366aff;
     }
@@ -205,9 +206,11 @@ export default {
     padding: 0 20px;
     .cancel {
       color: #606266;
+      cursor:pointer;
     }
     .sure {
       color: #366aff;
+      cursor: pointer;
     }
   }
 .popup-footer {

package/src/components/tree.vue

@@ -31,7 +31,10 @@ export default {
   name: "tree",
   data(){
     return{
-      defaultProps:{},
+      defaultProps:{
+        label:"label",
+        value:"value"
+      },
       checked:'',
       dataTree:[],
       checkList:[],
@@ -96,6 +99,7 @@ export default {
     else if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0]){
       this.dataTree = this.dataOptions.extInfo.cascadeDown[0].options
     }
+    console.debug('dataTree',this.dataOptions,this.dataTree)
   }
 };
 </script>
@@ -119,9 +123,11 @@ export default {
     padding-bottom: 30px;
     .primary{
       color: #366aff;
+      cursor: pointer;
     }
     .cacel{
       color: #969799;
+      cursor: pointer;
     }
   }
   .tree-container{