Skip to content

Commit

Permalink
chore: bump 2.0.0.rc.16
Browse files Browse the repository at this point in the history
  • Loading branch information
anncwb committed Jan 12, 2021
1 parent cdf0a60 commit 3571eb4
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
- 修复`layout` 收缩展开功能在分割模式下失效
- 修复 modal 高度计算错误
- 修复文件上传错误
- 修复表格已知问题

### 🎫 Chores

Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vben-admin",
"version": "2.0.0-rc.15",
"version": "2.0.0-rc.16",
"scripts": {
"bootstrap": "yarn install",
"serve": "vite",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -45,7 +45,7 @@
"devDependencies": {
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@iconify/json": "^1.1.284",
"@iconify/json": "^1.1.285",
"@ls-lint/ls-lint": "^1.9.2",
"@purge-icons/generated": "^0.5.0",
"@types/echarts": "^4.9.3",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/Application/src/AppLogo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion src/layouts/default/header/components/lock/LockModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
>
<div :class="`${prefixCls}__entry`">
<div :class="`${prefixCls}__header`">
<img src="/@/assets/images/header.jpg" :class="`${prefixCls}__header-img`" />
<img :src="headerImg" :class="`${prefixCls}__header-img`" />
<p :class="`${prefixCls}__header-name`">{{ getRealName }}</p>
</div>

Expand All @@ -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 },
Expand Down Expand Up @@ -75,6 +76,7 @@
register,
registerForm,
handleLock,
headerImg,
};
},
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`">
<span :class="[prefixCls, `${prefixCls}--${theme}`]">
<img :class="`${prefixCls}__header`" src="/@/assets/images/header.jpg" />
<img :class="`${prefixCls}__header`" :src="headerImg" />
<span :class="`${prefixCls}__info`">
<span :class="`${prefixCls}__name anticon`">{{ getUserInfo.realName }}</span>
</span>
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -99,6 +100,7 @@
getUserInfo,
handleMenuClick,
getShowDoc,
headerImg,
};
},
});
Expand Down
5 changes: 3 additions & 2 deletions src/views/dashboard/workbench/components/NewsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ListItem class="news-list__item">
<ListItemMeta>
<template #avatar>
<img src="/@/assets/images/header.jpg" class="news-list__item-avatar" />
<img :src="headerImg" class="news-list__item-avatar" />
</template>
<template #description>
<div class="news-list__item-desc">
Expand Down Expand Up @@ -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({
Expand All @@ -47,7 +48,7 @@
ScrollContainer,
},
setup() {
return { newList };
return { newList, headerImg };
},
});
</script>
Expand Down
4 changes: 3 additions & 1 deletion src/views/sys/lock/LockPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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.jpg" :class="`${prefixCls}-entry__header-img`" />
<img :src="headerImg" :class="`${prefixCls}-entry__header-img`" />
<p :class="`${prefixCls}-entry__header-name`">{{ realName }}</p>
</div>
<InputPassword :placeholder="t('sys.lock.placeholder')" v-model:value="password" />
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -129,6 +130,7 @@
showDate,
password: passwordRef,
handleShowForm,
headerImg,
...state,
};
},
Expand Down

0 comments on commit 3571eb4

Please sign in to comment.