by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

Browse Source
This commit is contained in:
dap
2024-08-25 12:53:39 +08:00
parent f0447d0b8c edb55b1fc0
commit d9360a4291
84 changed files with 6080 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@core/base/design/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/design",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

4
packages/@core/base/icons/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/icons",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
@@ -35,7 +35,7 @@
},
"dependencies": {
"@iconify/vue": "^4.1.2",
"lucide-vue-next": "^0.429.0",
"lucide-vue-next": "^0.435.0",
"vue": "^3.4.38"
}
}

2
packages/@core/base/shared/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/shared",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/base/typings/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/typings",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/composables/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/composables",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/preferences/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/preferences",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/ui-kit/layout-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/layout-ui",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/ui-kit/menu-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/menu-ui",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

4
packages/@core/ui-kit/shadcn-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/shadcn-ui",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
@@ -48,7 +48,7 @@
"@vben-core/typings": "workspace:*",
"@vueuse/core": "^11.0.1",
"class-variance-authority": "^0.7.0",
"lucide-vue-next": "^0.429.0",
"lucide-vue-next": "^0.435.0",
"radix-vue": "^1.9.4",
"vue": "^3.4.38"
}

2
packages/@core/ui-kit/tabs-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/tabs-ui",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/constants/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/constants",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/access/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/access",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/chart-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/chart-ui",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/common-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/common-ui",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

10
packages/effects/common-ui/src/ui/dashboard/analysis/analysis-overview.vue
View File

@@ -25,13 +25,9 @@ withDefaults(defineProps<Props>(), {
</script>
<template>
<div class="md:flex">
<template v-for="(item, index) in items" :key="item.title">
<Card
:class="{ 'md:mr-4': index + 1 < 4 }"
:title="item.title"
class="mt-5 w-full md:mt-0 md:w-1/4"
>
<div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4">
<template v-for="item in items" :key="item.title">
<Card :title="item.title" class="w-full">
<CardHeader>
<CardTitle class="text-xl">{{ item.title }}</CardTitle>
</CardHeader>

2
packages/effects/hooks/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/hooks",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/layouts/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/layouts",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/layouts/src/authentication/authentication.vue
View File

@@ -57,7 +57,7 @@ const logoSource = computed(() => preferences.logo.source);
</div>
</div>
<!-- 中间内容 -->
<!-- 系统介绍 -->
<div v-if="!authPanelCenter" class="relative hidden w-0 flex-1 lg:block">
<div class="absolute inset-0 h-full w-full bg-[#070709]">
<div class="login-background absolute left-0 top-0 size-full"></div>

4
packages/effects/request/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/request",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
@@ -22,7 +22,7 @@
"dependencies": {
"@vben/locales": "workspace:*",
"@vben/utils": "workspace:*",
"axios": "^1.7.4"
"axios": "^1.7.5"
},
"devDependencies": {
"axios-mock-adapter": "^2.0.0"

2
packages/icons/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/icons",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

51
packages/icons/src/svg/load.ts
View File

@@ -1,7 +1,4 @@
import {
addIcon,
// addCollection
} from '@vben-core/icons';
import { addIcon, type IconifyIcon } from '@vben-core/icons';
let loaded = false;
if (!loaded) {
@@ -9,32 +6,36 @@ if (!loaded) {
loaded = true;
}
// addCollection({
// prefix: 'mdi',
// icons: {
// 'account-box': {
// body: '<path d="M6 17c0-2 4-3.1 6-3.1s6 1.1 6 3.1v1H6m9-9a3 3 0 0 1-3 3a3 3 0 0 1-3-3a3 3 0 0 1 3-3a3 3 0 0 1 3 3M3 5v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2z" fill="currentColor"/>',
// },
// 'account-cash': {
// body: '<path d="M11 8c0 2.21-1.79 4-4 4s-4-1.79-4-4s1.79-4 4-4s4 1.79 4 4m0 6.72V20H0v-2c0-2.21 3.13-4 7-4c1.5 0 2.87.27 4 .72M24 20H13V3h11v17m-8-8.5a2.5 2.5 0 0 1 5 0a2.5 2.5 0 0 1-5 0M22 7a2 2 0 0 1-2-2h-3c0 1.11-.89 2-2 2v9a2 2 0 0 1 2 2h3c0-1.1.9-2 2-2V7z" fill="currentColor"/>',
// },
// 'account': {
// body: '<path d="M12 4a4 4 0 0 1 4 4a4 4 0 0 1-4 4a4 4 0 0 1-4-4a4 4 0 0 1 4-4m0 10c4.42 0 8 1.79 8 4v2H4v-2c0-2.21 3.58-4 8-4z" fill="currentColor"/>',
// },
// 'home': {
// body: '<path d="M10 20v-6h4v6h5v-8h3L12 3L2 12h3v8h5z" fill="currentColor"/>',
// },
// },
// width: 24,
// height: 24,
// });
function parseSvg(svgData: string): IconifyIcon {
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(svgData, 'image/svg+xml');
const svgElement = xmlDoc.documentElement;
const svgContent = [...svgElement.childNodes]
.filter((node) => node.nodeType === Node.ELEMENT_NODE)
.map((node) => new XMLSerializer().serializeToString(node))
.join('');
const viewBoxValue = svgElement.getAttribute('viewBox') || '';
const [left, top, width, height] = viewBoxValue.split(' ').map((val) => {
const num = Number(val);
return Number.isNaN(num) ? undefined : num;
});
return {
body: svgContent,
height,
left,
top,
width,
};
}
/**
* 自定义的svg图片转化为组件
* @example ./svg/avatar.svg
* <Icon icon="svg:avatar"></Icon>
*/
async function loadSvgIcons() {
const svgEagers = import.meta.glob('./icons/**', {
eager: true,
@@ -51,7 +52,7 @@ async function loadSvgIcons() {
const iconName = key.slice(start, end);
return addIcon(`svg:${iconName}`, {
body: typeof body === 'object' ? body.default : body,
...parseSvg(typeof body === 'object' ? body.default : body),
});
}),
);

2
packages/locales/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/locales",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/preferences/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/preferences",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/stores/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/stores",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/styles/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/styles",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/types/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/types",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/utils/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/utils",
"version": "5.1.1",
"version": "5.1.2",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {