Commit 3ec85344 by zhaochengxiang

bug fix

parent 49ad71de
......@@ -652,6 +652,10 @@ export function* getCooperationUsers() {
return yield call(datamodelerService.getCooperationUsers)
}
export function* getCooperatorCandidates(payload) {
return yield call(datamodelerService.getCooperatorCandidates, payload)
}
export function* getApprovalUsers(payload) {
return yield call(datamodelerService.getApprovalUsers, payload)
}
......
......@@ -635,7 +635,12 @@ export function approvalDeleteFile(payload) {
export function getCooperationUsers() {
return GetJSON("/datamodeler/easyDataModelerCooperation/users")
}
//权限共享
export function getCooperatorCandidates(payload) {
return GetJSON("/datamodeler/easyDataModelerCooperation/getDataModelCooperatorCandidates", payload)
}
export function getCooperators(payload) {
return GetJSON("/datamodeler/easyDataModelerCooperation/getDataModelCooperators", payload)
}
......
......@@ -94,7 +94,7 @@ const FC = (props) => {
onCancel={() => { close() }}
>
<Spin spinning={waiting}>
<Basic ref={basicRef} cooperators={cooperators} />
<Basic ref={basicRef} item={item} cooperators={cooperators} />
</Spin>
</Modal>
)
......@@ -102,7 +102,7 @@ const FC = (props) => {
export default FC
export const Basic = React.forwardRef(function ({ cooperators }, ref) {
export const Basic = React.forwardRef(function ({ cooperators, item }, ref) {
const [loading, setLoading] = React.useState(false)
const [users, setUsers] = React.useState()
const [form] = Form.useForm()
......@@ -114,8 +114,10 @@ export const Basic = React.forwardRef(function ({ cooperators }, ref) {
}), [form])
React.useEffect(() => {
if (item?.id) {
getUsers()
}, [])
}
}, [item])
React.useEffect(() => {
if ((cooperators??[]).length>0) {
......@@ -126,7 +128,10 @@ export const Basic = React.forwardRef(function ({ cooperators }, ref) {
const getUsers = () => {
setLoading(true)
dispatch({
type: 'datamodel.getCooperationUsers',
type: 'datamodel.getCooperatorCandidates',
payload: {
id: item?.id
},
callback: data => {
setLoading(false)
//id int转string
......
......@@ -93,7 +93,7 @@ const FC = (props) => {
onCancel={() => { close() }}
>
<Spin spinning={waiting}>
<Basic ref={basicRef} owner={owner} />
<Basic ref={basicRef} owner={owner} item={item} />
</Spin>
</Modal>
)
......@@ -101,7 +101,7 @@ const FC = (props) => {
export default FC
export const Basic = React.forwardRef(function ({ owner }, ref) {
export const Basic = React.forwardRef(function ({ owner, item }, ref) {
const [loading, setLoading] = React.useState(false)
const [users, setUsers] = React.useState()
const [form] = Form.useForm()
......@@ -113,8 +113,10 @@ export const Basic = React.forwardRef(function ({ owner }, ref) {
}), [form])
React.useEffect(() => {
if (item?.id) {
getUsers()
}, [])
}
}, [item])
React.useEffect(() => {
if (owner) {
......@@ -125,7 +127,10 @@ export const Basic = React.forwardRef(function ({ owner }, ref) {
const getUsers = () => {
setLoading(true)
dispatch({
type: 'datamodel.getCooperationUsers',
type: 'datamodel.getCooperatorCandidates',
payload: {
id: item?.id
},
callback: data => {
setLoading(false)
//id int转string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment