release: update 3.2.0

2022-03-22 00:37:24 +08:00
parent 12c2365a26
commit f80fbbed20
21 changed files with 119 additions and 127 deletions
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -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>
@@ -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>
--- a/src/layout/components/notice/index.vue
+++ b/src/layout/components/notice/index.vue
@@ -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>
--- a/src/layout/components/notice/noticeItem.vue
+++ b/src/layout/components/notice/noticeItem.vue
@@ -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
--- a/src/layout/components/notice/noticeList.vue
+++ b/src/layout/components/notice/noticeList.vue
@@ -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>
--- a/src/layout/components/panel/index.vue
+++ b/src/layout/components/panel/index.vue
@@ -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>
--- a/src/layout/components/search/components/SearchModal.vue
+++ b/src/layout/components/search/components/SearchModal.vue
@@ -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">
--- a/src/layout/components/search/components/SearchResult.vue
+++ b/src/layout/components/search/components/SearchResult.vue
@@ -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>
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -316,8 +316,7 @@ nextTick(() => {
      :active-icon="dayIcon"
      :inactive-icon="darkIcon"
      @change="dataThemeChange"
-    >
-    </el-switch>
+    />

    <el-divider>导航栏模式</el-divider>
    <ul class="pure-theme">
@@ -327,8 +326,8 @@ nextTick(() => {
          ref="verticalRef"
          @click="setLayoutModel('vertical')"
        >
-          <div></div>
-          <div></div>
+          <div />
+          <div />
        </li>
      </el-tooltip>

@@ -338,8 +337,8 @@ nextTick(() => {
          ref="horizontalRef"
          @click="setLayoutModel('horizontal')"
        >
-          <div></div>
-          <div></div>
+          <div />
+          <div />
        </li>
      </el-tooltip>

@@ -349,8 +348,8 @@ nextTick(() => {
          ref="mixRef"
          @click="setLayoutModel('mix')"
        >
-          <div></div>
-          <div></div>
+          <div />
+          <div />
        </li>
      </el-tooltip>
    </ul>
@@ -384,8 +383,7 @@ nextTick(() => {
          active-text="开"
          inactive-text="关"
          @change="greyChange"
-        >
-        </el-switch>
+        />
      </li>
      <li v-show="!dataTheme">
        <span>色弱模式</span>
@@ -396,8 +394,7 @@ nextTick(() => {
          active-text="开"
          inactive-text="关"
          @change="weekChange"
-        >
-        </el-switch>
+        />
      </li>
      <li>
        <span>隐藏标签页</span>
@@ -408,8 +405,7 @@ nextTick(() => {
          active-text="开"
          inactive-text="关"
          @change="tagsChange"
-        >
-        </el-switch>
+        />
      </li>
      <li>
        <span>侧边栏Logo</span>
@@ -422,8 +418,7 @@ nextTick(() => {
          active-text="开"
          inactive-text="关"
          @change="logoChange"
-        >
-        </el-switch>
+        />
      </li>
      <li>
        <span>标签页持久化</span>
@@ -434,8 +429,7 @@ nextTick(() => {
          active-text="开"
          inactive-text="关"
          @change="multiTagsCacheChange"
-        >
-        </el-switch>
+        />
      </li>

      <li>
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -69,11 +69,7 @@ function translationEn() {
 <template>
  <div class="horizontal-header">
    <div class="horizontal-header-left" @click="backHome">
-      <FontIcon
-        icon="team-iconlogo"
-        svg
-        style="width: 35px; height: 35px"
-      ></FontIcon>
+      <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
      <h4>{{ title }}</h4>
    </div>
    <el-menu
@@ -106,15 +102,17 @@ function translationEn() {
            <el-dropdown-item
              :style="getDropdownItemStyle(locale, 'zh')"
              @click="translationCh"
-              ><el-icon class="check-zh" v-show="locale === 'zh'"
-                ><IconifyIconOffline icon="check" /></el-icon
-              >简体中文</el-dropdown-item
            >
+              <span class="check-zh" v-show="locale === 'zh'">
+                <IconifyIconOffline icon="check" /> </span
+              >简体中文
+            </el-dropdown-item>
            <el-dropdown-item
              :style="getDropdownItemStyle(locale, 'en')"
              @click="translationEn"
-              ><el-icon class="check-en" v-show="locale === 'en'"
-                ><IconifyIconOffline icon="check" /></el-icon
+            >
+              <span class="check-en" v-show="locale === 'en'">
+                <IconifyIconOffline icon="check" /> </span
              >English</el-dropdown-item
            >
          </el-dropdown-menu>
@@ -138,13 +136,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>
--- a/src/layout/components/sidebar/logo.vue
+++ b/src/layout/components/sidebar/logo.vue
@@ -18,11 +18,7 @@ const title =
        class="sidebar-logo-link"
        to="/"
      >
-        <FontIcon
-          icon="team-iconlogo"
-          svg
-          style="width: 35px; height: 35px"
-        ></FontIcon>
+        <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
        <span class="sidebar-title">{{ title }}</span>
      </router-link>
      <router-link
@@ -32,11 +28,7 @@ const title =
        class="sidebar-logo-link"
        to="/"
      >
-        <FontIcon
-          icon="team-iconlogo"
-          svg
-          style="width: 35px; height: 35px"
-        ></FontIcon>
+        <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
        <span class="sidebar-title">{{ title }}</span>
      </router-link>
    </transition>
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -119,11 +119,9 @@ function translationEn() {
        :index="resolvePath(route) || route.redirect"
      >
        <template #title>
-          <el-icon v-show="route.meta.icon" :class="route.meta.icon">
-            <component
-              :is="useRenderIcon(route.meta && route.meta.icon)"
-            ></component>
-          </el-icon>
+          <div v-show="route.meta.icon" :class="['el-icon', route.meta.icon]">
+            <component :is="useRenderIcon(route.meta && route.meta.icon)" />
+          </div>
          <span>{{ transformI18n(route.meta.title, route.meta.i18n) }}</span>
          <FontIcon
            v-if="route.meta.extraIcon"
@@ -132,7 +130,7 @@ function translationEn() {
            style="position: absolute; right: 10px"
            :icon="route.meta.extraIcon.name"
            :svg="route.meta.extraIcon.svg ? true : false"
-          ></FontIcon>
+          />
        </template>
      </el-menu-item>
    </el-menu>
@@ -151,15 +149,15 @@ function translationEn() {
            <el-dropdown-item
              :style="getDropdownItemStyle(locale, 'zh')"
              @click="translationCh"
-              ><el-icon class="check-zh" v-show="locale === 'zh'"
-                ><IconifyIconOffline icon="check" /></el-icon
+              ><span class="check-zh" v-show="locale === 'zh'"
+                ><IconifyIconOffline icon="check" /></span
              >简体中文</el-dropdown-item
            >
            <el-dropdown-item
              :style="getDropdownItemStyle(locale, 'en')"
              @click="translationEn"
-              ><el-icon class="check-en" v-show="locale === 'en'"
-                ><IconifyIconOffline icon="check" /></el-icon
+              ><span class="check-en" v-show="locale === 'en'"
+                ><IconifyIconOffline icon="check" /></span
              >English</el-dropdown-item
            >
          </el-dropdown-menu>
@@ -183,13 +181,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>
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -148,7 +148,7 @@ function resolvePath(routePath) {
      :class="{ 'submenu-title-noDropdown': !isNest }"
      :style="getNoDropdownStyle"
    >
-      <el-icon v-show="props.item.meta.icon">
+      <div class="el-icon" v-show="props.item.meta.icon">
        <component
          :is="
            useRenderIcon(
@@ -156,8 +156,8 @@ function resolvePath(routePath) {
                (props.item.meta && props.item.meta.icon)
            )
          "
-        ></component>
-      </el-icon>
+        />
+      </div>
      <div
        v-if="
          !pureApp.sidebar.opened &&
@@ -203,7 +203,7 @@ function resolvePath(routePath) {
            :style="getExtraIconStyle"
            :icon="onlyOneChild.meta.extraIcon.name"
            :svg="onlyOneChild.meta.extraIcon.svg ? true : false"
-          ></FontIcon>
+          />
        </div>
      </template>
    </el-menu-item>
@@ -216,11 +216,14 @@ function resolvePath(routePath) {
    popper-append-to-body
  >
    <template #title>
-      <el-icon v-show="props.item.meta.icon" :class="props.item.meta.icon">
+      <div
+        v-show="props.item.meta.icon"
+        :class="['el-icon', props.item.meta.icon]"
+      >
        <component
          :is="useRenderIcon(props.item.meta && props.item.meta.icon)"
-        ></component>
-      </el-icon>
+        />
+      </div>
      <span v-if="!menuMode">{{
        transformI18n(props.item.meta.title, props.item.meta.i18n)
      }}</span>
@@ -250,7 +253,7 @@ function resolvePath(routePath) {
        style="position: absolute; right: 10px"
        :icon="props.item.meta.extraIcon.name"
        :svg="props.item.meta.extraIcon.svg ? true : false"
-      ></FontIcon>
+      />
    </template>
    <sidebar-item
      v-for="child in props.item.children"
--- a/src/layout/components/tag/index.vue
+++ b/src/layout/components/tag/index.vue
@@ -428,7 +428,8 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
  });
 }

-function handleCommand(command: any) {
+function handleCommand(command: object) {
+  // @ts-expect-error
  const { key, item } = command;
  onClickDrop(key, item);
 }
@@ -663,7 +664,7 @@ const getContextMenuStyle = computed((): CSSProperties => {
          <router-link :to="item.path"
            >{{ transformI18n(item.meta.title, item.meta.i18n) }}
          </router-link>
-          <el-icon
+          <span
            v-if="
              iconIsActive(item, index) ||
              (index === activeIndex && index !== 0)
@@ -672,12 +673,12 @@ const getContextMenuStyle = computed((): CSSProperties => {
            @click.stop="deleteMenu(item)"
          >
            <IconifyIconOffline icon="close-bold" />
-          </el-icon>
+          </span>
          <div
            :ref="'schedule' + index"
            v-if="showModel !== 'card'"
            :class="[scheduleIsActive(item)]"
-          ></div>
+          />
        </div>
      </div>
    </div>
@@ -710,13 +711,13 @@ const getContextMenuStyle = computed((): CSSProperties => {
    <!-- 右侧功能按钮 -->
    <ul class="right-button">
      <li>
-        <el-icon
+        <span
          :title="t('buttons.hsrefreshRoute')"
          class="el-icon-refresh-right rotate"
          @click="onFresh"
        >
          <IconifyIconOffline icon="refresh-right" />
-        </el-icon>
+        </span>
      </li>
      <li>
        <el-dropdown
@@ -724,9 +725,7 @@ const getContextMenuStyle = computed((): CSSProperties => {
          placement="bottom-end"
          @command="handleCommand"
        >
-          <el-icon>
-            <IconifyIconOffline icon="arrow-down" />
-          </el-icon>
+          <IconifyIconOffline icon="arrow-down" />
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item
@@ -748,7 +747,7 @@ const getContextMenuStyle = computed((): CSSProperties => {
        </el-dropdown>
      </li>
      <li>
-        <slot></slot>
+        <slot />
      </li>
    </ul>
  </div>
--- a/src/layout/frameView.vue
+++ b/src/layout/frameView.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="frame" v-loading="loading">
-    <iframe :src="frameSrc" class="frame-iframe" ref="frameRef"></iframe>
+    <iframe :src="frameSrc" class="frame-iframe" ref="frameRef" />
  </div>
 </template>
 <script lang="ts" setup>
--- a/src/layout/redirect.vue
+++ b/src/layout/redirect.vue
@@ -16,5 +16,5 @@ replace({
 </script>

 <template>
-  <div></div>
+  <div />
 </template>
--- a/src/style/sidebar.scss
+++ b/src/style/sidebar.scss
@@ -202,7 +202,7 @@

    .horizontal-header-right {
      display: flex;
-      min-width: 280px;
+      min-width: 340px;
      align-items: center;
      color: $subMenuActiveText;
      justify-content: flex-end;
@@ -609,15 +609,12 @@ body[layout="vertical"] {
        }
      }

-      /* 无子菜单 */
+      /* 有无子菜单 */
+      .el-sub-menu__title,
      .el-menu-item [class^="el-icon"] {
        right: 5px;
      }

-      .el-sub-menu__title [class^="el-icon"] {
-        right: 2px;
-      }
-
      .submenu-title-noDropdown {
        background: transparent !important;
      }
--- a/src/views/permission/button/index.vue
+++ b/src/views/permission/button/index.vue
@@ -24,8 +24,8 @@ function changRole(value) {
    <template #header>
      <div class="card-header">
        <el-radio-group v-model="auth" @change="changRole">
-          <el-radio-button label="admin"></el-radio-button>
-          <el-radio-button label="test"></el-radio-button>
+          <el-radio-button label="admin" />
+          <el-radio-button label="test" />
        </el-radio-group>
      </div>
    </template>