Skip to content

Commit 803f4d6

Browse files
pangyajun123pangyajun123
authored
Merge branch 'main' into main
2 parents a60163c + b9aef61 commit 803f4d6

File tree

39 files changed

+107
-44
lines changed

39 files changed

+107
-44
lines changed

‎apps/web-antd/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/web-antd",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://vben.pro",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎apps/web-ele/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/web-ele",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://vben.pro",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎apps/web-naive/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/web-naive",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://vben.pro",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/docs",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"private": true,
55
"scripts": {
66
"build": "vitepress build",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/commitlint-config",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
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/stylelint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/stylelint-config",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/node-utils",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/tailwind-config",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎internal/tsconfig/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/tsconfig",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"private": true,
55
"homepage": "https://github.com/vbenjs/vue-vben-admin",
66
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vben-admin-monorepo",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"private": true,
55
"keywords": [
66
"monorepo",

‎packages/@core/base/design/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/design",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/base/icons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/icons",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/base/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/shared",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/base/typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/typings",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/composables/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/composables",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/preferences/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/preferences",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/form-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/form-ui",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/layout-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/layout-ui",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/menu-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/menu-ui",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/@core/ui-kit/shadcn-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/shadcn-ui",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"#main": "./dist/index.mjs",
55
"#module": "./dist/index.mjs",
66
"homepage": "https://github.com/vbenjs/vue-vben-admin",

‎packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,25 @@ export type ValueType = boolean | number | string;
2929

3030
export interface VbenButtonGroupProps
3131
extends Pick<VbenButtonProps, 'disabled'> {
32+
/** 单选模式下允许清除选中 */
33+
allowClear?: boolean;
34+
/** 值改变前的回调 */
3235
beforeChange?: (
3336
value: ValueType,
3437
isChecked: boolean,
3538
) => boolean | PromiseLike<boolean | undefined> | undefined;
39+
/** 按钮样式 */
3640
btnClass?: any;
41+
/** 按钮间隔距离 */
3742
gap?: number;
43+
/** 多选模式下限制最多选择的数量。0表示不限制 */
44+
maxCount?: number;
45+
/** 是否允许多选 */
3846
multiple?: boolean;
47+
/** 选项 */
3948
options?: { [key: string]: any; label: CustomRenderType; value: ValueType }[];
49+
/** 显示图标 */
4050
showIcon?: boolean;
51+
/** 尺寸 */
4152
size?: 'large' | 'middle' | 'small';
4253
}

‎packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ const props = withDefaults(defineProps<VbenButtonGroupProps>(), {
1919
multiple: false,
2020
showIcon: true,
2121
size: 'middle',
22+
allowClear: false,
23+
maxCount: 0,
2224
});
2325
const emit = defineEmits(['btnClick']);
2426
const btnDefaultProps = computed(() => {
@@ -82,12 +84,22 @@ async function onBtnClick(value: ValueType) {
8284
if (innerValue.value.includes(value)) {
8385
innerValue.value = innerValue.value.filter((item) => item !== value);
8486
} else {
87+
if (props.maxCount > 0 && innerValue.value.length >= props.maxCount) {
88+
innerValue.value = innerValue.value.slice(0, props.maxCount - 1);
89+
}
8590
innerValue.value.push(value);
8691
}
8792
modelValue.value = innerValue.value;
8893
} else {
89-
innerValue.value = [value];
90-
modelValue.value = value;
94+
if (props.allowClear && innerValue.value.includes(value)) {
95+
innerValue.value = [];
96+
modelValue.value = undefined;
97+
emit('btnClick', undefined);
98+
return;
99+
} else {
100+
innerValue.value = [value];
101+
modelValue.value = value;
102+
}
91103
}
92104
emit('btnClick', value);
93105
}
@@ -112,12 +124,18 @@ async function onBtnClick(value: ValueType) {
112124
@click="onBtnClick(btn.value)"
113125
>
114126
<div class="icon-wrapper" v-if="props.showIcon">
115-
<LoaderCircle
116-
class="animate-spin"
117-
v-if="loadingValues.includes(btn.value)"
118-
/>
119-
<CircleCheckBig v-else-if="innerValue.includes(btn.value)" />
120-
<Circle v-else />
127+
<slot
128+
name="icon"
129+
:loading="loadingValues.includes(btn.value)"
130+
:checked="innerValue.includes(btn.value)"
131+
>
132+
<LoaderCircle
133+
class="animate-spin"
134+
v-if="loadingValues.includes(btn.value)"
135+
/>
136+
<CircleCheckBig v-else-if="innerValue.includes(btn.value)" />
137+
<Circle v-else />
138+
</slot>
121139
</div>
122140
<slot name="option" :label="btn.label" :value="btn.value" :data="btn">
123141
<VbenRenderContent :content="btn.label" />

‎packages/@core/ui-kit/tabs-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben-core/tabs-ui",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/constants/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/constants",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/access/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/access",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/common-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/common-ui",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/hooks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/hooks",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/layouts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/layouts",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/effects/request/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/request",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/icons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/icons",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/locales/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/locales",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/preferences/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/preferences",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/stores/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/stores",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/styles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/styles",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/types",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎packages/utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/utils",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://github.com/vbenjs/vue-vben-admin",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

‎playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vben/playground",
3-
"version": "5.5.6",
3+
"version": "5.5.7",
44
"homepage": "https://vben.pro",
55
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
66
"repository": {

0 commit comments

Comments
 (0)