大版本验收问题修复 (#1358)

* fix: 修复消息通知中心前端不显示的问题 # Reviewed, transaction id: 11048 * fix: 修复服务列表左侧菜单栏展开/收起icon显示不正确问题 # Reviewed, transaction id: 11062 * fix: 数据字典编辑后未保存点击阴影增加二次弹窗确认 --bug=126487351 # Reviewed, transaction id: 11066 * fix: 服务表格行高不生效问题修复 --bug=126360771 # Reviewed, transaction id: 11081 * refactor: 服务表单左侧字段控件搜索支持清空操作 --bug=126355419 # Reviewed, transaction id: 11093 * fix: 首页常用服务和全部服务卡片收藏状态切换后不同步问题修复 --bug=126425691 # Reviewed, transaction id: 11106 * fix: 修复api编辑后回到列表页数据未更新的问题 --bug=126365949 # Reviewed, transaction id: 11163 * fix: 修复服务导入后左侧目录树未更新的问题 --bug=126361807 # Reviewed, transaction id: 11166 * refactor: 任务模板触发器去掉引用公共触发 --bug=126484859 # Reviewed, transaction id: 11174 * docs: 升级版本至 2.6.23
TencentBlueKing · Jul 3, 2024 · 6359f15 · 6359f15
1 parent f044412
commit 6359f15
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 32 deletions.
diff --git a/app.yml b/app.yml
@@ -5,7 +5,7 @@ author: 蓝鲸智云
 category: 办公应用
 introduction: 流程服务是蓝鲸推出的轻量级ITSM，通过可自定义设计的流程模块，覆盖IT服务中的不同管理活动或应用场景。帮助企业用户规范内部管理流程，提升沟通及管理效率。
 introduction_en: bk_itsm is a lightweight ITSM created by Blueking. It covers different application scenarios in IT services through customizable workflows and help enterprise users to implement standardize IT workflow, improve communication and management efficiency.
-version: 2.6.22
+version: 2.6.23
 language: python
 is_use_celery: True
 is_use_celery_with_gevent: False

diff --git a/app_desc.yaml b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "2.6.22"
+app_version: "2.6.23"
 app:
     region: default
     bk_app_code: bk_itsm

diff --git a/docs/RELEASE.md b/docs/RELEASE.md
@@ -1,4 +1,16 @@
 # Changelog
+## [Version: 2.6.23] - 2024-07-03
+【优化】服务表单左侧字段控件搜索支持清空操作
+【优化】任务模板触发器去掉引用公共触发器方式
+【修复】修复消息通知中心前端不显示的问题 
+【修复】修复服务列表左侧菜单栏展开/收起icon显示不正确问题
+【修复】数据字典编辑后未保存点击阴影增加二次弹窗确认
+【修复】服务表格行高不生效问题修复
+【修复】首页常用服务和全部服务卡片收藏状态切换后不同步问题修复
+【修复】修复api编辑后回到列表页数据未更新的问题
+【修复】修复服务导入后左侧目录树未更新的问题
+
+
 ## [Version: 2.6.22] - 2024-06-24
 【优化】项目全局配置可修改
 

diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md
@@ -1,4 +1,15 @@
 # Changelog
+## [Version: 2.6.23] - 2024-07-03
+【Improved】Enabled support for clearing the search operation on the left-side field controls of the service form.
+【Improved】Removed the method of referencing common triggers from the task template triggers.
+【Fixed】Fixed the issue where the Message Notification Center was not displayed on the frontend.
+【Fixed】Fixed the issue where the expand/collapse icon on the left-side menu of the service list was displayed incorrectly.
+【Fixed】Added a secondary confirmation pop-up when clicking on the shadow area after editing the data dictionary without saving.
+【Fixed】Fixed the issue where the row height in the service table was not being applied.
+【Fixed】Fixed the issue where the favorite status of the frequently used services and all services cards on the homepage did not synchronize after toggling.
+【Fixed】Fixed the issue where data in the list page was not updated after editing the API.
+【Fixed】Fixed the issue where the left-side directory tree was not updated after service import.
+
 ## [Version: 2.6.22] - 2024-06-24
 【Improved】Global project settings are editable.
 

diff --git a/frontend/pc/src/App.vue b/frontend/pc/src/App.vue
@@ -22,7 +22,7 @@
 
 <template>
   <div id="app" class="bk-app" @click="hiddenTree" v-bkloading="{ isLoading: loading }">
-    <notice-component v-if="showNotice && !isSubNav && !$route.meta.iframe" :api-url="apiUrl" @show-alert-change="handleNoticeChange" />
+    <notice-component v-if="enableNoticeCenter && !isSubNav && !$route.meta.iframe" :api-url="apiUrl" @show-alert-change="handleNoticeChange" />
     <template v-if="isShowView">
       <!-- has navigation-->
       <navigation v-if="!isSubNav && !$route.meta.iframe" :class="{ 'show-notice': showNotice }">

diff --git a/frontend/pc/src/views/home/serviceList.vue b/frontend/pc/src/views/home/serviceList.vue
@@ -41,7 +41,7 @@
                 placement: 'top',
                 delay: [300, 0]
               }"
-              @click.stop="onCollectClick(service)">
+              @click.stop="onCollectClick(service, 'latest')">
             </i>
           </li>
         </ul>
@@ -87,7 +87,7 @@
                   placement: 'top',
                   delay: [300, 0]
                 }"
-                @click.stop="onCollectClick(service)">
+                @click.stop="onCollectClick(service, 'all')">
               </i>
               <div class="name" v-html="service.highlightName"></div>
               <div class="category">{{ service.serviceTypeName }}</div>
@@ -260,16 +260,19 @@
           this.isSearchResultShow = false;
         }
       },
-      onCollectClick(service) {
+      onCollectClick(service, type) {
         const curStatus = service.favorite;
         this.$store.dispatch('service/toggleServiceFavorite', {
           id: service.id,
           favorite: !curStatus,
         }).then((res) => {
           if (res.result) {
-            const serviceItem = this.allList.find(item => item.id === service.id);
             service.favorite = !curStatus; // 修改当前数据的收藏状态
-            this.$set(serviceItem, 'favorite', !curStatus); // 修改当前数据对应的源数据收藏状态
+            const list = type === 'latest' ? this.allList : this.latestList;
+            const serviceItem = list.find(item => item.id === service.id);
+            if (serviceItem) {
+              this.$set(serviceItem, 'favorite', !curStatus); // 修改当前数据对应的源数据收藏状态
+            }
           }
         })
           .catch((res) => {

diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiContent.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiContent.vue
@@ -23,7 +23,7 @@
 <template>
   <div class="bk-api-content">
     <div class="is-title-back">
-      <p class="bk-come-back" @click="backTab">
+      <p class="bk-come-back" @click="$emit('back')">
         <arrows-left-icon></arrows-left-icon>
         <template>{{ backName }}</template>
       </p>
@@ -131,9 +131,6 @@
       this.initData();
     },
     methods: {
-      backTab() {
-        this.$parent.displayInfo.level_1 = {};
-      },
       changTitle(item, index) {
         this.checkIndex = index;
       },

diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
@@ -334,7 +334,6 @@
         await this.$parent.getRemoteApiDetail(item.id);
       },
       getRemoteSystemData() {
-        debugger;
         this.$parent.getRemoteSystemData();
         const customPaging = {
           page: this.pagination.current,

diff --git a/frontend/pc/src/views/processManagement/apiConfigure/index.vue b/frontend/pc/src/views/processManagement/apiConfigure/index.vue
@@ -39,7 +39,8 @@
           </api-tree>
         </div>
         <div class="bk-directory-table">
-          <api-table v-if="!Object.keys(displayInfo['level_1']).length"
+          <api-table
+            v-show="!Object.keys(displayInfo['level_1']).length"
             ref="apiTable"
             :remote-system="remoteSystem"
             :project-id="projectId"
@@ -50,13 +51,15 @@
             :get-list-error="listError"
             :list-info-ori="listInfo">
           </api-table>
-          <api-content v-else
+          <api-content
+            v-if="Object.keys(displayInfo['level_1']).length > 0"
             :remote-system="remoteSystem"
             :second-level-info="secondLevelInfo"
             :api-detail-info="apiDetailInfo"
             :tree-list="treeList"
             :path-list="pathList"
-            :is-builtin-id-list="isBuiltinIdList">
+            :is-builtin-id-list="isBuiltinIdList"
+            @back="handleBackToList">
           </api-content>
         </div>
       </div>
@@ -305,6 +308,18 @@
           .finally(() => {
           });
       },
+      handleBackToList() {
+        this.displayInfo.level_1 = {};
+        this.$nextTick(() => {
+          const { pagination, searchInfo } = this.$refs.apiTable;
+          const { current, limit } = pagination;
+          const pageParams = {
+            page: current,
+            page_size: limit,
+          };
+          this.getTableList(this.displayInfo.level_0.id || '', pageParams, searchInfo);
+        });
+      },
     },
   };
 </script>

diff --git a/frontend/pc/src/views/processManagement/taskTemplate/components/commonStep.vue b/frontend/pc/src/views/processManagement/taskTemplate/components/commonStep.vue
@@ -107,7 +107,8 @@
     <common-trigger-list
       :source-id="changedTemplateInfo.id"
       :step-signal="stepList[step].signal"
-      :template-stage="stepList[step].stage">
+      :template-stage="stepList[step].stage"
+      :citable="false">
     </common-trigger-list>
     <!-- 步骤操作按钮 -->
     <div class="bk-common-step">

diff --git a/frontend/pc/src/views/processManagement/taskTemplate/components/commonTriggerList.vue b/frontend/pc/src/views/processManagement/taskTemplate/components/commonTriggerList.vue
@@ -53,8 +53,12 @@
                       <i class="bk-icon icon-delete" @click.stop="delTrigger(item)"></i>
                     </span>
                   </li>
-                  <bk-dropdown-menu trigger="click" style="float: left;">
-                    <div class="bk-trigger-add" slot="dropdown-trigger" :title="$t(`m.taskTemplate['添加触发器']`)">
+                  <bk-dropdown-menu trigger="click" class="trigger-dropdown" :disabled="!citable">
+                    <div
+                      class="bk-trigger-add"
+                      slot="dropdown-trigger"
+                      :title="$t(`m.taskTemplate['添加触发器']`)"
+                      @click="handleAddTrigger">
                       <i class="bk-icon icon-plus"></i>
                     </div>
                     <ul class="bk-dropdown-list" slot="dropdown-content">
@@ -197,6 +201,11 @@
         type: String,
         default: '',
       },
+      // 是否可以引用公共触发器
+      citable: {
+        type: Boolean,
+        default: true,
+      },
     },
     data() {
       return {
@@ -359,6 +368,11 @@
           trigger.checked = flag;
         });
       },
+      handleAddTrigger() {
+        if (!this.citable) {
+          this.openNew('add');
+        }
+      },
       openNew(type, item = {}) {
         this.originInfoToTrigger = {
           id: this.sourceId,
@@ -490,4 +504,11 @@
     @import '../../publicTrigger/triggerCss/index';
     @import '../taskCss/commonTrigger';
     @import '~@/scss/common-section-card.scss';
+    .trigger-dropdown.bk-dropdown-menu {
+      float: left;
+      cursor: pointer;
+      /deep/ .bk-dropdown-trigger * {
+        cursor: pointer;
+      }
+    }
 </style>
diff --git a/frontend/pc/src/views/service/editService/ServiceFormStep.vue b/frontend/pc/src/views/service/editService/ServiceFormStep.vue
@@ -29,25 +29,42 @@
         <div class="show-field" @click="handleShowField">
           <i :class="['bk-itsm-icon', isShowField ? 'icon-xiangyou1' : 'icon-xiangzuo1']"></i>
         </div>
-        <div style="    display: flex; height: calc(100% - 100px); flex-direction: column;">
+        <div style="display: flex; height: calc(100% - 100px); flex-direction: column;">
           <div class="field-content">
             <!-- <div class="field-title">控件库</div> -->
             <div class="field-title">
               <span>{{ $t(`m['控件库']`) }}</span>
-              <bk-input class="search-field" size="small" :right-icon="'bk-icon icon-search'" @enter="handleSearchLibrary"></bk-input>
+              <bk-input
+                class="search-field"
+                size="small"
+                :right-icon="'bk-icon icon-search'"
+                :clearable="true"
+                @clear="handleSearchLibrary"
+                @enter="handleSearchLibrary">
+              </bk-input>
             </div>
             <ul class="field-list">
               <li class="field-item" v-for="(field, index) in fieldsLibrary" :key="index" @click="onAddFormClick(field)">
                 <span v-bk-tooltips.light="field.name" class="field-name">{{ field.name }}</span>
               </li>
             </ul>
-            <div v-if="fieldsLibrary.length === 0" class="public-field"><i class="bk-itsm-icon icon-itsm-icon-four-zero" style="font-size: 14px"></i> 已有字段不存在你搜索的内容</div>
+            <div v-if="fieldsLibrary.length === 0" class="public-field">
+              <i class="bk-itsm-icon icon-itsm-icon-four-zero" style="font-size: 14px"></i>
+              控件库不存在你搜索的内容
+            </div>
           </div>
           <div class="field-content">
             <!-- <div class="field-title">已有字段</div> -->
             <div class="field-title">
               <span>{{ $t(`m['已有字段']`) }}</span>
-              <bk-input class="search-field" size="small" :right-icon="'bk-icon icon-search'" @enter="handleSearchField"></bk-input>
+              <bk-input
+                class="search-field"
+                size="small"
+                :right-icon="'bk-icon icon-search'"
+                :clearable="true"
+                @clear="handleSearchField"
+                @enter="handleSearchField">
+              </bk-input>
             </div>
             <ul class="field-list">
               <li class="field-item" v-for="(field, index) in publicFields" :key="index" @click="addField(field)">

diff --git a/frontend/pc/src/views/service/serviceList.vue b/frontend/pc/src/views/service/serviceList.vue
@@ -87,7 +87,7 @@
           ref="serviceTable"
           v-bkloading="{ isLoading: isDataLoading }"
           :data="dataList"
-          :size="'small'"
+          :size="setting.size"
           :pagination="pagination"
           @cell-mouse-enter="cellMouseEnter"
           @cell-mouse-leave="cellMouseLeave"
@@ -708,6 +708,7 @@
           this.isImportServiceShow = false;
           this.isCheckImport = false;
           this.getList(1);
+          this.updateDirTree();
         });
       },
       importService() {
@@ -1190,8 +1191,9 @@
                 display: inline-block;
                 font-size: 14px;
                 transition: transform 0.3s ease-in-out;
+                transform: rotate(180deg);
                 &.closed {
-                    transform: rotate(180deg);
+                    transform: rotate(0deg);
                 }
             }
         }

diff --git a/frontend/pc/src/views/systemConfig/component/addDataDirectory.vue b/frontend/pc/src/views/systemConfig/component/addDataDirectory.vue
@@ -34,31 +34,34 @@
         :property="'key'">
         <bk-input v-model.trim="addTableInfo.formInfo.key"
           :placeholder="$t(`m.systemConfig['请输入编码']`)"
-          :disabled="addTableInfo.formInfo.id !== '' && addTableInfo.formInfo.id !== undefined">
+          :disabled="addTableInfo.formInfo.id !== '' && addTableInfo.formInfo.id !== undefined"
+          @change="change">
         </bk-input>
       </bk-form-item>
       <bk-form-item :label="$t(`m.user['负责人：']`)">
-        <member-select v-model="addTableInfo.formInfo.ownersInputValue"></member-select>
+        <member-select v-model="addTableInfo.formInfo.ownersInputValue" @change="change"></member-select>
       </bk-form-item>
       <bk-form-item
         :label="$t(`m.systemConfig['名称']`)"
         :required="true"
         :property="'name'">
         <bk-input v-model.trim="addTableInfo.formInfo.name"
           maxlength="120"
-          :placeholder="$t(`m.systemConfig['请输入名称']`)">
+          :placeholder="$t(`m.systemConfig['请输入名称']`)"
+          @change="change">
         </bk-input>
       </bk-form-item>
       <bk-form-item
         :label="$t(`m.systemConfig['描述']`)">
         <bk-input type="textarea"
           v-model.trim="addTableInfo.formInfo.desc"
-          :placeholder="$t(`m.systemConfig['请输入描述']`)">
+          :placeholder="$t(`m.systemConfig['请输入描述']`)"
+          @change="change">
         </bk-input>
       </bk-form-item>
       <bk-form-item
         :label="$t(`m.systemConfig['启用状态']`)">
-        <bk-switcher v-model="addTableInfo.formInfo.is_enabled" size="small"></bk-switcher>
+        <bk-switcher v-model="addTableInfo.formInfo.is_enabled" size="small" @change="change"></bk-switcher>
       </bk-form-item>
     </bk-form>
     <!-- button -->
@@ -486,6 +489,9 @@
       onParentChange(tree) {
         this.dictDataTable.formInfo.parentObj = tree;
       },
+      change() {
+        this.$emit('change');
+      },
     },
   };
 </script>