Merge branch 'wwt'
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run

This commit is contained in:
wwt 2025-03-13 10:09:18 +08:00
commit f6ce053787

View File

@ -35,6 +35,7 @@
<div class="text-[#000000] text-[32rpx] <div class="text-[#000000] text-[32rpx]
font-bold opacity-90 name_text"> font-bold opacity-90 name_text">
{{ formatNameText(props.data.name) }} {{ formatNameText(props.data.name) }}
<span v-if="props.data.group_member_num > 0">{{props.data.group_member_num}}</span>
<span v-if="props.data.group_type === 2" class="depTag tag"> <span v-if="props.data.group_type === 2" class="depTag tag">
部门 部门
</span> </span>
@ -111,7 +112,7 @@ const props = defineProps({
}); });
// //
const formatNameText = (text, maxLength = 19) => { const formatNameText = (text, maxLength = 16) => {
return text.length > maxLength ? `${text.slice(0, maxLength - 1)}...` : text; return text.length > maxLength ? `${text.slice(0, maxLength - 1)}...` : text;
}; };
@ -191,7 +192,7 @@ const handleDelete = () => {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
text-align: center; text-align: center;
margin-left: 10rpx; // margin-left: 10rpx;
margin-top: 4rpx; margin-top: 4rpx;
vertical-align: top; vertical-align: top;
height: 38rpx; height: 38rpx;