release: update 3.9.4

release: update 3.9.3
release: update 3.9.2
2025-12-14 22:30:31 +08:00 · 2022-12-05 14:28:46 +08:00 · 2022-12-04 18:00:16 +08:00 · 2022-12-03 15:20:30 +08:00
27 changed files with 3835 additions and 1826 deletions
--- a/build/info.ts
+++ b/build/info.ts
@@ -9,10 +9,12 @@ export function viteBuildInfo(): Plugin {
  let config: { command: string };
  let startTime: Dayjs;
  let endTime: Dayjs;
+  let outDir: string;
  return {
    name: "vite:buildInfo",
-    configResolved(resolvedConfig: { command: string }) {
+    configResolved(resolvedConfig) {
      config = resolvedConfig;
+      outDir = resolvedConfig.build?.outDir ?? "dist";
    },
    buildStart() {
      console.log(
@@ -32,6 +34,7 @@ export function viteBuildInfo(): Plugin {
      if (config.command === "build") {
        endTime = dayjs(new Date());
        getPackageSize({
+          folder: outDir,
          callback: (size: string) => {
            console.log(
              bold(
--- a/build/optimize.ts
+++ b/build/optimize.ts
@@ -12,8 +12,6 @@ const include = [
  "pinia",
  "lodash",
  "echarts",
-  "xe-utils",
-  "vxe-table",
  "js-cookie",
  "lodash-es",
  "@vueuse/core",
--- a/mock/asyncRoutes.ts
+++ b/mock/asyncRoutes.ts
@@ -1,8 +1,6 @@
 // 模拟后端动态生成路由
 import { MockMethod } from "vite-plugin-mock";

-import Lollipop from "@iconify-icons/ep/lollipop";
-
 /**
 * roles：页面级别权限，这里模拟二种 "admin"、"common"
 * admin：管理员角色
@@ -13,7 +11,7 @@ const permissionRouter = {
  path: "/permission",
  meta: {
    title: "权限管理",
-    icon: Lollipop,
+    icon: "lollipop",
    rank: 10
  },
  children: [
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "pure-admin-thin",
-  "version": "3.9.1",
+  "version": "3.9.4",
  "private": true,
  "scripts": {
    "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
@@ -31,8 +31,8 @@
  "dependencies": {
    "@ctrl/tinycolor": "^3.4.1",
    "@pureadmin/descriptions": "^1.1.0",
-    "@pureadmin/table": "^1.8.1",
-    "@pureadmin/utils": "^1.7.1",
+    "@pureadmin/table": "^1.8.3",
+    "@pureadmin/utils": "^1.7.4",
    "@vueuse/core": "^9.6.0",
    "@vueuse/motion": "2.0.0-beta.12",
    "animate.css": "^4.1.1",
@@ -49,14 +49,12 @@
    "mockjs": "^1.1.0",
    "nprogress": "^0.2.0",
    "path": "^0.12.7",
-    "pinia": "^2.0.26",
+    "pinia": "^2.0.27",
    "qs": "^6.11.0",
    "responsive-storage": "^2.1.0",
    "vue": "^3.2.45",
    "vue-router": "^4.1.6",
-    "vue-types": "^4.2.1",
-    "vxe-table": "^4.3.6",
-    "xe-utils": "^3.5.7"
+    "vue-types": "^4.2.1"
  },
  "devDependencies": {
    "@commitlint/cli": "13.1.0",
@@ -86,7 +84,6 @@
    "eslint": "^8.8.0",
    "eslint-plugin-prettier": "^4.0.0",
    "eslint-plugin-vue": "^9.7.0",
-    "font-awesome": "^4.7.0",
    "husky": "^7.0.4",
    "lint-staged": "11.1.2",
    "picocolors": "^1.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "3.9.1",
+  "Version": "3.9.4",
  "Title": "PureAdmin",
  "FixedHeader": true,
  "HiddenSideBar": false,
--- a/src/components/ReIcon/src/offlineIcon.ts
+++ b/src/components/ReIcon/src/offlineIcon.ts
@@ -0,0 +1,14 @@
+import { addIcon } from "@iconify/vue/dist/offline";
+
+/**
+ * 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
+ */
+
+// 本地菜单图标，后端在路由的icon中返回对应的图标字符串并且前端在此处使用addIcon添加即可渲染菜单图标
+import HomeFilled from "@iconify-icons/ep/home-filled";
+import InformationLine from "@iconify-icons/ri/information-line";
+import Lollipop from "@iconify-icons/ep/lollipop";
+
+addIcon("homeFilled", HomeFilled);
+addIcon("informationLine", InformationLine);
+addIcon("lollipop", Lollipop);
--- a/src/layout/components/panel/index.vue
+++ b/src/layout/components/panel/index.vue
@@ -1,11 +1,27 @@
 <script setup lang="ts">
-import { ref } from "vue";
-import { onClickOutside } from "@vueuse/core";
+import { ref, computed } from "vue";
 import { emitter } from "@/utils/mitt";
+import { onClickOutside } from "@vueuse/core";
 import Close from "@iconify-icons/ep/close";

-const show = ref<Boolean>(false);
 const target = ref(null);
+const show = ref<Boolean>(false);
+
+const iconClass = computed(() => {
+  return [
+    "mr-[20px]",
+    "outline-none",
+    "width-[20px]",
+    "height-[20px]",
+    "rounded-[4px]",
+    "cursor-pointer",
+    "transition-colors",
+    "hover:bg-[#0000000f]",
+    "dark:hover:bg-[#ffffff1f]",
+    "dark:hover:text-[#ffffffd9]"
+  ];
+});
+
 onClickOutside(target, (event: any) => {
  if (event.clientX > target.value.offsetLeft) return;
  show.value = false;
@@ -23,9 +39,11 @@ emitter.on("openPanel", () => {
      <div class="right-panel-items">
        <div class="project-configuration">
          <h4 class="dark:text-white">项目配置</h4>
-          <span title="关闭配置">
+          <span title="关闭配置" :class="iconClass">
            <IconifyIconOffline
              class="dark:text-white"
+              width="20px"
+              height="20px"
              :icon="Close"
              @click="show = !show"
            />
@@ -69,7 +87,6 @@ emitter.on("openPanel", () => {
  box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.05);
  transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
  transform: translate(100%);
-  // background: #fff;
  z-index: 40000;
 }

@@ -125,16 +142,6 @@ emitter.on("openPanel", () => {
  align-items: center;
  top: 15px;
  margin-left: 10px;
-
-  svg {
-    font-size: 20px;
-    margin-right: 20px;
-
-    &:hover {
-      cursor: pointer;
-      color: var(--el-color-primary);
-    }
-  }
 }

 :deep(.el-divider--horizontal) {
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -1,4 +1,13 @@
 <script setup lang="ts">
+import {
+  ref,
+  unref,
+  watch,
+  reactive,
+  computed,
+  nextTick,
+  onBeforeMount
+} from "vue";
 import {
  useDark,
  debounce,
@@ -17,7 +26,6 @@ import { useNav } from "@/layout/hooks/useNav";
 import { useAppStoreHook } from "@/store/modules/app";
 import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import { ref, unref, watch, reactive, computed, nextTick } from "vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";

 import dayIcon from "@/assets/svg/day.svg?component";
@@ -189,16 +197,6 @@ function setLayoutModel(layout: string) {
  useAppStoreHook().setLayout(layout);
 }

-/* 初始化项目配置 */
-nextTick(() => {
-  settings.greyVal &&
-    document.querySelector("html")?.setAttribute("class", "html-grey");
-  settings.weakVal &&
-    document.querySelector("html")?.setAttribute("class", "html-weakness");
-  settings.tabsVal && tagsChange();
-  dataThemeChange();
-});
-
 watch($storage, ({ layout }) => {
  switch (layout["layout"]) {
    case "vertical":
@@ -218,6 +216,18 @@ watch($storage, ({ layout }) => {
      break;
  }
 });
+
+onBeforeMount(() => {
+  dataThemeChange();
+  /* 初始化项目配置 */
+  nextTick(() => {
+    settings.greyVal &&
+      document.querySelector("html")?.setAttribute("class", "html-grey");
+    settings.weakVal &&
+      document.querySelector("html")?.setAttribute("class", "html-weakness");
+    settings.tabsVal && tagsChange();
+  });
+});
 </script>

 <template>
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -35,7 +35,10 @@ watch(
 </script>

 <template>
-  <div class="horizontal-header">
+  <div
+    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
+    class="horizontal-header"
+  >
    <div class="horizontal-header-left" @click="backHome">
      <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
      <h4>{{ title }}</h4>
@@ -93,6 +96,9 @@ watch(
 </template>

 <style lang="scss" scoped>
+:deep(.el-loading-mask) {
+  opacity: 0.45;
+}
 .logout {
  max-width: 120px;

--- a/src/layout/components/sidebar/leftCollapse.vue
+++ b/src/layout/components/sidebar/leftCollapse.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
 import MenuFold from "@iconify-icons/ri/menu-fold-fill";
-import MenuUnfold from "@iconify-icons/ri/menu-unfold-fill";

 interface Props {
  isActive: boolean;
@@ -15,6 +14,22 @@ const props = withDefaults(defineProps<Props>(), {
 const visible = ref(false);
 const { tooltipEffect } = useNav();

+const iconClass = computed(() => {
+  return [
+    "ml-4",
+    "mb-1",
+    "w-[16px]",
+    "h-[16px]",
+    "inline-block",
+    "align-middle",
+    "text-primary",
+    "cursor-pointer",
+    "duration-[360ms]",
+    "hover:text-primary",
+    "dark:hover:!text-white"
+  ];
+});
+
 const emit = defineEmits<{
  (e: "toggleClick"): void;
 }>();
@@ -33,8 +48,9 @@ const toggleClick = () => {
      :content="props.isActive ? '点击折叠' : '点击展开'"
    >
      <IconifyIconOffline
-        :icon="props.isActive ? MenuFold : MenuUnfold"
-        class="cursor-pointer inline-block align-middle text-primary hover:text-primary dark:hover:!text-white w-[16px] h-[16px] ml-4 mb-1"
+        :icon="MenuFold"
+        :class="iconClass"
+        :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
        @click="toggleClick"
        @mouseenter="visible = true"
        @mouseleave="visible = false"
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -51,7 +51,11 @@ watch(
 </script>

 <template>
-  <div v-if="device !== 'mobile'" class="horizontal-header">
+  <div
+    v-if="device !== 'mobile'"
+    class="horizontal-header"
+    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
+  >
    <el-menu
      router
      ref="menuRef"
@@ -124,6 +128,9 @@ watch(
 </template>

 <style lang="scss" scoped>
+:deep(.el-loading-mask) {
+  opacity: 0.45;
+}
 .logout {
  max-width: 120px;

--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -202,7 +202,7 @@ function resolvePath(routePath) {
            placement="top"
            :effect="tooltipEffect"
            :offset="-10"
-            :disabled="!isCollapse && !onlyOneChild.showTooltip"
+            :disabled="!onlyOneChild.showTooltip"
          >
            <template #content>
              {{ onlyOneChild.meta.title }}
--- a/src/layout/components/sidebar/vertical.vue
+++ b/src/layout/components/sidebar/vertical.vue
@@ -59,7 +59,10 @@ watch(
 </script>

 <template>
-  <div :class="['sidebar-container', showLogo ? 'has-logo' : '']">
+  <div
+    v-loading="menuData.length === 0"
+    :class="['sidebar-container', showLogo ? 'has-logo' : '']"
+  >
    <Logo v-if="showLogo" :collapse="isCollapse" />
    <el-scrollbar
      wrap-class="scrollbar-wrapper"
@@ -91,3 +94,9 @@ watch(
    />
  </div>
 </template>
+
+<style scoped>
+:deep(.el-loading-mask) {
+  opacity: 0.45;
+}
+</style>
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import "animate.css";
-// vxe-table的所有icon不支持component模式，间接依赖了font-awesome
-// import "font-awesome/css/font-awesome.min.css";
+// 引入 src/components/ReIcon/src/offlineIcon.ts 文件中所有使用addIcon添加过的本地图标
+import "@/components/ReIcon/src/offlineIcon";
 import { setType } from "./types";
 import { emitter } from "@/utils/mitt";
 import { useLayout } from "./hooks/useLayout";
--- a/src/layout/theme/index.ts
+++ b/src/layout/theme/index.ts
@@ -2,19 +2,14 @@
 * @description ⚠️：此文件仅供主题插件使用，请不要在此文件中导出别的工具函数（仅在页面加载前运行）
 */

-import { EpThemeColor } from "../../../public/serverConfig.json";
-
 type MultipleScopeVarsItem = {
  scopeName: string;
  varsContent: string;
 };

-/** 将vxe默认主题色和ep默认主题色保持一致 */
-const vxeColor = EpThemeColor;
 /** 预设主题色 */
 const themeColors = {
  default: {
-    vxeColor,
    subMenuActiveText: "#fff",
    menuBg: "#001529",
    menuHover: "#4091f7",
@@ -26,7 +21,6 @@ const themeColors = {
    menuActiveBefore: "#4091f7"
  },
  light: {
-    vxeColor,
    subMenuActiveText: "#409eff",
    menuBg: "#fff",
    menuHover: "#e0ebf6",
@@ -38,7 +32,6 @@ const themeColors = {
    menuActiveBefore: "#4091f7"
  },
  dusk: {
-    vxeColor: "#f5222d",
    subMenuActiveText: "#fff",
    menuBg: "#2a0608",
    menuHover: "#e13c39",
@@ -50,7 +43,6 @@ const themeColors = {
    menuActiveBefore: "#e13c39"
  },
  volcano: {
-    vxeColor: "#fa541c",
    subMenuActiveText: "#fff",
    menuBg: "#2b0e05",
    menuHover: "#e85f33",
@@ -62,7 +54,6 @@ const themeColors = {
    menuActiveBefore: "#e85f33"
  },
  yellow: {
-    vxeColor: "#fadb14",
    subMenuActiveText: "#d25f00",
    menuBg: "#2b2503",
    menuHover: "#f6da4d",
@@ -74,7 +65,6 @@ const themeColors = {
    menuActiveBefore: "#f6da4d"
  },
  mingQing: {
-    vxeColor: "#13c2c2",
    subMenuActiveText: "#fff",
    menuBg: "#032121",
    menuHover: "#59bfc1",
@@ -86,7 +76,6 @@ const themeColors = {
    menuActiveBefore: "#59bfc1"
  },
  auroraGreen: {
-    vxeColor: "#52c41a",
    subMenuActiveText: "#fff",
    menuBg: "#0b1e15",
    menuHover: "#60ac80",
@@ -98,7 +87,6 @@ const themeColors = {
    menuActiveBefore: "#60ac80"
  },
  pink: {
-    vxeColor: "#eb2f96",
    subMenuActiveText: "#fff",
    menuBg: "#28081a",
    menuHover: "#d84493",
@@ -110,7 +98,6 @@ const themeColors = {
    menuActiveBefore: "#d84493"
  },
  saucePurple: {
-    vxeColor: "#722ed1",
    subMenuActiveText: "#fff",
    menuBg: "#130824",
    menuHover: "#693ac9",
@@ -132,7 +119,6 @@ export const genScssMultipleScopeVars = (): MultipleScopeVarsItem[] => {
    result.push({
      scopeName: `layout-theme-${key}`,
      varsContent: `
-        $vxe-primary-color: ${themeColors[key].vxeColor} !default;
        $subMenuActiveText: ${themeColors[key].subMenuActiveText} !default;
        $menuBg: ${themeColors[key].menuBg} !default;
        $menuHover: ${themeColors[key].menuHover} !default;
--- a/src/layout/types.ts
+++ b/src/layout/types.ts
@@ -1,5 +1,4 @@
 import type { IconifyIcon } from "@iconify/vue";
-import HomeFilled from "@iconify-icons/ep/home-filled";

 export const routerArrays: Array<RouteConfigs> = [
  {
@@ -7,7 +6,7 @@ export const routerArrays: Array<RouteConfigs> = [
    parentPath: "/",
    meta: {
      title: "首页",
-      icon: HomeFilled
+      icon: "homeFilled"
    }
  }
 ];
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,7 +6,6 @@ import { getServerConfig } from "./config";
 import { createApp, Directive } from "vue";
 import { MotionPlugin } from "@vueuse/motion";
 // import { useEcharts } from "@/plugins/echarts";
-// import { useTable } from "@/plugins/vxe-table";
 import { injectResponsiveStorage } from "@/utils/responsive";

 // import Table from "@pureadmin/table";
@@ -52,6 +51,5 @@ getServerConfig(app).then(async config => {
  // .use(useEcharts);
  // .use(Table);
  // .use(PureDescriptions);
-  // .use(useTable);
  app.mount("#app");
 });
--- a/src/plugins/vxe-table/index.scss
+++ b/src/plugins/vxe-table/index.scss
@@ -1,6 +0,0 @@
-@import "vxe-table/styles/variable.scss";
-@import "vxe-table/styles/modules.scss";
-
-i {
-  border-color: initial;
-}
--- a/src/plugins/vxe-table/index.ts
+++ b/src/plugins/vxe-table/index.ts
@@ -1,97 +0,0 @@
-import "xe-utils";
-import "./index.scss";
-import { App } from "vue";
-
-import {
-  // 核心
-  VXETable,
-  // 表格功能
-  Icon,
-  Filter,
-  Edit,
-  Menu,
-  Export,
-  Keyboard,
-  Validator,
-  // 可选组件
-  Column,
-  Colgroup,
-  Grid,
-  Tooltip,
-  Toolbar,
-  Pager,
-  Form,
-  FormItem,
-  FormGather,
-  Checkbox,
-  CheckboxGroup,
-  Radio,
-  RadioGroup,
-  RadioButton,
-  Switch,
-  Input,
-  Select,
-  Optgroup,
-  Option,
-  Textarea,
-  Button,
-  Modal,
-  List,
-  Pulldown,
-  // 表格
-  Table
-} from "vxe-table";
-
-// 全局默认参数
-VXETable.setup({
-  size: "medium",
-  version: 0,
-  zIndex: 1002,
-  table: {
-    // 自动监听父元素的变化去重新计算表格
-    autoResize: true,
-    // 鼠标移到行是否要高亮显示
-    highlightHoverRow: true
-  },
-  input: {
-    clearable: true
-  }
-});
-
-export function useTable(app: App) {
-  app
-    .use(Icon)
-    .use(Filter)
-    .use(Edit)
-    .use(Menu)
-    .use(Export)
-    .use(Keyboard)
-    .use(Validator)
-    // 可选组件
-    .use(Column)
-    .use(Colgroup)
-    .use(Grid)
-    .use(Tooltip)
-    .use(Toolbar)
-    .use(Pager)
-    .use(Form)
-    .use(FormItem)
-    .use(FormGather)
-    .use(Checkbox)
-    .use(CheckboxGroup)
-    .use(Radio)
-    .use(RadioGroup)
-    .use(RadioButton)
-    .use(Switch)
-    .use(Input)
-    .use(Select)
-    .use(Optgroup)
-    .use(Option)
-    .use(Textarea)
-    .use(Button)
-    .use(Modal)
-    .use(List)
-    .use(Pulldown)
-    // 安装表格
-    .use(Table);
-}
--- a/src/router/modules/error.ts
+++ b/src/router/modules/error.ts
@@ -1,10 +1,8 @@
-import InformationLine from "@iconify-icons/ri/information-line";
-
 export default {
  path: "/error",
  redirect: "/error/403",
  meta: {
-    icon: InformationLine,
+    icon: "informationLine",
    title: "异常页面",
    rank: 9
  },
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -1,5 +1,4 @@
 const Layout = () => import("@/layout/index.vue");
-import HomeFilled from "@iconify-icons/ep/home-filled";

 export default {
  path: "/",
@@ -7,7 +6,7 @@ export default {
  component: Layout,
  redirect: "/welcome",
  meta: {
-    icon: HomeFilled,
+    icon: "homeFilled",
    title: "首页",
    rank: 0
  },
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -1,5 +1,4 @@
 const Layout = () => import("@/layout/index.vue");
-import HomeFilled from "@iconify-icons/ep/home-filled";

 export default [
  {
@@ -16,7 +15,7 @@ export default [
    path: "/redirect",
    component: Layout,
    meta: {
-      icon: HomeFilled,
+      icon: "homeFilled",
      title: "首页",
      showLink: false,
      rank: 104
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -198,7 +198,7 @@ function initRouter() {
    } else {
      return new Promise(resolve => {
        getAsyncRoutes().then(({ data }) => {
-          handleAsyncRoutes(data);
+          handleAsyncRoutes(cloneDeep(data));
          storageSession.setItem(key, data);
          resolve(router);
        });
@@ -207,7 +207,7 @@ function initRouter() {
  } else {
    return new Promise(resolve => {
      getAsyncRoutes().then(({ data }) => {
-        handleAsyncRoutes(data);
+        handleAsyncRoutes(cloneDeep(data));
        resolve(router);
      });
    });
--- a/src/style/dark.scss
+++ b/src/style/dark.scss
@@ -39,97 +39,6 @@ html.dark {
    }
  }

-  /* vxe-table */
-  .vxe-table--header-wrapper,
-  .vxe-table--body-wrapper {
-    color: var(--el-text-color-primary);
-    background: var(--el-bg-color) !important;
-  }
-
-  .vxe-table--render-default.border--full .vxe-header--column,
-  .vxe-table--render-default.border--full .vxe-body--column,
-  .vxe-table--render-default.border--full .vxe-footer--column {
-    background-image: linear-gradient(
-        var(--el-border-color-lighter),
-        var(--el-border-color-lighter)
-      ),
-      linear-gradient(
-        var(--el-border-color-lighter),
-        var(--el-border-color-lighter)
-      );
-  }
-
-  /* 表头 */
-  .vxe-table--header-wrapper {
-    background: #262727 !important;
-  }
-
-  .vxe-table--render-wrapper,
-  .vxe-table--main-wrapper {
-    border: none;
-  }
-
-  .vxe-pager.is--perfect,
-  .vxe-table--render-default .vxe-table--border-line {
-    border: 1px solid var(--el-border-color-lighter);
-  }
-
-  .vxe-table--header-border-line {
-    border-bottom: 1px solid var(--el-border-color-lighter) !important;
-  }
-
-  .vxe-body--row.row--hover,
-  .vxe-pager {
-    background-color: #262727;
-  }
-
-  .vxe-input--inner,
-  .vxe-pager .vxe-pager--jump-prev,
-  .vxe-pager .vxe-pager--prev-btn,
-  .vxe-pager .vxe-pager--next-btn,
-  .vxe-pager .vxe-pager--jump-next,
-  .vxe-pager .vxe-pager--num-btn,
-  .vxe-pager .vxe-pager--jump .vxe-pager--goto {
-    background-color: transparent;
-    color: var(--el-text-color-primary);
-    // outline: none !important;
-  }
-
-  .vxe-select-option--wrapper {
-    background: var(--el-bg-color) !important;
-  }
-
-  .vxe-select-option:not(.is--disabled).is--hover {
-    background: var(--el-color-primary-light-6) !important;
-  }
-
-  .vxe-modal--wrapper.type--modal .vxe-modal--box,
-  .vxe-modal--wrapper.type--alert .vxe-modal--box,
-  .vxe-modal--wrapper.type--confirm .vxe-modal--box,
-  .vxe-form {
-    background: var(--el-bg-color) !important;
-  }
-
-  .vxe-modal--box,
-  .vxe-modal--header {
-    border: none;
-    background: var(--el-bg-color) !important;
-  }
-
-  .vxe-modal--title,
-  .vxe-button--content,
-  .vxe-modal--header-title {
-    color: var(--el-text-color-primary);
-  }
-
-  .vxe-button.type--button:hover {
-    background: var(--el-color-primary) !important;
-  }
-
-  .vxe-button {
-    background-color: transparent;
-  }
-
  /* 项目配置面板 */
  .right-panel-items {
    .el-divider__text {
@@ -156,6 +65,19 @@ html.dark {
    background: transparent;
  }

+  /* 全局覆盖element-plus的el-dialog、el-drawer、el-message-box、el-notification组件右上角关闭图标的样式，表现更鲜明 */
+  .el-icon {
+    &.el-dialog__close,
+    &.el-drawer__close,
+    &.el-message-box__close,
+    &.el-notification__closeBtn {
+      &:hover {
+        color: rgba(255, 255, 255, 0.85) !important;
+        background-color: rgba(255, 255, 255, 0.12);
+      }
+    }
+  }
+
  /* 克隆并自定义 ElMessage 样式，不会影响 ElMessage 原本样式，在 src/utils/message.ts 中调用自定义样式 ElMessage 方法即可，非暗黑模式在 src/style/element-plus.scss 文件进行了适配 */
  .pure-message {
    background-image: initial !important;
--- a/src/style/element-plus.scss
+++ b/src/style/element-plus.scss
@@ -69,6 +69,33 @@
  }
 }

+/* 全局覆盖element-plus的el-dialog、el-drawer、el-message-box、el-notification组件右上角关闭图标的样式，表现更鲜明 */
+.el-dialog__headerbtn,
+.el-message-box__headerbtn {
+  &:hover {
+    .el-dialog__close {
+      color: var(--el-color-info) !important;
+    }
+  }
+}
+.el-icon {
+  &.el-dialog__close,
+  &.el-drawer__close,
+  &.el-message-box__close,
+  &.el-notification__closeBtn {
+    width: 24px;
+    height: 24px;
+    outline: none;
+    border-radius: 4px;
+    transition: background-color 0.2s, color 0.2s;
+    &:hover {
+      color: rgba(0, 0, 0, 0.88) !important;
+      background-color: rgba(0, 0, 0, 0.06);
+      text-decoration: none;
+    }
+  }
+}
+
 /* 克隆并自定义 ElMessage 样式，不会影响 ElMessage 原本样式，在 src/utils/message.ts 中调用自定义样式 ElMessage 方法即可，暗黑模式在 src/style/dark.scss 文件进行了适配 */
 .pure-message {
  border-width: 0 !important;
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -19,9 +19,3 @@
 .html-weakness {
  filter: invert(80%);
 }
-
-/* 重置 vxe-table 样式 */
-.vxe-button.type--button.theme--primary:hover,
-.vxe-pager .vxe-pager--num-btn:not(.is--disabled).is--active {
-  color: #fff !important;
-}
Author	SHA1	Message	Date
xiaoxian521	27056e7560	release: update `3.9.4`	2022-12-05 14:28:46 +08:00
xiaoxian521	132fbbade3	release: update `3.9.3`	2022-12-04 18:00:16 +08:00
xiaoxian521	c6e25d6933	release: update `3.9.2`	2022-12-03 15:20:30 +08:00