diff --git a/src/components/b_table.tsx b/src/components/b_table.tsx index 3293b88..cbcfc06 100644 --- a/src/components/b_table.tsx +++ b/src/components/b_table.tsx @@ -18,7 +18,6 @@ const BTable = (props: any) => { dataSource, selectCallback, scroll, - editCallback, actionCloumn, onSizeChange, onPageChange, @@ -72,7 +71,6 @@ const BTable = (props: any) => { onClick={() => { setRecord(record); setIsModalOpen(true); - editCallback(record); }} > 编辑 @@ -141,7 +139,11 @@ const BTable = (props: any) => { formRef={formRef} colProps={25} onFinish={() => { - store.add(formRef.current?.getFieldsValue()); + if(!record){ + store.add(formRef.current?.getFieldsValue()); + return + } + store.putItem(record.identity,formRef.current?.getFieldsValue()); }} createCallback={() => { formRef.current?.setFieldsValue(record); diff --git a/src/pages/menu/menu_config.tsx b/src/pages/menu/menu_config.tsx index 4611710..b85d273 100644 --- a/src/pages/menu/menu_config.tsx +++ b/src/pages/menu/menu_config.tsx @@ -35,7 +35,7 @@ export const defaultConfig = [ { type: FormType.select, label: "上级菜单", - name: "pid", + name: "p_id", value: "", selectUrl:MenuConfig.LIST, key:"name", diff --git a/src/pages/role/role_config.tsx b/src/pages/role/role_config.tsx index 7a7997a..a1b2d12 100644 --- a/src/pages/role/role_config.tsx +++ b/src/pages/role/role_config.tsx @@ -1,8 +1,9 @@ import { FormType } from "@/components/form/interface"; import { UserDataType } from "@/model/userModel"; +import { MenuConfig } from "@/service/user_config"; import { ColumnsType } from "antd/lib/table"; -export const defaultConfig = [ +export const defaultConfig = [ { type: FormType.input, label: "职位名称", @@ -19,11 +20,12 @@ export const defaultConfig = [ rules: [{ required: true, message: "请输入职位描述" }], }, { - type: FormType.input, + type: FormType.select, label: "菜单权限", name: "menu_rights", + selectUrl: MenuConfig.LIST, value: "", - rules: [{ required: true, message: "请输入菜单权限" }], + rules: [{ required: true, message: "请选择菜单" }], }, { type: FormType.input,