From 1c79dc650bc17320fe707813c15c9f87fcd8e841 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Tue, 29 Nov 2022 15:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=84=9A=E6=9C=AC=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=90=9C=E7=B4=A2=EF=BC=9F=E5=86=85=E5=AE=B9=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9B=B4=E5=B8=B8=E7=94=A8=20#1337?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../script-manage/common/copy-create.vue      |  2 +-
 .../script-manage/common/detail/index.vue     |  4 +--
 .../src/views/script-manage/common/edit.vue   |  2 +-
 .../src/views/script-manage/create/index.vue  |  2 +-
 .../src/views/script-manage/list/index.vue    |  7 ++++-
 src/frontend/src/views/script-manage/local.js | 12 +++++--
 .../src/views/script-manage/version/index.vue | 31 ++++++++++++++-----
 7 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/frontend/src/views/script-manage/common/copy-create.vue b/src/frontend/src/views/script-manage/common/copy-create.vue
index 382ab320a1..59a21a525a 100644
--- a/src/frontend/src/views/script-manage/common/copy-create.vue
+++ b/src/frontend/src/views/script-manage/common/copy-create.vue
@@ -66,7 +66,7 @@
                         <Icon type="new-dark" svg class="new-flag" />
                     </div>
                 </jb-form-item>
-                <jb-form-item :label="$t('script.版本日志')">
+                <jb-form-item :label="$t('script.版本日志.label')">
                     <bk-input
                         v-model="formData.versionDesc"
                         type="textarea"
diff --git a/src/frontend/src/views/script-manage/common/detail/index.vue b/src/frontend/src/views/script-manage/common/detail/index.vue
index 6abb2ce2e9..055f781a73 100644
--- a/src/frontend/src/views/script-manage/common/detail/index.vue
+++ b/src/frontend/src/views/script-manage/common/detail/index.vue
@@ -50,14 +50,14 @@
                 :class="{ active: contentTab === 'content' }"
                 @click="handleChangeDispaly('content')"
                 v-test="{ type: 'button', value: 'scriptContentTab' }">
-                {{ $t('script.脚本内容') }}
+                {{ $t('script.脚本内容.label') }}
             </div>
             <div
                 class="content-tab-item"
                 :class="{ active: contentTab === 'log' }"
                 @click="handleChangeDispaly('log')"
                 v-test="{ type: 'button', value: 'scriptVersionLogTab' }">
-                {{ $t('script.版本日志') }}
+                {{ $t('script.版本日志.label') }}
             </div>
         </div>
         <div class="version-content">
diff --git a/src/frontend/src/views/script-manage/common/edit.vue b/src/frontend/src/views/script-manage/common/edit.vue
index 3f5bf55f0e..6adc507a35 100644
--- a/src/frontend/src/views/script-manage/common/edit.vue
+++ b/src/frontend/src/views/script-manage/common/edit.vue
@@ -58,7 +58,7 @@
                     required>
                     <bk-input :value="formData.version" readonly />
                 </jb-form-item>
-                <jb-form-item :label="$t('script.版本日志')">
+                <jb-form-item :label="$t('script.版本日志.label')">
                     <bk-input
                         v-model="formData.versionDesc"
                         type="textarea"
diff --git a/src/frontend/src/views/script-manage/create/index.vue b/src/frontend/src/views/script-manage/create/index.vue
index eab267d581..97eb8c0adc 100644
--- a/src/frontend/src/views/script-manage/create/index.vue
+++ b/src/frontend/src/views/script-manage/create/index.vue
@@ -61,7 +61,7 @@
                     :placeholder="$t('script.输入版本号')"
                     :maxlength="30" />
             </jb-form-item>
-            <jb-form-item :label="$t('script.脚本内容')" required property="content">
+            <jb-form-item :label="$t('script.脚本内容.label')" required property="content">
                 <div ref="content">
                     <ace-editor
                         v-model="formData.content"
diff --git a/src/frontend/src/views/script-manage/list/index.vue b/src/frontend/src/views/script-manage/list/index.vue
index 8e99414ba9..ba29e73481 100644
--- a/src/frontend/src/views/script-manage/list/index.vue
+++ b/src/frontend/src/views/script-manage/list/index.vue
@@ -366,6 +366,11 @@
                     remoteMethod: PublicScriptService.scriptTypeList,
                     remoteExecuteImmediate: true,
                 },
+                {
+                    name: I18n.t('script.脚本内容.colHead'),
+                    id: 'content',
+                    default: true,
+                },
                 {
                     name: I18n.t('script.场景标签.colHead'),
                     id: 'tags',
@@ -446,7 +451,7 @@
                     { id: 'lastModifyTime' },
                 ]);
             }
-            
+
             this.rules = {
                 name: [
                     {
diff --git a/src/frontend/src/views/script-manage/local.js b/src/frontend/src/views/script-manage/local.js
index fd0691830b..b190230ab0 100644
--- a/src/frontend/src/views/script-manage/local.js
+++ b/src/frontend/src/views/script-manage/local.js
@@ -55,8 +55,14 @@ export default {
         版本状态: 'Status',
         名称: 'NAME',
         输入版本号: 'Type the version number...',
-        版本日志: 'ChangeLog',
-        脚本内容: 'Contents',
+        版本日志: {
+            label: 'ChangeLog',
+            colHead: 'CHANGE LOG',
+        },
+        脚本内容: {
+            label: 'Contents',
+            colHead: 'CONTENT',
+        },
         提交: 'Commit',
         取消: 'Cancel',
         立即同步: 'Synchronize Now',
@@ -88,7 +94,7 @@ export default {
         版本管理: 'Versions',
         上传文件: 'Upload',
         版本对比: 'Diff',
-        '直接输入 版本号 或 更新人 进行全局模糊搜索': 'Search by Version No. or Modified By...',
+        选择匹配的字段并输入关键字进行搜索: 'Select matching fields and enter keywords to search',
         更新时间: 'LAST MODIFIED ON',
         状态: 'STATUS',
         '确定上线该版本？': 'Are you sure ?',
diff --git a/src/frontend/src/views/script-manage/version/index.vue b/src/frontend/src/views/script-manage/version/index.vue
index 3ad5ace57d..04c2c3c1b5 100644
--- a/src/frontend/src/views/script-manage/version/index.vue
+++ b/src/frontend/src/views/script-manage/version/index.vue
@@ -44,7 +44,7 @@
                     <jb-search-select
                         @on-change="handleSearch"
                         :data="searchSelect"
-                        :placeholder="$t('script.直接输入 版本号 或 更新人 进行全局模糊搜索')"
+                        :placeholder="$t('script.选择匹配的字段并输入关键字进行搜索')"
                         :show-condition="false"
                         style="width: 420px;" />
                 </template>
@@ -360,6 +360,7 @@
     import ScriptBasic from './components/script-basic';
     import Diff from '../common/diff';
     import NewVersion from './components/new-version';
+    import { Base64 } from 'js-base64';
 
     const TABLE_COLUMN_CACHE = 'script_version_list_columns';
 
@@ -513,13 +514,23 @@
             this.scriptId = this.$route.params.id;
 
             this.fetchData(true);
-            
+
             this.searchSelect = [
                 {
                     name: I18n.t('script.版本号.colHead'),
                     id: 'version',
                     default: true,
                 },
+                {
+                    name: I18n.t('script.脚本内容.colHead'),
+                    id: 'content',
+                    default: true,
+                },
+                {
+                    name: I18n.t('script.版本日志.colHead'),
+                    id: 'versionDesc',
+                    default: true,
+                },
                 {
                     name: I18n.t('script.更新人.colHead'),
                     id: 'lastModifyUser',
@@ -625,7 +636,7 @@
                 const windowHeight = window.innerHeight;
                 this.tableHeight = windowHeight - top - 20;
             },
-            
+
             rowClassName ({ row }) {
                 return row.scriptVersionId === this.selectVersionId ? 'active' : '';
             },
@@ -679,12 +690,16 @@
              * @param {Object} payload 搜索字段
              */
             handleSearch (payload) {
-                let list = this.dataMemo;
+                let scriptVersionList = this.dataMemo;
                 Object.keys(payload).forEach((key) => {
                     const reg = new RegExp(encodeRegexp(payload[key]));
-                    list = list.filter(item => reg.test(item[key]));
+
+                    scriptVersionList = scriptVersionList.filter((scriptVersionData) => {
+                        const value = key === 'content' ? Base64.decode(scriptVersionData.content) : scriptVersionData[key];
+                        return reg.test(value);
+                    });
                 });
-                this.data = Object.freeze(list);
+                this.data = Object.freeze(scriptVersionList);
                 this.handleLayoutFlod();
             },
             /**
@@ -824,7 +839,7 @@
              */
             handleSync (row) {
                 const routerName = this.isPublicScript ? 'scriptPublicSync' : 'scriptSync';
-                
+
                 this.$router.push({
                     name: routerName,
                     params: {
@@ -965,7 +980,7 @@
             handleEditCancel () {
                 this.displayCom = 'detail';
             },
-            
+
             /**
              * @desc 判断是否可以选中
              * @param {Object} row 脚本数据