Merge branch 'dev' into master-fetch-dev

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue

@@ -150,7 +150,7 @@ const filterRes = computed(() => {
   } catch (error) {
     // eslint-disable-next-line vue/no-side-effects-in-computed-properties
     errorFlag.value = true
-    return '过滤函数错误'
+    return `过滤函数错误，日志：${error}`
   }
 })
 

src/views/chart/index.vue

@@ -14,8 +14,10 @@
         </template>
       </layout-header-pro>
       <n-layout-content content-style="overflow:hidden; display: flex">
-        <content-charts></content-charts>
-        <content-layers></content-layers>
+        <div style="overflow:hidden; display: flex">
+          <content-charts></content-charts>
+          <content-layers></content-layers>
+        </div>
         <content-configurations></content-configurations>
       </n-layout-content>
     </n-layout>