From c8f4f5e21af04b9be95d68ae0c5a1efa89d2b7c4 Mon Sep 17 00:00:00 2001 From: Lhk0001 <2406661616@qq.com> Date: Fri, 27 Oct 2023 19:47:56 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=9F=BA=E6=9C=AC=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E8=BF=98=E6=9C=89=E4=B8=80=E4=B8=AA=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=9A=82=E6=97=B6=E6=B2=A1=E6=9C=89=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 13 +- package.json | 1 + src/api/system/role.ts | 4 +- src/view/system/role/RoleTable/index.scss | 35 -- src/view/system/role/RoleTable/index.tsx | 410 ------------------ src/view/system/role/RoleTable/index备份.tsx | 411 ------------------- src/view/system/role/Search/index.scss | 28 -- src/view/system/role/Search/index.tsx | 124 ------ src/view/system/role/index.tsx | 170 ++++---- src/view/system/role/newadd/index.scss | 5 - src/view/system/role/newadd/index.tsx | 200 --------- 11 files changed, 98 insertions(+), 1303 deletions(-) delete mode 100644 src/view/system/role/RoleTable/index.scss delete mode 100644 src/view/system/role/RoleTable/index.tsx delete mode 100644 src/view/system/role/RoleTable/index备份.tsx delete mode 100644 src/view/system/role/Search/index.scss delete mode 100644 src/view/system/role/Search/index.tsx delete mode 100644 src/view/system/role/newadd/index.scss delete mode 100644 src/view/system/role/newadd/index.tsx diff --git a/package-lock.json b/package-lock.json index 37dfd90..a81b147 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "antd": "^5.7.3", "axios": "^1.4.0", "babel-plugin-import": "^1.13.8", + "dayjs": "^1.11.10", "echarts": "^5.4.3", "js-cookie": "^3.0.5", "nprogress": "^0.2.0", @@ -1804,9 +1805,9 @@ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "node_modules/dayjs": { - "version": "1.11.9", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz", - "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==" + "version": "1.11.10", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "node_modules/debug": { "version": "4.3.4", @@ -5472,9 +5473,9 @@ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "dayjs": { - "version": "1.11.9", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz", - "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==" + "version": "1.11.10", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "debug": { "version": "4.3.4", diff --git a/package.json b/package.json index 8171330..34e3b2c 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "antd": "^5.7.3", "axios": "^1.4.0", "babel-plugin-import": "^1.13.8", + "dayjs": "^1.11.10", "echarts": "^5.4.3", "js-cookie": "^3.0.5", "nprogress": "^0.2.0", diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 0c290f7..7c6f997 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -34,7 +34,7 @@ export const getRolesDataAPI = (params: paramsType) => { } export const delRoleAPI = (params: paramsType) => { let { roleId } = params - console.log(roleId); + // console.log(roleId); return request({ url: `/admin/role/${roleId}`, @@ -50,7 +50,7 @@ export const getMenuLiseAPI = () => { }) } export const addRoleAPI = (data:any) => { - console.log('addAPI',data); + // console.log('addAPI',data); return request({ url: `/admin/role`, method: 'post', diff --git a/src/view/system/role/RoleTable/index.scss b/src/view/system/role/RoleTable/index.scss deleted file mode 100644 index 7de746e..0000000 --- a/src/view/system/role/RoleTable/index.scss +++ /dev/null @@ -1,35 +0,0 @@ -.tablebox{ - table{ - thead{ - th::before{ - - } - tr{ - .ant-table-cell{ - background: white; - color:#909399 - } - - } - } - tbody{ - tr{ - .ant-table-cell{ - background: white; - color:#606266 - } - - } - } - } - .ant-table-cell{ - button:focus - { - outline: none; - } - button:hover - { - border: 0px rgb(250, 250, 250); - } - } -} \ No newline at end of file diff --git a/src/view/system/role/RoleTable/index.tsx b/src/view/system/role/RoleTable/index.tsx deleted file mode 100644 index bc2caff..0000000 --- a/src/view/system/role/RoleTable/index.tsx +++ /dev/null @@ -1,410 +0,0 @@ -import React, { useEffect ,useMemo} from 'react' -import { useState } from 'react'; -import { Space, Table, Tag, Button, Pagination ,Modal,message ,Form,Radio,Input,InputNumber,Tree} from 'antd'; -import type { ColumnsType } from 'antd/es/table'; -import './index.scss' -import { getRolesDataAPI, delRoleAPI ,getMenuLiseAPI,getRoleAPI,setRoleDataAPI} from '../../../../api/system/role.ts' -import { number } from 'echarts' -import { ExclamationCircleFilled } from '@ant-design/icons'; -const { confirm } = Modal -interface getValueType { - valueSch: any -} -interface DataType { - createTime: string, - dataScope: string, - deptIds: any[], - menuIds: any[], - roleId: number, - roleKey: string, - roleName: string, - roleSort: string, - state: string, - updateTime: string, - key?: number, - total?: number -} -interface Values { - title: string; - description: string; - modifier: string; -} -interface CollectionCreateFormProps { - open: boolean; - onCreate: (values: Values) => void; - onCancel: () => void; -} -const fieldNames = { - key: 'menuId', - title: 'menuName', - value:'menuId', - children: 'children' -} -let treeData:any=[] -let thisrole:any={} -const CollectionCreateForm: React.FC = ({ - open, - onCreate, - onCancel, -}) => { - const [form] = Form.useForm(); - console.log('thisrole',thisrole); - form.setFieldsValue({...thisrole}) - - const [menulist, setMenulist] = useState([]) - const [expandedKeys, setExpandedKeys] = useState([]); - const [checkedKeys, setCheckedKeys] = useState([]); - const [selectedKeys, setSelectedKeys] = useState([]); - const [autoExpandParent, setAutoExpandParent] = useState(true); - // setCheckedKeys(thisrole.menuIds) - const getMenuList = async () => { - try { - let menul = await getMenuLiseAPI() - treeData = menul.data - setMenulist(menul.data) - } catch (error) { - console.log(error); - - } - - } - // const onExpand = (expandedKeysValue: React.Key[]) => { - // console.log('onExpand', expandedKeysValue); - // setExpandedKeys(expandedKeysValue); - // setAutoExpandParent(false); - // }; - // const onCheck = (checkedKeysValue: any) => { - // console.log('onCheck', checkedKeysValue); - // form.setFieldsValue({menuIds:checkedKeysValue}) - // setCheckedKeys(checkedKeysValue); - - - // }; - - // const onSelect = (selectedKeysValue: React.Key[], info: any) => { - // console.log('onSelect', info); - // setSelectedKeys(selectedKeysValue); - // }; - - useEffect(() => { - getMenuList() - // console.log('thisrole.menuIds',thisrole.menuIds); - // setCheckedKeys(thisrole.menuIds) - form.setFieldsValue({menuIds:thisrole.menuIds}) - }, []) - - return ( - { - form - .validateFields() - .then((values) => { - form.resetFields() - onCreate(values); - setSelectedKeys([]) - }) - .catch((info) => { - console.log('Validate Failed:', info); - }); - }} - > -
- - - - - - - - - - - - - 所有数据权限 - 自定义数据权限 - 本部门数据权限 - 本部门及以下数据权限 - - - - - 正常 - 停用 - - - - {/* */} - -
- - ); -}; -const RoleTable: React.FC = ({ valueSch }) => { - const [messageApi,contextHolder]=message.useMessage(); - console.log('table:', valueSch); - - let [queryParams,setQueryParams]=useState({ - roleKey: undefined, - roleName: undefined, - state: undefined, - endTime: undefined, - startTime: undefined, - pageNum: undefined, - pageSize: undefined - }) - // let queryParams: any = { - // roleKey: undefined, - // roleName: undefined, - // state: undefined, - // endTime: undefined, - // startTime: undefined, - // pageNum: undefined, - // pageSize: undefined - // } - const handleClickDel = (role: DataType) => { - console.log(role); - let { roleId } = role - del(roleId); - } - const showDeleteConfirm = (role:any) => { - console.log(role); - - confirm({ - title: '系统提示', - icon: , - content: `确定删除角色名称为${role.roleName}的数据吗`, - okText: '确定', - okType: 'danger', - cancelText: '取消', - onOk() { - handleClickDel(role); - }, - onCancel() { - console.log('Cancel'); - }, - }); - }; - const del = async (roleId: number) => { - try { - let { code } = await delRoleAPI({ roleId }) - if (code === 1000) { - console.log('del',valueSch); - messageApi.open({ - type: 'success', - content: '操作成功', - }); - getRoleData1({pageNum:count}) - } - } catch (error) { - console.log(error); - } - } - - const setRoleData=async(role:any)=>{ - // const {roleId,roleKey,roleName,roleSort,dataScope,state,meunIds}=role - thisrole=role - try { - let { code ,data} = await getRoleAPI(role) - if (code === 1000) { - console.log('role:',data); - thisrole=data - } - } catch (error) { - console.log(error); - } - setOpen(true); - } - const columns: ColumnsType = [ - { - title: '序号', - dataIndex: 'key', - key: 'key', - }, - { - title: '角色名称', - dataIndex: 'roleName', - key: 'roleName', - }, - { - title: '角色权限', - dataIndex: 'roleKey', - key: 'roleKey', - }, - { - title: '数据范围', - key: 'dataScope', - dataIndex: 'dataScope', - render:(text)=>{ - switch(text){ - case '1': - return <>所有数据权限 - case '2': - return <>自定义数据权限 - case '3': - return <>本部门数据权限 - default: - return <>本部门及以下数据权限 - } - } - }, - { - title: '显示顺序', - key: 'roleSort', - dataIndex: 'roleSort' - }, - { - title: '状态', - key: 'state', - dataIndex: 'state', - render: (text) => ( - <>{ - text === '0' - ? - 正常 - - : - 停用 - - } - - ) - }, - { - title: '创建时间', - key: 'createTime', - dataIndex: 'createTime', - }, - { - title: '操作', - key: '', - dataIndex: '', - render: (text) => ( - <> - - {/* */} - - - - ), - } - ]; - let [data, setData] = useState([]) - let [total, setTotal] = useState(0) - const getRoleData1 = async (queryParams: any) => { - try { - const { code, data } = await getRolesDataAPI(queryParams) - if (code === 1000) { - const sortData=data.rows.sort((a:DataType,b:DataType)=>parseInt(a.roleSort)-parseInt(b.roleSort)) - sortData.forEach((element: DataType, i: number) => { - element.key = i + 1; - }); - setData(sortData) - setTotal(data.total) - } - } catch (err: any) { - console.log(err); - } - } - let [count, setCount] = useState(1) - const change = (page: number, pageSize: number) => { - console.log(page, pageSize); - queryParams={...queryParams,pageNum:page,pageSize} - // setQueryParams({...queryParams,pageNum:page,pageSize}) - console.log(queryParams); - getRoleData1(queryParams) - setCount(page) - } - const [open, setOpen] = useState(false); - const setDataapi=async(values:any)=>{ - try { - console.log('ssssss',values); - let {code}=await setRoleDataAPI(values) - if(code===1000){ - messageApi.open({ - type: 'success', - content: '操作成功', - }); - } - } catch (error) { - console.log(error); - - } - } - const onCreate = (values: any) => { - // values.menuIds=[] - values={...thisrole,...values} - console.log('Received values of form: ', values); - setDataapi(values) - getRoleData1({pageNum:count}) - setOpen(false); - }; - useEffect(() => { - // setQueryParams({...queryParams,...valueSch}) - queryParams={...queryParams,...valueSch,pageNum:count} - // setCount(1) - getRoleData1(queryParams); - // console.log(queryParams); - }, [valueSch]) - return ( -
- {contextHolder} - - change(page, pageSize)} - showTotal={(total) => `共 ${total} 条`} - /> - { - setOpen(false); - }} - /> - - ) -} -export default RoleTable \ No newline at end of file diff --git a/src/view/system/role/RoleTable/index备份.tsx b/src/view/system/role/RoleTable/index备份.tsx deleted file mode 100644 index ba5f121..0000000 --- a/src/view/system/role/RoleTable/index备份.tsx +++ /dev/null @@ -1,411 +0,0 @@ -import React, { useEffect ,useMemo} from 'react' -import { useState } from 'react'; -import { Space, Table, Tag, Button, Pagination ,Modal,message ,Form,Radio,Input,InputNumber,Tree} from 'antd'; -import type { ColumnsType } from 'antd/es/table'; -import './index.scss' -import { getRolesDataAPI, delRoleAPI ,getMenuLiseAPI,getRoleAPI,setRoleDataAPI} from '../../../../api/system/role.ts' -import { number } from 'echarts' -import { ExclamationCircleFilled } from '@ant-design/icons'; -const { confirm } = Modal -interface getValueType { - valueSch: any -} -interface Values { - title: string; - description: string; - modifier: string; -} -interface CollectionCreateFormProps { - open: boolean; - onCreate: (values: Values) => void; - onCancel: () => void; -} -const fieldNames = { - key: 'menuId', - title: 'menuName', - value:'menuId', - children: 'children' -} -let treeData:any=[] -let thisrole:any={} -const CollectionCreateForm: React.FC = ({ - open, - onCreate, - onCancel, -}) => { - const [form] = Form.useForm(); - console.log('thisrole',thisrole); - form.setFieldsValue({...thisrole}) - - const [menulist, setMenulist] = useState([]) - const [expandedKeys, setExpandedKeys] = useState([]); - const [checkedKeys, setCheckedKeys] = useState([]); - const [selectedKeys, setSelectedKeys] = useState([]); - const [autoExpandParent, setAutoExpandParent] = useState(true); - // setCheckedKeys(thisrole.menuIds) - const getMenuList = async () => { - try { - let menul = await getMenuLiseAPI() - treeData = menul.data - setMenulist(menul.data) - } catch (error) { - console.log(error); - - } - - } - const onExpand = (expandedKeysValue: React.Key[]) => { - console.log('onExpand', expandedKeysValue); - setExpandedKeys(expandedKeysValue); - setAutoExpandParent(false); - }; - const onCheck = (checkedKeysValue: any) => { - console.log('onCheck', checkedKeysValue); - form.setFieldsValue({menuIds:checkedKeysValue}) - setCheckedKeys(checkedKeysValue); - - - }; - - const onSelect = (selectedKeysValue: React.Key[], info: any) => { - console.log('onSelect', info); - setSelectedKeys(selectedKeysValue); - }; - - useEffect(() => { - getMenuList() - // console.log('thisrole.menuIds',thisrole.menuIds); - - // setCheckedKeys(thisrole.menuIds) - form.setFieldsValue({menuIds:thisrole.menuIds}) - }, []) - - return ( - { - form - .validateFields() - .then((values) => { - form.resetFields() - onCreate(values); - setSelectedKeys([]) - }) - .catch((info) => { - console.log('Validate Failed:', info); - }); - }} - > -
- - - - - - - - - - - - - 所有数据权限 - 自定义数据权限 - 本部门数据权限 - 本部门及以下数据权限 - - - - - 正常 - 停用 - - - - - - - - ); -}; -const RoleTable: React.FC = ({ valueSch }) => { - const [messageApi,contextHolder]=message.useMessage(); - console.log('table:', valueSch); - interface DataType { - createTime: string, - dataScope: string, - deptIds: any[], - menuIds: any[], - roleId: number, - roleKey: string, - roleName: string, - roleSort: string, - state: string, - updateTime: string, - key?: number, - total?: number - } - let [queryParams,setQueryParams]=useState({ - roleKey: undefined, - roleName: undefined, - state: undefined, - endTime: undefined, - startTime: undefined, - pageNum: undefined, - pageSize: undefined - }) - // let queryParams: any = { - // roleKey: undefined, - // roleName: undefined, - // state: undefined, - // endTime: undefined, - // startTime: undefined, - // pageNum: undefined, - // pageSize: undefined - // } - const handleClickDel = (role: DataType) => { - console.log(role); - let { roleId } = role - del(roleId); - } - const showDeleteConfirm = (role:any) => { - console.log(role); - - confirm({ - title: '系统提示', - icon: , - content: `确定删除角色名称为${role.roleName}的数据吗`, - okText: '确定', - okType: 'danger', - cancelText: '取消', - onOk() { - handleClickDel(role); - }, - onCancel() { - console.log('Cancel'); - }, - }); - }; - const del = async (roleId: number) => { - try { - let { code } = await delRoleAPI({ roleId }) - if (code === 1000) { - console.log('del',valueSch); - messageApi.open({ - type: 'success', - content: '操作成功', - }); - getRoleData1({pageNum:count}) - } - } catch (error) { - console.log(error); - } - } - - const setRoleData=async(role:any)=>{ - // const {roleId,roleKey,roleName,roleSort,dataScope,state,meunIds}=role - thisrole=role - try { - let { code ,data} = await getRoleAPI(role) - if (code === 1000) { - console.log('role:',data); - thisrole=data - } - } catch (error) { - console.log(error); - } - setOpen(true); - } - const columns: ColumnsType = [ - { - title: '序号', - dataIndex: 'key', - key: 'key', - }, - { - title: '角色名称', - dataIndex: 'roleName', - key: 'roleName', - }, - { - title: '角色权限', - dataIndex: 'roleKey', - key: 'roleKey', - }, - { - title: '数据范围', - key: 'dataScope', - dataIndex: 'dataScope', - render:(text)=>{ - switch(text){ - case '1': - return <>所有数据权限 - case '2': - return <>自定义数据权限 - case '3': - return <>本部门数据权限 - default: - return <>本部门及以下数据权限 - } - } - }, - { - title: '显示顺序', - key: 'roleSort', - dataIndex: 'roleSort' - }, - { - title: '状态', - key: 'state', - dataIndex: 'state', - render: (text) => ( - <>{ - text === '0' - ? - 正常 - - : - 停用 - - } - - ) - }, - { - title: '创建时间', - key: 'createTime', - dataIndex: 'createTime', - }, - { - title: '操作', - key: '', - dataIndex: '', - render: (text) => ( - <> - - {/* */} - - - - ), - } - ]; - let [data, setData] = useState([]) - let [total, setTotal] = useState(0) - const getRoleData1 = async (queryParams: any) => { - try { - const { code, data } = await getRolesDataAPI(queryParams) - if (code === 1000) { - const sortData=data.rows.sort((a:DataType,b:DataType)=>parseInt(a.roleSort)-parseInt(b.roleSort)) - sortData.forEach((element: DataType, i: number) => { - element.key = i + 1; - }); - setData(sortData) - setTotal(data.total) - } - } catch (err: any) { - console.log(err); - } - } - let [count, setCount] = useState(1) - const change = (page: number, pageSize: number) => { - console.log(page, pageSize); - queryParams={...queryParams,pageNum:page,pageSize} - // setQueryParams({...queryParams,pageNum:page,pageSize}) - console.log(queryParams); - getRoleData1(queryParams) - setCount(page) - } - const [open, setOpen] = useState(false); - const setDataapi=async(values:any)=>{ - try { - console.log('ssssss',values); - let {code}=await setRoleDataAPI(values) - if(code===1000){ - messageApi.open({ - type: 'success', - content: '操作成功', - }); - } - } catch (error) { - console.log(error); - - } - } - const onCreate = (values: any) => { - // values.menuIds=[] - values={...thisrole,...values} - console.log('Received values of form: ', values); - setDataapi(values) - getRoleData1({pageNum:count}) - setOpen(false); - }; - useEffect(() => { - // setQueryParams({...queryParams,...valueSch}) - queryParams={...queryParams,...valueSch,pageNum:count} - // setCount(1) - getRoleData1(queryParams); - // console.log(queryParams); - }, [valueSch]) - return ( - -
- {contextHolder} -
- change(page, pageSize)} - showTotal={(total) => `共 ${total} 条`} - /> - { - setOpen(false); - }} - /> - - ) -} -export default RoleTable \ No newline at end of file diff --git a/src/view/system/role/Search/index.scss b/src/view/system/role/Search/index.scss deleted file mode 100644 index 2802d22..0000000 --- a/src/view/system/role/Search/index.scss +++ /dev/null @@ -1,28 +0,0 @@ -.SearchBox{ - display: flex; - flex-wrap: wrap; - .ipt{ - margin-top: 10px; - margin-right: 10px; - height: 32px; - line-height: 32px; - display: flex; - span{ - font-weight: 700; - // line-height: 32px; - padding-right: 12px; - // color: #606266; - } - .item,input{ - flex: 1; - // font-weight: 300; - margin-right: 40px; - } - } - .btn{ - button{ - margin-right: 15px; - } - margin-top: 10px; - } -} \ No newline at end of file diff --git a/src/view/system/role/Search/index.tsx b/src/view/system/role/Search/index.tsx deleted file mode 100644 index 4bc3f44..0000000 --- a/src/view/system/role/Search/index.tsx +++ /dev/null @@ -1,124 +0,0 @@ -import React, { useState ,useContext,createRef} from "react"; -import { Button, Input, Select, DatePicker, Space } from "antd"; -import type { DatePickerProps, RangePickerProps } from 'antd/es/date-picker'; -import './index.scss' -// import { valueType } from "antd/es/statistic/utils"; -import { SyncOutlined,SearchOutlined } from '@ant-design/icons'; -interface getValueType -{ - getValue:(value:any)=>void -} -interface valueType { - roleName: string | undefined, - roleKey: string | undefined, - state: string | undefined, - startTime: string | undefined, - endTime: string | undefined -} -const Serach:React.FC=({getValue})=>{ - const { RangePicker } = DatePicker - //时间值 - const [selectedDate, setSelectedDate]=useState([null,null]) - //搜索框内所有内容 - let [value, setValue] = useState({ - roleName: undefined, roleKey: undefined, startTime: undefined, state: undefined,endTime:undefined - }) - const handlClickSerach = () => { - console.log(value); - getValue(value); - } - const handleClickSerachNew = () => { - value={ - roleName: undefined, roleKey: undefined, startTime: undefined, state: undefined,endTime:undefined - } - setValue(value) - getValue(value) - } - const onDateChange = ( - valueDate: DatePickerProps['value'] | RangePickerProps['value'], - dateString: [string, string] | string, - ) => { - setValue({...value,startTime:dateString[0]+':00',endTime:dateString[1]+':00'}) - }; - // const onOk = (value: DatePickerProps['value'] | RangePickerProps['value']) => { - // console.log('onOk: ', value); - // }; - const filterOption = (input: string, option?: { label: string; value: string }) => - (option?.label ?? '').toLowerCase().includes(input.toLowerCase()); - const onStateChange = (values: string) => { - setValue({ ...value, state: values }) - // console.log(value); - }; - const onSearch = (value: string) => { - console.log('search:', value); - }; - return ( -
-
- 角色名称 -
- { - setValue({ ...value, roleName: e.target.value }) - // console.log(value); - - }} /> -
-
-
- 权限字符 -
- { - setValue({ ...value, roleKey: e.target.value }) - }} /> -
-
-
- 状态 -
-
- - @@ -700,13 +706,13 @@ export default function Role() { diff --git a/src/view/system/role/newadd/index.scss b/src/view/system/role/newadd/index.scss deleted file mode 100644 index 837da52..0000000 --- a/src/view/system/role/newadd/index.scss +++ /dev/null @@ -1,5 +0,0 @@ -.newadd{ - width: 60px; - height: 40px; - margin-top: 15px; -} \ No newline at end of file diff --git a/src/view/system/role/newadd/index.tsx b/src/view/system/role/newadd/index.tsx deleted file mode 100644 index d9ae889..0000000 --- a/src/view/system/role/newadd/index.tsx +++ /dev/null @@ -1,200 +0,0 @@ -import React, { useState, useEffect } from 'react'; -import { Button, Form, Input, Modal, Radio, Tree, InputNumber, message } from 'antd'; -import { SyncOutlined } from '@ant-design/icons' -import './index.scss' -import { getMenuLiseAPI, addRoleAPI } from '../../../../api/system/role' -import type { DataNode } from 'antd/es/tree' -import { Value } from 'sass'; -interface Values { - title: string; - description: string; - modifier: string; -} -interface CollectionCreateFormProps { - open: boolean; - onCreate: (values: Values) => void; - onCancel: () => void; -} -const fieldNames = { - key: 'menuId', - title: 'menuName', - value: 'menuId', - children: 'children' -} -let treeData: any = []; -const CollectionCreateForm: React.FC = ({ - open, - onCreate, - onCancel, -}) => { - const [form] = Form.useForm(); - const [menulist, setMenulist] = useState([]) - const getMenuList = async () => { - try { - let menul = await getMenuLiseAPI() - console.log('tree', menul.data); - treeData = menul.data - setMenulist(menul.data) - } catch (error) { - console.log(error); - - } - } - const [expandedKeys, setExpandedKeys] = useState([]); - const [checkedKeys, setCheckedKeys] = useState([]); - const [selectedKeys, setSelectedKeys] = useState([]); - const [autoExpandParent, setAutoExpandParent] = useState(true); - - const onExpand = (expandedKeysValue: React.Key[]) => { - console.log('onExpand', expandedKeysValue); - setExpandedKeys(expandedKeysValue); - setAutoExpandParent(false); - }; - const onCheck = (checkedKeysValue: any) => { - console.log('onCheck', checkedKeysValue); - form.setFieldsValue({ menuIds: checkedKeysValue }) - setCheckedKeys(checkedKeysValue); - }; - - const onSelect = (selectedKeysValue: React.Key[], info: any) => { - console.log('onSelect', info); - - setSelectedKeys(selectedKeysValue); - }; - - useEffect(() => { - getMenuList() - // setSelectedKeys([]) - }, []) - return ( - { - form - .validateFields() - .then((values) => { - form.resetFields() - onCreate(values); - setSelectedKeys([]) - }) - .catch((info) => { - console.log('Validate Failed:', info); - }); - }} - > -
- - - - - - - - - - - - - 所有数据权限 - 自定义数据权限 - 本部门数据权限 - 本部门及以下数据权限 - - - - - 正常 - 停用 - - - - {/* */} - - - - - ); -}; - -const Newadd: React.FC = () => { - const [messageApi, contextHolder] = message.useMessage(); - const [open, setOpen] = useState(false); - const postAdd = async (value: any) => { - try { - let { code } = await addRoleAPI(value); - console.log(code); - - if (code === 1000) { - console.log('success'); - messageApi.open({ - type: 'success', - content: '操作成功', - }); - } - else if (code === 2000) { - console.log('重名'); - - } - } catch (error) { - - } - } - const onCreate = (values: any) => { - // values.menuIds=[] - console.log('Received values of form: ', values); - - postAdd(values) - setOpen(false); - }; - - return ( -
- {contextHolder} - - { - setOpen(false); - }} - /> -
- ); -}; - -export default Newadd; \ No newline at end of file