You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/07 15:44:33 UTC
[incubator-linkis] branch dev-1.3.1 updated: optimize console display (#3267)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new d186cd1db optimize console display (#3267)
d186cd1db is described below
commit d186cd1dbb38c836f1f11bcb915fb169a9a6ca08
Author: Yonghao Mei <73...@users.noreply.github.com>
AuthorDate: Wed Sep 7 23:44:25 2022 +0800
optimize console display (#3267)
* upd: open the download function
* fix: resolve category display problem in English mode
* optimize console display
* restore env config file
---
linkis-web/src/apps/URM/i18n/common/en.json | 4 +-
linkis-web/src/apps/linkis/i18n/common/en.json | 61 +++++++++---------
.../module/globalHistoryManagement/index.vue | 4 +-
.../linkis/module/resourceManagement/index.vue | 2 +-
.../linkis/module/resourceManagement/search.vue | 3 +-
linkis-web/src/common/i18n/en.json | 72 +++++++++++-----------
.../src/dss/module/resourceSimple/engine.vue | 6 +-
7 files changed, 77 insertions(+), 75 deletions(-)
diff --git a/linkis-web/src/apps/URM/i18n/common/en.json b/linkis-web/src/apps/URM/i18n/common/en.json
index cf4fb5c73..0c6ce4124 100644
--- a/linkis-web/src/apps/URM/i18n/common/en.json
+++ b/linkis-web/src/apps/URM/i18n/common/en.json
@@ -48,7 +48,7 @@
"scriptPath": "Script Path",
"registerFunction": "Register Function",
"registerFormat": "Register Format",
- "preview": "preview",
+ "preview": "Preview",
"useFormat": "Use Format",
"returnType": "Return Type",
"paramType": "Param Type",
@@ -70,7 +70,7 @@
"SRFHLX": "Please enter the return type",
"SRCSLX": "Please enter the parameter type",
"SRFL": "Please enter the directory",
- "XGHS": "Update funtion",
+ "XGHS": "Update Funtion",
"XG": "Update",
"QPZS": "View In Full Screen",
"QXQP": "Cancel Full Screen"
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json b/linkis-web/src/apps/linkis/i18n/common/en.json
index 9cd679085..fc06e65cc 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -4,15 +4,15 @@
"refresh": "Refresh",
"noDescription": "No description",
"placeholderZip": "Please enter the workspace Python package path (only zip is supported)!",
- "emptyString": "Empty string",
+ "emptyString": "Empty String",
"description": "Description",
"name": "Name",
"order": "Order",
- "addParameterConfig": "Add parameter configuration",
- "addEngineType": "Add engine type",
- "editDescriptionEngineConfig": "Edit description engine config",
- "addAppType": "Add application type",
- "editContents": "Add contents",
+ "addParameterConfig": "Add Parameter Configuration",
+ "addEngineType": "Add Engine Type",
+ "editDescriptionEngineConfig": "Edit Description Engine Config",
+ "addAppType": "Add Application Type",
+ "editContents": "Add Contents",
"ConfirmEdit": "Done",
"eurekaRegisterCenter": "Eureka Register Center",
"addTags": "Add Tags",
@@ -22,20 +22,20 @@
"initiator": "Created From",
"inputOwnerHint": "Please input owner",
"find": "Find",
- "errorCode": "Error code",
- "errorDescription": "Error description",
+ "errorCode": "Error Code",
+ "errorDescription": "Error Description",
"notLog": "Log not obtained!",
"editedSuccess": "Edited success!",
"stopEngineTip": "Are you sure you want to stop the current engine?",
- "addVariable": "Add variable",
+ "addVariable": "Add Variable",
"defaultValue": "Default",
"noDefaultValue": "No default value",
"stop": "Stop",
"tip": "Tip",
"serverTip": "No Results（resultLocation:null）",
- "log": "Task log",
- "detail": "Task detail",
- "result": "Task result",
+ "log": "Task Log",
+ "detail": "Task Detail",
+ "result": "Task Result",
"startUp": "Start-up",
"tagEdit": "Edit",
"rename": "Rename",
@@ -46,6 +46,7 @@
"reset": "Reset",
"clearSearch": "Clear",
"showOperations": "Show Operations",
+ "hide": "Hide",
"resetAll": "Reset All",
"remove": "Remove",
"submit": "Submit",
@@ -61,8 +62,8 @@
"unselect": "Please select task",
"noselection": "Please select first",
"searchName": "Please enter username to search",
- "generalView": "Switch to the common view",
- "manageView": "Switch to the admin view",
+ "generalView": "Switch to The Common View",
+ "manageView": "Switch to The Admin View",
"back": "Back",
"prev": "Previous Step",
"complete": "Complete",
@@ -104,10 +105,10 @@
"label": "Label",
"engineVersion": "Engine Version",
"engineVersionCannotBeNull": "Engine Version Cannot Be Null",
- "lockedResource": "Locked resources",
- "usedResources": "Used resources",
- "maximumAvailableResources": "Maximum available resources",
- "minimumAvailableResources": "Minimum available resources",
+ "lockedResource": "Locked Resources",
+ "usedResources": "Used Resources",
+ "maximumAvailableResources": "Maximum Available Resources",
+ "minimumAvailableResources": "Minimum Available Resources",
"startTime": "Start Time",
"costTime": "Time Elapsed",
"executeApplicationName": "Execution Engine",
@@ -122,10 +123,10 @@
},
"queenRemain": "Queen Remain",
"queueUsed": "Queue Used",
- "queueTop": "Queue Top",
+ "queueTop": "Queue Max",
"engineRemain": "Engine Remain",
"engineUsed": "Engine Used",
- "engineTop": "Engine Top"
+ "engineTop": "Engine Max"
},
"logLoading": "Requesting logs, please hold on",
"title": "Linkis Control Panel",
@@ -290,17 +291,17 @@
"pleaseInput": "Please input",
"datasourceSrc": "Datasource",
"connectTest": "Test Connection",
- "sourceName": "DataSource name",
- "sourceDec": "DataSource description",
- "sourceType": "DataSource type",
+ "sourceName": "DataSource Name",
+ "sourceDec": "DataSource Description",
+ "sourceType": "DataSource Type",
"creator": "Creator",
"create": "Add Source",
"exports": "Export Sources",
"imports": "Importing Sources",
"overdue": "Expire",
"versionList": "Version list",
- "dataSourceName": "DataSource name",
- "dataSourceType": "DataSource type",
+ "dataSourceName": "DataSource Name",
+ "dataSourceType": "DataSource Type",
"createSystem": "Create System",
"dataSourceEnv": "Available Space",
"status": "Status",
@@ -309,14 +310,14 @@
"version": "Version",
"desc": "Description",
"action": "Action",
- "createUser": "Create user",
- "createTime": "Create time",
- "versionDec": "Version description",
+ "createUser": "Create User",
+ "createTime": "Create Time",
+ "versionDec": "Version Description",
"watch": "View",
"rollback": "Rollback",
"publish": "Publish",
- "initVersion": "Initial version",
- "updateVersion": "Version update",
+ "initVersion": "Initial Version",
+ "updateVersion": "Version Update",
"published": "Published",
"unpublish": "Unpublished",
"cannotPublish": "Cannot publish",
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
index bb1bac2ad..64d8a4d0a 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -362,8 +362,8 @@ export default {
},
getParams(page) {
- const startDate = this.searchBar.shortcut[0]
- const endDate = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].getTime()+86399999) : this.searchBar.shortcut[1]
+ const startDate = this.searchBar.shortcut[0] ? new Date(this.searchBar.shortcut[0].setHours(0, 0, 0, 0)) : this.searchBar.shortcut[0]
+ const endDate = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].setHours(23, 59, 59, 0)): this.searchBar.shortcut[1]
const params = {
taskID: this.searchBar.id,
creator: this.searchBar.creator,
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
index 20efce49d..c18edb96a 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
@@ -481,7 +481,7 @@ export default {
this.currentParentsData = item;
this.tagTitle = Object.assign(this.tagTitle, [item.userCreator])
} else {
- this.tagTitle = Object.assign(this.tagTitle, [this.currentParentsData.userCreator, item.engineType])
+ this.tagTitle = Object.assign(this.tagTitle, [parentData.userCreator, item.engineType])
}
let parameter = {
userCreator: isChildren ? parentData.userCreator : this.currentParentsData.userCreator,
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/search.vue b/linkis-web/src/apps/linkis/module/resourceManagement/search.vue
index 497016aca..2a6550740 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/search.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/search.vue
@@ -131,7 +131,8 @@ export default {
methods: {
search(isChangingPage) {
if (!isChangingPage) this.page.pageNow = 1
- this.searchBar.shortcut[1] = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].getTime()+86399999) : this.searchBar.shortcut[1]
+ this.searchBar.shortcut[0] = this.searchBar.shortcut[0] ? new Date(this.searchBar.shortcut[0].setHours(0, 0, 0, 0)) : this.searchBar.shortcut[0]
+ this.searchBar.shortcut[1] = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].setHours(23, 59, 59, 0)): this.searchBar.shortcut[1]
this.$emit("search", this.searchBar)
},
stop() {
diff --git a/linkis-web/src/common/i18n/en.json b/linkis-web/src/common/i18n/en.json
index 84b285c0d..435072a5c 100644
--- a/linkis-web/src/common/i18n/en.json
+++ b/linkis-web/src/common/i18n/en.json
@@ -13,12 +13,12 @@
"saveSuccess": "Successfully saved",
"detail": "Details",
"FAQ": "FAQ",
- "clearCache": "Clear cache",
+ "clearCache": "Clear Cache",
"logOut": "Log out",
"action": "Action",
"path": "Please choose the path",
"resultList": "Resultset",
- "process": "Execution time:",
+ "process": "Execution Time:",
"ok": "OK",
"cancel": "Cancel",
"delete": "Delete",
@@ -45,7 +45,7 @@
"render": "Start to execute the script"
},
"querySuccess": {
- "title": "Execution result notice",
+ "title": "Execution Result Notice",
"render": "Successfully executed script, time elapsed:"
},
"notice": {
@@ -108,14 +108,14 @@
}
},
"progress": {
- "title": "Execution progress",
+ "title": "Execution Progress",
"watingList": "{num} jobs wating in front",
"columns": {
"id": {
"title": "Name"
},
"progress": {
- "title": "Progress bar"
+ "title": "Progress Bar"
},
"taskNum": {
"title": "Number of Tasks",
@@ -146,18 +146,18 @@
},
"functionView": {
"formItems": {
- "name": "Funtion name",
+ "name": "Funtion Name",
"createUser": "Creator/Department",
"updateTime": "Updated At",
- "useFormat": "Using format",
- "description": "Funtion description"
+ "useFormat": "Using Format",
+ "description": "Funtion Description"
}
},
"navBar": {
- "addTitle": "New directory",
+ "addTitle": "New Directory",
"dataStudio": {
- "outTable": "Export table",
- "importHive": "Import to hive",
+ "outTable": "Export Table",
+ "importHive": "Import to Hive",
"addTitle": "New directory",
"searchPlaceholder": "Please enter file or directory name to search"
},
@@ -175,30 +175,30 @@
}
},
"monacoMenu": {
- "YXJB": "Run script",
+ "YXJB": "Run Script",
"GSH": "Format",
"CZ": "Search",
"TH": "Replace",
- "HZS": "Line comment",
+ "HZS": "Line Comment",
"ZT": "Paste",
"HBQWJCFZWB": "Sorry, no copied text detected by IDE, if you performed the copy operation outside IDE, please use ctrl+v to paste!",
- "TDZDH": "Jump to line",
- "GBYFJC": "Close syntax check",
- "DKYFJC": "Open syntax check",
+ "TDZDH": "Jump to Line",
+ "GBYFJC": "Close Syntax Check",
+ "DKYFJC": "Open Syntax Check",
"GYFSYGWYF": "This is highly dangerous syntax, please be cautious!"
},
"resourceSimple": {
"YS": "Scriptis",
"FL": "Category",
"ZH": "Visualis",
- "FLOW1": "flowexecution",
+ "FLOW1": "Flowexecution",
"FLOW2": "Scheduler",
"ZWSJ": "No data yet",
"KX": "Idle",
"FM": "Busy",
"QD": "Starting",
- "LX": "By category",
- "AZT": "By status",
+ "LX": "By Category",
+ "AZT": "By Status",
"DDJK": "Waiting for API response!",
"QDYQWFJS": "Cannot shut down an engine with starting status!",
"WXZYQ": "No engine selected!",
@@ -206,33 +206,33 @@
"YQGLQ": "Engine Management",
"DLGLQ": "Queue Management",
"SX": "Refresh",
- "JSRW": "Cancel task",
- "JSYQ": "Shut down engine",
+ "JSRW": "Cancel Task",
+ "JSYQ": "Shut Down Engine",
"PDZ": "Queueing",
- "ZYSQ": "Applying resources",
+ "ZYSQ": "Applying Resources",
"YX": "Running",
"YQ": "Engine",
"RW": "Task",
- "WZJBMC": "Unknown script name",
- "ZHJB": "Visualis script",
- "GZLJB": "workflow script",
- "YQRW": "Engine and task",
- "JSYQRW": "Terminate engine and tasks",
- "CKJBXX": "View script information",
- "FZJBXX": "Copy script information",
+ "WZJBMC": "Unknown Script Name",
+ "ZHJB": "Visualis Script",
+ "GZLJB": "Workflow Script",
+ "YQRW": "Engine And Task",
+ "JSYQRW": "Terminate Engine And Tasks",
+ "CKJBXX": "View Script Information",
+ "FZJBXX": "Copy Script Information",
"QXZYTJL": "Please choose a record!",
"WHQD": "The task is initializing. The end operation cannot be performed. Please wait until the task initialization is complete",
"WHQDENGINE": "Failed to get engineInstance, please contact admin for investigation or waiting!",
- "YXTS": "Execution hints",
- "YJTZZXJB": "Stopped executing script",
- "JSYQHRWCG": "Successfully terminated engine and tasks",
- "DKCG": "Successfully open",
+ "YXTS": "Execution Hints",
+ "YJTZZXJB": "Stopped Executing Script",
+ "JSYQHRWCG": "Successfully Terminated Engine And Tasks",
+ "DKCG": "Successfully Open",
"JBFZDZTRB": "Copied script information to clipboard, please use ctrl+v to paste!",
"XZDL": "Please choose a queue",
- "ZYSYL": "Resource consumption rate",
+ "ZYSYL": "Resource Consumption Rate",
"H": "Cores",
"NC": "Memory",
- "ZYSYPHB": "Ranking of resource consumption",
+ "ZYSYPHB": "Ranking Of Resource Consumption",
"ZW": "No data yet"
},
"headerNavBar": {
@@ -304,7 +304,7 @@
"success": {
"download": "Successfully downloaded, please check from the local download directory!"
},
- "rowToColumn": "switch row to column",
+ "rowToColumn": "Switch row to column",
"rowToColumnTitle": "View current row details"
},
"tableRow": {
diff --git a/linkis-web/src/dss/module/resourceSimple/engine.vue b/linkis-web/src/dss/module/resourceSimple/engine.vue
index ce2c9818e..3a38b83df 100644
--- a/linkis-web/src/dss/module/resourceSimple/engine.vue
+++ b/linkis-web/src/dss/module/resourceSimple/engine.vue
@@ -27,7 +27,7 @@
<div class="engine-header-bar">
<h3 class="data-type-title">{{ $t('message.common.resourceSimple.YS') }}</h3>
<div class="classify">
- <span style="display: inline">{{ $t('message.common.resourceSimple.FL') }}</span>
+ <span style="width: auto; white-space: nowrap;">{{ $t('message.common.resourceSimple.FL') }}</span>
<Select v-model="ideSelectData">
<Option
v-for="item in typeList"
@@ -70,7 +70,7 @@
<div class="engine-header-bar">
<h3 class="data-type-title">{{ $t('message.common.resourceSimple.ZH') }}</h3>
<div class="classify">
- <span>{{ $t('message.common.resourceSimple.FL') }}</span>
+ <span style="width: auto; white-space: nowrap;">{{ $t('message.common.resourceSimple.FL') }}</span>
<Select v-model="boardSelectData">
<Option
v-for="item in typeList"
@@ -113,7 +113,7 @@
<div class="engine-header-bar">
<h3 class="data-type-title">Other</h3>
<div class="classify">
- <span>{{ $t('message.common.resourceSimple.FL') }}</span>
+ <span style="width: auto; white-space: nowrap;">{{ $t('message.common.resourceSimple.FL') }}</span>
<Select v-model="otherSelectData">
<Option
v-for="item in typeList"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org