@gingkoo/pandora-metabase 1.0.0-alpha.16 → 1.0.0-alpha.17

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.16
+ * @gingkoo/pandora-metabase v1.0.0-alpha.17
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -924,6 +924,7 @@ const changeFieldAlias = (list, curObj) => {
   return newList;
 };
 function splitByUnion(data) {
+  if (!data) return [];
   const original = cloneDeep(data);
   const result = [];
   let i = 0;
@@ -959,7 +960,8 @@ function splitByUnion(data) {
   }
   return result;
 }
-function reassembleByUnion(target) {
+function reassembleByUnion(target = []) {
+  if (!target) return [];
   const result = [];
   let i = 0;
   const len = target.length;
@@ -1074,7 +1076,7 @@ const useStore = () => {
   };
   // 是否显示主表后面的字段按钮 （如果下面 没有聚合，或者选了聚合但是聚合里面没有选值的时候显示 主表字段按钮）
   const showMainColumn = useMemo(() => {
-    return metaList.map((item, groupIndex) => {
+    return metaList?.map((item, groupIndex) => {
       // 过滤出所有汇总类型的项
       const summarizeItems = item.list.filter(v => v.type === TypeEnum.summarize);
       // 如果没有汇总项，默认显示主列
@@ -1129,7 +1131,7 @@ const useStore = () => {
       columns = await fetchColumnsFn.current(extra, datasourceId);
       setColumns(tableName, columns);
     }
-    const _columns = columns.map(v => {
+    const _columns = columns?.map(v => {
       return {
         ...v,
         fieldUuid: v.fieldAlias || uuidv4('field')
@@ -1173,19 +1175,19 @@ const useStore = () => {
   };
   const setPreData = data => {
     if (data.length) {
-      let _metaList = data.map((item, groupIndex) => {
+      let _metaList = data?.map((item, groupIndex) => {
         let newList = item.list?.map((v, i) => {
           let newMeta = item.list;
           // 设置右侧column
           if (v.table2?.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, columns => {
+            fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, (columns = []) => {
               if (v.isSubquery) {
                 let newColumns = [];
                 const items = getSubColumns(v.subquery);
-                newColumns = items.flatMap(item => item.columns);
-                newMeta[i].columns = newColumns;
+                newColumns = items?.flatMap(item => item.columns);
+                newMeta[i].columns = newColumns || [];
               } else {
-                newMeta[i].columns = columns;
+                newMeta[i].columns = columns || [];
               }
               if (v.type === TypeEnum.joinData) {
                 newMeta[i] = setQuotes(newMeta[i]);
@@ -1198,16 +1200,14 @@ const useStore = () => {
           }
           // 设置column
           if (v.table?.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, columns => {
+            fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, (columns = []) => {
               if (v.isSubquery) {
                 let newColumns = [];
                 const items = getSubColumns(v.subquery);
                 newColumns = items.flatMap(item => item.columns);
-                newMeta[i].columns = newColumns;
-                v.columns = newColumns;
+                newMeta[i].columns = newColumns || [];
               } else {
-                newMeta[i].columns = columns;
-                v.columns = columns;
+                newMeta[i].columns = columns || [];
               }
               if (v.type === TypeEnum.joinData) {
                 newMeta[i] = setQuotes(newMeta[i]);
@@ -1385,7 +1385,7 @@ const useStore = () => {
     setMeta(_metaList, groupIndex);
   };
   const setColumns = (tableId, columns) => {
-    const _columns = columns.map(v => {
+    const _columns = columns?.map(v => {
       return {
         ...v,
         fieldUuid: v.fieldUuid || uuidv4('field')