From c1e21905dfc78730db2b07141d09d737a961a7c6 Mon Sep 17 00:00:00 2001
From: wangruidong <940853815@qq.com>
Date: Wed, 12 Jun 2024 19:30:52 +0800
Subject: [PATCH 1/8] fix: Modify some translations

---
 src/views/accounts/Account/AccountDetail/Detail.vue      | 5 +++--
 src/views/settings/Feature/index.vue                     | 2 +-
 .../settings/Storage/CommandStorageCreateUpdate.vue      | 9 ++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/accounts/Account/AccountDetail/Detail.vue b/src/views/accounts/Account/AccountDetail/Detail.vue
index 351f8f008..2fd1ec4f4 100644
--- a/src/views/accounts/Account/AccountDetail/Detail.vue
+++ b/src/views/accounts/Account/AccountDetail/Detail.vue
@@ -40,7 +40,8 @@ export default {
   props: {
     object: {
       type: Object,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -212,7 +213,7 @@ export default {
               name: 'AssetDetail',
               params: { id: this.object.asset.id }
             }
-            return <router-link to={route} >{ value }</router-link>
+            return <router-link to={route}>{value?.name}</router-link>
           },
           su_from: (item, value) => {
             return <span>{value?.name ? value?.name + `(${value?.username})` : ''}</span>
diff --git a/src/views/settings/Feature/index.vue b/src/views/settings/Feature/index.vue
index 0f3464b6f..58d4980ce 100644
--- a/src/views/settings/Feature/index.vue
+++ b/src/views/settings/Feature/index.vue
@@ -32,7 +32,7 @@ export default {
           hidden: !this.$store.getters.hasValidLicense
         },
         {
-          title: this.$t('AppOps'),
+          title: this.$t('JobCenter'),
           name: 'Ops'
         },
         {
diff --git a/src/views/settings/Storage/CommandStorageCreateUpdate.vue b/src/views/settings/Storage/CommandStorageCreateUpdate.vue
index cb6f0d5b3..854fb7a72 100644
--- a/src/views/settings/Storage/CommandStorageCreateUpdate.vue
+++ b/src/views/settings/Storage/CommandStorageCreateUpdate.vue
@@ -48,7 +48,8 @@ export default {
                 replaceRule: '(https?:\/\/[^:@]+:)([^@]+)(@.+)'
               },
               rules: [RequiredChange],
-              helpText: this.$t('EsUrl')
+              helpText: this.$t('EsUrl'),
+              helpTextAsPlaceholder: false
             },
             INDEX: {
               rules: [Required],
@@ -83,10 +84,8 @@ export default {
       }
     }
   },
-  computed: {
-  },
-  methods: {
-  }
+  computed: {},
+  methods: {}
 }
 </script>
 

From bb37dde0e0538e1bddf3ee91e87583c9e202f6da Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Thu, 13 Jun 2024 10:27:23 +0800
Subject: [PATCH 2/8] style: Fine-tuning styles

---
 src/components/Table/CardTable/index.vue           |  2 +-
 .../Cloud/Account/components/AccountPanel.vue      | 14 +++++++++-----
 .../Cloud/Account/components/CreateDialog.vue      |  6 +++++-
 .../assets/Cloud/Account/components/InfoPanel.vue  |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/Table/CardTable/index.vue b/src/components/Table/CardTable/index.vue
index ebff0ca0a..64607d3de 100644
--- a/src/components/Table/CardTable/index.vue
+++ b/src/components/Table/CardTable/index.vue
@@ -241,7 +241,7 @@ export default {
   .el-col, div {
     .my-card {
       min-width: 330px;
-      height: 250px;
+      //height: 250px;
       width: 100%;
       position: relative;
       margin-bottom: 20px;
diff --git a/src/views/assets/Cloud/Account/components/AccountPanel.vue b/src/views/assets/Cloud/Account/components/AccountPanel.vue
index 1b6eaebd1..22bd51fe2 100644
--- a/src/views/assets/Cloud/Account/components/AccountPanel.vue
+++ b/src/views/assets/Cloud/Account/components/AccountPanel.vue
@@ -8,7 +8,9 @@
       </el-col>
       <el-col :span="2" @click.native="handleClick($event)">
         <el-dropdown>
-          <el-link :underline="false" type="primary"><i class="el-icon-more el-icon--right" /></el-link>
+          <el-link :underline="false" type="primary">
+            <i class="el-icon-more el-icon--right" style="color: var(--color-text-primary)" />
+          </el-link>
           <el-dropdown-menu default="dropdown">
             <el-dropdown-item v-for="action in actions" :key="action.name" @click.native="action.callback">
               <i v-if="action.icon" :class="action.icon" /> {{ action.name }}
@@ -18,15 +20,15 @@
       </el-col>
     </el-row>
     <el-divider />
-    <el-row :gutter="20" style="height: 80%;">
+    <el-row :gutter="20">
       <el-col :span="6" class="image">
         <el-image :src="cloudImage" fit="contain" />
       </el-col>
       <el-col :span="18">
         <InfoPanel :content="iTask.regions.length" :title="$tc('TotalSyncRegion')" />
         <InfoPanel :content="iTask.instance_count || 0" :title="$tc('TotalSyncAsset')" />
-        <InfoPanel :content="iTask.strategy.length" :title="$tc('TotalSyncStrategy')" />
-        <InfoPanel :content="toSafeLocalDateStr(object.date_created)" :title="$tc('DateJoined')" />
+        <!-- <InfoPanel :content="iTask.strategy.length" :title="$tc('TotalSyncStrategy')" /> -->
+        <!-- <InfoPanel :content="toSafeLocalDateStr(object.date_created)" :title="$tc('DateJoined')" /> -->
         <InfoPanel :content="toSafeLocalDateStr(iTask.date_last_sync)" :title="$tc('DateLastSync')" />
       </el-col>
     </el-row>
@@ -168,11 +170,12 @@ export default {
 .account-panel {
   display: flex;
   flex-direction: column;
-  height: 100%;
+  //height: 100%;
   cursor: pointer;
 
   & .el-row:first-of-type {
     height: 30px !important;
+    padding: 0;
 
     .el-col-22 {
       padding-left: 0 !important;
@@ -199,6 +202,7 @@ export default {
     display: flex;
     align-items: center;
     margin: 0 !important;
+    padding: 25px 0;
   }
 
   .el-divider--horizontal {
diff --git a/src/views/assets/Cloud/Account/components/CreateDialog.vue b/src/views/assets/Cloud/Account/components/CreateDialog.vue
index 771f4a74d..222886922 100644
--- a/src/views/assets/Cloud/Account/components/CreateDialog.vue
+++ b/src/views/assets/Cloud/Account/components/CreateDialog.vue
@@ -8,7 +8,7 @@
     :title="$tc('CloudSyncConfig')"
     :visible.sync="iVisible"
     v-bind="$attrs"
-    width="70%"
+    width="1051px"
     v-on="$listeners"
   >
     <el-row style="padding: 10px">
@@ -103,6 +103,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-dialog {
+  min-width: 1051px !important;
+  max-width: 1051px !important;
+}
 ::v-deep .el-step {
   .el-step__head {
     &.is-process {
diff --git a/src/views/assets/Cloud/Account/components/InfoPanel.vue b/src/views/assets/Cloud/Account/components/InfoPanel.vue
index 1c9ed83ac..0dcc42794 100644
--- a/src/views/assets/Cloud/Account/components/InfoPanel.vue
+++ b/src/views/assets/Cloud/Account/components/InfoPanel.vue
@@ -59,7 +59,7 @@ export default {
 }
 
 html:lang(en) .panel-item span {
-  min-width: 160px;
+  min-width: 100px;
 }
 
 html:lang(ja) .panel-item span {

From 3d362db71ae9dcd76d07ca75b96c0bc84d04ec9d Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Thu, 13 Jun 2024 11:04:43 +0800
Subject: [PATCH 3/8] style: Fine-tune the asset tree input style

---
 .../Tree/DataZTree/components/ZTree/index.vue      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/Tree/DataZTree/components/ZTree/index.vue b/src/components/Tree/DataZTree/components/ZTree/index.vue
index 2ce1281ca..53e0f1d38 100644
--- a/src/components/Tree/DataZTree/components/ZTree/index.vue
+++ b/src/components/Tree/DataZTree/components/ZTree/index.vue
@@ -409,6 +409,11 @@ export default {
   &:hover {
     ::v-deep .tree-action-btn {
       display: inline;
+
+      &:hover {
+        box-shadow: none;
+        color: var(--color-text-primary) !important;
+      }
     }
   }
 
@@ -610,6 +615,7 @@ div.rMenu li {
     border-radius: 4px;
     background: #fafafa;
     padding-right: 32px;
+    color: var(--color-text-primary)
   }
 
   & ::v-deep .el-input__suffix {
@@ -617,7 +623,13 @@ div.rMenu li {
   }
 
   & ::v-deep .el-input__prefix {
-    padding-left: 6px;
+    display: flex;
+
+    .el-input__icon {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
   }
 
   & ::v-deep .el-input__suffix-inner {

From a465a093c9be662a1cdd7f04027885c11c3a9285 Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Thu, 13 Jun 2024 11:22:55 +0800
Subject: [PATCH 4/8] style: Fine-tune the asset tree input style

---
 .../Tree/DataZTree/components/ZTree/index.vue         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/Tree/DataZTree/components/ZTree/index.vue b/src/components/Tree/DataZTree/components/ZTree/index.vue
index 53e0f1d38..e816dba82 100644
--- a/src/components/Tree/DataZTree/components/ZTree/index.vue
+++ b/src/components/Tree/DataZTree/components/ZTree/index.vue
@@ -12,10 +12,9 @@
           @input="treeSearchHandle"
         >
           <span slot="suffix">
-            <svg-icon
-              class="icon"
-              icon-class="close"
-              style="font-size: 12px;"
+            <i
+              class="el-icon-close"
+              style="font-size: 12px; cursor: pointer"
               @click="onClose"
             />
           </span>
@@ -620,6 +619,10 @@ div.rMenu li {
 
   & ::v-deep .el-input__suffix {
     padding-right: 8px;
+
+    .el-input__suffix-inner:hover {
+      color: var(--color-text-primary);
+    }
   }
 
   & ::v-deep .el-input__prefix {

From 8ddc2cda92a6f813c231a3347bca7bec0453ad9a Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Thu, 13 Jun 2024 14:09:34 +0800
Subject: [PATCH 5/8] perf: i18n cookie default en and expired 365d and remove
 storage i18n

---
 src/i18n/i18n.js                             |  5 ++---
 src/layout/components/NavHeader/Language.vue | 11 ++---------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js
index 1ac437f5f..e975d6412 100644
--- a/src/i18n/i18n.js
+++ b/src/i18n/i18n.js
@@ -10,9 +10,8 @@ import store from '@/store'
 
 Vue.use(VueI18n)
 const cookieLang = VueCookie.get('django_language')
-const storeLang = VueCookie.get('lang')
-const browserLang = navigator.systemLanguage || navigator.language
-let lang = cookieLang || storeLang || browserLang || 'en'
+const browserLang = navigator.systemLanguage || navigator.language || navigator.userLanguage
+let lang = cookieLang || browserLang || 'en'
 if (lang === 'zh-hant') {
   lang = 'zh_hant'
 } else {
diff --git a/src/layout/components/NavHeader/Language.vue b/src/layout/components/NavHeader/Language.vue
index 0fde23a5e..094f921a1 100644
--- a/src/layout/components/NavHeader/Language.vue
+++ b/src/layout/components/NavHeader/Language.vue
@@ -63,9 +63,6 @@ export default {
   },
   mounted() {
     this.changeMomentLang()
-
-    const userLang = localStorage.getItem('lang')
-    document.documentElement.lang = userLang
   },
   methods: {
     changeLang() {
@@ -86,17 +83,13 @@ export default {
     },
     changeLangTo(item) {
       this.$i18n.locale = item.code
-      localStorage.setItem('lang', item.code)
-      this.$cookie.set(this.LANG_COOKIE_NAME, item.cookieCode)
+      this.$cookie.set(this.LANG_COOKIE_NAME, item.cookieCode, { expires: 365 })
       window.location.reload()
     },
     getLangCode() {
       let langCode = this.$cookie.get(this.LANG_COOKIE_NAME)
       if (!langCode) {
-        langCode = localStorage.lang
-      }
-      if (!langCode) {
-        langCode = navigator.language || navigator.userLanguage
+        langCode = navigator.systemLanguage || navigator.language || navigator.userLanguage
       }
       if (langCode === 'zh-hant') {
         langCode = 'zh_hant'

From 86b687d27bf9c0b639a5aae066faad221534ef24 Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Thu, 13 Jun 2024 15:02:37 +0800
Subject: [PATCH 6/8] fixed: Fixed an issue where Dialog does not close when
 the asset list is authorized for reclicking the jump

---
 .../Table/TableFormatters/DetailFormatter.vue         |  2 +-
 .../components/GenericListTableDialog/index.vue       |  6 +-----
 src/views/assets/Asset/AssetDetail/PermUser.vue       | 11 +++++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/Table/TableFormatters/DetailFormatter.vue b/src/components/Table/TableFormatters/DetailFormatter.vue
index cf1e80e06..6f8b3198c 100644
--- a/src/components/Table/TableFormatters/DetailFormatter.vue
+++ b/src/components/Table/TableFormatters/DetailFormatter.vue
@@ -99,7 +99,7 @@ export default {
       if (routeQuery && typeof routeQuery === 'object') {
         detailRoute.query = this.formatterArgs.routeQuery
         if (detailRoute.query.tab) {
-          detailRoute.query = detailRoute.query.tab
+          detailRoute.name = detailRoute.query.tab
         }
       }
       return detailRoute
diff --git a/src/layout/components/GenericListTableDialog/index.vue b/src/layout/components/GenericListTableDialog/index.vue
index 357394599..ac6aed59d 100644
--- a/src/layout/components/GenericListTableDialog/index.vue
+++ b/src/layout/components/GenericListTableDialog/index.vue
@@ -2,10 +2,10 @@
   <Dialog
     :title="title"
     :visible.sync="iVisible"
-    top="1vh"
     :width="width"
     :show-cancel="false"
     :show-confirm="false"
+    top="1vh"
   >
     <GenericListTable :table-config="tableConfig" :header-actions="headerActions" />
   </Dialog>
@@ -54,7 +54,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/assets/Asset/AssetDetail/PermUser.vue b/src/views/assets/Asset/AssetDetail/PermUser.vue
index 6f08d4250..7720dbe8a 100644
--- a/src/views/assets/Asset/AssetDetail/PermUser.vue
+++ b/src/views/assets/Asset/AssetDetail/PermUser.vue
@@ -206,10 +206,13 @@ export default {
         }
       }
     }
+  },
+  watch: {
+    $route: {
+      handler(newVal) {
+        newVal.fullPath.includes('/console/perms/asset-permissions/') && (this.GenericListTableDialogConfig.visible = false)
+      }
+    }
   }
 }
 </script>
-
-<style scoped>
-
-</style>

From 30444565a89ca6a295e919a9703c6b032ac84ede Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Thu, 13 Jun 2024 15:41:41 +0800
Subject: [PATCH 7/8] fixed: Fixed the Error message when updating assets

---
 src/components/Form/FormFields/Select2.vue               | 2 +-
 src/views/assets/Asset/AssetList/DatabaseList.vue        | 4 ----
 src/views/assets/Asset/AssetList/components/BaseList.vue | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/components/Form/FormFields/Select2.vue b/src/components/Form/FormFields/Select2.vue
index 927156ddb..5e747aa55 100644
--- a/src/components/Form/FormFields/Select2.vue
+++ b/src/components/Form/FormFields/Select2.vue
@@ -268,7 +268,7 @@ export default {
     }
     // 由于在新增时有些 Select 会存在初始值，而有些没有，就会导致动态类名判断出现相反的情况
     // 此处强制设置没有初始值的动态类名
-    if (this.iValue.length === 0) this.transformed = false
+    if (Array.isArray(this.iValue) && this.iValue.length === 0) this.transformed = false
 
     this.$nextTick(() => {
       // 因为elform存在问题，这个来清楚验证
diff --git a/src/views/assets/Asset/AssetList/DatabaseList.vue b/src/views/assets/Asset/AssetList/DatabaseList.vue
index beb8428c7..ab0c940cb 100644
--- a/src/views/assets/Asset/AssetList/DatabaseList.vue
+++ b/src/views/assets/Asset/AssetList/DatabaseList.vue
@@ -19,7 +19,3 @@ export default {
   }
 }
 </script>
-
-<style>
-
-</style>
diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue
index 3deac16c4..40fa80dc6 100644
--- a/src/views/assets/Asset/AssetList/components/BaseList.vue
+++ b/src/views/assets/Asset/AssetList/components/BaseList.vue
@@ -324,7 +324,3 @@ export default {
   }
 }
 </script>
-
-<style>
-
-</style>

From 99f027e0ee1ca27b6dfd91bd509a6a08a24611b9 Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Thu, 13 Jun 2024 16:47:20 +0800
Subject: [PATCH 8/8] style: Change shuttle box icon

---
 src/components/Libs/Krry/paging/index.vue | 50 ++++++++++++++---------
 src/icons/svg/arrow.svg                   |  1 +
 2 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 src/icons/svg/arrow.svg

diff --git a/src/components/Libs/Krry/paging/index.vue b/src/components/Libs/Krry/paging/index.vue
index 69718e946..b42b31ddf 100644
--- a/src/components/Libs/Krry/paging/index.vue
+++ b/src/components/Libs/Krry/paging/index.vue
@@ -27,21 +27,24 @@
       </el-col>
       <el-col :md="4" :sm="24" class="buttons">
         <div class="opera">
-          <el-button
-            :disabled="disablePre"
-            class="el-transfer__button"
-            icon="el-icon-arrow-left"
-            size="mini"
-            @click="deleteData"
-          />
-          <el-button
-            :disabled="disableNex"
-            class="el-transfer__button"
-            icon="el-icon-arrow-right"
-            size="mini"
-            type="primary"
-            @click="addData"
-          />
+          <svg-icon v-if="transferOnCheck" class="arrow" icon-class="arrow" />
+          <templae v-else>
+            <el-button
+              :disabled="disablePre"
+              class="el-transfer__button"
+              icon="el-icon-arrow-left"
+              size="mini"
+              @click="deleteData"
+            />
+            <el-button
+              :disabled="disableNex"
+              class="el-transfer__button"
+              icon="el-icon-arrow-right"
+              size="mini"
+              type="primary"
+              @click="addData"
+            />
+          </templae>
         </div>
       </el-col>
       <el-col :md="10" :sm="24">
@@ -422,13 +425,22 @@ export default {
 .buttons {
   vertical-align: middle;
 }
+
 .opera {
   position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  text-align: center;
-  margin: 180px 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-left: 10px;
   width: calc(100% - 5px);
+  height: 415px;
+
+  .arrow {
+    width: 1.25em;
+    height: 1.25em;
+    color: #888888;
+  }
+
   @media screen and (max-width: 992px) {
     margin: 8px 8px;
     text-align:start
diff --git a/src/icons/svg/arrow.svg b/src/icons/svg/arrow.svg
new file mode 100644
index 000000000..f0b53b2fd
--- /dev/null
+++ b/src/icons/svg/arrow.svg
@@ -0,0 +1 @@
+<svg t="1718268187955" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7725" width="40" height="40"><path d="M14.278687 494.72555121L312.91147481 788.51184055l0-172.82492782L711.08852519 615.68691273 711.08852519 788.51184055 1009.721313 494.72555121 711.08852519 235.48815945l0 172.82492782-398.17705038 0 0-172.82492782-298.63278781 259.23739176z" fill="#2c2c2c" p-id="7726"></path></svg>