Merge branch 'main' into example

CHANGELOG.md

@@ -1,6 +1,28 @@
 # Changelog
 
 
+## [v1.3.7](https://github.com/soybeanjs/soybean-admin/compare/v1.3.6...v1.3.7) (2024-09-21)
+
+###    🚨 Breaking Changes
+
+- **projects**: update scss config &nbsp;-&nbsp; by @soybeanjs [<samp>(24e9e)</samp>](https://github.com/soybeanjs/soybean-admin/commit/24e9e57)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
+
+- **projects**: fix global-tab click conflict with contextmenu &nbsp;-&nbsp; by @soybeanjs [<samp>(3e72c)</samp>](https://github.com/soybeanjs/soybean-admin/commit/3e72c3b)
+
+### &nbsp;&nbsp;&nbsp;💅 Refactors
+
+- **packages**: @sa/materials: remove tab close shortcut by mouse &nbsp;-&nbsp; by @soybeanjs [<samp>(4da58)</samp>](https://github.com/soybeanjs/soybean-admin/commit/4da588c)
+
+### &nbsp;&nbsp;&nbsp;🏡 Chore
+
+- **deps**: update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(baefd)</samp>](https://github.com/soybeanjs/soybean-admin/commit/baefdfd)
+
+### &nbsp;&nbsp;&nbsp;❤️ Contributors
+
+[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;
+
 ## [v1.3.6](https://github.com/soybeanjs/soybean-admin/compare/v1.3.5...v1.3.6) (2024-09-20)
 
 ### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
@@ -73,7 +73,7 @@
     "tailwind-merge": "2.5.2",
     "typeit": "8.8.4",
     "vditor": "3.10.5",
-    "vue": "3.5.6",
+    "vue": "3.5.7",
     "vue-draggable-plus": "0.5.3",
     "vue-i18n": "10.0.1",
     "vue-pdf-embed": "2.1.0",
@@ -85,7 +85,7 @@
   "devDependencies": {
     "@amap/amap-jsapi-types": "0.0.15",
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.250",
+    "@iconify/json": "2.2.251",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config": "1.4.1",
@@ -101,10 +101,10 @@
     "@unocss/vite": "0.62.4",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitejs/plugin-vue-jsx": "4.0.1",
-    "eslint": "9.10.0",
+    "eslint": "9.11.0",
     "eslint-plugin-vue": "9.28.0",
     "lint-staged": "15.2.10",
-    "sass": "1.79.2",
+    "sass": "1.79.3",
     "simple-git-hooks": "2.11.1",
     "tsx": "4.19.1",
     "typescript": "5.6.2",

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/materials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/materials/src/libs/page-tab/index.vue

@@ -53,23 +53,10 @@ const bindProps = computed(() => {
 function handleClose() {
   emit('close');
 }
-
-function handleMouseup(e: MouseEvent) {
-  // close tab by mouse wheel button click
-  if (e.button === 1) {
-    handleClose();
-  }
-}
 </script>
 
 <template>
-  <component
+  <component :is="activeTabComponent.component" :class="activeTabComponent.class" :style="cssVars" v-bind="bindProps">
-    :is="activeTabComponent.component"
-    :class="activeTabComponent.class"
-    :style="cssVars"
-    v-bind="bindProps"
-    @mouseup="handleMouseup"
-  >
     <template #prefix>
       <slot name="prefix"></slot>
     </template>

packages/ofetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -10,6 +10,6 @@
     }
   },
   "dependencies": {
-    "ofetch": "1.3.4"
+    "ofetch": "1.4.0"
   }
 }

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "bin": {
     "sa": "./bin.ts"
   },

packages/uno-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "exports": {
     ".": "./src/index.ts"
   },

src/layouts/modules/global-tab/index.vue

@@ -8,6 +8,7 @@ import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { useRouteStore } from '@/store/modules/route';
 import { useTabStore } from '@/store/modules/tab';
+import { isPC } from '@/utils/agent';
 import ContextMenu from './context-menu.vue';
 
 defineOptions({
@@ -24,6 +25,7 @@ const bsWrapper = ref<HTMLElement>();
 const { width: bsWrapperWidth, left: bsWrapperLeft } = useElementBounding(bsWrapper);
 const bsScroll = ref<InstanceType<typeof BetterScroll>>();
 const tabRef = ref<HTMLElement>();
+const isPCFlag = isPC();
 
 const TAB_DATA_ID = 'data-tab-id';
 
@@ -166,7 +168,7 @@ init();
 <template>
   <DarkModeContainer class="size-full flex-y-center px-16px shadow-tab">
     <div ref="bsWrapper" class="h-full flex-1-hidden">
-      <BetterScroll ref="bsScroll" :options="{ scrollX: true, scrollY: false, click: true }" @click="removeFocus">
+      <BetterScroll ref="bsScroll" :options="{ scrollX: true, scrollY: false, click: !isPCFlag }" @click="removeFocus">
         <div
           ref="tabRef"
           class="h-full flex pr-18px"

src/utils/agent.ts

@@ -0,0 +1,5 @@
+export function isPC() {
+  const agents = ['Android', 'iPhone', 'webOS', 'BlackBerry', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'];
+
+  return !agents.includes(window.navigator.userAgent);
+}

vite.config.ts

@@ -22,7 +22,8 @@ export default defineConfig(configEnv => {
     css: {
       preprocessorOptions: {
         scss: {
-          additionalData: `@use "./src/styles/scss/global.scss" as *;`
+          api: 'modern-compiler',
+          additionalData: `@use "@/styles/scss/global.scss" as *;`
         }
       }
     },