存量模型导入

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

-import React, { useContext } from 'react';
+import React from 'react';
 import { Modal, Button, Select, Input } from 'antd';
 
 import { showMessage } from '../../../../util';
@@ -270,7 +270,7 @@ class ExportDDLModal extends React.Component {
 
   render() {
     const { visible, onCancel, names, ids, reference } = this.props;
-    const { ddlGenerators, loadingDDLGenerators, confirmLoading, selectDDLGeneratorName, ddlExportSuccess, ddlExportString, selectModalerNameKey, loadingDatabases, loadingSchemas, databases, schemas, currentDatabaseId, currentSchemaId, filterDatabases } = this.state;
+    const { ddlGenerators, loadingDDLGenerators, confirmLoading, selectDDLGeneratorName, ddlExportSuccess, ddlExportString, selectModalerNameKey, loadingDatabases, loadingSchemas, schemas, currentDatabaseId, currentSchemaId, filterDatabases } = this.state;
 
     let title = '';
     if (reference === 'exportDDL') {

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

@@ -216,7 +216,7 @@ const ImportActionHeader = (props) => {
                 label="数据表类型"
                 name="easyDataModelerModelingTemplate"
                 labelAlign="left"
-                rules={[{ required: true, message: '请选择数据表类型!' }]}
+                rules={[{ required: false, message: '请选择数据表类型!' }]}
               >
                 <TemplateSelect 
                   templates={templates} 

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

@@ -6,7 +6,7 @@ import { dispatchLatest } from '../../../../model';
 import { showMessage } from '../../../../util';
 
 const ImportWordModal = (props) => {
-  const { onCancel, visible, catalogId } = props;
+  const { onCancel, visible, catalogId, reference = '' } = props;
   const [ fileList, setFileList ] = useState([]);
   const [ confirmLoading, setConfirmLoading ] = useState(false);
 
@@ -40,7 +40,8 @@ const ImportWordModal = (props) => {
       type: 'datamodel.importWordGenerateModel',
       payload: { 
         params: {
-          catalogId
+          catalogId,
+          stateId: (reference==='stock')?'':'1'
         },
         fileList 
       },
@@ -64,7 +65,7 @@ const ImportWordModal = (props) => {
     <Modal 
       forceRender
       visible={visible}
-      title='Word导入'
+      title={(reference==='')?'Word导入':'存量模型导入'}
       width={520}
       confirmLoading={confirmLoading}
       onCancel={() => {

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

@@ -97,7 +97,10 @@ const ModelTable = (props) => {
               }) 
             }
             {
-              record?.deployable && <Button size='small' onClick={() => { deployAction(record); }} >建表</Button>
+              record?.deployable && <React.Fragment>
+                <Divider type='vertical'  />
+                <Button size='small' onClick={() => { deployAction(record); }} >建表</Button>
+              </React.Fragment> 
             }
           </Space>
         )

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

 import React, { useState, useEffect, useRef } from "react";
 import { Tooltip, Tree, Modal, Spin, Dropdown, Menu } from "antd";
-import { PlusOutlined, EditOutlined, SyncOutlined, DeleteOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import { PlusOutlined, EditOutlined, SyncOutlined, DeleteOutlined, UnorderedListOutlined, ImportOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 
 import UpdateTreeItemModal from './UpdateTreeItemModal';
@@ -23,7 +23,7 @@ const viewModes = [
 
 const ModelTree = (props) => {
 
-  const { onSelect, onViewChange, refrence='' } = props;
+  const { onSelect, onViewChange, refrence='', importStockModel } = props;
   const [ loading, setLoading ] = useState(false);
   const [ treeData, setTreeData ] = useState(null);
   const [ item, setItem ] = useState(null);
@@ -343,6 +343,13 @@ const ModelTree = (props) => {
               </Tooltip>
           )
         }      
+        {
+          viewSelectedKey==='dir' && ( 
+            <Tooltip title="存量模型导入" className='ml-4'>
+              <ImportOutlined onClick={() => { importStockModel && importStockModel() }} style={{ fontSize:16,cursor:'pointer' }} />
+            </Tooltip>
+          )
+        }
         <Tooltip title="刷新目录" className='ml-4'>
           <SyncOutlined onClick={refresh} style={{ fontSize:16,cursor:'pointer' }} />
         </Tooltip>

src/view/Manage/Model/index.jsx

@@ -28,6 +28,7 @@ class Model extends React.Component {
       constraintDetailDrawerVisible: false,
       importModalVisible: false,
       importWordModalVisible: false,
+      importWordModalReference: '',
       exportDDLModalVisible: false,
       recatalogModalVisible: false,
       catalogId: '',
@@ -196,7 +197,7 @@ class Model extends React.Component {
       return;
     }
 
-    this.setState({ importWordModalVisible: true });
+    this.setState({ importWordModalVisible: true, importWordModalReference: '' });
     
   }
 
@@ -361,8 +362,12 @@ class Model extends React.Component {
     }
   }
 
+  importStockModel = () => {
+    this.setState({ importWordModalVisible: true, importWordModalReference: 'stock' });
+  }
+
   render() {
-    const { importModalVisible, catalogId, loadingTableData, selectModelerIds, keyword, filterTableData, selectModelerNames, importModalAddMode, exportErwinLoading, exportDDLModalVisible, templateCURDDrawerVisible, wordTemplateModalVisible, constraintDetailDrawerVisible, importWordModalVisible, loadingStates, modelStates, currentModelState, currentView, recatalogModalVisible, exportDDLModalReference, currentModel } = this.state;
+    const { importModalVisible, catalogId, loadingTableData, selectModelerIds, keyword, filterTableData, selectModelerNames, importModalAddMode, exportErwinLoading, exportDDLModalVisible, templateCURDDrawerVisible, wordTemplateModalVisible, constraintDetailDrawerVisible, importWordModalVisible, loadingStates, modelStates, currentModelState, currentView, recatalogModalVisible, exportDDLModalReference, currentModel, importWordModalReference } = this.state;
 
     const content = (
       <ModelTable 
@@ -387,7 +392,7 @@ class Model extends React.Component {
     return (
       <div className='data-model'>
         <div className='left'>
-          <ModelTree onViewChange={this.onViewChange} onSelect={this.onTreeSelect} {...this.props} />
+          <ModelTree onViewChange={this.onViewChange} onSelect={this.onTreeSelect} importStockModel={this.importStockModel} {...this.props} />
         </div> 
         <div className='right'>
           <div
@@ -469,6 +474,7 @@ class Model extends React.Component {
           visible={importWordModalVisible}
           onCancel={this.onImportWordModalCancel}
           catalogId={catalogId} 
+          reference={importWordModalReference}
         />
         
         <AppContext.Consumer>