From f2d32d82565e17d8c337ac80641dfc61c676f0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Wed, 6 Apr 2022 19:55:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChartDataMatchingAndShow/index.vue        | 59 +++++++++----------
 .../chart/ContentConfigurations/index.vue     |  2 +-
 src/views/chart/ContentLayers/index.vue       |  8 +++
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
index 9c50c790..41637bb7 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
@@ -1,10 +1,6 @@
 <template>
   <n-timeline class="go-chart-configurations-timeline">
-    <n-timeline-item
-      v-if="isCharts"
-      type="info"
-      :title="TimelineTitleEnum.MAPPING"
-    >
+    <n-timeline-item v-if="isCharts" type="info" :title="TimelineTitleEnum.MAPPING">
       <n-table striped>
         <thead>
           <tr>
@@ -21,10 +17,7 @@
                 <n-text>无</n-text>
               </n-space>
               <n-space v-else>
-                <n-badge
-                  dot
-                  :type="item.result === 1 ? 'success' : 'error'"
-                ></n-badge>
+                <n-badge dot :type="item.result === 1 ? 'success' : 'error'"></n-badge>
                 <n-text>匹配{{ item.result === 1 ? '成功' : '失败' }}</n-text>
               </n-space>
             </td>
@@ -94,10 +87,10 @@ const source = ref()
 const dimensions = ref()
 const dimensionsAndSource = ref()
 
-const { uploadFileListRef, customRequest, beforeUpload, download} = useFile(targetData)
+const { uploadFileListRef, customRequest, beforeUpload, download } = useFile(targetData)
 
 // 是图表类型
-const isCharts = computed(()=> {
+const isCharts = computed(() => {
   return targetData.value.chartConfig.package === PackagesCategoryEnum.CHARTS
 })
 
@@ -111,7 +104,7 @@ const matchingHandle = (mapping: string) => {
   let res = DataResultEnum.SUCCESS
   for (let i = 0; i < source.value.length; i++) {
     if (source.value[i][mapping] === undefined) {
-      res =  DataResultEnum.FAILURE
+      res = DataResultEnum.FAILURE
       return res
     }
   }
@@ -120,40 +113,44 @@ const matchingHandle = (mapping: string) => {
 
 // 处理映射列表
 const dimensionsAndSourceHandle = () => {
-  // 去除首项数据轴标识
-  return dimensions.value.map((dimensionsItem: string, index: number) => {
-    return index === 0 ?
-      {
-        // 字段
-        field: '通用标识',
-        // 映射
-        mapping: dimensionsItem,
-        // 结果
-        result: DataResultEnum.NULL
-      } : {
-        field: `数据项-${index}`,
-        mapping: dimensionsItem,
-        result: matchingHandle(dimensionsItem)
-      }
-  })
+  try {
+    // 去除首项数据轴标识
+    return dimensions.value.map((dimensionsItem: string, index: number) => {
+      return index === 0 ?
+        {
+          // 字段
+          field: '通用标识',
+          // 映射
+          mapping: dimensionsItem,
+          // 结果
+          result: DataResultEnum.NULL
+        } : {
+          field: `数据项-${index}`,
+          mapping: dimensionsItem,
+          result: matchingHandle(dimensionsItem)
+        }
+    })
+  } catch (error) {
+    return []
+  }
 }
 
 watch(() => targetData.value?.option?.dataset, (newData) => {
   if (newData) {
     // 只有 Echarts 数据才有对应的格式
     source.value = isCharts.value ? newData.source : newData
-    if(isCharts.value) {
+    if (isCharts.value) {
       dimensions.value = newData.dimensions
       dimensionsAndSource.value = dimensionsAndSourceHandle()
     }
   }
-},{
+}, {
   immediate: true
 })
 </script>
 
 <style lang="scss" scoped>
-@include go('chart-configurations-timeline') {
+@include go("chart-configurations-timeline") {
   @include deep() {
     pre {
       white-space: pre-wrap;
diff --git a/src/views/chart/ContentConfigurations/index.vue b/src/views/chart/ContentConfigurations/index.vue
index c1de4772..9e880a85 100644
--- a/src/views/chart/ContentConfigurations/index.vue
+++ b/src/views/chart/ContentConfigurations/index.vue
@@ -53,7 +53,7 @@
           type="segment"
         >
           <n-tab-pane
-            v-for="(item, index) in canvasTabList"
+            v-for="(item) in canvasTabList"
             :key="item.key"
             :name="item.key"
             size="small"
diff --git a/src/views/chart/ContentLayers/index.vue b/src/views/chart/ContentLayers/index.vue
index 7a9d741d..eb929b9e 100644
--- a/src/views/chart/ContentLayers/index.vue
+++ b/src/views/chart/ContentLayers/index.vue
@@ -12,6 +12,9 @@
       </n-icon>
     </template>
     <!-- 图层内容 -->
+    <n-space v-if="reverseList.length === 0" justify="center">
+      <n-text class="not-layer-text">暂无图层~</n-text>
+    </n-space>
     <!-- https://github.com/SortableJS/vue.draggable.next -->
     <draggable
       item-key="id"
@@ -108,6 +111,11 @@ $wight: 170px;
   flex-shrink: 0;
   overflow: hidden;
   @extend .go-transition;
+  .not-layer-text {
+    position: relative;
+    top: 10px;
+    opacity: .4;
+  }
   &.scoped {
     width: 0;
   }