Merge pull request TencentBlueKing#1771 from hLinx/hotfix_master

Hotfix master
liuliaozhong · Feb 24, 2023 · 9fd710e · 9fd710e
2 parents 7312591 + c7a6eb1
commit 9fd710e
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 21 deletions.
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -20,7 +20,7 @@
     "@vue/composition-api": "^1.5.0",
     "ace-builds": "^1.4.12",
     "axios": "^0.27.2",
-    "bk-magic-vue": "2.5.4-beta.4",
+    "bk-magic-vue": "2.5.4-beta.6",
     "core-js": "3.27.2",
     "cron-parser-custom": "^2.13.0",
     "diff": "^5.0.0",

diff --git a/src/frontend/src/components/jb-edit/textarea.vue b/src/frontend/src/components/jb-edit/textarea.vue
@@ -35,6 +35,7 @@
       @click.stop="handleBlockShowEdit">
       <div
         ref="valueTextBox"
+        v-bk-overflow-tips="renderText"
         class="render-text-box"
         :style="boxStyles"
         @copy="handleCopy">
@@ -127,10 +128,6 @@
         type: Function,
         default: () => Promise.resolve(),
       },
-      rules: {
-        type: Array,
-        default: () => [],
-      },
       readonly: {
         type: Boolean,
         default: false,

diff --git a/src/frontend/src/views/executive-history/list/index.vue b/src/frontend/src/views/executive-history/list/index.vue
@@ -39,11 +39,11 @@
           ref="datePicker"
           :clearable="false"
           :placeholder="$t('history.选择日期')"
-          :shortcut-close="true"
+          shortcut-close
           :shortcuts="shortcuts"
           type="datetimerange"
           up-to-now
-          :use-shortcut-text="true"
+          use-shortcut-text
           :value="defaultDateTime"
           @change="handleDateChange" />
       </template>
@@ -335,6 +335,10 @@
               name: I18n.t('history.等待确认'),
               id: 7,
             },
+            {
+              name: I18n.t('history.状态异常'),
+              id: 9,
+            },
             {
               name: I18n.t('history.强制终止中'),
               id: 10,
@@ -499,15 +503,15 @@
           startTime: '',
           endTime: '',
         };
-                
+
         const currentTime = new Date().getTime();
-                
+
         if (Object.prototype.hasOwnProperty.call(this.$route.query, 'startTime')) {
           defaultDateTime[0] = this.$route.query.startTime;
         } else {
           defaultDateTime[0] = prettyDateTimeFormat(currentTime - 86400000);
         }
-                
+
         searchParams.startTime = defaultDateTime[0]; // eslint-disable-line prefer-destructuring
 
         if (Object.prototype.hasOwnProperty.call(this.$route.query, 'endTime')) {

diff --git a/src/frontend/src/views/executive-history/local.js b/src/frontend/src/views/executive-history/local.js
@@ -47,6 +47,7 @@ export default {
     执行成功: 'Successful',
     执行失败: 'Failed',
     等待确认: 'Waiting',
+    状态异常: 'Abnormal',
     强制终止中: 'Terminating',
     强制终止成功: 'Terminated',
     强制终止失败: 'Terminate failed',

diff --git a/src/frontend/src/views/script-manage/version/index.vue b/src/frontend/src/views/script-manage/version/index.vue
@@ -42,6 +42,7 @@
         </bk-button>
         <template #right>
           <jb-search-select
+            ref="searchSelect"
             :data="searchSelect"
             :placeholder="$t('script.选择匹配的字段并输入关键字进行搜索')"
             :show-condition="false"
@@ -105,8 +106,8 @@
               <template slot-scope="{ row }">
                 <bk-button
                   v-bk-tooltips.allowHtml="`
-                                    <div>${$t('script.作业模板引用')}: ${row.relatedTaskTemplateNum}</div>
-                                    <div>${$t('script.执行方案引用')}: ${row.relatedTaskPlanNum}</div>`"
+                    <div>${$t('script.作业模板引用')}: ${row.relatedTaskTemplateNum}</div>
+                    <div>${$t('script.执行方案引用')}: ${row.relatedTaskPlanNum}</div>`"
                   class="mr20"
                   text
                   @click="handleShowRelated(row)">
@@ -262,6 +263,25 @@
                 :size="tableSize"
                 @setting-change="handleSettingChange" />
             </bk-table-column>
+            <empty
+              v-if="isSearching"
+              slot="empty"
+              type="search">
+              <div>
+                <div style="font-size: 14px; color: #63656e;">
+                  {{ $t('搜索结果为空') }}
+                </div>
+                <div style="margin-top: 8px; font-size: 12px; line-height: 16px; color: #979ba5;">
+                  <span>{{ $t('可以尝试调整关键词') }}</span>
+                  <span>{{ $t('或') }}</span>
+                  <bk-button
+                    text
+                    @click="handleClearSearch">
+                    {{ $t('清空搜索条件') }}
+                  </bk-button>
+                </div>
+              </div>
+            </empty>
           </bk-table>
           <template slot="flod">
             <component
@@ -359,6 +379,7 @@
   } from '@utils/assist';
   import { listColumnsCache } from '@utils/cache-helper';
 
+  import Empty from '@components/empty';
   import JbPopoverConfirm from '@components/jb-popover-confirm';
   import JbSearchSelect from '@components/jb-search-select';
   import ListActionLayout from '@components/list-action-layout';
@@ -380,6 +401,7 @@
   export default {
     name: 'ScriptVersion',
     components: {
+      Empty,
       ListActionLayout,
       JbPopoverConfirm,
       JbSearchSelect,
@@ -397,6 +419,7 @@
         isLoading: false,
         isListFlod: false,
         isShowNewVersion: false,
+        isSearching: false,
         showDiff: false,
         dataMemo: [],
         data: [],
@@ -713,8 +736,15 @@
           });
         });
         this.data = Object.freeze(scriptVersionList);
+        this.isSearching = Object.keys(payload).length > 0;
         this.handleLayoutFlod();
       },
+      /**
+       * @desc 清空搜索
+       */
+      handleClearSearch () {
+        this.$refs.searchSelect.reset();
+      },
       /**
        * @desc 列表排序
        * @param {Object} payload 排序字段

diff --git a/src/frontend/src/views/ticket-manage/list/index.vue b/src/frontend/src/views/ticket-manage/list/index.vue
@@ -59,6 +59,7 @@
         align="left"
         :label="$t('ticket.凭证ID')"
         prop="id"
+        show-overflow-tooltip
         width="300">
         <template slot-scope="{ row }">
           <span>{{ row.id }}</span>
@@ -83,6 +84,7 @@
         :filters="sourceFilters"
         :label="$t('ticket.类型.colHead')"
         prop="type"
+        show-overflow-tooltip
         width="180">
         <template slot-scope="{ row }">
           <span>{{ typeMap[row.type] }}</span>
@@ -94,7 +96,8 @@
         align="left"
         :label="$t('ticket.描述')"
         min-width="150"
-        prop="description">
+        prop="description"
+        show-overflow-tooltip>
         <template slot-scope="{ row }">
           <span>{{ row.description || '--' }}</span>
         </template>
@@ -131,27 +134,31 @@
         align="left"
         :label="$t('ticket.创建人')"
         prop="creator"
+        show-overflow-tooltip
         width="120" />
       <bk-table-column
         v-if="allRenderColumnMap.createTime"
         key="createTime"
         align="left"
         :label="$t('ticket.创建时间')"
         prop="createTime"
+        show-overflow-tooltip
         width="180" />
       <bk-table-column
         v-if="allRenderColumnMap.lastModifyUser"
         key="lastModifyUser"
         align="left"
         :label="$t('ticket.更新人')"
         prop="lastModifyUser"
+        show-overflow-tooltip
         width="120" />
       <bk-table-column
         v-if="allRenderColumnMap.lastModifyTime"
         key="lastModifyTime"
         align="left"
         :label="$t('ticket.更新时间')"
         prop="lastModifyTime"
+        show-overflow-tooltip
         width="180" />
       <bk-table-column
         key="action"
@@ -268,7 +275,7 @@
           return {
             title: I18n.t('ticket.新建凭证'),
             okText: I18n.t('ticket.提交'),
-                        
+
           };
         }
         return {

diff --git a/src/frontend/src/views/white-ip/index/index.vue b/src/frontend/src/views/white-ip/index/index.vue
@@ -65,43 +65,50 @@
         key="scopeText"
         align="left"
         :label="$t('whiteIP.生效范围.colHead')"
-        prop="scopeText" />
+        prop="scopeText"
+        show-overflow-tooltip />
       <bk-table-column
         v-if="allRenderColumnMap.appText"
         key="appText"
         align="left"
         :label="$t('whiteIP.目标业务.colHead')"
-        prop="appText" />
+        prop="appText"
+        show-overflow-tooltip />
       <bk-table-column
         v-if="allRenderColumnMap.remark"
         key="remark"
         align="left"
         :label="$t('whiteIP.备注.colHead')"
-        prop="remark" />
+        prop="remark"
+        show-overflow-tooltip />
       <bk-table-column
         v-if="allRenderColumnMap.creator"
         key="creator"
         align="left"
         :label="$t('whiteIP.创建人')"
-        prop="creator" />
+        prop="creator"
+        show-overflow-tooltip />
       <bk-table-column
         v-if="allRenderColumnMap.createTime"
         key="createTime"
         align="left"
         :label="$t('whiteIP.创建时间')"
-        prop="createTime" />
+        prop="createTime"
+        show-overflow-tooltip />
       <bk-table-column
         v-if="allRenderColumnMap.lastModifier"
         key="lastModifier"
         align="left"
         :label="$t('whiteIP.更新人')"
-        prop="lastModifier" />
+        prop="lastModifier"
+        show-overflow-tooltip />
       <bk-table-column
         v-if="allRenderColumnMap.lastModifyTime"
         key="lastModifyTime"
         align="left"
         :label="$t('whiteIP.更新时间')"
-        prop="lastModifyTime" />
+        prop="lastModifyTime"
+        show-overflow-tooltip />
       <bk-table-column
         key="action"
         align="left"