@gingkoo/pandora-metabase 1.0.0-alpha.22 → 1.0.0-alpha.24

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.22
+ * @gingkoo/pandora-metabase v1.0.0-alpha.24
  */
 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;
@@ -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) {
@@ -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 [];
@@ -2211,13 +2216,13 @@ const LeftJoinIcon = ({
   })
 });
 const InnerJoinIcon = ({
-  width: _width0 = 32,
-  height: _height0 = 32,
+  width: _width10 = 32,
+  height: _height10 = 32,
   style
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width0,
-  height: _height0,
+  width: _width10,
+  height: _height10,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'join_inner icon',
@@ -2227,13 +2232,13 @@ const InnerJoinIcon = ({
   })
 });
 const UpArrowIcon = ({
-  width: _width1 = 16,
-  height: _height1 = 17
+  width: _width11 = 16,
+  height: _height11 = 17
 }) => jsx("svg", {
   className: 'sort-arrow',
   viewBox: '0 0 32 34',
-  width: _width1,
-  height: _height1,
+  width: _width11,
+  height: _height11,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'arrow_up icon',
@@ -2242,13 +2247,13 @@ const UpArrowIcon = ({
   })
 });
 const DownArrowIcon = ({
-  width: _width10 = 16,
-  height: _height10 = 17
+  width: _width12 = 16,
+  height: _height12 = 17
 }) => jsx("svg", {
   className: 'sort-arrow',
   viewBox: '0 0 32 34',
-  width: _width10,
-  height: _height10,
+  width: _width12,
+  height: _height12,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'arrow_down icon',
@@ -2257,13 +2262,13 @@ const DownArrowIcon = ({
   })
 });
 const CloseIcon = ({
-  width: _width11 = 16,
-  height: _height11 = 16
+  width: _width13 = 16,
+  height: _height13 = 16
 }) => jsx("svg", {
   className: 'closeIcon',
   viewBox: '0 0 32 32',
-  width: _width11,
-  height: _height11,
+  width: _width13,
+  height: _height13,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'close icon',
@@ -2272,12 +2277,12 @@ const CloseIcon = ({
   })
 });
 const AddIcon = ({
-  width: _width12 = 16,
-  height: _height12 = 16
+  width: _width14 = 16,
+  height: _height14 = 16
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width12,
-  height: _height12,
+  width: _width14,
+  height: _height14,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'add icon',
@@ -2286,12 +2291,12 @@ const AddIcon = ({
   })
 });
 const TableIcon = ({
-  width: _width13 = 18,
-  height: _height13 = 18
+  width: _width15 = 18,
+  height: _height15 = 18
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width13,
-  height: _height13,
+  width: _width15,
+  height: _height15,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'table2 icon',
@@ -2300,12 +2305,12 @@ const TableIcon = ({
   })
 });
 const SearchIcon = ({
-  width: _width14 = 16,
-  height: _height14 = 16
+  width: _width16 = 16,
+  height: _height16 = 16
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width14,
-  height: _height14,
+  width: _width16,
+  height: _height16,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'search icon',
@@ -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,