Skip to content

Commit

Permalink
fix: 整体图标调整
Browse files Browse the repository at this point in the history
  • Loading branch information
chen-xt committed Dec 7, 2020
1 parent 7bae4c3 commit 5dc8226
Show file tree
Hide file tree
Showing 19 changed files with 45 additions and 47 deletions.
2 changes: 1 addition & 1 deletion mock/sys/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const dashboardRoute = {
meta: {
title: 'routes.dashboard.welcome',
affix: true,
icon: 'ant-design:home-outlined',
icon: 'bx:bx-home',
},
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/Upload/src/BasicUpload.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div>
<a-button-group>
<a-button type="primary" @click="openUploadModal" preIcon="ant-design:cloud-upload-outlined">
<a-button type="primary" @click="openUploadModal" preIcon="carbon:cloud-upload">
{{ t('component.upload.upload') }}
</a-button>
<Tooltip placement="bottom" v-if="showPreview">
Expand All @@ -10,7 +10,7 @@
<template v-if="fileListRef.length">{{ fileListRef.length }}</template>
</template>
<a-button @click="openPreviewModal">
<Icon icon="ant-design:eye-outlined" />
<Icon icon="bi:eye" />
<template v-if="fileListRef.length && showPreviewNumber">
{{ fileListRef.length }}
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/default/header/UserDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default defineComponent({
<MenuItem
key="loginOut"
text={t('layout.header.dropdownItemLoginOut')}
icon="ant-design:poweroff-outlined"
icon="carbon:power"
/>
</>
)}
Expand Down
12 changes: 6 additions & 6 deletions src/layouts/default/multitabs/useTabDropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,40 +62,40 @@ export function useTabDropdown(tabContentProps: TabContentProps) {
index === tabStore.getTabsState.length - 1 && tabStore.getLastDragEndIndexState >= 0;
const dropMenuList: DropMenu[] = [
{
icon: 'ant-design:reload-outlined',
icon: 'ion:reload-sharp',
event: MenuEventEnum.REFRESH_PAGE,
text: t('layout.multipleTab.redo'),
disabled: refreshDisabled,
},
{
icon: 'ant-design:close-outlined',
icon: 'clarity:close-line',
event: MenuEventEnum.CLOSE_CURRENT,
text: t('layout.multipleTab.close'),
disabled: meta?.affix || disabled,
divider: true,
},
{
icon: 'ant-design:pic-left-outlined',
icon: 'line-md:arrow-close-left',
event: MenuEventEnum.CLOSE_LEFT,
text: t('layout.multipleTab.closeLeft'),
disabled: closeLeftDisabled,
divider: false,
},
{
icon: 'ant-design:pic-right-outlined',
icon: 'line-md:arrow-close-right',
event: MenuEventEnum.CLOSE_RIGHT,
text: t('layout.multipleTab.closeRight'),
disabled: closeRightDisabled,
divider: true,
},
{
icon: 'ant-design:pic-center-outlined',
icon: 'dashicons:align-center',
event: MenuEventEnum.CLOSE_OTHER,
text: t('layout.multipleTab.closeOther'),
disabled: disabled,
},
{
icon: 'ant-design:line-outlined',
icon: 'clarity:minus-line',
event: MenuEventEnum.CLOSE_ALL,
text: t('layout.multipleTab.closeAll'),
disabled: disabled,
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const MainRoute: AppRouteModule = {
component: LAYOUT,
redirect: PageEnum.BASE_HOME,
meta: {
icon: 'ant-design:home-outlined',
icon: 'bx:bx-home',
title: 'routes.dashboard.dashboard',
},
};
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/dashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const dashboard: AppRouteModule = {
component: LAYOUT,
redirect: '/dashboard/welcome',
meta: {
icon: 'ant-design:home-outlined',
icon: 'bx:bx-home',
title: 'routes.dashboard.dashboard',
},
children: [
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/charts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const charts: AppRouteModule = {
component: LAYOUT,
redirect: '/charts/apexChart',
meta: {
icon: 'ant-design:area-chart-outlined',
icon: 'vaadin:spline-area-chart',
title: 'routes.demo.charts.charts',
},
children: [
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/comp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const comp: AppRouteModule = {
component: LAYOUT,
redirect: '/comp/basic',
meta: {
icon: 'ant-design:table-outlined',
icon: 'ic:outline-settings-input-component',
title: 'routes.demo.comp.comp',
},

Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const editor: AppRouteModule = {
component: LAYOUT,
redirect: '/editor/markdown',
meta: {
icon: 'ant-design:table-outlined',
icon: 'carbon:table-split',
title: 'routes.demo.editor.editor',
},
children: [
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const form: AppRouteModule = {
component: LAYOUT,
redirect: '/form/basic',
meta: {
icon: 'ant-design:table-outlined',
icon: 'mdi:form-select',
title: 'routes.demo.form.form',
},
children: [
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const table: AppRouteModule = {
component: LAYOUT,
redirect: '/table/basic',
meta: {
icon: 'ant-design:table-outlined',
icon: 'carbon:table-split',
title: 'routes.demo.table.table',
},

Expand Down
4 changes: 2 additions & 2 deletions src/router/routes/modules/home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const dashboard: AppRouteModule = {
component: LAYOUT,
redirect: '/home/welcome',
meta: {
icon: 'ant-design:home-outlined',
icon: 'bx:bx-home',
title: 'routes.dashboard.welcome',
},
children: [
Expand All @@ -19,7 +19,7 @@ const dashboard: AppRouteModule = {
meta: {
title: 'routes.dashboard.welcome',
affix: true,
icon: 'ant-design:home-outlined',
icon: 'bx:bx-home',
},
},
],
Expand Down
10 changes: 5 additions & 5 deletions src/views/demo/feat/context-menu/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
items: [
{
label: 'New',
icon: 'ant-design:plus-outlined',
icon: 'bi:plus',
handler: () => {
createMessage.success('click new');
},
},
{
label: 'Open',
icon: 'ant-design:folder-open-filled',
icon: 'bx:bxs-folder-open',
handler: () => {
createMessage.success('click open');
},
Expand All @@ -47,12 +47,12 @@
items: [
{
label: 'New',
icon: 'ant-design:plus-outlined',
icon: 'bi:plus',
children: [
{
label: 'New1-1',
icon: 'ant-design:plus-outlined',
icon: 'bi:plus',
divider: true,
children: [
{
Expand All @@ -69,7 +69,7 @@
},
{
label: 'New1-2',
icon: 'ant-design:plus-outlined',
icon: 'bi:plus',
},
],
},
Expand Down
24 changes: 12 additions & 12 deletions src/views/demo/page/account/center/data.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ export const tags: string[] = [
'前端开发',
'vue3',
];

<span class="iconify" data-icon="jam:codepen-circle" data-inline="false"></span>;
export const teams: ListItem[] = [
{
icon: 'ant-design:alipay-circle-outlined',
icon: 'ri:alipay-fill',
title: '科学搬砖组',
color: '#ff4000',
},
Expand All @@ -32,38 +32,38 @@ export const teams: ListItem[] = [
color: '#7c51b8',
},
{
icon: 'ant-design:alipay-circle-outlined',
icon: 'ri:alipay-fill',
title: '高逼格设计',
color: '#00adf7',
},
{
icon: 'ant-design:codepen-circle-filled',
icon: 'jam:codepen-circle',
title: '程序员日常',
color: '#00adf7',
},
{
icon: 'ant-design:behance-square-filled',
icon: 'fa:behance-square',
title: '科学搬砖组',
color: '#7c51b8',
},
{
icon: 'ant-design:dribbble-circle-filled',
icon: 'jam:codepen-circle',
title: '程序员日常',
color: '#ff4000',
},
];

export const details: ListItem[] = [
{
icon: 'ant-design:contacts-outlined',
icon: 'ic:outline-contacts',
title: '交互专家',
},
{
icon: 'ant-design:cluster-outlined',
icon: 'grommet-icons:cluster',
title: '某某某事业群',
},
{
icon: 'ant-design:home-outlined',
icon: 'bx:bx-home-circle',
title: '福建省厦门市',
},
];
Expand All @@ -87,9 +87,9 @@ export const achieveList: TabItem[] = [
];

export const actions: any[] = [
{ icon: 'ant-design:star-outlined', text: '156', color: '#018ffb' },
{ icon: 'ant-design:like-filled', text: '156', color: '#459ae8' },
{ icon: 'ant-design:message-filled', text: '2', color: '#42d27d' },
{ icon: 'clarity:star-line', text: '156', color: '#018ffb' },
{ icon: 'bx:bxs-like', text: '156', color: '#459ae8' },
{ icon: 'bx:bxs-message-dots', text: '2', color: '#42d27d' },
];

export const articleList = (() => {
Expand Down
4 changes: 1 addition & 3 deletions src/views/demo/page/account/setting/BaseSetting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
<div class="mb-2">头像</div>
<img width="140" :src="headerImg" />
<Upload :showUploadList="false">
<Button type="ghost" class="ml-5">
<Icon icon="ant-design:upload-outlined" />更换头像
</Button>
<Button type="ghost" class="ml-5"> <Icon icon="feather:upload" />更换头像 </Button>
</Upload>
</div>
</a-col>
Expand Down
4 changes: 2 additions & 2 deletions src/views/demo/page/account/setting/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ export const accountBindList: ListItem[] = [
title: '绑定淘宝',
description: '当前未绑定淘宝账号',
extra: '绑定',
avatar: 'ant-design:taobao-outlined',
avatar: 'ri:taobao-fill',
color: '#ff4000',
},
{
key: '2',
title: '绑定支付宝',
description: '当前未绑定支付宝账号',
extra: '绑定',
avatar: 'ant-design:alipay-outlined',
avatar: 'fa-brands:alipay',
color: '#2eabff',
},
{
Expand Down
6 changes: 3 additions & 3 deletions src/views/demo/page/list/search/data.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ export const searchList = (() => {
})();

export const actions: any[] = [
{ icon: 'ant-design:star-outlined', text: '156', color: '#018ffb' },
{ icon: 'ant-design:like-filled', text: '156', color: '#459ae8' },
{ icon: 'ant-design:message-filled', text: '2', color: '#42d27d' },
{ icon: 'clarity:star-line', text: '156', color: '#018ffb' },
{ icon: 'bx:bxs-like', text: '156', color: '#459ae8' },
{ icon: 'bx:bxs-message-dots', text: '2', color: '#42d27d' },
];

export const schemas: FormSchema[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/views/demo/table/FixedColumn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:actions="[
{
label: '删除',
icon: 'ant-design:area-chart-outlined',
icon: 'ic:outline-delete-outline',
onClick: handleDelete.bind(null, record),
},
]"
Expand Down
4 changes: 2 additions & 2 deletions src/views/demo/tree/EditTree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
handler: () => {
console.log('点击了新增', node);
},
icon: 'ant-design:plus-outlined',
icon: 'bi:plus',
},
{
label: '删除',
handler: () => {
console.log('点击了删除', node);
},
icon: 'ant-design:folder-open-filled',
icon: 'bx:bxs-folder-open',
},
];
}
Expand Down

0 comments on commit 5dc8226

Please sign in to comment.