模型通知

src/util/constant.js

@@ -24,7 +24,7 @@ export const ReadOnly = 'readOnly';
 export const ApprovalId = 'approvalId';
 export const ApprovalType = 'approvalType';
 export const TaskId = 'taskId';
-export const IsConflict = 'isConflict';
+export const ConflictItemId = 'conflictItemId';
 
 export const DataModelerRoleAdmin = 'admin';
 export const DataModelerRoleUser = 'user';

src/view/Manage/Model/Component/EditModel.jsx

@@ -10,7 +10,7 @@ import ImportAction from './ImportAction';
 import CatalogModal from './CatalogModal';
 import { dispatchLatest, dispatch } from '../../../../model'; 
 import { getQueryParam, isSzseEnv, showMessage, showNotifaction } from '../../../../util';
-import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId, DDL, ReadOnly, BranchId, ApprovalId, ApprovalType, TaskId, LogicId, ModelerMergeId, IsConflict, NoticeModelerId, NoticeModelerLatestVersionId } from '../../../../util/constant';
+import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId, DDL, ReadOnly, BranchId, ApprovalId, ApprovalType, TaskId, LogicId, ModelerMergeId, IsConflict, NoticeModelerId, NoticeModelerLatestVersionId, ConflictItemId } from '../../../../util/constant';
 import HistoryAndVersionDrawer from './HistoryAndVersionDrawer';
 import { EditModelContext } from './ContextManage';
 import EditInherited from './EditInherited';
@@ -24,7 +24,7 @@ import MetadataCompare from './metadata-compare';
 import './EditModel.less';
 
 const EditModel = (props) => {
-  const [ actionData, setActionData ] = useState({ action: '', catalogId: '', modelerId: '', hints: [],  roughModelerData: null, permitCheckOut: false, editable: false, stateId: '', versionId: '', ddl: '', readOnly: false, branchId: '', approvalId: '', approvalType: '', taskId: '', logicId: '', mergeId: '', isConflict: false, noticeModelerId: '', noticeModelerLatestVersionId: '' });
+  const [ actionData, setActionData ] = useState({ action: '', catalogId: '', modelerId: '', hints: [],  roughModelerData: null, permitCheckOut: false, editable: false, stateId: '', versionId: '', ddl: '', readOnly: false, branchId: '', approvalId: '', approvalType: '', taskId: '', logicId: '', mergeId: '', _conflictItemId: '', noticeModelerId: '', noticeModelerLatestVersionId: '' });
 
   const [ modelerData, setModelerData ] = useState({});
   const [ terms, setTerms ] = useState([]);
@@ -55,7 +55,7 @@ const EditModel = (props) => {
   const attrIsEditingRef = useRef(false);
   const indexIsEditingRef = useRef(false);
 
-  const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId, ddl, readOnly, branchId, approvalId, approvalType, taskId, logicId, mergeId, isConflict, noticeModelerId, noticeModelerLatestVersionId } = actionData;
+  const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId, ddl, readOnly, branchId, approvalId, approvalType, taskId, logicId, mergeId, conflictItemId, noticeModelerId, noticeModelerLatestVersionId } = actionData;
 
   const [form] = Form.useForm();
   const [modal, contextHolder] = Modal.useModal()
@@ -79,7 +79,7 @@ const EditModel = (props) => {
     const _taskId = getQueryParam(TaskId, props.location.search)
     const _logicId = getQueryParam(LogicId, props.location.search)
     const _mergeId = getQueryParam(ModelerMergeId, props.location.search)
-    const _isConflict = getQueryParam(IsConflict, props.location.search)
+    const _conflictItemId = getQueryParam(ConflictItemId, props.location.search)
     const _noticeModelerId = getQueryParam(NoticeModelerId, props.location.search)
     const _noticeModelerLatestVersionId = getQueryParam(NoticeModelerLatestVersionId, props.location.search)
 
@@ -99,7 +99,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, ddl: _ddl, readOnly: _readOnly, branchId: _branchId, approvalId: _approvalId, approvalType: _approvalType, taskId: _taskId, logicId: _logicId, mergeId: _mergeId, isConflict: (_isConflict==='true'), noticeModelerId: _noticeModelerId, noticeModelerLatestVersionId: _noticeModelerLatestVersionId });
+    setActionData({ action: _action, catalogId: _catalogId, modelerId: _modelerId, hints: _hints, roughModelerData: _roughModelerData, permitCheckOut: (_permitCheckOut==='true'), editable: (_editable==='true'), stateId: _stateId, versionId: _versionId, ddl: _ddl, readOnly: _readOnly, branchId: _branchId, approvalId: _approvalId, approvalType: _approvalType, taskId: _taskId, logicId: _logicId, mergeId: _mergeId, conflictItemId: _conflictItemId, noticeModelerId: _noticeModelerId, noticeModelerLatestVersionId: _noticeModelerLatestVersionId });
     actionRef.current = _action;
 
     if (_approvalId) {
@@ -281,13 +281,13 @@ const EditModel = (props) => {
 
             showMessage("success", '保存模型成功');
 
-            if (isConflict) {
+            if (conflictItemId) {
               processConflictDataModel()
             }
 
             const _action = getQueryParam(Action, props.location.search);
             
-            setActionData({ ...actionData, ...{ action: (_action==='flow')?'flow':'detail', modelerId: data.id||'', stateId: data?.state?.id||'', permitCheckOut: data?.permitCheckOut||false, editable: data?.editable||false, isConflict: false, branchId: data?.branch?.id } });
+            setActionData({ ...actionData, ...{ action: (_action==='flow')?'flow':'detail', modelerId: data.id||'', stateId: data?.state?.id||'', permitCheckOut: data?.permitCheckOut||false, editable: data?.editable||false, conflictItemId: '', branchId: data?.branch?.id } });
             actionRef.current = (_action==='flow')?'flow':'detail';
 
             LocalStorage.set('modelId', data.id||'');
@@ -328,7 +328,7 @@ const EditModel = (props) => {
       type: 'datamodel.processConflictDataModel',
       payload: { 
         params: {
-          conflictItemId: modelerId
+          conflictItemId
         }
       },
       callback: () => {}

src/view/Manage/Model/Component/branch-model-sync.jsx

@@ -6,7 +6,7 @@ import { CompareDetail } from './VersionCompare'
 
 import './VersionCompare.less'
 import { formatDate } from '../../../../util'
-import { Action, IsConflict, ModelerId, ModelerMergeId } from '../../../../util/constant'
+import { Action, ConflictItemId, IsConflict, ModelerId, ModelerMergeId } from '../../../../util/constant'
 
 const FC = (props) => {
   const { type = '', item, visible, title = '基线模型变更提醒',readonly = false, onCancel } = props
@@ -27,7 +27,7 @@ const FC = (props) => {
       callback: data => {
         setWaiting(false)
         if (type === 'notice') {
-          window.open(`/data-govern/data-model-action?${Action}=edit&${ModelerId}=${item?.id}&${ModelerMergeId}=${data?.id}&${IsConflict}=true`); 
+          window.open(`/data-govern/data-model-action?${Action}=edit&${ModelerId}=${item?.id}&${ModelerMergeId}=${data?.id}&${ConflictItemId}=${item?.conflictItemId}`); 
         } else {
           window.open(`/data-govern/data-model-action?${Action}=edit&${ModelerId}=${item?.id}&${ModelerMergeId}=${data?.id}`); 
         }     

src/view/Manage/ModelCompareList/index.jsx

@@ -82,7 +82,8 @@ const FC = (props) => {
             setBranchModelSyncParams({
               visible: true,
               item: {
-                id: record.conflictEasyDataModelerDataModelId
+                id: record.conflictEasyDataModelerDataModelId,
+                conflictItemId: record.conflictItemId,
               }
             })
           }}>冲突详情</a>