Renxy il y a 2 ans
Parent
commit
9e783d558c

+ 1 - 1
src/pages/Detail/FormAndFilesNode.js

@@ -14,7 +14,7 @@ const renderFrom = data => {
     return (
       <>
         {formData.map((item, idx) => {
-          const value = item.value[0];
+          const value = item.value.join(',');
           return (
             <Form.Item
               key={`FormAndFilesNode_${idx}`}

+ 6 - 1
src/pages/Flow/List.js

@@ -79,7 +79,12 @@ function List(props) {
         )}
       </div>
 
-      <Table rowKey="Id" dataSource={list} columns={columns} />
+      <Table
+        rowKey="Id"
+        loading={loading['flow/queryFlowList']}
+        dataSource={list}
+        columns={columns}
+      />
 
       <FlowModal
         loading={loading['flow/addFlow']}

+ 2 - 1
src/pages/List/ClassifyModal.js

@@ -2,7 +2,7 @@ import { Button, List, Modal, Select, Table } from 'antd';
 import TreeSelect from 'rc-tree-select';
 import React, { useEffect, useMemo } from 'react';
 
-const ClassifyModal = ({ data, visible, userList, onClose, handleChange }) => {
+const ClassifyModal = ({ data, visible, userList, onClose, handleChange, loading }) => {
   const { classify = [], project_id } = data;
   const list = useMemo(() => {
     return userList.map(item => {
@@ -66,6 +66,7 @@ const ClassifyModal = ({ data, visible, userList, onClose, handleChange }) => {
       ]}
     >
       <Table
+        loading={loading}
         columns={columns}
         dataSource={classify}
         pagination={{ position: ['none', 'none'], pageSize: 999 }}

+ 9 - 6
src/pages/List/List.js

@@ -14,7 +14,7 @@ import { getToken } from '@/utils/utils';
 import ClassifyModal from './ClassifyModal';
 
 function List(props) {
-  const { excel, loading, project, dispatch, versionList, typeOptions, userList } = props;
+  const { excel, loading, project, dispatch, typeOptions, userList } = props;
   const [flowVisible, setFlowVisible] = useState(false);
   const [version, setVersion] = useState({});
   const [versionVisible, setVersionVisible] = useState(false);
@@ -22,6 +22,7 @@ function List(props) {
   const [loading2, setLoading2] = useState(false);
   const [commitLoading, setCommitLoading] = useState(false);
   const [visible, setVisible] = useState(false);
+  const [classifyLoading, setClassifyLoading] = useState(false);
 
   const [data, setData] = useState([]);
 
@@ -58,9 +59,11 @@ function List(props) {
             <a
               onClick={async () => {
                 try {
+                  setClassifyLoading(true);
+                  setVisible(true);
                   const data = await queryBindClassify({ project_id: record.project_id }); //record.project_id
+                  setClassifyLoading(false);
                   setData({ project_id: record.project_id, classify: data });
-                  setVisible(true);
                 } catch (error) {}
               }}
             >
@@ -111,9 +114,9 @@ function List(props) {
     dispatch({
       type: 'list/queryProject',
     });
-    dispatch({
-      type: 'list/queryVersionsList',
-    });
+    // dispatch({
+    //   type: 'list/queryVersionsList',
+    // });
     dispatch({
       type: 'user/fetch',
     });
@@ -225,6 +228,7 @@ function List(props) {
         onDelVersion={onDelVersion}
       />
       <ClassifyModal
+        loading={classifyLoading}
         visible={visible}
         data={data}
         userList={userList}
@@ -240,7 +244,6 @@ export default connect(({ list, loading, detail, user }) => ({
   project: list.project,
   loading: loading.models.list,
   loadingVersion: loading,
-  versionList: list.versionList,
   typeOptions: list.typeOptions,
   userList: user.list,
 }))(List);