This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.3 by this push:
new 5e9433387 fix #2283 (#2292)
5e9433387 is described below
commit 5e9433387b2dbd64d794fe8491c392b3c2e63297
Author: [email protected] <[email protected]>
AuthorDate: Thu Jun 16 12:12:21 2022 +0800
fix #2283 (#2292)
---
web/src/apps/URM/i18n/common/en.json | 4 ++--
web/src/apps/URM/module/header/index.scss | 2 +-
web/src/apps/linkis/i18n/common/en.json | 24 ++++++++++++------------
web/src/apps/linkis/module/datasource/index.vue | 2 +-
web/src/apps/linkis/module/header/index.scss | 2 +-
web/src/common/i18n/en.json | 4 ++--
web/src/common/style/headerCommon.scss | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/web/src/apps/URM/i18n/common/en.json
b/web/src/apps/URM/i18n/common/en.json
index 5547e02db..cf4fb5c73 100644
--- a/web/src/apps/URM/i18n/common/en.json
+++ b/web/src/apps/URM/i18n/common/en.json
@@ -14,12 +14,12 @@
"functionType": "Function Type",
"addUDF": "Add UDF",
"creator": "Creator",
- "search": "search",
+ "search": "Search",
"addFunction": "Add Function",
"updateFunction": "Update Function",
"batchExportFunction": "Batch Export Function",
"batchImportFunction": "Batch Import Function",
- "status": "status",
+ "status": "Status",
"availableCluster": "Available Cluster",
"accessSetting": "Access Setting",
"functionDescription": "Function Description",
diff --git a/web/src/apps/URM/module/header/index.scss
b/web/src/apps/URM/module/header/index.scss
index ec0f640cb..e5ebdf073 100644
--- a/web/src/apps/URM/module/header/index.scss
+++ b/web/src/apps/URM/module/header/index.scss
@@ -57,7 +57,7 @@
}
.version {
position: absolute;
- right: 14px;
+ // right: 14px;
bottom: 15px;
font-size: 12px;
height: 15px;
diff --git a/web/src/apps/linkis/i18n/common/en.json
b/web/src/apps/linkis/i18n/common/en.json
index ffc24132c..9884ba716 100644
--- a/web/src/apps/linkis/i18n/common/en.json
+++ b/web/src/apps/linkis/i18n/common/en.json
@@ -279,23 +279,23 @@
"datasource": {
"pleaseInput": "Please input",
"datasourceSrc": "Datasource",
- "connectTest": "Test connection",
- "sourceName": "Data source name",
- "sourceDec": "Data source description",
- "sourceType": "Data source type",
+ "connectTest": "Test Connection",
+ "sourceName": "DataSource name",
+ "sourceDec": "DataSource description",
+ "sourceType": "DataSource type",
"creator": "Creator",
- "create": "add source",
- "exports": "export sources",
- "imports": "importing sources",
+ "create": "Add Source",
+ "exports": "Export Sources",
+ "imports": "Importing Sources",
"overdue": "Expire",
"versionList": "Version list",
- "dataSourceName": "Data source name",
- "dataSourceType": "Data source type",
- "createSystem": "Create system",
+ "dataSourceName": "DataSource name",
+ "dataSourceType": "DataSource type",
+ "createSystem": "Create System",
"dataSourceEnv": "Available Space",
"status": "Status",
"permissions": "Permissions",
- "label": "label",
+ "label": "Label",
"version": "Version",
"desc": "Description",
"action": "Action",
@@ -312,7 +312,7 @@
"cannotPublish": "Cannot publish",
"used": "Available",
"commentValue": "Roll back from version {text}",
- "undefinedVersion": "Cannot find the version of data source"
+ "undefinedVersion": "Cannot find the version of DataSource"
}
}
}
diff --git a/web/src/apps/linkis/module/datasource/index.vue
b/web/src/apps/linkis/module/datasource/index.vue
index c093bad89..5f02c7b5e 100644
--- a/web/src/apps/linkis/module/datasource/index.vue
+++ b/web/src/apps/linkis/module/datasource/index.vue
@@ -308,7 +308,7 @@ export default {
{
title: this.$t('message.linkis.datasource.createSystem'),
key: 'createSystem',
- width: 120,
+ width: 125,
tooltip: true,
align: 'center',
},
diff --git a/web/src/apps/linkis/module/header/index.scss
b/web/src/apps/linkis/module/header/index.scss
index f9e2bfc01..4ac6dc44c 100644
--- a/web/src/apps/linkis/module/header/index.scss
+++ b/web/src/apps/linkis/module/header/index.scss
@@ -56,7 +56,7 @@
}
.version {
position: absolute;
- right: 14px;
+ // right: 14px;
bottom: 15px;
font-size: 12px;
height: 15px;
diff --git a/web/src/common/i18n/en.json b/web/src/common/i18n/en.json
index 2ff5a1a20..1c77857b1 100644
--- a/web/src/common/i18n/en.json
+++ b/web/src/common/i18n/en.json
@@ -251,8 +251,8 @@
"comingSoon": "Planning in progress, please stay tuned!"
},
"login": {
- "loginTitle": "Welcome to Linkis Studioļ¼",
- "userName": "Please enter your phone",
+ "loginTitle": "Welcome to Linkis Console!",
+ "userName": "Please enter your username",
"remenber": "Remember me",
"login": "Login",
"passwordHint": "Please enter your password",
diff --git a/web/src/common/style/headerCommon.scss
b/web/src/common/style/headerCommon.scss
index d2a655d2b..802c22b14 100644
--- a/web/src/common/style/headerCommon.scss
+++ b/web/src/common/style/headerCommon.scss
@@ -57,7 +57,7 @@
}
.version {
position: absolute;
- right: -40px;
+ // right: -40px;
bottom: 10px;
font-size: $font-size-small;
height: 15px;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
