Merge branch 'main' into pages

2025-11-21 14:13:36 +08:00 · 2024-08-03 15:39:24 +08:00
parent c3320d771c 37ab40f188
commit c0d683c9b1
17 changed files with 2019 additions and 1761 deletions
--- a/src/components/ReDialog/index.vue
+++ b/src/components/ReDialog/index.vue
@@ -15,6 +15,7 @@ defineOptions({
  name: "ReDialog"
 });

+const sureBtnMap = ref({});
 const fullscreen = ref(false);

 const footerButtons = computed(() => {
@@ -43,8 +44,21 @@ const footerButtons = computed(() => {
            bg: true,
            popconfirm: options?.popconfirm,
            btnClick: ({ dialog: { options, index } }) => {
-              const done = () =>
+              if (options?.sureBtnLoading) {
+                sureBtnMap.value[index] = Object.assign(
+                  {},
+                  sureBtnMap.value[index],
+                  {
+                    loading: true
+                  }
+                );
+              }
+              const done = () => {
+                if (options?.sureBtnLoading) {
+                  sureBtnMap.value[index].loading = false;
+                }
                closeDialog(options, index, { command: "sure" });
+              };
              if (options?.beforeSure && isFunction(options?.beforeSure)) {
                options.beforeSure(done, { options, index });
              } else {
@@ -172,6 +186,7 @@ function handleClose(
          <el-button
            v-else
            v-bind="btn"
+            :loading="key === 1 && sureBtnMap[index]?.loading"
            @click="
              btn.btnClick({
                dialog: { options, index },
--- a/src/components/ReDialog/type.ts
+++ b/src/components/ReDialog/type.ts
@@ -162,6 +162,8 @@ interface DialogOptions extends DialogProps {
  hideFooter?: boolean;
  /** 确认按钮的 `Popconfirm` 气泡确认框相关配置 */
  popconfirm?: Popconfirm;
+  /** 点击确认按钮后是否开启 `loading` 加载动画 */
+  sureBtnLoading?: boolean;
  /**
   * @description 自定义对话框标题的内容渲染器
   * @see {@link https://element-plus.org/zh-CN/component/dialog.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%A4%B4%E9%83%A8}
--- a/src/components/RePureTableBar/src/bar.tsx
+++ b/src/components/RePureTableBar/src/bar.tsx
@@ -18,6 +18,8 @@ import {
  getKeyList
 } from "@pureadmin/utils";

+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
 import DragIcon from "@/assets/table-bar/drag.svg?component";
 import ExpandIcon from "@/assets/table-bar/expand.svg?component";
 import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
@@ -57,6 +59,7 @@ export default defineComponent({
    const size = ref("default");
    const loading = ref(false);
    const checkAll = ref(true);
+    const isFullscreen = ref(false);
    const isIndeterminate = ref(false);
    const instance = getCurrentInstance()!;
    const isExpandAll = ref(props.isExpandAll);
@@ -244,7 +247,18 @@ export default defineComponent({

    return () => (
      <>
-        <div {...attrs} class="w-[99/100] mt-2 px-2 pb-2 bg-bg_color">
+        <div
+          {...attrs}
+          class={[
+            "w-[99/100]",
+            "px-2",
+            "pb-2",
+            "bg-bg_color",
+            isFullscreen.value
+              ? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
+              : "mt-2"
+          ]}
+        >
          <div class="flex justify-between w-full h-[60px] p-4">
            {slots?.title ? (
              slots.title()
@@ -358,6 +372,14 @@ export default defineComponent({
                  </el-scrollbar>
                </div>
              </el-popover>
+              <el-divider direction="vertical" />
+
+              <iconifyIconOffline
+                class={["w-[16px]", iconClass.value]}
+                icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
+                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
+                onClick={() => (isFullscreen.value = !isFullscreen.value)}
+              />
            </div>
          </div>
          {slots.default({
--- a/src/components/ReVxeTableBar/src/bar.tsx
+++ b/src/components/ReVxeTableBar/src/bar.tsx
@@ -12,6 +12,8 @@ import {
  getCurrentInstance
 } from "vue";

+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
 import DragIcon from "@/assets/table-bar/drag.svg?component";
 import ExpandIcon from "@/assets/table-bar/expand.svg?component";
 import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
@@ -55,6 +57,7 @@ export default defineComponent({
    const size = ref("small");
    const loading = ref(false);
    const checkAll = ref(true);
+    const isFullscreen = ref(false);
    const isIndeterminate = ref(false);
    const instance = getCurrentInstance()!;
    const isExpandAll = ref(props.isExpandAll);
@@ -237,7 +240,18 @@ export default defineComponent({

    return () => (
      <>
-        <div {...attrs} class="w-[99/100] mt-2 px-2 pb-2 bg-bg_color">
+        <div
+          {...attrs}
+          class={[
+            "w-[99/100]",
+            "px-2",
+            "pb-2",
+            "bg-bg_color",
+            isFullscreen.value
+              ? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
+              : "mt-2"
+          ]}
+        >
          <div class="flex justify-between w-full h-[60px] p-4">
            {slots?.title ? (
              slots.title()
@@ -349,6 +363,14 @@ export default defineComponent({
                  </el-scrollbar>
                </div>
              </el-popover>
+              <el-divider direction="vertical" />
+
+              <iconifyIconOffline
+                class={["w-[16px]", iconClass.value]}
+                icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
+                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
+                onClick={() => (isFullscreen.value = !isFullscreen.value)}
+              />
            </div>
          </div>
          {slots.default({
--- a/src/layout/components/lay-sidebar/NavHorizontal.vue
+++ b/src/layout/components/lay-sidebar/NavHorizontal.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
-import { isAllEmpty } from "@pureadmin/utils";
-import { ref, nextTick, computed } from "vue";
+import { emitter } from "@/utils/mitt";
 import { useNav } from "@/layout/hooks/useNav";
 import LaySearch from "../lay-search/index.vue";
 import LayNotice from "../lay-notice/index.vue";
+import { responsiveStorageNameSpace } from "@/config";
+import { ref, nextTick, computed, onMounted } from "vue";
+import { storageLocal, isAllEmpty } from "@pureadmin/utils";
 import { useTranslationLang } from "../../hooks/useTranslationLang";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
@@ -16,6 +18,11 @@ import Setting from "@iconify-icons/ri/settings-3-line";
 import Check from "@iconify-icons/ep/check";

 const menuRef = ref();
+const showLogo = ref(
+  storageLocal().getItem<StorageConfigs>(
+    `${responsiveStorageNameSpace()}configure`
+  )?.showLogo ?? true
+);

 const { t, route, locale, translationCh, translationEn } =
  useTranslationLang(menuRef);
@@ -40,6 +47,12 @@ const defaultActive = computed(() =>
 nextTick(() => {
  menuRef.value?.handleResize();
 });
+
+onMounted(() => {
+  emitter.on("logoChange", key => {
+    showLogo.value = key;
+  });
+});
 </script>

 <template>
@@ -47,7 +60,7 @@ nextTick(() => {
    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
    class="horizontal-header"
  >
-    <div class="horizontal-header-left" @click="backTopMenu">
+    <div v-if="showLogo" class="horizontal-header-left" @click="backTopMenu">
      <img :src="getLogo()" alt="logo" />
      <span>{{ title }}</span>
    </div>
--- a/src/layout/components/lay-tag/index.vue
+++ b/src/layout/components/lay-tag/index.vue
@@ -37,6 +37,7 @@ const {
  buttonLeft,
  showModel,
  translateX,
+  isFixedTag,
  pureSetting,
  activeIndex,
  getTabStyle,
@@ -578,7 +579,7 @@ onBeforeUnmount(() => {
            'scroll-item is-closable',
            linkIsActive(item),
            showModel === 'chrome' && 'chrome-item',
-            !isAllEmpty(item?.meta?.fixedTag) && 'fixed-tag'
+            isFixedTag(item) && 'fixed-tag'
          ]"
          @contextmenu.prevent="openMenu(item, $event)"
          @mouseenter.prevent="onMouseenter(index)"
@@ -593,10 +594,10 @@ onBeforeUnmount(() => {
            </span>
            <span
              v-if="
-                isAllEmpty(item?.meta?.fixedTag)
-                  ? iconIsActive(item, index) ||
+                isFixedTag(item)
+                  ? false
+                  : iconIsActive(item, index) ||
                    (index === activeIndex && index !== 0)
-                  : false
              "
              class="el-icon-close"
              @click.stop="deleteMenu(item)"
@@ -617,7 +618,7 @@ onBeforeUnmount(() => {
              {{ transformI18n(item.meta.title) }}
            </span>
            <span
-              v-if="isAllEmpty(item?.meta?.fixedTag) ? index !== 0 : false"
+              v-if="isFixedTag(item) ? false : index !== 0"
              class="chrome-close-btn"
              @click.stop="deleteMenu(item)"
            >
--- a/src/layout/hooks/useTag.ts
+++ b/src/layout/hooks/useTag.ts
@@ -125,6 +125,12 @@ export function useTags() {
    }
  }

+  const isFixedTag = computed(() => {
+    return item => {
+      return isBoolean(item?.meta?.fixedTag) && item?.meta?.fixedTag === true;
+    };
+  });
+
  const iconIsActive = computed(() => {
    return (item, index) => {
      if (index === 0) return;
@@ -221,6 +227,7 @@ export function useTags() {
    buttonTop,
    buttonLeft,
    translateX,
+    isFixedTag,
    pureSetting,
    activeIndex,
    getTabStyle,
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -224,7 +224,7 @@ const LayHeader = defineComponent({
 .app-mask {
  position: absolute;
  top: 0;
-  z-index: 999;
+  z-index: 2001;
  width: 100%;
  height: 100%;
  background: #000;
--- a/src/style/sidebar.scss
+++ b/src/style/sidebar.scss
@@ -572,6 +572,7 @@
    }

    .sidebar-container {
+      z-index: 2001;
      width: $sideBarWidth;
      transition: transform var(--pure-transition-duration);
    }
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -450,6 +450,17 @@ function onBeforeSureClick() {
    }
  });
 }
+
+function onSureBtnLoading() {
+  addDialog({
+    sureBtnLoading: true,
+    title: "点击底部确定按钮可开启按钮动画",
+    contentRenderer: () => <p>弹框内容-点击底部确定按钮可开启按钮动画</p>,
+    beforeSure: done => {
+      setTimeout(() => done(), 800);
+    }
+  });
+}
 </script>

 <template>
@@ -534,6 +545,9 @@ function onBeforeSureClick() {
      <el-button @click="onBeforeSureClick">
        点击底部确定按钮的回调（会暂停弹框的关闭，经常用于新增、修改弹框内容后调用接口）
      </el-button>
+      <el-button @click="onSureBtnLoading">
+        点击底部确定按钮可开启按钮动画
+      </el-button>
    </el-space>
  </el-card>
 </template>
--- a/src/views/components/el-button.vue
+++ b/src/views/components/el-button.vue
@@ -99,7 +99,7 @@ watch(size, val =>
      <el-button
        v-for="(button, index) in buttonList"
        :key="index"
-        :type="button.type"
+        :type="button.type as any"
        :size="dynamicSize"
        :disabled="size === 'disabled'"
        :plain="baseRadio === 'plain'"
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -97,7 +97,11 @@ const immediateDebounce: any = debounce(
 );

 useEventListener(document, "keypress", ({ code }) => {
-  if (code === "Enter" && !disabled.value && !loading.value)
+  if (
+    ["Enter", "NumpadEnter"].includes(code) &&
+    !disabled.value &&
+    !loading.value
+  )
    immediateDebounce(ruleFormRef.value);
 });

--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -264,7 +264,7 @@ onMounted(() => {

      <div
        v-if="isShow"
-        class="!min-w-[calc(100vw-60vw-268px)] mt-2 px-2 pb-2 bg-bg_color ml-2 overflow-auto"
+        class="!min-w-[calc(100vw-60vw-268px)] w-full mt-2 px-2 pb-2 bg-bg_color ml-2 overflow-auto"
      >
        <div class="flex justify-between w-full px-3 pt-5 pb-4">
          <div class="flex">