新增组织机构

config/router.tsx

@@ -127,29 +127,7 @@ const router = [
             component: '@/pages/member/memberLevel/addEquity',
           },
         ],
-      },
-      {
-        path: '/authConfig',
-        name: 'authConfig',
-        icon: 'SmileOutlined',
-        routes: [
-          {
-            path: '/authConfig/organ',
-            name: 'organ',
-            component: '@/pages/authConfig/organ',
-          },
-          {
-            path: '/authConfig/memberSystem',
-            name: 'memberSystem',
-            component: '@/pages/authConfig/memberSystem',
-          },
-          {
-            path: '/authConfig/userSystem',
-            name: 'userSystem',
-            component: '@/pages/authConfig/userSystem',
-          },
-        ],
-      },
+      }
     ],
   },
 ];

config/routes/authConfig.ts

@@ -17,6 +17,7 @@ export default {
       path: '/authConfig/memberSystem/memberDetail',
       name: 'memberDetail',
       component: '@/pages/authConfig/memberSystem/memberDetail',
+      hideInMenu: true
     },
     {
       path: '/authConfig/userSystem',
@@ -27,6 +28,7 @@ export default {
       path: '/authConfig/userSystem/userDetail',
       name: 'userSystem',
       component: '@/pages/authConfig/userSystem/userDetail',
+      hideInMenu: true
     },
   ],
 }
\ No newline at end of file

src/components/TabTree/index.tsx

@@ -224,6 +224,7 @@ const TabTree:React.FC<TabTreeProps> = (props) => {
           const { node, selected } = e
           // 用户自定义的选择后触发事件
           if (props.handleSelect) {
+            console.log(node)
             const result = props.handleSelect(node.key, node)
             // 存在返回值则不执行选中事件, 一般用于切换node时，不希望离开当前页面
             if (result !== undefined) {

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -12,22 +12,12 @@ import CheckboxTree from '@/components/CheckBoxTree';
 import { useTreeTabs } from '@/hooks/useTreeTabs';
 import { createFormActions } from '@formily/antd';
 import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
-// import { UserOutlined } from '@ant-design/icons';
-const { TextArea } = Input;
 
 const pageTitles = [
   '新增',
   '编辑',
   '预览'
 ]
-const layout = {
-  labelCol: {
-    span: 24,
-  },
-  wrapperCol: {
-    span: 24,
-  },
-};
 
 const TabFormErrors = (props) => {
   return (

src/pages/authConfig/organ/index.tsx

@@ -12,6 +12,7 @@ import { PublicApi } from '@/services/api';
 import { omit } from '@/utils';
 import { useMap, useBoolean } from '@umijs/hooks';
 import { useTreeTabs } from '@/hooks/useTreeTabs';
+import { isObject } from '@antv/util';
 // import "./index.less"
 
 const { ON_FORM_INPUT_CHANGE } = LifeCycleTypes
@@ -56,7 +57,7 @@ const Organ: React.FC<{}> = () => {
 
   const handleDeleteMenu = (id) => {
     PublicApi.postMemberOrgDelete({
-      id: id || nodeRecord.key
+      id: isObject(id) ?  nodeRecord.key : id
     }).then(() => {
       setTreeStatus(FormState.FREE)
       setNodeRecord(undefined)
@@ -66,7 +67,7 @@ const Organ: React.FC<{}> = () => {
   
   // 保存设置提交
   const handleSubmit = (value) => {
-    // 去掉模拟的key
+    // 去掉模拟的key, 为true的时候是编辑
     const editOrAdd = nodeRecord && treeStatus === FormState.EDIT
     const params = editOrAdd ? { ...value, parentId: nodeRecord.id } : {
       ...value,
@@ -86,6 +87,7 @@ const Organ: React.FC<{}> = () => {
   const toolsRender = {
     addNode(node) {
       formActions.reset({ validate: false })
+      setNodeRecord(undefined)
       setTreeStatus(FormState.ADD)
     },
     addChildNode(node) {
@@ -112,6 +114,7 @@ const Organ: React.FC<{}> = () => {
                 fetchData = {params => fetchMenuData(params)}
                 treeData={treeData}
                 toolsRender={toolsRender}
+                customKey='id'
                 handleSelect={(key, node) => handleSelect(key, node)}
               />
               :