askbot-dragon 1.5.29 → 1.5.30

package/package.json

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

package/src/components/formTemplate.vue

@@ -1870,7 +1870,12 @@ export default {
         if (type === 'TIME_PICKER') {
           if(this.formList.form.formFieldRelation[i].value!==''&& this.formList.form.formFieldRelation[i].value!==null)
           {
-            const dateTime = new Date(this.formList.form.formFieldRelation[i].value)
+            // 判断是否是时间戳 时间戳为字符串转换为Number
+            var regex = /^\d{13}$/;
+            if (regex.test(this.formList.form.formFieldRelation[i].value)){
+              this.formList.form.formFieldRelation[i].value = Number(this.formList.form.formFieldRelation[i].value)
+            }
+            const dateTime = new Date(this.formList.form.formFieldRelation[i].value);
             if (!this.formList.form.formFieldRelation[i].formField.extInfo.mold ||
                 this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'TIME' ||
                 this.getMoldTime(this.formList.form.formFieldRelation[i].formField.formField) == 'TIME'){
@@ -1883,10 +1888,18 @@ export default {
                   this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value;
                   this.formList.form.formFieldRelation[i].value = new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate() + " " + this.formList.form.formFieldRelation[i].value;
                 } else {
-                  this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                  if (regex.test(this.formList.form.formFieldRelation[i].value)){
+                    this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime
+                  } else {
+                    this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                  }
                 }
               } else {
-                this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                if (regex.test(this.formList.form.formFieldRelation[i].value)){
+                  this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime.Format('hh:mm')
+                } else {
+                  this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                }
               }
             }
             else if (this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATA_TIME' ||
@@ -2080,8 +2093,10 @@ export default {
       let textFlag = true
       let imageFlag = true
       let attachmentFlag = true
+      let imageOrAttachment = true
       let errorText = ''
       let checkDescription = {
+        checkImageOrAttachment:this.workOrderDestail.checkImageOrAttachment ? this.workOrderDestail.checkImageOrAttachment : false,
         checkText:this.workOrderDestail.checkText ? this.workOrderDestail.checkText : false,
         checkImage:this.workOrderDestail.checkImage ? this.workOrderDestail.checkImage : false,
         checkAttachment:this.workOrderDestail.checkAttachment ? this.workOrderDestail.checkAttachment : false,
@@ -2099,16 +2114,24 @@ export default {
           d = null
         }
       }
+      if(checkDescription.checkImageOrAttachment) {
+        if(!this.workOrderDestail.value.includes('img') && this.attachmentList.length == 0) {
+          imageOrAttachment = false
+        }
+      }
       if (checkDescription.checkImage && !this.workOrderDestail.value.includes('img')) {
         imageFlag = false
       }
-      if (checkDescription.checkAttachment && this.attachments.length == 0) {
+      if (checkDescription.checkAttachment && this.attachmentList.length == 0) {
         attachmentFlag = false
       }
       let text = this.isBaiLi ? '反馈描述' : '问题描述'
       if (!textFlag) {
         errorText = text + '必须要有文字'
       }
+      if(!imageOrAttachment) {
+        errorText = text + '必须要有图片或附件'
+      }
       if (!imageFlag) {
         errorText = text + '必须要有图片'
       }
@@ -2130,7 +2153,7 @@ export default {
       } else {
         let d = document.createElement('div')
         d.innerHTML = this.workOrderDestail.value
-        if (checkDescription.required && !d.innerText && !this.workOrderDestail.value.includes('img') && this.attachments.length == 0) {
+        if (checkDescription.required && !d.innerText && !this.workOrderDestail.value.includes('img') && this.attachmentList.length == 0) {
           let errorText = this.isBaiLi ? '反馈描述是必填的' : '问题描述是必填的'
           this.$message.error(errorText);
           return false
@@ -2230,7 +2253,6 @@ export default {
       }
       let extInfo = {
         extInfoFieldValue:this.extInfoFieldValue,
-        attachments:this.attachments,
         attachmentList:this.attachmentList
       }
       this.$set(this.formShow,'extInfo',extInfo)
@@ -2967,76 +2989,8 @@ export default {
       }
       return flag
     },
-    getAttach (newVal) {
-      let d = document.createElement('div')
-      d.innerHTML = newVal
-      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('正在上传...', '')
-            let i = uploadList[index].childNodes[0].getAttribute('data')
-            if (newVal.includes(text + i)) {
-              uploadList[index].setAttribute('type', 'upload')
-              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') {
-            let span = uploadList[index].getElementsByClassName('ask-component-placeholder-span')[0]
-            const text = span.innerText
-            let value = ''
-            let id = ''
-            if (typeof span.getAttribute('data') == 'string' && !span.getAttribute('data').includes('default')) {
-              id = span.getAttribute('data')
-              this.attachmentList.push({
-                name: text,
-                id: id,
-                url: '',
-              })
-            } else {
-              value = JSON.parse(span.getAttribute('data')).default
-              id = JSON.parse(span.getAttribute('data')).id
-              this.attachments.push(value)
-              this.attachmentList = this.attachmentList.filter(attach => {
-                return attach.id != id
-              })
-              this.attachmentList.push({
-                name: text,
-                url: value,
-              })
-              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)
-            }
-            uploadList[index].setAttribute('type', 'MyFile')
-            let ht = '<span class="ask-component-placeholder-container">' + uploadList[index].innerHTML + '</span>'
-            newVal = newVal.replace(ht, '')
-            span = null
-          }
-        }
-      }
-      d = null
-      return newVal
-    },
     attachDeleteAttch (index) {
-      this.attachments.splice(index, 1)
+      // this.attachments.splice(index, 1)
       this.attachmentList.splice(index, 1)
     },
     attachDeleteFile(index,fieldId){
@@ -3070,7 +3024,6 @@ export default {
       handler(val){
         let newVal = ''
         newVal = val.replace(/ style=".*?"/g, '');
-        // newVal = this.getAttach(newVal)
         if (this.currentEditor){
           if (this.workOrderDestail){
             this.$nextTick(() =>{