Skip to content

Commit

Permalink
release: update 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoxian521 committed Mar 21, 2022
1 parent 12c2365 commit f80fbbe
Show file tree
Hide file tree
Showing 21 changed files with 119 additions and 127 deletions.
12 changes: 12 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ module.exports = {
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"vue/html-self-closing": [
"error",
{
html: {
void: "always",
normal: "always",
component: "always"
},
svg: "always",
math: "always"
}
],
"@typescript-eslint/no-unused-vars": [
"error",
{
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pure-admin-thin",
"version": "3.1.0",
"version": "3.2.0",
"private": true,
"scripts": {
"dev": "cross-env --max_old_space_size=4096 vite",
Expand Down Expand Up @@ -105,7 +105,7 @@
"stylelint-order": "^5.0.0",
"typescript": "^4.6.2",
"unplugin-element-plus": "^0.3.2",
"vite": "^2.9.0-beta.3",
"vite": "^2.9.0-beta.4",
"vite-plugin-live-reload": "^2.1.0",
"vite-plugin-mock": "^2.9.6",
"vite-plugin-remove-console": "^0.0.6",
Expand Down
54 changes: 27 additions & 27 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/serverConfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Version": "3.1.0",
"Version": "3.2.0",
"Title": "PureAdmin",
"FixedHeader": true,
"HiddenSideBar": false,
Expand Down
11 changes: 6 additions & 5 deletions src/layout/components/navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,11 @@ function translationEn() {
<el-dropdown-item
:style="getDropdownItemStyle(locale, 'en')"
@click="translationEn"
><el-icon class="check-en" v-show="locale === 'en'"
><IconifyIconOffline icon="check" /></el-icon
>English</el-dropdown-item
>
<span class="check-en" v-show="locale === 'en'">
<IconifyIconOffline icon="check" /> </span
>English
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
Expand All @@ -106,13 +107,13 @@ function translationEn() {
</el-dropdown-menu>
</template>
</el-dropdown>
<el-icon
<span
class="el-icon-setting"
:title="t('buttons.hssystemSet')"
@click="onPanel"
>
<IconifyIconOffline icon="setting" />
</el-icon>
</span>
</div>
</div>
</template>
Expand Down
6 changes: 3 additions & 3 deletions src/layout/components/notice/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ function tabClick() {
<el-dropdown ref="dropdownDom" trigger="click" placement="bottom-end">
<span class="dropdown-badge">
<el-badge :value="noticesNum" :max="99">
<el-icon class="header-notice-icon"
><IconifyIconOffline icon="bell"
/></el-icon>
<span class="header-notice-icon">
<IconifyIconOffline icon="bell" />
</span>
</el-badge>
</span>
<template #dropdown>
Expand Down
2 changes: 1 addition & 1 deletion src/layout/components/notice/noticeItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function hoverDescription(event, description) {
:size="30"
:src="props.noticeItem.avatar"
class="notice-container-avatar"
></el-avatar>
/>
<div class="notice-container-text">
<div class="notice-text-title">
<el-tooltip
Expand Down
4 changes: 2 additions & 2 deletions src/layout/components/notice/noticeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const props = defineProps({
v-for="(item, index) in props.list"
:noticeItem="item"
:key="index"
></NoticeItem>
/>
</div>
<el-empty v-else description="暂无数据"></el-empty>
<el-empty v-else description="暂无数据" />
</template>
2 changes: 1 addition & 1 deletion src/layout/components/panel/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ emitter.on("openPanel", () => {
<IconifyIconOffline icon="close" />
</el-icon>
</div>
<div style="border-bottom: 1px solid #dcdfe6"></div>
<div style="border-bottom: 1px solid #dcdfe6" />
<slot />
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/layout/components/search/components/SearchModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ onKeyStroke("ArrowDown", handleDown);
@input="handleSearch"
>
<template #prefix>
<el-icon class="el-input__icon">
<span class="el-input__icon">
<IconifyIconOffline icon="search" />
</el-icon>
</span>
</template>
</el-input>
<div class="search-result-container">
Expand Down
4 changes: 1 addition & 3 deletions src/layout/components/search/components/SearchResult.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
@click="handleTo"
@mouseenter="handleMouse(item)"
>
<component
:is="useRenderIcon(item.meta?.icon ?? 'bookmark-2-line')"
></component>
<component :is="useRenderIcon(item.meta?.icon ?? 'bookmark-2-line')" />
<span class="result-item-title">{{ t(item.meta?.title) }}</span>
<enterOutlined />
</div>
Expand Down
Loading

0 comments on commit f80fbbe

Please sign in to comment.