askbot-dragon 0.8.28 → 0.8.30

package/package.json

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

package/src/components/formTemplate.vue

@@ -575,6 +575,20 @@
                 </span>
               </template>
             </van-field>
+            <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>
           </template>
         </div>
         <div v-if="item.formField.type === 'REF_TEMPLATE' || item.formField.type === 'REF'" class="form-field-item-value">
@@ -720,20 +734,7 @@
           }"
       ></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>
 
@@ -916,6 +917,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){
@@ -925,12 +927,22 @@ 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 = []
+          if(item.formField.type === 'CHECKBOX'){
+            item.value = []
+          }
+          else {
+            item.value = ""
+          }
           this.extInfoFieldValue[item.fieldId] = []
           this.selectValues[item.fieldId] = []
           this.extInfoFieldValue[item.fieldId] = []