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

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.17
+ * @gingkoo/pandora-metabase v1.0.0-alpha.18
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -1146,28 +1146,29 @@ const useStore = () => {
   };
   // 回显
   // 设置column
-  const setQuotes = _meta => {
-    let newMeta = cloneDeep(_meta);
+  const setQuotes = newMeta => {
     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
+      fieldUuid: newMeta.table1.fieldUuid || uuidv4('field'),
+      quotes: newMeta.table1.quotes || newMeta.table1.column,
+      tableUuid: newMeta.table1.tableUuid || uuidv4('table')
     };
     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
+      fieldUuid: newMeta.table2.fieldUuid || uuidv4('field'),
+      quotes: newMeta.table2.quotes || newMeta.table2.column,
+      tableUuid: newMeta.table2.tableUuid || uuidv4('table')
     };
     newMeta.expressions = newMeta.expressions?.map(v => {
       return {
         ...v,
         left_fieldAlias: v.fieldAlias || v.left_column,
-        left_fieldUuid: v.fieldUuid || v.left_column_id,
+        left_fieldUuid: v.fieldUuid || uuidv4('field'),
         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_fieldUuid: v.right_fieldUuid || uuidv4('field'),
         right_quotes: v.right_quotes || v.right_column
       };
     });
@@ -1178,6 +1179,12 @@ const useStore = () => {
       let _metaList = data?.map((item, groupIndex) => {
         let newList = item.list?.map((v, i) => {
           let newMeta = item.list;
+          if (v.table) {
+            v.table.tableUuid = v.table.tableUuid || uuidv4('table');
+          }
+          if (v.type === TypeEnum.joinData) {
+            newMeta[i] = setQuotes(newMeta[i]);
+          }
           // 设置右侧column
           if (v.table2?.datasourceId && v.columns.length < 1) {
             fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, (columns = []) => {
@@ -1189,9 +1196,6 @@ const useStore = () => {
               } else {
                 newMeta[i].columns = columns || [];
               }
-              if (v.type === TypeEnum.joinData) {
-                newMeta[i] = setQuotes(newMeta[i]);
-              }
               setMeta(newMeta, groupIndex);
             });
             return {
@@ -1209,9 +1213,9 @@ const useStore = () => {
               } else {
                 newMeta[i].columns = columns || [];
               }
-              if (v.type === TypeEnum.joinData) {
-                newMeta[i] = setQuotes(newMeta[i]);
-              }
+              // if (v.type === TypeEnum.joinData) {
+              //   newMeta[i] = setQuotes(newMeta[i]);
+              // }
               setMeta(newMeta, groupIndex);
             });
             return {
@@ -1410,46 +1414,10 @@ const useStore = () => {
   const getDataset = datasourceId => {
     return _cacheSource2TableMap[datasourceId] || [];
   };
-  const changeAlias = (groupIndex, alias) => {
-    let newMetaList = metaList.slice();
-    const _list = newMetaList[groupIndex].list;
-    if (_list.length > 0) {
-      _list.forEach(item => {
-        if (item.type === TypeEnum.joinData && item.table2.alias === alias) {
-          item.table2.alias = alias;
-        } else if (item.type === TypeEnum.data && item.table.alias === alias) {
-          item.table.alias = alias;
-        } else if (item.type === TypeEnum.filter) {
-          //过滤器
-          item.filter.forEach(filterItem => {
-            if (filterItem.alias === alias) {
-              filterItem.alias = alias;
-            }
-          });
-        } else if (item.type === TypeEnum.summarize) {
-          // 汇总
-          item.alias = alias;
-          item.by.forEach(byItem => {
-            if (byItem.alias === alias) {
-              byItem.alias = alias;
-            }
-          });
-          item.group.forEach(groupItem => {
-            if (groupItem.alias === alias) {
-              groupItem.alias = alias;
-              groupItem.sql = alias;
-            }
-          });
-        }
-      });
-      newMetaList[groupIndex].list = _list;
-      _setMeta(newMetaList);
-    }
-  };
   const reset = () => {
     // setSourceList([]);
     _setMeta(defaultMeta);
-    setToolbar(defaultToolbar);
+    // setToolbar(defaultToolbar);
     set_cacheSource2TableMap({});
     set_cacheColumnsMap({});
   };
@@ -1503,7 +1471,6 @@ const useStore = () => {
     _setShowSubquery,
     constantList,
     setConstantList,
-    changeAlias,
     popupContainer
   };
 };
@@ -5631,33 +5598,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";
@@ -5682,11 +5622,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);
-  }, []);
+  // useEffect(() => {
+  //   let newMetaList = store.metaList[groupIndex].list.slice();
+  //   newMetaList[index] = setQuotes(meta);
+  //   store.setMeta(newMetaList, groupIndex);
+  // }, []);
   function selectColumns(e) {
     let columns = meta.columns;
     !meta.readonly && store.setPopup({