Commit baaa02ca by zhaochengxiang

bug fix

parent 1e79dfc3
...@@ -530,7 +530,7 @@ const ModelTable = (props) => { ...@@ -530,7 +530,7 @@ const ModelTable = (props) => {
const deleteItem = (record) => { const deleteItem = (record) => {
modal.confirm({ modal.confirm({
title: '提示!', title: '提示',
content: '您确定要删除该模型吗?', content: '您确定要删除该模型吗?',
onOk: () => { onOk: () => {
dispatch({ dispatch({
......
...@@ -56,6 +56,7 @@ const RecatalogModal = (props) => { ...@@ -56,6 +56,7 @@ const RecatalogModal = (props) => {
{ {
visible && <Modal visible && <Modal
title='变更目录详情' title='变更目录详情'
centered
visible={ visible } visible={ visible }
width={ 400 } width={ 400 }
confirmLoading={ confirmLoading } confirmLoading={ confirmLoading }
......
import React from 'react'; import React from 'react';
import { Button, Space, Spin, Input, Select, Tooltip, Radio } from 'antd'; import { Button, Space, Spin, Input, Select, Tooltip, Radio, Modal } from 'antd';
import copy from "copy-to-clipboard"; import copy from "copy-to-clipboard";
import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons'; import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
import classNames from 'classnames'; import classNames from 'classnames';
...@@ -28,7 +28,7 @@ const { Option } = Select; ...@@ -28,7 +28,7 @@ const { Option } = Select;
const InputDebounce = DebounceInput(300)(Input); const InputDebounce = DebounceInput(300)(Input);
class Model extends React.Component { class ModelComponet extends React.Component {
constructor() { constructor() {
super(); super();
...@@ -57,7 +57,6 @@ class Model extends React.Component { ...@@ -57,7 +57,6 @@ class Model extends React.Component {
currentModel: {}, currentModel: {},
offset: null, offset: null,
expandTree: true, expandTree: true,
showDeleteTip: false,
showUnbindTip: false, showUnbindTip: false,
showMode: 'list', showMode: 'list',
showBatchModeler: false, showBatchModeler: false,
...@@ -296,7 +295,27 @@ class Model extends React.Component { ...@@ -296,7 +295,27 @@ class Model extends React.Component {
return; return;
} }
this.setState({ showDeleteTip: true }); this.props.modal?.confirm({
title: '提示',
content: '您确定要删除这些模型吗?',
onOk: () => {
dispatch({
type: 'datamodel.deleteDataModels',
payload: {
params: {
easyDataModelerDataModelIds: selectModelerIds.join(',')
}
},
callback: (tip) => {
this.onTableChange();
this.setState({ selectModelerIds: [] });
if ((tip||'')!=='') {
showNotifaction('提示', tip, 5);
}
}
})
}
});
} }
onBatchModelerBtnClick = () => { onBatchModelerBtnClick = () => {
...@@ -539,29 +558,6 @@ class Model extends React.Component { ...@@ -539,29 +558,6 @@ class Model extends React.Component {
this.setState({ expandTree: !this.state.expandTree }); this.setState({ expandTree: !this.state.expandTree });
} }
onDeleteTipModalCancel = (refresh=false) => {
const { selectModelerIds } = this.state;
this.setState({ showDeleteTip: false });
if (refresh) {
dispatch({
type: 'datamodel.deleteDataModels',
payload: {
params: {
easyDataModelerDataModelIds: selectModelerIds.join(',')
}
},
callback: (tip) => {
this.onTableChange();
this.setState({ selectModelerIds: [] });
if ((tip||'')!=='') {
showNotifaction('提示', tip, 5);
}
}
})
}
}
onUnbindTipModalCancel = (refresh=false) => { onUnbindTipModalCancel = (refresh=false) => {
const { selectModelerIds } = this.state; const { selectModelerIds } = this.state;
...@@ -589,7 +585,7 @@ class Model extends React.Component { ...@@ -589,7 +585,7 @@ class Model extends React.Component {
} }
render() { render() {
const { importModalVisible, catalogId, loadingTableData, selectModelerIds, keyword, filterTableData, selectModelerNames, exportDDLModalVisible, exportOtherModalVisible, importStockWordDrawerVisible , loadingStates, modelStates, currentModelState, currentView, recatalogModalVisible, exportDDLModalReference, currentModel, offset, historyAndVersionDrawerVisible, modelerId, startFlowModalVisible, expandTree, showDeleteTip, showMode } = this.state; const { importModalVisible, catalogId, loadingTableData, selectModelerIds, keyword, filterTableData, selectModelerNames, exportDDLModalVisible, exportOtherModalVisible, importStockWordDrawerVisible , loadingStates, modelStates, currentModelState, currentView, recatalogModalVisible, exportDDLModalReference, currentModel, offset, historyAndVersionDrawerVisible, modelerId, startFlowModalVisible, expandTree, showMode } = this.state;
const content = ( const content = (
<ModelTable <ModelTable
...@@ -800,12 +796,6 @@ class Model extends React.Component { ...@@ -800,12 +796,6 @@ class Model extends React.Component {
/> />
<DeleteTipModal <DeleteTipModal
visible={showDeleteTip}
tip='您确定要删除这些模型吗?'
onCancel={this.onDeleteTipModalCancel}
/>
<DeleteTipModal
visible={this.state.showUnbindTip} visible={this.state.showUnbindTip}
tip='您确定要解绑这些模型吗?' tip='您确定要解绑这些模型吗?'
onCancel={this.onUnbindTipModalCancel} onCancel={this.onUnbindTipModalCancel}
...@@ -831,4 +821,15 @@ class Model extends React.Component { ...@@ -831,4 +821,15 @@ class Model extends React.Component {
} }
const Model = (props) => {
const [modal, contextHolder] = Modal.useModal();
return (
<>
<ModelComponet modal={modal} {...props} />
{contextHolder}
</>
)
}
export default Model; export default Model;
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