Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
5dc8226c
Commit
5dc8226c
authored
Dec 08, 2020
by
陈小婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 整体图标调整
parent
7bae4c37
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
45 additions
and
47 deletions
+45
-47
menu.ts
mock/sys/menu.ts
+1
-1
BasicUpload.vue
src/components/Upload/src/BasicUpload.vue
+2
-2
UserDropdown.tsx
src/layouts/default/header/UserDropdown.tsx
+1
-1
useTabDropdown.ts
src/layouts/default/multitabs/useTabDropdown.ts
+6
-6
index.ts
src/router/routes/index.ts
+1
-1
dashboard.ts
src/router/routes/modules/dashboard.ts
+1
-1
charts.ts
src/router/routes/modules/demo/charts.ts
+1
-1
comp.ts
src/router/routes/modules/demo/comp.ts
+1
-1
editor.ts
src/router/routes/modules/demo/editor.ts
+1
-1
form.ts
src/router/routes/modules/demo/form.ts
+1
-1
table.ts
src/router/routes/modules/demo/table.ts
+1
-1
home.ts
src/router/routes/modules/home.ts
+2
-2
index.vue
src/views/demo/feat/context-menu/index.vue
+5
-5
data.tsx
src/views/demo/page/account/center/data.tsx
+12
-12
BaseSetting.vue
src/views/demo/page/account/setting/BaseSetting.vue
+1
-3
data.ts
src/views/demo/page/account/setting/data.ts
+2
-2
data.tsx
src/views/demo/page/list/search/data.tsx
+3
-3
FixedColumn.vue
src/views/demo/table/FixedColumn.vue
+1
-1
EditTree.vue
src/views/demo/tree/EditTree.vue
+2
-2
No files found.
mock/sys/menu.ts
View file @
5dc8226c
...
...
@@ -9,7 +9,7 @@ const dashboardRoute = {
meta
:
{
title
:
'
routes.dashboard.welcome
'
,
affix
:
true
,
icon
:
'
ant-design:home-outlined
'
,
icon
:
'
bx:bx-home
'
,
},
};
...
...
src/components/Upload/src/BasicUpload.vue
View file @
5dc8226c
<
template
>
<div>
<a-button-group>
<a-button
type=
"primary"
@
click=
"openUploadModal"
preIcon=
"
ant-design:cloud-upload-outline
d"
>
<a-button
type=
"primary"
@
click=
"openUploadModal"
preIcon=
"
carbon:cloud-uploa
d"
>
{{
t
(
'
component.upload.upload
'
)
}}
</a-button>
<Tooltip
placement=
"bottom"
v-if=
"showPreview"
>
...
...
@@ -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
>
...
...
src/layouts/default/header/UserDropdown.tsx
View file @
5dc8226c
...
...
@@ -103,7 +103,7 @@ export default defineComponent({
<
MenuItem
key=
"loginOut"
text=
{
t
(
'
layout.header.dropdownItemLoginOut
'
)
}
icon=
"
ant-design:poweroff-outlined
"
icon=
"
carbon:power
"
/>
</>
)
}
...
...
src/layouts/default/multitabs/useTabDropdown.ts
View file @
5dc8226c
...
...
@@ -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
,
...
...
src/router/routes/index.ts
View file @
5dc8226c
...
...
@@ -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
'
,
},
};
...
...
src/router/routes/modules/dashboard.ts
View file @
5dc8226c
...
...
@@ -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
:
[
...
...
src/router/routes/modules/demo/charts.ts
View file @
5dc8226c
...
...
@@ -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
:
[
...
...
src/router/routes/modules/demo/comp.ts
View file @
5dc8226c
...
...
@@ -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
'
,
},
...
...
src/router/routes/modules/demo/editor.ts
View file @
5dc8226c
...
...
@@ -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
:
[
...
...
src/router/routes/modules/demo/form.ts
View file @
5dc8226c
...
...
@@ -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
:
[
...
...
src/router/routes/modules/demo/table.ts
View file @
5dc8226c
...
...
@@ -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
'
,
},
...
...
src/router/routes/modules/home.ts
View file @
5dc8226c
...
...
@@ -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
:
[
...
...
@@ -19,7 +19,7 @@ const dashboard: AppRouteModule = {
meta
:
{
title
:
'
routes.dashboard.welcome
'
,
affix
:
true
,
icon
:
'
ant-design:home-outlined
'
,
icon
:
'
bx:bx-home
'
,
},
},
],
...
...
src/views/demo/feat/context-menu/index.vue
View file @
5dc8226c
...
...
@@ -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
'
);
},
...
...
@@ -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
:
[
{
...
...
@@ -69,7 +69,7 @@
},
{
label
:
'
New1-2
'
,
icon
:
'
ant-design:plus-outlined
'
,
icon
:
'
bi:plus
'
,
},
],
},
...
...
src/views/demo/page/account/center/data.tsx
View file @
5dc8226c
...
...
@@ -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
'
,
},
...
...
@@ -32,22 +32,22 @@ 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
'
,
},
...
...
@@ -55,15 +55,15 @@ export const teams: ListItem[] = [
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
:
'
福建省厦门市
'
,
},
];
...
...
@@ -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
=
(()
=>
{
...
...
src/views/demo/page/account/setting/BaseSetting.vue
View file @
5dc8226c
...
...
@@ -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>
...
...
src/views/demo/page/account/setting/data.ts
View file @
5dc8226c
...
...
@@ -108,7 +108,7 @@ export const accountBindList: ListItem[] = [
title
:
'
绑定淘宝
'
,
description
:
'
当前未绑定淘宝账号
'
,
extra
:
'
绑定
'
,
avatar
:
'
ant-design:taobao-outlined
'
,
avatar
:
'
ri:taobao-fill
'
,
color
:
'
#ff4000
'
,
},
{
...
...
@@ -116,7 +116,7 @@ export const accountBindList: ListItem[] = [
title
:
'
绑定支付宝
'
,
description
:
'
当前未绑定支付宝账号
'
,
extra
:
'
绑定
'
,
avatar
:
'
ant-design:alipay-outlined
'
,
avatar
:
'
fa-brands:alipay
'
,
color
:
'
#2eabff
'
,
},
{
...
...
src/views/demo/page/list/search/data.tsx
View file @
5dc8226c
...
...
@@ -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
[]
=
[
...
...
src/views/demo/table/FixedColumn.vue
View file @
5dc8226c
...
...
@@ -6,7 +6,7 @@
:actions=
"[
{
label: '删除',
icon: '
ant-design:area-chart-outlined
',
icon: '
ic:outline-delete-outline
',
onClick: handleDelete.bind(null, record),
},
]"
...
...
src/views/demo/tree/EditTree.vue
View file @
5dc8226c
...
...
@@ -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
'
,
},
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment