From ad3c9f837fba3d3c3f8a4c8b1dc3fd4d1e438b08 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 23 Feb 2021 11:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Settings/new_tags.js | 37 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js
index 10ccbdda..d0affbc8 100644
--- a/src/forge/Settings/new_tags.js
+++ b/src/forge/Settings/new_tags.js
@@ -46,7 +46,7 @@ class NewTags extends Component {
       description: "",
       id: "",
       modelname: "",
-      isSpin: false,
+      isSpin: true,
     };
   }
   componentDidUpdate=(prevPros)=>{
@@ -60,6 +60,9 @@ class NewTags extends Component {
   };
 
   getList = (page, order_name, order_type) => {
+    this.setState({
+      isSpin:true
+    })
     const { projectsId , owner } = this.props.match.params;
     const { limit } = this.state;
     const url = `/${owner}/${projectsId}/labels.json`;
@@ -76,6 +79,7 @@ class NewTags extends Component {
         if (result) {
           this.setState({
             data: result.data,
+            isSpin:false
           });
         }
       })
@@ -247,7 +251,6 @@ class NewTags extends Component {
 
   render() {
     const { data, limit, page, isSpin } = this.state;
-    const { projectsId } = this.props.match.params;
     const { getFieldDecorator } = this.props.form;
 
     const menu = (
@@ -409,8 +412,8 @@ class NewTags extends Component {
             </div>
           </div>
         );
-      } else {
-        return <NoneData _html="暂时还没有相关数据!" />;
+      } else if(data && data.issue_tags && data.issue_tags.length === 0) {
+        return <NoneData _html="暂时还没有相关数据!" />
       }
     };
 
@@ -473,25 +476,23 @@ class NewTags extends Component {
                   ) : null}
                 </div>
                 <div className="fr" style={{ marginTop: 5 }}>
-                  <Spin spinning={isSpin}>
-                    <Button
-                      type="primary"
-                      onClick={this.createtagpost}
-                      className="fr"
-                    >
-                      创建标签
-                    </Button>
-                    {/* <a onClick={this.createtagpost} className="topWrapper_btn fr" >创建标签</a> */}
-                    <a onClick={this.newclose} className="a_btn cancel_btn fr">
-                      取消
-                    </a>
-                  </Spin>
+                  <Button
+                    type="primary"
+                    onClick={this.createtagpost}
+                    className="fr"
+                  >
+                    创建标签
+                  </Button>
+                  {/* <a onClick={this.createtagpost} className="topWrapper_btn fr" >创建标签</a> */}
+                  <a onClick={this.newclose} className="a_btn cancel_btn fr">
+                    取消
+                  </a>
                 </div>
               </div>
             </Form>
           </div>
           <div className="padding20-30">
-            {renderList()}
+            <Spin spinning={isSpin}><div style={{minHeight:"350px"}}>{renderList()}</div></Spin>
             {Paginations}
           </div>
         </div>