askbot-dragon 1.0.3 → 1.0.5

package/package.json

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

package/src/components/formTemplate.vue

@@ -1944,7 +1944,7 @@ export default {
         errorText = '问题描述必须要有附件'
       }
       if (!textFlag && (!imageFlag || !attachmentFlag)) {
-        errorText = '问题描述必须要有文字和' + !imageFlag ? '图片' : '附件'
+        errorText = '问题描述必须要有文字和' + (!imageFlag ? '图片' : '附件')
       }
       if (!imageFlag && !attachmentFlag) {
         errorText = '问题描述必须要有图片和附件'
@@ -1956,7 +1956,7 @@ export default {
         this.$message.error(errorText);
         return false
       } else {
-        if (checkDescription.required && !this.workOrderDestail.value) {
+        if (checkDescription.required && !this.workOrderDestail.value && this.attachments.length == 0) {
           this.$message.error('问题描述是必填的');
           return false
         }
@@ -2799,6 +2799,13 @@ export default {
               let ht = '<span class="ask-component-placeholder-container">' + uploadList[index].innerHTML + '</span>'
               newVal = newVal.replace(ht, '')
               this.uploadImgQueue = false
+              let time = setTimeout(() => {
+                this.currentEditor.model.change(writer => {
+                  writer.setSelection(writer.createPositionAt(this.currentEditor.model.document.getRoot(), 'end'));
+                })
+                this.currentEditor.editing.view.focus();
+                clearTimeout(time)
+              }, 500)
             }
           }
           if (uploadList[index].childNodes[0].getAttribute('type') == 'MyFile' || uploadList[index].childNodes[0].getAttribute('type') == 'FileUpload') {