From a4f6fced5b6dcd62f1774e48fe345226f97123e3 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Mon, 30 Oct 2023 10:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AF=B9=E5=BA=94bug=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/system/en.js                  |  2 +-
 src/common/lang/system/zh.js                  |  8 ++--
 .../system/tags/modules/StandardDrawer.vue    | 42 ++++++++++++-------
 .../system/tags/pages/ClauseSplittingList.vue |  6 +--
 src/views/system/tags/pages/StandardList.vue  |  9 +++-
 src/views/system/tags/pages/TagContent.vue    |  6 +--
 src/views/system/tags/pages/TagItem.vue       |  2 +-
 7 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/common/lang/system/en.js b/src/common/lang/system/en.js
index 6daf2c14..e18be931 100644
--- a/src/common/lang/system/en.js
+++ b/src/common/lang/system/en.js
@@ -44,7 +44,7 @@ module.exports = {
     documentSplitList: '文档拆分列表展示',
     selectSplitListDisplay: '请选择是否文档拆分列表展示',
     // 标签项内容管理
-    labelItemName: '标签项名称',
+    labelItemName: '标签名称',
     //  字段列表
     name: '名称',
     dataValue: '数据值',
diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js
index b5688473..80de5e32 100644
--- a/src/common/lang/system/zh.js
+++ b/src/common/lang/system/zh.js
@@ -23,9 +23,9 @@ module.exports = {
     module: '所属模块',
     required: '是否必填',
     optionContent: '选项内容',
-    documentLibraryModuleDisplay: '文档库模块展示',
-
-    documentLibraryListDisplay: '文档库列表展示',
+    documentLibraryModuleDisplay: '模块展示',
+    // 原来叫 文档库列表展示 后来去掉了前面的文档库
+    documentLibraryListDisplay: '列表展示',
     selectWhetherDisplayList: '请选择是否文档库列表展示',
     isShowDetail: '详情页展示',
     isShowDetailMessage: '请选择是否详情页展示',
@@ -45,7 +45,7 @@ module.exports = {
     documentSplitList: '文档拆分列表展示',
     selectSplitListDisplay: '请选择是否文档拆分列表展示',
     // 标签项内容管理
-    labelItemName: '标签项名称',
+    labelItemName: '标签名称',
     //  字段列表
     name: '名称',
     dataValue: '数据值',
diff --git a/src/views/system/tags/modules/StandardDrawer.vue b/src/views/system/tags/modules/StandardDrawer.vue
index 73f1af72..f4ad936b 100644
--- a/src/views/system/tags/modules/StandardDrawer.vue
+++ b/src/views/system/tags/modules/StandardDrawer.vue
@@ -37,9 +37,9 @@
             <a-col :span="24">
               <a-form-model-item :label="$t('system.tag.attributeName')" prop="dbFieldTxt">
                 <a-input
-                  v-model="form.dbFieldTxt" :placeholder="$t('pleaseEnter') + $t('system.tag.attributeName')"
+                  v-model.trim="form.dbFieldTxt" :placeholder="$t('pleaseEnter') + $t('system.tag.attributeName')"
                   @change="event => event.target.value = event.target.value.trim()"
-                  :maxLength="120"
+                  :maxLength="50"
                 ></a-input>
               </a-form-model-item>
             </a-col>
@@ -47,18 +47,18 @@
             <a-col :span="24">
               <a-form-model-item :label="$t('system.tag.attributeNameEnglish')" prop="dbFieldEnName">
                 <a-input
-                  v-model="form.dbFieldEnName"
+                  v-model.trim="form.dbFieldEnName"
                   :placeholder="$t('pleaseEnter') + $t('system.tag.attributeNameEnglish')"
                   @change="event => event.target.value = event.target.value.trim()"
-                  :maxLength="120"
+                  :maxLength="50"
                 ></a-input>
               </a-form-model-item>
             </a-col>
-            <!-- 字段名称-->
-            <a-col :span="24">
+            <!-- 字段名称 正式环境 需要注释掉，开发环境可以先留着，方便使用-->
+            <a-col :span="24" v-if="canOpeFlag">
               <a-form-model-item :label="$t('system.tag.fieldName')" prop="dbFieldName">
                 <a-input
-                  v-model="form.dbFieldName"
+                  v-model.trim="form.dbFieldName"
                   :placeholder="$t('pleaseEnter') + $t('system.tag.fieldName')"
                   @change="event => event.target.value = event.target.value.trim()"
                   :maxLength="60"
@@ -68,9 +68,13 @@
             <!-- 属性类型-->
             <a-col :span="24">
               <a-form-model-item :label="$t('system.tag.attributeType')" prop="fieldShowType">
-                <j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type"
-                                   :placeholder="$t('pleaseSelect') + $t('system.tag.attributeType')"
-                                   :disabled="disabledEdit" />
+                <j-dict-select-tag
+                  type="list" v-model="form.fieldShowType"
+                  dictCode="field_show_type"
+                  :placeholder="$t('pleaseSelect') + $t('system.tag.attributeType')"
+                  :disabled="disabledEdit"
+                  @change="form.dictId = undefined"
+                />
               </a-form-model-item>
             </a-col>
 
@@ -111,13 +115,13 @@
             </a-col>
 
             <template>
-              <!--文档库模块展示-->
-              <p class="tag-info">{{ $t('system.tag.documentLibraryModuleDisplay') }}</p>
+              <!--对应标准模块展示-->
+              <p class="tag-info">{{ showText + $t('system.tag.documentLibraryModuleDisplay') }}</p>
               <a-divider dashed />
               <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.documentLibraryListDisplay')" prop="isShowList">
+                <a-form-model-item :label="showText + $t('system.tag.documentLibraryListDisplay')" prop="isShowList">
                   <j-dict-select-tag type="list" v-model="form.isShowList" dictCode="yn"
-                                     :placeholder="$t('system.tag.selectWhetherDisplayList')" />
+                                     :placeholder="$t('pleaseSelect') + $t('whether') + showText + $t('system.tag.documentLibraryListDisplay')" />
                 </a-form-model-item>
               </a-col>
               <!--详情页展示-->
@@ -199,10 +203,16 @@ export default {
     type: {
       required: false,
       type: Number
+    },
+    // 当前模块的名称
+    showText: {
+      required: false,
+      type: String
     }
   },
   data () {
     return {
+      canOpeFlag: process.env.VUE_APP_TAG_FLAG === '0', // 是否存在字段名称，开发环境存在
       visible: false,
       title: '',
       width: 800,
@@ -231,7 +241,7 @@ export default {
         ],
 
         dbFieldName: [
-          { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' },
+          { required: false, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' },
           { min: 1, max: 60, message: this.$t('cantExeed') + '60' + this.$t('characters'), trigger: 'blur' },
           { validator: this.test }
         ],
@@ -267,7 +277,7 @@ export default {
         ],
         // 文档库模块展示
         isShowList: [
-          { required: true, message: this.$t('system.tag.selectWhetherDisplayList'), trigger: 'change' }
+          { required: true, message: this.$t('pleaseSelect') + this.$t('whether') + this.showText + this.$t('system.tag.documentLibraryListDisplay'), trigger: 'change' }
         ],
         // 详情页展示
         isShowForm: [
diff --git a/src/views/system/tags/pages/ClauseSplittingList.vue b/src/views/system/tags/pages/ClauseSplittingList.vue
index 8cea60fc..ce57bd10 100644
--- a/src/views/system/tags/pages/ClauseSplittingList.vue
+++ b/src/views/system/tags/pages/ClauseSplittingList.vue
@@ -12,10 +12,8 @@
           </a-form-item>
         </a-col>
         <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-          <a-button class="box-button" @click="searchReset">{{ $t('reset') }}</a-button>
-          <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">
-            {{ $t('query') }}
-          </a-button>
+          <a-button icon="search" class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
+          <a-button icon="reload" class="box-button" @click="searchReset">{{ $t('reset') }}</a-button>
         </div>
       </a-row>
     </a-form>
diff --git a/src/views/system/tags/pages/StandardList.vue b/src/views/system/tags/pages/StandardList.vue
index 63b8452c..a9f8bf28 100644
--- a/src/views/system/tags/pages/StandardList.vue
+++ b/src/views/system/tags/pages/StandardList.vue
@@ -21,10 +21,10 @@
             </a-form-item>
           </a-col>
           <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-            <a-button class="box-button" @click="searchReset">{{ $t('reset') }}</a-button>
-            <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">
+            <a-button icon="search" class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">
               {{ $t('query') }}
             </a-button>
+            <a-button icon="reload" class="box-button" @click="searchReset">{{ $t('reset') }}</a-button>
           </div>
         </a-row>
       </a-form>
@@ -93,6 +93,11 @@ export default {
     type: {
       required: false,
       type: Number
+    },
+    // 当前模块的名称
+    showText: {
+      required: false,
+      type: String
     }
   },
   data () {
diff --git a/src/views/system/tags/pages/TagContent.vue b/src/views/system/tags/pages/TagContent.vue
index 4c46ba40..59cf9cce 100644
--- a/src/views/system/tags/pages/TagContent.vue
+++ b/src/views/system/tags/pages/TagContent.vue
@@ -17,10 +17,8 @@
           </a-col>
           <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-col :span="8">
-              <a-button class="box-button" @click="searchReset">{{ $t('reset') }}</a-button>
-              <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">
-                {{ $t('query') }}
-              </a-button>
+              <a-button icon="search" class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
+              <a-button icon="reload" class="box-button" @click="searchReset">{{ $t('reset') }}</a-button>
             </a-col>
           </div>
         </a-row>
diff --git a/src/views/system/tags/pages/TagItem.vue b/src/views/system/tags/pages/TagItem.vue
index f8a7871f..98154d60 100644
--- a/src/views/system/tags/pages/TagItem.vue
+++ b/src/views/system/tags/pages/TagItem.vue
@@ -3,7 +3,7 @@
   <a-spin :spinning="spinning">
     <a-tabs :default-active-key="1" @change="callbackTab">
       <a-tab-pane v-for='item in tabArr' :key="item.value" :tab="item.showText">
-        <component :is='item.comp' :type='item.value' :property="item.props"></component>
+        <component :is='item.comp' :type='item.value' :show-text="item.showText" :property="item.props"></component>
       </a-tab-pane>
     </a-tabs>
   </a-spin>