askbot-dragon 0.8.23 → 0.8.25

package/package.json

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

package/src/components/formTemplate.vue

@@ -289,8 +289,8 @@
             </p>
             <p v-else class="explanation-p">
               <span class="el-icon-info"></span>
-              <span v-if="item.formField.extInfo.url" class="explain-url"><a :href="item.formField.extInfo.url" target="_blank">{{item.value}}</a></span>
-              <span v-else>{{item.value}}</span>
+              <span v-if="item.formField.extInfo.url" class="explain-url"><a :href="item.formField.extInfo.url" target="_blank">{{item.formField.description?item.formField.description:item.formField.extInfo.placeholder}}</a></span>
+              <span v-else>{{item.formField.description?item.formField.description:item.formField.extInfo.placeholder}}</span>
             </p>
           </div>
         </div>
@@ -920,11 +920,6 @@ export default {
             item.value = item.formField.defaultValue
           }
         }
-        if (item.formField.type === 'EXPLAIN'){
-          if (!item.value){
-            item.value = item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:''
-          }
-        }
         if (!item.relationDisplay){
           item.value = []
           this.extInfoFieldValue[item.fieldId] = []
@@ -1315,7 +1310,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();