Skip to content

Commit 35c8d7c

Browse files
likui628likui628
authored
Merge branch 'main' into page-comp
2 parents 3ff8f9e + ec49a04 commit 35c8d7c

File tree

67 files changed

+1166
-685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1166
-685
lines changed

‎.github/release-drafter.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ categories:
1717
- title: "🐞 Bug Fixes"
1818
labels:
1919
- "bug"
20-
- title: 📝 Documentation updates
20+
- title: 📝 Documentation
2121
labels:
2222
- "documentation"
2323
- title: 👻 Maintenance
2424
labels:
25+
- "perf"
2526
- "chore"
2627
- "dependencies"
2728
collapse-after: 5
@@ -34,12 +35,16 @@ categories:
3435
version-resolver:
3536
major:
3637
labels:
38+
- "major"
3739
- "breaking"
3840
minor:
3941
labels:
40-
- "feature"
42+
- "minor"
43+
# - "feature"
4144
patch:
4245
labels:
46+
- "patch"
47+
- "feature"
4348
- "bug"
4449
- "maintenance"
4550
- "docs"

‎.vscode/launch.json

+18
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,24 @@
1010
"env": { "NODE_ENV": "development" },
1111
"sourceMaps": true,
1212
"webRoot": "${workspaceFolder}/apps/web-antd/src"
13+
},
14+
{
15+
"type": "chrome",
16+
"name": "vben admin ele dev",
17+
"request": "launch",
18+
"url": "http://localhost:5666",
19+
"env": { "NODE_ENV": "development" },
20+
"sourceMaps": true,
21+
"webRoot": "${workspaceFolder}/apps/web-ele/src"
22+
},
23+
{
24+
"type": "chrome",
25+
"name": "vben admin naive dev",
26+
"request": "launch",
27+
"url": "http://localhost:5777",
28+
"env": { "NODE_ENV": "development" },
29+
"sourceMaps": true,
30+
"webRoot": "${workspaceFolder}/apps/web-naive/src"
1331
}
1432
]
1533
}

‎.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
"*.env": "$(capture).env.*",
184184
"README.md": "README*,CHANGELOG*,LICENSE,CNAME",
185185
"package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,.gitattributes,.gitignore,.gitpod.yml,.npmrc,.browserslistrc,.node-version,.git*,.tazerc.json",
186-
"Dockerfile": "Dockerfile,.docker*,docker-entrypoint.sh,build-local-docker*",
186+
"Dockerfile": "Dockerfile,.docker*,docker-entrypoint.sh,build-local-docker*,nginx.conf",
187187
"eslint.config.mjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,stylelint.config.*,.lintstagedrc.mjs,.ls-lint*,cspell.json",
188188
"tailwind.config.mjs": "postcss.*"
189189
},

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ FROM nginx:stable-alpine as production
2323
RUN echo "types { application/javascript js mjs; }" > /etc/nginx/conf.d/mjs.conf
2424
COPY --from=builder /app/apps/web-antd/dist /usr/share/nginx/html
2525

26-
COPY ./deploy/nginx.conf /etc/nginx/nginx.conf
26+
COPY ./nginx.conf /etc/nginx/nginx.conf
2727

2828
EXPOSE 8080
2929

‎apps/web-antd/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/web-antd",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"homepage": "https://vben.pro",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {
@@ -40,11 +40,11 @@
4040
"@vben/styles": "workspace:*",
4141
"@vben/types": "workspace:*",
4242
"@vben/utils": "workspace:*",
43-
"@vueuse/core": "^10.11.0",
43+
"@vueuse/core": "^10.11.1",
4444
"ant-design-vue": "^4.2.3",
4545
"dayjs": "^1.11.12",
46-
"pinia": "2.2.0",
47-
"vue": "^3.4.36",
46+
"pinia": "2.2.1",
47+
"vue": "^3.4.37",
4848
"vue-router": "^4.4.3"
4949
}
5050
}

‎apps/web-antd/src/locales/langs/en-US.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
"title": "Active Menu Icon",
3838
"children": "Children Active Icon"
3939
},
40-
"fallback": { "title": "Fallback Page" },
40+
"fallback": {
41+
"title": "Fallback Page"
42+
},
4143
"features": {
4244
"title": "Features",
4345
"hideChildrenInMenu": "Hide Menu Children",
@@ -54,6 +56,12 @@
5456
"level": "Level Mode",
5557
"levelDetail": "Level Mode Detail"
5658
}
59+
},
60+
"examples": {
61+
"title": "Examples",
62+
"ellipsis": {
63+
"title": "EllipsisText"
64+
}
5765
}
5866
}
5967
}

‎apps/web-antd/src/locales/langs/zh-CN.json

+6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
"levelDetail": "层级模式详情",
5757
"lateralDetail": "平级模式详情"
5858
}
59+
},
60+
"examples": {
61+
"title": "示例",
62+
"ellipsis": {
63+
"title": "文本省略"
64+
}
5965
}
6066
}
6167
}

‎apps/web-antd/src/router/routes/modules/examples.ts

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import type { RouteRecordRaw } from 'vue-router';
2+
3+
import { BasicLayout } from '#/layouts';
4+
import { $t } from '#/locales';
5+
6+
const routes: RouteRecordRaw[] = [
7+
{
8+
component: BasicLayout,
9+
meta: {
10+
icon: 'ion:layers-outline',
11+
keepAlive: true,
12+
order: 1000,
13+
title: $t('page.examples.title'),
14+
},
15+
name: 'Examples',
16+
path: '/examples',
17+
children: [
18+
{
19+
name: 'EllipsisDemo',
20+
path: '/examples/ellipsis',
21+
component: () => import('#/views/examples/ellipsis/index.vue'),
22+
meta: {
23+
title: $t('page.examples.ellipsis.title'),
24+
},
25+
},
26+
],
27+
},
28+
];
29+
30+
export default routes;

‎apps/web-antd/src/views/examples/ellipsis/data.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export const longText: string =
2+
'Vben Admin 是一个基于 Vue3.0、Vite、 TypeScript 的后台解决方案，目标是为开发中大型项目提供开箱即用的解决方案。包括二次封装组件、utils、hooks、动态菜单、权限校验、多主题配置、按钮级别权限控制等功能。项目会使用前端较新的技术栈，可以作为项目的启动模版，以帮助你快速搭建企业级中后台产品原型。也可以作为一个示例，用于学习 vue3、vite、ts 等主流技术。该项目会持续跟进最新技术，并将其应用在项目中。Vben Admin 是一个基于 Vue3.0、Vite、 TypeScript 的后台解决方案，目标是为开发中大型项目提供开箱即用的解决方案。包括二次封装组件、utils、hooks、动态菜单、权限校验、多主题配置、按钮级别权限控制等功能。项目会使用前端较新的技术栈，可以作为项目的启动模版，以帮助你快速搭建企业级中后台产品原型。也可以作为一个示例，用于学习 vue3、vite、ts 等主流技术。该项目会持续跟进最新技术，并将其应用在项目中。Vben Admin 是一个基于 Vue3.0、Vite、 TypeScript 的后台解决方案，目标是为开发中大型项目提供开箱即用的解决方案。包括二次封装组件、utils、hooks、动态菜单、权限校验、多主题配置、按钮级别权限控制等功能。项目会使用前端较新的技术栈，可以作为项目的启动模版，以帮助你快速搭建企业级中后台产品原型。也可以作为一个示例，用于学习 vue3、vite、ts 等主流技术。该项目会持续跟进最新技术，并将其应用在项目中。Vben Admin 是一个基于 Vue3.0、Vite、 TypeScript 的后台解决方案，目标是为开发中大型项目提供开箱即用的解决方案。包括二次封装组件、utils、hooks、动态菜单、权限校验、多主题配置、按钮级别权限控制等功能。项目会使用前端较新的技术栈，可以作为项目的启动模版，以帮助你快速搭建企业级中后台产品原型。也可以作为一个示例，用于学习 vue3、vite、ts 等主流技术。该项目会持续跟进最新技术，并将其应用在项目中。';

‎apps/web-antd/src/views/examples/ellipsis/index.vue

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<script lang="ts" setup>
2+
import { ref } from 'vue';
3+
4+
import { EllipsisText } from '@vben/common-ui';
5+
6+
import { Collapse, CollapsePanel } from 'ant-design-vue';
7+
8+
import { longText } from './data';
9+
10+
const text = ref(longText);
11+
const activeKey = ref(['1', '2', '3', '4']);
12+
</script>
13+
14+
<template>
15+
<div class="card-box p-5">
16+
<h1 class="mb-5 text-xl font-semibold">文本省略示例</h1>
17+
<div>
18+
<Collapse v-model:activeKey="activeKey">
19+
<CollapsePanel key="1" header="Ellipsis 基本使用">
20+
<EllipsisText :max-width="240">{{ text }}</EllipsisText>
21+
</CollapsePanel>
22+
<CollapsePanel key="2" header="Ellipsis 多行省略">
23+
<EllipsisText :line="2">{{ text }}</EllipsisText>
24+
</CollapsePanel>
25+
<CollapsePanel key="3" header="Ellipsis 点击展开">
26+
<EllipsisText :line="3" expand>{{ text }}</EllipsisText>
27+
</CollapsePanel>
28+
<CollapsePanel key="4" header="Ellipsis 定制 Tooltip 内容">
29+
<EllipsisText :max-width="240">
30+
住在我心里孤独的 孤独的海怪 痛苦之王 开始厌倦 深海的光 停滞的海浪
31+
<template #tooltip>
32+
<div style="text-align: center">
33+
《秦皇岛》<br />住在我心里孤独的<br />孤独的海怪 痛苦之王<br />开始厌倦
34+
深海的光 停滞的海浪
35+
</div>
36+
</template>
37+
</EllipsisText>
38+
</CollapsePanel>
39+
</Collapse>
40+
</div>
41+
</div>
42+
</template>

‎apps/web-ele/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/web-ele",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"homepage": "https://vben.pro",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {
@@ -40,11 +40,11 @@
4040
"@vben/styles": "workspace:*",
4141
"@vben/types": "workspace:*",
4242
"@vben/utils": "workspace:*",
43-
"@vueuse/core": "^10.11.0",
43+
"@vueuse/core": "^10.11.1",
4444
"dayjs": "^1.11.12",
45-
"element-plus": "^2.7.8",
46-
"pinia": "2.2.0",
47-
"vue": "^3.4.36",
45+
"element-plus": "^2.8.0",
46+
"pinia": "2.2.1",
47+
"vue": "^3.4.37",
4848
"vue-router": "^4.4.3"
4949
},
5050
"devDependencies": {

‎apps/web-naive/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/web-naive",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"homepage": "https://vben.pro",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {
@@ -40,10 +40,10 @@
4040
"@vben/styles": "workspace:*",
4141
"@vben/types": "workspace:*",
4242
"@vben/utils": "workspace:*",
43-
"@vueuse/core": "^10.11.0",
43+
"@vueuse/core": "^10.11.1",
4444
"naive-ui": "^2.39.0",
45-
"pinia": "2.2.0",
46-
"vue": "^3.4.36",
45+
"pinia": "2.2.1",
46+
"vue": "^3.4.37",
4747
"vue-router": "^4.4.3"
4848
}
4949
}

‎docs/.vitepress/theme/plugins/hm.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ function registerAnalytics() {
2323

2424
export function initHmPlugin() {
2525
if (inBrowser && import.meta.env.PROD) {
26-
registerAnalytics(SITE_ID);
26+
registerAnalytics();
2727
}
2828
}

‎docs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/docs",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"private": true,
55
"scripts": {
66
"build": "vitepress build",
@@ -13,6 +13,6 @@
1313
"devDependencies": {
1414
"@vite-pwa/vitepress": "^0.5.0",
1515
"vitepress": "^1.3.2",
16-
"vue": "^3.4.36"
16+
"vue": "^3.4.37"
1717
}
1818
}

‎internal/lint-configs/commitlint-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/commitlint-config",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/lint-configs/eslint-config/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"eslint-plugin-jsonc": "^2.16.0",
4444
"eslint-plugin-n": "^17.10.2",
4545
"eslint-plugin-no-only-tests": "^3.1.0",
46-
"eslint-plugin-perfectionist": "^3.1.2",
46+
"eslint-plugin-perfectionist": "^3.1.3",
4747
"eslint-plugin-prettier": "^5.2.1",
4848
"eslint-plugin-regexp": "^2.6.0",
4949
"eslint-plugin-unicorn": "^55.0.0",
50-
"eslint-plugin-unused-imports": "^4.0.1",
50+
"eslint-plugin-unused-imports": "^4.1.2",
5151
"eslint-plugin-vitest": "^0.5.4",
5252
"eslint-plugin-vue": "^9.27.0",
5353
"globals": "^15.9.0",

‎internal/lint-configs/eslint-config/src/custom-config.ts

+8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ const customConfig: Linter.Config[] = [
1414
'vue/require-default-prop': 'off',
1515
},
1616
},
17+
{
18+
files: ['packages/effects/**/**', 'packages/types/**/**'],
19+
ignores: restrictedImportIgnores,
20+
rules: {
21+
'perfectionist/sort-interfaces': 'off',
22+
},
23+
},
1724
{
1825
// apps内部的一些基础规则
1926
files: ['apps/**/**'],
@@ -46,6 +53,7 @@ const customConfig: Linter.Config[] = [
4653
],
4754
},
4855
],
56+
'perfectionist/sort-interfaces': 'off',
4957
},
5058
},
5159
{

‎internal/lint-configs/prettier-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
},
2424
"dependencies": {
2525
"prettier": "^3.3.3",
26-
"prettier-plugin-tailwindcss": "^0.6.5"
26+
"prettier-plugin-tailwindcss": "^0.6.6"
2727
}
2828
}

‎internal/lint-configs/stylelint-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/stylelint-config",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/node-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/node-utils",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/tailwind-config/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/tailwind-config",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
@@ -46,17 +46,17 @@
4646
"tailwindcss": "^3.4.3"
4747
},
4848
"dependencies": {
49-
"@iconify/json": "^2.2.234",
49+
"@iconify/json": "^2.2.235",
5050
"@iconify/tailwind": "^1.1.2",
5151
"@tailwindcss/nesting": "0.0.0-insiders.565cd3e",
52-
"@tailwindcss/typography": "^0.5.13",
52+
"@tailwindcss/typography": "^0.5.14",
5353
"autoprefixer": "^10.4.20",
54-
"cssnano": "^7.0.4",
54+
"cssnano": "^7.0.5",
5555
"postcss": "^8.4.41",
5656
"postcss-antd-fixes": "^0.2.0",
5757
"postcss-import": "^16.1.0",
5858
"postcss-preset-env": "^10.0.0",
59-
"tailwindcss": "^3.4.7",
59+
"tailwindcss": "^3.4.9",
6060
"tailwindcss-animate": "^1.0.7"
6161
},
6262
"devDependencies": {

‎internal/tsconfig/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/tsconfig",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
@@ -20,6 +20,6 @@
2020
],
2121
"dependencies": {
2222
"@vben/types": "workspace:*",
23-
"vite": "^5.3.5"
23+
"vite": "^5.4.0"
2424
}
2525
}

0 commit comments

Comments
 (0)