系统逻辑模型创建物理模型

src/model/datamodel.js

@@ -802,4 +802,8 @@ export function* getModelBranchNotice(payload) {
 
 export function* getMetadataTable(payload) {
   return yield call(datamodelerService.getMetadataTable, payload)
+}
+
+export function* conceptualModelCreateDataModel(payload) {
+  return yield call(datamodelerService.conceptualModelCreateDataModel, payload)
 }
\ No newline at end of file

src/service/datamodeler.js

@@ -758,4 +758,8 @@ export function getModelBranchNotice(payload) {
 
 export function getMetadataTable(payload) {
   return PostJSON("/baseservice/dataSecurityGrade/getTablePage", payload)
+}
+
+export function conceptualModelCreateDataModel(payload) {
+  return PostJSON("/datamodeler/easyDataModelerConceptualModeling/populdateDataModel", payload)
 }
\ No newline at end of file

src/util/constant.js

@@ -8,6 +8,7 @@ export const Action = 'action';
 export const CatalogId = 'cid';
 export const BranchId = 'branchId';
 export const ModelerId = 'mid';
+export const LogicId = 'logicId';
 export const Hints = 'hints';
 export const ModelerData = 'mdata';
 export const DDL = 'ddl';

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 } from '../../../../util/constant';
+import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId, DDL, ReadOnly, BranchId, ApprovalId, ApprovalType, TaskId, LogicId } from '../../../../util/constant';
 import HistoryAndVersionDrawer from './HistoryAndVersionDrawer';
 import { EditModelContext } from './ContextManage';
 import EditInherited from './EditInherited';
@@ -25,7 +25,7 @@ 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: '' });
+  const [ actionData, setActionData ] = useState({ action: '', catalogId: '', modelerId: '', hints: [],  roughModelerData: null, permitCheckOut: false, editable: false, stateId: '', versionId: '', ddl: '', readOnly: false, branchId: '', approvalId: '', approvalType: '', taskId: '', logicId: '' });
 
   const [ modelerData, setModelerData ] = useState({});
   const [ terms, setTerms ] = useState([]);
@@ -56,7 +56,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 } = actionData;
+  const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId, ddl, readOnly, branchId, approvalId, approvalType, taskId, logicId } = actionData;
 
   const [form] = Form.useForm();
   const [modal, contextHolder] = Modal.useModal()
@@ -78,6 +78,7 @@ const EditModel = (props) => {
     const _approvalId = getQueryParam(ApprovalId, props.location.search)
     const _approvalType = getQueryParam(ApprovalType, props.location.search)
     const _taskId = getQueryParam(TaskId, props.location.search)
+    const _logicId = getQueryParam(LogicId, props.location.search)
 
     let _hints = [];
     if ((_hintsStr||'') !== '') {
@@ -91,7 +92,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 });
+    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 });
     actionRef.current = _action;
 
     if (_approvalId) {
@@ -728,6 +729,7 @@ const EditModel = (props) => {
                 permitCheckOut={permitCheckOut} 
                 versionId={versionId} branchId={branchId} autoTabKey={autoTabKey} 
                 approvalModelId={currentApprovalModelId} approvalId={approvalId} 
+                logicId={logicId}
                 height={containerHeight} 
                 onChange={onActionChange} 
                 {...props} 

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

@@ -19,7 +19,7 @@ import './ImportAction.less'
 export const importActionSubject = new Subject()
 
 const ImportAction = React.forwardRef((props, ref) => {
-  const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, catalogId, branchId, approvalModelId, approvalId, reference = '', height } = props;
+  const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, catalogId, branchId, approvalModelId, approvalId, logicId, reference = '', height } = props;
 
   const [ constraints, setConstraints ] = useState([]);
   const [ constraint, setConstraint ] = useState({});
@@ -75,7 +75,9 @@ const ImportAction = React.forwardRef((props, ref) => {
       type: 'datamodel.getAllConstraints',
       callback: data => {
         setConstraints(data);
-        if (action === 'add') {
+        if (logicId) {
+          conceptualModelCreateDataModel()
+        } else if (action === 'add') {
           // setConstraint(data?.length>0?data[0]:{});
           // setTemplate({});
           if ((hints||[]).length>0) {
@@ -189,6 +191,24 @@ const ImportAction = React.forwardRef((props, ref) => {
     }) 
   }
 
+  const conceptualModelCreateDataModel = () => { 
+    dispatch({
+      type: 'datamodel.conceptualModelCreateDataModel',
+      payload: {
+        data: [logicId]  
+      },
+      callback: data => {
+        setLoading(false);
+        if ((data??[]).length > 0) {
+          getExtraData(data[0]);
+        }
+      },
+      error: () => {
+        setLoading(false);
+      }
+    })
+  }
+
   const getDraft = (_constraint, _template, _hints) => { 
     dispatch({
       type: 'datamodel.getDraft',