修改模型送审用户接口

src/model/datamodel.js

@@ -624,10 +624,22 @@ export function* deleteBranch(payload) {
   return yield call(datamodelerService.deleteBranch, payload)
 }
 
+export function* getBranchDiffForked(payload) {
+  return yield call(datamodelerService.getBranchDiffForked, payload)
+}
+
+export function* joinBranch(payload) {
+  return yield call(datamodelerService.joinBranch, payload)
+}
+
 export function* getCooperationUsers() {
   return yield call(datamodelerService.getCooperationUsers)
 }
 
+export function* getApprovalUsers(payload) {
+  return yield call(datamodelerService.getApprovalUsers, payload)
+}
+
 export function* addPhysicalModelApproval(payload) {
   return yield call(datamodelerService.addPhysicalModelApproval, payload)
 }
@@ -651,3 +663,19 @@ export function* approvalUploadFile(payload) {
 export function* approvalDeleteFile(payload) {
   return yield call(datamodelerService.approvalDeleteFile, payload)
 }
+
+export function* getCooperators(payload) {
+  return yield call(datamodelerService.getCooperators, payload)
+}
+
+export function* setCooperators(payload) {
+  return yield call(datamodelerService.setCooperators, payload)
+}
+
+export function* getOwner(payload) {
+  return yield call(datamodelerService.getOwner, payload)
+}
+
+export function* setOwner(payload) {
+  return yield call(datamodelerService.setOwner, payload)
+}
\ No newline at end of file

src/service/datamodeler.js

@@ -571,11 +571,19 @@ export function deleteBranch(payload) {
   return Delete("/datamodeler/easyDataModelerBranching/deleteBranch", payload)
 }
 
-export function getCooperationUsers() {
-  return GetJSON("/datamodeler/easyDataModelerCooperation/users")
+export function getBranchDiffForked(payload) {
+  return GetJSON("/datamodeler/easyDataModelerBranching/diffForkedEasyDataModelerDataModel", payload)
+}
+
+export function joinBranch(payload) {
+  return GetJSON("/datamodeler/easyDataModelerBranching/joinEasyDataModelerDataModel", payload)
 }
 
 /*approval*/
+export function getApprovalUsers(payload) {
+  return GetJSON("/baseservice/sync/getUserByUserName", payload)
+}
+
 export function addPhysicalModelApproval(payload) {
   return Post("/datamodeler/easyDataModelerApproval/addPhysicalModelApproval", payload)
 }
@@ -598,3 +606,25 @@ export function approvalUploadFile(payload) {
 export function approvalDeleteFile(payload) {
   return Delete("/datamodeler/file/del", payload)
 }
+
+/*协同工作*/
+export function getCooperationUsers() {
+  return GetJSON("/datamodeler/easyDataModelerCooperation/users")
+}
+//权限共享
+export function getCooperators(payload) {
+  return GetJSON("/datamodeler/easyDataModelerCooperation/getDataModelCooperators", payload)
+}
+
+export function setCooperators(payload) {
+  return PostJSON("/datamodeler/easyDataModelerCooperation/setDataModelCooperators", payload)
+}
+
+//权限转移
+export function getOwner(payload) {
+  return GetJSON("/datamodeler/easyDataModelerCooperation/getDataModelOwner", payload)
+}
+
+export function setOwner(payload) {
+  return PostJSON("/datamodeler/easyDataModelerCooperation/setDataModelOwner", payload) 
+}
\ No newline at end of file

src/view/Manage/Model/Component/ModelTable.jsx

@@ -695,6 +695,15 @@ const ModelTable = (props) => {
           复制模型
         </PermissionRcItem>
         {
+          view === 'branch' && <PermissionRcItem 
+            id="join" 
+            onClick={handleItemClick}
+            defaultPermission={true}
+          >
+            合并到基线
+          </PermissionRcItem>
+        }
+        {
           (currentItem?.state?.supportedActions||[]).length>0 && currentItem?.state?.supportedActions.map((item, index) => {
             return (
               <PermissionRcItem 

src/view/Manage/Model/Component/start-flow.jsx

@@ -220,15 +220,10 @@ const RuleReviewItem = ({ value = {}, onChange }) => {
   const [options, setOptions] = React.useState()
 
   useDebounceEffect(() => {
-    setOptions(
-      (users??[])
-        .filter(item => !searchValue || (item.name??'').indexOf(searchValue)!==-1)
-        .map(item => ({
-          label: item.name,
-          value: item.id,
-        }))
-    )
-  }, [searchValue, users], { wait: 300 })
+    if (searchValue) {
+      getUsers()
+    }
+  }, [searchValue], { wait: 300 })
 
   React.useEffect(() => {
     getUsers()
@@ -237,16 +232,24 @@ const RuleReviewItem = ({ value = {}, onChange }) => {
   const getUsers = () => {
     setLoading(true)
     dispatch({
-      type: 'datamodel.getCooperationUsers',
+      type: 'datamodel.getApprovalUsers',
+      payload: {
+        userName: searchValue
+      },
       callback: data => {
         setLoading(false)
-        //id int转string
-        const newData = produce(data??[], (draft) => {
-          draft.forEach(item => {
+
+        const newUsers = produce(data?[data]:[], (draft) => {
+          draft?.forEach(item => {
             item.id = `${item.id}`
           })
         })
-        setUsers(newData)
+
+        setUsers(newUsers)
+        setOptions((newUsers??[]).map(item => ({
+          label: item.realName,
+          value: item.id,
+        })))
       },
       error: () => {
         setLoading(false)
@@ -287,7 +290,7 @@ const RuleReviewItem = ({ value = {}, onChange }) => {
               triggerChange({
                 standardApprovalUserList: (users??[])
                 .filter(item => val===item.id)
-                .map(item => ({ userId: item.id, userName: item.name }))
+                .map(item => ({ userId: item.id, userName: item.realName }))
               })
             }}
           />
@@ -406,15 +409,10 @@ const DesignUsersItem = ({ value, onChange }) => {
   const [options, setOptions] = React.useState()
 
   useDebounceEffect(() => {
-    setOptions(
-      (users??[])
-        .filter(item => !searchValue || (item.name??'').indexOf(searchValue)!==-1)
-        .map(item => ({
-          label: item.name,
-          value: item.id,
-        }))
-    )
-  }, [searchValue, users], { wait: 300 })
+    if (searchValue) {
+      getUsers()
+    }
+  }, [searchValue], { wait: 300 })
 
   React.useEffect(() => {
     getUsers()
@@ -423,16 +421,24 @@ const DesignUsersItem = ({ value, onChange }) => {
   const getUsers = () => {
     setLoading(true)
     dispatch({
-      type: 'datamodel.getCooperationUsers',
+      type: 'datamodel.getApprovalUsers',
+      payload: {
+        userName: searchValue
+      },
       callback: data => {
         setLoading(false)
-        //id int转string
-        const newData = produce(data??[], (draft) => {
-          draft.forEach(item => {
+
+        const newUsers = produce(data?[data]:[], (draft) => {
+          draft?.forEach(item => {
             item.id = `${item.id}`
           })
         })
-        setUsers(newData)
+
+        setUsers(newUsers)
+        setOptions((newUsers??[]).map(item => ({
+          label: item.realName,
+          value: item.id,
+        })))
       },
       error: () => {
         setLoading(false)
@@ -457,7 +463,7 @@ const DesignUsersItem = ({ value, onChange }) => {
         onChange?.(
           (users??[])
           .filter(item => val===item.id)
-          .map(item => ({ userId: item.id, userName: item.name }))
+          .map(item => ({ userId: item.id, userName: item.realName }))
         )
       }}
     />