Commit fcb5aadc by zhaochengxiang

模型编辑增加心跳

parent 2e91b9ac
...@@ -202,6 +202,10 @@ export function* importWordGenerateModelDraft(payload) { ...@@ -202,6 +202,10 @@ export function* importWordGenerateModelDraft(payload) {
return yield call(datamodelerService.importWordGenerateModelDraft, payload); return yield call(datamodelerService.importWordGenerateModelDraft, payload);
} }
export function* heartbeat() {
return yield call(datamodelerService.heartbeat);
}
export function* validateDataModel(payload) { export function* validateDataModel(payload) {
return yield call(datamodelerService.validateDataModel, payload); return yield call(datamodelerService.validateDataModel, payload);
} }
......
...@@ -181,6 +181,10 @@ export function importWordGenerateModelDraft(payload) { ...@@ -181,6 +181,10 @@ export function importWordGenerateModelDraft(payload) {
return PostFile("/datamodeler/easyDataModelerExport/word/draft", payload); return PostFile("/datamodeler/easyDataModelerExport/word/draft", payload);
} }
export function heartbeat() {
return Get("/datamodeler/easyDataModelerExport/heartbeat");
}
export function validateDataModel(payload) { export function validateDataModel(payload) {
return PostJSON("/datamodeler/easyDataModelerConstraint/validateDataModel", payload); return PostJSON("/datamodeler/easyDataModelerConstraint/validateDataModel", payload);
} }
...@@ -212,3 +216,4 @@ export function getParent(payload) { ...@@ -212,3 +216,4 @@ export function getParent(payload) {
export function autoCreateTable(payload) { export function autoCreateTable(payload) {
return PostJSON("/metadataharvester/datasource/createTableByDDLList", payload); return PostJSON("/metadataharvester/datasource/createTableByDDLList", payload);
} }
...@@ -207,7 +207,7 @@ const AttributeRelationModal = (props) => { ...@@ -207,7 +207,7 @@ const AttributeRelationModal = (props) => {
name={element.id||''} name={element.id||''}
key={index} key={index}
> >
<Select> <Select allowClear>
{ {
(attributes||[]).map((attribute, _index) => { (attributes||[]).map((attribute, _index) => {
return ( return (
......
...@@ -47,10 +47,24 @@ const EditModel = (props) => { ...@@ -47,10 +47,24 @@ const EditModel = (props) => {
} }
setActionData({ action: _action, catalogId: _catalogId, modelerId: _modelerId, hints: _hints, roughModelerData: _roughModelerData, permitCheckOut: _permitCheckOut, editable: _editable, stateId: _stateId, versionId: _versionId }); setActionData({ action: _action, catalogId: _catalogId, modelerId: _modelerId, hints: _hints, roughModelerData: _roughModelerData, permitCheckOut: _permitCheckOut, editable: _editable, stateId: _stateId, versionId: _versionId });
const interval = setInterval(() => {
heartbeat();
}, 10*60*1000);
return () => {
clearInterval(interval);
}
//eslint-disable-next-line react-hooks/exhaustive-deps //eslint-disable-next-line react-hooks/exhaustive-deps
}, []) }, [])
const heartbeat = () => {
dispatchLatest({
type: 'datamodel.heartbeat'
});
}
const save = async (e, cid = '') => { const save = async (e, cid = '') => {
try { try {
const row = await form.validateFields(); const row = await form.validateFields();
......
...@@ -135,7 +135,7 @@ const ModelTable = (props) => { ...@@ -135,7 +135,7 @@ const ModelTable = (props) => {
if (record?.state?.id === '2') { if (record?.state?.id === '2') {
editTip = '待发布的模型不允许编辑'; editTip = '待发布的模型不允许编辑';
} else if (record?.state?.id === '4') { } else if (record?.state?.id === '4') {
editTip = '已发布模型下存在未发布的模型,不允许再编辑'; editTip = `${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