From 6b612410953e2da838b3edf15114ef349b30d6a0 Mon Sep 17 00:00:00 2001
From: Yuikill <1191184301@qq.com>
Date: Thu, 9 Nov 2023 11:13:32 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E8=8A=82=E7=9B=AE=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=9D=BF=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config-table-list/create-config/pkg-tree.vue    | 13 +++++++++++--
 .../space/templates/list/package-menu/menu.vue      |  7 +++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/pkg-tree.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/pkg-tree.vue
index ee2e6ae5da..cbe9936bca 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/pkg-tree.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/pkg-tree.vue
@@ -1,6 +1,9 @@
 <template>
   <h4 class="title">从配置模板导入</h4>
-  <SearchInput v-model="searchStr" placeholder="搜索模板套餐" @search="handleSearch" />
+  <div class="search-wrap">
+    <SearchInput v-model="searchStr" placeholder="搜索模板套餐" @search="handleSearch" />
+    <bk-button style="margin-left: 8px;" @click="router.push({name:'templates-list'})"> 管理模板 </bk-button>
+  </div>
   <div class="packages-tree">
     <bk-tree
       v-if="pkgTreeData.length"
@@ -38,6 +41,7 @@
 </template>
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
+import { useRouter } from 'vue-router';
 import { ITemplateBoundByAppData } from '../../../../../../../../../types/config';
 import { IAllPkgsGroupBySpaceInBiz, IPkgTreeItem } from '../../../../../../../../../types/template';
 import SearchInput from '../../../../../../../../components/search-input.vue';
@@ -46,6 +50,7 @@ interface ISpaceTreeItem extends IPkgTreeItem {
   children: IPkgTreeItem[];
 }
 
+const router = useRouter();
 const props = defineProps<{
   bkBizId: string;
   pkgList: IAllPkgsGroupBySpaceInBiz[];
@@ -175,9 +180,13 @@ const clearSearchStr = () => {
   font-weight: 400;
   color: #313238;
 }
-.search-input {
+.search-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
   padding: 0 24px;
 }
+
 .packages-tree {
   margin-top: 8px;
   padding: 0 24px;
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/menu.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/menu.vue
index 79d4238150..8b90e59e07 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/menu.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/menu.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="package-list-comp">
     <div class="search-wrapper">
-      <div class="create-btn" v-bk-tooltips="'新建模板套餐'" @click="isCreatePackageDialogShow = true">
-        <Plus />
-      </div>
       <div class="search-input">
         <SearchInput v-model="searchStr" placeholder="搜索模板套餐" @search="handleSearch" />
       </div>
+      <div class="create-btn" v-bk-tooltips="'新建模板套餐'" @click="isCreatePackageDialogShow = true">
+        <Plus />
+      </div>
     </div>
     <div v-if="menuList.length > 0" class="package-list">
       <PackageItem
@@ -299,7 +299,6 @@ const clearSearch = () => {
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    margin-right: 8px;
     width: 32px;
     height: 32px;
     font-size: 24px;

From 10361c3037082e1be370c1e12f82dddf031d94ec Mon Sep 17 00:00:00 2001
From: Yuikill <1191184301@qq.com>
Date: Thu, 9 Nov 2023 11:37:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=E6=96=87=E6=9C=AC=E5=9F=9F?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E6=8B=96=E5=8A=A8=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bcs-bscp/ui/src/views/space/scripts/list/create-script.vue  | 2 +-
 .../ui/src/views/space/scripts/version-manage/version-edit.vue  | 2 +-
 .../space/scripts/version-manage/version-list-simple-table.vue  | 2 --
 .../detail/components/create-version/create-version-slider.vue  | 2 +-
 .../detail/components/publish-version/confirm-dialog.vue        | 2 +-
 .../detail/config/config-list/config-table-list/config-form.vue | 2 +-
 .../src/views/space/service/list/components/create-service.vue  | 2 +-
 .../ui/src/views/space/service/list/components/edit-service.vue | 2 +-
 .../views/space/templates/list/package-menu/package-form.vue    | 2 +-
 .../bcs-bscp/ui/src/views/space/templates/list/space/create.vue | 2 +-
 .../bcs-bscp/ui/src/views/space/templates/list/space/edit.vue   | 2 +-
 .../templates/version-manage/version-detail/version-editor.vue  | 2 +-
 .../bcs-bscp/ui/src/views/space/variables/editing-form.vue      | 2 +-
 13 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/scripts/list/create-script.vue b/bcs-services/bcs-bscp/ui/src/views/space/scripts/list/create-script.vue
index 7739b36584..4cddf53f64 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/scripts/list/create-script.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/scripts/list/create-script.vue
@@ -21,7 +21,7 @@
             />
           </bk-form-item>
           <bk-form-item class="fixed-width-form" property="memo" label="脚本描述">
-            <bk-input v-model="formData.memo" type="textarea" :rows="3" :maxlength="200" :resize="false" />
+            <bk-input v-model="formData.memo" type="textarea" :rows="3" :maxlength="200" :resize="true" />
           </bk-form-item>
           <bk-form-item label="脚本内容" property="content" required>
             <div class="script-content-wrapper">
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-edit.vue b/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-edit.vue
index 47df704577..8b5f94eaff 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-edit.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-edit.vue
@@ -16,7 +16,7 @@
               <bk-input v-model="localVal.name" />
             </bk-form-item>
             <bk-form-item label="版本说明" propperty="memo">
-              <bk-input v-model="localVal.memo" type="textarea" :rows="8" :resize="false"/>
+              <bk-input v-model="localVal.memo" type="textarea" :rows="8" :resize="true"/>
             </bk-form-item>
           </bk-form>
         </div>
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-simple-table.vue b/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-simple-table.vue
index 318ef92d09..4e93f889ad 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-simple-table.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-simple-table.vue
@@ -5,7 +5,6 @@
         <div v-if="row.hook_revision" class="version-name-wrapper">
           <span :class="['status-dot', row.hook_revision.spec.state]"></span>
           <div class="name">{{ row.hook_revision.spec.name }}</div>
-          <RightShape v-if="props.versionId === row.hook_revision.id" class="arrow-icon" />
         </div>
       </template>
     </bk-table-column>
@@ -23,7 +22,6 @@
   />
 </template>
 <script setup lang="ts">
-import { RightShape } from 'bkui-vue/lib/icon';
 import { IScriptVersionListItem } from '../../../../../types/script';
 import { IPagination } from '../../../../../types/index';
 
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue
index ae717f893c..23d5fe5472 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue
@@ -8,7 +8,7 @@
             <bk-input v-model="formData.name" @change="formChange" />
           </bk-form-item>
           <bk-form-item label="版本描述" property="memo">
-            <bk-input v-model="formData.memo" type="textarea" :maxlength="100" @change="formChange" :resize="false" />
+            <bk-input v-model="formData.memo" type="textarea" :maxlength="100" @change="formChange" :resize="true" />
           </bk-form-item>
           <bk-checkbox v-model="isPublish" :true-label="true" :false-label="false" @change="formChange">
             同时上线版本
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/confirm-dialog.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/confirm-dialog.vue
index 01bbb4eaa3..71c53edc54 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/confirm-dialog.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/confirm-dialog.vue
@@ -24,7 +24,7 @@
         </div>
       </bk-form-item>
       <bk-form-item label="上线说明" property="memo">
-        <bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :resize="false"></bk-input>
+        <bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :resize="true"></bk-input>
       </bk-form-item>
     </bk-form>
     <template #footer>
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue
index a468960703..37df85aad3 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue
@@ -17,7 +17,7 @@
       />
     </bk-form-item>
     <bk-form-item label="配置文件描述" property="memo">
-      <bk-input v-model="localVal.memo" type="textarea" :disabled="!editable" @change="change" :resize="false" />
+      <bk-input v-model="localVal.memo" type="textarea" :disabled="!editable" @change="change" :resize="true" />
     </bk-form-item>
     <bk-form-item label="配置文件格式">
       <bk-radio-group v-model="localVal.file_type" :required="true" @change="change">
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/create-service.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/create-service.vue
index 0dc07893a1..98ecf8093d 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/create-service.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/create-service.vue
@@ -21,7 +21,7 @@
             type="textarea"
             v-model="formData.memo"
             @change="isFormChange = true"
-            :resize="false"
+            :resize="true"
           />
         </bk-form-item>
       </bk-form>
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/edit-service.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/edit-service.vue
index 09a17eefb4..f8e65a665b 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/edit-service.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/list/components/edit-service.vue
@@ -20,7 +20,7 @@
                 :maxlength="255"
                 :rows="5"
                 @blur="handleUpdateMemo"
-                :resize="false"
+                :resize="true"
               >
               </bk-input>
             </template>
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/package-form.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/package-form.vue
index 79ba31a53d..579a3aae99 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/package-form.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/package-form.vue
@@ -4,7 +4,7 @@
       <bk-input v-model="localVal.name" @change="change" />
     </bk-form-item>
     <bk-form-item label="模板套餐描述" property="memo">
-      <bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="256" @change="change" :resize="false" />
+      <bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="256" @change="change" :resize="true" />
     </bk-form-item>
     <bk-form-item label="服务可见范围" property="public" required>
       <bk-radio-group v-model="localVal.public" @change="change">
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/create.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/create.vue
index 1dace1cda8..f8b408cfab 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/create.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/create.vue
@@ -16,7 +16,7 @@
         <bk-input v-model="localVal.name" />
       </bk-form-item>
       <bk-form-item label="模板空间描述" property="memo">
-        <bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="100" :resize="false" />
+        <bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="100" :resize="true" />
       </bk-form-item>
     </bk-form>
   </bk-dialog>
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/edit.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/edit.vue
index cbf3393ef9..d7bffd875b 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/edit.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/edit.vue
@@ -18,7 +18,7 @@
     </template>
     <bk-form ref="formRef" form-type="vertical" :model="{ memo }">
       <bk-form-item label="模板空间描述" property="memo">
-        <bk-input v-model="memo" type="textarea" :rows="6" :maxlength="100" :resize="false" />
+        <bk-input v-model="memo" type="textarea" :rows="6" :maxlength="100" :resize="true" />
       </bk-form-item>
     </bk-form>
   </bk-dialog>
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/version-manage/version-detail/version-editor.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/version-manage/version-detail/version-editor.vue
index 540260635a..fa509bbb47 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/templates/version-manage/version-detail/version-editor.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/version-manage/version-detail/version-editor.vue
@@ -16,7 +16,7 @@
             <bk-input v-model="formData.revision_name" />
           </bk-form-item>
           <bk-form-item label="版本描述" property="revision_memo">
-            <bk-input v-model="formData.revision_memo" type="textarea" :rows="4" :maxlength="200" :resize="false" />
+            <bk-input v-model="formData.revision_memo" type="textarea" :rows="4" :maxlength="200" :resize="true" />
           </bk-form-item>
           <bk-form-item label="文件权限" required>
             <PermissionInputPicker v-model="formData.privilege" />
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/variables/editing-form.vue b/bcs-services/bcs-bscp/ui/src/views/space/variables/editing-form.vue
index a89a6ec618..26ff5310d2 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/variables/editing-form.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/variables/editing-form.vue
@@ -26,7 +26,7 @@
       <bk-input v-model="localVal.default_val" @change="change" />
     </bk-form-item>
     <bk-form-item label="描述" property="memo">
-      <bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :rows="5" @change="change" :resize="false" />
+      <bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :rows="5" @change="change" :resize="true" />
     </bk-form-item>
   </bk-form>
 </template>

From f06fc114ee1272f01ecd40da8209a60dce3d2182 Mon Sep 17 00:00:00 2001
From: Yuikill <1191184301@qq.com>
Date: Thu, 9 Nov 2023 16:03:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=98=E9=87=8F=E5=AE=9E=E6=97=B6=E6=80=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../associate-config-items/rule-edit.vue      |  7 ++++++-
 .../components/publish-version/index.vue      | 17 ++++++++++++---
 .../config-table-list/config-form.vue         | 21 ++++++++++++-------
 .../variables/variables-table.vue             |  7 +++++++
 .../create-new-config/select-package.vue      |  2 ++
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/credentials/associate-config-items/rule-edit.vue b/bcs-services/bcs-bscp/ui/src/views/space/credentials/associate-config-items/rule-edit.vue
index 77eead1128..adc3cddec1 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/credentials/associate-config-items/rule-edit.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/credentials/associate-config-items/rule-edit.vue
@@ -40,7 +40,12 @@
         </div>
         <div class="error-info"><span v-if="!rule.isRight">输入的规则有误，请重新确认</span></div>
       </div>
-      <p class="tips">可填写服务名称/文件路径，支持glob 表达式，如：myservice/**</p>
+      <div class="tips">
+        <div>填写格式为“服务名称/配置路径”，支持通配符，常用方法：</div>
+        <div>关联myservice服务下所有的配置(包含子目录):myservice/**</div>
+        <div>关联myservice服务/etc目录下所有的配置(不含子目录):myservice/etc/*</div>
+        <div>关联myservice服务/etc/nginx/nginx.conf文件:myservice/etc/nginx/nginx.conf</div>
+      </div>
     </div>
     <!-- <div class="preview-btn">预览匹配结果</div> -->
   </div>
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue
index 5323bd9339..212b75f9e4 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue
@@ -32,7 +32,7 @@
         <template #footer>
           <section class="actions-wrapper">
             <bk-button class="publish-btn" theme="primary" @click="handleDiffOrPublish">{{
-              versionList.length ? '对比并上线' : '上线版本'
+              versionListByGroup.length ? '对比并上线' : '上线版本'
             }}</bk-button>
             <bk-button @click="handlePanelClose">取消</bk-button>
           </section>
@@ -54,7 +54,7 @@
       :base-version-id="baseVersionId"
       :show-publish-btn="true"
       @publish="handleOpenPublishDialog"
-      :version-diff-list="versionList"
+      :version-diff-list="versionListByGroup"
     />
   </section>
 </template>
@@ -114,9 +114,20 @@ const permissionQueryResource = computed(() => [
   },
 ]);
 
+// 获取所有选择上线范围的上线版本
+const versionListByGroup = computed(() => {
+  const list = [] as IConfigVersion[];
+  versionList.value.forEach((version) => {
+    groups.value.forEach((group) => {
+      if (version.spec.name === group.release_name && !list.includes(version)) list.push(version);
+    });
+  });
+  return list;
+});
+
 // 判断是否需要对比上线版本
 const handleDiffOrPublish = () => {
-  if (versionList.value.length) {
+  if (versionListByGroup.value.length) {
     isDiffSliderShow.value = true;
     return;
   }
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue
index 37df85aad3..f353a974ff 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue
@@ -9,12 +9,15 @@
       />
     </bk-form-item>
     <bk-form-item label="配置文件路径" property="path" :required="true">
-      <bk-input
-        v-model="localVal.path"
-        placeholder="请输入绝对路径，下载路径为前缀+配置路径"
-        :disabled="!editable"
-        @change="change"
-      />
+      <template #label>
+        <span
+          v-bk-tooltips="{
+            content:'客户端拉取配置文件后存放路径为：临时目录/业务ID/服务名称/files/配置文件路径，除了配置文件路径其它参数都在客户端sidecar中配置',
+            placement: 'top'
+          }"
+          >配置文件路径</span>
+      </template>
+      <bk-input v-model="localVal.path" placeholder="请输入绝对路径" :disabled="!editable" @change="change" />
     </bk-form-item>
     <bk-form-item label="配置文件描述" property="memo">
       <bk-input v-model="localVal.memo" type="textarea" :disabled="!editable" @change="change" :resize="true" />
@@ -98,7 +101,8 @@
         :disabled="!editable"
         :multiple="false"
         :files="fileList"
-        :custom-request="handleFileUpload">
+        :custom-request="handleFileUpload"
+      >
         <template #file="{ file }">
           <div>
             <div class="file-wrapper">
@@ -118,7 +122,8 @@
     <bk-form-item v-else>
       <template #label
         ><div class="config-content-label">
-          <span>配置内容</span><info v-bk-tooltips="{ content: configContentTip, placement: 'top' }" fill="#3a84ff" /></div
+          <span>配置内容</span
+          ><info v-bk-tooltips="{ content: configContentTip, placement: 'top' }" fill="#3a84ff" /></div
       ></template>
       <ConfigContentEditor
         :content="stringContent"
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/variables/variables-table.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/variables/variables-table.vue
index 915d161654..e80fea587b 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/variables/variables-table.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/variables/variables-table.vue
@@ -153,6 +153,13 @@ const validate = () => {
         }
       }
     });
+    if (variable.type === 'number' && !/^\d*(\.\d+)?$/.test(variable.default_val)) {
+      if (errors[variable.name]) {
+        errors[variable.name].push('default_val');
+      } else {
+        errors[variable.name] = ['default_val'];
+      }
+    }
   });
   errorDetails.value = errors;
   return Object.keys(errorDetails.value).length === 0;
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/add-configs/create-new-config/select-package.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/add-configs/create-new-config/select-package.vue
index cec3fc8074..5725d86dbf 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/add-configs/create-new-config/select-package.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/add-configs/create-new-config/select-package.vue
@@ -34,6 +34,7 @@
         </bk-select>
       </bk-form-item>
     </bk-form>
+    <div v-if="citedList.length">
     <p class="tips">{{ tips }}</p>
     <bk-loading style="min-height: 100px" :loading="loading">
       <bk-table v-if="!selectedPkgs.includes(0)" :data="citedList" :max-height="maxTableHeight">
@@ -48,6 +49,7 @@
         </bk-table-column>
       </bk-table>
     </bk-loading>
+  </div>
   </bk-dialog>
 </template>
 <script lang="ts" setup>

From aa27a745c87f71fb30ef8fe715eb36b7435cf0e6 Mon Sep 17 00:00:00 2001
From: Yuikill <1191184301@qq.com>
Date: Thu, 9 Nov 2023 16:46:55 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9cmdb=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bcs-bscp/ui/src/components/head.vue       |  2 +-
 .../create-version/create-version-slider.vue  |  1 +
 .../batch-move-out-from-pkg-dialog.vue        | 36 ++++++++++---------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/bcs-services/bcs-bscp/ui/src/components/head.vue b/bcs-services/bcs-bscp/ui/src/components/head.vue
index 2f5bb9f02a..378ef40a9e 100644
--- a/bcs-services/bcs-bscp/ui/src/components/head.vue
+++ b/bcs-services/bcs-bscp/ui/src/components/head.vue
@@ -263,7 +263,7 @@ const handleLoginOut = () => {
 };
 const handleToCMDB = () => {
   // @ts-ignore
-  window.open(BK_CC_HOST); // eslint-disable-line no-undef
+  window.open(`${BK_CC_HOST}/#/resource/business`); // eslint-disable-line no-undef
 };
 </script>
 
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue
index 23d5fe5472..15da3a5732 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue
@@ -119,6 +119,7 @@ const handleVariablesChange = (variables: IVariableEditParams[]) => {
 // };
 
 const confirm = async () => {
+  if (!formRef.value.validate() || !tableRef.value.validate()) return;
   try {
     pending.value = true;
     const params = {
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/move-out-from-pkg/batch-move-out-from-pkg-dialog.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/move-out-from-pkg/batch-move-out-from-pkg-dialog.vue
index e2682181b5..9a3503560c 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/move-out-from-pkg/batch-move-out-from-pkg-dialog.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/move-out-from-pkg/batch-move-out-from-pkg-dialog.vue
@@ -15,19 +15,21 @@
       已选 <span class="num">{{ props.value.length }}</span> 个配置文件
     </div>
     <p class="tips">以下服务配置的未命名版本中引用此套餐的内容也将更新</p>
-    <bk-loading style="min-height: 100px" :loading="loading">
-      <bk-table :data="citedList" :max-height="maxTableHeight">
-        <bk-table-column label="所在模板套餐" prop="template_set_name"></bk-table-column>
-        <bk-table-column label="使用此套餐的服务">
-          <template #default="{ row }">
-            <div v-if="row.app_id" class="app-info" @click="goToConfigPageImport(row.app_id)">
-              <div v-overflow-title class="name-text">{{ row.app_name }}</div>
-              <LinkToApp class="link-icon" :id="row.app_id" />
-            </div>
-          </template>
-        </bk-table-column>
-      </bk-table>
-    </bk-loading>
+    <div class="service-table">
+      <bk-loading style="min-height: 100px" :loading="loading">
+        <bk-table :data="citedList" :max-height="maxTableHeight">
+          <bk-table-column label="所在模板套餐" prop="template_set_name"></bk-table-column>
+          <bk-table-column label="使用此套餐的服务">
+            <template #default="{ row }">
+              <div v-if="row.app_id" class="app-info" @click="goToConfigPageImport(row.app_id)">
+                <div v-overflow-title class="name-text">{{ row.app_name }}</div>
+                <LinkToApp class="link-icon" :id="row.app_id" />
+              </div>
+            </template>
+          </bk-table-column>
+        </bk-table>
+      </bk-loading>
+    </div>
   </bk-dialog>
 </template>
 <script lang="ts" setup>
@@ -67,7 +69,7 @@ watch(
   () => props.show,
   () => {
     getCitedData();
-  },
+  }
 );
 
 const goToConfigPageImport = (id: number) => {
@@ -89,19 +91,19 @@ const getCitedData = async () => {
     spaceId.value,
     currentTemplateSpace.value,
     [props.currentPkg],
-    params,
+    params
   );
   citedList.value = res.details;
   loading.value = false;
 };
 
 const handleConfirm = async () => {
-  const pkg = packageList.value.find(item => item.id === currentPkg.value);
+  const pkg = packageList.value.find((item) => item.id === currentPkg.value);
   if (!pkg) return;
 
   try {
     pending.value = true;
-    const ids = props.value.map(item => item.id);
+    const ids = props.value.map((item) => item.id);
     await moveOutTemplateFromPackage(spaceId.value, currentTemplateSpace.value, ids, [currentPkg.value as number]);
     emits('movedOut');
     close();