Commit 83b40e16 by zhaochengxiang

流程编辑模型

parent 476c3699
...@@ -249,7 +249,7 @@ const EditModel = (props) => { ...@@ -249,7 +249,7 @@ const EditModel = (props) => {
</div> </div>
<div className='edit-container'> <div className='edit-container'>
<div className='edit-container-card'> <div className='edit-container-card'>
<ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} form={form} terms={terms} roughModelerData={roughModelerData} permitCheckOut={permitCheckOut} stateId={stateId} versionId={versionId} autoTabKey={autoTabKey} /> <ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} form={form} terms={terms} roughModelerData={roughModelerData} permitCheckOut={permitCheckOut} stateId={stateId} versionId={versionId} autoTabKey={autoTabKey} {...props} />
</div> </div>
</div> </div>
<div className='edit-footer'> <div className='edit-footer'>
......
...@@ -7,13 +7,15 @@ import ImportActionHeader from './ImportActionHeader'; ...@@ -7,13 +7,15 @@ import ImportActionHeader from './ImportActionHeader';
import ImportActionTable from './ImportActionTable'; import ImportActionTable from './ImportActionTable';
import ImportActionIndex from './ImportActionIndex'; import ImportActionIndex from './ImportActionIndex';
import ImportActionPartition from './ImportActionPartition'; import ImportActionPartition from './ImportActionPartition';
import { getQueryParam } from '../../../../util';
import { Action } from '../../../../util/constant';
import { dispatch } from '../../../../model'; import { dispatch } from '../../../../model';
const { TabPane } = Tabs; const { TabPane } = Tabs;
const ImportAction = (props) => { const ImportAction = (props) => {
const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, stateId, versionId, permitCheckOut, autoTabKey } = props; const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, autoTabKey } = props;
const [ constraints, setConstraints ] = useState([]); const [ constraints, setConstraints ] = useState([]);
const [ constraint, setConstraint ] = useState({}); const [ constraint, setConstraint ] = useState({});
...@@ -153,8 +155,11 @@ const ImportAction = (props) => { ...@@ -153,8 +155,11 @@ const ImportAction = (props) => {
} }
} else if (action==='edit' && permitCheckOut) { } else if (action==='edit' && permitCheckOut) {
type = 'datamodel.getCheckOutDataModel'; type = 'datamodel.getCheckOutDataModel';
} else if ((stateId||'') !=='') { } else if (action==='edit') {
params.stateId = stateId; const _action = getQueryParam(Action, props.location.search);
if (_action === 'flow') {
params.ignoreNamespace = true;
}
} }
dispatch({ dispatch({
......
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