From fa6f19fe6508c791c0cda2e665ede60dbdb0afb2 Mon Sep 17 00:00:00 2001
From: yuri0528 <72436066+yuri0528@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:23:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20(#1244)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/src/css/index.css                   | 14 +++++++
 src/pages/src/router/index.ts                 |  2 +-
 src/pages/src/views/Header.vue                | 11 ++++-
 .../src/views/data-source/LocalDataSource.vue | 10 +++--
 .../data-source/local-details/PswInfo.vue     |  3 +-
 .../views/data-source/local-details/index.vue | 41 +++++++++----------
 .../data-source/new-data/NewLocalData.vue     | 15 +++++--
 src/pages/src/views/organization/index.vue    |  1 +
 8 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/src/pages/src/css/index.css b/src/pages/src/css/index.css
index 931f29c09..2c3fd0d76 100644
--- a/src/pages/src/css/index.css
+++ b/src/pages/src/css/index.css
@@ -73,3 +73,17 @@
     visibility: hidden;
   }
 }
+
+.datasource-type-icon {
+  display: flex;
+  align-items: center;
+
+  img {
+    width: 14px;
+    height: 14px;
+  }
+
+  span {
+    margin-left: 8px;
+  }
+}
\ No newline at end of file
diff --git a/src/pages/src/router/index.ts b/src/pages/src/router/index.ts
index a62b15aa5..2697a078d 100644
--- a/src/pages/src/router/index.ts
+++ b/src/pages/src/router/index.ts
@@ -84,7 +84,7 @@ export default createRouter({
           ],
         },
         {
-          path: 'local-details/:id',
+          path: 'local-details/:id/:status',
           name: 'dataConfDetails',
           meta: {
             routeParentName: 'dataSource',
diff --git a/src/pages/src/views/Header.vue b/src/pages/src/views/Header.vue
index cad968171..06d119aef 100644
--- a/src/pages/src/views/Header.vue
+++ b/src/pages/src/views/Header.vue
@@ -160,6 +160,8 @@ const toIndividualCenter = () => {
 
 <style lang="less" scoped>
 .main-navigation {
+  min-width: 1200px;
+
   :deep(.bk-navigation-header) {
     background-color: #0e1525;
 
@@ -173,8 +175,13 @@ const toIndividualCenter = () => {
     }
   }
 
-  :deep(.container-content) {
-    padding: 0 !important;
+  :deep(.navigation-container) {
+    min-width: 1200px;
+
+    .container-content {
+      padding: 0 !important;
+      overflow: hidden;
+    }
   }
 
   :deep(.header-right) {
diff --git a/src/pages/src/views/data-source/LocalDataSource.vue b/src/pages/src/views/data-source/LocalDataSource.vue
index 041e20914..a9d5212de 100644
--- a/src/pages/src/views/data-source/LocalDataSource.vue
+++ b/src/pages/src/views/data-source/LocalDataSource.vue
@@ -59,8 +59,9 @@
         </bk-table-column>
         <bk-table-column prop="plugin_id" label="数据源类型">
           <template #default="{ row }">
-            <div>
-              <i :class="[dataSourceType[row.plugin_id]?.icon, 'type-icon']" />
+            <div class="datasource-type-icon" v-for="item in state.typeList" :key="item">
+              <img v-if="item.id === row.plugin_id && item.logo" :src="item.logo">
+              <i v-else :class="[dataSourceType[row.plugin_id]?.icon, 'type-icon']" />
               <span>{{ dataSourceType[row.plugin_id]?.text }}</span>
             </div>
           </template>
@@ -156,6 +157,7 @@ function handleClick(item) {
     name: 'dataConfDetails',
     params: {
       id: item.id,
+      status: item.status,
     },
   });
 }
@@ -235,8 +237,8 @@ function newDataSource(item) {
     align-items: center;
 
     img {
-      width: 16px;
-      height: 16px;
+      width: 24px;
+      height: 24px;
     }
 
     .user-icon {
diff --git a/src/pages/src/views/data-source/local-details/PswInfo.vue b/src/pages/src/views/data-source/local-details/PswInfo.vue
index 8e5e715b6..72e970e27 100644
--- a/src/pages/src/views/data-source/local-details/PswInfo.vue
+++ b/src/pages/src/views/data-source/local-details/PswInfo.vue
@@ -27,7 +27,8 @@
           </li>
           <li>
             <span class="key">密码不允许：</span>
-            <span class="value">
+            <span class="value" v-if="passwordRule?.not_continuous_count === 0">--</span>
+            <span class="value" v-else>
               连续{{ passwordRule?.not_continuous_count }}位出现
               {{ passwordNotAllowedMap(passwordRule) }}
             </span>
diff --git a/src/pages/src/views/data-source/local-details/index.vue b/src/pages/src/views/data-source/local-details/index.vue
index 98c1cd78e..e5ec9fa77 100644
--- a/src/pages/src/views/data-source/local-details/index.vue
+++ b/src/pages/src/views/data-source/local-details/index.vue
@@ -2,16 +2,19 @@
   <bk-loading :loading="isLoading">
     <MainBreadcrumbsDetails :subtitle="subtitle">
       <template #tag>
-        <bk-tag v-if="typeText">
+        <bk-tag>
           <template #icon>
-            <i :class="typeIcon" />
+            <div class="datasource-type-icon" v-for="item in typeList" :key="item">
+              <img v-if="item.id === pluginId && item.logo" :src="item.logo">
+              <i v-else :class="dataSourceType[pluginId].icon" />
+              <span>{{ dataSourceType[pluginId].text }}</span>
+            </div>
           </template>
-          {{ typeText }}
         </bk-tag>
       </template>
       <template #right>
-        <bk-button v-if="statusText" class="w-[64px]" @click="handleClick">
-          {{ statusText }}
+        <bk-button class="w-[64px]" hover-theme="primary" @click="handleClick">
+          {{ statusText === 'disabled' ? '启用' : '停用' }}
         </bk-button>
       </template>
     </MainBreadcrumbsDetails>
@@ -42,7 +45,7 @@ import PswInfo from './PswInfo.vue';
 import UserInfo from './UserInfo.vue';
 
 import MainBreadcrumbsDetails from '@/components/layouts/MainBreadcrumbsDetails.vue';
-import { changeSwitchStatus, getDataSourceList } from '@/http/dataSourceFiles';
+import { changeSwitchStatus, getDataSourceList, getDataSourcePlugins } from '@/http/dataSourceFiles';
 import { dataSourceType } from '@/utils';
 
 const route = useRoute();
@@ -58,40 +61,34 @@ const panels = reactive([
 const isLoading = ref(false);
 
 const subtitle = ref('');
-const typeText = ref('');
-const typeIcon = ref('');
 const statusText = ref('');
-const switchStatus = ref('');
+const typeList = ref([]);
+const pluginId = ref('');
 
 onMounted(async () => {
   isLoading.value = true;
+  statusText.value = route.params.status;
   const res = await getDataSourceList('');
-  await getSwitchStatus();
   res.data.forEach((item) => {
     if (item.id === currentId.value) {
-      const { text, icon } = dataSourceType[item.plugin_id];
       subtitle.value = item.name;
-      typeText.value = text;
-      typeIcon.value = icon;
+      pluginId.value = item.plugin_id;
     }
   });
+  const pluginsRes = await getDataSourcePlugins();
+  typeList.value = pluginsRes.data;
   isLoading.value = false;
 });
 
-const getSwitchStatus = async () => {
-  const res = await changeSwitchStatus(route.params.id);
-  switchStatus.value = res.data?.status;
-  statusText.value = res.data?.status === 'disabled' ? '启用' : '停用';
-};
-
 const handleClick = async () => {
-  await getSwitchStatus();
-  const message = switchStatus.value === 'disabled' ? '停用成功' : '启用成功';
+  const res = await changeSwitchStatus(route.params.id);
+  statusText.value = res.data?.status;
+  const message = res.data?.status === 'disabled' ? '停用成功' : '启用成功';
   Message({ theme: 'success', message });
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .main-breadcrumbs-details {
   box-shadow: none;
 }
diff --git a/src/pages/src/views/data-source/new-data/NewLocalData.vue b/src/pages/src/views/data-source/new-data/NewLocalData.vue
index 13eec42ae..f45d7ff6b 100644
--- a/src/pages/src/views/data-source/new-data/NewLocalData.vue
+++ b/src/pages/src/views/data-source/new-data/NewLocalData.vue
@@ -4,9 +4,12 @@
       <template #tag>
         <bk-tag>
           <template #icon>
-            <i :class="dataSourceType[route.params.type].icon" />
+            <div class="datasource-type-icon" v-for="item in typeList" :key="item">
+              <img v-if="item.id === route.params.type && item.logo" :src="item.logo">
+              <i v-else :class="dataSourceType[route.params.type].icon" />
+              <span>{{ dataSourceType[route.params.type].text }}</span>
+            </div>
           </template>
-          {{ dataSourceType[route.params.type].text }}
         </bk-tag>
       </template>
     </MainBreadcrumbsDetails>
@@ -36,7 +39,7 @@
               type="number"
               suffix="至32位"
               :min="10"
-              :max="31"
+              :max="32"
               v-model="formData.config.password_rule.min_length"
               @change="handleChange"
             />
@@ -243,7 +246,7 @@ import { useRoute } from 'vue-router';
 import MainBreadcrumbsDetails from '@/components/layouts/MainBreadcrumbsDetails.vue';
 import NotifyEditorTemplate from '@/components/notify-editor/NotifyEditorTemplate.vue';
 import useValidate from '@/hooks/use-validate';
-import { getDataSourceDetails, getDefaultConfig, newDataSource, putDataSourceDetails } from '@/http/dataSourceFiles';
+import { getDataSourceDetails, getDataSourcePlugins, getDefaultConfig, newDataSource, putDataSourceDetails } from '@/http/dataSourceFiles';
 import router from '@/router';
 import { useMainViewStore } from '@/store/mainView';
 import { dataSourceType, passwordMustIncludes, passwordNotAllowed } from '@/utils';
@@ -283,9 +286,13 @@ const rulesInfo = {
   min_length: [validate.required],
 };
 
+const typeList = ref([]);
+
 onMounted(async () => {
   isLoading.value = true;
   try {
+    const pluginsRes = await getDataSourcePlugins();
+    typeList.value = pluginsRes.data;
     if (currentId.value) {
       store.breadCrumbsTitle = '编辑数据源';
       const res = await getDataSourceDetails(currentId.value);
diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
index 436a9288b..99d910b38 100644
--- a/src/pages/src/views/organization/index.vue
+++ b/src/pages/src/views/organization/index.vue
@@ -339,6 +339,7 @@ const updateTenantsList = () => {
   height: calc(100vh - 52px);
 
   .organization-main {
+    width: calc(100% - 280px);
     height: calc(100% - 52px);
 
     header {

From 909952c191cd1333229dfd4f018969c946c02e89 Mon Sep 17 00:00:00 2001
From: yuri0528 <72436066+yuri0528@users.noreply.github.com>
Date: Mon, 18 Sep 2023 19:33:57 +0800
Subject: [PATCH 2/2] fix: bugfix (#1246)

---
 src/pages/src/views/data-source/local-details/UserInfo.vue | 7 ++++++-
 src/pages/src/views/data-source/local-details/index.vue    | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/src/views/data-source/local-details/UserInfo.vue b/src/pages/src/views/data-source/local-details/UserInfo.vue
index aa1312cbe..e7110e4a2 100644
--- a/src/pages/src/views/data-source/local-details/UserInfo.vue
+++ b/src/pages/src/views/data-source/local-details/UserInfo.vue
@@ -110,7 +110,7 @@
 
 <script setup lang="ts">
 import { Message } from 'bkui-vue';
-import { computed, inject, onMounted, reactive, ref, watch } from 'vue';
+import { computed, defineProps, inject, onMounted, reactive, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import EditUser from './EditUser.vue';
@@ -119,6 +119,11 @@ import ViewUser from './ViewUser.vue';
 import Empty from '@/components/Empty.vue';
 import { getDataSourceUserDetails, getDataSourceUsers } from '@/http/dataSourceFiles';
 
+defineProps({
+  dataSourceId: {
+    type: Number,
+  },
+});
 const route = useRoute();
 
 const currentId = computed(() => Number(route.params.id));
diff --git a/src/pages/src/views/data-source/local-details/index.vue b/src/pages/src/views/data-source/local-details/index.vue
index e5ec9fa77..bc9f871ee 100644
--- a/src/pages/src/views/data-source/local-details/index.vue
+++ b/src/pages/src/views/data-source/local-details/index.vue
@@ -29,7 +29,9 @@
         :name="item.name"
         :label="item.label"
       >
-        <UserInfo v-if="activeKey === 'user'" />
+        <UserInfo
+          v-if="activeKey === 'user'"
+          :data-source-id="currentId" />
         <PswInfo v-else />
       </bk-tab-panel>
     </bk-tab>