From cf0a72e187745d4ca85ef2c4a2ac4590a9e6ee4a Mon Sep 17 00:00:00 2001
From: raja <1647193241@qq.com>
Date: Fri, 6 Dec 2024 11:25:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E6=97=B6=E9=80=89=E6=8B=A9=E8=AE=A1=E7=AE=97=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=B7=B2=E6=9C=89=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=8A=A5=E9=94=99=20--bug=3D135106919?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增 bkbase 已有数据源特性开关
---
 src/backend/config/default.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/config/default.py b/src/backend/config/default.py
index ccca228f..2283e459 100644
--- a/src/backend/config/default.py
+++ b/src/backend/config/default.py
@@ -251,6 +251,7 @@
     "watermark": os.getenv("BKAPP_FEATURE_WATERMARK", "deny"),
     "bkvision": os.getenv("BKAPP_FEATURE_BKVISION", "deny"),
     "bknotice": os.getenv("BKAPP_FEATURE_BKNOTICE", "deny"),
+    "bkbase_data_source": os.getenv("BKAPP_FEATURE_BKBASE_DATA_SOURCE", "on"),
 }
 
 # BkLog

From 7103363f360caccf554d6541ec25262038c38709 Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Mon, 9 Dec 2024 17:34:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E7=BC=BA=E5=B0=91type=EF=BC=8C?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99=20--story=3D135106919?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/env.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/frontend/env.d.ts b/src/frontend/env.d.ts
index dbe8b456..73240552 100644
--- a/src/frontend/env.d.ts
+++ b/src/frontend/env.d.ts
@@ -41,7 +41,9 @@ declare interface Window {
   timezone: string;
 }
 
-declare module 'js-cookie'
+declare module 'js-cookie';
+
+declare module 'dompurify';
 
 declare module '@blueking/notice-component';
 

From 71a124b01bc5d944240328055b449996b95d6963 Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Mon, 9 Dec 2024 15:16:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=BB=BA=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E6=97=B6=E9=80=89=E6=8B=A9=E8=AE=A1=E7=AE=97=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=B7=B2=E6=9C=89=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=8A=E6=8A=A5=E6=8A=A5=E9=94=99=20--story=3D13510?=
 =?UTF-8?q?6919?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/domain/service/collector-manage.ts     |  7 +++++++
 .../src/domain/source/collector-manage.ts      |  4 ++++
 .../collector-create/pages/step1/index.vue     | 18 +++++++++++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/domain/service/collector-manage.ts b/src/frontend/src/domain/service/collector-manage.ts
index d62e85e6..5517bfe9 100644
--- a/src/frontend/src/domain/service/collector-manage.ts
+++ b/src/frontend/src/domain/service/collector-manage.ts
@@ -317,4 +317,11 @@ export default {
     return CollectorSource.createApiPush(params)
       .then(({ data }) => data);
   },
+  /**
+   * @desc 是否显示：上报方式，计算平台已有数据源
+   */
+  fetchBkbaseFeature(params: {feature_id: string}) {
+    return CollectorSource.getBkbaseFeature(params)
+      .then(({ data }) => data);
+  },
 };
diff --git a/src/frontend/src/domain/source/collector-manage.ts b/src/frontend/src/domain/source/collector-manage.ts
index 2d6853b5..02621dae 100644
--- a/src/frontend/src/domain/source/collector-manage.ts
+++ b/src/frontend/src/domain/source/collector-manage.ts
@@ -238,6 +238,10 @@ class CollectorManage extends ModuleBase {
       payload,
     });
   }
+  // 判断上报方式，计算平台已有数据源是否显示
+  getBkbaseFeature(params: {feature_id: string}) {
+    return Request.get<Record<'enabled', boolean>>(`/api/v1/feature/${params.feature_id}/`);
+  }
 }
 
 export default new CollectorManage();
diff --git a/src/frontend/src/views/system-manage/collector-create/pages/step1/index.vue b/src/frontend/src/views/system-manage/collector-create/pages/step1/index.vue
index 623baebc..9f02c756 100644
--- a/src/frontend/src/views/system-manage/collector-create/pages/step1/index.vue
+++ b/src/frontend/src/views/system-manage/collector-create/pages/step1/index.vue
@@ -30,7 +30,7 @@
             property="test">
             <bk-radio-group v-model="reportMethod">
               <bk-radio-button
-                v-for="item in reportMethodRadioList"
+                v-for="item in reportMethodRadioList.filter(item => showBkbase.enabled || item.id !== 'bkbase')"
                 :key="item.id"
                 class="form-raido-common"
                 :disabled="isEditMode"
@@ -334,7 +334,7 @@
     yaml_config: '',
   });
   const reportMethod = ref('newlog');
-  const reportMethodRadioList = [
+  const reportMethodRadioList = ref([
     {
       id: 'newlog',
       name: t('新建日志采集'),
@@ -343,7 +343,7 @@
       id: 'bkbase',
       name: t('计算平台已有数据源'),
     },
-  ];
+  ]);
   type environmentType = keyof typeof comMap
   const isEditMode = route.name === 'collectorEdit' || route.name === 'dataIdEdit';
   const formRef = ref();
@@ -518,6 +518,18 @@
     });
   }
 
+  const {
+    data: showBkbase,
+  }  = useRequest(CollectorManageService.fetchBkbaseFeature, {
+    defaultValue: {
+      enabled: false,
+    },
+    defaultParams: {
+      feature_id: 'bkbase_data_source',
+    },
+    manual: true,
+  });
+
 
   const {
     run: fecthDetail,