Skip to content

[Frontend]Update function table page #10

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

Merged
RobertIndie merged 1 commit into from
Jun 1, 2021
Merged

[Frontend]Update function table page #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions front-end/src/components/GlobalHeader/AvatarDropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<template>
<a-dropdown v-if="currentUser && currentUser.name" placement="bottomRight">
<span class="ant-pro-account-avatar">
<a-avatar size="small" src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" class="antd-pro-global-header-index-avatar" />
<!-- <span class="ant-pro-account-avatar">
<a-avatar
size="small"
src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png"
class="antd-pro-global-header-index-avatar"
/>
<span>{{ currentUser.name }}</span>
</span>
<template v-slot:overlay>
Expand All @@ -20,10 +24,10 @@
{{ $t('menu.account.logout') }}
</a-menu-item>
</a-menu>
</template>
</template> -->
</a-dropdown>
<span v-else>
<a-spin size="small" :style="{ marginLeft: 8, marginRight: 8 }" />
<!-- <a-spin size="small" :style="{ marginLeft: 8, marginRight: 8 }" /> -->
</span>
</template>

Expand All @@ -35,21 +39,21 @@ export default {
props: {
currentUser: {
type: Object,
default: () => null
default: () => null,
},
menu: {
type: Boolean,
default: true
}
default: true,
},
},
methods: {
handleToCenter () {
handleToCenter() {
this.$router.push({ path: '/account/center' })
},
handleToSettings () {
handleToSettings() {
this.$router.push({ path: '/account/settings' })
},
handleLogout (e) {
handleLogout(e) {
Modal.confirm({
title: this.$t('layouts.usermenu.dialog.title'),
content: this.$t('layouts.usermenu.dialog.content'),
Expand All @@ -61,10 +65,10 @@ export default {
this.$router.push({ name: 'login' })
})
},
onCancel () {}
onCancel() {},
})
}
}
},
},
}
</script>

Expand Down
4 changes: 2 additions & 2 deletions front-end/src/components/GlobalHeader/RightContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div :class="wrpCls">
<avatar-dropdown :menu="showMenu" :current-user="currentUser" :class="prefixCls" />
<select-lang :class="prefixCls" />
<!-- <avatar-dropdown :menu="showMenu" :current-user="currentUser" :class="prefixCls" />
<select-lang :class="prefixCls" /> -->
</div>
</template>

Expand Down
2 changes: 1 addition & 1 deletion front-end/src/views/function/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<page-header-wrapper>
<template slot="extra">
<div class="table-operator">
<a-button type="primary" icon="plus" @click="showDrawer">add Function</a-button>
<a-button type="primary" icon="plus" @click="showDrawer">Add Function</a-button>
</div>
</template>

Expand Down