askbot-dragon 0.8.22 → 0.8.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "0.8.22",
+  "version": "0.8.24",
   "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] = []
@@ -1632,7 +1627,6 @@ export default {
             }
             bool[this.formShow.form.formFieldRelation[i].fieldId] = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n') && !strVal
           }
-          console.debug('formFieldRelation',this.formShow.form.formFieldRelation[i].value,bool[this.formShow.form.formFieldRelation[i]],Array.isArray(this.formShow.form.formFieldRelation[i].value) && !this.formShow.form.formFieldRelation[i].value.length)
             if(!this.formShow.form.formFieldRelation[i].value || bool[this.formShow.form.formFieldRelation[i].fieldId] || (Array.isArray(this.formShow.form.formFieldRelation[i].value) && !this.formShow.form.formFieldRelation[i].value.length)) {
               this.$message.error('请完善'+ this.formShow.form.formFieldRelation[i].formField.name)
               return
@@ -1642,9 +1636,15 @@ export default {
       let extInfo = {
         extInfoFieldValue:this.extInfoFieldValue
       }
-        this.$set(this.formShow,'extInfo',extInfo)
-      console.debug('form',this.formShow)
-        this.$emit('submitClick',this.formShow)
+      this.$set(this.formShow,'extInfo',extInfo)
+      let newForm = JSON.parse(JSON.stringify(this.formShow));
+      for (let i=0;i<newForm.form.formFieldRelation.length;i++){
+        if (newForm.form.formFieldRelation[i].fieldId === 'workorder_description'){
+          newForm.form.formFieldRelation[i].value =  newForm.form.formFieldRelation[i].value.replace(/<img/g, "<img onclick='previewImage(this)' ")
+        }
+      }
+      console.debug('formShow',this.formShow.form,newForm.form)
+        this.$emit('submitClick',newForm)
         this.disableds = true
         this.submitValue = '已提交'
     },