Merge branch 'develop'

package.json

@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@iconify/iconify": "^2.2.1",
-    "@vueuse/core": "^8.3.1",
+    "@vueuse/core": "^8.4.2",
     "@wangeditor/editor": "^5.0.1",
     "@wangeditor/editor-for-vue": "^5.1.10",
     "@zxcvbn-ts/core": "^2.0.1",
     "animate.css": "^4.1.1",
-    "axios": "^0.27.0",
+    "axios": "^0.27.2",
     "echarts": "^5.3.2",
     "echarts-wordcloud": "^2.0.0",
     "element-plus": "2.1.11",
@@ -41,57 +41,57 @@
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.13",
+    "pinia": "^2.0.14",
     "pinia-plugin-persist": "^1.0.0",
     "qrcode": "^1.5.0",
     "qs": "^6.10.3",
     "url": "^0.11.0",
     "vue": "3.2.33",
-    "vue-i18n": "9.1.9",
-    "vue-router": "^4.0.14",
+    "vue-i18n": "9.1.10",
+    "vue-router": "^4.0.15",
     "vue-types": "^4.1.1",
     "web-storage-cache": "^1.1.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.3",
-    "@commitlint/config-conventional": "^16.2.1",
-    "@iconify/json": "^2.1.32",
+    "@commitlint/cli": "^16.2.4",
+    "@commitlint/config-conventional": "^16.2.4",
+    "@iconify/json": "^2.1.38",
     "@intlify/vite-plugin-vue-i18n": "^3.4.0",
     "@purge-icons/generated": "^0.8.1",
     "@types/intro.js": "^3.0.2",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "^17.0.27",
+    "@types/node": "^17.0.31",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.4.2",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.21.0",
-    "@typescript-eslint/parser": "^5.21.0",
-    "@vitejs/plugin-vue": "^2.3.1",
+    "@typescript-eslint/eslint-plugin": "^5.22.0",
+    "@typescript-eslint/parser": "^5.22.0",
+    "@vitejs/plugin-vue": "^2.3.2",
     "@vitejs/plugin-vue-jsx": "^1.3.10",
-    "autoprefixer": "^10.4.5",
-    "eslint": "^8.14.0",
+    "autoprefixer": "^10.4.7",
+    "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-define-config": "^1.4.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^8.7.1",
     "husky": "^7.0.4",
     "less": "^4.1.2",
-    "lint-staged": "^12.4.0",
-    "plop": "^3.0.6",
-    "postcss": "^8.4.12",
+    "lint-staged": "^12.4.1",
+    "plop": "^3.1.0",
+    "postcss": "^8.4.13",
     "postcss-html": "^1.4.1",
     "postcss-less": "^6.0.0",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
-    "stylelint": "^14.7.1",
+    "stylelint": "^14.8.2",
     "stylelint-config-html": "^1.0.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recommended": "^7.0.0",
     "stylelint-config-standard": "^25.0.0",
     "stylelint-order": "^5.0.0",
-    "typescript": "4.6.3",
+    "typescript": "4.6.4",
     "unplugin-vue-define-options": "^0.6.1",
-    "vite": "2.9.5",
+    "vite": "2.9.8",
     "vite-plugin-eslint": "^1.6.0",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-mock": "^2.9.6",
@@ -99,7 +99,7 @@
     "vite-plugin-style-import": "^1.4.1",
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-windicss": "^1.8.4",
-    "vue-tsc": "^0.34.10",
+    "vue-tsc": "^0.34.11",
     "windicss": "^3.5.1",
     "windicss-analysis": "^0.3.5"
   },

src/components/Menu/src/Menu.vue

@@ -70,19 +70,16 @@ export default defineComponent({
       }
     }
 
-    return () => (
-      <div
-        id={prefixCls}
-        class={[
-          `${prefixCls} ${prefixCls}__${unref(menuMode)}`,
-          'h-[100%] overflow-hidden flex-col bg-[var(--left-menu-bg-color)]',
-          {
-            'w-[var(--left-menu-min-width)]': unref(collapse) && unref(layout) !== 'cutMenu',
-            'w-[var(--left-menu-max-width)]': !unref(collapse) && unref(layout) !== 'cutMenu'
+    const renderMenuWrap = () => {
+      if (unref(layout) === 'top') {
+        return renderMenu()
+      } else {
+        return <ElScrollbar>{renderMenu()}</ElScrollbar>
       }
-        ]}
-      >
-        <ElScrollbar>
+    }
+
+    const renderMenu = () => {
+      return (
         <ElMenu
           defaultActive={unref(activeMenu)}
           mode={unref(menuMode)}
@@ -102,7 +99,22 @@ export default defineComponent({
             }
           }}
         </ElMenu>
-        </ElScrollbar>
+      )
+    }
+
+    return () => (
+      <div
+        id={prefixCls}
+        class={[
+          `${prefixCls} ${prefixCls}__${unref(menuMode)}`,
+          'h-[100%] overflow-hidden flex-col bg-[var(--left-menu-bg-color)]',
+          {
+            'w-[var(--left-menu-min-width)]': unref(collapse) && unref(layout) !== 'cutMenu',
+            'w-[var(--left-menu-max-width)]': !unref(collapse) && unref(layout) !== 'cutMenu'
+          }
+        ]}
+      >
+        {renderMenuWrap()}
       </div>
     )
   }