fix: tooltips多个存在不消失情况处理 & 体验提单汇总修复

webfe/package_vue/src/components/global-search/search-input.vue

@@ -157,6 +157,7 @@ export default {
   border: none;
   z-index: 1;
   border-radius: 2px;
+  font-size: 12px;
 }
 .global-search-modal {
   .global-search-focus {
@@ -171,15 +172,14 @@ export default {
     align-items: center;
     position: relative;
     width: 240px;
-    background: #303d55;
-    font-size: 12px;
+    background: #252f43;
+    color: #979ba5;
 
     .icon-search {
       position: absolute;
       right: 12px;
       top: 9px;
       font-size: 14px;
-      color: #979ba5;
       cursor: pointer;
     }
   }
@@ -241,7 +241,8 @@ export default {
     input[type='text'] {
       outline: none;
       width: 720px;
-      background: #303d55;
+      background: #394561 !important;
+      color: #fff;
     }
   }
 
@@ -251,18 +252,15 @@ export default {
 
     &:focus {
       outline: none;
-      background: #303d55;
-    }
-
-    &::-webkit-input-placeholder {
-      color: #d3d9e4;
+      background: #394561;
     }
   }
 
   .clear-icon,
   .icon-search {
-    cursor: pointer;
     position: absolute;
+    cursor: pointer;
+    color: #c4c6cc;
     top: 9px;
   }
   i.clear-icon {

webfe/package_vue/src/components/global-search/search-result.vue

@@ -1,10 +1,10 @@
 <template>
-  <div :class="['search-content', { 'empty-search-cls': !searchHistory.length }]">
+  <div class="search-content">
     <section
       v-if="!curSearchKeyword"
       class="search-history-wrapper"
     >
-      <template v-if="searchHistory.length">
+      <section class="search-history" v-if="searchHistory.length">
         <div class="top-wrapper">
           <p class="sub-title">{{ $t('历史搜索') }}</p>
           <div class="clear-history" @click="handleClearHistory">
@@ -20,13 +20,21 @@
         >
           {{ item }}
         </span>
-      </template>
-      <bk-exception v-else type="search-empty" scene="part">
-        <span>{{ $t('请输入关键词进行搜索') }}</span>
-      </bk-exception>
+      </section>
+      <!-- 推荐搜索 -->
+      <section class="recommended-search">
+        <p class="sub-title">{{ $t('推荐搜索') }}</p>
+        <span
+          class="tag"
+          v-for="item in recommendedSearch"
+          :key="item"
+          @click="historicalSearch(item)"
+        >
+          {{ item }}
+        </span>
+      </section>
     </section>
     <div v-else v-bkloading="{ isLoading: isLoading, zIndex: 10 }">
-
       <div class="search-tip-cls" v-html="searchTip"></div>
       <!-- 蓝鲸应用 -->
       <section class="app">
@@ -123,6 +131,16 @@ export default {
       totalDataCount: 0,
       isSearchHistory: false,
       curSearchKeyword: '',
+      recommendedSearch: [
+        '开发框架',
+        '自定义 Python 版本',
+        '安装 apt 包',
+        'Celery 开发',
+        '数据库慢查询',
+        '蓝盾流水线构建云原生应用镜像',
+        'bkpaas-cli',
+        '内置环境变量',
+      ],
     };
   },
   computed: {
@@ -322,19 +340,24 @@ export default {
     border-bottom: 1px solid #EAEBF0;
   }
 }
-.empty-search-cls {
-  margin-top: 100px;
-}
 .search-history-wrapper {
-  .top-wrapper {
-    @include flex-center-space;
-    margin-bottom: 3px;
-    font-size: 12px;
-    color: #979ba5;
-
-    .clear-history:hover {
-      color: #3a84ff;
-      cursor: pointer;
+  .search-history {
+    margin-bottom: 24px;
+    .top-wrapper {
+      @include flex-center-space;
+      margin-bottom: 3px;
+      font-size: 12px;
+      color: #979ba5;
+      .clear-history:hover {
+        color: #3a84ff;
+        cursor: pointer;
+      }
+    }
+  }
+  .recommended-search {
+    .sub-title {
+      font-size: 12px;
+      color: #979ba5;
     }
   }
   .tag {

webfe/package_vue/src/components/paas-module-bar.vue

@@ -6,6 +6,7 @@
     <div class="flex-row align-items-center pr40">
       <bk-tab
         :active.sync="active"
+        :scroll-step="100"
         ext-cls="module-tab-cls"
         type="unborder-card"
         @tab-change="handleTabChange"
@@ -335,11 +336,16 @@ export default defineComponent({
   }
 }
 .module-tab-cls {
+  min-width: 0;
   /deep/ .bk-tab-section {
     padding: 0 !important;
   }
   /deep/ .bk-tab-header {
     background-image: none !important;
+    .bk-tab-scroll-controller {
+      height: 50px !important;
+      border-bottom: none;
+    }
   }
 }
 .module-manager {

webfe/package_vue/src/language/lang/en.js

@@ -2532,8 +2532,8 @@ export default {
   去发布: 'To Release',
   我发起的测试: 'My Initiated Tests',
   '代码分支/代码 Commit/创建人/测试进度': 'Code Branch/Code Commit/Creator/Test Progress',
-  'S-mart 应用请在配置文件中设置并开启增强服务': 'For S-mart applications, please set and enable enhanced services in the configuration file',
-  'S-mart 应用暂不支持删除增强服务': 'S-mart applications do not support the deletion of enhanced services for now',
+  'S-mart 应用不支持停用增强服务': 'S-mart apps do not support disabling enhanced services',
+  'S-mart 应用请在应用描述文件中启用增强服务': 'For S-mart apps, please enable enhanced services in the app descriptor file',
   持久存储: 'Persistent Storage',
   新增持久存储: 'Create Persistent Storage',
   删除持久存储: 'Delete Persistent Storage',
@@ -2697,6 +2697,7 @@ export default {
   '已找到 “{k}” 相关的 <i>{n}</i> 条数据': 'Found <i>{n}</i> results related to “{k}”',
   历史搜索: 'Search History',
   清空历史: 'Clear History',
+  推荐搜索: 'Recommended Searches',
   查看更多: 'View More',
   请输入关键词进行搜索: 'Please enter keywords to search',
   没有找到相关结果: 'No related results found',
@@ -2708,4 +2709,5 @@ export default {
   '当前分支正在测试中，请先终止测试才能新建版本': 'The current branch is under testing, please terminate the test before creating a new version',
   暂无可对比的代码版本: 'No comparable code versions available',
   暂无已发布成功的版本: 'No successfully published versions available',
+  退出插件成功: 'Successfully Exited Plugin',
 };

webfe/package_vue/src/language/lang/zh.js

@@ -2671,8 +2671,8 @@ export default {
   去发布: '去发布',
   我发起的测试: '我发起的测试',
   '代码分支/代码 Commit/创建人/测试进度': '代码分支/代码 Commit/创建人/测试进度',
-  'S-mart 应用请在配置文件中设置并开启增强服务': 'S-mart 应用请在配置文件中设置并开启增强服务',
-  'S-mart 应用暂不支持删除增强服务': 'S-mart 应用暂不支持删除增强服务',
+  'S-mart 应用不支持停用增强服务': 'S-mart 应用不支持停用增强服务',
+  'S-mart 应用请在应用描述文件中启用增强服务': 'S-mart 应用请在应用描述文件中启用增强服务',
   持久存储: '持久存储',
   新增持久存储: '新增持久存储',
   删除持久存储: '删除持久存储',
@@ -2836,6 +2836,7 @@ export default {
   '已找到 “{k}” 相关的 <i>{n}</i> 条数据': '已找到 “{k}” 相关的 <i>{n}</i> 条数据',
   历史搜索: '历史搜索',
   清空历史: '清空历史',
+  推荐搜索: '推荐搜索',
   查看更多: '查看更多',
   请输入关键词进行搜索: '请输入关键词进行搜索',
   没有找到相关结果: '没有找到相关结果',
@@ -2847,4 +2848,5 @@ export default {
   '当前分支正在测试中，请先终止测试才能新建版本': '当前分支正在测试中，请先终止测试才能新建版本',
   暂无可对比的代码版本: '暂无可对比的代码版本',
   暂无已发布成功的版本: '暂无已发布成功的版本',
+  退出插件成功: '退出插件成功',
 };

webfe/package_vue/src/store/modules/service.js

@@ -129,5 +129,21 @@ export default {
       const url = `${BACKEND_URL}/api/bkapps/applications/${appCode}/modules/${moduleId}/services/${service}/`;
       return http.delete(url, {}, config);
     },
+
+    /**
+     * 获取服务详情
+     */
+    getServiceDetail({}, { service }, config = {}) {
+      const url = `${BACKEND_URL}/api/services/${service}/`;
+      return http.get(url, {}, config);
+    },
+
+    /**
+     * 获取增强服务详情列表
+     */
+    getServiceInstances({}, { appCode, moduleId,  service }, config = {}) {
+      const url = `${BACKEND_URL}/api/bkapps/applications/${appCode}/modules/${moduleId}/services/${service}/`;
+      return http.get(url, {}, config);
+    },
   },
 };

webfe/package_vue/src/views/dev-center/app/basic-config/members.vue

@@ -84,7 +84,7 @@
               <template v-if="canManageMe(props.row)">
                 <bk-button
                   text
-                  class="mr5"
+                  class="mr8"
                   @click="leaveApp(props.row.user.id, props.row.user.username)"
                 >
                   {{ $t('退出应用') }}
@@ -93,15 +93,15 @@
               <bk-button
                 v-if="canChangeMembers()"
                 text
-                class="mr5"
+                class="mr8"
                 @click="updateMember(props.row.user.id, props.row.user.username, props.row.roles)"
               >
                 {{ $t('更换角色') }}
               </bk-button>
               <bk-button
                 v-if="canManageMembers(props.row)"
                 text
-                class="mr5"
+                class="mr8"
                 @click="delMember(props.row.user.username, props.row.user.id)"
               >
                 {{ $t('删除成员') }}
@@ -233,7 +233,7 @@
       :title="$t('权限须知')"
       :theme="'primary'"
       :mask-close="false"
-      :loading="leaveAppDialog.isLoading"
+      :loading="permissionNoticeDialog.isLoading"
     >
       <div class="tc">
         {{ $t('由于应用目前使用了第三方源码托管系统，当管理员添加新的“开发者”角色用户后，需要同时在源码系统中添加对应的账号权限。否则无法进行正常开发工作') }}
@@ -250,7 +250,8 @@
   </div>
 </template>
 
-<script>import { APP_ROLE_NAMES } from '@/common/constants';
+<script>
+import { APP_ROLE_NAMES } from '@/common/constants';
 import auth from '@/auth';
 import appBaseMixin from '@/mixins/app-base-mixin';
 import user from '@/components/user';
@@ -349,6 +350,7 @@ export default {
       },
       permissionNoticeDialog: {
         visiable: false,
+        isLoading: false,
       },
 
       pagination: {
@@ -393,22 +395,13 @@ export default {
         return;
       }
       this.pagination.current = page;
-
       this.handleSearch();
-      // const start = this.pagination.limit * (this.pagination.current - 1)
-      // const end = start + this.pagination.limit
-      // this.memberListShow.splice(0, this.memberListShow.length, ...this.memberList.slice(start, end))
     },
 
     limitChange(currentLimit) {
       this.pagination.limit = currentLimit;
       this.pagination.current = 1;
-
       this.handleSearch();
-
-      // const start = this.pagination.limit * (this.pagination.current - 1)
-      // const end = start + this.pagination.limit
-      // this.memberListShow.splice(0, this.memberListShow.length, ...this.memberList.slice(start, end))
     },
 
     iKnow() {
@@ -526,6 +519,7 @@ export default {
     },
 
     async leaveSave() {
+      this.leaveAppDialog.isLoading = true;
       try {
         await this.$store.dispatch('member/quitApplication', { appCode: this.appCode });
         this.closeLeaveApp();
@@ -605,6 +599,7 @@ export default {
     },
 
     async delSave() {
+      this.removeUserDialog.isLoading = true;
       try {
         await this.$store.dispatch('member/deleteRole', { appCode: this.appCode, id: this.selectedMember.id });
         this.closeDelModal();
@@ -618,6 +613,8 @@ export default {
           theme: 'error',
           message: `${this.$t('删除成员失败：')} ${e.detail}`,
         });
+      } finally {
+        this.removeUserDialog.isLoading = false;
       }
     },
 

webfe/package_vue/src/views/dev-center/app/create-module/index.vue

@@ -47,38 +47,6 @@
                 </p>
               </div>
             </div>
-
-            <div
-              v-if="curUserFeature.ENABLE_TC_DOCKER"
-              class="form-group"
-              style="margin-top: 7px;margin-left: 10px"
-            >
-              <label class="form-label"> {{ $t('构建方式') }} </label>
-              <div
-                class="form-group-flex-radio"
-                style="width: 100%"
-              >
-                <div class="form-group-radio mt10">
-                  <bk-radio-group
-                    v-model="structureType"
-                    class="construction-manner"
-                  >
-                    <bk-radio :value="'soundCode'">
-                      {{ $t('提供源码') }}
-                    </bk-radio>
-                    <bk-radio :value="'mirror'">
-                      {{ $t('提供镜像') }}
-                    </bk-radio>
-                    <bk-radio
-                      :value="'isMirror'"
-                      disabled
-                    >
-                      {{ $t('从源码构建镜像') }}
-                    </bk-radio>
-                  </bk-radio-group>
-                </div>
-              </div>
-            </div>
           </div>
 
           <!-- 镜像管理 -->