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
3571eb4c
Commit
3571eb4c
authored
Jan 12, 2021
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: bump 2.0.0.rc.16
parent
cdf0a600
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
13 deletions
+21
-13
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
package.json
package.json
+7
-7
AppLogo.vue
src/components/Application/src/AppLogo.vue
+1
-1
LockModal.vue
src/layouts/default/header/components/lock/LockModal.vue
+3
-1
index.vue
...layouts/default/header/components/user-dropdown/index.vue
+3
-1
NewsList.vue
src/views/dashboard/workbench/components/NewsList.vue
+3
-2
LockPage.vue
src/views/sys/lock/LockPage.vue
+3
-1
No files found.
CHANGELOG.zh_CN.md
View file @
3571eb4c
...
...
@@ -27,6 +27,7 @@
-
修复
`layout`
收缩展开功能在分割模式下失效
-
修复 modal 高度计算错误
-
修复文件上传错误
-
修复表格已知问题
### 🎫 Chores
...
...
package.json
View file @
3571eb4c
{
"name"
:
"vben-admin"
,
"version"
:
"2.0.0-rc.1
5
"
,
"version"
:
"2.0.0-rc.1
6
"
,
"scripts"
:
{
"bootstrap"
:
"yarn install"
,
"serve"
:
"vite"
,
...
...
@@ -18,7 +18,7 @@
"reinstall"
:
"rimraf yarn.lock && rimraf package.lock.json && rimraf node_modules && npm run bootstrap"
},
"dependencies"
:
{
"
@iconify/iconify
"
:
"
^2.0.0-rc.
5
"
,
"
@iconify/iconify
"
:
"
^2.0.0-rc.
6
"
,
"
@vueuse/core
"
:
"
^4.0.5
"
,
"
ant-design-vue
"
:
"
^2.0.0-rc.8
"
,
"
apexcharts
"
:
"
^3.23.1
"
,
...
...
@@ -34,7 +34,7 @@
"
sortablejs
"
:
"
^1.13.0
"
,
"
vditor
"
:
"
^3.7.5
"
,
"
vue
"
:
"
^3.0.5
"
,
"
vue-i18n
"
:
"
^9.0.0-rc.
1
"
,
"
vue-i18n
"
:
"
^9.0.0-rc.
2
"
,
"
vue-router
"
:
"
^4.0.3
"
,
"
vue-types
"
:
"
^3.0.1
"
,
"
vuex
"
:
"
^4.0.0-rc.2
"
,
...
...
@@ -45,7 +45,7 @@
"devDependencies"
:
{
"
@commitlint/cli
"
:
"
^11.0.0
"
,
"
@commitlint/config-conventional
"
:
"
^11.0.0
"
,
"
@iconify/json
"
:
"
^1.1.28
4
"
,
"
@iconify/json
"
:
"
^1.1.28
5
"
,
"
@ls-lint/ls-lint
"
:
"
^1.9.2
"
,
"
@purge-icons/generated
"
:
"
^0.5.0
"
,
"
@types/echarts
"
:
"
^4.9.3
"
,
...
...
@@ -66,8 +66,8 @@
"
@vitejs/plugin-vue
"
:
"
^1.0.5
"
,
"
@vitejs/plugin-vue-jsx
"
:
"
^1.0.1
"
,
"
@vue/compiler-sfc
"
:
"
^3.0.5
"
,
"
@vuedx/typecheck
"
:
"
^0.
4.1
"
,
"
@vuedx/typescript-plugin-vue
"
:
"
^0.
4.1
"
,
"
@vuedx/typecheck
"
:
"
^0.
5.0
"
,
"
@vuedx/typescript-plugin-vue
"
:
"
^0.
5.0
"
,
"
autoprefixer
"
:
"
^10.2.1
"
,
"
commitizen
"
:
"
^4.2.2
"
,
"
conventional-changelog-cli
"
:
"
^2.1.1
"
,
...
...
@@ -100,7 +100,7 @@
"
vite-plugin-html
"
:
"
^2.0.0-beta.5
"
,
"
vite-plugin-mock
"
:
"
^2.0.0-beta.3
"
,
"
vite-plugin-purge-icons
"
:
"
^0.5.0
"
,
"
vite-plugin-pwa
"
:
"
^0.3.
5
"
,
"
vite-plugin-pwa
"
:
"
^0.3.
6
"
,
"
vue-eslint-parser
"
:
"
^7.3.0
"
,
"
yargs
"
:
"
^16.2.0
"
},
...
...
src/components/Application/src/AppLogo.vue
View file @
3571eb4c
...
...
@@ -8,7 +8,7 @@
:class=
"[prefixCls, theme,
{ 'collapsed-show-title': getCollapsedShowTitle }]"
@click="handleGoHome"
>
<img
src=
"
/@
/assets/images/logo.png"
/>
<img
src=
"
../../..
/assets/images/logo.png"
/>
<div
class=
"ml-2 ellipsis"
:class=
"[`$
{prefixCls}__title`]" v-show="showTitle">
{{
title
}}
</div>
...
...
src/layouts/default/header/components/lock/LockModal.vue
View file @
3571eb4c
...
...
@@ -8,7 +8,7 @@
>
<div
:class=
"`$
{prefixCls}__entry`">
<div
:class=
"`$
{prefixCls}__header`">
<img
src=
"/@/assets/images/header.jp
g"
:class=
"`$
{prefixCls}__header-img`" />
<img
:src=
"headerIm
g"
:class=
"`$
{prefixCls}__header-img`" />
<p
:class=
"`$
{prefixCls}__header-name`">
{{
getRealName
}}
</p>
</div>
...
...
@@ -31,6 +31,7 @@
import
{
userStore
}
from
'
/@/store/modules/user
'
;
import
{
lockStore
}
from
'
/@/store/modules/lock
'
;
import
headerImg
from
'
/@/assets/images/header.jpg
'
;
export
default
defineComponent
({
name
:
'
LockModal
'
,
components
:
{
BasicModal
,
BasicForm
},
...
...
@@ -75,6 +76,7 @@
register
,
registerForm
,
handleLock
,
headerImg
,
};
},
});
...
...
src/layouts/default/header/components/user-dropdown/index.vue
View file @
3571eb4c
<
template
>
<Dropdown
placement=
"bottomLeft"
:overlayClassName=
"`$
{prefixCls}-dropdown-overlay`">
<span
:class=
"[prefixCls, `$
{prefixCls}--${theme}`]">
<img
:class=
"`$
{prefixCls}__header`"
src="/@/assets/images/header.jp
g" />
<img
:class=
"`$
{prefixCls}__header`"
:src="headerIm
g" />
<span
:class=
"`$
{prefixCls}__info`">
<span
:class=
"`$
{prefixCls}__name anticon`">
{{
getUserInfo
.
realName
}}
</span>
</span>
...
...
@@ -47,6 +47,7 @@
import
{
useDesign
}
from
'
/@/hooks/web/useDesign
'
;
import
{
createAsyncComponent
}
from
'
/@/utils/factory/createAsyncComponent
'
;
import
{
propTypes
}
from
'
/@/utils/propTypes
'
;
import
headerImg
from
'
/@/assets/images/header.jpg
'
;
type
MenuEvent
=
'
loginOut
'
|
'
doc
'
;
...
...
@@ -99,6 +100,7 @@
getUserInfo
,
handleMenuClick
,
getShowDoc
,
headerImg
,
};
},
});
...
...
src/views/dashboard/workbench/components/NewsList.vue
View file @
3571eb4c
...
...
@@ -6,7 +6,7 @@
<ListItem
class=
"news-list__item"
>
<ListItemMeta>
<template
#avatar
>
<img
src=
"/@/assets/images/header.jp
g"
class=
"news-list__item-avatar"
/>
<img
:src=
"headerIm
g"
class=
"news-list__item-avatar"
/>
</
template
>
<
template
#description
>
<div
class=
"news-list__item-desc"
>
...
...
@@ -36,6 +36,7 @@
import
{
defineComponent
}
from
'
vue
'
;
import
{
List
}
from
'
ant-design-vue
'
;
import
{
CollapseContainer
,
ScrollContainer
}
from
'
/@/components/Container/index
'
;
import
headerImg
from
'
/@/assets/images/header.jpg
'
;
import
{
newList
}
from
'
../data
'
;
export
default
defineComponent
({
...
...
@@ -47,7 +48,7 @@
ScrollContainer
,
},
setup
()
{
return
{
newList
};
return
{
newList
,
headerImg
};
},
});
</
script
>
...
...
src/views/sys/lock/LockPage.vue
View file @
3571eb4c
...
...
@@ -16,7 +16,7 @@
<div
:class=
"`$
{prefixCls}-entry`" v-show="!showDate">
<div
:class=
"`$
{prefixCls}-entry-content`">
<div
:class=
"`$
{prefixCls}-entry__header`">
<img
src=
"/@/assets/images/header.jp
g"
:class=
"`$
{prefixCls}-entry__header-img`" />
<img
:src=
"headerIm
g"
:class=
"`$
{prefixCls}-entry__header-img`" />
<p
:class=
"`$
{prefixCls}-entry__header-name`">
{{
realName
}}
</p>
</div>
<InputPassword
:placeholder=
"t('sys.lock.placeholder')"
v-model:value=
"password"
/>
...
...
@@ -70,6 +70,7 @@
import
{
useDesign
}
from
'
/@/hooks/web/useDesign
'
;
import
{
LockOutlined
}
from
'
@ant-design/icons-vue
'
;
import
headerImg
from
'
/@/assets/images/header.jpg
'
;
export
default
defineComponent
({
name
:
'
LockPage
'
,
...
...
@@ -129,6 +130,7 @@
showDate
,
password
:
passwordRef
,
handleShowForm
,
headerImg
,
...
state
,
};
},
...
...
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