增加提示

src/util/index.js

@@ -73,7 +73,7 @@ export class GetSession extends React.Component {
 
 export const Assert = function (arg, msg) {
   if (!arg) {
-    message.warning(msg)
+    this.showMessage('warn', msg);
     throw msg
   }
 }
@@ -96,3 +96,20 @@ export const generateUUID = function() {
   });
   return uuid;
 }
+
+export const showMessage = function(action, content) {
+  //https://github.com/ant-design/ant-design/issues/22269
+  message.config({ prefixCls: "yy-message" });
+  if (action === 'success') {
+    message.success(content);
+  }
+  if (action === 'error') {
+    message.error(content);
+  }
+  if (action === 'info') {
+    message.info(content);
+  }
+  if (action === 'warn') {
+    message.warn(content);
+  }
+}

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

 import React, { useState } from 'react';
-import { Modal, Radio, Button, Form } from 'antd';
+import { Modal, Radio, Button, Form, message } from 'antd';
 
 import ImportLog from './ImportLog';
 import ImportExcel from './ImportExcel';
@@ -7,6 +7,7 @@ import ImportMetadata from './ImportMetadata';
 import ImportAction from './ImportAction';
 
 import { dispatchLatest } from '../../../../model'; 
+import { showMessage } from '../../../../util';
 
 const modes = [
   {
@@ -47,15 +48,26 @@ const ImportModal = (props) => {
 
   const next = () => {
 
+    if (step===0) {
+      if (radioValue === '') {
+        showMessage('warn', '请先选择创建方式');
+      } else {
+        setStep(step+1);
+      }
+
+      return;
+    }
+
     if (step===1 && radioValue===0) {
       if ((excelFiles||[]).length === 0) {
-
+        showMessage('warn', '请先选择文件上传');
       } else {
         setConfirmLoading(true);
         dispatchLatest({
           type: 'datamodel.extractExcelContent',
           payload: { fileList: excelFiles },
           callback: data => {
+            setExcelFiles([]);
             setConfirmLoading(false);
             setHints(data||[]);
             setStep(step+1);
@@ -92,6 +104,7 @@ const ImportModal = (props) => {
             },
             callback: () => {
               setConfirmLoading(false);
+              reset();
               onCancel && onCancel(true);
             }
           })
@@ -104,6 +117,18 @@ const ImportModal = (props) => {
 
   }
 
+  const reset = () => {
+    setStep(0);
+    setRadioValue('');
+    setExcelFiles([]);
+    setHints([]);
+    setModelerData({});
+    setConfirmLoading(false);
+    if (form && form.resetFields) {
+      form.resetFields();
+    }
+  }
+
   const onActionChange = (data) => {
     setModelerData(data);
   }
@@ -130,6 +155,7 @@ const ImportModal = (props) => {
       destroyOnClose
       onCancel={() => {
         setStep(0);
+        reset();
         onCancel && onCancel();
       }}
       footer={[