Commit 5543aab9 by zhaochengxiang

bug fix

parent 4056bec4
...@@ -15,6 +15,7 @@ import BranchModelSync from './branch-model-sync'; ...@@ -15,6 +15,7 @@ import BranchModelSync from './branch-model-sync';
import ModelCompareSelectModel from './model-compare-select-model'; import ModelCompareSelectModel from './model-compare-select-model';
import MetadataCompareSelectMetadata from './metadata-compare-select-metadata'; import MetadataCompareSelectMetadata from './metadata-compare-select-metadata';
import ModelForkDetail from './model-fork-detail'; import ModelForkDetail from './model-fork-detail';
import AuthTransfer from './auth-transfer';
import './ModelTable.less'; import './ModelTable.less';
import 'react-contexify/dist/ReactContexify.css'; import 'react-contexify/dist/ReactContexify.css';
...@@ -148,7 +149,7 @@ export const ModelNameColumn = (props) => { ...@@ -148,7 +149,7 @@ export const ModelNameColumn = (props) => {
} }
const ModelTable = (props) => { const ModelTable = (props) => {
const { data, onChange, onItemAction, onSelect, onHistory, catalogId, keyword, onAutoCreateTable, offset = null, view, modelState, user, selectModelerIds, visibleColNames, tagSelectOptions, batchAddTagChange, onMerge, onSyncSuccess, onAuthTransfer, onAuthShare } = props; const { data, onChange, onItemAction, onSelect, onHistory, catalogId, keyword, onAutoCreateTable, offset = null, view, modelState, user, selectModelerIds, visibleColNames, tagSelectOptions, batchAddTagChange, onMerge, onSyncSuccess, onAuthShare } = props;
const [ selectedRowKeys, setSelectedRowKeys ] = useState([]); const [ selectedRowKeys, setSelectedRowKeys ] = useState([]);
const [ expandedSelectedRowKeys, setExpandedSelectedRowKeys ] = useState([]); const [ expandedSelectedRowKeys, setExpandedSelectedRowKeys ] = useState([]);
...@@ -172,6 +173,10 @@ const ModelTable = (props) => { ...@@ -172,6 +173,10 @@ const ModelTable = (props) => {
visible: false, visible: false,
item: undefined, item: undefined,
}) })
const [authTransferParams, setAuthTransferParams] = useState({
visible: false,
item: undefined,
})
const expandedDataMapRef = useRef(new Map()); const expandedDataMapRef = useRef(new Map());
const shouldScrollRef = useRef(false); const shouldScrollRef = useRef(false);
...@@ -665,7 +670,10 @@ const ModelTable = (props) => { ...@@ -665,7 +670,10 @@ const ModelTable = (props) => {
} else if (key === 'join') { } else if (key === 'join') {
onMerge?.(currentItem); onMerge?.(currentItem);
} else if (key === 'auth-transfer') { } else if (key === 'auth-transfer') {
onAuthTransfer?.(currentItem) setAuthTransferParams({
visible: true,
item: currentItem,
})
} else if (key === 'auth-share') { } else if (key === 'auth-share') {
onAuthShare?.(currentItem) onAuthShare?.(currentItem)
} else if (key === 'viewBaselineModel') { } else if (key === 'viewBaselineModel') {
...@@ -912,6 +920,27 @@ const ModelTable = (props) => { ...@@ -912,6 +920,27 @@ const ModelTable = (props) => {
}) })
}} }}
/> />
<AuthTransfer
{...authTransferParams}
onCancel={(refresh) => {
setAuthTransferParams({
visible: false,
item: undefined
})
if (refresh) {
onChange && onChange();
const index = selectedRowKeys.findIndex((rowKey) => rowKey === currentItem?.id);
if (index !== -1) {
const newSelectedRowKeys = [...selectedRowKeys];
newSelectedRowKeys.splice(index, 1);
setSelectedRowKeys(newSelectedRowKeys);
onSelect && onSelect(newSelectedRowKeys);
}
}
}}
/>
{ contextHolder } { contextHolder }
</div> </div>
); );
......
...@@ -25,7 +25,6 @@ import { TagSelect, TagSelectPopup } from './Component/tag-help'; ...@@ -25,7 +25,6 @@ import { TagSelect, TagSelectPopup } from './Component/tag-help';
import BranchAddModel from './Component/branch-add-model' import BranchAddModel from './Component/branch-add-model'
import StartFlow from './Component/start-flow' import StartFlow from './Component/start-flow'
import MergeToMaster from './Component/merge-to-master'; import MergeToMaster from './Component/merge-to-master';
import AuthTransfer from './Component/auth-transfer';
import AuthShare from './Component/auth-share'; import AuthShare from './Component/auth-share';
import NodeIntroduction from './Component/node-introduction'; import NodeIntroduction from './Component/node-introduction';
...@@ -411,17 +410,6 @@ class Model extends React.Component { ...@@ -411,17 +410,6 @@ class Model extends React.Component {
}) })
} }
onAuthTransfer = (item) => {
if (item) {
this.setState({
authTransferParams: {
visible: true,
item,
}
})
}
}
onAuthShare = (item) => { onAuthShare = (item) => {
if (item) { if (item) {
this.setState({ this.setState({
...@@ -911,7 +899,6 @@ class Model extends React.Component { ...@@ -911,7 +899,6 @@ class Model extends React.Component {
onItemAction={this.onTableItemAction} onItemAction={this.onTableItemAction}
onAutoCreateTable={this.onAutoCreateTable} onAutoCreateTable={this.onAutoCreateTable}
onHistory={this.onHistory} onHistory={this.onHistory}
onAuthTransfer={this.onAuthTransfer}
onAuthShare={this.onAuthShare} onAuthShare={this.onAuthShare}
onMerge={this.onMerge} onMerge={this.onMerge}
onSyncSuccess={this.onSyncSuccess} onSyncSuccess={this.onSyncSuccess}
...@@ -1015,22 +1002,6 @@ class Model extends React.Component { ...@@ -1015,22 +1002,6 @@ class Model extends React.Component {
}} }}
/> />
<AuthTransfer
{...this.state.authTransferParams}
onCancel={(refresh) => {
this.setState({
authTransferParams: {
visible: false,
item: undefined
}
})
if (refresh) {
this.onTableChange()
}
}}
/>
<AuthShare <AuthShare
{...this.state.authShareParams} {...this.state.authShareParams}
onCancel={(refresh) => { onCancel={(refresh) => {
......
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