diff --git a/src/browser/locale/messages.xlf b/src/browser/locale/messages.xlf index a1bfe2347..1c5ec4b05 100644 --- a/src/browser/locale/messages.xlf +++ b/src/browser/locale/messages.xlf @@ -127,7 +127,7 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 231 + 233 src/app/pages/workspace/project/api/components/params-import/params-import.component.html @@ -1272,11 +1272,15 @@ src/app/pages/components/extension/extension.model.ts - 56 + 49 src/app/pages/components/extension/extension.model.ts - 72 + 60 + + + src/app/pages/components/extension/extension.model.ts + 76 src/app/shared/components/extension-feedback/extension-feedback.ts @@ -1287,53 +1291,53 @@ extensions src/app/pages/components/extension/extension.model.ts - 60 + 64 src/app/pages/components/extension/extension.model.ts - 68 + 72 themes src/app/pages/components/extension/extension.model.ts - 64 + 68 Data Migration src/app/pages/components/extension/extension.model.ts - 87 + 91 Themes src/app/pages/components/extension/extension.model.ts - 92 + 96 API Security src/app/pages/components/extension/extension.model.ts - 97 + 101 API Testing src/app/pages/components/extension/extension.model.ts - 102 + 106 Other src/app/pages/components/extension/extension.model.ts - 107 + 111 @@ -1793,25 +1797,6 @@ 20 - - - - src/app/pages/workspace/overview/workspace-overview.component.html - 4,6 - - - src/app/pages/workspace/project/api/http/mock/api-mock.component.html - 4,6 - - - src/app/shared/components/schema-form/schema-form.component.ts - 57 - - - src/app/shared/components/schema-form/schema-form.component.ts - 71 - - Invite Member @@ -1855,7 +1840,7 @@ src/app/pages/workspace/project/api/api-tab.service.ts - 46 + 47 @@ -1866,32 +1851,36 @@ src/app/pages/workspace/project/api/api-tab.service.ts - 64 + 32 + + + src/app/pages/workspace/project/api/api-tab.service.ts + 65 New Websocket src/app/pages/workspace/project/api/api-tab.service.ts - 38 + 39 src/app/pages/workspace/project/api/api-tab.service.ts - 71 + 72 New Environment src/app/pages/workspace/project/api/api-tab.service.ts - 54 + 55 New Group src/app/pages/workspace/project/api/api-tab.service.ts - 61 + 62 src/app/pages/workspace/project/api/group/group.component.ts @@ -1902,7 +1891,7 @@ New API src/app/pages/workspace/project/api/api-tab.service.ts - 63 + 64 @@ -2114,11 +2103,25 @@ 21 + + API Group + + src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts + 33 + + + + API Request + + src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts + 34 + + Type src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 39 + 44 src/app/pages/workspace/project/api/http/edit/extra-setting/api-params-extra-setting.component.ts @@ -2133,25 +2136,25 @@ 244 - - This API Request is using from + + This is using from src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 54,56 + 59,61 These parameters hold sensitive data. To keep this data secure while working in a collaborative environment, we recommend using variables. Learn more about variables src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 62,65 + 67,70 Authorization src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 92 + 98 src/app/pages/workspace/project/api/group/group.component.html @@ -2264,28 +2267,28 @@ Delete Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 185 + 187 Deletion Confirmation? src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 198 + 200 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 - 199,201 + 201,203 Save and Sync src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 235 + 237 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2296,7 +2299,7 @@ Confirm src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 235 + 237 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2311,7 +2314,7 @@ Failed to ,Please upgrade extension or try again later src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 242 + 244 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2322,7 +2325,7 @@ successfully src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 250 + 252 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2619,7 +2622,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 209 + 210 @@ -2668,7 +2671,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 201,200 + 202,201 @@ -2691,7 +2694,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 192 + 193 @@ -2706,7 +2709,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 196 + 197 @@ -3122,21 +3125,21 @@ Pre-request Script src/app/pages/workspace/project/api/http/test/api-test.component.html - 143 + 144 After-response Script src/app/pages/workspace/project/api/http/test/api-test.component.html - 156 + 157 Save As File src/app/pages/workspace/project/api/http/test/api-test.component.html - 222 + 223 @@ -3532,11 +3535,11 @@ 22,24 - - Please Enter + + Please enter src/app/shared/components/schema-form/schema-form.component.ts - 44 + 151 diff --git a/src/browser/locale/messages.zh.xlf b/src/browser/locale/messages.zh.xlf index 2350c5e88..780297089 100644 --- a/src/browser/locale/messages.zh.xlf +++ b/src/browser/locale/messages.zh.xlf @@ -17,7 +17,7 @@ 16 发送 - /Users/qinyuanyuan/Downloads/messages.zh.xlf + Download @@ -142,7 +142,7 @@ src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 231 + 233 src/app/pages/workspace/project/api/components/params-import/params-import.component.html @@ -1422,11 +1422,15 @@ src/app/pages/components/extension/extension.model.ts - 56 + 49 src/app/pages/components/extension/extension.model.ts - 72 + 60 + + + src/app/pages/components/extension/extension.model.ts + 76 src/app/shared/components/extension-feedback/extension-feedback.ts @@ -1438,11 +1442,11 @@ extensions src/app/pages/components/extension/extension.model.ts - 60 + 64 src/app/pages/components/extension/extension.model.ts - 68 + 72 插件 @@ -1450,7 +1454,7 @@ themes src/app/pages/components/extension/extension.model.ts - 64 + 68 主题 @@ -1458,7 +1462,7 @@ Data Migration src/app/pages/components/extension/extension.model.ts - 87 + 91 数据迁移 @@ -1466,7 +1470,7 @@ Themes src/app/pages/components/extension/extension.model.ts - 92 + 96 主题 @@ -1474,7 +1478,7 @@ API Security src/app/pages/components/extension/extension.model.ts - 97 + 101 API 安全 @@ -1482,7 +1486,7 @@ API Testing src/app/pages/components/extension/extension.model.ts - 102 + 106 API 测试 @@ -1490,7 +1494,7 @@ Other src/app/pages/components/extension/extension.model.ts - 107 + 111 其他 @@ -1996,28 +2000,6 @@ 新建项目 - - - - - - src/app/pages/workspace/overview/workspace-overview.component.html - 4,6 - - - src/app/pages/workspace/project/api/http/mock/api-mock.component.html - 4,6 - - - src/app/shared/components/schema-form/schema-form.component.ts - 57 - - - src/app/shared/components/schema-form/schema-form.component.ts - 71 - - - Invite Member @@ -2066,7 +2048,7 @@ src/app/pages/workspace/project/api/api-tab.service.ts - 46 + 47 新请求 @@ -2078,7 +2060,11 @@ src/app/pages/workspace/project/api/api-tab.service.ts - 64 + 32 + + + src/app/pages/workspace/project/api/api-tab.service.ts + 65 文档 @@ -2086,11 +2072,11 @@ New Websocket src/app/pages/workspace/project/api/api-tab.service.ts - 38 + 39 src/app/pages/workspace/project/api/api-tab.service.ts - 71 + 72 测试 Websocket @@ -2098,7 +2084,7 @@ New Environment src/app/pages/workspace/project/api/api-tab.service.ts - 54 + 55 新建环境 @@ -2106,7 +2092,7 @@ New Group src/app/pages/workspace/project/api/api-tab.service.ts - 61 + 62 src/app/pages/workspace/project/api/group/group.component.ts @@ -2118,7 +2104,7 @@ New API src/app/pages/workspace/project/api/api-tab.service.ts - 63 + 64 新建 API @@ -2354,11 +2340,27 @@ 从父级继承 + + API Group + + src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts + 33 + + API 分组 + + + API Request + + src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts + 34 + + API 请求 + Type src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 39 + 44 src/app/pages/workspace/project/api/http/edit/extra-setting/api-params-extra-setting.component.ts @@ -2374,19 +2376,19 @@ 类型 - - This API Request is using from + + This is using from src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 54,56 + 59,61 - 此 API 请求正在使用 继承自 + 此 正在使用 继承自 These parameters hold sensitive data. To keep this data secure while working in a collaborative environment, we recommend using variables. Learn more about variables src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 62,65 + 67,70 这些参数包含敏感数据。为了在协作环境中工作时保持此数据安全，我们建议使用全局变量。 了解更多： 全局变量 @@ -2394,7 +2396,7 @@ Authorization src/app/pages/workspace/project/api/components/authorization-extension-form/authorization-extension-form.component.ts - 92 + 98 src/app/pages/workspace/project/api/group/group.component.html @@ -2521,7 +2523,7 @@ Delete Group src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 185 + 187 删除分组 @@ -2529,7 +2531,7 @@ Deletion Confirmation? src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 198 + 200 确认删除？ @@ -2537,7 +2539,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 - 199,201 + 201,203 确认要删除数据 <strong title=""></strong> 吗？删除后不可恢复！ @@ -2545,7 +2547,7 @@ Save and Sync src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 235 + 237 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2557,7 +2559,7 @@ Confirm src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 235 + 237 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2573,7 +2575,7 @@ Failed to ,Please upgrade extension or try again later src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 242 + 244 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2585,7 +2587,7 @@ successfully src/app/pages/workspace/project/api/components/group/tree/api-group-tree.component.ts - 250 + 252 src/app/pages/workspace/project/setting/project-setting.component.ts @@ -2917,7 +2919,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 209 + 210 请求头部 @@ -2969,7 +2971,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 201,200 + 202,201 请求体 @@ -2993,7 +2995,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 192 + 193 返回值 @@ -3009,7 +3011,7 @@ src/app/pages/workspace/project/api/http/test/api-test.component.html - 196 + 197 返回头部 @@ -3477,7 +3479,7 @@ Pre-request Script src/app/pages/workspace/project/api/http/test/api-test.component.html - 143 + 144 前置脚本 @@ -3485,7 +3487,7 @@ After-response Script src/app/pages/workspace/project/api/http/test/api-test.component.html - 156 + 157 后置脚本 @@ -3493,7 +3495,7 @@ Save As File src/app/pages/workspace/project/api/http/test/api-test.component.html - 222 + 223 保存为文件 @@ -3941,13 +3943,13 @@ 找不到您想要的？查看更多... - - Please Enter + + Please enter src/app/shared/components/schema-form/schema-form.component.ts - 44 + 151 - 请输入 + 请输入 Project Owner diff --git a/src/browser/src/app/pages/workspace/overview/workspace-overview.component.html b/src/browser/src/app/pages/workspace/overview/workspace-overview.component.html index 675357d8d..e820592fe 100644 --- a/src/browser/src/app/pages/workspace/overview/workspace-overview.component.html +++ b/src/browser/src/app/pages/workspace/overview/workspace-overview.component.html @@ -1,7 +1,7 @@
- {{ title }} + {{ title }}
- - - - + + +
@@ -130,9 +129,11 @@ export class AuthorizationExtensionFormComponent implements OnChanges { .get() .pipe(takeUntil(this.destroy$)) .subscribe((inArg: Message) => { - if (inArg.type === 'extensionsChange') { - this.initExtensions(); - } + if (inArg.type !== 'extensionsChange') return; + const extension = inArg.data.extension; + if (!extension?.features?.authAPI) return; + this.initExtensions(); + this.updateSchema(this.authType); }); } diff --git a/src/browser/src/app/pages/workspace/project/api/http/mock/api-mock.component.html b/src/browser/src/app/pages/workspace/project/api/http/mock/api-mock.component.html index 8e894adcf..9cc1ead82 100644 --- a/src/browser/src/app/pages/workspace/project/api/http/mock/api-mock.component.html +++ b/src/browser/src/app/pages/workspace/project/api/http/mock/api-mock.component.html @@ -1,6 +1,6 @@
- diff --git a/src/browser/src/app/shared/components/schema-form/schema-form.component.ts b/src/browser/src/app/shared/components/schema-form/schema-form.component.ts index 2d17a71ef..1e27f1121 100644 --- a/src/browser/src/app/shared/components/schema-form/schema-form.component.ts +++ b/src/browser/src/app/shared/components/schema-form/schema-form.component.ts @@ -41,7 +41,7 @@ const compMap = { - +
{{ properties[field]?.description }} @@ -53,8 +53,7 @@ const compMap = { eo-ng-input id="{{ field }}" [disabled]="properties[field]?.disabled" - i18n-placeholder - placeholder="{{ properties[field]?.placeholder ?? 'Please Enter ' + (properties[field]?.label || '') }}" + placeholder="{{ properties[field]?.placeholder ?? placeholderTips + (properties[field]?.label || '') }}" formControlName="{{ field }}" [(ngModel)]="model[field]" /> @@ -67,8 +66,7 @@ const compMap = { eo-ng-input id="{{ field }}" [disabled]="properties[field]?.disabled" - i18n-placeholder - placeholder="{{ properties[field]?.placeholder ?? 'Please Enter ' + (properties[field]?.label || '') }}" + placeholder="{{ properties[field]?.placeholder ?? placeholderTips + (properties[field]?.label || '') }}" formControlName="{{ field }}" [rows]="properties[field].ui.rows ?? 4" [(ngModel)]="model[field]" @@ -150,7 +148,7 @@ export class EoSchemaFormComponent implements OnChanges { properties = {}; compMap = compMap; isInited = true; - + placeholderTips = $localize`Please enter `; constructor(private fb: FormBuilder) { this.validateForm = this.fb.group({}); this.initEmitter();