@gingkoo/pandora-metabase 1.0.0-alpha.21 → 1.0.0-alpha.23

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.21
+ * @gingkoo/pandora-metabase v1.0.0-alpha.23
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -725,7 +725,7 @@ const changeTableAlias = (list, curObj) => {
     alias
   } = cloneDeep(curObj);
   const newList = cloneDeep(list);
-  newList?.map(v => {
+  return newList?.map(v => {
     if (v.type === TypeEnum.data) {
       if (v.table.tableUuid === tableUuid) {
         v.table.alias = alias;
@@ -774,7 +774,7 @@ const changeTableAlias = (list, curObj) => {
       v.by.map(by => {
         if (by.tableUuid === tableUuid) {
           by.alias = alias;
-          by.sql = `${by.alias}.${by.realName || by.name} AS ${by.fieldAlias}`;
+          by.sql = `${by.alias}.${by.realName || by.name}`;
         }
       });
     }
@@ -816,13 +816,16 @@ const changeTableAlias = (list, curObj) => {
           item.table2.alias = alias;
           // item.table2.sql = '';
         }
+        if (item.subquery) {
+          item.subquery = changeTableAlias(item.subquery || [], curObj);
+        }
       });
     }
     if (v.subquery) {
       v.subquery = changeTableAlias(v.subquery || [], curObj);
     }
-  });
-  return newList || [];
+    return v;
+  }) || [];
 };
 const changeFieldAlias = (list, curObj) => {
   const {
@@ -830,7 +833,7 @@ const changeFieldAlias = (list, curObj) => {
     fieldAlias
   } = cloneDeep(curObj);
   const newList = cloneDeep(list);
-  newList.map(v => {
+  return newList?.map(v => {
     if (v.type === TypeEnum.data) ;
     if (v.type === TypeEnum.joinData) {
       if (v.table1.fieldUuid === fieldUuid) {
@@ -887,7 +890,7 @@ const changeFieldAlias = (list, curObj) => {
       v.by.map(by => {
         if (by.fieldUuid === fieldUuid) {
           by.fieldAlias = fieldAlias;
-          by.sql = `${by.alias}.${by.realName || by.name} AS ${by.fieldAlias}`;
+          by.sql = `${by.alias}.${by.realName || by.name}`;
         }
       });
     }
@@ -926,10 +929,12 @@ const changeFieldAlias = (list, curObj) => {
           //   }
           // }
         }
+        if (item.subquery) {
+          item.subquery = changeFieldAlias(item.subquery || [], curObj);
+        }
       });
     }
-  });
-  return newList;
+  }) || [];
 };
 function splitByUnion(data) {
   if (!data) return [];
@@ -7564,6 +7569,9 @@ const Filter = props => {
   let {
     filter
   } = meta;
+  const {
+    notExistsColumns
+  } = store.preProps;
   React__default.useRef(null);
   let index = findIndex(store.metaList[groupIndex].list, meta);
   let notSelected = !meta.filter.length;
@@ -7673,7 +7681,7 @@ const Filter = props => {
       showNotExists(i, '');
       return;
     }
-    let data = getColumns();
+    let data = [...getColumns(), ...cloneDeep(notExistsColumns)];
     store.setPopup({
       visible: true,
       node: e.currentTarget,
@@ -7783,6 +7791,7 @@ const Filter = props => {
     let _toolbar = notExistsToolbar || toolbar;
     _toolbar = _toolbar.filter(v => v !== 'group'); // 子查询不需要分组
     let zIndex = store.popupContainer.current ? getMaxZIndexInParents(store.popupContainer.current) : null;
+    let notExistsColumns = getColumns();
     let o = Modal2.openModal({
       title: 'NOT EXISTS',
       transparentMask: true,
@@ -7790,6 +7799,7 @@ const Filter = props => {
       content: jsx(Fragment, {
         children: jsx(SqlVisionBuilder, {
           ...other,
+          notExistsColumns: notExistsColumns,
           showFields: false,
           showSubquery: false,
           toolbar: _toolbar,