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

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.10
+ * @gingkoo/pandora-metabase v1.0.0-alpha.11
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -1143,14 +1143,48 @@ const useStore = () => {
     _setMeta(newMeta);
   };
   // 回显
+  // 设置column
+  const setQuotes = async _meta => {
+    let newMeta = cloneDeep(_meta);
+    newMeta.table1 = {
+      ...newMeta.table1,
+      fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
+      fieldUuid: newMeta.table1.fieldUuid || newMeta.table1.column_id,
+      quotes: newMeta.table1.quotes || newMeta.table1.column
+    };
+    newMeta.table2 = {
+      ...newMeta.table2,
+      fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
+      fieldUuid: newMeta.table2.fieldUuid || newMeta.table2.column_id,
+      quotes: newMeta.table2.quotes || newMeta.table2.column
+    };
+    newMeta.expressions = newMeta.expressions.map(v => {
+      return {
+        ...v,
+        left_fieldAlias: v.fieldAlias || v.left_column,
+        left_fieldUuid: v.fieldUuid || v.left_column_id,
+        left_quotes: v.left_quotes || v.left_column,
+        right_fieldAlias: v.right_fieldAlias || v.right_column,
+        right_fieldUuid: v.right_fieldUuid || v.right_column_id,
+        right_quotes: v.right_quotes || v.right_column
+      };
+    });
+    return newMeta;
+  };
   const setPreData = async data => {
     if (data.length) {
       let _metaList = data.map((item, groupIndex) => {
-        let newList = item.list?.map((v, i) => {
+        let newList = item.list?.map(async (v, i) => {
           let newMeta = cloneDeep(item.list);
+          let newV = cloneDeep(v);
+          // 替换column
+          if (newV.type === TypeEnum.joinData) {
+            newMeta[i] = await setQuotes(newMeta[i]);
+            setMeta(newMeta, groupIndex);
+          }
           // 设置右侧column
           if (v.table2?.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, columns => {
+            await fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, columns => {
               if (v.isSubquery) {
                 let newColumns = [];
                 const items = getSubColumns(v.subquery);
@@ -1167,7 +1201,7 @@ const useStore = () => {
           }
           // 设置column
           if (v.table?.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, columns => {
+            await fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, columns => {
               if (v.isSubquery) {
                 let newColumns = [];
                 const items = getSubColumns(v.subquery);
@@ -5595,33 +5629,6 @@ const TableData = props => {
 };
 
 const PrevResult$1 = 'Previous results';
-function setQuotes(_meta) {
-  let newMeta = cloneDeep(_meta);
-  newMeta.table1 = {
-    ...newMeta.table1,
-    fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
-    fieldUuid: newMeta.table1.fieldUuid || newMeta.table1.column_id,
-    quotes: newMeta.table1.quotes || newMeta.table1.column
-  };
-  newMeta.table2 = {
-    ...newMeta.table2,
-    fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
-    fieldUuid: newMeta.table2.fieldUuid || newMeta.table2.column_id,
-    quotes: newMeta.table2.quotes || newMeta.table2.column
-  };
-  newMeta.expressions = newMeta.expressions.map(v => {
-    return {
-      ...v,
-      left_fieldAlias: v.fieldAlias || v.left_column,
-      left_fieldUuid: v.fieldUuid || v.left_column_id,
-      left_quotes: v.left_quotes || v.left_column,
-      right_fieldAlias: v.right_fieldAlias || v.right_column,
-      right_fieldUuid: v.right_fieldUuid || v.right_column_id,
-      right_quotes: v.right_quotes || v.right_column
-    };
-  });
-  return newMeta;
-}
 var FlagLocation;
 (function (FlagLocation) {
   FlagLocation["TABLE_1"] = "table1";
@@ -5646,11 +5653,11 @@ const JoinData = props => {
   let table2Selected = Boolean(meta.table2.name);
   let subQuerySelected = Boolean(meta.subquery?.[0]?.table?.name);
   let columnsSelected = meta.table1.quotes && meta.table2.quotes;
-  useEffect(() => {
-    let newMetaList = store.metaList[groupIndex].list.slice();
-    newMetaList[index] = setQuotes(meta);
-    store.setMeta(newMetaList, groupIndex);
-  }, [metaKey]);
+  // useEffect(() => {
+  //   let newMetaList = store.metaList[groupIndex].list.slice();
+  //   newMetaList[index] = setQuotes(meta);
+  //   store.setMeta(newMetaList, groupIndex);
+  // }, [metaKey]);
   function selectColumns(e) {
     let columns = meta.columns;
     !meta.readonly && store.setPopup({