Browse Source

🎟 构建平台业务模块

master
wangxiang 3 years ago
parent
commit
dce35040c5
  1. 15
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java
  2. 22
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java
  3. 1
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMapper.java
  4. 15
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleService.java
  5. 97
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java
  6. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java
  7. 40
      kicc-ui/src/api/model/baseModel.ts
  8. 6
      kicc-ui/src/api/system/menu.ts
  9. 4
      kicc-ui/src/api/system/model/menuModel.ts
  10. 11
      kicc-ui/src/api/system/model/roleModel.ts
  11. 10
      kicc-ui/src/api/system/role.ts
  12. 4
      kicc-ui/src/views/system/menu/MenuModal.vue
  13. 2
      kicc-ui/src/views/system/menu/menu.data.ts
  14. 90
      kicc-ui/src/views/system/role/RoleDrawer.vue
  15. 108
      kicc-ui/src/views/system/role/role.data.ts
  16. 4
      kicc-ui/src/views/system/user/user.data.ts

15
kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java

@ -52,23 +52,8 @@ public class Role extends CommonEntity { @@ -52,23 +52,8 @@ public class Role extends CommonEntity {
*/
private String status;
/** 用户是否存在此角色标识 默认不存在 */
@TableField(exist = false)
private boolean flag = false;
@TableField(exist = false)
private List<Role> roles;
/** 角色组 */
@TableField(exist = false)
private String[] roleIds;
/** 菜单组 */
@TableField(exist = false)
private String[] menuIds;
/** 机构(数据权限) */
@TableField(exist = false)
private String[] deptIds;
}

22
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java

@ -3,16 +3,17 @@ package com.cloud.kicc.system.controller; @@ -3,16 +3,17 @@ package com.cloud.kicc.system.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.system.api.entity.Role;
import com.cloud.kicc.system.service.RoleService;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.common.core.util.PinyinUtil;
import com.cloud.kicc.common.log.annotation.SysLog;
import com.cloud.kicc.system.api.entity.Role;
import com.cloud.kicc.system.service.RoleService;
import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -34,10 +35,10 @@ public class RoleController { @@ -34,10 +35,10 @@ public class RoleController {
private final RoleService roleService;
private QueryWrapper<Role> getQueryWrapper(Role role) {
return new QueryWrapper<Role>()
.like(StrUtil.isNotBlank(role.getName()), "name", role.getName())
.eq(StrUtil.isNotBlank(role.getCode()), "code", role.getCode());
private LambdaQueryWrapper<Role> getQueryWrapper(Role role) {
return new LambdaQueryWrapper<Role>()
.like(StrUtil.isNotBlank(role.getName()), Role::getName, role.getName())
.eq(StrUtil.isNotBlank(role.getCode()), Role::getCode, role.getCode());
}
@GetMapping("/list")
@ -75,7 +76,9 @@ public class RoleController { @@ -75,7 +76,9 @@ public class RoleController {
@PutMapping("/changeStatus")
@PreAuthorize("@pms.hasPermission('role_edit')")
public R changeStatus(@RequestBody Role role) {
roleService.update(new UpdateWrapper<Role>().eq("id", role.getId()).set("status", role.getStatus()));
roleService.update(new LambdaUpdateWrapper<Role>()
.eq(Role::getId, role.getId())
.set(Role::getStatus, role.getStatus()));
return R.ok();
}
@ -83,7 +86,8 @@ public class RoleController { @@ -83,7 +86,8 @@ public class RoleController {
@DeleteMapping("/remove/{id:[\\w,]+}")
@PreAuthorize("@pms.hasPermission('role_del')")
public R remove(@PathVariable String[] id) {
if(ArrayUtil.contains(id, "1")){
// todo: 防止管理员角色删除,暂时处理手段
if(ArrayUtil.contains(id, "1510536230140129280")){
return R.error("不允许删除管理员角色");
}
roleService.removeByIds(Arrays.asList(id));

1
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMapper.java

@ -14,6 +14,7 @@ import java.util.List; @@ -14,6 +14,7 @@ import java.util.List;
* @Date: 2022/2/24
*/
public interface RoleMapper extends BaseMapper<Role> {
/**
* 根据用户ID查询角色
*

15
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleService.java

@ -23,14 +23,6 @@ public interface RoleService extends IService<Role> { @@ -23,14 +23,6 @@ public interface RoleService extends IService<Role> {
*/
boolean insertRole(Role role);
/**
* 修改数据权限信息
*
* @param role 角色信息
* @return 结果
*/
boolean updatePerms(Role role);
/**
* 修改角色信息
*
@ -47,11 +39,4 @@ public interface RoleService extends IService<Role> { @@ -47,11 +39,4 @@ public interface RoleService extends IService<Role> {
*/
List<Role> selectMyRolesByUserId(String userId);
/**
* 根据用户ID查询角色
*
* @param userId 用户ID
* @return 角色列表
*/
List<Role> selectRolesByUserId(String userId);
}

97
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
package com.cloud.kicc.system.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.system.api.entity.Dept;
@ -31,89 +32,29 @@ import java.util.List; @@ -31,89 +32,29 @@ import java.util.List;
@AllArgsConstructor
public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
private final RoleDeptService roleDeptService;
private final RoleMenuService roleMenuService;
private final DeptService deptService;
/**
* 新增保存角色信息
*
* @param role 角色信息
* @return 结果
*/
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public boolean insertRole(Role role) {
// 新增角色信息
baseMapper.insert(role);
return insertRoleMenu(role);
}
/**
* 修改数据权限信息
*
* @param role 角色信息
* @return 结果
*/
@Override
public boolean updatePerms(Role role) {
// 修改角色信息
baseMapper.updateById(role);
// 删除角色与部门关联
roleDeptService.remove(new QueryWrapper<RoleDept>().eq("role_id", role.getId()));
// 新增角色和部门信息(数据权限)
return insertRoleDept(role);
}
/**
* 新增角色部门信息(数据权限)
*
* @param role 角色对象
*/
public boolean insertRoleDept(Role role) {
boolean rows = true;
// 新增角色与部门(数据权限)管理
List<RoleDept> list = new ArrayList<RoleDept>();
for (String deptId : role.getDeptIds()) {
Dept dept = deptService.getById(deptId);
if (dept != null) {
RoleDept rd = new RoleDept();
rd.setRoleId(role.getId());
rd.setDeptId(deptId);
list.add(rd);
}
}
if (list.size() > 0) {
rows = roleDeptService.saveBatch(list);
}
return rows;
}
/**
* 修改保存角色信息
*
* @param role 角色信息
* @return 结果
*/
@Override
public boolean updateRoleMenu(Role role) {
// 修改角色信息
baseMapper.updateById(role);
// 删除角色与菜单关联
roleMenuService.remove(new QueryWrapper<RoleMenu>().eq("role_id", role.getId()));
roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, role.getId()));
return insertRoleMenu(role);
}
/**
* 新增角色菜单信息
*
* @param role 角色对象
*/
public boolean insertRoleMenu(Role role) {
boolean rows = true;
// 新增用户与角色管理
List<RoleMenu> list = new ArrayList<RoleMenu>();
List<RoleMenu> list = new ArrayList();
for (String menuId : role.getMenuIds()) {
RoleMenu rm = new RoleMenu();
rm.setRoleId(role.getId());
@ -126,39 +67,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro @@ -126,39 +67,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
return rows;
}
/**
* 根据用户ID查询角色
*
* @param userId 用户ID
* @return 角色列表
*/
@Override
public List<Role> selectMyRolesByUserId(String userId) {
return baseMapper.selectRolesByUserId(userId);
}
/**
* 根据用户ID查询角色
*
* @param userId 用户ID
* @return 角色列表
*/
@Override
public List<Role> selectRolesByUserId(String userId) {
List<Role> roles = baseMapper.selectList(new QueryWrapper<>());
if (StrUtil.isEmptyIfStr(userId)) {
return roles;
} else {
List<Role> userRoles = baseMapper.selectRolesByUserId(userId);
for (Role role : roles) {
for (Role userRole : userRoles) {
if (role.getId() == userRole.getId()) {
role.setFlag(true);
break;
}
}
}
return roles;
}
}
}

2
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java

@ -64,7 +64,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us @@ -64,7 +64,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
@Override
public User getUserAuthority(User user) {
// 设置角色列表
List<Role> roleList = roleService.selectRolesByUserId(user.getId());
List<Role> roleList = roleService.selectMyRolesByUserId(user.getId());
// 设置角色列表 (ID)
List<String> roleIds = roleList.stream().map(Role::getId).collect(Collectors.toList());
user.setRoleIds(ArrayUtil.toArray(roleIds, String.class));

40
kicc-ui/src/api/model/baseModel.ts

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/** 对应后端的Page */
/** 分页模型 */
export interface Page {
size: number;
current: number;
@ -7,10 +7,46 @@ export interface Page { @@ -7,10 +7,46 @@ export interface Page {
[key: string]: any;
}
/** 对应后端的R */
/** 响应信息主体 */
export interface R<T extends any> {
code: number;
msg: string;
total: number;
data: T;
}
/** 扩展安全框架用户信息 */
export interface KiccUser {
tenantId: string;
id: string;
deptId: string;
phone: string;
[key: string]: any;
}
/** 基础模型 */
export interface BaseEntity {
tenantId: string;
currentUser: KiccUser;
sqlFilter: string;
}
/** 通用模型 */
export interface CommonEntity {
createById: string;
createByName: string;
createTime: string;
updateById: string;
updateByName: string;
updateTime: string;
remarks: string;
}
/** 树结构模型 */
export interface TreeEntity<T extends any> {
parentId: string;
name: string;
sort: number;
children: T[]
}

6
kicc-ui/src/api/system/menu.ts

@ -10,13 +10,13 @@ enum Api { @@ -10,13 +10,13 @@ enum Api {
}
// 查询菜单列表
export const listMenu = (params?: MenuDto) => defHttp.get({ url: Api.list, params });
export const listMenu = (params?: Partial<MenuDto>) => defHttp.get({ url: Api.list, params });
// 新增菜单
export const addMenu = (params: Menu) => defHttp.post({ url: Api.add, data: params });
export const addMenu = (params: Partial<Menu>) => defHttp.post({ url: Api.add, data: params });
// 修改菜单
export const editMenu = (params: Menu) => defHttp.put({ url: Api.edit, data: params });
export const editMenu = (params: Partial<Menu>) => defHttp.put({ url: Api.edit, data: params });
// 查询菜单详细
export const getMenu = (params: { id: String }) => defHttp.get<Menu>({ url: `${Api.get}/${params.id}` });

4
kicc-ui/src/api/system/model/menuModel.ts

@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
// 引入基础包
import { Page, R } from '/@/api/model/baseModel';
import { Page, R, CommonEntity } from '/@/api/model/baseModel';
// 查询参数
export type MenuDto = Page & Menu;
// 菜单对象
export interface Menu {
export interface Menu extends CommonEntity {
id: string;
name: string;
parentId: string;

11
kicc-ui/src/api/system/model/roleModel.ts

@ -1,23 +1,16 @@ @@ -1,23 +1,16 @@
// 引入基础包
import { Page, R } from '/@/api/model/baseModel';
import { CommonEntity, Page, R } from '/@/api/model/baseModel';
// 查询参数
export type RoleDto = Page & Role;
// 角色对象
export interface Role {
export interface Role extends CommonEntity {
id: string;
name: string;
code: string;
sort: string;
status: string;
createById: string;
createByName: string;
createTime: string;
updateById: string;
updateByName: string;
updateTime: string;
remarks: string;
[key: string]: any;
}

10
kicc-ui/src/api/system/role.ts

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { Role, RoleVo, RoleDto } from './model/roleModel';
import { Role, RoleDto } from './model/roleModel';
import { defHttp } from '/@/utils/http/axios';
enum Api {
@ -11,13 +11,13 @@ enum Api { @@ -11,13 +11,13 @@ enum Api {
}
// 查询角色列表
export const listRole = (params?: RoleDto) => defHttp.get<RoleVo>({ url: Api.list, params });
export const listRole = (params?: Partial<RoleDto>) => defHttp.get({ url: Api.list, params });
// 新增角色
export const addRole = (params: Role) => defHttp.post({ url: Api.add, data: params });
export const addRole = (params: Partial<Role>) => defHttp.post({ url: Api.add, data: params });
// 修改角色
export const editRole = (params: Role) => defHttp.put({ url: Api.edit, data: params });
export const editRole = (params: Partial<Role>) => defHttp.put({ url: Api.edit, data: params });
// 查询角色详细
export const getRole = (params: { id: String }) => defHttp.get<Role>({ url: `${Api.get}/${params.id}` });
@ -26,4 +26,4 @@ export const getRole = (params: { id: String }) => defHttp.get<Role>({ url: `${A @@ -26,4 +26,4 @@ export const getRole = (params: { id: String }) => defHttp.get<Role>({ url: `${A
export const delRole = (params: { id: String }) => defHttp.delete({ url: `${Api.del}/${params.id}` });
// 修改角色状态
export const roleSetStatus = (params: Role) => defHttp.post({ url: Api.changeStatus, data: params });
export const changeStatus = (params: Partial<Role>) => defHttp.post({ url: Api.changeStatus, data: params });

4
kicc-ui/src/views/system/menu/MenuModal.vue

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<template>
<BasicModal width="720px"
v-bind="$attrs"
<BasicModal v-bind="$attrs"
width="720px"
@ok="handleSubmit"
@register="registerModal"
>

2
kicc-ui/src/views/system/menu/menu.data.ts

@ -186,7 +186,7 @@ export const formSchema: FormSchema[] = [ @@ -186,7 +186,7 @@ export const formSchema: FormSchema[] = [
},
{
field: 'sort',
label: '显示排序',
label: '菜单排序',
component: 'InputNumber',
componentProps: {
style: { width:'100%' },

90
kicc-ui/src/views/system/role/RoleDrawer.vue

@ -1,21 +1,18 @@ @@ -1,21 +1,18 @@
<template>
<BasicDrawer
v-bind="$attrs"
@register="registerDrawer"
showFooter
:title="getTitle"
width="500px"
@ok="handleSubmit"
<BasicDrawer v-bind="$attrs"
width="500px"
showFooter
@ok="handleSubmit"
@register="registerDrawer"
>
<BasicForm @register="registerForm">
<template #menu="{ model, field }">
<BasicTree
v-model:value="model[field]"
:treeData="treeData"
:replaceFields="{ title: 'name', key: 'id' }"
checkable
toolbar
title="菜单分配"
<BasicTree v-model:value="model[field]"
title="菜单分配"
toolbar
checkable
:treeData="state.menuTree"
:replaceFields="{ title: 'name', key: 'id' }"
/>
</template>
</BasicForm>
@ -26,20 +23,21 @@ @@ -26,20 +23,21 @@
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
* author entfrm开发团队-王翔
*/
import {defineComponent, ref, computed, unref, reactive} from 'vue';
import { unref, reactive } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './role.data';
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
import { BasicDrawer, DrawerProps, useDrawerInner } from '/@/components/Drawer';
import { BasicTree, TreeItem } from '/@/components/Tree';
import { listMenu } from '/@/api/system/menu';
import { addRole, editRole, delRole } from '/@/api/system/role';
import { addRole, editRole, getRole } from '/@/api/system/role';
import { listToTree } from "/@/utils/helper/treeHelper";
/** https://v3.cn.vuejs.org/api/options-data.html#emits */
const emit = defineEmits(['success', 'register']);
const state = reactive({
//
tag: [],
tag: '',
//
menuTree: [] as TreeItem[],
});
@ -51,34 +49,42 @@ @@ -51,34 +49,42 @@
baseColProps: { span: 24 }
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
resetFields();
setDrawerProps({ confirmLoading: false });
// setFieldsValuetreeDataTreekey not exist
if (unref(treeData).length === 0) {
treeData.value = (await getMenuList()) as any as TreeItem[];
}
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
setFieldsValue({
...data.record,
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data: WindowInnerData = { _tag: '' }) => {
await resetFields();
await clearValidate();
state.menuTree = listToTree(await listMenu());
state.tag = data._tag;
const roleId = data.record?.id;
const props: Partial<DrawerProps> = { confirmLoading: false };
switch (unref(state.tag)) {
case 'add':
props.title = '新增角色';
break;
case 'edit':
props.title = '编辑角色';
await setFieldsValue(await getRole({ id: roleId }) || {});
break;
}
setDrawerProps(props);
});
const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
async function handleSubmit() {
try {
const values = await validate();
setDrawerProps({ confirmLoading: true });
await roleSet(values);
closeDrawer();
emit('success');
} finally {
setDrawerProps({ confirmLoading: false });
async function handleSubmit() {
try {
const formData = await validate();
setDrawerProps({ confirmLoading: true });
switch (unref(state.tag)) {
case 'add':
await addRole(formData);
break;
case 'edit':
await editRole(formData);
break;
}
closeDrawer();
emit('success');
} finally {
setDrawerProps({ confirmLoading: false });
}
}
</script>

108
kicc-ui/src/views/system/role/role.data.ts

@ -1,23 +1,26 @@ @@ -1,23 +1,26 @@
/**
* @program: kicc-ui
* @description:
* @author: entfrm开发团队-
* @create: 2022/4/21
*/
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import { h } from 'vue';
import { Switch } from 'ant-design-vue';
import { roleSetStatus } from '/@/api/system/role';
import { changeStatus } from '/@/api/system/role';
import { useMessage } from '/@/hooks/web/useMessage';
const { createConfirm } = useMessage();
export const columns: BasicColumn[] = [
{
title: '角色名称',
dataIndex: 'roleName',
dataIndex: 'name',
width: 200,
},
{
title: '角色值',
dataIndex: 'roleCode',
width: 180,
},
{
title: '排序',
title: '显示顺序',
dataIndex: 'sort',
width: 50,
},
@ -26,6 +29,7 @@ export const columns: BasicColumn[] = [ @@ -26,6 +29,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'status',
width: 120,
customRender: ({ record }) => {
// 设置请求加载状态标识
if (!Reflect.has(record, 'pendingStatus')) {
record.pendingStatus = false;
}
@ -35,27 +39,32 @@ export const columns: BasicColumn[] = [ @@ -35,27 +39,32 @@ export const columns: BasicColumn[] = [
unCheckedChildren: '已禁用',
loading: record.pendingStatus,
onChange(checked: boolean) {
record.pendingStatus = true;
const newStatus = checked ? '0' : '1';
const { createMessage } = useMessage();
roleSetStatus(record.id, newStatus)
.then(() => {
record.status = newStatus;
createMessage.success(`已成功修改角色状态`);
})
.catch(() => {
createMessage.error('修改角色状态失败');
})
.finally(() => {
record.pendingStatus = false;
});
},
const text = checked ? "启用" : "停用";
createConfirm({
iconType: 'warning',
title: '警告',
content: `确认要"${text}${record.name}角色吗?`,
onOk: async () => {
record.pendingStatus = true;
const newStatus = checked ? '0' : '1';
const { createMessage } = useMessage();
changeStatus({ id: record.id, status: newStatus }).then(() => {
record.status = newStatus;
createMessage.success(`${text}成功`);
}).catch(() => {
createMessage.error(`${text}失败`);
}).finally(() => {
record.pendingStatus = false;
});
}
});
}
});
},
}
},
{
title: '备注',
dataIndex: 'description',
dataIndex: 'remarks',
},
{
title: '创建时间',
@ -66,26 +75,26 @@ export const columns: BasicColumn[] = [ @@ -66,26 +75,26 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
{
field: 'keyword',
label: '关键字',
field: 'name',
label: '角色名称',
component: 'Input',
componentProps: {
placeholder: '请输入名称/编码',
placeholder: '请输入角色名称',
},
colProps: { span: 8 },
},
{
field: 'startDate',
label: '起始时间',
component: 'DatePicker',
colProps: { span: 8 },
},
{
field: 'endDate',
label: '截止时间',
component: 'DatePicker',
colProps: { span: 8 },
},
field: 'status',
label: '状态',
component: 'Select',
componentProps: {
options: [
{ label: '启动', value: '0' },
{ label: '停用', value: '1' }
]
},
colProps: { span: 7 }
}
];
export const formSchema: FormSchema[] = [
@ -93,19 +102,26 @@ export const formSchema: FormSchema[] = [ @@ -93,19 +102,26 @@ export const formSchema: FormSchema[] = [
field: 'id',
label: 'ID',
component: 'Input',
show: false,
show: false
},
{
field: 'roleName',
field: 'name',
label: '角色名称',
required: true,
component: 'Input',
},
{
field: 'roleCode',
label: '角色值',
field: 'sort',
label: '角色排序',
component: 'InputNumber',
componentProps: {
style: { width:'100%' },
min: 0
},
required: true,
component: 'Input',
colProps: {
span: 12
}
},
{
field: 'status',
@ -121,7 +137,7 @@ export const formSchema: FormSchema[] = [ @@ -121,7 +137,7 @@ export const formSchema: FormSchema[] = [
},
{
label: '备注',
field: 'description',
field: 'remarks',
component: 'InputTextArea',
},
{
@ -129,5 +145,5 @@ export const formSchema: FormSchema[] = [ @@ -129,5 +145,5 @@ export const formSchema: FormSchema[] = [
field: 'menu',
slot: 'menu',
component: 'Input',
},
}
];

4
kicc-ui/src/views/system/user/user.data.ts

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { roleAllList } from './../../../api/system/role';
// import { roleAllList } from './../../../api/system/role';
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import { h } from 'vue';
@ -105,7 +105,7 @@ export const accountFormSchema: FormSchema[] = [ @@ -105,7 +105,7 @@ export const accountFormSchema: FormSchema[] = [
field: 'roleId',
component: 'ApiSelect',
componentProps: {
api: roleAllList,
// api: roleAllList,
resultField: 'list',
labelField: 'roleName',
valueField: 'id',

Loading…
Cancel
Save