i118 issues

internal/server/modules/v1/service/test-script.go

@@ -29,7 +29,7 @@ func (s *TestScriptService) LoadTestScriptsBySiteProduct(
 	workspaces, _ := s.WorkspaceRepo.ListByProduct(siteId, productId)
 
 	// load scripts from disk
-	root = serverDomain.TestAsset{Path: "", Title: "测试脚本", Type: commConsts.Root, Slots: iris.Map{"icon": "icon"}}
+	root = serverDomain.TestAsset{Path: "", Title: "all", Type: commConsts.Root, Slots: iris.Map{"icon": "icon"}}
 	for _, workspace := range workspaces {
 
 		if filerType == string(commConsts.FilterWorkspace) &&

ui/src/locales/en-US.ts

@@ -56,7 +56,7 @@ export default {
     'script_lang': 'Script Language',
 
     'script': 'Script',
-    'test_script': 'Script',
+    'test_script': 'Test Script',
     'script.list': 'Script List',
     'script.view': 'View Script',
     'script.edit': 'Edit Script',
@@ -104,7 +104,10 @@ export default {
     'test_env':  'Test Environment', 
     'test_type':  'Test Type', 
     'exec_type': 'Execution Type', 
-    'case_num':  'Case Number', 
+    'case_num':  'Case Number',
+
+    'enable': 'Enable',
+    'disable':  'Disable',
 
     'submit': 'Submit',
     'cancel': 'Cancel',
@@ -116,6 +119,7 @@ export default {
     'view':  'View',
     'edit': 'Edit',
     'delete':  'Delete',
+    'remove': 'Remove',
     'select':  'Select',
     'pass':  'Pass', 
     'fail':  'Fail', 

ui/src/locales/zh-CN.ts

@@ -103,7 +103,10 @@ export default {
     'test_env':  '测试环境', 
     'test_type':  '测试类型', 
     'exec_type': '执行类型', 
-    'case_num':  '用例数', 
+    'case_num':  '用例数',
+
+    'enable': '启用',
+    'disable':  '禁用',
 
     'submit': '提交',
     'cancel': '取消',

ui/src/utils/const.ts

@@ -51,15 +51,15 @@ export const MonacoOptions = {
 
 export const disableStatusMap = [
     {
-        label: '所有状态',
+        label: 'all',
         value: '',
     },
     {
-        label: '启用',
+        label: 'enable',
         value: '1',
     },
     {
-        label: '禁用',
+        label: 'disable',
         value: '0',
     },
 ]

ui/src/views/result/index.vue

@@ -56,7 +56,7 @@
           <template #action="{ record }">
             <a-button @click="() => view(record)" type="link" size="small">{{ t('view') }}</a-button>
             <a-button @click="() => remove(record)" type="link" size="small"
-                      :loading="removeLoading.includes(record.seq)">{{ t('remove') }}
+                      :loading="removeLoading.includes(record.seq)">{{ t('delete') }}
             </a-button>
           </template>
 

ui/src/views/script/component/execLog.vue

@@ -301,7 +301,7 @@ export default defineComponent({
 
   #logs {
     margin: 0;
-    padding: 10px;
+    padding: 0 10px 10px 10px;
     position: relative;
     width: 100%;
     overflow-y: auto;
@@ -318,7 +318,8 @@ export default defineComponent({
       position: absolute;
       top: 5px;
       right: 5px;
-      width: 230px;
+      width: 260px;
+      text-align: right;
       .ant-select {
         margin: 0 3px;
       }

ui/src/views/script/component/tree.vue

@@ -21,7 +21,7 @@
         <a-select
             v-model:value="filerValue"
             @change="selectFilerValue"
-            style="width: 200px"
+            style="width: 180px"
             :dropdownMatchSelectWidth="false"
         >
           <a-select-option value=""></a-select-option>
@@ -199,6 +199,7 @@ export default defineComponent({
     watch(treeData, (currConfig) => {
       console.log('watch treeData', treeData.value)
 
+      treeData.value[0].title = t('test_script')
       getNodeMap(treeData.value[0])
 
       getExpandedKeys(currSite.value.id, currProduct.value.id).then(async keys => {
@@ -489,8 +490,8 @@ export default defineComponent({
     }
 
     .right {
-      width: 40px;
-      text-align: right;
+      width: 60px;
+      text-align: center;
     }
 
     .ant-btn-link {

ui/src/views/workspace/index.vue

@@ -7,7 +7,10 @@
             {{ t('workspace') }}
           </div>
           <div class="right">
-            <a-select @change="onSearch" v-model:value="queryParams.enabled" :options="statusArr" class="status-select">
+            <a-select @change="onSearch" v-model:value="queryParams.enabled" class="status-select">
+              <a-select-option v-for="item in statusArr" :key="item.value" :value="item.value">
+                {{t(item.label)}}
+              </a-select-option>
             </a-select>
             <a-input-search @change="onSearch" @search="onSearch" v-model:value="queryParams.keywords"
                             :placeholder="t('input_keyword_to_search')" style="width:270px;margin-left: 16px;"/>