From 471afe5b9c25c3cb2a5ed55e2d94ab48ad709bda Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 5 Aug 2022 15:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/externalReports/components/addModel.vue  | 4 +++-
 jero-web/src/views/externalReports/index.vue                | 3 ++-
 jero-web/src/views/parameter/escalationlibrary/index.vue    | 2 +-
 .../views/parameter/parameterexport/components/addModel.vue | 6 ++++--
 jero-web/src/views/parameter/parameterexport/index.vue      | 2 +-
 jero-web/src/views/regulationsKanban/index.vue              | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue
index 13b1c911a..7f2ad7395 100644
--- a/jero-web/src/views/externalReports/components/addModel.vue
+++ b/jero-web/src/views/externalReports/components/addModel.vue
@@ -42,7 +42,7 @@
                       <a-input class="box-input add-input"
                                type="textarea"
                                :placeholder="$t('PleaseEnter')+$t('fileDeclaration')"
-                               v-model="formInline.fileDescription"/>
+                               v-model.trim="formInline.fileDescription"/>
                     </a-form-model-item>
                   </div>
                 </a-col>
@@ -146,6 +146,7 @@ export default {
         this.visible = true
         return
       }else{
+        this.$refs['ruleForm'].clearValidate()
         this.visible = false
       }
     },
@@ -209,6 +210,7 @@ export default {
       /** 赋值给当前对应的表单文件 */
       this.formInline[this.uploadName] = attIdList.join(',')
       this.formInline = { ...this.formInline }
+      this.$refs.ruleForm.clearValidate(['fileKey'])
     },
     clickButtonToUpload(item) {
       this.$refs.uploadFile.perentHandleFunc()
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 83e6a7017..200150c2b 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -132,7 +132,7 @@
                   size="middle"
                   :loading="loading"
                   :pagination="false"
-                  :scroll="{x: true}"
+                  :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
                   rowKey="id"
                   :data-source="dataSource"
                   :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -630,6 +630,7 @@ export default {
     },
     handleCancelMenuRight() {
       this.menuRightVisible = false
+      this.$refs['ruleForm'].clearValidate()
     },
     //增加文件夹确定
     hideModalMenuRight() {
diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue
index 226f3b068..68aee47ac 100644
--- a/jero-web/src/views/parameter/escalationlibrary/index.vue
+++ b/jero-web/src/views/parameter/escalationlibrary/index.vue
@@ -36,7 +36,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
index 732aa5b9e..a9b8f0f65 100644
--- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
@@ -73,7 +73,7 @@
                   </div>
                   <a-form-model-item class="itemModel" prop="fileConnectId">
                     <a-button type="primary" class="button-text"
-                              v-model='formInline.fileConnectId'
+                              v-model:value='formInline.fileConnectId'
                               @click="clickButtonToUpload('fileTemplateConnectId')">
                       {{ (formInline.fileConnectId === 'null' || formInline.fileConnectId === '' ||
                       formInline.fileConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
@@ -119,7 +119,7 @@ export default {
         description:[
           { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
         ],
-        status: [
+        state: [
           { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
         ],
         fileConnectId: [
@@ -146,6 +146,7 @@ export default {
       /** 赋值给当前对应的表单文件 */
       this.formInline.fileConnectId = attIdList.join(',')
       this.formInline = { ...this.formInline }
+      this.$refs.ruleForm.clearValidate(['fileConnectId'])
     },
     clickButtonToUpload(item) {
       this.$refs.uploadFile.visible = true
@@ -185,6 +186,7 @@ export default {
     },
     handleCancel() {
       this.visible = false
+      this.$refs['ruleForm'].clearValidate()
     },
     handleSubmit() {
       if(this.formInline.paramsTemplateName !== undefined) {
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue
index 0d427120a..f99f92e7e 100644
--- a/jero-web/src/views/parameter/parameterexport/index.vue
+++ b/jero-web/src/views/parameter/parameterexport/index.vue
@@ -37,7 +37,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index f5810e353..ea385e32d 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -77,7 +77,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"