askbot-dragon 0.8.24 → 0.8.26

package/package.json

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

package/src/components/formTemplate.vue

@@ -860,6 +860,7 @@ export default {
       selectDetail:{},
       refDefaultValue:{},
       selectOptionWidth:null,
+      fieldValue:{}
     }
   },
   props: {
@@ -911,6 +912,9 @@ export default {
         }
       })
       arr.forEach(item=>{
+        if (item.value && item.value.length){
+          this.$set(this.fieldValue,item.fieldId,item.value)
+        }
         this.$set(item,'relationDisplay',this.relationSet(item.formField,'dependentFieldId'))
         if(item.formField.type === 'CHECKBOX'){
           if(!item.value){
@@ -920,6 +924,10 @@ 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){
           item.value = []
           this.extInfoFieldValue[item.fieldId] = []
@@ -1310,7 +1318,14 @@ export default {
             else {
               let valueList=[]
               let bool=false
-              if(this.formList.form.formFieldRelation[i].value.length > 0) {
+
+              if (!Array.isArray(this.formList.form.formFieldRelation[i].value)){
+                let obj = {
+                  url:this.formList.form.formFieldRelation[i].value
+                }
+                this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = [obj]
+              }
+              else if(this.formList.form.formFieldRelation[i].value.length > 0) {
                   for (let file=0;file<this.formList.form.formFieldRelation[i].value.length;file++) {
                     let type = typeof (this.formList.form.formFieldRelation[i].value[file])
                     if (type === "string") {

package/src/components/utils/command.js

@@ -12,7 +12,11 @@ export default class ImageCommand extends Command {
     refresh() {
         this.isEnabled = true;
     }
-    execute() {
+    execute(file) {
+        if (file){
+            this.forEachFiles(file.file)
+            return
+        }
         var inputObj = document.createElement('input')
         inputObj.setAttribute('id', '_ef');
         inputObj.setAttribute('type', 'file');
@@ -39,7 +43,22 @@ export default class ImageCommand extends Command {
             }
         }
     }
-
+    forEachFiles(files){
+        for (let index = 0; index < files.length; index++) {
+            const filed = files[index];
+            this.upload(filed).then(res =>{
+                let command = this.editor.commands.get("insertAskComponent");
+                command.execute({
+                    tag: "img",
+                    options: {
+                        width:'100%',
+                        name: res.default,
+                        src: res.default
+                    },
+                });
+            })
+        }
+    }
     upload(file) {
         return new Promise((resolve) => {
             /* this._initRequest();