bug fix

src/util/Component/PermissionButton.jsx

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import { Button, Tooltip } from 'antd';
 
 const FC = (props) => {
-  const { permissionKey, permissions, defaultPermission, disabled, tip, ...restProps } = props;
+  const { permissionKey, permissions, defaultPermission, disabled, tip, tooltipPlacement = 'top', ...restProps } = props;
 
   const havePermission = useMemo(() => {
     let _havePermission = true;
@@ -18,7 +18,7 @@ const FC = (props) => {
   }, [permissionKey, permissions, defaultPermission])
 
   return (
-    <Tooltip title={havePermission?tip:'暂无权限'}>
+    <Tooltip title={havePermission?tip:'暂无权限'} placement={tooltipPlacement}>
       <Button disabled={!havePermission||disabled} {...restProps} />
     </Tooltip>
   )

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

@@ -561,6 +561,7 @@ const EditModel = (props) => {
                 onClick={edit} 
                 disabled={ modelerData?.inheritedFromEasyDataModelerDataModel?true:((stateId==='4')?!permitCheckOut:!editable)} 
                 tip={editTip}
+                tooltipPlacement='topRight'
                 permissionKey='编辑'
                 defaultPermission={branchId?true:undefined}
                 permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
@@ -650,6 +651,7 @@ const EditModel = (props) => {
           {
             !modelerData?.inheritedFromEasyDataModelerDataModel && editable && <PermissionButton 
               type='primary' 
+              tooltipPlacement='topRight'
               onClick={edit}  
               permissionKey='编辑'
               permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)}

src/view/Manage/Model/Component/update-branch.jsx

@@ -122,31 +122,37 @@ const Basic = React.forwardRef(function ({ type, item }, ref) {
     validate: async () => {
       let rows = await form.validateFields()
       if (type === 'add') {
+        let newMembers = [...rows.members??[]].filter(item => item.id !== app?.user?.userId)
+        newMembers = [
+          {
+            admin: true,
+            id: app?.user?.userId,
+            name: app?.user?.userName,
+          }, 
+          ...(newMembers.map(item => ({
+            admin: false,
+            ...item,
+          })))
+        ]
+
         rows = {...rows, easyDataModelerMemberShip: {
-          easyDataModelerMembers: [
-            ...(rows.members??[]).map(item => ({
-              admin: false,
-              ...item,
-            })),
-            {
-              admin: true,
-              id: app?.user?.userId,
-              name: app?.user?.userName,
-            },
-          ]
+          easyDataModelerMembers: newMembers
         }}
       } else {
+        let newMembers = [...rows.members??[]].filter(item => (rows.admins??[]).findIndex(_item => _item.id===item.id) === -1)
+        newMembers = [
+          ...((rows.admins??[]).map(item => ({
+            admin: true,
+            ...item,
+          }))),
+          ...(newMembers.map(item => ({
+            admin: false,
+            ...item,
+          })))
+        ]
+
         rows = {...rows, easyDataModelerMemberShip: {
-          easyDataModelerMembers: [
-            ...(rows.members??[]).map(item => ({
-              admin: false,
-              ...item,
-            })),
-            ...(rows.admins??[]).map(item => ({
-              admin: true,
-              ...item,
-            })),
-          ]
+          easyDataModelerMembers: newMembers
         }}
       }
       return rows