askbot-dragon 0.7.96 → 0.7.97

package/package.json

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

package/src/components/formTemplate.vue

@@ -214,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>
@@ -486,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>
@@ -697,6 +700,7 @@ export default {
       refTemplateList:{},
       refList:{},
       dataQuery:{},
+      refNextPage:{},
       drawer:false,
       detailField:{
         formField:{}
@@ -1537,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()
       }
     },
@@ -1886,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, {
@@ -1903,7 +1909,8 @@ export default {
             templateId:field.formField.extInfo.ref.source,
             fieldId:fields,
             field:field,
-            dataQuery:this.dataQuery
+            dataQuery:this.dataQuery,
+            refNextPage:this.refNextPage
           }
           this.$emit('getTemplateList',param)
         }

package/src/components/tree.vue

@@ -99,7 +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.dataTree)
+    console.debug('dataTree',this.dataOptions,this.dataTree)
   }
 };
 </script>