模型批量送审

src/model/datamodel.js

@@ -210,6 +210,10 @@ export function* recommandEnglishWords(payload) {
   return yield call(datamodelerService.recommandEnglishWords, payload);
 }
 
+export function* startFlow(payload) {
+  return yield call(datamodelerService.startFlow, payload);
+}
+
 export function* getDatasourcesByEnv(payload) {
   return yield call(datamodelerService.getDatasourcesByEnv, payload);
 }

src/service/datamodeler.js

@@ -181,6 +181,10 @@ export function recommandEnglishWords(payload) {
   return PostJSON("/datamodeler/easyDataModelerDesign/recommandEnglishWords", payload);
 }
 
+export function startFlow(payload) {
+  return PostJSON("/datamodeler/easyDataModelerWorkflowSupport/startModelFlow", payload);
+}
+
 export function getDatasourcesByEnv (payload) {
   return GetJSON("/metadatarepo/rest/metadata/findByModelAndSys", payload);
 }

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

@@ -124,10 +124,13 @@ const EditModel = (props) => {
     setModelerData(data);
   }
 
-  const onCatalogModalCancel = (id) => {
+  const onCatalogModalCancel = (id = null) => {
     setCatalogModalVisible(false);
+
+    if ((id||'') !== '') {
       save(null, id);
     }
+  }
 
   const onHistory = () => {
     setHistoryAndVersionDrawerVisible(true);

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

 import React, { useState, useEffect, useRef } from "react";
 import { Space, Button, Tooltip, Modal, Divider, Pagination, Table } from 'antd';
-import { EditOutlined, DeleteOutlined, DownOutlined, UpOutlined, HistoryOutlined, PullRequestOutlined } from '@ant-design/icons';
+import { EditOutlined, DeleteOutlined, DownOutlined, UpOutlined, HistoryOutlined } from '@ant-design/icons';
 import SmoothScroll from 'smooth-scroll';
 import classnames from 'classnames';
 

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

+import React, { useState } from 'react';
+import { Modal, Form, Input } from 'antd';
+import LocalStorage from 'local-storage';
+
+import { dispatchLatest } from '../../../../model';
+
+const StartFlowModal = (props) => {
+  const { visible, onCancel, ids } = props;
+
+  const [ form ] = Form.useForm();
+  const [ confirmLoading, setConfirmLoading ] = useState(false);
+
+  const formItemLayout = {
+    labelCol: {
+      xs: { span: 24 },
+      sm: { span: 4 },
+    },
+    wrapperCol: {
+      xs: { span: 24 },
+      sm: { span: 20 },
+    },
+  };
+
+  const handleOk = async () => {
+
+    try {
+      const values = await form.validateFields();
+
+      setConfirmLoading(true);
+
+      dispatchLatest({
+        type: 'user.fetchSessionInfo',
+        callback: session => {
+          dispatchLatest({
+            type: 'datamodel.startFlow',
+            payload: {
+              params: {
+                user: session?.userName,
+                modelIds: ids.join(','),
+                flowDesc: values?.desc
+              }
+            },
+            callback: () => {
+              reset();
+              
+              LocalStorage.set('modelChange', !(LocalStorage.get('modelChange')||false));
+              onCancel && onCancel(true);
+            },
+            error: () => {
+              setConfirmLoading(false);
+            }
+          })
+        },
+        error: () => {
+          setConfirmLoading(false);
+        }
+      })
+
+    } catch (errInfo) {
+
+    }
+  }
+
+  const reset = () => {
+    setConfirmLoading(false);
+    form.resetFields();
+  }
+
+  return (
+    <Modal 
+      forceRender
+      visible={visible}
+      title='模型送审'
+      width={520}
+      confirmLoading={confirmLoading}
+      onCancel={() => {
+        reset();
+        onCancel && onCancel();
+      }}
+      onOk={handleOk}
+    >
+    <Form 
+      {...formItemLayout}
+      form={form}
+    >
+      <Form.Item 
+        label="送审内容" 
+        name="desc" 
+        rules={[{ required: true, message: '请填写送审内容' }]}
+      >
+        <Input.TextArea rows={6} />
+      </Form.Item>
+    </Form>
+    </Modal>
+  );
+}
+
+export default StartFlowModal;
\ No newline at end of file

src/view/Manage/Model/index.jsx

@@ -14,6 +14,7 @@ import ImportStockWordDrawer from './Component/ImportStockWordDrawer';
 import ExportDDLModal from './Component/ExportDDLModal';
 import RecatalogModal from './Component/RecatalogModal';
 import HistoryAndVersionDrawer from './Component/HistoryAndVersionDrawer';
+import StartFlowModal from './Component/StartFlowModal';
 import { showMessage, showNotifaction } from '../../../util';
 import { dispatch, dispatchLatest } from '../../../model'; 
 import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId } from '../../../util/constant';
@@ -37,6 +38,7 @@ class Model extends React.Component {
       exportDDLModalVisible: false,
       recatalogModalVisible: false,
       historyAndVersionDrawerVisible: false,
+      startFlowModalVisible: false,
       catalogId: '',
       importModalAction: '',
       importModalAddMode: '',
@@ -320,6 +322,16 @@ class Model extends React.Component {
     window.open(`/api/datamodeler/easyDataModelerExport/word/template?ids=${selectModelerIds.join(',')}`);
   }
 
+  startFlow = () => {
+    const { selectModelerIds } = this.state;
+    if ((selectModelerIds||[]).length === 0) {
+      showMessage('info', '请先选择模型');
+      return;
+    }
+
+    this.setState({ startFlowModalVisible: true });
+  }
+
   onRecatalogBtnClick = () => {
     const { selectModelerIds } = this.state;
     if ((selectModelerIds||[]).length === 0) {
@@ -412,6 +424,14 @@ class Model extends React.Component {
     this.setState({ historyAndVersionDrawerVisible: false });
   }
 
+  onStartFlowModalCancel = (refresh) => {
+    this.setState({ startFlowModalVisible: false });
+
+    if (refresh) {
+      this.onTableChange();
+    }
+  }
+
   importStockModel = () => {
     const { catalogId } = this.state;
 
@@ -463,7 +483,7 @@ class Model extends React.Component {
   }
 
   render() {
-    const { importModalVisible, catalogId, loadingTableData, selectModelerIds, keyword, filterTableData, selectModelerNames, importModalAddMode, exportDDLModalVisible, templateCURDDrawerVisible, wordTemplateModalVisible, constraintDetailDrawerVisible, importWordModalVisible, importStockWordDrawerVisible , loadingStates, modelStates, currentModelState, currentView, recatalogModalVisible, exportDDLModalReference, currentModel, offset, historyAndVersionDrawerVisible, modelerId } = this.state;
+    const { importModalVisible, catalogId, loadingTableData, selectModelerIds, keyword, filterTableData, selectModelerNames, importModalAddMode, exportDDLModalVisible, templateCURDDrawerVisible, wordTemplateModalVisible, constraintDetailDrawerVisible, importWordModalVisible, importStockWordDrawerVisible , loadingStates, modelStates, currentModelState, currentView, recatalogModalVisible, exportDDLModalReference, currentModel, offset, historyAndVersionDrawerVisible, modelerId, startFlowModalVisible } = this.state;
 
     const content = (
       <ModelTable 
@@ -597,9 +617,12 @@ class Model extends React.Component {
                   <Button type='primary'>模型导出<DownOutlined /></Button>
                 </Dropdown>
               </Space>
+              <Space>
+                  <Button type='primary' onClick={this.startFlow}>模型送审</Button>
+              </Space>
 
               <Space>
-                <Button type='primary' onClick={() => { this.onRecatalogBtnClick(); }}>
+                <Button type='primary' onClick={this.onRecatalogBtnClick}>
                   模型变更目录
                 </Button>
               </Space>
@@ -677,6 +700,12 @@ class Model extends React.Component {
           visible={historyAndVersionDrawerVisible}
           onCancel={this.onHistoryAndVersionDrawerCancel}
         />
+
+        <StartFlowModal
+          ids={selectModelerIds}
+          visible={startFlowModalVisible}
+          onCancel={this.onStartFlowModalCancel}
+        />
       </div>
     );
   }