jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复正则校验问题

Browse Source
This commit is contained in:
xlsea
2025-04-24 18:21:53 +08:00
parent ed875f7786
commit e381db8ba7
7 changed files with 39 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/components/custom/button-icon.vue
View File

@ -19,6 +19,8 @@ interface Props {
tooltipContent?: string;
/** Tooltip placement */
tooltipPlacement?: PopoverPlacement;
/** Popconfirm content */
popconfirmContent?: string;
zIndex?: number;
quaternary?: boolean;
[key: string]: any;
@ -30,10 +32,17 @@ const props = withDefaults(defineProps<Props>(), {
localIcon: '',
tooltipContent: '',
tooltipPlacement: 'bottom',
popconfirmContent: '',
zIndex: 98,
quaternary: true
});
interface Emits {
(e: 'positiveClick'): void;
}
const emit = defineEmits<Emits>();
const DEFAULT_CLASS = 'h-[36px] text-icon';
const attrs: ButtonProps = useAttrs();
@ -41,19 +50,33 @@ const attrs: ButtonProps = useAttrs();
const quaternary = computed(() => {
return !(attrs.text || attrs.dashed || attrs.ghost) && props.quaternary;
});
const handlePositiveClick = () => {
emit('positiveClick');
};
</script>
<template>
<NTooltip :placement="tooltipPlacement" :z-index="zIndex" :disabled="!tooltipContent">
<template #trigger>
<NButton :quaternary="quaternary" :class="twMerge(DEFAULT_CLASS, props.class)" :focusable="false" v-bind="attrs">
<div class="flex-center gap-8px">
<slot>
<SvgIcon v-if="icon" :icon="icon" />
<SvgIcon v-else :local-icon="localIcon" />
</slot>
</div>
</NButton>
<NPopconfirm :disabled="!popconfirmContent" @positive-click="handlePositiveClick">
{{ popconfirmContent }}
<template #trigger>
<NButton
:quaternary="quaternary"
:class="twMerge(DEFAULT_CLASS, props.class)"
:focusable="false"
v-bind="attrs"
>
<div class="flex-center gap-8px">
<slot>
<SvgIcon v-if="icon" :icon="icon" />
<SvgIcon v-else :local-icon="localIcon" />
</slot>
</div>
</NButton>
</template>
</NPopconfirm>
</template>
{{ tooltipContent }}
</NTooltip>

85
src/components/custom/button-popconfirm.vue
View File

@ -1,85 +0,0 @@
<script setup lang="ts">
import { computed, useAttrs } from 'vue';
import type { ButtonProps, PopoverPlacement } from 'naive-ui';
import { twMerge } from 'tailwind-merge';
defineOptions({
name: 'ButtonPopconfirm',
inheritAttrs: false
});
interface Props {
/** Button class */
class?: string;
/** Iconify icon name */
icon?: string;
/** Local icon name */
localIcon?: string;
/** Tooltip content */
tooltipContent?: string;
/** Tooltip placement */
tooltipPlacement?: PopoverPlacement;
/** Popconfirm content */
popconfirmContent?: string;
zIndex?: number;
quaternary?: boolean;
[key: string]: any;
}
const props = withDefaults(defineProps<Props>(), {
class: '',
icon: '',
localIcon: '',
tooltipContent: '',
tooltipPlacement: 'bottom',
popconfirmContent: '',
zIndex: 98,
quaternary: true
});
interface Emits {
(e: 'positiveClick'): void;
}
const emit = defineEmits<Emits>();
const DEFAULT_CLASS = 'h-[36px] text-icon';
const attrs: ButtonProps = useAttrs();
const quaternary = computed(() => {
return !(attrs.text || attrs.dashed || attrs.ghost) && props.quaternary;
});
const handlePositiveClick = () => {
emit('positiveClick');
};
</script>
<template>
<NTooltip :placement="tooltipPlacement" :z-index="zIndex" :disabled="!tooltipContent">
<template #trigger>
<NPopconfirm :disabled="!popconfirmContent" @positive-click="handlePositiveClick">
{{ popconfirmContent }}
<template #trigger>
<NButton
:quaternary="quaternary"
:class="twMerge(DEFAULT_CLASS, props.class)"
:focusable="false"
v-bind="attrs"
>
<div class="flex-center gap-8px">
<slot>
<SvgIcon v-if="icon" :icon="icon" />
<SvgIcon v-else :local-icon="localIcon" />
</slot>
</div>
</NButton>
</template>
</NPopconfirm>
</template>
{{ tooltipContent }}
</NTooltip>
</template>
<style scoped></style>