From 984f2d066a4b9ae8e0f6550d5a059b2f38907bb1 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 24 Feb 2023 16:08:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?bugfix:=20=E6=96=87=E6=9C=AC=E6=BA=A2?=
 =?UTF-8?q?=E5=87=BA=E4=BA=A4=E4=BA=92=E8=A7=84=E8=8C=83=20#1766?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/jb-edit/textarea.vue        |  5 +++--
 .../src/views/ticket-manage/list/index.vue     | 17 +++++++++++------
 .../src/views/white-ip/index/index.vue         | 18 ++++++++++++------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/frontend/src/components/jb-edit/textarea.vue b/src/frontend/src/components/jb-edit/textarea.vue
index a218e41bf1..748fc6b25b 100644
--- a/src/frontend/src/components/jb-edit/textarea.vue
+++ b/src/frontend/src/components/jb-edit/textarea.vue
@@ -34,6 +34,7 @@
             <div
                 class="render-text-box"
                 ref="valueTextBox"
+                v-bk-overflow-tips="renderText"
                 @copy="handleCopy"
                 :style="boxStyles">
                 <slot v-bind:value="newVal">{{ renderText }}</slot>
@@ -206,7 +207,7 @@
                         $el.style.wordBreak = 'keep-all';
                         $el.style.whiteSpace = 'pre';
                     }
-                    
+
                     this.$refs.valueTextBox.appendChild($el);
 
                     const lineHeight = 24;
@@ -214,7 +215,7 @@
                     const maxHeight = lineHeight * maxLine;
                     let realHeight = 0;
                     let realLength = 1;
-                
+
                     const calcLength = () => {
                         const text = this.newVal.slice(0, realLength);
                         $el.innerText = `${text} 展开展开`;
diff --git a/src/frontend/src/views/ticket-manage/list/index.vue b/src/frontend/src/views/ticket-manage/list/index.vue
index 12cea79ad6..5eba03072e 100644
--- a/src/frontend/src/views/ticket-manage/list/index.vue
+++ b/src/frontend/src/views/ticket-manage/list/index.vue
@@ -57,7 +57,8 @@
                 width="300"
                 prop="id"
                 key="id"
-                align="left">
+                align="left"
+                show-overflow-tooltip>
                 <template slot-scope="{ row }">
                     <span>{{ row.id }}</span>
                 </template>
@@ -91,7 +92,8 @@
                 prop="description"
                 key="description"
                 min-width="150"
-                align="left">
+                align="left"
+                show-overflow-tooltip>
                 <template slot-scope="{ row }">
                     <span>{{ row.description || '--' }}</span>
                 </template>
@@ -128,7 +130,8 @@
                 width="120"
                 prop="creator"
                 key="creator"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 v-if="allRenderColumnMap.createTime"
                 :label="$t('ticket.创建时间')"
@@ -142,14 +145,16 @@
                 prop="lastModifyUser"
                 key="lastModifyUser"
                 width="120"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 v-if="allRenderColumnMap.lastModifyTime"
                 :label="$t('ticket.更新时间')"
                 prop="lastModifyTime"
                 key="lastModifyTime"
                 width="180"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 :label="$t('ticket.操作')"
                 :resizable="false"
@@ -261,7 +266,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
index 0c042a1e24..f854c06e8a 100644
--- a/src/frontend/src/views/white-ip/index/index.vue
+++ b/src/frontend/src/views/white-ip/index/index.vue
@@ -75,37 +75,43 @@
                 :label="$t('whiteIP.生效范围.colHead')"
                 prop="scopeText"
                 key="scopeText"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 v-if="allRenderColumnMap.appText"
                 :label="$t('whiteIP.目标业务.colHead')"
                 prop="appText"
                 key="appText"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 v-if="allRenderColumnMap.creator"
                 :label="$t('whiteIP.创建人')"
                 prop="creator"
                 key="creator"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 v-if="allRenderColumnMap.createTime"
                 :label="$t('whiteIP.创建时间')"
                 prop="createTime"
                 key="createTime"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 v-if="allRenderColumnMap.lastModifier"
                 :label="$t('whiteIP.更新人')"
                 prop="lastModifier"
                 key="lastModifier"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 v-if="allRenderColumnMap.lastModifyTime"
                 :label="$t('whiteIP.更新时间')"
                 prop="lastModifyTime"
                 key="lastModifyTime"
-                align="left" />
+                align="left"
+                show-overflow-tooltip />
             <bk-table-column
                 :label="$t('whiteIP.操作')"
                 :resizable="false"

From 764668d12255eeffd817590ce2c73b13e9b78ba2 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 24 Feb 2023 16:10:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?bugfix:=20=E6=89=A7=E8=A1=8C=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E7=9A=84=E2=80=9C=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E2=80=9D=E5=AD=97=E6=AE=B5=E6=9E=9A=E4=B8=BE=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E4=B8=80=E4=B8=AA=E2=80=9C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E2=80=9D=20#1763?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/executive-history/list/index.vue         | 10 +++++++---
 src/frontend/src/views/executive-history/local.js      |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/views/executive-history/list/index.vue b/src/frontend/src/views/executive-history/list/index.vue
index a44ff9a45f..c958600145 100644
--- a/src/frontend/src/views/executive-history/list/index.vue
+++ b/src/frontend/src/views/executive-history/list/index.vue
@@ -332,6 +332,10 @@
                             name: I18n.t('history.等待确认'),
                             id: 7,
                         },
+                        {
+                            name: I18n.t('history.状态异常'),
+                            id: 9,
+                        },
                         {
                             name: I18n.t('history.强制终止中'),
                             id: 10,
@@ -496,15 +500,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
index f3e944fb06..db8909679f 100644
--- 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',

From fd98a2ba4156ae690dcacde3eafe2297abbbdbb7 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 24 Feb 2023 16:13:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feature:=20=E6=90=9C=E7=B4=A2=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=B7=E5=BC=8F=E8=A7=84=E8=8C=83=20#1767?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/script-manage/version/index.vue | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/frontend/src/views/script-manage/version/index.vue b/src/frontend/src/views/script-manage/version/index.vue
index 3ad5ace57d..f2710f4b4c 100644
--- a/src/frontend/src/views/script-manage/version/index.vue
+++ b/src/frontend/src/views/script-manage/version/index.vue
@@ -258,6 +258,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
@@ -341,6 +360,7 @@
     import PublicScriptService from '@service/public-script-manage';
     import NotifyService from '@service/notify';
     import ScriptModel from '@model/script/script';
+    import Empty from '@components/empty';
     import JbSearchSelect from '@components/jb-search-select';
     import ListActionLayout from '@components/list-action-layout';
     import JbPopoverConfirm from '@components/jb-popover-confirm';
@@ -366,6 +386,7 @@
     export default {
         name: 'ScriptVersion',
         components: {
+            Empty,
             ListActionLayout,
             JbPopoverConfirm,
             JbSearchSelect,
@@ -383,6 +404,7 @@
                 isLoading: false,
                 isListFlod: false,
                 isShowNewVersion: false,
+                isSearching: false,
                 showDiff: false,
                 dataMemo: [],
                 data: [],
@@ -513,7 +535,7 @@
             this.scriptId = this.$route.params.id;
 
             this.fetchData(true);
-            
+
             this.searchSelect = [
                 {
                     name: I18n.t('script.版本号.colHead'),
@@ -625,7 +647,7 @@
                 const windowHeight = window.innerHeight;
                 this.tableHeight = windowHeight - top - 20;
             },
-            
+
             rowClassName ({ row }) {
                 return row.scriptVersionId === this.selectVersionId ? 'active' : '';
             },
@@ -685,8 +707,15 @@
                     list = list.filter(item => reg.test(item[key]));
                 });
                 this.data = Object.freeze(list);
+                this.isSearching = Object.keys(payload).length > 0;
                 this.handleLayoutFlod();
             },
+            /**
+             * @desc 清空搜索
+             */
+            handleClearSearch () {
+                this.$refs.searchSelect.reset();
+            },
             /**
              * @desc 列表排序
              * @param {Object} payload 排序字段
@@ -824,7 +853,7 @@
              */
             handleSync (row) {
                 const routerName = this.isPublicScript ? 'scriptPublicSync' : 'scriptSync';
-                
+
                 this.$router.push({
                     name: routerName,
                     params: {
@@ -965,7 +994,7 @@
             handleEditCancel () {
                 this.displayCom = 'detail';
             },
-            
+
             /**
              * @desc 判断是否可以选中
              * @param {Object} row 脚本数据

From 938c48812cce414a61623dd62a58b05108da06e7 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 24 Feb 2023 16:25:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feature:=20=E6=90=9C=E7=B4=A2=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=B7=E5=BC=8F=E8=A7=84=E8=8C=83=20#1767?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/views/script-manage/version/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/frontend/src/views/script-manage/version/index.vue b/src/frontend/src/views/script-manage/version/index.vue
index 919b5b332f..c783f0a948 100644
--- 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"
                         @on-change="handleSearch"
                         :data="searchSelect"
                         :placeholder="$t('script.选择匹配的字段并输入关键字进行搜索')"