This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new aae10a166 [chore] Chinese Notes to English Notes (#1798)
aae10a166 is described below
commit aae10a16637465e458364b08add5048e2e8a75e0
Author: ChunFu Wu <[email protected]>
AuthorDate: Tue Oct 11 10:01:17 2022 +0800
[chore] Chinese Notes to English Notes (#1798)
* [chore] Chinese Notes to English Notes
---
.../build/vite/plugin/styleImport.ts | 6 +--
.../src/adapter/utils/request.ts | 20 ++++----
.../src/api/flink/app/app.ts | 38 ++++++++--------
.../src/api/flink/app/app.type.ts | 2 +-
.../src/api/flink/app/flinkBuild.ts | 2 +-
.../src/api/flink/app/flinkHistory.ts | 4 +-
.../src/api/flink/app/metrics.ts | 2 +-
.../src/api/flink/app/savepoint.ts | 2 +-
.../src/api/flink/config/index.ts | 2 +-
.../src/api/flink/setting/alert.ts | 14 +++---
.../src/api/flink/setting/flinkEnv.ts | 14 +++---
.../src/api/flink/setting/index.ts | 6 +--
.../src/api/flink/setting/types/alert.type.ts | 2 +-
.../src/api/flink/setting/types/flinkEnv.type.ts | 2 +-
.../streampark-console-newui/src/api/sys/member.ts | 20 ++++----
.../streampark-console-newui/src/api/sys/notify.ts | 12 ++---
.../streampark-console-newui/src/api/sys/team.ts | 8 ++--
.../streampark-console-newui/src/api/sys/token.ts | 2 +-
.../streampark-console-newui/src/api/sys/user.ts | 6 +--
.../src/components/CardList/src/CardList.vue | 32 ++++++-------
.../src/components/CardList/src/data.ts | 6 +--
.../CodeEditor/src/codemirror/CodeMirror.vue | 2 +-
.../src/components/Description/src/typing.ts | 2 +-
.../src/components/Excel/src/ImportExcel.vue | 14 +++---
.../src/components/Modal/src/index.less | 3 ++
.../streampark-console-newui/src/main.ts | 9 ----
.../src/views/flink/app/Add.vue | 16 +++----
.../src/views/flink/app/Detail.vue | 6 +--
.../src/views/flink/app/EditFlink.vue | 8 ++--
.../src/views/flink/app/EditStreamPark.vue | 14 +++---
.../src/views/flink/app/View.vue | 20 ++++----
.../flink/app/components/AppDetail/DetailTab.vue | 6 +--
.../flink/app/components/AppDetail/Different.vue | 2 +-
.../app/components/AppDetail/ExecOptionModal.vue | 6 +--
.../flink/app/components/AppView/BuildDrawer.vue | 4 +-
.../components/AppView/StartApplicationModal.vue | 2 +-
.../components/AppView/StopApplicationModal.vue | 2 +-
.../src/views/flink/app/components/Dependency.vue | 2 +-
.../src/views/flink/app/components/Mergely.vue | 14 +++---
.../src/views/flink/app/components/flinkSql.vue | 6 +--
.../src/views/flink/app/data/index.ts | 10 ++--
.../src/views/flink/app/data/option.ts | 53 ++++++++++++++--------
.../src/views/flink/app/hooks/useApp.tsx | 2 +-
.../flink/app/hooks/useCreateAndEditSchema.ts | 12 ++---
.../src/views/flink/app/hooks/useDetail.ts | 6 +--
.../src/views/flink/app/hooks/useEdit.ts | 4 +-
.../src/views/flink/app/hooks/useFlinkRender.tsx | 2 +-
.../src/views/flink/app/hooks/useFlinkSchema.ts | 10 ++--
.../src/views/flink/app/hooks/useLog.ts | 6 +--
.../src/views/flink/app/utils/index.ts | 20 ++++----
.../src/views/flink/notebook/Submit.vue | 12 ++---
.../src/views/flink/project/Add.vue | 2 +-
.../src/views/flink/project/Edit.vue | 2 +-
.../src/views/flink/project/View.vue | 2 +-
.../src/views/flink/project/useProject.ts | 2 +-
.../src/views/flink/setting/EditCluster.vue | 2 +-
.../views/flink/setting/components/AlertModal.vue | 8 ++--
.../flink/setting/components/AlertSetting.vue | 18 ++++----
.../setting/components/FlinkClusterSetting.vue | 18 ++++----
.../flink/setting/components/FlinkEnvDraw.vue | 10 ++--
.../flink/setting/components/FlinkEnvModal.vue | 12 ++---
.../flink/setting/components/FlinkEnvSetting.vue | 8 ++--
.../views/flink/setting/components/SettingList.vue | 4 +-
.../flink/setting/components/SystemSetting.vue | 4 +-
.../src/views/sys/error-log/index.vue | 2 +-
.../src/views/sys/exception/Exception.vue | 2 +-
.../src/views/sys/lock/useNow.ts | 4 +-
.../src/views/sys/login/SessionTimeoutLogin.vue | 6 +--
.../src/views/system/account/AccountDetail.vue | 26 +++++------
.../src/views/system/account/AccountModal.vue | 2 +-
.../src/views/system/account/DeptTree.vue | 2 +-
.../src/views/system/account/account.data.ts | 39 ++++++++--------
.../src/views/system/account/index.vue | 14 +++---
.../src/views/system/dept/DeptModal.vue | 2 +-
.../src/views/system/dept/dept.data.ts | 34 +++++++-------
.../src/views/system/dept/index.vue | 6 +--
.../src/views/system/member/MemberDrawer.vue | 2 +-
.../src/views/system/menu/Menu.vue | 2 +-
.../src/views/system/menu/menu.data.ts | 16 +++----
.../src/views/system/password/index.vue | 9 ++--
.../src/views/system/password/pwd.data.ts | 14 +++---
.../src/views/system/role/RoleDrawer.vue | 4 +-
.../src/views/system/team/TeamDrawer.vue | 2 +-
.../src/views/system/token/Token.vue | 2 +-
.../streampark-console-newui/tests/server/index.ts | 2 +-
.../streampark-spark-test/assembly.xml | 2 +-
86 files changed, 389 insertions(+), 374 deletions(-)
diff --git
a/streampark-console/streampark-console-newui/build/vite/plugin/styleImport.ts
b/streampark-console/streampark-console-newui/build/vite/plugin/styleImport.ts
index 10989dbb1..34b235f5c 100644
---
a/streampark-console/streampark-console-newui/build/vite/plugin/styleImport.ts
+++
b/streampark-console/streampark-console-newui/build/vite/plugin/styleImport.ts
@@ -30,7 +30,7 @@ export function configStyleImportPlugin(_isBuild: boolean) {
libraryName: 'ant-design-vue',
esModule: true,
resolveStyle: (name) => {
- // 这里是无需额外引入样式文件的“子组件”列表
+ // Here is a list of "subcomponents" that do not require additional
style files
const ignoreList = [
'anchor-link',
'sub-menu',
@@ -62,8 +62,8 @@ export function configStyleImportPlugin(_isBuild: boolean) {
'skeleton-image',
'skeleton-button',
];
- // 这里是需要额外引入样式的子组件列表
- // 单独引入子组件时需引入组件样式，否则会在打包后导致子组件样式丢失
+ // Here is a list of subcomponents that require additional styles
+ // When importing sub-components separately, you need to import
component styles, otherwise the styles of sub-components will be lost after
packaging
const replaceList = {
'typography-text': 'typography',
'typography-title': 'typography',
diff --git
a/streampark-console/streampark-console-newui/src/adapter/utils/request.ts
b/streampark-console/streampark-console-newui/src/adapter/utils/request.ts
index 086a3b7c5..47977346b 100644
--- a/streampark-console/streampark-console-newui/src/adapter/utils/request.ts
+++ b/streampark-console/streampark-console-newui/src/adapter/utils/request.ts
@@ -29,10 +29,10 @@ import { SignOut } from '../store/modules/user';
const http = axios.create({
baseURL: baseUrl(),
withCredentials: false,
- timeout: 1000 * 10, // 请求超时时间
+ timeout: 1000 * 10, // request timeout
responseType: 'json',
validateStatus(status) {
- // 200 外的状态码都认定为失败
+ // Status codes other than 200 are considered failures
return status === 200;
},
});
@@ -42,7 +42,7 @@ http.interceptors.request.use(
(config) => {
const expire = store.getters.expire;
const now = dayjs().format('YYYY-MM-DD HH:mm:ss');
- // 让token早10秒种过期，提升“请重新登录”弹窗体验
+ // Let the token expire 10 seconds earlier to improve the "Please log in
again" pop-up experience
if (now > expire) {
Modal.error({
title: 'Sign in expired',
@@ -69,7 +69,7 @@ http.interceptors.request.use(
}
config.transformRequest = [
function (data) {
- // 在请求之前对data传参进行格式转换
+ // Format the data parameter before the request
if (config.method === 'get' || config.method === 'post') {
if (data.sortField && data.sortOrder) {
data.sortOrder = data.sortOrder === 'descend' ? 'desc' : 'asc';
@@ -113,7 +113,7 @@ http.interceptors.response.use(
break;
case 403:
case 401:
- //避免在某些页面有密集的ajax请求数据时反复的弹窗
+ // Avoid repeated pop-ups when some pages have dense ajax request
data
if (!storage.get(INVALID, false)) {
storage.set(INVALID, true);
notification.warn({
@@ -178,14 +178,14 @@ export default {
return http
.post(url, params, {
responseType: 'blob',
- timeout: blobTimeout, // 上传文件超时10分钟
+ timeout: blobTimeout, // Uploading files timed out for 10 minutes
})
.then((resp) => {
respBlob(resp, filename);
})
.catch((r) => {
console.error(r);
- message.error('下载失败');
+ message.error('download failed');
});
},
upload(url, params) {
@@ -193,7 +193,7 @@ export default {
headers: {
'Content-Type': 'multipart/form-data',
},
- timeout: blobTimeout, // 上传文件超时10分钟
+ timeout: blobTimeout, // Uploading files timed out for 10 minutes
});
},
export(url, params = {}, blobCallback, msg) {
@@ -201,7 +201,7 @@ export default {
blobCallback = respBlob;
}
msg = msg == null ? {} : msg;
- message.loading(msg.loading || '导入文件中...');
+ message.loading(msg.loading || 'import file...');
return http
.post(url, params, {
responseType: 'blob',
@@ -211,7 +211,7 @@ export default {
})
.catch((r) => {
console.error(r);
- message.error(msg.error || '导出文件失败!');
+ message.error(msg.error || 'Failed to export file!');
});
},
};
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/app/app.ts
b/streampark-console/streampark-console-newui/src/api/flink/app/app.ts
index 435956eda..d392ca230 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/app/app.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/app/app.ts
@@ -53,7 +53,7 @@ enum APP_API {
}
/**
- * 读取配置文件
+ * read configuration file
* @returns Promise<any>
*/
export function fetchAppConf(params?: { config: any }) {
@@ -64,7 +64,7 @@ export function fetchAppConf(params?: { config: any }) {
}
/**
- * 仪表盘数据
+ * Dashboard data
* @returns Promise<DashboardResponse>
*/
export function fetchDashboard() {
@@ -75,7 +75,7 @@ export function fetchDashboard() {
}
/**
- * 获取 app 列表数据
+ * Get app list data
* @returns Promise<AppListResponse>
*/
export function fetchAppRecord(params) {
@@ -88,7 +88,7 @@ export function fetchAppRecord(params) {
});
}
/**
- * 移出 app
+ * remove the app
* @returns Promise<boolean>
*/
export function fetchAppRemove(id: string) {
@@ -101,7 +101,7 @@ export function fetchAppRemove(id: string) {
});
}
/**
- * 获取 yarn 地址
+ * get yarn address
* @returns Promise<any>
*/
export function fetchYarn() {
@@ -114,7 +114,7 @@ export function fetchYarn() {
}
/**
- * 获取项目
+ * get item
* @returns Promise<any>
*/
export function fetchCheckName(params: { id?: string; jobName: string }) {
@@ -137,9 +137,9 @@ export function fetchMain(params) {
});
}
/**
- * 上传
+ * upload
* @param params
- * @returns {String} 文件路径
+ * @returns {String} file path
*/
export function fetchUpload(params) {
return defHttp.post<string>({
@@ -148,14 +148,14 @@ export function fetchUpload(params) {
headers: {
'Content-Type': ContentTypeEnum.FORM_DATA,
},
- timeout: 1000 * 60 * 10, // 上传文件超时10分钟
+ timeout: 1000 * 60 * 10, // Uploading files timed out for 10 minutes
});
}
/**
- * 创建
- * @param params 创建参数
- * @returns {Promise<AxiosResponse<Result>>} data 创建是否成功 message: 错误提示
+ * create
+ * @param params Create parameters
+ * @returns {Promise<AxiosResponse<Result>>} Whether the data creation was
successful message: error message
*/
export function fetchCreate(params) {
return defHttp.post<AxiosResponse<Result>>(
@@ -172,9 +172,9 @@ export function fetchCreate(params) {
);
}
/**
- * 更新
- * @param params 更新参数
- * @returns {Promise<AxiosResponse<Result>>} data 更新是否成功 message: 错误提示
+ * update
+ * @param params update parameters
+ * @returns {Promise<AxiosResponse<Result>>} Whether the data update is
successful message: error message
*/
export function fetchUpdate(params) {
return defHttp.post<AxiosResponse<Result>>(
@@ -192,9 +192,9 @@ export function fetchUpdate(params) {
}
/**
- * 通过id 获取application 信息
- * @param params 创建参数
- * @returns {Promise<AxiosResponse<Result>>} data 创建是否成功 message: 错误提示
+ * Get application information by id
+ * @param params get parameters
+ * @returns {Promise<AxiosResponse<Result>>} Whether the data get is
successful message: error message
*/
export function fetchGet(params: { id: string }) {
return defHttp.post<AppListRecord>({
@@ -225,7 +225,7 @@ export function fetchOptionLog(params) {
});
}
/**
- * 强制停止
+ * forced stop
* @param params id:string
* @returns
*/
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
b/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
index 866b51f5d..afb482711 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// 仪表盘
+// dashboard
export interface DashboardResponse {
totalTM: number;
task: Task;
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/app/flinkBuild.ts
b/streampark-console/streampark-console-newui/src/api/flink/app/flinkBuild.ts
index f8fc8128d..43751b60c 100644
---
a/streampark-console/streampark-console-newui/src/api/flink/app/flinkBuild.ts
+++
b/streampark-console/streampark-console-newui/src/api/flink/app/flinkBuild.ts
@@ -38,7 +38,7 @@ export function fetchBuild(params) {
);
}
/**
- * 获取构建详情
+ * Get build details
* @param params appId:string
* @returns
*/
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/app/flinkHistory.ts
b/streampark-console/streampark-console-newui/src/api/flink/app/flinkHistory.ts
index 46457e6c4..00b0f2d00 100644
---
a/streampark-console/streampark-console-newui/src/api/flink/app/flinkHistory.ts
+++
b/streampark-console/streampark-console-newui/src/api/flink/app/flinkHistory.ts
@@ -28,7 +28,7 @@ enum HISTORY_API {
}
/**
- * 获取k8s
+ * get k8s
* @returns Promise<any>
*/
export function fetchK8sNamespaces() {
@@ -41,7 +41,7 @@ export function fetchK8sNamespaces() {
}
/**
- * 上传jar
+ * upload jar
* @returns Promise<DashboardResponse>
*/
export function fetchUploadJars() {
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/app/metrics.ts
b/streampark-console/streampark-console-newui/src/api/flink/app/metrics.ts
index 83bd4c576..e442f8fe7 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/app/metrics.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/app/metrics.ts
@@ -24,7 +24,7 @@ enum Metrics_API {
DEL_NOTICE = '/metrics/delnotice',
}
/**
- * 导出
+ * export
* @param {String} appId application id
* @param {Number} width The width of the screen
* @returns {Promise<AxiosResponse<Blob>>} Promise<AxiosResponse<Blob>>
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/app/savepoint.ts
b/streampark-console/streampark-console-newui/src/api/flink/app/savepoint.ts
index 47924d289..e8bab5f99 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/app/savepoint.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/app/savepoint.ts
@@ -42,7 +42,7 @@ export function fetchSavePonitHistory(params) {
});
}
/**
- * 删除
+ * delete
* @param params id
* @returns
*/
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/config/index.ts
b/streampark-console/streampark-console-newui/src/api/flink/config/index.ts
index f79afe743..f1124ab70 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/config/index.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/config/index.ts
@@ -62,7 +62,7 @@ export function fetchListVer(params) {
});
}
/**
- * 删除配置
+ * delete configuration
* @param {String}
* @returns {Promise<Boolean>}
*/
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/setting/alert.ts
b/streampark-console/streampark-console-newui/src/api/flink/setting/alert.ts
index 869fc9d0c..2510b3fda 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/setting/alert.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/setting/alert.ts
@@ -29,7 +29,7 @@ enum ALERT_APi {
SEND = '/flink/alert/send',
}
/**
- * 获取告警设置
+ * Get alert settings
* @returns Promise<AlertSetting[]>
*/
export function fetchAlertSetting() {
@@ -38,7 +38,7 @@ export function fetchAlertSetting() {
});
}
/**
- * 测试告警设置
+ * Test alert settings
* @returns Promise<boolean>
*/
export function fetchSendAlert(params: { id: string }) {
@@ -56,7 +56,7 @@ export function fetchSendAlert(params: { id: string }) {
);
}
/**
- * 删除告警设置
+ * Delete alert settings
* @returns Promise<MavenSetting[]>
*/
export function fetchAlertDelete(params: { id: string }) {
@@ -69,7 +69,7 @@ export function fetchAlertDelete(params: { id: string }) {
});
}
/**
- * 告警名称测试
+ * Alarm name test
* @returns Promise<boolean>
*/
export function fetchExistsAlert(params: { alertName: string; isJsonType?:
boolean }) {
@@ -80,7 +80,7 @@ export function fetchExistsAlert(params: { alertName: string;
isJsonType?: boole
}
/**
- * 添加告警设置
+ * Add alert settings
* @param {AlertCreate} params
* @returns Promise<boolean>
*/
@@ -91,7 +91,7 @@ export function fetchAlertAdd(params: AlertCreate) {
});
}
/**
- * 更新告警设置
+ * Update alert settings
* @param {AlertCreate} params
* @returns Promise<boolean>
*/
@@ -103,7 +103,7 @@ export function fetchAlertUpdate(params: AlertCreate) {
}
/**
- * 更新系统设置
+ * Update system settings
* @param {String} settingKey key
* @param {Boolean} settingValue value
* @returns Promise<boolean>
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/setting/flinkEnv.ts
b/streampark-console/streampark-console-newui/src/api/flink/setting/flinkEnv.ts
index fdf6d41cb..ee07469e5 100644
---
a/streampark-console/streampark-console-newui/src/api/flink/setting/flinkEnv.ts
+++
b/streampark-console/streampark-console-newui/src/api/flink/setting/flinkEnv.ts
@@ -30,7 +30,7 @@ enum FLINK_API {
DEFAULT = '/flink/env/default',
}
/**
- * flink 环境数据
+ * flink environment data
* @returns Promise<FlinkEnv[]>
*/
export function fetchFlinkEnv() {
@@ -40,7 +40,7 @@ export function fetchFlinkEnv() {
}
/**
- * 设置默认
+ * Set the default
* @param {String} id
* @returns Promise<Boolean>
*/
@@ -54,7 +54,7 @@ export function fetchDefaultSet(id: string) {
});
}
/**
- * 获取flink 详细信息
+ * Get flink details
* @param {String} id
* @returns Promise<Boolean>
*/
@@ -69,7 +69,7 @@ export function fetchFlinkInfo(id: string) {
}
/**
- * 检测环境是否存在
+ * Check if the environment exists
* @param {String} id
* @returns Promise<Boolean>
*/
@@ -87,7 +87,7 @@ export function fetchExistsEnv(params: {
});
}
/**
- * 创建 flink
+ * Create flink
* @param {FlinkCreate} params
* @returns Promise<Boolean>
*/
@@ -107,7 +107,7 @@ export function fetchFlinkCreate(params: FlinkCreate) {
}
/**
- * 更新 flink
+ * update flink
* @param {FlinkCreate} params
* @returns Promise<Boolean>
*/
@@ -127,7 +127,7 @@ export function fetchFlinkUpdate(params: FlinkCreate) {
}
/**
- * 配置同步
+ * Configure synchronization
* @param {String} id
* @returns Promise<Boolean>
*/
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/setting/index.ts
b/streampark-console/streampark-console-newui/src/api/flink/setting/index.ts
index c2a4179d3..fe8999e3c 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/setting/index.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/setting/index.ts
@@ -27,7 +27,7 @@ enum SETTING_APi {
UPDATE = '/flink/setting/update',
}
/**
- * 获取系统设置
+ * Get system settings
* @returns Promise<MavenSetting[]>
*/
export function fetchSystemSetting() {
@@ -37,7 +37,7 @@ export function fetchSystemSetting() {
}
/**
- * 更新系统设置
+ * Update system settings
* @param {String} settingKey key
* @param {Boolean} settingValue value
* @returns Promise<boolean>
@@ -52,7 +52,7 @@ export function fetchSystemSettingUpdate(params: {
settingKey: string; settingVa
});
}
/**
- * 检查配置
+ * Check configuration
* @returns Promise<boolean>
*/
export function fetchCheckHadoop() {
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/setting/types/alert.type.ts
b/streampark-console/streampark-console-newui/src/api/flink/setting/types/alert.type.ts
index bcbfc5c1c..5cc232c57 100644
---
a/streampark-console/streampark-console-newui/src/api/flink/setting/types/alert.type.ts
+++
b/streampark-console/streampark-console-newui/src/api/flink/setting/types/alert.type.ts
@@ -28,7 +28,7 @@ export interface AlertSetting {
modifyTime: string;
}
-/* 创建告警 */
+// Create an alert
export interface AlertCreate {
id?: any;
alertName: string;
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkEnv.type.ts
b/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkEnv.type.ts
index fe93a7690..7c244008b 100644
---
a/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkEnv.type.ts
+++
b/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkEnv.type.ts
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* flink home 数据 */
+// flink home data
export interface FlinkEnv {
id: string;
flinkName: string;
diff --git a/streampark-console/streampark-console-newui/src/api/sys/member.ts
b/streampark-console/streampark-console-newui/src/api/sys/member.ts
index b2cb3511a..e5b762350 100644
--- a/streampark-console/streampark-console-newui/src/api/sys/member.ts
+++ b/streampark-console/streampark-console-newui/src/api/sys/member.ts
@@ -39,7 +39,7 @@ enum MEMBER_API {
DELETE = '/member/delete',
}
/**
- * 获取member 列表
+ * get member list
* @param params
* @returns
*/
@@ -54,10 +54,10 @@ export function fetchMemberList(params) {
}
/**
- * 添加member
- * @param {String} teamId 组织id
- * @param {String} userName 用户名
- * @param {Number} roleId 角色ID
+ * add member
+ * @param {String} teamId organization id
+ * @param {String} userName username
+ * @param {Number} roleId role id
* @returns Promise<boolean>
*/
export function fetchAddMember(params: AddMemberParams) {
@@ -70,7 +70,7 @@ export function fetchAddMember(params: AddMemberParams) {
});
}
/**
- * 更新member
+ * update member
* @param params
* @returns
*/
@@ -84,7 +84,7 @@ export function fetchUpdateMember(params) {
});
}
/**
- * 查找用户team
+ * Find user team
* @param {Number|String} userId
* @returns Promise<Array<{ id: string; teamName: string }>>
*/
@@ -98,8 +98,8 @@ export function fetchUserTeam(params: { userId: number |
string }) {
});
}
/**
- * 名称检查
- * @param {String} username 名称
+ * name check
+ * @param {String} username name
* @returns Promise<boolean>
*/
export function fetchCheckUserName(params: { username: string }) {
@@ -113,7 +113,7 @@ export function fetchCheckUserName(params: { username:
string }) {
}
/**
- * 删除
+ * delete
* @param {String} id memeber Id
* @returns Promise<boolean>
*/
diff --git a/streampark-console/streampark-console-newui/src/api/sys/notify.ts
b/streampark-console/streampark-console-newui/src/api/sys/notify.ts
index 776f5a571..127fdf4ff 100644
--- a/streampark-console/streampark-console-newui/src/api/sys/notify.ts
+++ b/streampark-console/streampark-console-newui/src/api/sys/notify.ts
@@ -23,10 +23,10 @@ enum NOTIFY_API {
DEL = '/metrics/delnotice',
}
/**
- * 获取通知列表
- * @param {number} type 通知类型 1:异常告警 2:通知消息,
- * @param {number} pageNum 页码
- * @param {number} pageSize 页大小
+ * Get notification list
+ * @param {number} type Notification Type 1: Abnormal Alarm 2: Notification
Message,
+ * @param {number} pageNum page number
+ * @param {number} pageSize page size
* @returns Promise<NoticyList>
*/
export const fetchNotify = (params: { type: number; pageNum: number; pageSize:
number }) => {
@@ -40,8 +40,8 @@ export const fetchNotify = (params: { type: number; pageNum:
number; pageSize: n
};
/**
- * 删除通知
- * @param {number} id 通知id,
+ * delete notification
+ * @param {number} id notification id,
* @returns Promise<boolean>
*/
export const fetchNotifyDelete = (id: string) => {
diff --git a/streampark-console/streampark-console-newui/src/api/sys/team.ts
b/streampark-console/streampark-console-newui/src/api/sys/team.ts
index 159e2d724..5cc48f9ed 100644
--- a/streampark-console/streampark-console-newui/src/api/sys/team.ts
+++ b/streampark-console/streampark-console-newui/src/api/sys/team.ts
@@ -42,7 +42,7 @@ export function getTeamList(params) {
});
}
/**
- * 创建组织
+ * Create an organization
* @param {Recordable} teamParams
* @returns Promise<Boolean>
*/
@@ -57,7 +57,7 @@ export function fetchTeamCreate(params) {
}
/**
- * 更新组织
+ * update organization
* @param {Recordable} teamParams
* @returns Promise<Boolean>
*/
@@ -71,8 +71,8 @@ export function fetchTeamUpdate(params: Recordable) {
});
}
/**
- * 组织删除
- * @param {String} id 组织id
+ * delete organization
+ * @param {String} id organization id
* @returns Promise<AxiosResponse>
*/
export function deleteTeam(params: { id: string }) {
diff --git a/streampark-console/streampark-console-newui/src/api/sys/token.ts
b/streampark-console/streampark-console-newui/src/api/sys/token.ts
index 2b510afd5..fd379fa1d 100644
--- a/streampark-console/streampark-console-newui/src/api/sys/token.ts
+++ b/streampark-console/streampark-console-newui/src/api/sys/token.ts
@@ -66,7 +66,7 @@ export function deleteToken(data) {
}
/**
- * 检查token
+ * check token
* @param data
* @returns {Promise<number>}
*/
diff --git a/streampark-console/streampark-console-newui/src/api/sys/user.ts
b/streampark-console/streampark-console-newui/src/api/sys/user.ts
index 9c326ff48..03c422f6f 100644
--- a/streampark-console/streampark-console-newui/src/api/sys/user.ts
+++ b/streampark-console/streampark-console-newui/src/api/sys/user.ts
@@ -154,9 +154,9 @@ export function fetchUserTypes() {
});
}
/**
- * 用户修改密码
- * @param{String} username 用户名
- * @param{String} password 密码
+ * User change password
+ * @param{String} username username
+ * @param{String} password password
*/
export function fetchUserPasswordUpdate(params: { username: string; password:
string }) {
return defHttp.put<boolean>({
diff --git
a/streampark-console/streampark-console-newui/src/components/CardList/src/CardList.vue
b/streampark-console/streampark-console-newui/src/components/CardList/src/CardList.vue
index 89dde2fd6..2d926b064 100644
---
a/streampark-console/streampark-console-newui/src/components/CardList/src/CardList.vue
+++
b/streampark-console/streampark-console-newui/src/components/CardList/src/CardList.vue
@@ -30,7 +30,7 @@
><slot name="header"></slot>
<Tooltip>
<template #title>
- <div class="w-50">每行显示数量</div
+ <div class="w-50">Display quantity per line</div
><Slider
id="slider"
v-bind="sliderProp"
@@ -40,7 +40,7 @@
<Button><TableOutlined /></Button>
</Tooltip>
<Tooltip @click="fetch">
- <template #title>刷新</template>
+ <template #title>refresh</template>
<Button><RedoOutlined /></Button>
</Tooltip>
</div>
@@ -61,10 +61,10 @@
:trigger="['hover']"
:dropMenuList="[
{
- text: '删除',
+ text: 'delete',
event: '1',
popConfirm: {
- title: '是否确认删除',
+ title: 'Whether to confirm the deletion',
confirm: handleDelete.bind(null, item.id),
},
},
@@ -109,27 +109,27 @@
const ListItem = List.Item;
const CardMeta = Card.Meta;
const TypographyText = Typography.Text;
- // 获取slider属性
+ // Get slider property
const sliderProp = computed(() => useSlider(4));
- // 组件接收参数
+ // Component receives parameters
const props = defineProps({
- // 请求API的参数
+ // Request API parameters
params: propTypes.object.def({}),
//api
api: propTypes.func,
});
- //暴露内部方法
+ // expose internal methods
const emit = defineEmits(['getMethod', 'delete']);
- //数据
+ // data
const data = ref([]);
- // 切换每行个数
- // cover图片自适应高度
- //修改pageSize并重新请求数据
+ // Switch the number of lines per line
+ // cover image adaptive height
+ // Modify pageSize and re-request data
const height = computed(() => {
return `h-${120 - grid.value * 6}`;
});
- //表单
+ // form
const [registerForm, { validate }] = useForm({
schemas: [{ field: 'type', component: 'Input', label: '类型' }],
labelWidth: 80,
@@ -138,7 +138,7 @@
autoSubmitOnEnter: true,
submitFunc: handleSubmit,
});
- //表单提交
+ // form submit
async function handleSubmit() {
const data = await validate();
await fetch(data);
@@ -148,7 +148,7 @@
fetch();
}
- // 自动请求并暴露内部方法
+ // Automatically request and expose internal methods
onMounted(() => {
fetch();
emit('getMethod', fetch);
@@ -162,7 +162,7 @@
total.value = res.total;
}
}
- //分页相关
+ // Pagination related
const page = ref(1);
const pageSize = ref(36);
const total = ref(0);
diff --git
a/streampark-console/streampark-console-newui/src/components/CardList/src/data.ts
b/streampark-console/streampark-console-newui/src/components/CardList/src/data.ts
index c6e2980c3..d47498e06 100644
---
a/streampark-console/streampark-console-newui/src/components/CardList/src/data.ts
+++
b/streampark-console/streampark-console-newui/src/components/CardList/src/data.ts
@@ -15,11 +15,11 @@
* limitations under the License.
*/
import { ref } from 'vue';
-// 每行个数
+// number of lines
export const grid = ref(12);
-// slider属性
+// slider property
export const useSlider = (min = 6, max = 12) => {
- // 每行显示个数滑动条
+ // Display count sliders per line
const getMarks = () => {
const l = {};
for (let i = min; i < max + 1; i++) {
diff --git
a/streampark-console/streampark-console-newui/src/components/CodeEditor/src/codemirror/CodeMirror.vue
b/streampark-console/streampark-console-newui/src/components/CodeEditor/src/codemirror/CodeMirror.vue
index 4c2f7ae99..fcc0649b5 100644
---
a/streampark-console/streampark-console-newui/src/components/CodeEditor/src/codemirror/CodeMirror.vue
+++
b/streampark-console/streampark-console-newui/src/components/CodeEditor/src/codemirror/CodeMirror.vue
@@ -39,7 +39,7 @@
type: String as PropType<MODE>,
default: MODE.JSON,
validator(value: any) {
- // 这个值必须匹配下列字符串中的一个
+ // This value must match one of the following strings
return Object.values(MODE).includes(value);
},
},
diff --git
a/streampark-console/streampark-console-newui/src/components/Description/src/typing.ts
b/streampark-console/streampark-console-newui/src/components/Description/src/typing.ts
index f082d3c15..b7d3d7793 100644
---
a/streampark-console/streampark-console-newui/src/components/Description/src/typing.ts
+++
b/streampark-console/streampark-console-newui/src/components/Description/src/typing.ts
@@ -43,7 +43,7 @@ export interface DescriptionProps extends DescriptionsProps {
*/
schema: DescItem[];
/**
- * 数据
+ * data
* @type object
*/
data: Recordable;
diff --git
a/streampark-console/streampark-console-newui/src/components/Excel/src/ImportExcel.vue
b/streampark-console/streampark-console-newui/src/components/Excel/src/ImportExcel.vue
index 6420ba587..503eb88ec 100644
---
a/streampark-console/streampark-console-newui/src/components/Excel/src/ImportExcel.vue
+++
b/streampark-console/streampark-console-newui/src/components/Excel/src/ImportExcel.vue
@@ -37,11 +37,11 @@
export default defineComponent({
name: 'ImportExcel',
props: {
- // 日期时间格式。如果不提供或者提供空值，将返回原始Date对象
+ // Datetime format. If not provided or a null value is provided, the
original Date object will be returned
dateFormat: {
type: String,
},
- // 时区调整。实验性功能，仅为了解决读取日期时间值有偏差的问题。目前仅提供了+08:00时区的偏差修正值
+ // Time zone adjustment. Experimental feature, only to solve the problem
of reading datetime values skewed. Currently only offset corrections for the
+08:00 time zone are available
// https://github.com/SheetJS/sheetjs/issues/1470#issuecomment-501108554
timeZone: {
type: Number,
@@ -54,7 +54,7 @@
const loadingRef = ref<Boolean>(false);
/**
- * @description: 第一行作为头部
+ * @description: first line as header
*/
function getHeaderRow(sheet: XLSX.WorkSheet) {
if (!sheet || !sheet['!ref']) return [];
@@ -76,7 +76,7 @@
}
/**
- * @description: 获得excel数据
+ * @description: get excel data
*/
function getExcelData(workbook: XLSX.WorkBook) {
const excelData: ExcelData[] = [];
@@ -114,7 +114,7 @@
}
/**
- * @description: 读取excel数据
+ * @description: read excel data
*/
function readerData(rawFile: File) {
loadingRef.value = true;
@@ -150,7 +150,7 @@
}
/**
- * @description: 触发选择文件管理器
+ * @description: Trigger select file manager
*/
function handleInputClick(e: Event) {
const files = e && (e.target as HTMLInputElement).files;
@@ -160,7 +160,7 @@
}
/**
- * @description: 点击上传按钮
+ * @description: Click the upload button
*/
function handleUpload() {
const inputRefDom = unref(inputRef);
diff --git
a/streampark-console/streampark-console-newui/src/components/Modal/src/index.less
b/streampark-console/streampark-console-newui/src/components/Modal/src/index.less
index 1a3f3f926..cc3e2f5c4 100644
---
a/streampark-console/streampark-console-newui/src/components/Modal/src/index.less
+++
b/streampark-console/streampark-console-newui/src/components/Modal/src/index.less
@@ -126,16 +126,19 @@
.ant-modal-confirm .ant-modal-body {
padding: 24px !important;
}
+
@media screen and (max-height: 600px) {
.ant-modal {
top: 60px;
}
}
+
@media screen and (max-height: 540px) {
.ant-modal {
top: 30px;
}
}
+
@media screen and (max-height: 480px) {
.ant-modal {
top: 10px;
diff --git a/streampark-console/streampark-console-newui/src/main.ts
b/streampark-console/streampark-console-newui/src/main.ts
index 6ed8a01ae..d436add11 100644
--- a/streampark-console/streampark-console-newui/src/main.ts
+++ b/streampark-console/streampark-console-newui/src/main.ts
@@ -38,37 +38,28 @@ async function bootstrap() {
setupAdapter(app);
// Configure store
- // 配置 store
setupStore(app);
// Initialize internal system configuration
- // 初始化内部系统配置
initAppConfigStore();
// Register global components
- // 注册全局组件
registerGlobComp(app);
// Multilingual configuration
- // 多语言配置
// Asynchronous case: language files may be obtained from the server side
- // 异步案例：语言文件可能从服务器端获取
await setupI18n(app);
// Configure routing
- // 配置路由
setupRouter(app);
// router-guard
- // 路由守卫
setupRouterGuard(router);
// Register global directive
- // 注册全局指令
setupGlobDirectives(app);
// Configure global error handling
- // 配置全局错误处理
setupErrorHandle(app);
// https://next.router.vuejs.org/api/#isready
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/Add.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/Add.vue
index 0be38a4f4..4ac6b3a09 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/Add.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/Add.vue
@@ -77,7 +77,7 @@
const [registerConfDrawer, { openDrawer: openConfDrawer }] = useDrawer();
- /* 初始化表单 */
+ /* Initialize the form */
async function handleInitForm() {
const defaultValue = {
resolveOrder: 0,
@@ -95,7 +95,7 @@
setFieldsValue(defaultValue);
}
- /* 打开sqlConf drawer */
+ /* Open the sqlConf drawer */
async function handleSQLConf(checked: boolean, model: Recordable) {
if (checked) {
if (model.configOverride != null) {
@@ -114,7 +114,7 @@
}
}
- /* 自定义job 上传 */
+ /* Custom job upload */
async function handleCustomJobRequest(data) {
const formData = new FormData();
formData.append('file', data.file);
@@ -158,7 +158,7 @@
}
}
- /* custom模式 */
+ /* custom mode */
async function handleSubmitCustomJob(values) {
handleCluster(values);
const params = {
@@ -205,9 +205,9 @@
}
}
}
- /* flink sql 模式 */
+ /* flink sql mode */
function handleSubmitSQL(values) {
- //触发一次pom确认操作.
+ // Trigger a pom confirmation operation.
unref(dependencyRef)?.handleApplyPom();
// common params...
const dependency: { pom?: string; jar?: string } = {};
@@ -244,7 +244,7 @@
handleSubmitParams(params, values, k8sTemplate);
handleCreateApp(params);
}
- /* 提交创建 */
+ /* Submit to create */
function handleAppCreate(formValue: Recordable) {
try {
submitLoading.value = true;
@@ -265,7 +265,7 @@
submitLoading.value = false;
}
}
- /* 发送创建请求 */
+ /* send create request */
async function handleCreateApp(params: Recordable) {
const param = {};
for (const k in params) {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/Detail.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/Detail.vue
index ff6d6b602..8f14ebb7c 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/Detail.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/Detail.vue
@@ -142,7 +142,7 @@
const res = await fetchGet({
id: route.query.appId as string,
});
- // 首次获取数据
+ // Get data for the first time
if (Object.keys(app).length == 0) {
if ([2, 3, 4].includes(res.executionMode)) {
handleYarn();
@@ -170,7 +170,7 @@
if (optionList.records.length > 0) detailTabs.showOptionLog = true;
}
- /* 获取yarn 数据 */
+ /* Get yarn data */
async function handleYarn() {
const res = await fetchYarn();
yarn.value = res;
@@ -195,7 +195,7 @@
}
}
- /* 文档页 */
+ /* Documentation page */
function handleDocPage() {
const res = window.origin.split(':')[1] + ':10000/doc.html';
window.open(res);
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
index df965547a..3a0067e07 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
@@ -63,7 +63,7 @@
showActionButtonGroup: false,
});
- /* 表单重置 */
+ /* Form reset */
function handleReset(executionMode?: string) {
nextTick(async () => {
const resetParams = await handleResetApplication();
@@ -98,7 +98,7 @@
setFieldsValue(defaultParams);
});
}
- /* 自定义job 上传 */
+ /* Custom job upload */
async function handleCustomJobRequest(data) {
const formData = new FormData();
formData.append('file', data.file);
@@ -117,7 +117,7 @@
}
}
- /* 处理更新参数 */
+ /* Handling update parameters */
function handleAppUpdate(values) {
submitLoading.value = true;
try {
@@ -163,7 +163,7 @@
}
}
- /* 提交更新 */
+ /* Submit an update */
async function handleUpdateApp(params: Recordable) {
const updated = await fetchUpdate(params);
if (updated) {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
index 98bbc0cd5..2824f290b 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
@@ -83,7 +83,7 @@
const [registerConfDrawer, { openDrawer: openConfDrawer }] = useDrawer();
- /* 表单重置 */
+ /* Form reset */
function handleReset(executionMode?: string) {
nextTick(() => {
const resetParams = handleResetApplication();
@@ -115,7 +115,7 @@
setFieldsValue(defaultParams);
});
}
- /* 自定义job 上传 */
+ /* Custom job upload */
async function handleCustomJobRequest(data) {
const formData = new FormData();
formData.append('file', data.file);
@@ -134,7 +134,7 @@
}
}
- /* 处理更新参数 */
+ /* Handling update parameters */
async function handleAppUpdate(values) {
try {
submitLoading.value = true;
@@ -159,7 +159,7 @@
function handleSubmitSQL(values) {
try {
- //触发一次pom确认操作.
+ // Trigger a pom confirmation operation.
unref(dependencyRef)?.handleApplyPom();
// common params...
const dependency: { pom?: any; jar?: any } = {};
@@ -193,7 +193,7 @@
submitLoading.value = false;
}
}
- /* 提交更新 */
+ /* Submit an update */
async function handleSubmitCustomJob(values: Recordable) {
try {
const format =
@@ -219,7 +219,7 @@
}
}
- /* 发送提交接口 */
+ /* Send submission interface */
async function handleUpdateApp(params: Recordable) {
try {
const updated = await fetchUpdate(params);
@@ -233,7 +233,7 @@
}
}
- /* 初始化信息 */
+ /* initialization information */
async function handleStreamParkInfo() {
const appId = route.query.appId;
const res = await fetchGet({ id: appId as string });
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/View.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/View.vue
index 915e9f657..3ad83ab9e 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/app/View.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/app/View.vue
@@ -71,7 +71,7 @@
const userId = ref(undefined);
const yarn = ref<Nullable<string>>(null);
- // 获取仪表盘指标数据
+ // Get Dashboard Metrics Data
async function handleDashboard() {
try {
const res = await fetchDashboard();
@@ -182,11 +182,11 @@
openBuildDrawer(true, { appId: app.id });
}
- /* 点击添加 */
+ /* Click to add */
function handleAdd() {
router.push({ path: '/flink/app/add' });
}
- /* 点击编辑 */
+ /* Click to edit */
function handleEdit(app: AppListRecord) {
flinkAppStore.setApplicationId(app.id);
if (app.appType === 1) {
@@ -197,7 +197,7 @@
router.push({ path: '/flink/app/edit_flink' });
}
}
- /* 点击详情 */
+ /* Click for details */
function handleDetail(app: AppListRecord) {
flinkAppStore.setApplicationId(app.id);
router.push({ path: '/flink/app/detail', query: { appId: app.id } });
@@ -205,13 +205,13 @@
/* view */
async function handleJobView(app: AppListRecord) {
- // 任务正在运行中, 重启中, 正在 savePoint 中
+ // Task is running, restarting, in savePoint
if ([4, 5].includes(app.state) || app['optionState'] === 4) {
// yarn-per-job|yarn-session|yarn-application
handleView(app, unref(yarn));
}
}
- /* 点击删除 */
+ /* Click to delete */
async function handleDelete(app: AppListRecord) {
const hide = createMessage.loading('deleting', 0);
try {
@@ -252,7 +252,7 @@
});
}
}
- /* 日志查看 */
+ /* log view */
function handleSeeLog(app: AppListRecord) {
openLogModal(true, { app: unref(app) });
}
@@ -289,7 +289,7 @@
});
}
- /* 操作按扭 */
+ /* Operation button */
function getTableActions(record: AppListRecord): ActionItem[] {
return [
{
@@ -364,7 +364,7 @@
];
}
- /* 下拉操作按扭 */
+ /* pull down button */
function getActionDropdown(record: AppListRecord): ActionItem[] {
return [
{
@@ -404,7 +404,7 @@
},
];
}
- /* 更新options数据 */
+ /* Update options data */
function handleOptionApp(data: {
type: 'starting' | 'stopping' | 'launch';
key: any;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/DetailTab.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/DetailTab.vue
index 23c599c86..79ebd38ba 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/DetailTab.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/DetailTab.vue
@@ -151,7 +151,7 @@
}
function handleConfDetail() {}
- /* 删除配置 */
+ /* delete configuration */
async function handleDeleteConf(record) {
await fetchRemoveConf({ id: record.id });
reloadConf();
@@ -184,13 +184,13 @@
},
];
}
- /* 删除 savePoint */
+ /* delete savePoint */
async function handleDeleteSavePoint(record) {
await fetchRemoveSavePoint({ id: record.id });
reloadSavePoint();
}
- /* 复制路径 */
+ /* copy path */
function handleCopy(record: Recordable) {
try {
copy(record.path);
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
index a27f2c5a7..d24b56567 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/Different.vue
@@ -73,7 +73,7 @@
setupEditor(elem);
});
}
- /* 更改编辑器高度 */
+ /* Change editor height */
function handleHeight(ele: any, h: number) {
const height = document.documentElement.offsetHeight ||
document.body.offsetHeight;
ele.style.height = height - h + 'px';
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/ExecOptionModal.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/ExecOptionModal.vue
index 9e796a9cc..d453e848f 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/ExecOptionModal.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppDetail/ExecOptionModal.vue
@@ -38,8 +38,8 @@
theme: 'log',
readOnly: true,
scrollBeyondLastLine: false,
- overviewRulerBorder: false, // 不要滚动条边框
- tabSize: 2, // tab 缩进长度
+ overviewRulerBorder: false, // Don't scroll bar borders
+ tabSize: 2, // tab indent length
minimap: { enabled: true },
scrollbar: {
useShadows: false,
@@ -58,7 +58,7 @@
setContent(data.content);
}
- /* 注册语言 */
+ /* registered language */
async function handleLogMonaco(monaco: any) {
monaco.languages.register({ id: 'log' });
monaco.languages.setMonarchTokensProvider('log', {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/BuildDrawer.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/BuildDrawer.vue
index 3190771ad..e06621eca 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/BuildDrawer.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/BuildDrawer.vue
@@ -54,7 +54,7 @@
1000,
{ immediate: false },
);
- /* 构建详情 */
+ /* Build Detail */
async function handleFetchBuildDetail() {
try {
if (unref(appId) == null) {
@@ -75,7 +75,7 @@
const [registerBuild] = useDrawerInner((data: { app: AppListRecord }) => {
data && onReceiveData(data);
});
- /* 数据接收 */
+ /* data reception */
function onReceiveData(data) {
appId.value = data.appId;
if (!isPending.value) start();
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StartApplicationModal.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StartApplicationModal.vue
index f0efb993d..8c9571ff0 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StartApplicationModal.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StartApplicationModal.vue
@@ -104,7 +104,7 @@
wrapperCol: { lg: { span: 16, offset: 0 }, sm: { span: 4, offset: 0 } },
baseColProps: { span: 24 },
});
- /* 提交 */
+ /* submit */
async function handleSubmit() {
try {
const formValue = (await validate()) as Recordable;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StopApplicationModal.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StopApplicationModal.vue
index b9b1a46b4..7a596a16c 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StopApplicationModal.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/AppView/StopApplicationModal.vue
@@ -86,7 +86,7 @@
baseColProps: { span: 24 },
});
- /* 提交 */
+ /* submit */
async function handleSubmit() {
try {
const { stopSavePointed, drain, customSavepoint } = (await validate())
as Recordable;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
index e3562a694..f5b1ce04b 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/Dependency.vue
@@ -157,7 +157,7 @@
]),
});
}
- /* 自定义http */
+ /* custom http */
async function handleCustomDepsRequest(data) {
try {
const formData = new FormData();
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/Mergely.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/Mergely.vue
index 329f85579..f50e4bc62 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/Mergely.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/Mergely.vue
@@ -48,7 +48,7 @@
const monacoConfig = ref();
const loading = ref(false);
- /* 点击下一步 */
+ /* Click Next */
function handleNext() {
visibleDiff.value = true;
title.value = 'Compare configuration';
@@ -70,26 +70,26 @@
options: getMonacoOptions(props.readOnly) as any,
});
onChange((value) => {
- // 第一次
+ // the first time
if (targetValue.value) {
changed.value = true;
}
targetValue.value = value;
});
- /* 更改编辑器高度 */
+ /* Change editor height */
function handleHeight(ele: Ref, h: number) {
const height = document.documentElement.offsetHeight ||
document.body.offsetHeight;
unref(ele).style.height = height - h + 'px';
}
- /* 关闭比对 */
+ /* close match */
function handleCloseDiff() {
title.value = 'Edit configuration';
visibleDiff.value = false;
}
- /* 点击确定 */
+ /* Click OK */
function handleOk() {
const value = unref(targetValue);
if (value == null || !value.replace(/^\s+|\s+$/gm, '')) {
@@ -101,7 +101,7 @@
handleCancel();
}
- /* 点击取消 */
+ /* Click to cancel */
function handleCancel() {
changed.value = false;
targetValue.value = null;
@@ -116,7 +116,7 @@
data && onReceiveDrawerData(data);
},
);
- /* 数据接收 */
+ /* data reception */
function onReceiveDrawerData(data) {
compareMode.value = false;
changed.value = false;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/components/flinkSql.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/components/flinkSql.vue
index d62ebddca..89f1f4753 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/components/flinkSql.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/components/flinkSql.vue
@@ -58,7 +58,7 @@
});
const defaultValue = '';
- /* 验证 */
+ /* verify */
async function handleVerifySql() {
if (isEmpty(props.value)) {
vertifyRes.errorMsg = 'empty sql';
@@ -128,13 +128,13 @@
}
}
}
- /* 格式化 */
+ /* format */
function handleFormatSql() {
if (isEmpty(props.value)) return;
const formatSql = format(props.value);
setContent(formatSql);
}
- /* 全屏 */
+ /* full screen */
function handleBigScreen() {
toggle();
unref(flinkSql).style.width = '0';
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
index e27f9203c..8be64d2a3 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/data/index.ts
@@ -84,14 +84,14 @@ export const getAppColumns = (): BasicColumn[] => [
},
];
-/* 获取diff编辑器配置 */
+/* Get diff editor configuration */
export const getMonacoOptions = (readOnly: boolean) => {
return {
selectOnLineNumbers: false,
- foldingStrategy: 'indentation', // 代码分小段折叠
- overviewRulerBorder: false, // 不要滚动条边框
+ foldingStrategy: 'indentation', // code fragmentation
+ overviewRulerBorder: false, // Don't scroll bar borders
autoClosingBrackets: true,
- tabSize: 2, // tab 缩进长度
+ tabSize: 2, // tab indent length
readOnly,
inherit: true,
scrollBeyondLastLine: false,
@@ -103,7 +103,7 @@ export const getMonacoOptions = (readOnly: boolean) => {
cursorWidth: 3,
renderFinalNewline: true,
renderLineHighlight: 'all',
- quickSuggestionsDelay: 100, //代码提示延时
+ quickSuggestionsDelay: 100, // Code prompt delay
scrollbar: {
useShadows: false,
vertical: 'visible',
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/data/option.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/data/option.ts
index 292089df1..772d38912 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/data/option.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/data/option.ts
@@ -21,7 +21,7 @@ const options = [
key: 'jobmanager',
name: 'jobmanager',
placeholder: '-m,--jobmanager <arg>',
- description: 'JobManager 地址(yarn-cluster)',
+ description: 'JobManager address (yarn-cluster)',
group: 'run',
type: 'input',
defaultValue: '',
@@ -64,7 +64,8 @@ const options = [
key: 'shutdownOnAttachedExit',
name: 'shutdownOnAttachedExit',
placeholder: '-sae,--shutdownOnAttachedExit',
- description: '如果非独立模式提交的任务,当客户端中断,集群执行的job任务也会shutdown',
+ description:
+ 'If the task submitted in non-standalone mode, when the client is
interrupted, the job task executed by the cluster will also shutdown',
group: 'no-support',
type: 'switch',
defaultValue: false,
@@ -74,7 +75,7 @@ const options = [
key: 'jobmanager_memory_flink_size',
name: 'jobmanager.memory.flink.size',
placeholder: 'Total Flink Memory size for the JobManage',
- description: 'JobManager Flink总内存大小',
+ description: 'JobManager Flink total memory size',
unit: 'mb',
group: 'total-memory',
type: 'number',
@@ -94,7 +95,7 @@ const options = [
key: 'taskmanager_memory_flink_size',
name: 'taskmanager.memory.flink.size',
placeholder: 'Total Flink Memory size for the TaskExecutors',
- description: 'TaskExecutor Flink总内存大小',
+ description: 'TaskExecutor Flink total memory size',
unit: 'mb',
group: 'total-memory',
type: 'number',
@@ -115,7 +116,7 @@ const options = [
key: 'jobmanager_memory_process_size',
name: 'jobmanager.memory.process.size',
placeholder: 'Total Process Memory size for the JobManager',
- description: 'JobManager 进程总内存大小',
+ description: 'The total memory size of the JobManager process',
unit: 'mb',
group: 'process-memory',
type: 'number',
@@ -135,7 +136,7 @@ const options = [
key: 'taskmanager_memory_process_size',
name: 'taskmanager.memory.process.size',
placeholder: 'Total Process Memory size for the TaskExecutors',
- description: 'TaskExecutor 进程总内存大小',
+ description: 'The total memory size of the TaskExecutor process',
unit: 'mb',
group: 'process-memory',
type: 'number',
@@ -156,7 +157,7 @@ const options = [
key: 'jobmanager_memory_heap_size',
name: 'jobmanager.memory.heap.size',
placeholder: 'JVM Heap Memory size for JobManager',
- description: 'JobManager 的 JVM 堆内存,推荐大小128mb',
+ description: 'JobManager is JVM heap memory, the recommended size is
128mb',
unit: 'mb',
group: 'jobmanager-memory',
type: 'number',
@@ -176,7 +177,7 @@ const options = [
key: 'jobmanager_memory_off_heap_size',
name: 'jobmanager.memory.off-heap.size',
placeholder: 'Off-heap Memory size for JobManager',
- description: 'JobManager 的堆外内存(直接内存或本地内存)',
+ description: 'JobManager is off-heap memory (direct or local)',
unit: 'mb',
group: 'jobmanager-memory',
type: 'number',
@@ -216,7 +217,8 @@ const options = [
key: 'jobmanager_memory_jvm_overhead_fraction',
name: 'jobmanager.memory.jvm-overhead.fraction',
placeholder: 'Fraction of Total Process Memory to be reserved for JVM
Overhead',
- description: 'JobManager其他JVM开销(如栈空间,垃圾回收空间)于进程总内存占比',
+ description:
+ 'JobManager is other JVM overhead (such as stack space, garbage
collection space) accounts for the total memory of the process',
unit: null,
group: 'jobmanager-memory',
type: 'number',
@@ -236,7 +238,8 @@ const options = [
key: 'jobmanager_memory_jvm_overhead_max',
name: 'jobmanager.memory.jvm-overhead.max',
placeholder: 'Max JVM Overhead size for the JobManager',
- description: 'JobManager其他JVM开销(如栈空间,垃圾回收空间)的最大内存',
+ description:
+ 'Maximum memory for JobManager other JVM overhead (such as stack space,
garbage collection space)',
unit: 'mb',
group: 'jobmanager-memory',
type: 'number',
@@ -256,7 +259,8 @@ const options = [
key: 'jobmanager_memory_jvm_overhead_min',
name: 'jobmanager.memory.jvm.overhead.min',
placeholder: 'Min JVM Overhead size for the JobManager',
- description: 'JobManager其他JVM开销(如栈空间,垃圾回收空间)的最小内存',
+ description:
+ 'Minimum memory for JobManager other JVM overhead (such as stack space,
garbage collection space)',
unit: 'mb',
group: 'jobmanager-memory',
type: 'number',
@@ -277,7 +281,8 @@ const options = [
key: 'taskmanager_memory_framework_heap_size',
name: 'taskmanager.memory.framework.heap.size',
placeholder: 'Framework Heap Memory size for TaskExecutors',
- description: '框架堆内存-用于Flink框架的JVM堆内存 (不建议调整,进阶配置)',
+ description:
+ 'Framework heap memory - JVM heap memory for the Flink framework (not
recommended for adjustment, advanced configuration)',
unit: 'mb',
group: 'taskmanager-memory',
type: 'number',
@@ -297,7 +302,8 @@ const options = [
key: 'taskmanager_memory_framework_off_heap_size',
name: 'taskmanager.memory.framework.off-heap.size',
placeholder: 'Framework Off-Heap Memory size for TaskExecutors',
- description: '框架堆外内存-用于Flink框架的堆外内存 (不建议调整,进阶配置)',
+ description:
+ 'Framework off-heap memory - off-heap memory for the Flink framework
(not recommended for adjustment, advanced configuration)',
unit: 'mb',
group: 'taskmanager-memory',
type: 'number',
@@ -318,7 +324,8 @@ const options = [
key: 'taskmanager_memory_task_heap_size',
name: 'taskmanager.memory.task.heap.size',
placeholder: 'Task Heap Memory size for TaskExecutors',
- description: '任务堆内存-用于Flink应用的算子及用户代码的JVM堆内存',
+ description:
+ 'Task heap memory - JVM heap memory for operators and user code of Flink
applications',
unit: 'mb',
group: 'taskmanager-memory',
type: 'number',
@@ -338,7 +345,8 @@ const options = [
key: 'taskmanager_memory_task_off_heap_size',
name: 'taskmanager.memory.task.off-heap.size',
placeholder: 'Task Off-Heap Memory size for TaskExecutors',
- description: '任务堆外内存-用于Flink算子及用户代码的堆外内存(不建议调整,进阶配置)',
+ description:
+ 'Task off-heap memory - off-heap memory for Flink operators and user
code (not recommended for adjustment, advanced configuration)',
unit: 'mb',
group: 'taskmanager-memory',
type: 'number',
@@ -358,7 +366,8 @@ const options = [
key: 'taskmanager_memory_managed_size',
name: 'taskmanager.memory.managed.size',
placeholder: 'Managed Memory size for TaskExecutors',
- description: '托管内存-由Flink管理用于(排序|缓存中间结果|StateBackend)的内存大小',
+ description:
+ 'Managed memory - size of memory managed by Flink for (sort|cache
intermediate results|StateBackend)',
unit: 'mb',
group: 'taskmanager-memory',
type: 'number',
@@ -378,7 +387,8 @@ const options = [
key: 'taskmanager_memory_managed_fraction',
name: 'taskmanager.memory.managed.fraction',
placeholder: 'Min JVM Overhead size for the TaskExecutors',
- description: '托管内存-由Flink管理用于(排序|缓存中间结果|StateBackend)的内存占比',
+ description:
+ 'Managed memory - percentage of memory managed by Flink for (sort|cache
intermediate results|StateBackend)',
unit: null,
group: 'taskmanager-memory',
type: 'number',
@@ -418,7 +428,8 @@ const options = [
key: 'taskmanager_memory_jvm_overhead_fraction',
name: 'taskmanager.memory.jvm-overhead.fraction',
placeholder: 'Fraction of Total Process Memory to be reserved for JVM
Overhead',
- description: 'TaskExecutor的其他JVM开销(如栈空间,垃圾回收空间)于进程总内存占比',
+ description:
+ 'Other JVM overheads of TaskExecutor (such as stack space, garbage
collection space) account for the total memory of the process',
unit: null,
group: 'taskmanager-memory',
type: 'number',
@@ -438,7 +449,8 @@ const options = [
key: 'taskmanager_memory_jvm_overhead_max',
name: 'taskmanager.memory.jvm-overhead.max',
placeholder: 'Max JVM Overhead size for the TaskExecutors',
- description: 'TaskExecutor的其他JVM开销(如栈空间,垃圾回收空间)的最大内存',
+ description:
+ 'Maximum memory for TaskExecutor is other JVM overhead (such as stack
space, garbage collection space)',
unit: 'mb',
group: 'taskmanager-memory',
type: 'number',
@@ -458,7 +470,8 @@ const options = [
key: 'taskmanager_memory_jvm_overhead_min',
name: 'taskmanager.memory.jvm-overhead.min',
placeholder: 'Min JVM Overhead size for the TaskExecutors',
- description: 'TaskExecutor的其他JVM开销(如栈空间,垃圾回收空间)的最小内存',
+ description:
+ 'Minimum memory for TaskExecutor is other JVM overhead (such as stack
space, garbage collection space)',
unit: 'mb',
group: 'taskmanager-memory',
type: 'number',
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useApp.tsx
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useApp.tsx
index 882801f23..336870935 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useApp.tsx
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useApp.tsx
@@ -35,7 +35,7 @@ export const useFlinkApplication = (openStartModal: Fn) => {
launch: new Map(),
};
- /* 检测 */
+ /* check */
function handleCheckLaunchApp(app) {
if (app['appControl']['allowBuild'] === true) {
handleLaunchApp(app, false);
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
index 062cbff57..3c40ea81d 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
@@ -71,20 +71,20 @@ export const useCreateAndEditSchema = (
const [registerConfDrawer, { openDrawer: openConfDrawer }] = useDrawer();
/*
- !原项目也未赋值
+ !The original item is also unassigned
*/
function getConfigSchemas() {
return [];
}
- /* 过滤cluster */
+ /* filter cluster */
const getExecutionCluster = (
executionMode: number,
valueKey: string,
): Array<{ label: string; value: string }> => {
return (unref(flinkClusters) || [])
.filter((o) => {
- // 编辑模式多了一个过滤条件
+ // Edit mode has one more filter condition
if (edit?.mode) {
return o.executionMode == executionMode && o.clusterState === 1;
} else {
@@ -283,7 +283,7 @@ export const useCreateAndEditSchema = (
];
});
- /* 检测job name 字段 */
+ /* Detect job name field */
async function getJobNameCheck(_rule: RuleObject, value: StoreValue) {
if (value === null || value === undefined || value === '') {
return Promise.reject('Application Name is required');
@@ -527,10 +527,10 @@ export const useCreateAndEditSchema = (
});
onMounted(async () => {
- /* 获取项目数据 */
+ /* Get project data */
projectList.value = await fetchSelect({});
flinkEnvs.value = await fetchFlinkEnv();
- /* 获取告警数据 */
+ /* Get project data */
alerts.value = await fetchAlertSetting();
flinkClusters.value = await fetchFlinkCluster();
historyRecord.k8sNamespace = await fetchK8sNamespaces();
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useDetail.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useDetail.ts
index ed9eddbeb..509dfe52d 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useDetail.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useDetail.ts
@@ -60,7 +60,7 @@ export const userDetail = (
];
}
- /* 删除配置 */
+ /* delete configuration */
async function handleDeleteConf(record) {
await fetchRemoveConf({ id: record.id });
reloadConf();
@@ -94,7 +94,7 @@ export const userDetail = (
];
}
- /* 复制路径 */
+ /* copy path */
function handleCopy(record: Recordable) {
try {
copy(record.path);
@@ -104,7 +104,7 @@ export const userDetail = (
createMessage.error('copied to clipboard failed');
}
}
- /* 删除 savePoint */
+ /* delete savePoint */
async function handleDeleteSavePoint(record) {
await fetchRemoveSavePoint({ id: record.id });
reloadSavePoint();
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEdit.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEdit.ts
index df93ebd3d..e4ca7d9fd 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEdit.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useEdit.ts
@@ -35,7 +35,7 @@ export const useEdit = (alerts?: Ref) => {
jmMemoryItems: [],
tmMemoryItems: [],
});
- /* 初始化信息 */
+ /* initialization information */
async function handleGetApplication() {
const returnData = {};
const appId = route.query.appId;
@@ -52,7 +52,7 @@ export const useEdit = (alerts?: Ref) => {
}
return returnData;
}
- /* 表单重置 */
+ /* Form reset */
function handleResetApplication() {
let parallelism: Nullable<number> = null;
let slot: Nullable<number> = null;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
index 9b857fe61..17ba23939 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
@@ -315,7 +315,7 @@ export const renderIsSetConfig = (
registerConfDrawer: Fn,
openConfDrawer: Fn,
) => {
- /* 打开sqlConf drawer */
+ /* Open the sqlConf drawer */
async function handleSQLConf(checked: boolean) {
if (checked) {
if (unref(model.configOverride) != null) {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
index 9c962326d..ccb35617f 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
@@ -363,7 +363,7 @@ export const useFlinkSchema = (editModel?: string) => {
},
];
- /* flink 类型数据 */
+ /* flink type data */
const getFlinkTypeSchema = (): FormSchema[] => {
return [
{
@@ -397,7 +397,7 @@ export const useFlinkSchema = (editModel?: string) => {
};
/**
*
- * @param appId 编辑状态传递app数据,创建不传递
+ * @param appId Edit state passes app data, create does not pass
* @returns
*/
const getFlinkSqlSchema = (appId?: string): FormSchema[] => [
@@ -458,16 +458,16 @@ export const useFlinkSchema = (editModel?: string) => {
});
/*
- !原项目也未赋值
+ !The original item is also unassigned
*/
function getConfigSchemas() {
return [];
}
onMounted(async () => {
- /* 获取项目数据 */
+ /* Get project data */
projectList.value = await fetchSelect({});
- /* 获取告警数据 */
+ /* Get alarm data */
alerts.value = await fetchAlertSetting();
const cluster = await fetchFlinkCluster();
flinkClusters.value = cluster;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useLog.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useLog.ts
index 764d0da46..8fee7c5b8 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useLog.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useLog.ts
@@ -27,8 +27,8 @@ export const useLog = () => {
theme: 'log',
readOnly: true,
scrollBeyondLastLine: false,
- overviewRulerBorder: false, // 不要滚动条边框
- tabSize: 2, // tab 缩进长度
+ overviewRulerBorder: false, // Don't scroll bar borders
+ tabSize: 2, // tab indent length
minimap: { enabled: true },
scrollbar: {
useShadows: false,
@@ -43,7 +43,7 @@ export const useLog = () => {
},
handleLogMonaco,
);
- /* 注册语言 */
+ /* registered language */
async function handleLogMonaco(monaco: any) {
monaco.languages.register({ id: 'log' });
monaco.languages.setMonarchTokensProvider('log', {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
index f7de4b88c..26ff78475 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
@@ -92,7 +92,7 @@ export function handleAppBuildStepText(stepStatus) {
}
}
-// 字段描述过滤器
+// Field Description Filter
export function descriptionFilter(option) {
if (option.unit) {
return option.description + ' (Unit ' + option.unit + ')';
@@ -138,14 +138,14 @@ export function handleIsStart(app, optionApps) {
const status = [0, 7, 9, 10, 11, 13, 16, 18, 19, 20, -9].includes(app.state);
/**
- * 部署失败 FAILED(-1),
- * 完结 DONE(0),
- * 任务修改完毕需要重新发布 NEED_LAUNCH(1),
- * 上线中 LAUNCHING(2),
- * 上线完毕,需要重启 NEED_RESTART(3),
- * 需要回滚 NEED_ROLLBACK(4),
- * 项目发生变化,任务需检查(是否需要重新选择jar) NEED_CHECK(5),
- * 发布的任务已经撤销 REVOKED(10);
+ * Deployment failed FAILED(-1),
+ * Done DONE(0),
+ * After the task is modified, NEED_LAUNCH(1) needs to be reissued,
+ * Online LAUNCHING(2),
+ * After going online, you need to restart NEED_RESTART(3),
+ * Need to rollback NEED_ROLLBACK(4),
+ * When the project changes, the task needs to be checked (whether the jar
needs to be re-selected) NEED_CHECK(5),
+ * The posted task has been revoked REVOKED(10);
*/
const launch = [0, 3].includes(app.launch);
@@ -165,7 +165,7 @@ export function handleYarnQueue(values) {
}
}
-/* 拼接参数 */
+/* Splice parameters */
export function handleFormValue(values) {
const options = {};
for (const k in omit(values, ['totalOptions', 'jmOptions', 'tmOptions'])) {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/notebook/Submit.vue
b/streampark-console/streampark-console-newui/src/views/flink/notebook/Submit.vue
index 325075ac5..ad7d29776 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/notebook/Submit.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/notebook/Submit.vue
@@ -109,9 +109,9 @@
code: woldCount,
options: {
selectOnLineNumbers: false,
- foldingStrategy: 'indentation', // 代码分小段折叠
- overviewRulerBorder: false, // 不要滚动条边框
- tabSize: 2, // tab 缩进长度
+ foldingStrategy: 'indentation', // code fragmentation
+ overviewRulerBorder: false, // Don't scroll bar borders
+ tabSize: 2, // tab indent length
readOnly: false,
scrollBeyondLastLine: false,
lineNumbersMinChars: 4,
@@ -121,7 +121,7 @@
cursorWidth: 3,
renderFinalNewline: true,
renderLineHighlight: 'line',
- quickSuggestionsDelay: 100, //代码提示延时
+ quickSuggestionsDelay: 100, // Code prompt delay
minimap: { enabled: true },
scrollbar: {
useShadows: false,
@@ -142,7 +142,7 @@
}
});
- /* 提交 */
+ /* submit */
async function handleReplSubmit() {
const code = await getContent();
const hide = createMessage.loading('submiting', 0);
@@ -158,7 +158,7 @@
hide();
}
}
- /* 设置/取消全屏内容 */
+ /* Set/unset fullscreen content */
function toggle() {
appStore.setProjectConfig({ fullContent: !isFullscreen.value });
}
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/project/Add.vue
b/streampark-console/streampark-console-newui/src/views/flink/project/Add.vue
index 7c116b5b4..58cf8c5d7 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/project/Add.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/project/Add.vue
@@ -33,7 +33,7 @@
const { createMessage } = useMessage();
const { t } = useI18n();
- /* 创建项目 */
+ /* Create project */
async function handleCreateAction(values: Recordable) {
try {
const res = await createProject({
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/project/Edit.vue
b/streampark-console/streampark-console-newui/src/views/flink/project/Edit.vue
index a3d38bded..2cfde75f9 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/project/Edit.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/project/Edit.vue
@@ -53,7 +53,7 @@
buildState.value = projectResource.buildState;
}
}
- /* 更新项目 */
+ /* Update project */
async function handleEditAction(values: Recordable) {
try {
handleCheckRebuild(values);
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/project/View.vue
b/streampark-console/streampark-console-newui/src/views/flink/project/View.vue
index 72c0ae127..3b81e4349 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/project/View.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/project/View.vue
@@ -123,7 +123,7 @@
2000,
{ immediate: false },
);
- /* 查看日志 */
+ /* View log */
function handleViewLog(value) {
openLogModal(true, { project: value });
}
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/project/useProject.ts
b/streampark-console/streampark-console-newui/src/views/flink/project/useProject.ts
index be173b724..ca789d244 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/project/useProject.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/project/useProject.ts
@@ -183,7 +183,7 @@ export const useProject = () => {
}
}
- /* 表单提交 */
+ /* form submit */
async function handleSubmit(values: Recordable, FetchAction: (v: Recordable)
=> Promise<void>) {
submitLoading.value = true;
try {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
index e95ece3c2..1d01826eb 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
@@ -90,7 +90,7 @@
changeLoading(false);
}
}
- /* 获取cluster数据 */
+ // Get cluster data
async function getClusterInfo() {
const res = await fetchGetCluster({ id: route?.query?.clusterId });
Object.assign(cluster, res);
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertModal.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertModal.vue
index fd9b00f9e..be9b099dc 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertModal.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertModal.vue
@@ -113,7 +113,7 @@
],
});
- /* 提交新建设置 */
+ // Submit new settings
async function handleSubmit() {
try {
changeOkLoading(true);
@@ -143,11 +143,11 @@
},
isJsonType: true,
};
- console.log('更新告警参数：' + JSON.stringify(param));
+ console.log('Update alarm parameters：' + JSON.stringify(param));
- /* 无id 表示新增操作 */
+ // No id means new operation
if (!param.id) {
- // 提交之前检测一下是否存在相同名称的告警
+ // Check if there is an alarm with the same name before submitting
const isExist = await fetchExistsAlert({ alertName: param.alertName });
if (isExist) {
createConfirm({
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
index 8a6663e2f..1bdf3ee7b 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/AlertSetting.vue
@@ -46,27 +46,27 @@
const [registerAlertModal, { openModal: openAlertModal }] = useModal();
const alerts = ref<AlertSetting[]>([]);
const alertType = ref<number[]>([]);
- /* 获取告警配置 */
+ /* Get alert configuration */
async function getAlertSetting() {
const res = await fetchAlertSetting();
alerts.value = res;
}
- /* 计算类型 */
+ /* compute type */
function computeAlertType(level: number) {
if (level === null) {
level = 0;
}
const result: number[] = [];
while (level != 0) {
- // 获取最低位的 1
+ // Get the lowest 1
const code = level & -level;
result.push(code);
- // 将最低位置 0
+ // Set the lowest position to 0
level ^= code;
}
return result;
}
- /* 测试连接 */
+ /* test connection */
async function handleTestAlarm(item) {
const hide = createMessage.loading(' Testing', 0);
try {
@@ -74,7 +74,7 @@
createMessage.success('Test Alert Config successful!');
getAlertSetting();
} catch (error: any) {
- /* 自定义提示消息 */
+ /* custom alert message */
if (error?.response?.data?.message) {
createConfirm({
iconType: 'error',
@@ -88,7 +88,7 @@
hide();
}
}
- /* 点击编辑按扭 */
+ /* Click the edit button */
function handleEditAlertConf(item: AlertSetting) {
alertType.value = computeAlertType(item.alertType);
@@ -113,7 +113,7 @@
// larkSecretEnable = larkParams.secretEnable;
}
- console.log('告警参数：' + JSON.stringify(item));
+ console.log('Alarm parameters：' + JSON.stringify(item));
openAlertModal(true, {
alertId: item.id,
alertName: item.alertName,
@@ -133,7 +133,7 @@
});
}
- /* 删除配置 */
+ /* delete configuration */
async function handleDeleteAlertConf(item: AlertSetting) {
try {
await fetchAlertDelete({ id: item.id });
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkClusterSetting.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkClusterSetting.vue
index 83dad9c7a..17366e6a9 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkClusterSetting.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkClusterSetting.vue
@@ -76,20 +76,20 @@
function handleIsStart(item) {
/**
- 集群刚创建但未启动
- CREATED(0),
- 集群已启动
- STARTED(1),
- 集群已停止
- STOPED(2);
+ The cluster was just created but not started
+ CREATED(0),
+ cluster started
+ STARTED(1),
+ cluster stopped
+ STOPED(2);
*/
return optionClusters.starting.get(item.id);
}
- /* 前往编辑集群 */
+ /* Go to edit cluster */
function handleEditCluster(item: FlinkCluster) {
go(`/flink/setting/edit_cluster?clusterId=${item.id}`);
}
- /* 部署 */
+ /* deploy */
async function handleDeployCluser(item: FlinkCluster) {
const hide = createMessage.loading('The current cluster is starting', 0);
try {
@@ -117,7 +117,7 @@
hide();
}
}
- /* 删除 */
+ /* delete */
async function handleDelete(item: FlinkCluster) {
const { data } = await fetchClusterRemove(item.id);
if (data?.data?.status) {
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvDraw.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvDraw.vue
index 5ff1c51ce..98dc9121b 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvDraw.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvDraw.vue
@@ -46,9 +46,9 @@
language: 'yaml',
options: {
selectOnLineNumbers: false,
- foldingStrategy: 'indentation', // 代码分小段折叠
- overviewRulerBorder: false, // 不要滚动条边框
- tabSize: 2, // tab 缩进长度
+ foldingStrategy: 'indentation', // code fragmentation
+ overviewRulerBorder: false, // Don't scroll bar borders
+ tabSize: 2, // tab indent length
readOnly: true,
scrollBeyondLastLine: false,
lineNumbersMinChars: 5,
@@ -58,7 +58,7 @@
cursorWidth: 3,
renderFinalNewline: true,
renderLineHighlight: 'all',
- quickSuggestionsDelay: 100, //代码提示延时
+ quickSuggestionsDelay: 100, // Code prompt delay
minimap: { enabled: true },
scrollbar: {
useShadows: false,
@@ -71,7 +71,7 @@
},
},
});
- /* 同步配置 */
+ /* Sync configuration */
async function handleSync() {
try {
syncLoading.value = true;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvModal.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvModal.vue
index 87a90e424..1807172da 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvModal.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvModal.vue
@@ -87,20 +87,20 @@
}
});
- /* 表单提交 */
+ /* form submit */
async function handleSubmit() {
try {
changeOkLoading(true);
const formValue = await validate();
- // 检测环境
+ // Detection environment
const isExist = await fetchExistsEnv({
id: versionId.value,
flinkName: formValue.flinkName,
flinkHome: formValue.flinkHome,
});
- // 环境检测成功
+ // Environment detection is successful
if (isExist) {
- // 创建
+ // create
if (versionId.value == null) {
const { data } = await fetchFlinkCreate(formValue);
if (data.data) {
@@ -111,7 +111,7 @@
createMessage.error(data.message.replaceAll(/\[StreamPark]/g, ''));
}
} else {
- //更新
+ // update
const { data } = await fetchFlinkUpdate({
id: versionId.value,
...formValue,
@@ -132,7 +132,7 @@
});
}
} catch (error: any) {
- /* 自定义提示消息 */
+ /* custom alert message */
if (error?.response?.data?.message) {
createConfirm({
iconType: 'error',
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvSetting.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvSetting.vue
index 388549ff8..9fb9c9314 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvSetting.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/FlinkEnvSetting.vue
@@ -43,7 +43,7 @@
const flinks = ref<FlinkEnv[]>([]);
const [registerModal, { openModal: openFlinkModal }] = useModal();
const [registerFlinkDraw, { openDrawer: openEnvDrawer }] = useDrawer();
- /* 编辑按扭 */
+ /* Edit button */
function handleEditFlink(item: FlinkEnv) {
versionId.value = item.id;
openFlinkModal(true, {
@@ -54,13 +54,13 @@
});
}
- /* 查看配置 */
+ /* View configuration */
async function handleFlinkConf(item: FlinkEnv) {
const res = await fetchFlinkInfo(item.id);
openEnvDrawer(true, res);
}
- /* 设为默认环境 */
+ /* set as default environment */
async function handleSetDefault(item: FlinkEnv) {
if (item.isDefault) {
await fetchDefaultSet(item.id);
@@ -69,7 +69,7 @@
}
}
- /* 获取flink环境数据 */
+ /* Get flink environment data */
async function getFlinkSetting() {
flinks.value = await fetchFlinkEnv();
}
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/SettingList.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/SettingList.vue
index 3e0d48ed5..b365b6830 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/SettingList.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/SettingList.vue
@@ -65,14 +65,14 @@
function handleSwitch(record: SystemSetting) {
emits('updateValue', record);
}
- /* 编辑输入 */
+ /* edit input */
function handleEdit(record: SystemSetting) {
if (!record.editable) {
record.submitting = true;
}
record.editable = !record.editable;
}
- /* 编辑提交 */
+ /* edit commit */
async function handleSubmit(record: SystemSetting) {
record.submitting = false;
record.editable = false;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/SystemSetting.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/SystemSetting.vue
index 64cd5e8df..e608fc94f 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/components/SystemSetting.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/components/SystemSetting.vue
@@ -62,13 +62,13 @@
];
});
const collapseActive = ref(['1', '2', '3', '4']);
- /* 获取所有系统设置 */
+ /* Get all system settings */
async function getSettingAll() {
const res = await fetchSystemSetting();
settings.value = res;
}
- /* 更新设置值 */
+ /* Update setting value */
async function handleSettingUpdate(record: SystemSetting) {
await fetchSystemSettingUpdate({
settingKey: record.settingKey,
diff --git
a/streampark-console/streampark-console-newui/src/views/sys/error-log/index.vue
b/streampark-console/streampark-console-newui/src/views/sys/error-log/index.vue
index f8d11a86a..ca7fb4edc 100644
---
a/streampark-console/streampark-console-newui/src/views/sys/error-log/index.vue
+++
b/streampark-console/streampark-console-newui/src/views/sys/error-log/index.vue
@@ -88,7 +88,7 @@
if (import.meta.env.DEV) {
createMessage.info(t('sys.errorLog.enableMessage'));
}
- // 查看详情
+ // check the details
function handleDetail(row: ErrorLogInfo) {
rowInfo.value = row;
openModal(true);
diff --git
a/streampark-console/streampark-console-newui/src/views/sys/exception/Exception.vue
b/streampark-console/streampark-console-newui/src/views/sys/exception/Exception.vue
index f8eb0e7e5..c54bd9fd5 100644
---
a/streampark-console/streampark-console-newui/src/views/sys/exception/Exception.vue
+++
b/streampark-console/streampark-console-newui/src/views/sys/exception/Exception.vue
@@ -39,7 +39,7 @@
export default defineComponent({
name: 'ErrorPage',
props: {
- // 状态码
+ // status code
status: {
type: Number as PropType<number>,
default: ExceptionEnum.PAGE_NOT_FOUND,
diff --git
a/streampark-console/streampark-console-newui/src/views/sys/lock/useNow.ts
b/streampark-console/streampark-console-newui/src/views/sys/lock/useNow.ts
index 4bdd9c67e..eb630796a 100644
--- a/streampark-console/streampark-console-newui/src/views/sys/lock/useNow.ts
+++ b/streampark-console/streampark-console-newui/src/views/sys/lock/useNow.ts
@@ -41,7 +41,9 @@ export function useNow(immediate = true) {
state.year = now.get('y');
state.month = now.get('M') + 1;
- state.week = '星期' + ['日', '一', '二', '三', '四', '五', '六'][now.day()];
+ state.week =
+ 'Week' +
+ ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday',
'Saturday'][now.day()];
state.day = now.get('date');
state.hour = h;
state.minute = m;
diff --git
a/streampark-console/streampark-console-newui/src/views/sys/login/SessionTimeoutLogin.vue
b/streampark-console/streampark-console-newui/src/views/sys/login/SessionTimeoutLogin.vue
index 5842a2dcf..c8b3d682f 100644
---
a/streampark-console/streampark-console-newui/src/views/sys/login/SessionTimeoutLogin.vue
+++
b/streampark-console/streampark-console-newui/src/views/sys/login/SessionTimeoutLogin.vue
@@ -41,17 +41,17 @@
};
onMounted(() => {
- // 记录当前的UserId
+ // Record the current UserId
userId.value = userStore.getUserInfo?.userId;
console.log('Mounted', userStore.getUserInfo);
});
onBeforeUnmount(() => {
if (userId.value && userId.value !== userStore.getUserInfo.userId) {
- // 登录的不是同一个用户，刷新整个页面以便丢弃之前用户的页面状态
+ // Not the same user is logged in, refresh the entire page to discard
the previous user's page state
document.location.reload();
} else if (isBackMode() && permissionStore.getLastBuildMenuTime === 0) {
- // 后台权限模式下，没有成功加载过菜单，就重新加载整个页面。这通常发生在会话过期后按F5刷新整个页面后载入了本模块这种场景
+ // In the background permission mode, if the menu is not loaded
successfully, the entire page is reloaded. This usually happens when this
module is loaded after pressing F5 to refresh the entire page after the session
expires
document.location.reload();
}
});
diff --git
a/streampark-console/streampark-console-newui/src/views/system/account/AccountDetail.vue
b/streampark-console/streampark-console-newui/src/views/system/account/AccountDetail.vue
index d85863808..25c3acf3c 100644
---
a/streampark-console/streampark-console-newui/src/views/system/account/AccountDetail.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/account/AccountDetail.vue
@@ -16,27 +16,27 @@
-->
<template>
<PageWrapper
- :title="`用户` + userId + `的资料`"
- content="这是用户资料详情页面。本页面仅用于演示相同路由在tab中打开多个页面并且显示不同的数据"
+ :title="`username` + userId + `profile`"
+ content="This is the user profile details page. This page is only used to
demonstrate that the same route opens multiple pages in the tab and displays
different data"
contentBackground
@back="goBack"
>
<template #extra>
- <a-button type="primary" danger> 禁用账号 </a-button>
- <a-button type="primary"> 修改密码 </a-button>
+ <a-button type="primary" danger> Disable account </a-button>
+ <a-button type="primary"> change Password </a-button>
</template>
<template #footer>
<a-tabs default-active-key="detail" v-model:activeKey="currentKey">
- <a-tab-pane key="detail" tab="用户资料" />
- <a-tab-pane key="logs" tab="操作日志" />
+ <a-tab-pane key="detail" tab="user information" />
+ <a-tab-pane key="logs" tab="Operation log" />
</a-tabs>
</template>
<div class="pt-4 m-4 desc-wrap">
<template v-if="currentKey == 'detail'">
- <div v-for="i in 10" :key="i">这是用户{{ userId }}资料Tab</div>
+ <div v-for="i in 10" :key="i">This is the user {{ userId }} profile
Tab</div>
</template>
<template v-if="currentKey == 'logs'">
- <div v-for="i in 10" :key="i">这是用户{{ userId }}操作日志Tab</div>
+ <div v-for="i in 10" :key="i">This is the user {{ userId }} operation
log Tab</div>
</template>
</div>
</PageWrapper>
@@ -55,19 +55,19 @@
setup() {
const route = useRoute();
const go = useGo();
- // 此处可以得到用户ID
+ // User ID can be found here
const userId = ref(route.params?.id);
const currentKey = ref('detail');
const { setTitle } = useTabs();
// TODO
- // 本页代码仅作演示，实际应当通过userId从接口获得用户的相关资料
+ // The code on this page is only for demonstration. In fact, the
relevant information of the user should be obtained from the interface through
the userId
- // 设置Tab的标题（不会影响页面标题）
+ // Set the title of the tab (does not affect the title of the page)
setTitle('详情：用户' + userId.value);
- // 页面左侧点击返回链接时的操作
+ // What to do when you click the back link on the left side of the page
function goBack() {
- // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
+ // In the effect of this example, click Back to always jump to the
account list page, and can return to the previous page in actual application
go('/system/account');
}
return { userId, currentKey, goBack };
diff --git
a/streampark-console/streampark-console-newui/src/views/system/account/AccountModal.vue
b/streampark-console/streampark-console-newui/src/views/system/account/AccountModal.vue
index fbed15717..55beb25eb 100644
---
a/streampark-console/streampark-console-newui/src/views/system/account/AccountModal.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/account/AccountModal.vue
@@ -69,7 +69,7 @@
]);
});
- const getTitle = computed(() => (!unref(isUpdate) ? '新增账号' : '编辑账号'));
+ const getTitle = computed(() => (!unref(isUpdate) ? 'Add account' :
'Edit account'));
async function handleSubmit() {
try {
diff --git
a/streampark-console/streampark-console-newui/src/views/system/account/DeptTree.vue
b/streampark-console/streampark-console-newui/src/views/system/account/DeptTree.vue
index 9f9694ac5..9abda8287 100644
---
a/streampark-console/streampark-console-newui/src/views/system/account/DeptTree.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/account/DeptTree.vue
@@ -17,7 +17,7 @@
<template>
<div class="m-4 mr-0 overflow-hidden bg-white">
<BasicTree
- title="部门列表"
+ title="Department List"
toolbar
search
:clickRowToExpand="false"
diff --git
a/streampark-console/streampark-console-newui/src/views/system/account/account.data.ts
b/streampark-console/streampark-console-newui/src/views/system/account/account.data.ts
index 957aac302..e1986c172 100644
---
a/streampark-console/streampark-console-newui/src/views/system/account/account.data.ts
+++
b/streampark-console/streampark-console-newui/src/views/system/account/account.data.ts
@@ -20,32 +20,32 @@ import { FormSchema } from '/@/components/Table';
export const columns: BasicColumn[] = [
{
- title: '用户名',
+ title: 'username',
dataIndex: 'account',
width: 120,
},
{
- title: '昵称',
+ title: 'nick name',
dataIndex: 'nickname',
width: 120,
},
{
- title: '邮箱',
+ title: 'email',
dataIndex: 'email',
width: 120,
},
{
- title: '创建时间',
+ title: 'create time',
dataIndex: 'createTime',
width: 180,
},
{
- title: '角色',
+ title: 'role',
dataIndex: 'role',
width: 200,
},
{
- title: '备注',
+ title: 'remark',
dataIndex: 'remark',
},
];
@@ -53,13 +53,13 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
{
field: 'account',
- label: '用户名',
+ label: 'username',
component: 'Input',
colProps: { span: 8 },
},
{
field: 'nickname',
- label: '昵称',
+ label: 'nick name',
component: 'Input',
colProps: { span: 8 },
},
@@ -68,13 +68,16 @@ export const searchFormSchema: FormSchema[] = [
export const accountFormSchema: FormSchema[] = [
{
field: 'account',
- label: '用户名',
+ label: 'username',
component: 'Input',
- helpMessage: ['本字段演示异步验证', '不能输入带有admin的用户名'],
+ helpMessage: [
+ 'This field demonstrates asynchronous validation',
+ 'Cannot enter username with admin',
+ ],
rules: [
{
required: true,
- message: '请输入用户名',
+ message: 'please enter user name',
},
{
validator(_, value) {
@@ -82,7 +85,7 @@ export const accountFormSchema: FormSchema[] = [
isAccountExist(value)
.then(() => resolve())
.catch((err) => {
- reject(err.message || '验证失败');
+ reject(err.message || 'verification failed');
});
});
},
@@ -91,13 +94,13 @@ export const accountFormSchema: FormSchema[] = [
},
{
field: 'pwd',
- label: '密码',
+ label: 'password',
component: 'InputPassword',
required: true,
ifShow: false,
},
{
- label: '角色',
+ label: 'role',
field: 'role',
component: 'ApiSelect',
componentProps: {
@@ -109,7 +112,7 @@ export const accountFormSchema: FormSchema[] = [
},
{
field: 'dept',
- label: '所属部门',
+ label: 'department',
component: 'TreeSelect',
componentProps: {
fieldNames: {
@@ -123,20 +126,20 @@ export const accountFormSchema: FormSchema[] = [
},
{
field: 'nickname',
- label: '昵称',
+ label: 'nick name',
component: 'Input',
required: true,
},
{
- label: '邮箱',
+ label: 'email',
field: 'email',
component: 'Input',
required: true,
},
{
- label: '备注',
+ label: 'remark',
field: 'remark',
component: 'InputTextArea',
},
diff --git
a/streampark-console/streampark-console-newui/src/views/system/account/index.vue
b/streampark-console/streampark-console-newui/src/views/system/account/index.vue
index cf5696bb5..835dc87a4 100644
---
a/streampark-console/streampark-console-newui/src/views/system/account/index.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/account/index.vue
@@ -26,20 +26,20 @@
:actions="[
{
icon: 'clarity:info-standard-line',
- tooltip: '查看用户详情',
+ tooltip: 'View user details',
onClick: handleView.bind(null, record),
},
{
icon: 'clarity:note-edit-line',
- tooltip: '编辑用户资料',
+ tooltip: 'Edit user profile',
onClick: handleEdit.bind(null, record),
},
{
icon: 'ant-design:delete-outlined',
color: 'error',
- tooltip: '删除此账号',
+ tooltip: 'delete this account',
popConfirm: {
- title: '是否确认删除',
+ title: 'Whether to confirm the deletion',
placement: 'left',
confirm: handleDelete.bind(null, record),
},
@@ -91,7 +91,7 @@
},
actionColumn: {
width: 120,
- title: '操作',
+ title: 'operate',
dataIndex: 'action',
slots: { customRender: 'action' },
},
@@ -117,8 +117,8 @@
function handleSuccess({ isUpdate, values }) {
if (isUpdate) {
- // 演示不刷新表格直接更新内部数据。
- // 注意：updateTableDataRecord要求表格的rowKey属性为string并且存在于每一行的record的keys中
+ // Demo directly update internal data without refreshing the table。
+ // Note: updateTableDataRecord requires that the rowKey property of
the table is string and exists in the keys of the record of each row
const result = updateTableDataRecord(values.id, values);
console.log(result);
} else {
diff --git
a/streampark-console/streampark-console-newui/src/views/system/dept/DeptModal.vue
b/streampark-console/streampark-console-newui/src/views/system/dept/DeptModal.vue
index e87b68503..84da07e8b 100644
---
a/streampark-console/streampark-console-newui/src/views/system/dept/DeptModal.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/dept/DeptModal.vue
@@ -57,7 +57,7 @@
});
});
- const getTitle = computed(() => (!unref(isUpdate) ? '新增部门' : '编辑部门'));
+ const getTitle = computed(() => (!unref(isUpdate) ? 'add department' :
'edit department'));
async function handleSubmit() {
try {
diff --git
a/streampark-console/streampark-console-newui/src/views/system/dept/dept.data.ts
b/streampark-console/streampark-console-newui/src/views/system/dept/dept.data.ts
index f267199a3..d9e387ed7 100644
---
a/streampark-console/streampark-console-newui/src/views/system/dept/dept.data.ts
+++
b/streampark-console/streampark-console-newui/src/views/system/dept/dept.data.ts
@@ -21,35 +21,35 @@ import { Tag } from 'ant-design-vue';
export const columns: BasicColumn[] = [
{
- title: '部门名称',
+ title: 'department name',
dataIndex: 'deptName',
width: 160,
align: 'left',
},
{
- title: '排序',
+ title: 'sort',
dataIndex: 'orderNo',
width: 50,
},
{
- title: '状态',
+ title: 'status',
dataIndex: 'status',
width: 80,
customRender: ({ record }) => {
const status = record.status;
const enable = ~~status === 0;
const color = enable ? 'green' : 'red';
- const text = enable ? '启用' : '停用';
+ const text = enable ? 'enable' : 'disable';
return h(Tag, { color: color }, () => text);
},
},
{
- title: '创建时间',
+ title: 'create time',
dataIndex: 'createTime',
width: 180,
},
{
- title: '备注',
+ title: 'remark',
dataIndex: 'remark',
},
];
@@ -57,18 +57,18 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
{
field: 'deptName',
- label: '部门名称',
+ label: 'department name',
component: 'Input',
colProps: { span: 8 },
},
{
field: 'status',
- label: '状态',
+ label: 'status',
component: 'Select',
componentProps: {
options: [
- { label: '启用', value: '0' },
- { label: '停用', value: '1' },
+ { label: 'enable', value: '0' },
+ { label: 'disable', value: '1' },
],
},
colProps: { span: 8 },
@@ -78,13 +78,13 @@ export const searchFormSchema: FormSchema[] = [
export const formSchema: FormSchema[] = [
{
field: 'deptName',
- label: '部门名称',
+ label: 'department name',
component: 'Input',
required: true,
},
{
field: 'parentDept',
- label: '上级部门',
+ label: 'parent department',
component: 'TreeSelect',
componentProps: {
@@ -99,25 +99,25 @@ export const formSchema: FormSchema[] = [
},
{
field: 'orderNo',
- label: '排序',
+ label: 'sort',
component: 'InputNumber',
required: true,
},
{
field: 'status',
- label: '状态',
+ label: 'status',
component: 'RadioButtonGroup',
defaultValue: '0',
componentProps: {
options: [
- { label: '启用', value: '0' },
- { label: '停用', value: '1' },
+ { label: 'enable', value: '0' },
+ { label: 'disable', value: '1' },
],
},
required: true,
},
{
- label: '备注',
+ label: 'remark',
field: 'remark',
component: 'InputTextArea',
},
diff --git
a/streampark-console/streampark-console-newui/src/views/system/dept/index.vue
b/streampark-console/streampark-console-newui/src/views/system/dept/index.vue
index 7c17dd751..e229f3650 100644
---
a/streampark-console/streampark-console-newui/src/views/system/dept/index.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/dept/index.vue
@@ -31,7 +31,7 @@
icon: 'ant-design:delete-outlined',
color: 'error',
popConfirm: {
- title: '是否确认删除',
+ title: 'Whether to confirm the deletion',
placement: 'left',
confirm: handleDelete.bind(null, record),
},
@@ -60,7 +60,7 @@
setup() {
const [registerModal, { openModal }] = useModal();
const [registerTable, { reload }] = useTable({
- title: '部门列表',
+ title: 'Department List',
api: getDeptList,
columns,
formConfig: {
@@ -76,7 +76,7 @@
canResize: false,
actionColumn: {
width: 80,
- title: '操作',
+ title: 'operate',
dataIndex: 'action',
slots: { customRender: 'action' },
fixed: undefined,
diff --git
a/streampark-console/streampark-console-newui/src/views/system/member/MemberDrawer.vue
b/streampark-console/streampark-console-newui/src/views/system/member/MemberDrawer.vue
index f223e9122..8976ff1ff 100644
---
a/streampark-console/streampark-console-newui/src/views/system/member/MemberDrawer.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/member/MemberDrawer.vue
@@ -154,7 +154,7 @@
const getTitle = computed(() =>
!unref(isUpdate) ? t('system.member.addMember') :
t('system.member.modifyMember'),
);
- /* 表单提交 */
+ // form submit
async function handleSubmit() {
try {
const values = await validate();
diff --git
a/streampark-console/streampark-console-newui/src/views/system/menu/Menu.vue
b/streampark-console/streampark-console-newui/src/views/system/menu/Menu.vue
index 518a67134..1a1730312 100644
--- a/streampark-console/streampark-console-newui/src/views/system/menu/Menu.vue
+++ b/streampark-console/streampark-console-newui/src/views/system/menu/Menu.vue
@@ -97,7 +97,7 @@
}
function onFetchSuccess() {
- // 演示默认展开所有表项
+ // Demo expands all table items by default
nextTick(expandAll);
}
diff --git
a/streampark-console/streampark-console-newui/src/views/system/menu/menu.data.ts
b/streampark-console/streampark-console-newui/src/views/system/menu/menu.data.ts
index d7a7ebf87..33a22037e 100644
---
a/streampark-console/streampark-console-newui/src/views/system/menu/menu.data.ts
+++
b/streampark-console/streampark-console-newui/src/views/system/menu/menu.data.ts
@@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [
title: 'Type',
dataIndex: 'type',
customRender: ({ record }) => {
- const text = isMenu(record.type) ? '菜单' : '按钮';
+ const text = isMenu(record.type) ? 'menu' : 'button';
return h(Tag, { color: isMenu(record.type) ? 'cyan' : 'pink' }, () =>
text);
},
},
@@ -143,41 +143,41 @@ export const formSchema: FormSchema[] = [
},
{
field: 'orderNum',
- label: '排序',
+ label: 'sort',
component: 'InputNumber',
required: true,
ifShow: ({ values }) => !isButton(values.type),
},
{
field: 'icon',
- label: '图标',
+ label: 'icon',
component: 'IconPicker',
required: true,
ifShow: ({ values }) => !isButton(values.type),
},
{
field: 'path',
- label: '菜单URL',
+ label: 'Menu URL',
component: 'Input',
required: true,
ifShow: ({ values }) => !isButton(values.type),
},
{
field: 'component',
- label: '组件地址',
+ label: 'component address',
component: 'Input',
ifShow: ({ values }) => isMenu(values.type),
},
{
field: 'perms',
- label: '相关权限',
+ label: 'Related permissions',
component: 'Input',
- rules: [{ max: 50, message: '长度不能超过50个字符' }],
+ rules: [{ max: 50, message: 'Length cannot exceed 50 characters' }],
ifShow: ({ values }) => !isDir(values.type),
},
{
field: 'display',
- label: '是否显示',
+ label: 'whether to display',
component: 'Switch',
defaultValue: '1',
componentProps: {
diff --git
a/streampark-console/streampark-console-newui/src/views/system/password/index.vue
b/streampark-console/streampark-console-newui/src/views/system/password/index.vue
index d0b45edb9..499548f44 100644
---
a/streampark-console/streampark-console-newui/src/views/system/password/index.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/password/index.vue
@@ -15,12 +15,15 @@
limitations under the License.
-->
<template>
- <PageWrapper title="修改当前用户密码" content="修改成功后会自动退出当前登录！">
+ <PageWrapper
+ title="Modify the current user password"
+ content="After the modification is successful, the current login will be
automatically logged out！"
+ >
<div class="py-8 bg-white flex flex-col justify-center items-center">
<BasicForm @register="register" />
<div class="flex justify-center">
- <a-button @click="resetFields"> 重置 </a-button>
- <a-button class="!ml-4" type="primary" @click="handleSubmit"> 确认
</a-button>
+ <a-button @click="resetFields"> reset </a-button>
+ <a-button class="!ml-4" type="primary" @click="handleSubmit"> confirm
</a-button>
</div>
</div>
</PageWrapper>
diff --git
a/streampark-console/streampark-console-newui/src/views/system/password/pwd.data.ts
b/streampark-console/streampark-console-newui/src/views/system/password/pwd.data.ts
index ee18832c6..2fef2fdba 100644
---
a/streampark-console/streampark-console-newui/src/views/system/password/pwd.data.ts
+++
b/streampark-console/streampark-console-newui/src/views/system/password/pwd.data.ts
@@ -19,27 +19,27 @@ import { FormSchema } from '/@/components/Form';
export const formSchema: FormSchema[] = [
{
field: 'passwordOld',
- label: '当前密码',
+ label: 'current password',
component: 'InputPassword',
required: true,
},
{
field: 'passwordNew',
- label: '新密码',
+ label: 'new password',
component: 'StrengthMeter',
componentProps: {
- placeholder: '新密码',
+ placeholder: 'new password',
},
rules: [
{
required: true,
- message: '请输入新密码',
+ message: 'Please enter a new password',
},
],
},
{
field: 'confirmPassword',
- label: '确认密码',
+ label: 'Confirm Password',
component: 'InputPassword',
dynamicRules: ({ values }) => {
@@ -48,10 +48,10 @@ export const formSchema: FormSchema[] = [
required: true,
validator: (_, value) => {
if (!value) {
- return Promise.reject('密码不能为空');
+ return Promise.reject('password can not be blank');
}
if (value !== values.passwordNew) {
- return Promise.reject('两次输入的密码不一致!');
+ return Promise.reject('The two entered passwords do not match!');
}
return Promise.resolve();
},
diff --git
a/streampark-console/streampark-console-newui/src/views/system/role/RoleDrawer.vue
b/streampark-console/streampark-console-newui/src/views/system/role/RoleDrawer.vue
index 8b16207bf..85618ddfe 100644
---
a/streampark-console/streampark-console-newui/src/views/system/role/RoleDrawer.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/role/RoleDrawer.vue
@@ -31,7 +31,7 @@
:fieldNames="{ title: 'text', key: 'id' }"
checkable
toolbar
- title="菜单分配"
+ title="menu assignment"
/>
</template>
</BasicForm>
@@ -81,7 +81,7 @@
});
formType.value = data.formType;
- // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+ // You need to fill in treeData before setFieldsValue, otherwise the
Tree component may report a key not exist warning
if (!unref(isCreate)) {
const res = await getRoleMenu({ roleId: data.record.roleId });
data.record.menuId = res || [];
diff --git
a/streampark-console/streampark-console-newui/src/views/system/team/TeamDrawer.vue
b/streampark-console/streampark-console-newui/src/views/system/team/TeamDrawer.vue
index a9a4ea621..6e1e32734 100644
---
a/streampark-console/streampark-console-newui/src/views/system/team/TeamDrawer.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/team/TeamDrawer.vue
@@ -86,7 +86,7 @@
const getTitle = computed(() =>
!unref(isUpdate) ? t('system.team.addTeam') :
t('system.team.modifyTeam'),
);
- /* 表单提交 */
+ // form submit
async function handleSubmit() {
try {
const values = await validate();
diff --git
a/streampark-console/streampark-console-newui/src/views/system/token/Token.vue
b/streampark-console/streampark-console-newui/src/views/system/token/Token.vue
index 171d50996..bb216589b 100644
---
a/streampark-console/streampark-console-newui/src/views/system/token/Token.vue
+++
b/streampark-console/streampark-console-newui/src/views/system/token/Token.vue
@@ -127,7 +127,7 @@
function onFetchSuccess(res) {
console.log(res);
- // 演示默认展开所有表项
+ // Demo expands all table items by default
nextTick(expandAll);
}
diff --git a/streampark-console/streampark-console-newui/tests/server/index.ts
b/streampark-console/streampark-console-newui/tests/server/index.ts
index 893886fce..26210c9e2 100644
--- a/streampark-console/streampark-console-newui/tests/server/index.ts
+++ b/streampark-console/streampark-console-newui/tests/server/index.ts
@@ -64,7 +64,7 @@ app.use(
encoding: 'gzip',
multipart: true,
formidable: {
- // uploadDir: path.join(__dirname, '/upload/'), // 设置文件上传目录
+ // uploadDir: path.join(__dirname, '/upload/'), // Set file upload
directory
keepExtensions: true,
maxFieldsSize: 20 * 1024 * 1024,
},
diff --git a/streampark-spark/streampark-spark-test/assembly.xml
b/streampark-spark/streampark-spark-test/assembly.xml
index fd45a1449..c0f0d1621 100644
--- a/streampark-spark/streampark-spark-test/assembly.xml
+++ b/streampark-spark/streampark-spark-test/assembly.xml
@@ -22,7 +22,7 @@
<format>tar.gz</format>
</formats>
<dependencySets>
- <!-- 需要打进去的jar包都写在这里，是的我没有找到好的方法😅 -->
+ <!-- The jar packages that need to be entered are all written here,
yes I have not found a good way😅 -->
<dependencySet>
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
