askbot-dragon 0.8.13 → 0.8.16

package/package.json

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

package/src/components/formTemplate.vue

@@ -1218,11 +1218,6 @@ export default {
           if (!this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId]){
             this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = fieldValue
           }
-          if (this.formList.form.formFieldRelation[i].value){
-            this.formList.form.formFieldRelation[i].value = this.formList.form.formFieldRelation[i].formField.defaultValue?
-                this.formList.form.formFieldRelation[i].formField.defaultValue:[];
-          }
-
         }
         if (type === 'DATE_PICKER') {
           if(this.formList.form.formFieldRelation[i].value!==null && this.formList.form.formFieldRelation[i].value!=='' ) {
@@ -1489,13 +1484,18 @@ export default {
             (this.formShow.form.formFieldRelation[i].required || this.isRequiredFn(this.formShow.form.formFieldRelation[i].formField)) &&
             this.formShow.form.formFieldRelation[i].fieldId!=='workorder_name'&&
             this.formShow.form.formFieldRelation[i].formField.type !== 'EXPLANATION') {
-          let value = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n')?this.formShow.form.formFieldRelation[i].value:'';
-          let strVal = '';
+          console.debug('formFieldRelation',this.formShow.form.formFieldRelation[i].value)
+          let value = "";
+          let bool = false
+          if (this.formShow.form.formFieldRelation[i].formField.type === 'INPUT' || this.formShow.form.formFieldRelation[i].formField.type === 'TEXTAREA'){
+            value = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.indexOf('\n')!==-1?this.formShow.form.formFieldRelation[i].value:'';
+            let strVal = '';
             if(value){
-            strVal = value.replace(/\n/g,'');
+              strVal = value.replace(/\n/g,'');
+            }
+            bool = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.indexOf('\n')!==-1 && !strVal
           }
-          let bool = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n') && !strVal
-            if(!this.formShow.form.formFieldRelation[i].value || bool || (this.formShow.form.formFieldRelation[i].value&&this.formShow.form.formFieldRelation[i].value.length===0)) {
+            if(!this.formShow.form.formFieldRelation[i].value || bool || (this.formShow.form.formFieldRelation[i].value && !this.formShow.form.formFieldRelation[i].value.length)) {
               this.$message.error('请完善'+ this.formShow.form.formFieldRelation[i].formField.name)
               return
             }
@@ -2335,7 +2335,7 @@ export default {
     text-align: center;
     font-size:28px;
     color:#366AFF;
-    display: -webkit-box;
+    display: flex;
     align-items: center;
     justify-content: center;
     i{