Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support displaying history EngineConn information #2495

Merged
merged 9 commits into from
Jul 19, 2022
Merged

Support displaying history EngineConn information #2495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aad05ac
fix: 275767
Jun 20, 2022
e8b23ba
add: 2227 requirements
Jun 21, 2022
cc35266
upd: delete stop and edit operaion in History Engine List page
Jun 23, 2022
9d0f712
fix: bug
Jun 29, 2022
d45ef23
fix: engineConn page, pgae bug
Jun 30, 2022
175e2c3
fix: 281727, 281686
Jul 5, 2022
632634b
fix: ecm and resourceManagement, bottom blank and resource data bug
Jul 7, 2022
989aacf
fix: bug
Jul 8, 2022
2c6ff5c
fix: 282598
Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/apps/linkis/components/tag/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
:color="item.modifiable ? 'primary' : 'default'"
@on-close="handleClose2"
@on-change="handleTagChange"
>{{ item.key }}-{{ item.value }}
>{{ item.key }}{{ item.key ? '-' : '' }}{{ item.value }}
</Tag>
<!-- 编辑标签 -->
<div class="addAndCancel" v-else>
Expand Down
2 changes: 2 additions & 0 deletions web/src/apps/linkis/i18n/common/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"fold": "Fold",
"jumpPage": "Please check in the jump page...",
"initiator": "Created From",
"inputOwnerHint": "Please input owner",
"find": "Find",
"errorCode": "Error code",
"errorDescription": "Error description",
Expand Down Expand Up @@ -142,6 +143,7 @@
"children": {
"globalHistory": "Global History",
"resource": "Resource Manager",
"resourceEngineConnList": "History Engine List",
"setting": "Settings",
"dateReport": "Global Variables",
"globalValiable": "Frequently Asked",
Expand Down
2 changes: 2 additions & 0 deletions web/src/apps/linkis/i18n/common/zh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"addTags": "添加标签",
"find": "查询",
"initiator": "创建者",
"inputOwnerHint": "请输入创建者",
"jumpPage": "请在跳转页面查看……",
"editedSuccess": "修改成功",
"errorCode": "错误码",
Expand Down Expand Up @@ -144,6 +145,7 @@
"children": {
"globalHistory": "全局历史",
"resource": "资源管理",
"resourceEngineConnList": "历史引擎信息",
"setting": "参数配置",
"dateReport": "全局变量",
"globalValiable": "常见问题",
Expand Down
2 changes: 1 addition & 1 deletion web/src/apps/linkis/module/ECM/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default {
}
return data;
}
return v && (v.cores !== undefined || v.memonry !== undefined || v.instance !== undefined) ? `${calcCompany(v.cores)}cores,${calcCompany(v.memory, true)}G,${calcCompany(v.instance)}apps` : ''
return v && (v.cores !== undefined || v.memory !== undefined || v.instance !== undefined) ? `${calcCompany(v.cores)}cores,${calcCompany(v.memory, true)}G,${calcCompany(v.instance)}apps` : ''
}
},
created() {
Expand Down
5 changes: 4 additions & 1 deletion web/src/apps/linkis/module/ECM/log.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

<template>
<div style="position:relative">
<div class="log" style="position:relative">
<Tabs @on-click="onClickTabs" :value="tabName">
<TabPane name="stdout" label="stdout"></TabPane>
<TabPane name="stderr" label="stderr"></TabPane>
Expand Down Expand Up @@ -122,6 +122,9 @@ export default {
};
</script>
<style lang="scss" scoped>
.log {
height: 100%;
}
.backButton {
position: absolute;
top: -2px;
Expand Down
5 changes: 3 additions & 2 deletions web/src/apps/linkis/module/ECM/search.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

<template>
<Form :model="searchBar" :rules="ruleInline" inline>
<Form :model="searchBar" :rules="ruleInline" inline @submit.native.prevent>
<FormItem prop="instance" :label="`${$t('message.linkis.instanceName')}`">
<Input :maxlength="50" v-model="searchBar.instance" :placeholder="$t('message.linkis.instanceName')"/>
</FormItem>
Expand Down Expand Up @@ -115,7 +115,8 @@ export default {
display: flex;
.ivu-form-item {
display: flex;
margin-right: 30px;
margin-right: 8px;
margin-bottom: 8px;
flex: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion web/src/apps/linkis/module/datasource/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ export default {
})
},
openVersionList(row) {
this.currentSourceData = row
this.currentSourceData = JSON.parse(JSON.stringify(row))
this.getVersionListBySourceId()
this.showVersionList = true
},
Expand Down
2 changes: 1 addition & 1 deletion web/src/apps/linkis/module/globalHistoryManagement/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
}
}
.workbench-log-view {
height: 100%;
height: calc(100% - 76px) !important;
.log-tools {
height: 36px;
line-height: 36px;
Expand Down
Loading