askbot-dragon 1.0.4 → 1.0.6

package/package.json

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

package/src/components/formTemplate.vue

@@ -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
         }
@@ -2046,7 +2046,7 @@ export default {
             }
             bool[this.formShow.form.formFieldRelation[i].fieldId] = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n') && !strVal
           }
-          if (this.formShow.form.formFieldRelation[i].relationDisplay && this.formShow.form.formFieldRelation[i].display) {
+          if (this.formShow.form.formFieldRelation[i].relationDisplay && this.formShow.form.formFieldRelation[i].display && this.formShow.form.formFieldRelation[i].fieldId !== 'workorder_description') {
             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
@@ -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') {