@gingkoo/pandora-metabase 1.0.0-alpha.11 → 1.0.0-alpha.12

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.11
+ * @gingkoo/pandora-metabase v1.0.0-alpha.12
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -1144,7 +1144,7 @@ const useStore = () => {
   };
   // 回显
   // 设置column
-  const setQuotes = async _meta => {
+  const setQuotes = _meta => {
     let newMeta = cloneDeep(_meta);
     newMeta.table1 = {
       ...newMeta.table1,
@@ -1171,20 +1171,19 @@ const useStore = () => {
     });
     return newMeta;
   };
-  const setPreData = async data => {
+  const setPreData = data => {
     if (data.length) {
       let _metaList = data.map((item, groupIndex) => {
-        let newList = item.list?.map(async (v, i) => {
-          let newMeta = cloneDeep(item.list);
-          let newV = cloneDeep(v);
+        let newList = item.list?.map((v, i) => {
+          let newMeta = item.list;
           // 替换column
-          if (newV.type === TypeEnum.joinData) {
-            newMeta[i] = await setQuotes(newMeta[i]);
+          if (newMeta[i].type === TypeEnum.joinData) {
+            newMeta[i] = setQuotes(newMeta[i]);
             setMeta(newMeta, groupIndex);
           }
           // 设置右侧column
           if (v.table2?.datasourceId && v.columns.length < 1) {
-            await 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);
@@ -1201,14 +1200,16 @@ const useStore = () => {
           }
           // 设置column
           if (v.table?.datasourceId && v.columns.length < 1) {
-            await 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;
               } else {
                 newMeta[i].columns = columns;
+                v.columns = columns;
               }
               setMeta(newMeta, groupIndex);
             });