From 223f7f6e5831c3dd193251203f535f5f63b18171 Mon Sep 17 00:00:00 2001 From: buqiyuan <1743369777@qq.com> Date: Wed, 13 Jul 2022 11:37:45 +0800 Subject: [PATCH 1/2] fix: set eo-editor height be auto --- .../app/eoui/editor/eo-editor/eo-editor.component.scss | 10 ++++++++++ .../src/app/pages/api/test/api-test.component.scss | 2 +- .../components/api-script/api-script.component.html | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/workbench/browser/src/app/eoui/editor/eo-editor/eo-editor.component.scss b/src/workbench/browser/src/app/eoui/editor/eo-editor/eo-editor.component.scss index 14232644..5492278e 100644 --- a/src/workbench/browser/src/app/eoui/editor/eo-editor/eo-editor.component.scss +++ b/src/workbench/browser/src/app/eoui/editor/eo-editor/eo-editor.component.scss @@ -24,3 +24,13 @@ } } } + + ::ng-deep eo-editor { + height: 100%; + & > div { + height: 100%; + } + .ace_editor { + height: 100% !important; + } +} diff --git a/src/workbench/browser/src/app/pages/api/test/api-test.component.scss b/src/workbench/browser/src/app/pages/api/test/api-test.component.scss index a99cca58..e36515bd 100644 --- a/src/workbench/browser/src/app/pages/api/test/api-test.component.scss +++ b/src/workbench/browser/src/app/pages/api/test/api-test.component.scss @@ -22,7 +22,7 @@ eo-api-test-rest { height: 100%; .scroll_container { height: calc(100% - 52px); - overflow-y: auto; + // overflow-y: auto; } } diff --git a/src/workbench/browser/src/app/shared/components/api-script/api-script.component.html b/src/workbench/browser/src/app/shared/components/api-script/api-script.component.html index 0a1e6a03..59772399 100644 --- a/src/workbench/browser/src/app/shared/components/api-script/api-script.component.html +++ b/src/workbench/browser/src/app/shared/components/api-script/api-script.component.html @@ -1,5 +1,5 @@
-
+
Shortcut
From bad544813366a261752f5dada123f15db8b676cc Mon Sep 17 00:00:00 2001 From: buqiyuan <1743369777@qq.com> Date: Wed, 13 Jul 2022 12:13:05 +0800 Subject: [PATCH 2/2] refactor: translate chinese to english --- build/entitlements.mac.plist | 2 + build/notarize.js | 10 +++++ .../shared/components/api-script/constant.ts | 42 +++++++++---------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist index d6b93bc0..88b70edf 100644 --- a/build/entitlements.mac.plist +++ b/build/entitlements.mac.plist @@ -1,3 +1,5 @@ + + diff --git a/build/notarize.js b/build/notarize.js index 60158866..c98fa121 100644 --- a/build/notarize.js +++ b/build/notarize.js @@ -1,3 +1,13 @@ +/** + * Use electron-notarize to notarize app + * + * @description The app should be notarized after it has been signed and before it’s packaged into a dmg. + * Electron-builder has a hook for this called afterSign. You can link that to a javascript file that will be called (and waited for) after sign. + * You add it to your top level “build” configuration + * + * @link https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/ + */ + exports.default = function notarizing(context) { return context; }; diff --git a/src/workbench/browser/src/app/shared/components/api-script/constant.ts b/src/workbench/browser/src/app/shared/components/api-script/constant.ts index bfce31d5..da2c918d 100644 --- a/src/workbench/browser/src/app/shared/components/api-script/constant.ts +++ b/src/workbench/browser/src/app/shared/components/api-script/constant.ts @@ -24,76 +24,76 @@ export type Completion = { caption: string; value: string }; export const TREE_DATA: TreeNode[] = [ { - name: 'HTTP API 请求', + name: $localize`HTTP API request`, children: [ { - name: '获取响应结果', + name: $localize`Get Response Results`, caption: 'eo.http.response.get', value: 'eo.http.response.get();', note: { code: 'eo.http.response.get()', - desc: '获取 HTTP API 的响应结果', + desc: $localize`Get the response result of the HTTP API`, }, }, { - name: '设置响应结果', + name: $localize`Set Response Result`, caption: 'eo.http.response.set', value: 'eo.http.response.set("response_value");', note: { code: 'eo.http.response.set("response_value")', - desc: '设置 HTTP API 的响应结果', - input: [{ key: 'response_value：', value: '响应结果' }], + desc: $localize`Set the response result of the HTTP API`, + input: [{ key: 'response_value：', value: $localize`response result` }], }, }, ], }, { - name: '自定义全局变量', + name: $localize`Custom Global Variable`, children: [ { - name: '设置全局变量', + name: $localize`Set Global Variable`, caption: 'eo.globals.set', value: 'eo.globals.set("param_key","param_value")', note: { code: 'eo.globals.set("param_key","param_value")', - desc: '设置全局变量', + desc: $localize`Set Global Variable`, input: [ - { key: 'param_key', value: '参数名' }, - { key: 'param_value', value: '参数值' }, + { key: 'param_key', value: $localize`parameter name` }, + { key: 'param_value', value: $localize`parameter value` }, ], }, }, { - name: '获取全局变量值', + name: $localize`Get global variable value`, caption: 'eo.globals.get', value: 'eo.globals.get("param_key")', note: { code: 'eo.globals.set("param_key","param_value")', - desc: '设置全局变量', + desc: $localize`Get global variable value`, input: [ - { key: 'param_key', value: '参数名' }, - { key: 'param_value', value: '参数值' }, + { key: 'param_key', value: $localize`parameter name` }, + { key: 'param_value', value: $localize`parameter value` }, ], - output: '全局变量值', + output: $localize`Global Variable Value`, }, }, { - name: '删除全局变量', + name: $localize`Delete Global Variable`, caption: 'eo.globals.unset', value: 'eo.globals.unset("param_key")', note: { code: 'eo.globals.unset("param_key")', - desc: '删除全局变量', - input: [{ key: 'param_key', value: '参数名' }], + desc: $localize`Delete Global Variable`, + input: [{ key: 'param_key', value: $localize`parameter name` }], }, }, { - name: '清空所有全局变量', + name: $localize`Clear All Global Variables`, caption: 'eo.globals.clear', value: 'eo.globals.clear()', note: { code: 'eo.globals.clear()', - desc: '清空所有全局变量', + desc: $localize`Clear All Global Variables`, }, }, ],