From 7eb8ba79f8445989c18a126f1d7d340924d74506 Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Mon, 1 Jul 2024 15:03:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=91loading=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/component/tree/tree-api.vue            | 32 +++++++++++++++---------------
 lib/saas/view/system/layout/breadcrumb.vue |  2 +-
 lib/saas/view/system/layout/tags.vue       |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/component/tree/tree-api.vue b/lib/component/tree/tree-api.vue
index f2d9009..448eda6 100644
--- a/lib/component/tree/tree-api.vue
+++ b/lib/component/tree/tree-api.vue
@@ -1,25 +1,26 @@
 <template>
-  <a-spin :spinning="treeState.loading">
-    <div class="ns-tree-form">
-      <div v-if="header" class="ns-tree-title">
-        <ns-icon :name="header.icon" size="14" />
-        <span>{{ header.title }}</span>
-      </div>
-      <div v-if="!formConfig?.schema">
-        <ns-form ref="formElRef" v-bind="formConfig" :model="formModel" @finish="formFinish" />
-      </div>
+  <div class="ns-tree-form">
+    <div v-show="header" class="ns-tree-title">
+      <ns-icon :name="header.icon" size="14" />
+      <span>{{ header.title }}</span>
+    </div>
+    <div v-show="!formConfig?.schema">
+      <ns-form ref="formElRef" v-bind="formConfig" :model="formModel" @finish="formFinish" />
     </div>
-    <div>
+  </div>
+  <a-spin :spinning="treeState.loading">
+    <div style="min-height: 300px">
       <ns-tree v-if="treeData?.length" v-bind="getBindValue" v-model:selectedKeys="selectedKeys">
         <template #[item]="data" v-for="(item, index) in Object.keys($slots)" :key="index">
           <slot :name="item" v-bind="data || {}"></slot>
         </template>
       </ns-tree>
+      <!-- <a-empty v-if="!treeData?.length" /> -->
     </div>
   </a-spin>
 </template>
 <script lang="ts" setup>
-  import { computed, reactive, ref, unref, useAttrs } from 'vue';
+  import { computed, nextTick, reactive, ref, unref, useAttrs } from 'vue';
   import { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
   import { useApi } from '/nerv-lib/use/use-api';
   import { AxiosRequestConfig } from 'axios';
@@ -27,14 +28,13 @@
   import { useRoute } from 'vue-router';
   import { debounce } from 'lodash-es';
   import { treeProps, treeFormProps } from '/nerv-lib/component/tree/props';
-  const formElRef = ref();
+
   defineOptions({
     name: 'NsTreeApi',
   });
-  const props = defineProps(treeProps);
-
-  console.log(props);
 
+  const formElRef = ref();
+  const props = defineProps(treeProps);
   const treeData = ref<TreeDataItem[]>([]);
   const selectedKeys = ref(props.selectedKeys || []);
   const { httpRequest } = useApi();
@@ -82,7 +82,6 @@
     })
       .then((res) => {
         treeData.value = transform(get(res, resultField));
-        console.log(treeData.value, 'treeData.value');
       })
       .finally(() => {
         setLoading(false);
@@ -123,6 +122,7 @@
     }
     & ~ div {
       padding: 0 @gap !important;
+      width: 100%;
     }
   }
 </style>
diff --git a/lib/saas/view/system/layout/breadcrumb.vue b/lib/saas/view/system/layout/breadcrumb.vue
index 4f61866..81eec46 100644
--- a/lib/saas/view/system/layout/breadcrumb.vue
+++ b/lib/saas/view/system/layout/breadcrumb.vue
@@ -87,7 +87,7 @@
     width: 100%;
     padding: 0 @ns-gap;
     min-height: @ns-nav-shutters-height;
-    background: #ffffff;
+    background: @white;
     display: flex;
     align-items: center;
     position: fixed;
diff --git a/lib/saas/view/system/layout/tags.vue b/lib/saas/view/system/layout/tags.vue
index 4ce9096..8dbf797 100644
--- a/lib/saas/view/system/layout/tags.vue
+++ b/lib/saas/view/system/layout/tags.vue
@@ -299,7 +299,7 @@
     // padding: 0 12px;
     min-height: @ns-nav-shutters-height;
     height: @ns-nav-shutters-height;
-    background: #ffffff;
+    background: @white;
     display: flex;
     align-items: center;
     position: fixed;
@@ -312,7 +312,7 @@
     // padding: 0 12px;
     min-height: @ns-nav-shutters-height;
     height: @ns-nav-shutters-height;
-    background: #ffffff;
+    background: @white;
     display: flex;
     align-items: center;
     position: fixed;