Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project
jinfa-admin
Commits
3cfbb369
Commit
3cfbb369
authored
Aug 15, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增组织机构
parent
24bd02b6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
35 deletions
+10
-35
router.tsx
config/router.tsx
+1
-23
authConfig.ts
config/routes/authConfig.ts
+3
-0
index.tsx
src/components/TabTree/index.tsx
+1
-0
memberDetail.tsx
src/pages/authConfig/memberSystem/memberDetail.tsx
+0
-10
index.tsx
src/pages/authConfig/organ/index.tsx
+5
-2
No files found.
config/router.tsx
View file @
3cfbb369
...
...
@@ -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
View file @
3cfbb369
...
...
@@ -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
View file @
3cfbb369
...
...
@@ -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
View file @
3cfbb369
...
...
@@ -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
View file @
3cfbb369
...
...
@@ -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
:
i
d
||
nodeRecord
.
key
id
:
i
sObject
(
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
)
}
/
>
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment