add

src/pages/Auth/MemberPage.tsx

@@ -51,6 +51,7 @@ const MemberPage: React.FC = (props, context) => {
       // 获取角色人员的配置信息
       let msg = await getRoleMember({r_id:recordData.id})
       setTargetKeys(msg?.union_ids || [])
+      localStorage.setItem('targetSelectedKeys',JSON.stringify(msg?.union_ids || []))
 
     })()
 

src/pages/Auth/MenuTree.tsx

@@ -27,6 +27,7 @@ const MenuTree: React.FC = (props) => {
 
       setCheckedKeys(info?.m_ids);
       setExpandedKeys(info?.m_ids);
+      localStorage.setItem('checkedKeysValue',JSON.stringify(info?.m_ids || []))
     })()
   }
 

src/pages/Auth/index.tsx

@@ -62,6 +62,8 @@ const Auth = () => {
     fie.then(()=> {
       ( async ()=> {
 
+        debugger
+
         // 设置权限保存
         let menu = undefined
         if (status === 2) {

src/pages/Menu/index.tsx

@@ -19,7 +19,7 @@ import {history} from "@umijs/max";
 import {PageContainer} from "@ant-design/pro-components";
 import {SearchOutline} from "antd-mobile-icons";
 import React, {useEffect, useState} from "react";
-import {addMenu, delMenu, getMenuPage, saveMenu} from "@/services/role";
+import {addMenu, delMenu, getMenuPage, getShowMenuList, saveMenu} from "@/services/role";
 import MenuTree from "@/pages/Auth/MenuTree";
 
 const Auth = () => {
@@ -32,6 +32,7 @@ const Auth = () => {
   const [status,setStatus] = useState(0) // edit 1 add 0 menu 2
 
   const [dataSource,setDataSource] = useState()
+  const [pidList,setPidList] = useState([])
   const [params,setParams] = useState<ROLE_API.RuleParmes>({
     page: 1,
     page_size: 10
@@ -88,20 +89,27 @@ const Auth = () => {
       }
     })()
   }
-  const onGenderChange = (value: string) => {
-    switch (value) {
-      case 'male':
-        formRef.current?.setFieldsValue({ note: 'Hi, man!' });
-        break;
-      case 'female':
-        formRef.current?.setFieldsValue({ note: 'Hi, lady!' });
-        break;
-      case 'other':
-        formRef.current?.setFieldsValue({ note: 'Hi there!' });
-        break;
-      default:
-        break;
+
+  const getHandle = () => {
+    ( async ()=> {
+      // 获取上级菜单
+      let msg = await getShowMenuList()
+      if (msg) {
+          setPidList(msg?.items)
+        // success()
+        // search()
+      }
+    })()
   }
+
+
+  const onGenderChange = (value: string) => {
+    const item = pidList[value.key - 1]
+    form.setFieldsValue({
+      pid: item.pid
+    })
+    console.log(form.getFieldsValue())
+    debugger
   };
   const handleCancel = () => {
     setIsModalOpen(false);
@@ -151,7 +159,7 @@ const Auth = () => {
       render: (_, record) => {
         // console.log(_)
         // console.log(record)
-        return record.type === 1 ? '菜单' : '接口'
+        return record.menu?.type === 1 ? '菜单' : '接口'
       }
     },
     {
@@ -176,11 +184,14 @@ const Auth = () => {
           <a onClick={()=> {
             showModal()
             setStatus(1)
+            getHandle()
 
             form.setFieldsValue({
               id: record.menu.id,
               link: record.menu.link,
               pid: record.menu.pid,
+              // 同步
+              dis_pid: record.menu.id,
               type: record.menu.type,
               name:record.menu.name,
               is_show:record.menu.is_show
@@ -250,9 +261,10 @@ const Auth = () => {
                                             style={{ maxWidth: 600 }}>
           {/*gutter 是分割距离*/}
           <Form.Item
-            name={'pid'}
+            name={'dis_pid'}
             label={'上级菜单ID'}
             hasFeedback
+            // pidList
             rules={[
               {
                 required: true,
@@ -260,7 +272,22 @@ const Auth = () => {
               },
             ]}
           >
-            <Input placeholder="请输入" />
+            {/*pidList*/}
+            {/*<Input placeholder="请输入" />*/}
+            <Select
+                placeholder="请选择"
+                labelInValue
+                onChange={onGenderChange}
+                allowClear
+                fieldNames={{label:'name',value:'id'}}
+                options={pidList}
+            >
+              {/*<Select.Option value={1}>启用</Select.Option>*/}
+              {/*<Select.Option value={-1}>不启用</Select.Option>*/}
+
+            </Select>
+
+
           </Form.Item>
           <Form.Item
             name={'name'}
@@ -289,14 +316,25 @@ const Auth = () => {
             <Input placeholder="请输入" />
           </Form.Item>
 
-          <Form.Item  label={'类型'} name={'is_show'} rules={[{ required: true }]}>
+          <Form.Item  label={'类型'} name={'type'} rules={[{ required: true }]}>
             <Select
               placeholder="请输入"
               // onChange={onGenderChange}
               allowClear
             >
-              <Select.Option value={1}>显示</Select.Option>
-              <Select.Option value={-1}>隐藏</Select.Option>
+              <Select.Option value={1}>菜单</Select.Option>
+              <Select.Option value={-1}>接口</Select.Option>
+            </Select>
+          </Form.Item>
+
+          <Form.Item  label={'是否启用'} name={'type'} rules={[{ required: true }]}>
+            <Select
+                placeholder="请选择"
+                // onChange={onGenderChange}
+                allowClear
+            >
+              <Select.Option value={1}>启用</Select.Option>
+              <Select.Option value={-1}>不启用</Select.Option>
             </Select>
           </Form.Item>
 
@@ -307,6 +345,13 @@ const Auth = () => {
           >
             <Input placeholder="请输入" hidden />
           </Form.Item>
+          <Form.Item
+            name={'pid'}
+            hidden
+          >
+            <Input placeholder="请输入" hidden />
+          </Form.Item>
+
         </Form>
       }
 

src/pages/User/Login/FsQr.tsx

@@ -93,7 +93,6 @@ const FsQr = () => {
     }
 
 
-
     const domain = window.location.hostname;
     const port = window.location.port;
     console.log(domain);

src/services/role/index.ts

@@ -23,6 +23,17 @@ export async function getRuleList (body:ROLE_API.RuleParmes ) {
   })
 }
 
+// 获取上级菜单列表
+export async function getShowMenuList (body:any ) {
+  return request<any>('/api/permission/getShowMenuList', {
+    method: 'GET',
+    params: body
+  })
+}
+
+
+
+
 export async function getAbleMember (body:ROLE_API.RuleParmes ) {
   return request<ROLE_API.RuleResult>('/api/member/getAbleMember', {
     method: 'GET',