From 6dc3ab1058f2efdbbcf7fd43de5d3890a381cc78 Mon Sep 17 00:00:00 2001
From: hanyuxia <hanyuxia@geedgenetworks.com>
Date: Fri, 12 Apr 2024 11:39:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:CN-1592=20UI=20=E6=96=B0=E5=A2=9ETag?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E7=95=8C=E9=9D=A2=EF=BC=9A=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/views/tag/tagForm.scss       | 12 +++++++++---
 src/permission.js                               |  4 ++--
 src/views/tag/Tag.vue                           |  4 ++--
 src/views/tag/TagForm.vue                       | 17 +++++++++++------
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/assets/css/components/views/tag/tagForm.scss b/src/assets/css/components/views/tag/tagForm.scss
index 5e7ee0c8..1cff78d1 100644
--- a/src/assets/css/components/views/tag/tagForm.scss
+++ b/src/assets/css/components/views/tag/tagForm.scss
@@ -1316,7 +1316,7 @@ $color-mousemove-cursor: #D3D0D8;
       }
 
       .el-form-item {
-        margin-bottom: 12px;
+        margin-bottom: 0px;
       }
 
       .el-form-item__content {
@@ -1542,8 +1542,8 @@ $color-mousemove-cursor: #D3D0D8;
       }
 
       .el-form-item__content {
-        margin-top: -16px;
-        margin-bottom: -17px;
+        margin-top: 0px;
+        margin-bottom: 0px;
       }
 
       .el-form-item__error {
@@ -1560,6 +1560,12 @@ $color-mousemove-cursor: #D3D0D8;
     margin-top: 3px;
     box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.10);
 
+    .tag__btn {
+      margin: 0 10px;
+      height: 30px;
+      min-width: 74px;
+    }
+
     .footer__btn {
       margin: 0 10px;
       height: 30px;
diff --git a/src/permission.js b/src/permission.js
index 6e0afd2d..e19b9d27 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -164,8 +164,8 @@ export function handleComponent (code) {
       return () => import('@/views/report/Report')
     case 'tag':
       return () => import('@/views/tag/Tag')
-    case 'createUserDefinedLibrary':
-    case 'editUserDefinedLibrary':
+    case 'createTag':
+    case 'editTag':
       return () => import('@/views/tag/TagForm')
     case 'knowledgeBase':
       return () => import('@/views/setting/KnowledgeBase')
diff --git a/src/views/tag/Tag.vue b/src/views/tag/Tag.vue
index cd365673..9e442d34 100644
--- a/src/views/tag/Tag.vue
+++ b/src/views/tag/Tag.vue
@@ -260,7 +260,7 @@ export default {
     },
     add () {
       this.$router.push({
-        path: '/tag/userDefined/create',
+        path: '/tag/create',
         query: {
           t: +new Date()
         }
@@ -284,7 +284,7 @@ export default {
     jumpToEditPage (id) {
       const pageNo = this.$router.currentRoute.value.query.pageNo
       this.$router.push({
-        path: '/tag/userDefined/edit',
+        path: '/tag/edit',
         query: {
           t: +new Date(),
           pageNoForTable: pageNo || 1,
diff --git a/src/views/tag/TagForm.vue b/src/views/tag/TagForm.vue
index e3908548..711705d1 100644
--- a/src/views/tag/TagForm.vue
+++ b/src/views/tag/TagForm.vue
@@ -155,7 +155,7 @@
                     <td class="imported-data-item" :title="d.entityValue">
                       <el-form-item v-if="(editIndex === i)  || (addEditFlag && d.entityValue === '' && d.entityType === '')" prop="entityValue">
                         <span class="imported-data-item-edit__input">
-                          <el-input v-model="editTagForm.entityValue" @blur="onBlurTagItem(i)" size="mini"></el-input>
+                          <el-input v-model="editTagForm.entityValue" @blur="onBlurTagItem(i)" ></el-input>
                         </span>
                       </el-form-item>
                       <span v-else>{{ d.entityValue }}</span>
@@ -858,7 +858,7 @@ export default {
           customClass: 'del-model'
         }).then(() => {
           this.$router.push({
-            path: '/tag/userDefined',
+            path: '/tag',
             query: {
               pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
               t: +new Date()
@@ -867,7 +867,7 @@ export default {
         }).catch(() => {})
       } else {
         this.$router.push({
-          path: '/tag/userDefined',
+          path: '/tag',
           query: {
             pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
             t: +new Date()
@@ -932,7 +932,7 @@ export default {
                             message: this.$t('tip.saveSuccess')
                           })
                           this.$router.push({
-                            path: '/tag/userDefined',
+                            path: '/tag',
                             query: {
                               pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
                               t: +new Date()
@@ -960,7 +960,7 @@ export default {
                             message: this.$t('tip.saveSuccess')
                           })
                           this.$router.push({
-                            path: '/tag/userDefined',
+                            path: '/tag',
                             query: {
                               pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
                               t: +new Date()
@@ -1176,6 +1176,11 @@ export default {
           this.editTagErrorTip = ''
           this.showImportedData[index].isValid = 1
           this.showImportedData[index].msg = this.$t('overall.success')
+          if (this.hasErrorImportedData()) {
+            this.previewErrorTip = this.$t('validate.pleaseCheckForErrorItem')
+          } else {
+            this.previewErrorTip = ''
+          }
         } else {
           this.showImportedData[index].isValid = 0
         }
@@ -1284,7 +1289,7 @@ export default {
         console.error(e)
         this.$message.error(this.errorMsgHandler(e))
         this.$router.push({
-          path: '/tag/userDefined',
+          path: '/tag',
           query: {
             pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
             t: +new Date()