From b355ac7bf6ac50b9de25903eac71d06522ebc6fa Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 17 Aug 2022 15:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +-
 .../components/globalAdvancedQuery/index.vue  | 45 ++++++++++++++++---
 .../src/views/regulationsKanban/index.vue     |  6 +--
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4839ad2e8..a94cf3b59 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1168,7 +1168,7 @@ module.exports = {
   exportComparisonReport: 'Export Comparison Report',
   comparisonDifferenceComment: 'Comparison Difference Comment',
   fullTextComments: 'Full text comments',
-  fileDeclaration: 'file Declaration',
+  fileDeclaration: 'File Declaration',
   FileForDetails: 'File For Details',
   Converting: 'Converting',
   convertNetwork: 'Convert Network',
diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue
index 5d0ad277d..8c59e085a 100644
--- a/jero-web/src/components/globalAdvancedQuery/index.vue
+++ b/jero-web/src/components/globalAdvancedQuery/index.vue
@@ -56,12 +56,19 @@
 
             <a-row style="margin-bottom: 12px;">
               <a-col :md="12" :xs="24">
-                <a-form-item :label="$t('FilterMatching')" :labelCol="{md: 6,xs:24}" :wrapperCol="{md: 18,xs:24}" style="width: 100%;">
-                  <a-select v-model="matchType" :getPopupContainer="node=>node.parentNode" style="width: 100%;">
-                    <a-select-option value="and">AND{{$t('AllMatching')}}</a-select-option>
-                    <a-select-option value="or">OR{{$t('AnyOneMatches')}}</a-select-option>
-                  </a-select>
-                </a-form-item>
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('FilterMatching')">
+                    <span>{{$t('FilterMatching')}}</span>
+                  </div>
+<!--                  :label="$t('FilterMatching')" :labelCol="{md: 6,xs:24}" :wrapperCol="{md: 18,xs:24}" style="width: 100%;"-->
+                  <a-form-item class='box-input'>
+                    <a-select v-model="matchType" :getPopupContainer="node=>node.parentNode" style="width: 100%;">
+                      <a-select-option value="and">AND{{$t('AllMatching')}}</a-select-option>
+                      <a-select-option value="or">OR{{$t('AnyOneMatches')}}</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </div>
+
               </a-col>
             </a-row>
 
@@ -627,7 +634,33 @@
 </script>
 
 <style lang="less" scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
 
+.title-text {
+  width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
   .j-super-query-box {
     display: inline-block;
   }
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index 3165a3bfd..cceb1f691 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -175,7 +175,7 @@ export default {
           title: this.$t('title'),
           align: 'center',
           dataIndex: 'title',
-          width: 180,
+          width: 250,
           scopedSlots: { customRender: 'standard' }
         },
         {
@@ -193,14 +193,14 @@ export default {
           title: this.$t('technicalField'),
           align: 'center',
           dataIndex: 'technologyTerritory_dicText',
-          width: 350,
+          width: 250,
           scopedSlots: { customRender: 'technicalField' }
         },
         {
           title: this.$t('RegulatoryProcessEvaluationResults'),
           align: 'center',
           fixed: 'right',
-          width: 250,
+          width: 380,
           scopedSlots: { customRender: 'operation' }
         }
       ],