Commit caf227d9 by zhaochengxiang

已有用户编辑的发布模型,查看详情时需要保持编辑按钮,提示不可编辑原因 提Bug

parent 5100bb95
......@@ -12,4 +12,5 @@ export const Editable = 'editable';
export const PermitCheckOut = 'permitCheckOut';
export const StateId = 'sid';
export const VersionId = 'vid';
export const TemplateId = 'tid';
\ No newline at end of file
export const TemplateId = 'tid';
export const Holder = 'holder';
\ No newline at end of file
import React, { useState, useEffect } from 'react';
import { Form, Button, Space } from 'antd';
import { Form, Button, Space, Tooltip } from 'antd';
import LocalStorage from 'local-storage';
import ImportAction from './ImportAction';
import CatalogModal from './CatalogModal';
import { dispatchLatest } from '../../../../model';
import { getQueryParam, showMessage } from '../../../../util';
import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId } from '../../../../util/constant';
import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId, Holder } from '../../../../util/constant';
import HistoryAndVersionDrawer from './HistoryAndVersionDrawer';
import './EditModel.less';
......@@ -22,7 +22,7 @@ const EditModel = (props) => {
const [ historyAndVersionDrawerVisible, setHistoryAndVersionDrawerVisible ] = useState(false);
const [ autoTabKey, setAutoTabKey ] = useState(null);
const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId } = actionData;
const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId, holder } = actionData;
const [form] = Form.useForm();
......@@ -36,6 +36,7 @@ const EditModel = (props) => {
const _editable = getQueryParam(Editable, props.location.search);
const _stateId = getQueryParam(StateId, props.location.search);
const _versionId = getQueryParam(VersionId, props.location.search);
const _holder = getQueryParam(Holder, props.location.search);
let _hints = [];
if ((_hintsStr||'') !== '') {
......@@ -49,7 +50,7 @@ const EditModel = (props) => {
judgeAttributeRepeat(_roughModelerData.easyDataModelerDataModelAttributes);
}
setActionData({ action: _action, catalogId: _catalogId, modelerId: _modelerId, hints: _hints, roughModelerData: _roughModelerData, permitCheckOut: (_permitCheckOut==='true'), editable: (_editable==='true'), stateId: _stateId, versionId: _versionId });
setActionData({ action: _action, catalogId: _catalogId, modelerId: _modelerId, hints: _hints, roughModelerData: _roughModelerData, permitCheckOut: (_permitCheckOut==='true'), editable: (_editable==='true'), stateId: _stateId, versionId: _versionId, holder: _holder });
const interval = setInterval(() => {
heartbeat();
......@@ -227,14 +228,24 @@ const EditModel = (props) => {
</Space>
)
} else if (action === 'detail') {
let editTip = '';
if (!editable) {
if (stateId === '2') {
editTip = '待发布的模型不允许编辑';
} else if (stateId === '4') {
editTip = `${holder||''}正在编辑中, 不允许再编辑`;
}
}
actionsBtn = (
<Space>
<Button type='primary' onClick={onHistory} danger >版本历史</Button>
{
editable && <Button type='primary' onClick={edit} danger >
编辑
<Tooltip title={editTip}>
<Button type='primary' onClick={edit} disabled={!editable} danger >
编辑
</Button>
}
</Tooltip>
</Space>
);
} else if (action === 'edit') {
......
......@@ -15,7 +15,7 @@ import HistoryAndVersionDrawer from './Component/HistoryAndVersionDrawer';
import StartFlowModal from './Component/StartFlowModal';
import { showMessage, showNotifaction, inputWidth, DeleteTipModal } from '../../../util';
import { dispatch, dispatchLatestHomepage } from '../../../model';
import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId } from '../../../util/constant';
import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, Holder } from '../../../util/constant';
import { AppContext } from '../../../App';
import './index.less';
......@@ -175,7 +175,7 @@ class Model extends React.Component {
this.setState({ importModalAction: action, modelerId: record.id }, () => {
const { catalogId, importModalAction, modelerId } = this.state;
window.open(`/data-govern/data-model-action?${Action}=${importModalAction}&${CatalogId}=${catalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}`);
window.open(`/data-govern/data-model-action?${Action}=${importModalAction}&${CatalogId}=${catalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${Holder}=${record.holder||''}`);
});
}
......
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