From 34520bfbd1911ae89449f666354c7378111ac655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E9=B9=B0?= <17kungfuboy@gmail.com> Date: Thu, 9 Feb 2023 16:04:53 +0800 Subject: [PATCH 1/2] fix: delete group after delete tab by id --- package.json | 4 +- src/workbench/browser/locale/messages.xlf | 267 ++++++++++-------- .../workspace/project/api/api-tab.service.ts | 7 + .../group/tree/api-group-tree.component.ts | 12 +- 4 files changed, 172 insertions(+), 118 deletions(-) diff --git a/package.json b/package.json index 31266ae5..d6f32479 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "build:static": "npm run clear:electron:tsc&&npm run electron:tsc && electron-builder build", "electron:build:web": "yarn workspace postcat-web run build", "electron:static": "npm run electron:tsc && electron .", - "release": "npm-run-all -s build:web electron:tsc && electron-builder --publish=always && node upload.js", - "release:m1": "npm-run-all -s build:web electron:tsc && electron-builder -m=dmg --arm64 -p onTagOrDraft && node upload.js", + "release": "npm-run-all -s electron:build:web electron:tsc && electron-builder --publish=always && node upload.js", + "release:m1": "npm-run-all -s electron:build:web electron:tsc && electron-builder -m=dmg --arm64 -p onTagOrDraft && node upload.js", "test": "npm-run-all --serial test:*", "e2e": "yarn build:prod && npx playwright test -c e2e/playwright.config.ts e2e/", "clear:electron:tsc": "tsc --build --clean", diff --git a/src/workbench/browser/locale/messages.xlf b/src/workbench/browser/locale/messages.xlf index 1046bc90..935750bc 100644 --- a/src/workbench/browser/locale/messages.xlf +++ b/src/workbench/browser/locale/messages.xlf @@ -10,7 +10,7 @@ src/app/pages/extension/detail/extension-detail.component.html - 70 + 88 @@ -24,14 +24,14 @@ Release Notes src/app/core/services/notification.service.ts - 26 + 27 There will be downtime updates from :00 to :00 today, and may be temporarily inaccessible. src/app/core/services/notification.service.ts - 27 + 28 @@ -300,6 +300,9 @@ src/app/layouts/navbar/nav-operate.component.ts 17 + + + Maximize src/app/layouts/navbar/nav-operate.component.ts 28 @@ -366,7 +369,7 @@ src/app/pages/extension/list/extension-list.component.html - 42 + 50 src/app/pages/workspace/overview/workspace-overview.component.html @@ -392,7 +395,7 @@ src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 73 + 74 @@ -428,7 +431,7 @@ src/app/pages/extension/detail/extension-detail.component.html - 51 + 69 @@ -458,11 +461,11 @@ src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 36 + 37 src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 53 + 54 @@ -583,11 +586,11 @@ src/app/pages/user-modal.component.ts - 474 + 477 src/app/pages/workspace/project/api/websocket/websocket.component.ts - 318 + 340 src/app/shared/services/modal.service.ts @@ -676,11 +679,11 @@ src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 37 + 38 src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 54 + 55 @@ -709,10 +712,10 @@ - Import like this: + Import like this: src/app/modules/api-shared/params-import/params-import.component.html - 8,10 + 9,11 @@ -775,18 +778,18 @@ JSON format invalid src/app/modules/api-shared/params-import/params-import.component.ts - 81 + 107 XML format invalid src/app/modules/api-shared/params-import/params-import.component.ts - 93 + 119 src/app/modules/api-shared/params-import/params-import.component.ts - 99 + 125 @@ -818,7 +821,7 @@ src/app/pages/extension/extension.component.html - 4 + 12 src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.html @@ -962,11 +965,11 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 41 + 45 src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 63 + 67 @@ -993,7 +996,7 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 49 + 53 src/app/pages/workspace/project/api/components/history/eo-history.component.html @@ -1020,14 +1023,14 @@ src/app/pages/workspace/project/api/env/env-list/env-list.component.html - 36 + 37 Please import the file first src/app/modules/extension-select/import-api/import-api.component.ts - 84 + 102 @@ -1055,11 +1058,18 @@ 39 + + Can't find the you want? find more... + + src/app/modules/extension-select/select/extension-select.component.html + 48,49 + + Only files in JSON format are supported src/app/modules/extension-select/select/extension-select.component.ts - 50 + 55 @@ -1161,7 +1171,7 @@ src/app/pages/user-modal.component.ts - 75 + 81 @@ -1317,102 +1327,102 @@ Enable src/app/pages/extension/detail/extension-detail.component.html - 24 + 42 Disable src/app/pages/extension/detail/extension-detail.component.html - 25 + 43 Uninstall src/app/pages/extension/detail/extension-detail.component.html - 35 + 53 Install src/app/pages/extension/detail/extension-detail.component.html - 36 + 54 Details src/app/pages/extension/detail/extension-detail.component.html - 59 + 77 src/app/pages/extension/list/extension-list.component.html - 45 + 54 Support src/app/pages/extension/detail/extension-detail.component.html - 67 + 85 Author src/app/pages/extension/detail/extension-detail.component.html - 69 + 87 Repository src/app/pages/extension/detail/extension-detail.component.html - 71 + 89 Homepage src/app/pages/extension/detail/extension-detail.component.html - 76 + 94 BugReport src/app/pages/extension/detail/extension-detail.component.html - 79 + 97 ChangeLog src/app/pages/extension/detail/extension-detail.component.html - 85 + 103 Changelog failed to load src/app/pages/extension/detail/extension-detail.component.html - 88 + 106 Reacquire src/app/pages/extension/detail/extension-detail.component.html - 90 + 108 Need Client src/app/pages/extension/detail/extension-detail.component.html - 98 + 116 @@ -1426,85 +1436,120 @@ This plugin has no documentation yet. src/app/pages/extension/detail/extension-detail.component.ts - 64 + 68 All src/app/pages/extension/extension.component.ts - 23 + 25 Official src/app/pages/extension/extension.component.ts - 29 + 31 Installed src/app/pages/extension/extension.component.ts - 34 + 37 src/app/pages/extension/list/extension-list.component.html - 23 + 27 + + + + Data Migration + + src/app/pages/extension/extension.model.ts + 75 + + + + Themes + + src/app/pages/extension/extension.model.ts + 80 + + + + API Security + + src/app/pages/extension/extension.model.ts + 85 + + + + Other + + src/app/pages/extension/extension.model.ts + 90 + + + + or + + src/app/pages/third-login.component.ts + 21 + + + + Sign In/Up with Github + + src/app/pages/third-login.component.ts + 38,39 Check your connection src/app/pages/user-modal.component.ts - 25 + 26 Can't connect right now, click to retry or src/app/pages/user-modal.component.ts - 29 + 30 config in the configuration src/app/pages/user-modal.component.ts - 30 + 31 Cancel src/app/pages/user-modal.component.ts - 34,35 + 35,36 src/app/pages/user-modal.component.ts - 148,149 + 156,157 Retry src/app/pages/user-modal.component.ts - 37,38 + 38,39 Sign In/Up src/app/pages/user-modal.component.ts - 47 - - - - Email - - src/app/pages/user-modal.component.ts - 54 + 48 @@ -1518,81 +1563,74 @@ Enter Email src/app/pages/user-modal.component.ts - 62 - - - - Password - - src/app/pages/user-modal.component.ts - 69 + 63 Enter password src/app/pages/user-modal.component.ts - 71 + 76 Please input your password src/app/pages/user-modal.component.ts - 73 + 80 Sign In/Up src/app/pages/user-modal.component.ts - 92,93 + 99,100 Open setting src/app/pages/user-modal.component.ts - 104 + 112 If you want to collaborate, please src/app/pages/user-modal.component.ts - 108 + 116 open the settings src/app/pages/user-modal.component.ts - 109 + 117 and fill in the configuration src/app/pages/user-modal.component.ts - 110 + 118 Add Workspace src/app/pages/user-modal.component.ts - 117 + 125 Workspace Name src/app/pages/user-modal.component.ts - 123 + 131 src/app/pages/user-modal.component.ts - 131 + 139 src/app/pages/workspace/components/edit/workspace-edit.component.ts @@ -1607,67 +1645,67 @@ Confirm src/app/pages/user-modal.component.ts - 151,152 + 159,160 Oops, server fail src/app/pages/user-modal.component.ts - 223 + 232 Connect failed src/app/pages/user-modal.component.ts - 228 + 237 Connect success src/app/pages/user-modal.component.ts - 236 + 244 Please check you username or password src/app/pages/user-modal.component.ts - 375 + 380 src/app/pages/user-modal.component.ts - 388 + 393 Username must a email src/app/pages/user-modal.component.ts - 385 + 390 New workspace Failed ! src/app/pages/user-modal.component.ts - 456 + 459 New workspace successfully ! src/app/pages/user-modal.component.ts - 459 + 462 Upload local data to the cloud src/app/pages/user-modal.component.ts - 469 + 472 @@ -1675,21 +1713,21 @@ If you do not upload it now, you can also manually export the project data and import it into a new workspace later. src/app/pages/user-modal.component.ts - 470,471 + 473,474 Upload src/app/pages/user-modal.component.ts - 480 + 483 Create Project Failed ! src/app/pages/user-modal.component.ts - 525 + 528 src/app/shared/store/effect.service.ts @@ -2068,7 +2106,7 @@ Copy src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 45 + 49 @Copy @@ -2076,70 +2114,70 @@ Add API src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 55 + 59 Add Subgroup src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 59 + 63 Delete src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 67 + 71 Edit Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 146 + 154 Delete Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 155 + 163 Deletion Confirmation? src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 168 + 176 Are you sure you want to delete the data <strong title=""></strong> ? You cannot restore it once deleted! src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 169,171 + 177,179 Add Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 187 + 195 Import API src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 197 + 205 Failed to ,Please upgrade extension or try again later src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 207 + 215 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2150,7 +2188,7 @@ successfully src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 213 + 221 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2206,6 +2244,13 @@ 101 + + Environment name length needs to be less than 32 + + src/app/pages/workspace/project/api/env/env-edit/env-edit.component.ts + 115 + + New Environment @@ -2224,35 +2269,35 @@ Global variable src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 34 + 35 No Global variables src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 43 + 44 Environment Host src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 46 + 47 Environment Global variable src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 51 + 52 Manage Environment src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 79 + 80 @@ -2896,28 +2941,28 @@ Connect to is failed src/app/pages/workspace/project/api/websocket/websocket.component.ts - 266 + 288 Do you want to leave the page? src/app/pages/workspace/project/api/websocket/websocket.component.ts - 313 + 335 After leaving, the current long connection is no longer maintained, whether to confirm to leave? src/app/pages/workspace/project/api/websocket/websocket.component.ts - 314 + 336 Leave src/app/pages/workspace/project/api/websocket/websocket.component.ts - 326 + 348 diff --git a/src/workbench/browser/src/app/pages/workspace/project/api/api-tab.service.ts b/src/workbench/browser/src/app/pages/workspace/project/api/api-tab.service.ts index 6b40731c..b9115a07 100644 --- a/src/workbench/browser/src/app/pages/workspace/project/api/api-tab.service.ts +++ b/src/workbench/browser/src/app/pages/workspace/project/api/api-tab.service.ts @@ -105,6 +105,13 @@ export class ApiTabService { } } } + batchCloseTabById(uuidList) { + const result = this.apiTabComponent + .getTabs() + .filter(it => uuidList.includes(it.params.uuid)) + .map(it => it.uuid); + this.apiTabComponent.batchCloseTab(result); + } onChildComponentInit(componentRef) { this.componentRef = componentRef; } diff --git a/src/workbench/browser/src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts b/src/workbench/browser/src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts index ba7a9a0d..264fc04c 100644 --- a/src/workbench/browser/src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts +++ b/src/workbench/browser/src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { EoNgFeedbackMessageService } from 'eo-ng-feedback'; import { requestMethodMap } from 'eo/workbench/browser/src/app/modules/api-shared/api.model'; import { ImportApiComponent } from 'eo/workbench/browser/src/app/modules/extension-select/import-api/import-api.component'; +import { ApiTabService } from 'eo/workbench/browser/src/app/pages/workspace/project/api/api-tab.service'; import { ApiGroupEditComponent } from 'eo/workbench/browser/src/app/pages/workspace/project/api/components/group/edit/api-group-edit.component'; import { ModalService } from 'eo/workbench/browser/src/app/shared/services/modal.service'; import { GroupCreateDto, GroupUpdateDto } from 'eo/workbench/browser/src/app/shared/services/storage/db/dto/group.dto'; @@ -20,9 +21,7 @@ import { ApiStoreService } from '../../../service/store/api-state.service'; export type GroupAction = 'new' | 'edit' | 'delete'; -const getAllAPIId = ({ id, children = [] }) => { - return [id, ...children.map(getAllAPIId)]; -}; +const getAllAPIId = ({ id, children = [] }: any) => [id, ...children.map(getAllAPIId)]; @Component({ selector: 'pc-api-group-tree', templateUrl: './api-group-tree.component.html', @@ -82,6 +81,7 @@ export class ApiGroupTreeComponent implements OnInit { private modalService: ModalService, private router: Router, private route: ActivatedRoute, + private tab: ApiTabService, private message: EoNgFeedbackMessageService ) {} @@ -140,8 +140,10 @@ export class ApiGroupTreeComponent implements OnInit { nzContent: ApiGroupEditComponent, nzComponentParams: params, nzOnOk: () => { - console.log('this.apiGroupTree', params.group); - // const idList = getAllAPIId(params.group) + if (params.action === 'delete') { + const idList = [...new Set(getAllAPIId(params.group).flat(Infinity))]; + this.tab.batchCloseTabById(idList); + } return modal.componentInstance.submit().then(data => { if (params.action !== 'new') return; this.expandKeys = [...(this.expandKeys || []), modal.componentInstance.group.parentId]; From 92671ba463dd9f647adb681f76e4e9d0f169c18b Mon Sep 17 00:00:00 2001 From: scarqin <1054139596@qq.com> Date: Thu, 9 Feb 2023 16:35:43 +0800 Subject: [PATCH 2/2] wip: translate --- src/workbench/browser/locale/messages.xlf | 83 +++- src/workbench/browser/locale/messages.zh.xlf | 358 +++++++++++------- .../select/extension-select.component.html | 2 +- .../select-theme/select-theme.component.ts | 4 +- .../app/pages/extension/extension.model.ts | 18 +- .../src/app/shared/store/effect.service.ts | 1 + 6 files changed, 299 insertions(+), 167 deletions(-) diff --git a/src/workbench/browser/locale/messages.xlf b/src/workbench/browser/locale/messages.xlf index 935750bc..256e82ab 100644 --- a/src/workbench/browser/locale/messages.xlf +++ b/src/workbench/browser/locale/messages.xlf @@ -965,11 +965,11 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 45 + 44 src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 67 + 66 @@ -996,7 +996,7 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 53 + 52 src/app/pages/workspace/project/api/components/history/eo-history.component.html @@ -1059,11 +1059,15 @@ - Can't find the you want? find more... + Can't find the you want? find more... src/app/modules/extension-select/select/extension-select.component.html 48,49 + + src/app/modules/system-setting/common/select-theme/select-theme.component.ts + 47,48 + Only files in JSON format are supported @@ -1464,6 +1468,47 @@ 27 + + format + + src/app/pages/extension/extension.model.ts + 25 + + + src/app/pages/extension/extension.model.ts + 29 + + + src/app/pages/extension/extension.model.ts + 33 + + + src/app/pages/extension/extension.model.ts + 37 + + + src/app/pages/extension/extension.model.ts + 48 + + + src/app/pages/extension/extension.model.ts + 60 + + + + themes + + src/app/pages/extension/extension.model.ts + 52 + + + + extensions + + src/app/pages/extension/extension.model.ts + 56 + + Data Migration @@ -1731,7 +1776,7 @@ src/app/shared/store/effect.service.ts - 218 + 219 @@ -2106,7 +2151,7 @@ Copy src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 49 + 48 @Copy @@ -2114,70 +2159,70 @@ Add API src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 59 + 58 Add Subgroup src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 63 + 62 Delete src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 71 + 70 Edit Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 154 + 155 Delete Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 163 + 164 Deletion Confirmation? src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 176 + 177 Are you sure you want to delete the data <strong title=""></strong> ? You cannot restore it once deleted! src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 177,179 + 178,180 Add Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 195 + 196 Import API src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 205 + 206 Failed to ,Please upgrade extension or try again later src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 215 + 216 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2188,7 +2233,7 @@ successfully src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 221 + 222 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -3158,6 +3203,10 @@ src/app/shared/services/storage/db/services/workspace.service.ts 16 + + src/app/shared/store/effect.service.ts + 36 + diff --git a/src/workbench/browser/locale/messages.zh.xlf b/src/workbench/browser/locale/messages.zh.xlf index b5d71cf8..d344be1a 100644 --- a/src/workbench/browser/locale/messages.zh.xlf +++ b/src/workbench/browser/locale/messages.zh.xlf @@ -10,7 +10,7 @@ src/app/pages/extension/detail/extension-detail.component.html - 70 + 88 版本 @@ -26,7 +26,7 @@ Release Notes src/app/core/services/notification.service.ts - 26 + 27 更新说明 @@ -34,7 +34,7 @@ There will be downtime updates from :00 to :00 today, and may be temporarily inaccessible. src/app/core/services/notification.service.ts - 27 + 28 今天 :00至 :00 将会进行停机更新，可能暂时无法访问。 @@ -336,11 +336,15 @@ src/app/layouts/navbar/nav-operate.component.ts 17 + 最小化 + + + Maximize src/app/layouts/navbar/nav-operate.component.ts 28 - 最小化 + 最大化 Quit @@ -410,7 +414,7 @@ src/app/pages/extension/list/extension-list.component.html - 42 + 50 src/app/pages/workspace/overview/workspace-overview.component.html @@ -438,7 +442,7 @@ src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 73 + 74 环境 @@ -478,7 +482,7 @@ src/app/pages/extension/detail/extension-detail.component.html - 51 + 69 设置 @@ -510,11 +514,11 @@ src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 36 + 37 src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 53 + 54 名称 @@ -646,11 +650,11 @@ src/app/pages/user-modal.component.ts - 474 + 477 src/app/pages/workspace/project/api/websocket/websocket.component.ts - 318 + 340 src/app/shared/services/modal.service.ts @@ -746,11 +750,11 @@ src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 37 + 38 src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 54 + 55 参数值 @@ -783,12 +787,12 @@ 导入 - Import like this: + Import like this: src/app/modules/api-shared/params-import/params-import.component.html - 8,10 + 9,11 - 导入格式: + 导入格式： Replace All @@ -858,7 +862,7 @@ JSON format invalid src/app/modules/api-shared/params-import/params-import.component.ts - 81 + 107 JSON 格式不正确 @@ -866,11 +870,11 @@ XML format invalid src/app/modules/api-shared/params-import/params-import.component.ts - 93 + 119 src/app/modules/api-shared/params-import/params-import.component.ts - 99 + 125 XML 格式不正确 @@ -906,7 +910,7 @@ src/app/pages/extension/extension.component.html - 4 + 12 src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.html @@ -1066,11 +1070,11 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 41 + 44 src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 63 + 66 编辑 @@ -1098,7 +1102,7 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 49 + 52 src/app/pages/workspace/project/api/components/history/eo-history.component.html @@ -1126,7 +1130,7 @@ src/app/pages/workspace/project/api/env/env-list/env-list.component.html - 36 + 37 是否确定删除? @@ -1134,7 +1138,7 @@ Please import the file first src/app/modules/extension-select/import-api/import-api.component.ts - 84 + 102 请先导入文件 @@ -1166,11 +1170,23 @@ 仅支持导入单个文件 + + Can't find the you want? find more... + + src/app/modules/extension-select/select/extension-select.component.html + 48,49 + + + src/app/modules/system-setting/common/select-theme/select-theme.component.ts + 47,48 + + 找不到你想要的?查看更多... + Only files in JSON format are supported src/app/modules/extension-select/select/extension-select.component.ts - 50 + 55 仅支持上传 JSON 格式的文件 @@ -1286,7 +1302,7 @@ src/app/pages/user-modal.component.ts - 75 + 81 最小长度为 6 @@ -1430,28 +1446,6 @@ 请输入 - - - - - - src/app/pages/extension/detail/components/extensions-settings.component.ts - 33 - - - src/app/pages/workspace/overview/workspace-overview.component.html - 4 - - - src/app/pages/workspace/project/api/http/mock/api-mock.component.html - 3,4 - - - src/app/pages/workspace/project/api/http/test/body/api-test-body.component.html - 40 - - - Save Success @@ -1464,7 +1458,7 @@ Enable src/app/pages/extension/detail/extension-detail.component.html - 24 + 42 启用 @@ -1472,7 +1466,7 @@ Disable src/app/pages/extension/detail/extension-detail.component.html - 25 + 43 停用 @@ -1480,7 +1474,7 @@ Uninstall src/app/pages/extension/detail/extension-detail.component.html - 35 + 53 卸载 @@ -1488,7 +1482,7 @@ Install src/app/pages/extension/detail/extension-detail.component.html - 36 + 54 安装 @@ -1496,11 +1490,11 @@ Details src/app/pages/extension/detail/extension-detail.component.html - 59 + 77 src/app/pages/extension/list/extension-list.component.html - 45 + 54 介绍 @@ -1508,7 +1502,7 @@ Support src/app/pages/extension/detail/extension-detail.component.html - 67 + 85 支持 @@ -1516,7 +1510,7 @@ Author src/app/pages/extension/detail/extension-detail.component.html - 69 + 87 作者 @@ -1524,7 +1518,7 @@ Repository src/app/pages/extension/detail/extension-detail.component.html - 71 + 89 代码仓库 @@ -1532,7 +1526,7 @@ Homepage src/app/pages/extension/detail/extension-detail.component.html - 76 + 94 首页 @@ -1540,7 +1534,7 @@ BugReport src/app/pages/extension/detail/extension-detail.component.html - 79 + 97 报告问题 @@ -1548,7 +1542,7 @@ ChangeLog src/app/pages/extension/detail/extension-detail.component.html - 85 + 103 更新日志 @@ -1556,7 +1550,7 @@ Changelog failed to load src/app/pages/extension/detail/extension-detail.component.html - 88 + 106 更新日志加载失败 @@ -1564,7 +1558,7 @@ Reacquire src/app/pages/extension/detail/extension-detail.component.html - 90 + 108 重新获取 @@ -1572,7 +1566,7 @@ Need Client src/app/pages/extension/detail/extension-detail.component.html - 98 + 116 需要客户端 @@ -1588,7 +1582,7 @@ This plugin has no documentation yet. src/app/pages/extension/detail/extension-detail.component.ts - 64 + 68 此插件尚无文档。 @@ -1596,7 +1590,7 @@ All src/app/pages/extension/extension.component.ts - 23 + 25 所有 @@ -1604,7 +1598,7 @@ Official src/app/pages/extension/extension.component.ts - 29 + 31 官方 @@ -1612,19 +1606,111 @@ Installed src/app/pages/extension/extension.component.ts - 34 + 37 src/app/pages/extension/list/extension-list.component.html - 23 + 27 已安装 + + format + + src/app/pages/extension/extension.model.ts + 25 + + + src/app/pages/extension/extension.model.ts + 29 + + + src/app/pages/extension/extension.model.ts + 33 + + + src/app/pages/extension/extension.model.ts + 37 + + + src/app/pages/extension/extension.model.ts + 48 + + + src/app/pages/extension/extension.model.ts + 60 + + 格式 + + + themes + + src/app/pages/extension/extension.model.ts + 52 + + 主题 + + + extensions + + src/app/pages/extension/extension.model.ts + 56 + + 插件 + + + Data Migration + + src/app/pages/extension/extension.model.ts + 75 + + 数据迁移 + + + Themes + + src/app/pages/extension/extension.model.ts + 80 + + 主题 + + + API Security + + src/app/pages/extension/extension.model.ts + 85 + + API 安全 + + + Other + + src/app/pages/extension/extension.model.ts + 90 + + 其他 + + + or + + src/app/pages/third-login.component.ts + 21 + + 或 + + + Sign In/Up with Github + + src/app/pages/third-login.component.ts + 38,39 + + 通过 Github 注册/登录 + Check your connection src/app/pages/user-modal.component.ts - 25 + 26 检查您的网络连接 @@ -1632,7 +1718,7 @@ Can't connect right now, click to retry or src/app/pages/user-modal.component.ts - 29 + 30 目前无法连接，点击重试或者 @@ -1640,7 +1726,7 @@ config in the configuration src/app/pages/user-modal.component.ts - 30 + 31 填写配置 @@ -1648,11 +1734,11 @@ Cancel src/app/pages/user-modal.component.ts - 34,35 + 35,36 src/app/pages/user-modal.component.ts - 148,149 + 156,157 取消 @@ -1660,7 +1746,7 @@ Retry src/app/pages/user-modal.component.ts - 37,38 + 38,39 重连 @@ -1668,18 +1754,10 @@ Sign In/Up src/app/pages/user-modal.component.ts - 47 + 48 登录/注册 - - Email - - src/app/pages/user-modal.component.ts - 54 - - 邮箱 - Please input your email @@ -1692,23 +1770,15 @@ Enter Email src/app/pages/user-modal.component.ts - 62 + 63 请输入邮箱 - - Password - - src/app/pages/user-modal.component.ts - 69 - - 密码 - Enter password src/app/pages/user-modal.component.ts - 71 + 76 输入密码 @@ -1716,7 +1786,7 @@ Please input your password src/app/pages/user-modal.component.ts - 73 + 80 请输入你的密码 @@ -1724,7 +1794,7 @@ Sign In/Up src/app/pages/user-modal.component.ts - 92,93 + 99,100 登录/注册 @@ -1732,7 +1802,7 @@ Open setting src/app/pages/user-modal.component.ts - 104 + 112 打开设置 @@ -1740,7 +1810,7 @@ If you want to collaborate, please src/app/pages/user-modal.component.ts - 108 + 116 如果您想要协作，请 @@ -1748,7 +1818,7 @@ open the settings src/app/pages/user-modal.component.ts - 109 + 117 打开设置 @@ -1756,7 +1826,7 @@ and fill in the configuration src/app/pages/user-modal.component.ts - 110 + 118 并填写配置 @@ -1764,7 +1834,7 @@ Add Workspace src/app/pages/user-modal.component.ts - 117 + 125 新建空间 @@ -1772,11 +1842,11 @@ Workspace Name src/app/pages/user-modal.component.ts - 123 + 131 src/app/pages/user-modal.component.ts - 131 + 139 src/app/pages/workspace/components/edit/workspace-edit.component.ts @@ -1792,7 +1862,7 @@ Confirm src/app/pages/user-modal.component.ts - 151,152 + 159,160 确认 @@ -1800,7 +1870,7 @@ Oops, server fail src/app/pages/user-modal.component.ts - 223 + 232 糟糕，服务连接失败 @@ -1808,7 +1878,7 @@ Connect failed src/app/pages/user-modal.component.ts - 228 + 237 连接失败 @@ -1816,7 +1886,7 @@ Connect success src/app/pages/user-modal.component.ts - 236 + 244 连接成功 @@ -1824,11 +1894,11 @@ Please check you username or password src/app/pages/user-modal.component.ts - 375 + 380 src/app/pages/user-modal.component.ts - 388 + 393 请检查您的用户名和密码。 @@ -1836,7 +1906,7 @@ Username must a email src/app/pages/user-modal.component.ts - 385 + 390 用户名必须是邮箱 @@ -1844,7 +1914,7 @@ New workspace Failed ! src/app/pages/user-modal.component.ts - 456 + 459 新建空间失败 ! @@ -1852,7 +1922,7 @@ New workspace successfully ! src/app/pages/user-modal.component.ts - 459 + 462 新建空间成功 @@ -1860,7 +1930,7 @@ Upload local data to the cloud src/app/pages/user-modal.component.ts - 469 + 472 上传本地数据 @@ -1869,7 +1939,7 @@ If you do not upload it now, you can also manually export the project data and import it into a new workspace later. src/app/pages/user-modal.component.ts - 470,471 + 473,474 您已创建了一个云端工作空间，是否需要将本地的数据上传到新的工作空间以方便团队协作？<br> 如果现在不上传，后续您也可以手动导出项目数据并导入到新的工作空间。 @@ -1878,7 +1948,7 @@ Upload src/app/pages/user-modal.component.ts - 480 + 483 上传 @@ -1886,11 +1956,11 @@ Create Project Failed ! src/app/pages/user-modal.component.ts - 525 + 528 src/app/shared/store/effect.service.ts - 218 + 219 创建项目失败！ @@ -2308,7 +2378,7 @@ Copy src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 45 + 48 @Copy 复制 @@ -2317,7 +2387,7 @@ Add API src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 55 + 58 添加 API @@ -2325,7 +2395,7 @@ Add Subgroup src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 59 + 62 添加子分组 @@ -2333,7 +2403,7 @@ Delete src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 67 + 70 删除 @@ -2341,7 +2411,7 @@ Edit Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 146 + 155 编辑分组 @@ -2349,7 +2419,7 @@ Delete Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 155 + 164 删除分组 @@ -2357,7 +2427,7 @@ Deletion Confirmation? src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 168 + 177 确认删除？ @@ -2365,7 +2435,7 @@ Are you sure you want to delete the data <strong title=""></strong> ? You cannot restore it once deleted! src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 169,171 + 178,180 确认要删除数据 <strong title=""></strong> 吗？删除后不可恢复！ @@ -2373,7 +2443,7 @@ Add Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 187 + 196 添加分组 @@ -2381,7 +2451,7 @@ Import API src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 197 + 206 导入 API @@ -2389,7 +2459,7 @@ Failed to ,Please upgrade extension or try again later src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 207 + 216 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2401,7 +2471,7 @@ successfully src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 213 + 222 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2465,6 +2535,14 @@ 编辑失败 + + Environment name length needs to be less than 32 + + src/app/pages/workspace/project/api/env/env-edit/env-edit.component.ts + 115 + + 环境名称长度必须小于 32 + New Environment @@ -2485,7 +2563,7 @@ Global variable src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 34 + 35 全局变量 @@ -2493,7 +2571,7 @@ No Global variables src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 43 + 44 暂无全局变量 @@ -2501,7 +2579,7 @@ Environment Host src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 46 + 47 环境 Host @@ -2509,7 +2587,7 @@ Environment Global variable src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 51 + 52 环境全局变量 @@ -2517,7 +2595,7 @@ Manage Environment src/app/pages/workspace/project/api/env/env-select/env-select.component.ts - 79 + 80 管理环境 @@ -3237,7 +3315,7 @@ Connect to is failed src/app/pages/workspace/project/api/websocket/websocket.component.ts - 266 + 288 连接到 失败 @@ -3245,7 +3323,7 @@ Do you want to leave the page? src/app/pages/workspace/project/api/websocket/websocket.component.ts - 313 + 335 你想要离开当前页面吗？ @@ -3253,7 +3331,7 @@ After leaving, the current long connection is no longer maintained, whether to confirm to leave? src/app/pages/workspace/project/api/websocket/websocket.component.ts - 314 + 336 当前的长连接将会断开，是否确认离开？ @@ -3261,7 +3339,7 @@ Leave src/app/pages/workspace/project/api/websocket/websocket.component.ts - 326 + 348 离开 @@ -3483,6 +3561,10 @@ src/app/shared/services/storage/db/services/workspace.service.ts 16 + + src/app/shared/store/effect.service.ts + 36 + 个人工作空间 diff --git a/src/workbench/browser/src/app/modules/extension-select/select/extension-select.component.html b/src/workbench/browser/src/app/modules/extension-select/select/extension-select.component.html index 3e256d2c..2347efa0 100644 --- a/src/workbench/browser/src/app/modules/extension-select/select/extension-select.component.html +++ b/src/workbench/browser/src/app/modules/extension-select/select/extension-select.component.html @@ -45,7 +45,7 @@
Can't find the {{ tipsMap[tipsType].type }} you want? + >Can't find the {{ tipsMap[tipsType].name }} you want? find more...
diff --git a/src/workbench/browser/src/app/modules/system-setting/common/select-theme/select-theme.component.ts b/src/workbench/browser/src/app/modules/system-setting/common/select-theme/select-theme.component.ts index 250f432f..d046ff84 100644 --- a/src/workbench/browser/src/app/modules/system-setting/common/select-theme/select-theme.component.ts +++ b/src/workbench/browser/src/app/modules/system-setting/common/select-theme/select-theme.component.ts @@ -43,8 +43,8 @@ import { ThemeService } from '../../../../core/services/theme/theme.service'; -
Can't find the {{ categoriesTipsMap.Themes.type }} you want? +
Can't find the {{ categoriesTipsMap.Themes.name }} you want? find more...
`, diff --git a/src/workbench/browser/src/app/pages/extension/extension.model.ts b/src/workbench/browser/src/app/pages/extension/extension.model.ts index 44196d43..95251124 100644 --- a/src/workbench/browser/src/app/pages/extension/extension.model.ts +++ b/src/workbench/browser/src/app/pages/extension/extension.model.ts @@ -22,42 +22,42 @@ export enum ContributionPointsPrefix { export const featuresTipsMap = { importAPI: { - type: 'format', + name: $localize`format`, suggest: '@feature:importAPI' }, exportAPI: { - type: 'format', + name: $localize`format`, suggest: '@feature:exportAPI' }, syncAPI: { - type: 'format', + name: $localize`format`, suggest: '@feature:syncAPI' }, sidebarView: { - type: 'format', + name: $localize`format`, suggest: '@feature:sidebarView' }, theme: { - type: 'theme', + name: 'theme', suggest: '@feature:theme' } } as const; export const categoriesTipsMap = { 'Data Migration': { - type: 'format', + name: $localize`format`, suggest: '@category:Data Migration' }, Themes: { - type: 'format', + name: $localize`themes`, suggest: '@category:Themes' }, 'API Security': { - type: 'format', + name: $localize`extensions`, suggest: '@category:API Security' }, Other: { - type: 'format', + name: $localize`format`, suggest: '@category:Other' } } as const; diff --git a/src/workbench/browser/src/app/shared/store/effect.service.ts b/src/workbench/browser/src/app/shared/store/effect.service.ts index 7451fa3c..52fa24d2 100644 --- a/src/workbench/browser/src/app/shared/store/effect.service.ts +++ b/src/workbench/browser/src/app/shared/store/effect.service.ts @@ -33,6 +33,7 @@ export class EffectService { } async init() { const result = await db.workspace.read(); + result.data.title = $localize`Personal Workspace`; this.store.setLocalWorkspace(result.data as API.Workspace); const isUserFirstUse = !this.store.getCurrentWorkspaceUuid;