chore: 同步完整版

2022-10-19 14:09:42 +08:00
parent 43069ac127
commit 24db509381
29 changed files with 1018 additions and 1098 deletions
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -5,9 +5,7 @@ import mixNav from "./sidebar/mixNav.vue";
 import avatars from "/@/assets/avatars.jpg";
 import { useNav } from "/@/layout/hooks/useNav";
 import Breadcrumb from "./sidebar/breadCrumb.vue";
-import { deviceDetection } from "@pureadmin/utils";
 import topCollapse from "./sidebar/topCollapse.vue";
-import screenfull from "../components/screenfull/index.vue";
 import { useTranslationLang } from "../hooks/useTranslationLang";
 import globalization from "/@/assets/svg/globalization.svg?component";

@@ -50,8 +48,6 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
      <Search />
      <!-- 通知 -->
      <Notice id="header-notice" />
-      <!-- 全屏 -->
-      <screenfull id="header-screenfull" v-show="!deviceDetection()" />
      <!-- 国际化 -->
      <el-dropdown id="header-translation" trigger="click">
        <globalization
@@ -103,7 +99,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
        </template>
      </el-dropdown>
      <span
-        class="el-icon-setting navbar-bg-hover"
+        class="set-icon navbar-bg-hover"
        :title="t('buttons.hssystemSet')"
        @click="onPanel"
      >
@@ -153,15 +149,6 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
        border-radius: 50%;
      }
    }
-
-    .el-icon-setting {
-      height: 48px;
-      width: 38px;
-      padding: 12px;
-      display: flex;
-      cursor: pointer;
-      align-items: center;
-    }
  }

  .breadcrumb-container {
--- a/src/layout/components/panel/index.vue
+++ b/src/layout/components/panel/index.vue
@@ -22,9 +22,13 @@ emitter.on("openPanel", () => {
      <div class="right-panel-items">
        <div class="project-configuration">
          <h3 class="dark:text-white">项目配置</h3>
-          <el-icon title="关闭配置" class="el-icon-close" @click="show = !show">
-            <IconifyIconOffline icon="close" />
-          </el-icon>
+          <span title="关闭配置">
+            <IconifyIconOffline
+              class="dark:text-white"
+              icon="close"
+              @click="show = !show"
+            />
+          </span>
        </div>
        <div
          class="border-b-[1px] border-solid border-[#dcdfe6] dark:border-[#303030]"
@@ -121,7 +125,7 @@ emitter.on("openPanel", () => {
  top: 15px;
  margin-left: 10px;

-  i {
+  svg {
    font-size: 20px;
    margin-right: 20px;

--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -132,6 +132,8 @@ const multiTagsCacheChange = () => {
 /** 清空缓存并返回登录页 */
 function onReset() {
  router.push("/login");
+  storageLocal.clear();
+  storageSession.clear();
  const { Grey, Weak, MultiTagsCache, EpThemeColor, Layout } = getConfig();
  useAppStoreHook().setLayout(Layout);
  setEpThemeColor(EpThemeColor);
@@ -139,8 +141,6 @@ function onReset() {
  toggleClass(Grey, "html-grey", document.querySelector("html"));
  toggleClass(Weak, "html-weakness", document.querySelector("html"));
  useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
-  storageLocal.clear();
-  storageSession.clear();
  resetRouter();
 }

--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
-import { ref, watch } from "vue";
 import Search from "../search/index.vue";
 import Notice from "../notice/index.vue";
+import { ref, watch, nextTick } from "vue";
 import SidebarItem from "./sidebarItem.vue";
 import avatars from "/@/assets/avatars.jpg";
 import { useNav } from "/@/layout/hooks/useNav";
-import screenfull from "../screenfull/index.vue";
-import { deviceDetection } from "@pureadmin/utils";
 import { useTranslationLang } from "../../hooks/useTranslationLang";
 import { usePermissionStoreHook } from "/@/store/modules/permission";
 import globalization from "/@/assets/svg/globalization.svg?component";
@@ -28,6 +26,10 @@ const {
  getDropdownItemClass
 } = useNav();

+nextTick(() => {
+  menuRef.value?.handleResize();
+});
+
 watch(
  () => route.path,
  () => {
@@ -62,8 +64,6 @@ watch(
      <Search />
      <!-- 通知 -->
      <Notice id="header-notice" />
-      <!-- 全屏 -->
-      <screenfull id="header-screenfull" v-show="!deviceDetection()" />
      <!-- 国际化 -->
      <el-dropdown id="header-translation" trigger="click">
        <globalization
@@ -113,7 +113,7 @@ watch(
        </template>
      </el-dropdown>
      <span
-        class="el-icon-setting navbar-bg-hover"
+        class="set-icon navbar-bg-hover"
        :title="t('buttons.hssystemSet')"
        @click="onPanel"
      >
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -4,9 +4,7 @@ import Notice from "../notice/index.vue";
 import avatars from "/@/assets/avatars.jpg";
 import { useNav } from "/@/layout/hooks/useNav";
 import { transformI18n } from "/@/plugins/i18n";
-import screenfull from "../screenfull/index.vue";
-import { deviceDetection } from "@pureadmin/utils";
-import { ref, toRaw, watch, onMounted } from "vue";
+import { ref, toRaw, watch, onMounted, nextTick } from "vue";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import { getParentPaths, findRouteByPath } from "/@/router/utils";
 import { useTranslationLang } from "../../hooks/useTranslationLang";
@@ -45,6 +43,10 @@ onMounted(() => {
  getDefaultActive(route.path);
 });

+nextTick(() => {
+  menuRef.value?.handleResize();
+});
+
 watch(
  () => route.path,
  () => {
@@ -94,8 +96,6 @@ watch(
      <Search />
      <!-- 通知 -->
      <Notice id="header-notice" />
-      <!-- 全屏 -->
-      <screenfull id="header-screenfull" v-show="!deviceDetection()" />
      <!-- 国际化 -->
      <el-dropdown id="header-translation" trigger="click">
        <globalization
@@ -145,7 +145,7 @@ watch(
        </template>
      </el-dropdown>
      <span
-        class="el-icon-setting navbar-bg-hover"
+        class="set-icon navbar-bg-hover"
        :title="t('buttons.hssystemSet')"
        @click="onPanel"
      >
--- a/src/layout/components/tag/index.scss
+++ b/src/layout/components/tag/index.scss
@@ -121,21 +121,6 @@
    }
  }

-  .right-button {
-    display: flex;
-    font-size: 16px;
-
-    li {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 40px;
-      height: 38px;
-      border-right: 1px solid #ccc;
-      cursor: pointer;
-    }
-  }
-
  /* 右键菜单 */
  .contextmenu {
    margin: 0;
@@ -196,6 +181,9 @@
  margin-right: 10px;
 }

+:deep(.el-dropdown-menu__item--divided) {
+  margin: 1px 0;
+}
 .el-dropdown-menu__item--divided::before {
  margin: 0;
 }
@@ -223,7 +211,8 @@
 }

 .arrow-left,
-.arrow-right {
+.arrow-right,
+.arrow-down {
  width: 40px;
  height: 38px;
  color: var(--el-text-color-primary);
@@ -248,7 +237,7 @@

 .arrow-right {
  box-shadow: -5px 0 5px -6px #ccc;
-  border-right: 1px solid #ccc;
+  border-right: 0.5px solid #ccc;

  &:hover {
    cursor: e-resize;
@@ -305,8 +294,3 @@
  background: var(--el-color-primary);
  animation: scheduleOutWidth 400ms ease-in;
 }
-
-/* 刷新按钮动画效果 */
-.refresh-button {
-  animation: rotate 600ms linear infinite;
-}
--- a/src/layout/components/tag/index.vue
+++ b/src/layout/components/tag/index.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
+import { $t } from "/@/plugins/i18n";
 import { emitter } from "/@/utils/mitt";
 import { RouteConfigs } from "../../types";
 import { useTags } from "../../hooks/useTag";
 import { routerArrays } from "/@/layout/types";
 import { isEqual, isEmpty } from "lodash-unified";
-import { toggleClass, removeClass } from "@pureadmin/utils";
-import { useResizeObserver, useDebounceFn } from "@vueuse/core";
 import { useSettingStoreHook } from "/@/store/modules/settings";
+import { ref, watch, unref, nextTick, onBeforeMount } from "vue";
 import { handleAliveRoute, delAliveRoutes } from "/@/router/utils";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
-import { ref, watch, unref, toRaw, nextTick, onBeforeMount } from "vue";
+import { useResizeObserver, useDebounceFn, useFullscreen } from "@vueuse/core";

 const {
  route,
@@ -23,6 +23,7 @@ const {
  buttonLeft,
  showModel,
  translateX,
+  pureSetting,
  activeIndex,
  getTabStyle,
  iconIsActive,
@@ -34,12 +35,15 @@ const {
  onMounted,
  onMouseenter,
  onMouseleave,
-  transformI18n
+  transformI18n,
+  onContentFullScreen
 } = useTags();

 const tabDom = ref();
 const containerDom = ref();
 const scrollbarDom = ref();
+let isShowArrow = ref(false);
+const { isFullscreen, toggle } = useFullscreen();

 const dynamicTagView = () => {
  const index = multiTags.value.findIndex(item => {
@@ -66,6 +70,9 @@ const moveToView = (index: number): void => {
    : 0;
  // 已有标签页总长度（包含溢出部分）
  const tabDomWidth = tabDom.value ? tabDom.value?.offsetWidth : 0;
+  scrollbarDomWidth <= tabDomWidth
+    ? (isShowArrow.value = true)
+    : (isShowArrow.value = false);
  if (tabDomWidth < scrollbarDomWidth || tabItemElOffsetLeft === 0) {
    translateX.value = 0;
  } else if (tabItemElOffsetLeft < -translateX.value) {
@@ -143,16 +150,11 @@ function dynamicRouteTag(value: string, parentPath: string): void {

 /** 刷新路由 */
 function onFresh() {
-  const refreshButton = "refresh-button";
-  toggleClass(true, refreshButton, document.querySelector(".rotate"));
  const { fullPath, query } = unref(route);
  router.replace({
    path: "/redirect" + fullPath,
    query: query
  });
-  setTimeout(() => {
-    removeClass(document.querySelector(".rotate"), refreshButton);
-  }, 600);
 }

 function deleteDynamicTag(obj: any, current: any, tag?: string) {
@@ -277,6 +279,32 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
      });
      router.push("/welcome");
      break;
+    case 6:
+      // 整体页面全屏
+      toggle();
+      setTimeout(() => {
+        if (isFullscreen.value) {
+          tagsViews[6].icon = "exit-fullscreen";
+          tagsViews[6].text = $t("buttons.hswholeExitFullScreen");
+        } else {
+          tagsViews[6].icon = "fullscreen";
+          tagsViews[6].text = $t("buttons.hswholeFullScreen");
+        }
+      }, 100);
+      break;
+    case 7:
+      // 内容区全屏
+      onContentFullScreen();
+      setTimeout(() => {
+        if (pureSetting.hiddenSideBar) {
+          tagsViews[7].icon = "exit-fullscreen";
+          tagsViews[7].text = $t("buttons.hscontentExitFullScreen");
+        } else {
+          tagsViews[7].icon = "fullscreen";
+          tagsViews[7].text = $t("buttons.hscontentFullScreen");
+        }
+      }, 100);
+      break;
  }
  setTimeout(() => {
    showMenuModel(route.fullPath, route.query);
@@ -467,9 +495,9 @@ onMounted(() => {

 <template>
  <div ref="containerDom" class="tags-view" v-if="!showTags">
-    <div class="arrow-left">
+    <span v-show="isShowArrow" class="arrow-left">
      <IconifyIconOffline icon="arrow-left-s-line" @click="handleScroll(200)" />
-    </div>
+    </span>
    <div ref="scrollbarDom" class="scroll-container">
      <div class="tab" ref="tabDom" :style="getTabStyle">
        <div
@@ -512,7 +540,7 @@ onMounted(() => {
        </div>
      </div>
    </div>
-    <span class="arrow-right">
+    <span v-show="isShowArrow" class="arrow-right">
      <IconifyIconOffline
        icon="arrow-right-s-line"
        @click="handleScroll(-200)"
@@ -527,59 +555,41 @@ onMounted(() => {
        class="contextmenu"
      >
        <div
-          v-for="(item, key) in tagsViews"
+          v-for="(item, key) in tagsViews.slice(0, 6)"
          :key="key"
          style="display: flex; align-items: center"
        >
          <li v-if="item.show" @click="selectTag(key, item)">
-            <component :is="toRaw(item.icon)" :key="key" />
+            <IconifyIconOffline :icon="item.icon" />
            {{ transformI18n(item.text) }}
          </li>
        </div>
      </ul>
    </transition>
    <!-- 右侧功能按钮 -->
-    <ul class="right-button">
-      <li>
-        <span
-          :title="transformI18n('buttons.hsrefreshRoute')"
-          class="el-icon-refresh-right rotate"
-          @click="onFresh"
-        >
-          <IconifyIconOffline icon="refresh-right" />
-        </span>
-      </li>
-      <li>
-        <el-dropdown
-          trigger="click"
-          placement="bottom-end"
-          @command="handleCommand"
-        >
-          <IconifyIconOffline icon="arrow-down" class="dark:text-white" />
-          <template #dropdown>
-            <el-dropdown-menu>
-              <el-dropdown-item
-                v-for="(item, key) in tagsViews"
-                :key="key"
-                :command="{ key, item }"
-                :divided="item.divided"
-                :disabled="item.disabled"
-              >
-                <component
-                  :is="toRaw(item.icon)"
-                  :key="key"
-                  style="margin-right: 6px"
-                />
-                {{ transformI18n(item.text) }}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </template>
-        </el-dropdown>
-      </li>
-      <li>
-        <slot />
-      </li>
-    </ul>
+    <el-dropdown
+      trigger="click"
+      placement="bottom-end"
+      @command="handleCommand"
+    >
+      <span class="arrow-down">
+        <IconifyIconOffline icon="arrow-down" class="dark:text-white" />
+      </span>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item
+            v-for="(item, key) in tagsViews"
+            :key="key"
+            :command="{ key, item }"
+            :divided="item.divided"
+            :disabled="item.disabled"
+          >
+            <IconifyIconOffline :icon="item.icon" />
+            {{ transformI18n(item.text) }}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
  </div>
 </template>

--- a/src/layout/hooks/useTag.ts
+++ b/src/layout/hooks/useTag.ts
@@ -14,20 +14,15 @@ import type { StorageConfigs } from "/#/index";
 import { useEventListener } from "@vueuse/core";
 import { useRoute, useRouter } from "vue-router";
 import { transformI18n, $t } from "/@/plugins/i18n";
+import { useSettingStoreHook } from "/@/store/modules/settings";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
 import { storageLocal, toggleClass, hasClass } from "@pureadmin/utils";

-import close from "/@/assets/svg/close.svg?component";
-import refresh from "/@/assets/svg/refresh.svg?component";
-import closeAll from "/@/assets/svg/close_all.svg?component";
-import closeLeft from "/@/assets/svg/close_left.svg?component";
-import closeOther from "/@/assets/svg/close_other.svg?component";
-import closeRight from "/@/assets/svg/close_right.svg?component";
-
 export function useTags() {
  const route = useRoute();
  const router = useRouter();
  const instance = getCurrentInstance();
+  const pureSetting = useSettingStoreHook();

  const buttonTop = ref(0);
  const buttonLeft = ref(0);
@@ -53,46 +48,60 @@ export function useTags() {

  const tagsViews = reactive<Array<tagsViewsType>>([
    {
-      icon: refresh,
+      icon: "refresh-right",
      text: $t("buttons.hsreload"),
      divided: false,
      disabled: false,
      show: true
    },
    {
-      icon: close,
+      icon: "close",
      text: $t("buttons.hscloseCurrentTab"),
      divided: false,
      disabled: multiTags.value.length > 1 ? false : true,
      show: true
    },
    {
-      icon: closeLeft,
+      icon: "close-left-tags",
      text: $t("buttons.hscloseLeftTabs"),
      divided: true,
      disabled: multiTags.value.length > 1 ? false : true,
      show: true
    },
    {
-      icon: closeRight,
+      icon: "close-right-tags",
      text: $t("buttons.hscloseRightTabs"),
      divided: false,
      disabled: multiTags.value.length > 1 ? false : true,
      show: true
    },
    {
-      icon: closeOther,
+      icon: "close-other-tags",
      text: $t("buttons.hscloseOtherTabs"),
      divided: true,
      disabled: multiTags.value.length > 2 ? false : true,
      show: true
    },
    {
-      icon: closeAll,
+      icon: "close-all-tags",
      text: $t("buttons.hscloseAllTabs"),
      divided: false,
      disabled: multiTags.value.length > 1 ? false : true,
      show: true
+    },
+    {
+      icon: "fullscreen",
+      text: $t("buttons.hswholeFullScreen"),
+      divided: true,
+      disabled: false,
+      show: true
+    },
+    {
+      icon: "fullscreen",
+      text: $t("buttons.hscontentFullScreen"),
+      divided: false,
+      disabled: false,
+      show: true
    }
  ]);

@@ -172,6 +181,12 @@ export function useTags() {
    }
  }

+  function onContentFullScreen() {
+    pureSetting.hiddenSideBar
+      ? pureSetting.changeSetting({ key: "hiddenSideBar", value: false })
+      : pureSetting.changeSetting({ key: "hiddenSideBar", value: true });
+  }
+
  onMounted(() => {
    if (!showModel.value) {
      const configure = storageLocal.getItem<StorageConfigs>(
@@ -201,6 +216,7 @@ export function useTags() {
    buttonTop,
    buttonLeft,
    translateX,
+    pureSetting,
    activeIndex,
    getTabStyle,
    iconIsActive,
@@ -213,6 +229,7 @@ export function useTags() {
    onMounted,
    onMouseenter,
    onMouseleave,
-    transformI18n
+    transformI18n,
+    onContentFullScreen
  };
 }
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -7,16 +7,13 @@ import { useSettingStoreHook } from "/@/store/modules/settings";
 import { deviceDetection, useDark, useGlobal } from "@pureadmin/utils";
 import { h, reactive, computed, onMounted, defineComponent } from "vue";

-import backTop from "/@/assets/svg/back_top.svg?component";
-import fullScreen from "/@/assets/svg/full_screen.svg?component";
-import exitScreen from "/@/assets/svg/exit_screen.svg?component";
-
 import navbar from "./components/navbar.vue";
 import tag from "./components/tag/index.vue";
 import appMain from "./components/appMain.vue";
 import setting from "./components/setting/index.vue";
 import Vertical from "./components/sidebar/vertical.vue";
 import Horizontal from "./components/sidebar/horizontal.vue";
+import backTop from "/@/assets/svg/back_top.svg?component";

 const { isDark } = useDark();
 const { layout } = useLayout();
@@ -102,12 +99,6 @@ onMounted(() => {
  }
 });

-function onFullScreen() {
-  pureSetting.hiddenSideBar
-    ? pureSetting.changeSetting({ key: "hiddenSideBar", value: false })
-    : pureSetting.changeSetting({ key: "hiddenSideBar", value: true });
-}
-
 const layoutHeader = defineComponent({
  render() {
    return h(
@@ -127,31 +118,11 @@ const layoutHeader = defineComponent({
          !pureSetting.hiddenSideBar &&
          (layout.value.includes("vertical") || layout.value.includes("mix"))
            ? h(navbar)
-            : h("div"),
+            : null,
          !pureSetting.hiddenSideBar && layout.value.includes("horizontal")
            ? h(Horizontal)
-            : h("div"),
-          h(
-            tag,
-            {},
-            {
-              default: () => [
-                h(
-                  "span",
-                  {
-                    onClick: onFullScreen
-                  },
-                  {
-                    default: () => [
-                      !pureSetting.hiddenSideBar
-                        ? h(fullScreen, { class: "dark:text-white" })
-                        : h(exitScreen, { class: "dark:text-white" })
-                    ]
-                  }
-                )
-              ]
-            }
-          )
+            : null,
+          h(tag)
        ]
      }
    );
@@ -226,10 +197,6 @@ const layoutHeader = defineComponent({
  }
 }

-.main-hidden {
-  margin-left: 0 !important;
-}
-
 .app-mask {
  background: #000;
  opacity: 0.3;
--- a/src/layout/types.ts
+++ b/src/layout/types.ts
@@ -1,4 +1,3 @@
-import { Component } from "vue";
 export const routerArrays: Array<RouteConfigs> = [
  {
    path: "/welcome",
@@ -33,7 +32,7 @@ export type multiTagsType = {
 };

 export type tagsViewsType = {
-  icon: Component;
+  icon: string;
  text: string;
  divided: boolean;
  disabled: boolean;