fix Bug Features CHANGELOG.ms

2026-03-01 00:23:11 +08:00 · 2021-07-19 16:42:11 +08:00
parent 46dc7eb69e
commit b689fabfdd
148 changed files with 5829 additions and 4268 deletions
--- a/src/layout/components/Footer/index.vue
+++ b/src/layout/components/Footer/index.vue
@@ -12,7 +12,7 @@
      </a>
    </div>
    <div class="copyright">
-      naive-ui-admin 1.2 · Made by Ah jung
+      naive-ui-admin 1.3 · Made by Ah jung
    </div>
  </div>

--- a/src/layout/components/Header/ProjectSetting.vue
+++ b/src/layout/components/Header/ProjectSetting.vue
@@ -212,10 +212,10 @@ export default defineComponent({
    })

    watch(
-      () => designStore.darkTheme,
-      (to) => {
-        settingStore.navTheme = to ? 'header-dark' : 'dark'
-      }
+        () => designStore.darkTheme,
+        (to) => {
+          settingStore.navTheme = to ? 'header-dark' : 'dark'
+        }
    )

    function openDrawer(isDrawer) {
--- a/src/layout/components/Header/components.ts
+++ b/src/layout/components/Header/components.ts
@@ -1,31 +1,31 @@
 import {
-  SettingOutlined,
-  SearchOutlined,
-  MenuFoldOutlined,
-  MenuUnfoldOutlined,
-  FullscreenOutlined,
-  FullscreenExitOutlined,
-  PoweroffOutlined,
-  GithubOutlined,
-  LockOutlined,
-  ReloadOutlined,
-  LogoutOutlined,
-  UserOutlined,
-  CheckOutlined
+    SettingOutlined,
+    SearchOutlined,
+    MenuFoldOutlined,
+    MenuUnfoldOutlined,
+    FullscreenOutlined,
+    FullscreenExitOutlined,
+    PoweroffOutlined,
+    GithubOutlined,
+    LockOutlined,
+    ReloadOutlined,
+    LogoutOutlined,
+    UserOutlined,
+    CheckOutlined
 } from '@vicons/antd'

 export default {
-  SettingOutlined,
-  LockOutlined,
-  GithubOutlined,
-  SearchOutlined,
-  MenuFoldOutlined,
-  MenuUnfoldOutlined,
-  FullscreenOutlined,
-  FullscreenExitOutlined,
-  PoweroffOutlined,
-  ReloadOutlined,
-  LogoutOutlined,
-  UserOutlined,
-  CheckOutlined
+    SettingOutlined,
+    LockOutlined,
+    GithubOutlined,
+    SearchOutlined,
+    MenuFoldOutlined,
+    MenuUnfoldOutlined,
+    FullscreenOutlined,
+    FullscreenExitOutlined,
+    PoweroffOutlined,
+    ReloadOutlined,
+    LogoutOutlined,
+    UserOutlined,
+    CheckOutlined
 }
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -8,29 +8,29 @@
    <div class="layout-header-left" v-else>
      <!-- 菜单收起 -->
      <div class="ml-1 layout-header-trigger layout-header-trigger-min"
-            @click="() => $emit('update:collapsed', !collapsed)">
-          <n-icon size="18" v-if="collapsed">
-            <MenuUnfoldOutlined/>
-          </n-icon>
-          <n-icon size="18" v-else>
-            <MenuFoldOutlined/>
-          </n-icon>
+           @click="() => $emit('update:collapsed', !collapsed)">
+        <n-icon size="18" v-if="collapsed">
+          <MenuUnfoldOutlined/>
+        </n-icon>
+        <n-icon size="18" v-else>
+          <MenuFoldOutlined/>
+        </n-icon>
      </div>
      <!-- 刷新 -->
      <div class="mr-1 layout-header-trigger layout-header-trigger-min" v-if="headerSetting.isReload"
-            @click="reloadPage">
-          <n-icon size="18">
-            <ReloadOutlined/>
-          </n-icon>
+           @click="reloadPage">
+        <n-icon size="18">
+          <ReloadOutlined/>
+        </n-icon>
      </div>
      <!-- 面包屑 -->
      <n-breadcrumb v-if="crumbsSetting.show">
        <template v-for="routeItem in breadcrumbList" :key="routeItem.name">
          <n-breadcrumb-item>
            <n-dropdown
-              v-if="routeItem.children.length"
-              :options="routeItem.children"
-              @select="dropdownSelect"
+                v-if="routeItem.children.length"
+                :options="routeItem.children"
+                @select="dropdownSelect"
            >
                <span class="link-text">
                  <component v-if="crumbsSetting.showIcon && routeItem.meta.icon" :is="routeItem.meta.icon"></component>
@@ -46,49 +46,51 @@
      </n-breadcrumb>
    </div>
    <div class="layout-header-right">
-        <div class="layout-header-trigger layout-header-trigger-min" v-for="item in iconList" :key="item.icon.name">
-          <n-tooltip placement="bottom">
-            <template #trigger>
-              <n-icon size="18">
-                <component :is="item.icon" v-on="item.eventObject || {}"/>
-              </n-icon>
-            </template>
-            <span>{{ item.tips }}</span>
-          </n-tooltip>
-        </div>
+      <div class="layout-header-trigger layout-header-trigger-min" v-for="item in iconList" :key="item.icon.name">
+        <n-tooltip placement="bottom">
+          <template #trigger>
+            <n-icon size="18">
+              <component :is="item.icon" v-on="item.eventObject || {}"/>
+            </n-icon>
+          </template>
+          <span>{{ item.tips }}</span>
+        </n-tooltip>
+      </div>
      <!--切换全屏-->
      <div class="layout-header-trigger layout-header-trigger-min">
        <n-tooltip placement="bottom">
-            <template #trigger>
-              <n-icon size="18">
-                <component :is="fullscreenIcon" @click="toggleFullScreen"/>
-              </n-icon>
-            </template>
-            <span>全屏</span>
-          </n-tooltip>
-        </div>
+          <template #trigger>
+            <n-icon size="18">
+              <component :is="fullscreenIcon" @click="toggleFullScreen"/>
+            </n-icon>
+          </template>
+          <span>全屏</span>
+        </n-tooltip>
+      </div>
      <!-- 个人中心 -->
      <div class="layout-header-trigger layout-header-trigger-min">
-            <n-dropdown trigger="hover" @select="avatarSelect" :options="avatarOptions">
-              <div class="avatar">
-                <n-avatar>
-                  {{ username }}
-                  <template #icon><UserOutlined/></template>
-                </n-avatar>
-              </div>
-            </n-dropdown>
-        </div>
+        <n-dropdown trigger="hover" @select="avatarSelect" :options="avatarOptions">
+          <div class="avatar">
+            <n-avatar>
+              {{ username }}
+              <template #icon>
+                <UserOutlined/>
+              </template>
+            </n-avatar>
+          </div>
+        </n-dropdown>
+      </div>
      <!--设置-->
      <div class="layout-header-trigger layout-header-trigger-min" @click="openSetting">
-            <n-tooltip placement="bottom-end">
-              <template #trigger>
-                <n-icon size="18" style="font-weight: bold">
-                  <SettingOutlined/>
-                </n-icon>
-              </template>
-              <span>项目配置</span>
-            </n-tooltip>
-          </div>
+        <n-tooltip placement="bottom-end">
+          <template #trigger>
+            <n-icon size="18" style="font-weight: bold">
+              <SettingOutlined/>
+            </n-icon>
+          </template>
+          <span>项目配置</span>
+        </n-tooltip>
+      </div>
    </div>
  </div>
  <!--项目配置-->
@@ -188,7 +190,7 @@ export default defineComponent({

    // 退出登录
    const doLogout = () => {
-      dialog.warning({
+      dialog.info({
        title: '提示',
        content: '您确定要退出登录吗',
        positiveText: '确定',
@@ -199,13 +201,13 @@ export default defineComponent({
            // 移除标签页
            localStorage.removeItem(TABS_ROUTES)
            router
-              .replace({
-                name: 'Login',
-                query: {
-                  redirect: route.fullPath
-                }
-              })
-              .finally(() => location.reload())
+                .replace({
+                  name: 'Login',
+                  query: {
+                    redirect: route.fullPath
+                  }
+                })
+                .finally(() => location.reload())
          })
        },
        onNegativeClick: () => {
@@ -216,8 +218,8 @@ export default defineComponent({

    // 切换全屏图标
    const toggleFullscreenIcon = () =>
-      (state.fullscreenIcon =
-        document.fullscreenElement !== null ? 'FullscreenExitOutlined' : 'FullscreenOutlined')
+        (state.fullscreenIcon =
+            document.fullscreenElement !== null ? 'FullscreenExitOutlined' : 'FullscreenOutlined')

    // 监听全屏切换事件
    document.addEventListener('fullscreenchange', toggleFullscreenIcon)
@@ -269,7 +271,7 @@ export default defineComponent({
    const avatarSelect = (key) => {
      switch (key) {
        case 1:
-          router.push({name:'Setting'})
+          router.push({ name: 'Setting' })
          break;
        case 2:
          doLogout()
--- a/src/layout/components/Logo/index.vue
+++ b/src/layout/components/Logo/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="logo">
    <img src="~@/assets/images/logo.png" alt=""/>
-    <h2 v-show="!collapsed" class="title">NaiveUiAdmin</h2>
+    <h2 v-show="!collapsed" class="title">&nbsp;NaiveUiAdmin</h2>
  </div>
 </template>

@@ -27,6 +27,7 @@ export default {
  white-space: nowrap;

  img {
+    width: auto;
    height: 32px;
  }

--- a/src/layout/components/TagsView/components.ts
+++ b/src/layout/components/TagsView/components.ts
@@ -1,24 +1,24 @@
 import {
-  DownOutlined,
-  ReloadOutlined,
-  CloseOutlined,
-  VerticalRightOutlined,
-  VerticalLeftOutlined,
-  ColumnWidthOutlined,
-  MinusOutlined
+    DownOutlined,
+    ReloadOutlined,
+    CloseOutlined,
+    VerticalRightOutlined,
+    VerticalLeftOutlined,
+    ColumnWidthOutlined,
+    MinusOutlined
 } from '@ant-design/icons-vue'
 import { Dropdown, Tabs, Card } from 'ant-design-vue'

 export default {
-  [Tabs.name]: Tabs,
-  [Tabs.TabPane.name]: Tabs.TabPane,
-  [Dropdown.name]: Dropdown,
-  [Card.name]: Card,
-  MinusOutlined,
-  DownOutlined,
-  ReloadOutlined,
-  CloseOutlined,
-  VerticalRightOutlined,
-  VerticalLeftOutlined,
-  ColumnWidthOutlined
+    [Tabs.name]: Tabs,
+    [Tabs.TabPane.name]: Tabs.TabPane,
+    [Dropdown.name]: Dropdown,
+    [Card.name]: Card,
+    MinusOutlined,
+    DownOutlined,
+    ReloadOutlined,
+    CloseOutlined,
+    VerticalRightOutlined,
+    VerticalLeftOutlined,
+    ColumnWidthOutlined
 }
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -215,12 +215,12 @@ export default defineComponent({

    // 标签页列表
    const tabsList: any = computed(() => tabsViewStore.tabsList)
-    const whiteList: string[] = [PageEnum.REDIRECT, PageEnum.BASE_LOGIN]
+    const whiteList: string[] = [PageEnum.BASE_LOGIN_NAME, PageEnum.REDIRECT_NAME, PageEnum.ERROR_PAGE_NAME]

    watch(
        () => route.fullPath,
        (to) => {
-          if (whiteList.includes(route.name as string) || ['ErrorPage'].includes(route.name as string)) return
+          if (whiteList.includes(route.name as string)) return
          state.activeKey = to
          tabsViewStore.addTabs(getSimpleRoute(route))
          updateNavScroll()
@@ -443,7 +443,7 @@ export default defineComponent({
 <style lang="less" scoped>
 .tabs-view {
  width: 100%;
-  padding: 6px 0px;
+  padding: 6px 0;
  display: flex;
  transition: all 0.2s ease-in-out;

@@ -589,6 +589,6 @@ export default defineComponent({
 }

 .tabs-view-fixed-header {
-  top: 0px;
+  top: 0;
 }
 </style>