@gingkoo/pandora-metabase 1.0.0-alpha.19 → 1.0.0-alpha.20

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.19
+ * @gingkoo/pandora-metabase v1.0.0-alpha.20
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -340,7 +340,8 @@ const summarizeToSql = (arr, record) => {
   });
   as = as + (count ? '_' + (count + 1) : '');
   return {
-    sql: sql + ' AS ' + as,
+    sql: sql,
+    // + ' AS ' + as,
     fieldAlias: as
   };
 };
@@ -1012,26 +1013,91 @@ function reassembleByUnion(target = []) {
   }
   return result;
 }
+// export const buildSqlQuery = (data?: MetaListType[]): string => {
+//   if (!data || data.length === 0) return '';
+//   let sqlClauses: string[] = ['not exitis ( '];
+//   data.forEach((item) => {
+//     if (item.type === TypeEnum.data) {
+//       const meta = item as MetaData;
+//       const tableName = meta.table.name;
+//       const alias = meta.table.alias ? `AS ${meta.table.alias}` : '';
+//       const dataSource = meta.table.datasourceName;
+//       sqlClauses.push(`SELECT 1 FROM ${dataSource}.${tableName} ${alias}`);
+//     }
+//        if (item.type === TypeEnum.joinData) {
+//       const meta = item as MetaJoin;
+//       const table1 = meta.table1.alias ? meta.table1.alias : meta.table1.name;
+//       const table2 = `${meta.table2.datasourceName}.${meta.table2.name}`;
+//       const alias2 = meta.table2.alias ? meta.table2.alias : '';
+//       joins.push(`LEFT JOIN ${table2} ${alias2} ON ${table1}.${meta.columns[0]?.name} = ${alias2}.${meta.columns[0]?.name}`);
+//        }
+//     if (item.type === TypeEnum.filter) {
+//       const filterStrings = (item as MetaFilter).filter.map((f) => f.quotes).filter(Boolean); // 排除空条件
+//       if (filterStrings.length > 0) {
+//         sqlClauses.push(`WHERE ${filterStrings.join(' AND ')}`);
+//       }
+//     }
+//   });
+//   // 简单拼接 SQL 片段
+//   return sqlClauses.join(' ') + ' )' + ';';
+// };
 const buildSqlQuery = data => {
   if (!data || data.length === 0) return '';
-  let sqlClauses = ['not exitis ( '];
+  let sqlClauses = ['NOT EXISTS ('];
+  let tables = [];
+  let joins = [];
+  let wheres = [];
   data.forEach(item => {
     if (item.type === TypeEnum.data) {
       const meta = item;
-      const tableName = meta.table.name;
-      const alias = meta.table.alias ? `AS ${meta.table.alias}` : '';
-      const dataSource = meta.table.datasourceName;
-      sqlClauses.push(`SELECT ${tableName} ${alias} FROM ${dataSource}`);
+      const tableName = `${meta.table.name}`;
+      const alias = meta.table.alias ? ` AS ${meta.table.alias}` : '';
+      tables.push(`${tableName}${alias}`);
+    }
+    if (item.type === TypeEnum.joinData) {
+      const meta = item;
+      const table2Name = `${meta.table2.name}`;
+      const alias2 = meta.table2.alias ? ` AS ${meta.table2.alias}` : '';
+      const table2 = `${meta.table2.alias || meta.table2.name}`;
+      const table1 = `${meta.table1.alias || meta.table1.name}`;
+      joins.push(`LEFT JOIN ${table2Name}${alias2} ON ${table1}.${meta.table1.fieldAlias} = ${table2}.${meta.table2.fieldAlias}`);
+      if (Array.isArray(item.expressions) && item.expressions.length > 0) {
+        item.expressions.forEach(expression => {
+          let left = '',
+            right = '';
+          if (expression.left_type === 'field') {
+            left = `${table1}.${expression.left_fieldAlias}`;
+          } else {
+            left = expression.left_string;
+          }
+          if (expression.right_type === 'field') {
+            right = `${table2}.${expression.right_fieldAlias}`;
+          } else {
+            right = expression.right_string;
+          }
+          joins.push(`AND ${left} = ${right}`);
+        });
+      }
     }
     if (item.type === TypeEnum.filter) {
-      const filterStrings = item.filter.map(f => f.quotes).filter(Boolean); // 排除空条件
+      const filterStrings = item.filter.map(f => f.quotes).filter(Boolean);
       if (filterStrings.length > 0) {
-        sqlClauses.push(`WHERE ${filterStrings.join(' AND ')}`);
+        wheres.push(...filterStrings);
       }
     }
   });
-  // 简单拼接 SQL 片段
-  return sqlClauses.join(' ') + ' )' + ';';
+  // 构建子查询
+  if (tables.length > 0) {
+    sqlClauses.push(`SELECT 1 FROM ${tables[0]}`);
+    if (joins.length > 0) {
+      sqlClauses.push(joins.join(' '));
+    }
+    if (wheres.length > 0) {
+      sqlClauses.push(`WHERE ${wheres.join(' AND ')}`);
+    }
+  }
+  sqlClauses.push(')');
+  return sqlClauses.join(' ') + ';';
 };
 
 let metaKey = 1;
@@ -4009,7 +4075,7 @@ const SelectJoinColumn = ({
                       let quotes = name;
                       return onGroup({
                         ..._value,
-                        tableUuid: _value.tableUuid || tableUuid,
+                        tableUuid: tableUuid || _value.tableUuid,
                         ...v,
                         table,
                         tableId,
@@ -4023,7 +4089,7 @@ const SelectJoinColumn = ({
                     }
                     typeof onSelect === 'function' && onSelect({
                       ..._value,
-                      tableUuid: _value.tableUuid || tableUuid,
+                      tableUuid: tableUuid || _value.tableUuid,
                       ...v,
                       table,
                       tableId,
@@ -6025,7 +6091,8 @@ const JoinData = props => {
             id = '',
             fieldAlias = '',
             fieldUuid = '',
-            quotes
+            quotes,
+            tableUuid
           } = record;
           let newMeta = store.metaList[groupIndex].list.slice();
           if (alias === SummarizeAlias$1) {
@@ -6041,6 +6108,7 @@ const JoinData = props => {
             if (newMeta[index][type].alias !== alias) {
               newMeta[index][type].alias = alias;
               newMeta[index][type].name = table;
+              newMeta[index][type].tableUuid = tableUuid;
               newMeta[index][type].datasourceId = datasourceId;
               newMeta[index][type].datasourceName = datasourceName;
               newMeta[index].expressions = [];