v3.0.0

2025-11-15 07:03:48 +08:00 · 2024-01-08 19:52:39 +08:00
parent 8dc663d885
commit 192e959d14
1126 changed files with 13783 additions and 68273 deletions
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
@@ -18,9 +18,6 @@
    </div>
    <template #overlay>
      <a-menu :class="['avatar-menu']">
-        <a-menu-item @click="onRefresh">
-          <span>刷新权限</span>
-        </a-menu-item>
        <a-menu-item @click="showUpdatePwdModal">
          <span>修改密码</span>
        </a-menu-item>
@@ -34,7 +31,7 @@
 </template>
 <script setup>
  import { computed, ref, onMounted } from 'vue';
-  import { loginApi } from '/@/api/system/login/login-api';
+  import { loginApi } from '/src/api/system/login-api';
  import { useUserStore } from '/@/store/modules/system/user';
  import { clearAllCoolies } from '/@/utils/cookie-util';
  import { localClear } from '/@/utils/local-util';
@@ -59,12 +56,6 @@
    }
  }

-  // 刷新用户信息（包含用户基础信息、权限信息等等）
-  async function onRefresh() {
-    await loginApi.refresh();
-    location.reload();
-  }
-
  // ------------------------ 修改密码 ------------------------
  const resetPasswordRef = ref();

--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
@@ -9,7 +9,7 @@
 -->

 <template>
-  <a-dropdown trigger="click" v-model:visible="show">
+  <a-dropdown trigger="click" v-model:open="show">
    <div @click="fetchMessage">
      <a-badge count="12">
        <div style="width: 26px; height: 26px">
@@ -110,7 +110,6 @@

  .dropdown-tabs {
    background-color: @base-bg-color;
-    box-shadow: 0 2px 8px @shadow-color;
    border-radius: 4px;
  }
 </style>
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue
@@ -8,7 +8,7 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :visible="visible" title="修改密码" ok-text="确认" cancel-text="取消" @ok="updatePwd" @cancel="cancelModal">
+  <a-modal :open="visible" title="修改密码" ok-text="确认" cancel-text="取消" @ok="updatePwd" @cancel="cancelModal">
    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }">
      <a-form-item label="原密码" name="oldPassword">
        <a-input v-model:value.trim="form.oldPassword" type="password" placeholder="请输入原密码" />
@@ -25,19 +25,19 @@
 <script setup>
  import { ref, reactive } from 'vue';
  import { message } from 'ant-design-vue';
-  import { employeeApi } from '/@/api/system/employee/employee-api';
+  import { employeeApi } from '/src/api/system/employee-api';
  import { SmartLoading } from '/@/components/framework/smart-loading';
  import { smartSentry } from '/@/lib/smart-sentry';

  const visible = ref(false);
  const formRef = ref();
-  const tips = '字母（不限大小写）+数字组合，6-15位'; //校验规则
-  const reg = /(^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,15}$)/; //校验正则
+  const tips = '密码长度8-20位且包含大写字母、小写字母、数字三种'; //校验规则
+  const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,20}$/;

  const rules = {
    oldPassword: [{ required: true, message: '请输入原密码' }],
-    newPassword: [{ type: 'string',  pattern: reg, message: '密码格式错误' }],
-    confirmPwd: [{ type: 'string',  pattern: reg, message: '请输入确认密码' }],
+    newPassword: [{ type: 'string', pattern: reg, message: '密码格式错误' }],
+    confirmPwd: [{ type: 'string', pattern: reg, message: '请输入确认密码' }],
  };

  const formDefault = {
@@ -75,6 +75,9 @@

  function showModal() {
    visible.value = true;
+    form.oldPassword = '';
+    form.newPassword = '';
+    form.confirmPwd = '';
  }

  function cancelModal() {
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
@@ -9,7 +9,7 @@
 -->

 <template>
-  <a-drawer :title="$t('setting.title')" placement="right" :visible="visible" @close="close">
+  <a-drawer :title="$t('setting.title')" placement="right" :open="visible" @close="close">
    <a-form layout="horizontal" :label-col="{ span: 8 }">
      <a-form-item label="语言/Language">
        <a-select v-model:value="formState.language" @change="changeLanguage" style="width: 120px">
@@ -27,6 +27,10 @@
        <a-input-number @change="changeSideMenuWidth" v-model:value="formState.sideMenuWidth" :min="1" />
        像素（px）
      </a-form-item>
+      <a-form-item :label="$t('setting.page.width')" v-if="formState.layout === LAYOUT_ENUM.TOP.value">
+        <a-input @change="changePageWidth" v-model:value="formState.pageWidth" />
+        像素（px）或者 百分比
+      </a-form-item>
      <a-form-item :label="$t('setting.menu.theme')">
        <a-radio-group v-model:value="formState.sideMenuTheme" button-style="solid" @change="changeMenuTheme">
          <a-radio-button value="dark">Dark</a-radio-button>
@@ -45,6 +49,9 @@
      <a-form-item :label="$t('setting.helpdoc')">
        <a-switch @change="changeHelpDocFlag" v-model:checked="formState.helpDocFlag" checked-children="显示" un-checked-children="隐藏" />
      </a-form-item>
+      <a-form-item :label="$t('setting.watermark')">
+        <a-switch @change="changeWatermarkFlag" v-model:checked="formState.watermarkFlag" checked-children="显示" un-checked-children="隐藏" />
+      </a-form-item>
    </a-form>
    <div class="footer">
      <a-button style="margin-right: 8px" type="primary" @click="copy">复制配置信息</a-button>
@@ -121,6 +128,8 @@
    language: appConfigStore.language,
    // 布局: side 或者 side-expand
    layout: appConfigStore.layout,
+    // 页面宽度
+    pageWidth: appConfigStore.pageWidth,
    // 侧边菜单宽度
    sideMenuWidth: appConfigStore.sideMenuWidth,
    // 菜单主题
@@ -133,6 +142,8 @@
    footerFlag: appConfigStore.footerFlag,
    // 帮助文档
    helpDocFlag: appConfigStore.helpDocFlag,
+    // 水印
+    watermarkFlag: appConfigStore.watermarkFlag,
  };

  let formState = reactive({ ...formValue });
@@ -156,6 +167,13 @@
      sideMenuWidth: value,
    });
  }
+
+  function changePageWidth(e) {
+    appConfigStore.$patch({
+      pageWidth: e.target.value,
+    });
+  }
+
  function changeMenuTheme(e) {
    appConfigStore.$patch({
      sideMenuTheme: e.target.value,
@@ -185,6 +203,12 @@
      helpDocFlag: e,
    });
  }
+
+  function changeWatermarkFlag(e) {
+    appConfigStore.$patch({
+      watermarkFlag: e,
+    });
+  }
 </script>
 <style lang="less" scoped>
  .footer {
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
@@ -13,7 +13,7 @@
      <a-input-search
        @click="search"
        style="margin-right: 30px; width: 250px"
-        placeholder="1024创新实验室、小镇程序员"
+        placeholder="搜索：六边形工程师、1024"
        enter-button="搜索"
        size="small"
      />
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/menu-location-breadcrumb/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/menu-location-breadcrumb/index.vue
@@ -8,7 +8,7 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-breadcrumb separator=">" style="display: inline" v-if="breadCrumbFlag">
+  <a-breadcrumb separator=">" v-if="breadCrumbFlag" class="breadcrumb">
    <a-breadcrumb-item v-for="(item, index) in parentMenuList" :key="index">{{ item.title }}</a-breadcrumb-item>
    <a-breadcrumb-item>{{ currentRoute.meta.title }}</a-breadcrumb-item>
  </a-breadcrumb>
@@ -33,3 +33,8 @@
    return menuParentIdListMap.get(currentName) || [];
  });
 </script>
+<style scoped lang="less">
+.breadcrumb{
+  line-height: @page-tag-height;
+}
+</style>
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
@@ -12,7 +12,7 @@
  <a-row style="border-bottom: 1px solid #eeeeee; position: relative" v-show="pageTagFlag">
    <a-dropdown :trigger="['contextmenu']">
      <div class="smart-page-tag">
-        <a-tabs :tab-position="mode" v-model:activeKey="selectedKey" size="small" @tabClick="selectTab">
+        <a-tabs style="width: 100%" :tab-position="mode" v-model:activeKey="selectedKey" size="small" @tabClick="selectTab" >
          <a-tab-pane v-for="item in tagNav" :key="item.menuName">
            <template #tab>
              <span>
@@ -23,7 +23,7 @@
          </a-tab-pane>
        </a-tabs>
      </div>
-      <template #overlay>
+      <template #rightExtra>
        <a-menu>
          <a-menu-item @click="closeByMenu(false)">关闭其他</a-menu-item>
          <a-menu-item @click="closeByMenu(true)">关闭所有</a-menu-item>
@@ -56,6 +56,12 @@
  import { useAppConfigStore } from '/@/store/modules/system/app-config';
  import { useUserStore } from '/@/store/modules/system/user';

+  // //样式
+  // const tagOperateWidth = ref(40);
+  // const tabBarStyle = {
+  //   width: 'calc(100% - 80px)'
+  // }
+
  //标签页 是否显示
  const pageTagFlag = computed(() => useAppConfigStore().$state.pageTagFlag);

@@ -84,7 +90,8 @@
      router.push({ name: HOME_PAGE_NAME });
      return;
    }
-    router.push({ name, query: tag.menuQuery, params: { keepAlive: 1 } });
+    // router.push({ name, query: Object.assign({ _keepAlive: 1 }, tag.menuQuery) });
+    router.push({ name, query: tag.menuQuery });
  }

  //通过菜单关闭
@@ -116,7 +123,8 @@
          goQuery = leftTagNav.menuQuery;
        }
      }
-      router.push({ name: goName, query: goQuery, params: { keepAlive: 1 } });
+      // router.push({ name: goName, query: Object.assign({ _keepAlive: 1 }, goQuery) });
+      router.push({ name: goName, query: goQuery });
    } else if (!item && closeAll) {
      // 关闭所有tag
      router.push({ name: HOME_PAGE_NAME });
@@ -173,13 +181,6 @@
    background: #fff;
    width: calc(100% - @smart-page-tag-operate-width);

-    .smart-page-tag-tabs {
-      width: calc(100% - 100px);
-      height: 26px;
-      background-color: red;
-      margin: 2px;
-    }
-
    .smart-page-tag-close {
      margin-left: 5px;
      font-size: 10px;
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/index.vue
@@ -9,40 +9,64 @@
 -->
 <template>
  <div class="menu-container">
-    <!-- logo 第一列：一级导航 -->
-    <TopMenu ref="topMenu" class="topMenu" :menuTree="menuTree" />
-    <!-- 第二列：导航 -->
-    <RecursionMenu v-if="showRecursionMenu" class="recursion-menu" :selectedMenu="selectedMenu" />
+    <!-- 第一列：一级导航 -->
+    <TopMenu ref="topMenuRef" class="top-menu" />
+    <!-- 第二列：二级导航 -->
+    <RecursionMenu ref="recursionMenuRef" class="recursion-menu" />
  </div>
 </template>
 <script setup>
-  import { computed, ref } from 'vue';
+  import { onMounted, ref, watch } from 'vue';
+  import { useRoute } from 'vue-router';
  import RecursionMenu from './recursion-menu.vue';
  import TopMenu from './top-menu.vue';
  import { useUserStore } from '/@/store/modules/system/user';

-  defineEmits(['update:value']);
-  const menuTree = computed(() => useUserStore().getMenuTree || []);
-
-  const topMenu = ref();
-  const selectedMenu = computed(() => {
-    if (topMenu.value) {
-      return topMenu.value.selectedMenu;
-    }
-    return {};
+  const props = defineProps({
+    placeholder: {
+      type: String,
+      default: '请选择',
+    },
  });
-  const showRecursionMenu = computed(() => {
-    return selectedMenu.value && selectedMenu.value.children && selectedMenu.value.children.some((e) => e.visibleFlag);
+
+  // 选中的顶级菜单
+  const topMenuRef = ref();
+  // 二级菜单引用
+  const recursionMenuRef = ref();
+
+  let currentRoute = useRoute();
+
+  // 根据路由更新菜单展开和选中状态
+  function updateSelectKeyAndOpenKey() {
+    // 第一步，根据路由 更新选中 顶级菜单
+    let parentList = useUserStore().menuParentIdListMap.get(currentRoute.name) || [];
+    if (parentList.length === 0) {
+      topMenuRef.value.updateSelectKey(currentRoute.name);
+      return;
+    }
+    topMenuRef.value.updateSelectKey(parentList[0].name);
+
+    //第二步，根据路由 更新 二级菜单的selectKey和openKey
+    recursionMenuRef.value.updateSelectKeyAndOpenKey(parentList, currentRoute.name);
+  }
+
+  onMounted(updateSelectKeyAndOpenKey);
+
+  //监听路由的变化，进行更新菜单展开项目
+  watch(currentRoute, () => {
+    updateSelectKeyAndOpenKey();
  });
 </script>
 <style scoped lang="less">
  .menu-container {
    display: flex;
    height: 100%;
-    .topMenu {
+
+    .top-menu {
      width: 114px;
      flex-shrink: 0;
    }
+
    .recursion-menu {
      min-width: 126px;
      flex: 1;
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
@@ -8,14 +8,14 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <div class="resursion-container">
+  <div class="recursion-container" v-show="topMenu.children && topMenu.children.length > 0">
    <!-- 顶部顶级菜单名称 -->
    <div class="top-menu">
-      <span class="ant-menu">{{ props.selectedMenu.menuName }}</span>
+      <span class="ant-menu">{{ topMenu.menuName }}</span>
    </div>
    <!-- 次级菜单展示 -->
    <a-menu :selectedKeys="selectedKeys" :openKeys="openKeys" mode="inline">
-      <template v-for="item in props.selectedMenu.children" :key="item.menuId">
+      <template v-for="item in topMenu.children" :key="item.menuId">
        <template v-if="item.visibleFlag">
          <template v-if="$lodash.isEmpty(item.children)">
            <a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">
@@ -34,59 +34,60 @@
  </div>
 </template>
 <script setup>
-  import { computed } from 'vue';
-  import { useRoute } from 'vue-router';
-  import { router } from '/@/router';
-  import SubMenu from './sub-menu.vue';
+  import { ref } from 'vue';
  import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
-  import { useUserStore } from '/@/store/modules/system/user';
+  import SubMenu from './sub-menu.vue';
+  import { router } from '/@/router';
  import _ from 'lodash';
+  import menuEmitter from './side-expand-menu-mitt';
+  import { useUserStore } from '/@/store/modules/system/user';

-  let props = defineProps({
-    selectedMenu: Object,
-  });
+  // 选中的顶级菜单
+  let topMenu = ref({});
+  menuEmitter.on('selectTopMenu', onSelectTopMenu);

-  defineEmits('update:value');
+  // 监听选中顶级菜单事件
+  function onSelectTopMenu(selectedTopMenu) {
+    topMenu.value = selectedTopMenu;
+    if (selectedTopMenu.children && selectedTopMenu.children.length > 0) {
+      openKeys.value = _.map(selectedTopMenu.children, 'menuId').map((e) => e.toString());
+    } else {
+      openKeys.value = [];
+    }
+    selectedKeys.value = [];
+  }

  //展开的菜单
-  let currentRoute = useRoute();
-  const selectedKeys = computed(() => {
-    return [currentRoute.name];
-  });
+  const selectedKeys = ref([]);
+  const openKeys = ref([]);

-  const parentMenuList = computed(() => {
-    let currentName = currentRoute.name;
-    if (!currentName || typeof currentName !== 'string') {
-      return [];
+  function updateSelectKeyAndOpenKey(parentList, currentSelectKey) {
+    if (!parentList) {
+      return;
    }
-    let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
-    return menuParentIdListMap.get(currentName) || [];
-  });
+    //获取需要展开的menu key集合
+    openKeys.value = _.map(parentList, 'name');
+    selectedKeys.value = [currentSelectKey];
+  }

-  const openKeys = computed(() => {
-    // // 仅展开当前页面
-    // return parentMenuList.value.map((e) => e.name);
-    // 展开所有
-    let children = props.selectedMenu.children;
-    if (!children || _.isEmpty(children)) {
-      return [];
-    }
-    return children.map((e) => e.menuId.toString());
-  });
  // 页面跳转
  function turnToPage(route) {
+    useUserStore().deleteKeepAliveIncludes(route.menuId.toString());
    router.push({ name: route.menuId.toString() });
  }

  function goHome() {
    router.push({ name: HOME_PAGE_NAME });
  }
+
+  defineExpose({ updateSelectKeyAndOpenKey });
 </script>
 <style scoped lang="less">
-  .resursion-container {
+  .recursion-container {
    height: 100%;
    background: #ffffff;
  }
+
  .top-menu {
    overflow: hidden;
    display: flex;
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/side-expand-menu-mitt.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/side-expand-menu-mitt.js
@@ -0,0 +1,11 @@
+/*
+ * 展开菜单 event bus
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-07-12 23:32:48
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+import mitt from 'mitt';
+export default mitt();
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
@@ -32,7 +32,7 @@
 </template>
 <script setup>
  let props = defineProps({
-    menuInfo: Array,
+    menuInfo: Object,
  });
  const emits = defineEmits(['turnToPage']);
  const turnToPage = (route) => {
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
@@ -12,11 +12,11 @@
    <!-- 顶部logo区域 -->
    <div class="logo" @click="onGoHome">
      <img class="logo-img" :src="logoImg" />
-      <div class="title">SmartAdmin 2.X</div>
+      <div class="title">{{ websiteName }}</div>
    </div>
    <!-- 一级菜单展示 -->
    <a-menu :selectedKeys="selectedKeys" mode="inline" :theme="theme">
-      <template v-for="item in props.menuTree" :key="item.menuId">
+      <template v-for="item in menuTree" :key="item.menuId">
        <template v-if="item.visibleFlag">
          <a-menu-item :key="item.menuId.toString()" @click="onSelectMenu(item)">
            <template #icon>
@@ -31,75 +31,52 @@
 </template>
 <script setup>
  import _ from 'lodash';
-  import { computed, ref, watch } from 'vue';
-  import { useRoute } from 'vue-router';
-  import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
+  import { computed, ref } from 'vue';
  import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
  import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
  import { router } from '/@/router';
  import { useAppConfigStore } from '/@/store/modules/system/app-config';
  import { useUserStore } from '/@/store/modules/system/user';
+  import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
+  import menuEmitter from './side-expand-menu-mitt';

+  const websiteName = computed(() => useAppConfigStore().websiteName);
  const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);
-
-  const props = defineProps({
-    menuTree: Array,
-  });
-  const selectedMenu = ref();
-  let currentRoute = useRoute();
-
-  const parentMenuList = computed(() => {
-    let currentName = currentRoute.name;
-    if (!currentName || typeof currentName !== 'string') {
-      return [];
-    }
-    let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
-    return menuParentIdListMap.get(currentName) || [];
-  });
-
-  const selectedKeys = computed(() => {
-    if (selectedMenu.value) {
-      return [selectedMenu.value.menuId.toString()];
-    }
-    return parentMenuList.value.map((e) => e.name);
-  });
+  const menuTree = computed(() => useUserStore().getMenuTree || []);

  // 展开菜单的顶级目录名字适配，只展示两个字为好
-  function menuNameAdapter(name){
-    return name.substr(0,2);
+  function menuNameAdapter(name) {
+    return name.substr(0, 2);
  }

-  //监听路由的变化，进行更新菜单展开项目
-  watch(
-    currentRoute,
-    () => {
-      selectedMenu.value = undefined;
-      let menuList = props.menuTree.map((e) => e.menuId.toString());
-      let parentIdList = _.intersection(menuList, selectedKeys.value);
-      if (parentIdList.length > 0) {
-        let parentId = parentIdList[0];
-        let parentItem = props.menuTree.find((e) => e.menuId == Number(parentId));
-        selectedMenu.value = parentItem;
-      }
-    },
-    {
-      immediate: true,
-    }
-  );
+  // 选中的顶级菜单
+  const selectedKeys = ref([]);
+
  // 选中菜单，页面跳转
-  function onSelectMenu(route) {
-    selectedMenu.value = route;
-    if (route.menuType == MENU_TYPE_ENUM.MENU.value && (_.isEmpty(route.children) || route.children.every((e) => !e.visibleFlag))) {
-      router.push({ name: route.menuId.toString() });
+  function onSelectMenu(menuItem) {
+    selectedKeys.value = [menuItem.menuId.toString()];
+    if (menuItem.menuType === MENU_TYPE_ENUM.MENU.value && (_.isEmpty(menuItem.children) || menuItem.children.every((e) => !e.visibleFlag))) {
+      useUserStore().deleteKeepAliveIncludes(menuItem.menuId.toString());
+      router.push({ name: menuItem.menuId.toString() });
+    }
+    menuEmitter.emit('selectTopMenu', menuItem);
+  }
+
+  // 更新选中的菜单
+  function updateSelectKey(key) {
+    selectedKeys.value = [key];
+    let selectMenu = _.find(menuTree.value, { menuId: Number(key) });
+    if (selectMenu) {
+      menuEmitter.emit('selectTopMenu', selectMenu);
    }
  }
+
  //点击logo回到首页
  function onGoHome() {
    router.push({ name: HOME_PAGE_NAME });
  }
-  defineExpose({
-    selectedMenu,
-  });
+
+  defineExpose({ updateSelectKey });
 </script>
 <style scoped lang="less">
  .top-menu-container {
@@ -110,7 +87,7 @@
    line-height: @header-user-height;
    padding: 0px 15px 0px 15px;
    width: 100%;
-    z-index: 9999;
+    z-index: 100;
    display: flex;
    justify-content: space-between;
    cursor: pointer;
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/contact-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/contact-modal.vue
@@ -8,8 +8,8 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :visible="visible" width="600px" title="联系客服人员" :closable="false" :maskClosable="true">
-    <a-row><div style="margin-left: 180px">客服(卓大)电话：18637925892 ;</div> </a-row>
+  <a-modal :open="visible" width="600px" title="联系客服人员" :closable="false" :maskClosable="true">
+    <a-row><div style="margin-left: 180px;font-weight:bolder">客服(卓大)电话：18637925892 ;</div> </a-row>
    <br />
    <div class="app-qr-box">
      <div class="app-qr">
@@ -19,8 +19,8 @@
      </div>
      <div class="app-qr">
        <img :src="xiaozhen" />
-        <span class="qr-desc strong"> 关注：小镇程序员 </span>
-        <span class="qr-desc"> 程序员的工作生活 </span>
+        <span class="qr-desc strong"> 六边形工程师 </span>
+        <span class="qr-desc"> 赚钱、代码、生活 </span>
      </div>
      <div class="app-qr">
        <img :src="lab1024" />
@@ -37,7 +37,7 @@
  import { ref, reactive, nextTick, computed } from 'vue';
  import zhuoda from '/@/assets/images/1024lab/zhuoda-wechat.jpg';
  import lab1024 from '/@/assets/images/1024lab/1024lab-gzh.jpg';
-  import xiaozhen from '/@/assets/images/1024lab/xiaozhen-gzh.jpg';
+  import xiaozhen from '/@/assets/images/1024lab/gzh.jpg';

  defineExpose({
    show,
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue
@@ -8,7 +8,7 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :visible="visible" title="意见反馈" :closable="false" :maskClosable="true" >
+  <a-modal :open="visible" title="意见反馈" :closable="false" :maskClosable="true" >
    <a-form :labelCol="{ span: 6 }">
      <a-form-item label="我要吐槽/建议：">
        <a-textarea v-model:value="form.feedbackContent" placeholder="请输入让您不满意的点，我们争取做到更好～" :rows="3"/>
@@ -34,7 +34,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { SmartLoading } from '/@/components/framework/smart-loading';
-import { feedbackApi } from '/@/api/support/feedback/feedback-api';
+import { feedbackApi } from '/src/api/support/feedback-api';
 import { message } from 'ant-design-vue';
 import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
 import Upload from '/@/components/support/file-upload/index.vue';
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/index.vue
@@ -42,7 +42,7 @@
    <!-----文档列表---->
    <div class="help-doc-list">
      <div class="help-doc-item-all">
-        <router-link tag="a" target="_blank" :to="{ path: '/help-doc/detail' }">系统手册文档 >></router-link>
+        <router-link tag="a" target="_blank" :to="{ path: '/help-doc/detail' }">系统帮助文档 >></router-link>
      </div>
      <div class="help-doc-item" v-for="item in helpDocList" :key="item.helpDocId">
        <router-link tag="a" target="_blank" :to="{ path: '/help-doc/detail', query: { helpDocId: item.helpDocId } }">{{ item.title }}</router-link>
@@ -59,11 +59,11 @@
  import { onMounted, ref, watch, reactive } from 'vue';
  import { useRoute } from 'vue-router';
  import _ from 'lodash';
-  import { helpDocApi } from '/@/api/support/help-doc/help-doc-api';
+  import { helpDocApi } from '/src/api/support/help-doc-api';
  import ContactModal from './components/contact-modal.vue';
  import FeedbackModal from './components/feedback-modal.vue';
  import { useAppConfigStore } from '/@/store/modules/system/app-config';
-  import { feedbackApi } from '/@/api/support/feedback/feedback-api';
+  import { feedbackApi } from '/src/api/support/feedback-api';
  import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
  import { smartSentry } from '/@/lib/smart-sentry';

@@ -92,7 +92,7 @@
    }

    scheduleShowInterval = setInterval(() => {
-      if (feedbackList.length == 0) {
+      if (feedbackList.length === 0) {
        return;
      }

@@ -187,6 +187,7 @@
      justify-content: space-between;
      .help-doc-contact-left {
        width: 30px;
+        margin-top: 10px;
      }
      .help-doc-contact-right {
        margin-top: 10px;
@@ -194,19 +195,20 @@
        .help-doc-contac-time {
          color: #888;
          font-size: 12px;
+          margin-top: 10px;
        }
      }
    }

    .feedback {
      .feedback-message-list {
-        margin: 6px 0px;
-        height: 40px;
+        margin: 12px 0px;
+        height: 70px;
        position: relative;
        overflow: hidden;
        .feedback-message {
-          margin: 2px 2px;
-          color: #888;
+          margin: 10px 2px;
+          color: #a9a9a9;
          font-size: 12px;
        }
      }
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue
@@ -13,19 +13,19 @@
  <!-- 1、顶部logo区域 -->
  <div class="logo" @click="onGoHome" :style="sideMenuWidth" v-if="!collapsed">
    <img class="logo-img" :src="logoImg" />
-    <div class="title title-light" v-if="sideMenuTheme === 'light'">{{websiteName}}</div>
-    <div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{websiteName}}</div>
+    <div class="title title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
+    <div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
  </div>
  <div class="min-logo" @click="onGoHome" v-if="collapsed">
    <img class="logo-img" :src="logoImg" />
  </div>

  <!-- 2、下方菜单区域： 这里使用一个递归菜单解决 -->
-  <RecursionMenu :collapsed="collapsed" ref="menu" />
+  <RecursionMenu :collapsed="collapsed" ref="menuRef" />
 </template>

 <script setup>
-  import { computed, ref, watch } from 'vue';
+  import { computed, nextTick, ref, watch } from 'vue';
  import { useRouter } from 'vue-router';
  import RecursionMenu from './recursion-menu.vue';
  import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
@@ -44,14 +44,14 @@
    },
  });

-  const menu = ref();
+  const menuRef = ref();

  watch(
    () => props.collapsed,
    (newValue, oldValue) => {
      // 如果是展开菜单的话，重新获取更新菜单的展开项: openkeys和selectKeys
      if (!newValue) {
-        menu.value.updateOpenKeysAndSelectKeys();
+        nextTick(() => menuRef.value.updateOpenKeysAndSelectKeys());
      }
    }
  );
@@ -76,7 +76,7 @@
      line-height: @header-user-height;
      padding: 0px 15px 0px 15px;
      width: 100%;
-      z-index: 9999;
+      z-index: 21;
      display: flex;
      justify-content: center;
      .logo-img {
@@ -89,10 +89,10 @@
      height: @header-user-height;
      line-height: @header-user-height;
      padding: 0px 15px 0px 15px;
-      z-index: 9999;
+      z-index: 21;
      display: flex;
      cursor: pointer;
-      justify-content:space-around;
+      justify-content: center;

      .logo-img {
        width: 40px;
@@ -102,13 +102,13 @@
      .title {
        font-size: 16px;
        font-weight: 600;
-        margin-left:8px;
+        margin-left: 8px;
      }
      .title-light {
-        color:#001529;
+        color: #001529;
      }
      .title-dark {
-        color:#ffffff;
+        color: #ffffff;
      }
    }
  }
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/recursion-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/recursion-menu.vue
@@ -14,7 +14,7 @@
    class="smart-menu"
    mode="inline"
    :theme="theme"
-    :inlineCollapsed="inlineCollapsed"
+    :inlineCollapsed="collapsed"
  >
    <template v-for="item in menuTree" :key="item.menuId">
      <template v-if="item.visibleFlag && !item.disabledFlag">
@@ -45,7 +45,7 @@
  const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);

  const props = defineProps({
-    inlineCollapsed: {
+    collapsed: {
      type: Boolean,
      default: false,
    },
@@ -60,6 +60,7 @@

  // 页面跳转
  function turnToPage(menu) {
+    useUserStore().deleteKeepAliveIncludes(menu.menuId.toString());
    router.push({ path: menu.path });
  }

@@ -77,9 +78,13 @@
    //获取需要展开的menu key集合
    let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
    let parentList = menuParentIdListMap.get(currentRoute.name) || [];
-    let needOpenKeys = _.map(parentList, 'name').map(Number);
-    // 使用lodash的union函数，进行 去重合并两个数组
-    openKeys.value = _.union(openKeys.value, needOpenKeys);
+
+    // 如果是折叠菜单的话，则不需要设置openkey
+    if(!props.collapsed){
+      // 使用lodash的union函数，进行 去重合并两个数组
+      let needOpenKeys = _.map(parentList, 'name').map(Number);
+      openKeys.value = _.union(openKeys.value, needOpenKeys);
+    }
  }

  watch(
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue
@@ -8,10 +8,8 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <div class="version" >
-    <a target="_blank" href="https://www.1024lab.net">
-      SmartAdmin V2.x @copyright 河南·洛阳【1024创新实验室】 Since 2012-{{ currentYear }}
-    </a>
+  <div class="version">
+    <a target="_blank" href="javascript:void(0)"> SmartAdmin V3.x @copyright 河南·洛阳【1024创新实验室】 Since 2012-{{ currentYear }} </a>
  </div>
 </template>
 <script setup>
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-keep-alive.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-keep-alive.js
@@ -0,0 +1,39 @@
+/*
+ *  keep-alive
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-06 20:39:54
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+import { computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useUserStore } from '/@/store/modules/system/user';
+
+export function smartKeepAlive() {
+  const route = useRoute();
+  const router = useRouter();
+  // 需要keep-alive的页面
+  const keepAliveIncludes = computed(() => {
+    return useUserStore().keepAliveIncludes || [];
+  });
+  
+  // ----------------------- iframe相关 -----------------------
+
+  // 当前路由是否为不需要缓存的iframe页面
+  const iframeNotKeepAlivePageFlag = computed(() => route.meta.frameFlag && !route.meta.keepAlive);
+  // 打开中的tagNav
+  const tagNav = computed(() => useUserStore().getTagNav || []);
+  // 已打开的iframe列表
+  const keepAliveIframePages = computed(() => {
+    let routes = router.getRoutes();
+    return routes.filter((e) => e.meta.frameFlag && e.meta.keepAlive && tagNav.value.some((t) => t.menuName == e.name));
+  });
+  return {
+    route,
+    keepAliveIncludes,
+    iframeNotKeepAlivePageFlag,
+    keepAliveIframePages,
+  };
+}
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue
@@ -0,0 +1,173 @@
+<!--
+  * 顶部菜单
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-06 20:29:12 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <!--总共3部分：1、logo区域，包含 logo和名称; 2、菜单区域  ;3、用户操作区域-->
+  <div class="header-main">
+    <!-- 1、logo区域 -->
+    <div class="logo" @click="onGoHome">
+      <img class="logo-img" :src="logoImg" />
+      <div class="title title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
+      <div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
+    </div>
+    <!-- 2、菜单区域 -->
+    <RecursionMenu ref="menuRef" />
+
+    <!-- 3、用户操作区域 -->
+    <div class="user-space">
+      <div class="setting">
+        <!---消息通知--->
+        <HeaderMessage ref="headerMessage" />
+        <!---设置--->
+        <a-button type="text" @click="showSetting" class="operate-icon">
+          <template #icon><setting-outlined /></template>
+        </a-button>
+      </div>
+      <!---头像信息--->
+      <div class="user-space-item">
+        <HeaderAvatar />
+      </div>
+      <HeaderSetting ref="headerSetting" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { computed, ref, watch } from 'vue';
+  import { useRouter } from 'vue-router';
+  import RecursionMenu from './recursion-menu.vue';
+  import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
+  import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import HeaderAvatar from '../header-user-space/header-avatar.vue';
+  import HeaderSetting from '../header-user-space/header-setting.vue';
+  import HeaderMessage from '../header-user-space/header-message.vue';
+
+  // 设置
+  const headerSetting = ref();
+  function showSetting() {
+    headerSetting.value.show();
+  }
+
+  //消息通知
+  const headerMessage = ref();
+  function showMessage() {
+    headerMessage.value.showMessage();
+  }
+
+  const websiteName = computed(() => useAppConfigStore().websiteName);
+  const sideMenuTheme = computed(() => useAppConfigStore().sideMenuTheme);
+
+  const props = defineProps({
+    collapsed: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  });
+
+  const menuRef = ref();
+
+  watch(
+    () => props.collapsed,
+    (newValue, oldValue) => {
+      // 如果是展开菜单的话，重新获取更新菜单的展开项: openkeys和selectKeys
+      if (!newValue) {
+        menuRef.value.updateSelectKeys();
+      }
+    }
+  );
+
+  const color = computed(() => {
+    let isLight = useAppConfigStore().$state.sideMenuTheme === 'light';
+      return {
+          color: isLight ? '#001529' : '#FFFFFF',
+          background:isLight ? '#FFFFFF' : '#001529',
+      }
+  });
+
+  const router = useRouter();
+  function onGoHome() {
+    router.push({ name: HOME_PAGE_NAME });
+  }
+</script>
+
+<style lang="less" scoped>
+  .header-main {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    width: 100%;
+    padding-left: 16px;
+    height: 48px;
+    z-index: 21;
+    border-bottom: 1px solid rgb(238, 238, 238);
+
+    .logo {
+      min-width: 192px;
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+
+      .logo-img {
+        display: inline-block;
+        height: 45px;
+        vertical-align: middle;
+      }
+      .title {
+        font-size: 16px;
+        font-weight: 600;
+        margin-left: 8px;
+      }
+      .title-light {
+        color: #001529;
+      }
+      .title-dark {
+        color: #ffffff;
+      }
+    }
+
+    .user-space {
+      min-width: 208px;
+      margin-left: auto;
+      padding-right: 10px;
+      color: v-bind('color.color');
+      display: flex;
+      flex-direction: row;
+      vertical-align: middle;
+      align-items: center;
+      justify-content: flex-end;
+
+      .setting {
+        height: @header-user-height;
+        line-height: @header-user-height;
+        vertical-align: middle;
+        display: flex;
+        align-items: center;
+
+        :deep(.ant-badge) {
+          color: v-bind('color.color');
+        }
+      }
+      .operate-icon {
+        margin-left: 20px;
+        color: v-bind('color.color');
+      }
+
+      .user-space-item{
+        margin-left: 10px;
+      }
+    }
+  }
+
+  :deep(.ant-menu-horizontal){
+    border-bottom:0;
+  }
+</style>
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/recursion-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/recursion-menu.vue
@@ -0,0 +1,88 @@
+<!--
+  * 顶部菜单-递归菜单
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-06 20:29:12 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-menu
+    v-model:openKeys="openKeys"
+    v-model:selectedKeys="selectedKeys"
+    class="smart-menu"
+    mode="horizontal"
+    :theme="theme"
+  >
+    <template v-for="item in menuTree" :key="item.menuId">
+      <template v-if="item.visibleFlag && !item.disabledFlag">
+        <template v-if="$lodash.isEmpty(item.children)">
+          <a-menu-item :key="item.menuId" @click="turnToPage(item)">
+            <template #icon>
+              <component :is="$antIcons[item.icon]" />
+            </template>
+            {{ item.menuName }}
+          </a-menu-item>
+        </template>
+        <template v-else>
+          <SubMenu :menu-info="item" :key="item.menuId" @turnToPage="turnToPage" />
+        </template>
+      </template>
+    </template>
+  </a-menu>
+</template>
+<script setup>
+  import _ from 'lodash';
+  import { computed, ref, watch } from 'vue';
+  import { useRoute } from 'vue-router';
+  import SubMenu from './sub-menu.vue';
+  import { router } from '/@/router/index';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import { useUserStore } from '/@/store/modules/system/user';
+
+  const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);
+
+  const menuTree = computed(() => useUserStore().getMenuTree || []);
+
+  //展开的菜单
+  let currentRoute = useRoute();
+  const selectedKeys = ref([]);
+  const openKeys = ref([]);
+
+  // 页面跳转
+  function turnToPage(menu) {
+    useUserStore().deleteKeepAliveIncludes(menu.menuId.toString());
+    router.push({ path: menu.path });
+  }
+
+  /**
+   * SmartAdmin中 router的name 就是 后端存储menu的id
+   * 所以此处可以直接监听路由，根据路由更新菜单的选中和展开
+   */
+  function updateSelectKeys() {
+    // 更新选中
+    selectedKeys.value = [_.toNumber(currentRoute.name)];
+  }
+
+  watch(
+    currentRoute,
+    () => {
+      updateSelectKeys();
+    },
+    {
+      immediate: true,
+    }
+  );
+
+  defineExpose({
+    updateSelectKeys,
+  });
+</script>
+
+<style lang="less" scoped>
+  .smart-menu {
+    position: relative;
+  }
+
+</style>
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/sub-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/sub-menu.vue
@@ -0,0 +1,45 @@
+<!--
+  * 顶部菜单-递归菜单
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-06 20:29:12 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-sub-menu :key="menuInfo.menuId">
+    <template #icon>
+      <component :is="$antIcons[menuInfo.icon]" />
+    </template>
+    <template #title>{{ menuInfo.menuName }}</template>
+    <template v-for="item in menuInfo.children" :key="item.menuId">
+      <template v-if="item.visibleFlag && !item.disabledFlag">
+        <template v-if="!item.children">
+          <a-menu-item :key="item.menuId" @click="turnToPage(item)">
+            <template #icon>
+              <component :is="$antIcons[item.icon]" />
+            </template>
+            {{ item.menuName }}
+          </a-menu-item>
+        </template>
+        <template v-else>
+          <SubMenu :menu-info="item" :key="item.menuId" @turnToPage="turnToPage" />
+        </template>
+      </template>
+    </template>
+  </a-sub-menu>
+</template>
+<script setup>
+  const props = defineProps({
+    menuInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+  });
+
+  const emits = defineEmits(['turnToPage']);
+  const turnToPage = (menu) => {
+    emits('turnToPage', menu);
+  };
+</script>