You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/24 11:40:18 UTC
[incubator-linkis] 07/07: fix: #1771, #1772 (#8)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit f3ef0c5fca69f1b5d74d0128b947dba25310d533
Author: 李为 <12...@qq.com>
AuthorDate: Tue Mar 22 17:28:14 2022 +0800
fix: #1771, #1772 (#8)
* fix: issue 1650 and 1596
* change execID in viewHistory
* fix: bug
* change zh
* fix: bug
* fix: #1771, #1772
* fix: #1771, #1772
Co-authored-by: liveipooli(李为) <li...@webank.com>
---
web/src/apps/URM/view/urm/index.vue | 12 +++++++++++-
.../linkis/module/globalHistoryManagement/index.scss | 4 ++++
.../linkis/module/globalHistoryManagement/index.vue | 18 ++++++------------
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/web/src/apps/URM/view/urm/index.vue b/web/src/apps/URM/view/urm/index.vue
index 2c1c840..5edbb7b 100644
--- a/web/src/apps/URM/view/urm/index.vue
+++ b/web/src/apps/URM/view/urm/index.vue
@@ -19,6 +19,7 @@
<div class="console-page">
<div class="console-page-content-head">
<div>
+ <Icon type="ios-arrow-back" size="20" color="#338cf0" class="back" @click="back"></Icon>
<span class="console-page-content-title">用户资源管理</span>
</div>
</div>
@@ -47,7 +48,6 @@
<div class="content-body-side-right-title">
<Breadcrumb>
<BreadcrumbItem>
- <!-- <Icon type="ios-arrow-back" size="16" color="#338cf0"></Icon> -->
{{ breadcrumbSecondName }}
</BreadcrumbItem>
</Breadcrumb>
@@ -117,6 +117,11 @@ export default {
workspaceId: this.$route.query.workspaceId
},
});
+ },
+ back() {
+ this.$router.push({
+ path: '/console/globalHistory',
+ });
}
}
};
@@ -126,5 +131,10 @@ export default {
.crrentItem {
color: #338cf0;
}
+ .back {
+ position: relative;
+ top: -3px;
+ cursor: pointer;
+ }
</style>
diff --git a/web/src/apps/linkis/module/globalHistoryManagement/index.scss b/web/src/apps/linkis/module/globalHistoryManagement/index.scss
index 191fb46..1f1eb58 100644
--- a/web/src/apps/linkis/module/globalHistoryManagement/index.scss
+++ b/web/src/apps/linkis/module/globalHistoryManagement/index.scss
@@ -49,11 +49,15 @@
.ivu-form {
display: flex;
.ivu-form-item {
+ margin-right: 4px;
margin-bottom: 10px;
.ivu-form-item-content {
display: flex !important;
}
}
+ .ivu-input-with-suffix {
+ padding-right: 7px;
+ }
}
.global-history-table {
display: flex;
diff --git a/web/src/apps/linkis/module/globalHistoryManagement/index.vue b/web/src/apps/linkis/module/globalHistoryManagement/index.vue
index 8521783..85e90e3 100644
--- a/web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -22,20 +22,18 @@
<InputNumber
v-model="searchBar.id"
:placeholder="$t('message.linkis.formItems.id.placeholder')"
- style="width:100px;"
+ style="width:60px;"
:min="1"
></InputNumber>
</FormItem>
- <Divider type="vertical" class="divider" v-if="isAdminModel" />
<FormItem prop="proxyUser" :label="$t('message.linkis.userName')" v-if="isAdminModel">
<Input
:maxlength="50"
v-model="searchBar.proxyUser"
:placeholder="$t('message.linkis.searchName')"
- style="width:120px;"
+ style="width:60px;"
/>
</FormItem>
- <Divider type="vertical" class="divider" />
<FormItem prop="shortcut" :label="$t('message.linkis.formItems.date.label')">
<DatePicker
:transfer="true"
@@ -46,28 +44,25 @@
placement="bottom-start"
format="yyyy-MM-dd HH:mm"
:placeholder="$t('message.linkis.formItems.date.placeholder')"
- style="width: 200px"
+ style="width: 115px"
:editable="false"
/>
</FormItem>
- <Divider type="vertical" class="divider"/>
<FormItem prop="creator" :label="$t('message.linkis.formItems.creator.label')">
<Input
:maxlength="50"
v-model="searchBar.creator"
:placeholder="$t('message.linkis.formItems.creator.placeholder')"
- style="width:120px;"
+ style="width:80px;"
/>
</FormItem>
- <Divider type="vertical" class="divider" />
<FormItem prop="engine" :label="$t('message.linkis.formItems.engine.label')">
- <Select v-model="searchBar.engine" style="min-width:70px;">
+ <Select v-model="searchBar.engine" style="width: 70px">
<Option v-for="(item) in getEngineTypes" :label="item === 'all' ? '全部': item" :value="item" :key="item" />
</Select>
</FormItem>
- <Divider type="vertical" class="divider" />
<FormItem prop="status" :label="$t('message.linkis.formItems.status.label')">
- <Select v-model="searchBar.status" style="min-width:90px;">
+ <Select v-model="searchBar.status" style="width: 70px">
<Option
v-for="(item) in statusType"
:label="item.label"
@@ -76,7 +71,6 @@
/>
</Select>
</FormItem>
- <Divider type="vertical" class="divider" />
<FormItem>
<Button
type="primary"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org