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

src/model/datamodel.js

@@ -456,4 +456,8 @@ export function* getDbTypes() {
 //zcx hive
 export function* getHiveStoredTypes() {
   return yield call(datamodelerService.getHiveStoredTypes)
+}
+
+export function* conceptualModelCreateDataModel(payload) {
+  return yield call(datamodelerService.conceptualModelCreateDataModel, payload)
 }
\ No newline at end of file

src/service/datamodeler.js

@@ -412,4 +412,8 @@ export function getDbTypes() {
 //zcx hive
 export function getHiveStoredTypes() {
   return GetJSON("/datamodeler/easyDataModelerCURD/getHiveStoredTypes")
+}
+
+export function conceptualModelCreateDataModel(payload) {
+  return PostJSON("/datamodeler/easyDataModelerConceptualModeling/populdateDataModel", payload)
 }
\ No newline at end of file

src/util/constant.js

@@ -9,6 +9,7 @@ export const Action = 'action';
 export const CatalogId = 'cid';
 export const RequireId = 'rid';
 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

@@ -7,7 +7,7 @@ import ImportAction from './ImportAction';
 import CatalogModal from './CatalogModal';
 import { dispatchLatest, dispatch } from '../../../../model'; 
 import { getQueryParam, showMessage, showNotifaction } from '../../../../util';
-import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId, Holder, DDL, RequireId } from '../../../../util/constant';
+import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId, Holder, DDL, RequireId, LogicId } from '../../../../util/constant';
 import HistoryAndVersionDrawer from './HistoryAndVersionDrawer';
 
 import './EditModel.less';
@@ -25,7 +25,7 @@ const EditModel = (props) => {
 
   const actionRef = useRef('');
 
-  const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId, holder, ddl, requireId } = actionData;
+  const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId, holder, ddl, logicId, requireId } = actionData;
 
   const [form] = Form.useForm();
 
@@ -42,7 +42,7 @@ const EditModel = (props) => {
     const _holder = getQueryParam(Holder, props.location.search);
     const _ddl = getQueryParam(DDL, props.location.search);
     const _requireId = getQueryParam(RequireId, props.location.search);
-
+    const _logicId = getQueryParam(LogicId, props.location.search);
 
     let _hints = [];
     if ((_hintsStr||'') !== '') {
@@ -56,7 +56,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, holder: _holder, ddl: _ddl, requireId: _requireId });
+    setActionData({ action: _action, catalogId: _catalogId, modelerId: _modelerId, hints: _hints, roughModelerData: _roughModelerData, permitCheckOut: (_permitCheckOut==='true'), editable: (_editable==='true'), stateId: _stateId, versionId: _versionId, holder: _holder, ddl: _ddl, requireId: _requireId, logicId: _logicId });
     actionRef.current = _action;
 
     const interval = setInterval(() => {
@@ -343,7 +343,7 @@ const EditModel = (props) => {
       </div> */}
       <div className='edit-container'>
         <div className='edit-container-card'>
-          <ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} ddl={ddl} form={form} terms={terms} roughModelerData={roughModelerData} permitCheckOut={permitCheckOut} stateId={stateId} versionId={versionId} autoTabKey={autoTabKey} {...props} /> 
+          <ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} ddl={ddl} form={form} terms={terms} roughModelerData={roughModelerData} permitCheckOut={permitCheckOut} stateId={stateId} versionId={versionId} autoTabKey={autoTabKey} logicId={logicId} {...props} /> 
         </div>
       </div>
       <div className='edit-footer'>

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

@@ -15,7 +15,7 @@ import { dispatch } from '../../../../model';
 import './ImportAction.less'
 
 const ImportAction = React.forwardRef((props, ref) => {
-  const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, catalogId } = props;
+  const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, catalogId, logicId } = props;
 
   const [ constraints, setConstraints ] = useState([]);
   const [ constraint, setConstraint ] = useState({});
@@ -74,7 +74,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) {
@@ -159,6 +161,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',