askbot-dragon 1.0.12 → 1.0.14

package/package.json

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

package/src/components/associationIntention.vue

@@ -1,10 +1,21 @@
 <template>
   <div class="association-intention">
     <div v-if=" (msgType === 'answer_welcofmetext' || msgType === 'answer_text') && !(msg.recommend&& msg.recommend.status)">
-      <p v-html="msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)"></p>
+<!--      <p v-html="msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)"></p>-->
+      <template v-if="msgContent(msg.content)">
+        <p>{{msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)}}</p>
+      </template>
+      <template v-else>
+        <p v-html="msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)" class="answer-rich-text"></p>
+      </template>
     </div>
     <div v-if=" (msgType === 'answer_welcofmetext' || msgType === 'answer_text') && (msg.recommend&& msg.recommend.status)">
-      <p v-html="msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)" class="answer-rich-text"></p>
+      <template v-if="msgContent(msg.content)">
+        <p>{{msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)}}</p>
+      </template>
+      <template v-else>
+        <p v-html="msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)" class="answer-rich-text"></p>
+      </template>
      <Recommend :msg="msg" @onRadioClickReco="onRadioClickReco"></Recommend>
     </div>
     <div v-if="msg.type === 'answer_rich_text' && !(msg.content.recommend && msg.content.recommend.status)">
@@ -192,6 +203,12 @@
       onImageClick(url){
         this.$emit('onImageClick',url)
       },
+      msgContent(content){
+        let msg = content.replace('<br/>',"\n");
+        var  reg = /<[^>]+>/g;
+        return reg.test(msg);
+
+      }
     },
     watch:{
       isOpen:{

package/src/components/formTemplate.vue

@@ -1972,7 +1972,6 @@ export default {
       if(this.workOrderDestail && !this.verificationDescription()) {
         return
       }
-      console.log(this.workOrderDestail);
       for (let i=0;i<this.formShow.form.formFieldRelation.length;i++)
       {
         if(this.formShow.form.formFieldRelation[i].formField.type==='CASCADER')
@@ -2790,6 +2789,9 @@ export default {
       let uploadList = d.getElementsByClassName('ask-component-placeholder-container')
       if (uploadList) {
         for (let index = 0; index < uploadList.length; index++) {
+          if(!uploadList[index].childNodes[0] || !uploadList[index].childNodes[0].getAttribute) {
+            break
+          }
           if (uploadList[index].childNodes[0].getAttribute('type') == 'upload' || uploadList[index].childNodes[0].getAttribute('type') == 'undefined') {
             this.uploadImgQueue = true
             let text = uploadList[index].innerText.replace('正在上传...', '')

package/src/components/utils/ckeditor.js

@@ -59,9 +59,11 @@ class MyUploadAdapter {
             for(let child of children){
                 for (let index = 0; index < child._children._nodes.length; index++) {
                     if(child._children._nodes[index].name == 'askComponentPlaceholderContainer'){
-                        this.editor.model.change(writer => {
-                            writer.remove(child);
-                        });
+                        if(child._children._nodes[index]._children._nodes[0]) {
+                            this.editor.model.change(writer => {
+                                writer.remove(child._children._nodes[index]._children._nodes[0]);
+                            });
+                        }
                     }
                 }
             }