Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: improve layout boundary processing #4423

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ env:
jobs:
test:
name: Test
if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down Expand Up @@ -56,7 +55,6 @@ jobs:

lint:
name: Lint
if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down Expand Up @@ -109,7 +107,6 @@ jobs:
ci-ok:
name: CI OK
runs-on: ubuntu-latest
if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') && always()
needs: [test, check, lint]
env:
FAILURE: ${{ contains(join(needs.*.result, ','), 'failure') }}
Expand Down
6 changes: 6 additions & 0 deletions docs/.vitepress/config/shared.mts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import {
} from '@nolebase/vitepress-plugin-git-changelog/vite';
import tailwind from 'tailwindcss';
import { defineConfig, postcssIsolateStyles } from 'vitepress';
import {
groupIconMdPlugin,
groupIconVitePlugin,
} from 'vitepress-plugin-group-icons';

import { demoPreviewPlugin } from './plugins/demo-preview';
import { search as zhSearch } from './zh.mts';
Expand All @@ -21,6 +25,7 @@ export const shared = defineConfig({
markdown: {
preConfig(md) {
md.use(demoPreviewPlugin);
md.use(groupIconMdPlugin);
},
},
pwa: pwa(),
Expand Down Expand Up @@ -79,6 +84,7 @@ export const shared = defineConfig({
}),
GitChangelogMarkdownSection(),
viteArchiverPlugin({ outputDir: '.vitepress' }),
groupIconVitePlugin(),
],
server: {
fs: {
Expand Down
1 change: 1 addition & 0 deletions docs/.vitepress/theme/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { initHmPlugin } from './plugins/hm';

import './styles';

import 'virtual:group-icons.css';
import '@nolebase/vitepress-plugin-git-changelog/client/style.css';

export default {
Expand Down
3 changes: 2 additions & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"@vben/styles": "workspace:*",
"lucide-vue-next": "^0.441.0",
"medium-zoom": "^1.1.0",
"radix-vue": "^1.9.5"
"radix-vue": "^1.9.5",
"vitepress-plugin-group-icons": "^1.2.4"
},
"devDependencies": {
"@nolebase/vitepress-plugin-git-changelog": "^2.5.0",
Expand Down
4 changes: 2 additions & 2 deletions docs/src/guide/introduction/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ git -v

::: code-group

```bash [GitHub]
```sh [GitHub]
# clone 代码
git clone https://github.com/vbenjs/vue-vben-admin.git
```

```bash [Gitee]
```sh [Gitee]
# clone 代码
# Gitee 的代码可能不是最新的
git clone https://gitee.com/annsion/vue-vben-admin.git
Expand Down
2 changes: 1 addition & 1 deletion internal/lint-configs/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-jsdoc": "^50.2.3",
"eslint-plugin-jsonc": "^2.16.0",
"eslint-plugin-n": "^17.10.2",
"eslint-plugin-n": "^17.10.3",
"eslint-plugin-no-only-tests": "^3.3.0",
"eslint-plugin-perfectionist": "^3.6.0",
"eslint-plugin-prettier": "^5.2.1",
Expand Down
2 changes: 1 addition & 1 deletion internal/tailwind-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"tailwindcss": "^3.4.3"
},
"dependencies": {
"@iconify/json": "^2.2.249",
"@iconify/json": "^2.2.250",
"@iconify/tailwind": "^1.1.3",
"@tailwindcss/nesting": "0.0.0-insiders.565cd3e",
"@tailwindcss/typography": "^0.5.15",
Expand Down
4 changes: 2 additions & 2 deletions internal/vite-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
"@types/archiver": "^6.0.2",
"@types/html-minifier-terser": "^7.0.2",
"@vben/node-utils": "workspace:*",
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue": "^5.1.4",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"dayjs": "^1.11.13",
"dotenv": "^16.4.5",
"rollup": "^4.21.3",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.78.0",
"sass": "^1.79.1",
"vite": "^5.4.6",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-dts": "4.2.1",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
"@vben/turbo-run": "workspace:*",
"@vben/vite-config": "workspace:*",
"@vben/vsh": "workspace:*",
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue": "^5.1.4",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"@vue/test-utils": "^2.4.6",
"autoprefixer": "^10.4.20",
"cross-env": "^7.0.3",
"cspell": "^8.14.3",
"cspell": "^8.14.4",
"husky": "^9.1.6",
"is-ci": "^3.0.1",
"jsdom": "^25.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,11 @@ function calcMenuWidthStyle(isHiddenDom: boolean): CSSProperties {
};
}

function handleMouseenter() {
function handleMouseenter(e: MouseEvent) {
if (e?.offsetX < 10) {
return;
}

// 未开启和未折叠状态不生效
if (expandOnHover.value) {
return;
Expand Down
Loading