Commit 854e5aea by lijiabin

【需求 25171】styles: 查看权限输入框撑满整行,视频推送选人输入框移到单选下方

parent cf9ae590
<template> <template>
<!-- 触发区完全交给调用方自己写(长度、placeholder 等都自己控制),这里只负责点击打开弹窗。 --> <!-- 触发区完全交给调用方自己写(长度、placeholder 等都自己控制),这里只负责点击打开弹窗。
<div class="inline-block" :class="{ 'cursor-not-allowed': disabled }" @click="open"> 组件有两个根节点,class 等属性不会自动落到外层,这里手动挂到触发区上:
想让触发区撑满一行就在组件上写 class="w-full" -->
<div
v-bind="$attrs"
class="inline-block"
:class="{ 'cursor-not-allowed': disabled }"
@click="open"
>
<slot :echo-text="echoText" /> <slot :echo-text="echoText" />
</div> </div>
<DepartmentUserModal ref="modalRef" @confirm="handleConfirm" /> <DepartmentUserModal ref="modalRef" @confirm="handleConfirm" />
...@@ -52,6 +59,8 @@ const { ...@@ -52,6 +59,8 @@ const {
valueType = 'array', valueType = 'array',
} = defineProps<DeptUserPickerProps>() } = defineProps<DeptUserPickerProps>()
defineOptions({ inheritAttrs: false })
const emit = defineEmits<{ const emit = defineEmits<{
confirm: [items: DepartmentUserSelection[]] confirm: [items: DepartmentUserSelection[]]
}>() }>()
......
...@@ -303,6 +303,7 @@ const handleSubmitPermission = async () => { ...@@ -303,6 +303,7 @@ const handleSubmitPermission = async () => {
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<DeptUserPicker <DeptUserPicker
class="w-full"
v-model:dept-value="permissionDeptIds" v-model:dept-value="permissionDeptIds"
v-model:user-value="permissionUserIds" v-model:user-value="permissionUserIds"
selection-mode="both" selection-mode="both"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<!-- 查看权限:不选就是所有人可见,选了部门/人员之后只有被选中的能看到,本人和管理员都能改 --> <!-- 查看权限:不选就是所有人可见,选了部门/人员之后只有被选中的能看到,本人和管理员都能改 -->
<el-form-item label="查看权限"> <el-form-item label="查看权限">
<DeptUserPicker <DeptUserPicker
class="w-full"
v-model:dept-value="permissionDeptIds" v-model:dept-value="permissionDeptIds"
v-model:user-value="permissionUserIds" v-model:user-value="permissionUserIds"
selection-mode="both" selection-mode="both"
......
...@@ -179,30 +179,28 @@ ...@@ -179,30 +179,28 @@
<div class="mb-8"> <div class="mb-8">
<el-form-item> <el-form-item>
<label class="block text-sm font-semibold text-gray-700 mb-3"> 推送对象 </label> <label class="block text-sm font-semibold text-gray-700 mb-3"> 推送对象 </label>
<div class="w-full flex items-center gap-2"> <div class="w-full">
<el-radio-group v-model="form.isPushAll"> <el-radio-group v-model="form.isPushAll">
<el-radio :value="BooleanFlag.YES">全员</el-radio> <el-radio :value="BooleanFlag.YES">全员</el-radio>
<el-radio :value="BooleanFlag.NO">指定部门/人员</el-radio> <el-radio :value="BooleanFlag.NO">指定部门/人员</el-radio>
</el-radio-group> </el-radio-group>
<div </div>
v-show="form.isPushAll === BooleanFlag.NO" <!-- 选人输入框单独放一行,跟帖子/专栏等发布页的推送设置保持一致 -->
class="flex items-center gap-2" <div v-show="form.isPushAll === BooleanFlag.NO" class="w-full mt-2">
<DeptUserPicker
v-model:dept-value="pushDeptIds"
v-model:user-value="pushUserIds"
selection-mode="both"
@confirm="(items) => (pushSelection = items)"
v-slot="{ echoText }"
> >
<DeptUserPicker <el-input
v-model:dept-value="pushDeptIds" readonly
v-model:user-value="pushUserIds" class="w-80 cursor-pointer"
selection-mode="both" placeholder="请选择部门/人员"
@confirm="(items) => (pushSelection = items)" :model-value="echoText"
v-slot="{ echoText }" />
> </DeptUserPicker>
<el-input
readonly
class="w-80 cursor-pointer"
placeholder="请选择部门/人员"
:model-value="echoText"
/>
</DeptUserPicker>
</div>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment