npm - askbot-dragon - Versions diffs - 0.8.17 → 0.8.18 - Mend

askbot-dragon 0.8.17 → 0.8.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json +1 -1
package/src/components/ConversationContainer.vue +1 -1
package/src/components/formTemplate.vue +6 -5

package/package.json CHANGED Viewed

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

package/src/components/ConversationContainer.vue CHANGED Viewed

@@ -1698,7 +1698,7 @@ export default {
               },
               "value":"",
               "display":true,
-              "required":false,
+              "required":true,
               "editable":null
             },
             {

package/src/components/formTemplate.vue CHANGED Viewed

@@ -1484,18 +1484,19 @@ 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') {
-          console.debug('formFieldRelation',this.formShow.form.formFieldRelation[i].value)
           let value = "";
-          let bool = false
+          let bool = {}
+          bool[this.formShow.form.formFieldRelation[i].fieldId] = 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:'';
+            value = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n')?this.formShow.form.formFieldRelation[i].value:'';
             let strVal = '';
             if(value){
               strVal = value.replace(/\n/g,'');
             }
-            bool = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.indexOf('\n')!==-1 && !strVal
+            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].value || bool || (this.formShow.form.formFieldRelation[i].value && !this.formShow.form.formFieldRelation[i].value.length)) {
+          console.debug('formFieldRelation',this.formShow.form.formFieldRelation[i].value,bool[this.formShow.form.formFieldRelation[i]],this.formShow.form.formFieldRelation[i].value && !this.formShow.form.formFieldRelation[i].value.length)
+            if(!this.formShow.form.formFieldRelation[i].value || bool[this.formShow.form.formFieldRelation[i].fieldId] || (this.formShow.form.formFieldRelation[i].value && !this.formShow.form.formFieldRelation[i].value.length)) {
               this.$message.error('请完善'+ this.formShow.form.formFieldRelation[i].formField.name)
               return
             }