Commit 3571eb4c47c2f0bb80082c9ab3f9b862382f61ad
1 parent
cdf0a600
chore: bump 2.0.0.rc.16
Showing
7 changed files
with
21 additions
and
13 deletions
CHANGELOG.zh_CN.md
package.json
1 | { | 1 | { |
2 | "name": "vben-admin", | 2 | "name": "vben-admin", |
3 | - "version": "2.0.0-rc.15", | 3 | + "version": "2.0.0-rc.16", |
4 | "scripts": { | 4 | "scripts": { |
5 | "bootstrap": "yarn install", | 5 | "bootstrap": "yarn install", |
6 | "serve": "vite", | 6 | "serve": "vite", |
@@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
18 | "reinstall": "rimraf yarn.lock && rimraf package.lock.json && rimraf node_modules && npm run bootstrap" | 18 | "reinstall": "rimraf yarn.lock && rimraf package.lock.json && rimraf node_modules && npm run bootstrap" |
19 | }, | 19 | }, |
20 | "dependencies": { | 20 | "dependencies": { |
21 | - "@iconify/iconify": "^2.0.0-rc.5", | 21 | + "@iconify/iconify": "^2.0.0-rc.6", |
22 | "@vueuse/core": "^4.0.5", | 22 | "@vueuse/core": "^4.0.5", |
23 | "ant-design-vue": "^2.0.0-rc.8", | 23 | "ant-design-vue": "^2.0.0-rc.8", |
24 | "apexcharts": "^3.23.1", | 24 | "apexcharts": "^3.23.1", |
@@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
34 | "sortablejs": "^1.13.0", | 34 | "sortablejs": "^1.13.0", |
35 | "vditor": "^3.7.5", | 35 | "vditor": "^3.7.5", |
36 | "vue": "^3.0.5", | 36 | "vue": "^3.0.5", |
37 | - "vue-i18n": "^9.0.0-rc.1", | 37 | + "vue-i18n": "^9.0.0-rc.2", |
38 | "vue-router": "^4.0.3", | 38 | "vue-router": "^4.0.3", |
39 | "vue-types": "^3.0.1", | 39 | "vue-types": "^3.0.1", |
40 | "vuex": "^4.0.0-rc.2", | 40 | "vuex": "^4.0.0-rc.2", |
@@ -45,7 +45,7 @@ | @@ -45,7 +45,7 @@ | ||
45 | "devDependencies": { | 45 | "devDependencies": { |
46 | "@commitlint/cli": "^11.0.0", | 46 | "@commitlint/cli": "^11.0.0", |
47 | "@commitlint/config-conventional": "^11.0.0", | 47 | "@commitlint/config-conventional": "^11.0.0", |
48 | - "@iconify/json": "^1.1.284", | 48 | + "@iconify/json": "^1.1.285", |
49 | "@ls-lint/ls-lint": "^1.9.2", | 49 | "@ls-lint/ls-lint": "^1.9.2", |
50 | "@purge-icons/generated": "^0.5.0", | 50 | "@purge-icons/generated": "^0.5.0", |
51 | "@types/echarts": "^4.9.3", | 51 | "@types/echarts": "^4.9.3", |
@@ -66,8 +66,8 @@ | @@ -66,8 +66,8 @@ | ||
66 | "@vitejs/plugin-vue": "^1.0.5", | 66 | "@vitejs/plugin-vue": "^1.0.5", |
67 | "@vitejs/plugin-vue-jsx": "^1.0.1", | 67 | "@vitejs/plugin-vue-jsx": "^1.0.1", |
68 | "@vue/compiler-sfc": "^3.0.5", | 68 | "@vue/compiler-sfc": "^3.0.5", |
69 | - "@vuedx/typecheck": "^0.4.1", | ||
70 | - "@vuedx/typescript-plugin-vue": "^0.4.1", | 69 | + "@vuedx/typecheck": "^0.5.0", |
70 | + "@vuedx/typescript-plugin-vue": "^0.5.0", | ||
71 | "autoprefixer": "^10.2.1", | 71 | "autoprefixer": "^10.2.1", |
72 | "commitizen": "^4.2.2", | 72 | "commitizen": "^4.2.2", |
73 | "conventional-changelog-cli": "^2.1.1", | 73 | "conventional-changelog-cli": "^2.1.1", |
@@ -100,7 +100,7 @@ | @@ -100,7 +100,7 @@ | ||
100 | "vite-plugin-html": "^2.0.0-beta.5", | 100 | "vite-plugin-html": "^2.0.0-beta.5", |
101 | "vite-plugin-mock": "^2.0.0-beta.3", | 101 | "vite-plugin-mock": "^2.0.0-beta.3", |
102 | "vite-plugin-purge-icons": "^0.5.0", | 102 | "vite-plugin-purge-icons": "^0.5.0", |
103 | - "vite-plugin-pwa": "^0.3.5", | 103 | + "vite-plugin-pwa": "^0.3.6", |
104 | "vue-eslint-parser": "^7.3.0", | 104 | "vue-eslint-parser": "^7.3.0", |
105 | "yargs": "^16.2.0" | 105 | "yargs": "^16.2.0" |
106 | }, | 106 | }, |
src/components/Application/src/AppLogo.vue
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | :class="[prefixCls, theme, { 'collapsed-show-title': getCollapsedShowTitle }]" | 8 | :class="[prefixCls, theme, { 'collapsed-show-title': getCollapsedShowTitle }]" |
9 | @click="handleGoHome" | 9 | @click="handleGoHome" |
10 | > | 10 | > |
11 | - <img src="/@/assets/images/logo.png" /> | 11 | + <img src="../../../assets/images/logo.png" /> |
12 | <div class="ml-2 ellipsis" :class="[`${prefixCls}__title`]" v-show="showTitle"> | 12 | <div class="ml-2 ellipsis" :class="[`${prefixCls}__title`]" v-show="showTitle"> |
13 | {{ title }} | 13 | {{ title }} |
14 | </div> | 14 | </div> |
src/layouts/default/header/components/lock/LockModal.vue
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | > | 8 | > |
9 | <div :class="`${prefixCls}__entry`"> | 9 | <div :class="`${prefixCls}__entry`"> |
10 | <div :class="`${prefixCls}__header`"> | 10 | <div :class="`${prefixCls}__header`"> |
11 | - <img src="/@/assets/images/header.jpg" :class="`${prefixCls}__header-img`" /> | 11 | + <img :src="headerImg" :class="`${prefixCls}__header-img`" /> |
12 | <p :class="`${prefixCls}__header-name`">{{ getRealName }}</p> | 12 | <p :class="`${prefixCls}__header-name`">{{ getRealName }}</p> |
13 | </div> | 13 | </div> |
14 | 14 | ||
@@ -31,6 +31,7 @@ | @@ -31,6 +31,7 @@ | ||
31 | 31 | ||
32 | import { userStore } from '/@/store/modules/user'; | 32 | import { userStore } from '/@/store/modules/user'; |
33 | import { lockStore } from '/@/store/modules/lock'; | 33 | import { lockStore } from '/@/store/modules/lock'; |
34 | + import headerImg from '/@/assets/images/header.jpg'; | ||
34 | export default defineComponent({ | 35 | export default defineComponent({ |
35 | name: 'LockModal', | 36 | name: 'LockModal', |
36 | components: { BasicModal, BasicForm }, | 37 | components: { BasicModal, BasicForm }, |
@@ -75,6 +76,7 @@ | @@ -75,6 +76,7 @@ | ||
75 | register, | 76 | register, |
76 | registerForm, | 77 | registerForm, |
77 | handleLock, | 78 | handleLock, |
79 | + headerImg, | ||
78 | }; | 80 | }; |
79 | }, | 81 | }, |
80 | }); | 82 | }); |
src/layouts/default/header/components/user-dropdown/index.vue
1 | <template> | 1 | <template> |
2 | <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`"> | 2 | <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`"> |
3 | <span :class="[prefixCls, `${prefixCls}--${theme}`]"> | 3 | <span :class="[prefixCls, `${prefixCls}--${theme}`]"> |
4 | - <img :class="`${prefixCls}__header`" src="/@/assets/images/header.jpg" /> | 4 | + <img :class="`${prefixCls}__header`" :src="headerImg" /> |
5 | <span :class="`${prefixCls}__info`"> | 5 | <span :class="`${prefixCls}__info`"> |
6 | <span :class="`${prefixCls}__name anticon`">{{ getUserInfo.realName }}</span> | 6 | <span :class="`${prefixCls}__name anticon`">{{ getUserInfo.realName }}</span> |
7 | </span> | 7 | </span> |
@@ -47,6 +47,7 @@ | @@ -47,6 +47,7 @@ | ||
47 | import { useDesign } from '/@/hooks/web/useDesign'; | 47 | import { useDesign } from '/@/hooks/web/useDesign'; |
48 | import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent'; | 48 | import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent'; |
49 | import { propTypes } from '/@/utils/propTypes'; | 49 | import { propTypes } from '/@/utils/propTypes'; |
50 | + import headerImg from '/@/assets/images/header.jpg'; | ||
50 | 51 | ||
51 | type MenuEvent = 'loginOut' | 'doc'; | 52 | type MenuEvent = 'loginOut' | 'doc'; |
52 | 53 | ||
@@ -99,6 +100,7 @@ | @@ -99,6 +100,7 @@ | ||
99 | getUserInfo, | 100 | getUserInfo, |
100 | handleMenuClick, | 101 | handleMenuClick, |
101 | getShowDoc, | 102 | getShowDoc, |
103 | + headerImg, | ||
102 | }; | 104 | }; |
103 | }, | 105 | }, |
104 | }); | 106 | }); |
src/views/dashboard/workbench/components/NewsList.vue
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | <ListItem class="news-list__item"> | 6 | <ListItem class="news-list__item"> |
7 | <ListItemMeta> | 7 | <ListItemMeta> |
8 | <template #avatar> | 8 | <template #avatar> |
9 | - <img src="/@/assets/images/header.jpg" class="news-list__item-avatar" /> | 9 | + <img :src="headerImg" class="news-list__item-avatar" /> |
10 | </template> | 10 | </template> |
11 | <template #description> | 11 | <template #description> |
12 | <div class="news-list__item-desc"> | 12 | <div class="news-list__item-desc"> |
@@ -36,6 +36,7 @@ | @@ -36,6 +36,7 @@ | ||
36 | import { defineComponent } from 'vue'; | 36 | import { defineComponent } from 'vue'; |
37 | import { List } from 'ant-design-vue'; | 37 | import { List } from 'ant-design-vue'; |
38 | import { CollapseContainer, ScrollContainer } from '/@/components/Container/index'; | 38 | import { CollapseContainer, ScrollContainer } from '/@/components/Container/index'; |
39 | + import headerImg from '/@/assets/images/header.jpg'; | ||
39 | 40 | ||
40 | import { newList } from '../data'; | 41 | import { newList } from '../data'; |
41 | export default defineComponent({ | 42 | export default defineComponent({ |
@@ -47,7 +48,7 @@ | @@ -47,7 +48,7 @@ | ||
47 | ScrollContainer, | 48 | ScrollContainer, |
48 | }, | 49 | }, |
49 | setup() { | 50 | setup() { |
50 | - return { newList }; | 51 | + return { newList, headerImg }; |
51 | }, | 52 | }, |
52 | }); | 53 | }); |
53 | </script> | 54 | </script> |
src/views/sys/lock/LockPage.vue
@@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
16 | <div :class="`${prefixCls}-entry`" v-show="!showDate"> | 16 | <div :class="`${prefixCls}-entry`" v-show="!showDate"> |
17 | <div :class="`${prefixCls}-entry-content`"> | 17 | <div :class="`${prefixCls}-entry-content`"> |
18 | <div :class="`${prefixCls}-entry__header`"> | 18 | <div :class="`${prefixCls}-entry__header`"> |
19 | - <img src="/@/assets/images/header.jpg" :class="`${prefixCls}-entry__header-img`" /> | 19 | + <img :src="headerImg" :class="`${prefixCls}-entry__header-img`" /> |
20 | <p :class="`${prefixCls}-entry__header-name`">{{ realName }}</p> | 20 | <p :class="`${prefixCls}-entry__header-name`">{{ realName }}</p> |
21 | </div> | 21 | </div> |
22 | <InputPassword :placeholder="t('sys.lock.placeholder')" v-model:value="password" /> | 22 | <InputPassword :placeholder="t('sys.lock.placeholder')" v-model:value="password" /> |
@@ -70,6 +70,7 @@ | @@ -70,6 +70,7 @@ | ||
70 | import { useDesign } from '/@/hooks/web/useDesign'; | 70 | import { useDesign } from '/@/hooks/web/useDesign'; |
71 | 71 | ||
72 | import { LockOutlined } from '@ant-design/icons-vue'; | 72 | import { LockOutlined } from '@ant-design/icons-vue'; |
73 | + import headerImg from '/@/assets/images/header.jpg'; | ||
73 | 74 | ||
74 | export default defineComponent({ | 75 | export default defineComponent({ |
75 | name: 'LockPage', | 76 | name: 'LockPage', |
@@ -129,6 +130,7 @@ | @@ -129,6 +130,7 @@ | ||
129 | showDate, | 130 | showDate, |
130 | password: passwordRef, | 131 | password: passwordRef, |
131 | handleShowForm, | 132 | handleShowForm, |
133 | + headerImg, | ||
132 | ...state, | 134 | ...state, |
133 | }; | 135 | }; |
134 | }, | 136 | }, |