askbot-dragon 0.8.27 → 0.8.29

package/package.json

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

package/src/components/formTemplate.vue

@@ -575,20 +575,6 @@
                 </span>
               </template>
             </van-field>
-            <van-popup v-model="selectPicker" position="bottom" :style="{ height: '300px' }">
-              <select-popup
-                  :options="selectOptions(item.formField)"
-                  :defaultValue="defaultValue"
-                  @onConfim="confirmSelect"
-                  @onclose= "selectPicker = false"
-                  :multiple="item.formField.extInfo && item.formField.extInfo.selectType ==='多选'?true:false"
-                  ref="selectPopup"
-                  :props="{
-                    value:'value',
-                    label:'label'
-                  }"
-              ></select-popup>
-            </van-popup>
           </template>
         </div>
         <div v-if="item.formField.type === 'REF_TEMPLATE' || item.formField.type === 'REF'" class="form-field-item-value">
@@ -734,6 +720,20 @@
           }"
       ></select-popup>
     </el-drawer>
+    <van-popup v-model="selectPicker" position="bottom" :style="{ height: '300px' }">
+      <select-popup
+          :options="optionsList[selectDetail.fieldId]"
+          :defaultValue="defaultValue"
+          @onConfim="confirmSelect"
+          @onclose= "selectPicker = false"
+          :multiple="selectDetail.formField && selectDetail.formField.extInfo && selectDetail.formField.extInfo.selectType ==='多选'?true:false"
+          ref="selectPopup"
+          :props="{
+                    value:'value',
+                    label:'label'
+                  }"
+      ></select-popup>
+    </van-popup>
   </div>
 </template>
 
@@ -860,7 +860,8 @@ export default {
       selectDetail:{},
       refDefaultValue:{},
       selectOptionWidth:null,
-      fieldValue:{}
+      fieldValue:{},
+      optionsList:{}
     }
   },
   props: {
@@ -915,6 +916,7 @@ export default {
         if (item.value && item.value.length){
           this.$set(this.fieldValue,item.fieldId,item.value)
         }
+        let itemType = item.relationDisplay
         this.$set(item,'relationDisplay',this.relationSet(item.formField,'dependentFieldId'))
         if(item.formField.type === 'CHECKBOX'){
           if(!item.value){
@@ -924,9 +926,14 @@ export default {
             item.value = item.formField.defaultValue
           }
         }
-        if (item.relationDisplay && this.fieldValue[item.fieldId]){
-          item.value = this.fieldValue[item.fieldId];
-          this.extInfoFieldValue[item.fieldId] = this.fieldValue[item.fieldId];
+        if (item.relationDisplay && this.fieldValue[item.fieldId] && itemType !== item.relationDisplay){
+          item.value =  JSON.parse(JSON.stringify(this.fieldValue[item.fieldId]));
+          if (item.formField.type === 'CASCADER'){
+            this.extInfoFieldValue[item.fieldId] = item.formField.extInfo.fieldValue?item.formField.extInfo.fieldValue:null
+          }
+          else {
+            this.extInfoFieldValue[item.fieldId] = this.extInfoFieldValue[item.fieldId];
+          }
         }
         if (!item.relationDisplay){
           item.value = []
@@ -1725,6 +1732,12 @@ export default {
         this.refDefaultValue[item.fieldId] = item.value?[item.value]:[]
       } else if (type == 'select'){
         this.selectPicker = true;
+        if (item.formField.extInfo){
+          this.optionsList[id] = item.formField.extInfo.option ? item.formField.extInfo.option:item.formField.extInfo.options
+        }
+        else {
+          this.optionsList[id] = []
+        }
       }
       if (item){
         this.detailField = item;