Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev
This commit is contained in:
@@ -37,6 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
|
||||
},
|
||||
rules: 'required',
|
||||
},
|
||||
// TODO @xingyu:测试有问题
|
||||
{
|
||||
fieldName: 'content',
|
||||
label: '公告内容',
|
||||
@@ -54,6 +55,7 @@ export function useFormSchema(): VbenFormSchema[] {
|
||||
},
|
||||
rules: z.number().default(CommonStatusEnum.ENABLE),
|
||||
},
|
||||
// TODO @xingyu:测试有问题
|
||||
{
|
||||
fieldName: 'remark',
|
||||
label: '备注',
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts" setup>
|
||||
// TODO @xingyu:这个展示不出来;从右上角的站内信点进来的
|
||||
import type { SystemNotifyMessageApi } from '#/api/system/notify/message';
|
||||
|
||||
import { ref } from 'vue';
|
||||
|
||||
@@ -37,6 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
|
||||
label: '租户套餐',
|
||||
component: 'ApiSelect',
|
||||
componentProps: {
|
||||
// TODO @xingyu:系统租户的情况
|
||||
api: () => getTenantPackageList(),
|
||||
labelField: 'name',
|
||||
valueField: 'id',
|
||||
@@ -149,6 +150,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
|
||||
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
|
||||
},
|
||||
},
|
||||
// TODO @xingyu:时间检索,有问题
|
||||
{
|
||||
fieldName: 'createTime',
|
||||
label: '创建时间',
|
||||
|
||||
@@ -333,10 +333,12 @@ export function useGridColumns<T = SystemUserApi.User>(
|
||||
code: 'edit',
|
||||
show: hasAccessByCodes(['system:user:update']),
|
||||
},
|
||||
// TODO @xingyu:删除一直弹出来
|
||||
{
|
||||
code: 'delete',
|
||||
show: hasAccessByCodes(['system:user:delete']),
|
||||
},
|
||||
// TODO @xingyu:后面的按钮,无法展示
|
||||
{
|
||||
code: 'assign-role',
|
||||
text: '分配角色',
|
||||
|
||||
@@ -49,6 +49,7 @@ onMounted(async () => {
|
||||
loading.value = false;
|
||||
}
|
||||
});
|
||||
// TODO @xingyu:数据没展示
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
Reference in New Issue
Block a user