feat: add loading for open project (#2707)

alibaba · Aug 14, 2019 · 96690ce · 96690ce
1 parent 3760bea
commit 96690ce
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/packages/iceworks-client/src/components/SelectWorkFolderModal/index.js b/packages/iceworks-client/src/components/SelectWorkFolderModal/index.js
@@ -7,7 +7,7 @@ import Modal from '@components/Modal';
 import showMessage from '@utils/showMessage';
 import styles from './index.module.scss';
 
-const SelectWorkFolderModal = ({ on, onCancel, onOk }) => {
+const SelectWorkFolderModal = ({ on, onCancel, onOk, loading }) => {
   const [workFolder, setWorkFolder] = useState({});
   const {path: workPath, directories = [], disabled = true} = workFolder;
 
@@ -70,9 +70,8 @@ const SelectWorkFolderModal = ({ on, onCancel, onOk }) => {
       title="打开项目"
       visible={on}
       onCancel={onCancel}
-      onOk={async () => {
-        await onOk(workPath);
-      }}
+      onOk={() => onOk(workPath)}
+      okProps={{loading}}
     >
       <div className={styles.wrap}>
         <div className={styles.bar}>
@@ -117,10 +116,15 @@ const SelectWorkFolderModal = ({ on, onCancel, onOk }) => {
   );
 };
 
+SelectWorkFolderModal.defaultProps = {
+  loading: false,
+};
+
 SelectWorkFolderModal.propTypes = {
   on: PropTypes.bool.isRequired,
   onCancel: PropTypes.func.isRequired,
   onOk: PropTypes.func.isRequired,
+  loading: PropTypes.bool,
 };
 
 export default SelectWorkFolderModal;
diff --git a/packages/iceworks-client/src/hooks/useProject.js b/packages/iceworks-client/src/hooks/useProject.js
@@ -19,6 +19,8 @@ function useProject({ panelStores } = {}) {
   const {
     on: onOpenProjectModal,
     setModal: setOpenProjectModal,
+    loading: openProjectLoading,
+    setLoading: setOpenProjectLoading,
   } = useModal();
   const {
     on: onDeleteProjectModal,
@@ -69,6 +71,19 @@ function useProject({ panelStores } = {}) {
     }
   }
 
+  async function onAddProject(path) {
+    setOpenProjectLoading(true);
+
+    try {
+      await addProject(path);
+      setOpenProjectModal(false);
+    } catch (err) {
+      showMessage(err);
+    }
+
+    setOpenProjectLoading(false);
+  }
+
   async function addProject(path) {
     await projectsStore.add(path);
     await refreshProjects();
@@ -77,7 +92,6 @@ function useProject({ panelStores } = {}) {
       module: 'project',
       action: 'add-project',
     });
-    setOpenProjectModal(false);
   }
 
   async function deleteProject(params) {
@@ -163,7 +177,6 @@ function useProject({ panelStores } = {}) {
     refreshProjects,
     refreshProject,
     createProject,
-    addProject,
     deleteProject,
     sortProjectPanel,
 
@@ -175,10 +188,13 @@ function useProject({ panelStores } = {}) {
     },
     onOpenProjectModal,
     setOpenProjectModal,
+    openProjectLoading,
+    setOpenProjectLoading,
     onDeleteProjectModal,
     setDeleteProjectModal,
 
     // event handles
+    onAddProject,
     onCreateProject,
     onOpenProject,
     onDeleteProject,

diff --git a/packages/iceworks-client/src/pages/Project/index.js b/packages/iceworks-client/src/pages/Project/index.js
@@ -107,10 +107,10 @@ const Project = ({ history, intl }) => {
 
     refreshProjects,
     refreshProjectStore,
-    addProject,
     deleteProject,
     sortProjectPanel,
 
+    onAddProject,
     onSwitchProject,
     onDeleteProject,
     onOpenProject,
@@ -120,6 +120,7 @@ const Project = ({ history, intl }) => {
 
     onOpenProjectModal,
     setOpenProjectModal,
+    openProjectLoading,
     onDeleteProjectModal,
     setDeleteProjectModal,
     onCreateProjectModal,
@@ -248,7 +249,8 @@ const Project = ({ history, intl }) => {
       <SelectWorkFolderModal
         on={onOpenProjectModal}
         onCancel={() => setOpenProjectModal(false)}
-        onOk={addProject}
+        onOk={onAddProject}
+        loading={openProjectLoading}
       />
       <DeleteProjectModal
         on={onDeleteProjectModal}