@gingkoo/pandora-metabase 1.0.0-alpha.28 → 1.0.0-alpha.29

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.28
+ * @gingkoo/pandora-metabase v1.0.0-alpha.29
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -681,7 +681,7 @@ const getSubColumns = metaList => {
           ...v,
           name: v.fieldAlias || v.name,
           fieldAlias: '',
-          fieldUuid: uuidv4('field'),
+          // fieldUuid: uuidv4('field'),
           realName: v.sql?.split(' AS ')?.[1] || '',
           // name_zh: '',
           database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
@@ -697,7 +697,7 @@ const getSubColumns = metaList => {
           ...v,
           name: v.fieldAlias || v.name,
           fieldAlias: '',
-          fieldUuid: uuidv4('field'),
+          // fieldUuid: uuidv4('field'),
           realName: v.sql?.split(' AS ')?.[1] || '',
           // name_zh: '',
           database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
@@ -718,8 +718,8 @@ const getSubColumns = metaList => {
           return {
             ...column,
             name: column.fieldAlias || column.name,
-            fieldAlias: '',
-            fieldUuid: uuidv4('field')
+            fieldAlias: ''
+            // fieldUuid: uuidv4('field'),
           };
         });
         return {
@@ -737,10 +737,10 @@ const getSubColumns = metaList => {
           return {
             ...column,
             name: column.fieldAlias || column.name,
-            fieldAlias: '',
-            fieldUuid: uuidv4('field')
+            fieldAlias: ''
+            // fieldUuid: uuidv4('field'),
           };
-        });
+        }).filter(item => item.select);
         return {
           alias: v.table.alias,
           table: v.table.name,
@@ -751,10 +751,10 @@ const getSubColumns = metaList => {
           return {
             ...column,
             name: column.fieldAlias || column.name,
-            fieldAlias: '',
-            fieldUuid: uuidv4('field')
+            fieldAlias: ''
+            // fieldUuid: uuidv4('field'),
           };
-        });
+        }).filter(item => item.select);
         return {
           alias: v.table2.alias,
           table: v.table2.name,
@@ -766,10 +766,12 @@ const getSubColumns = metaList => {
         } = v;
         const columns = customColumn.map(v => {
           return {
-            name_zh: __('SqlQueryBuilder.customColumn'),
+            database_type: SQL_COLUMN_TYPE.STRING,
+            name_zh: v.name,
             name: v.name,
-            fieldAlias: '',
-            fieldUuid: uuidv4('field')
+            select: true,
+            fieldAlias: ''
+            // fieldUuid: uuidv4('field'),
           };
         });
         return {
@@ -891,14 +893,17 @@ const changeTableAlias = (list, curObj) => {
           item.table2.alias = alias;
           // item.table2.sql = '';
         }
-        if (item.subquery) {
-          item.subquery = changeTableAlias(item.subquery || [], curObj);
-        }
+        // if (item.subquery) {
+        //   item.subquery = changeTableAlias(item.subquery || [], curObj);
+        // }
       });
     }
-    if (v.subquery) {
-      v.subquery = changeTableAlias(v.subquery || [], curObj);
-    }
+    // if ((v as MetaData | MetaJoin).subquery) {
+    //   (v as MetaData | MetaJoin).subquery = changeTableAlias(
+    //     (v as MetaData | MetaJoin).subquery || [],
+    //     curObj,
+    //   );
+    // }
     return v;
   }) || [];
 };
@@ -979,9 +984,9 @@ const changeFieldAlias = (list, curObj) => {
               prevGroupBy
             } = getHelper(list, v);
             let groupBy = prevGroupBy?.by.filter(v => v.fieldUuid === item.fieldUuid)[0] || prevGroupBy?.group.filter(v => v.fieldUuid === item.fieldUuid)[0] || null;
-            groupBy.fieldAlias = fieldAlias;
-            const sql = groupBy.sql;
             if (groupBy) {
+              groupBy.fieldAlias = fieldAlias;
+              const sql = groupBy.sql;
               item.sql = sql;
               item.groupSql = sql;
             }
@@ -1004,8 +1009,8 @@ const changeFieldAlias = (list, curObj) => {
           //   }
           // }
         }
-        if (item.subquery) {
-          item.subquery = changeFieldAlias(item.subquery || [], curObj);
+        if (item.notExists) {
+          item.notExists = changeFieldAlias(item.notExists || [], curObj);
         }
       });
     }
@@ -2264,13 +2269,13 @@ const LeftJoinIcon = ({
   })
 });
 const InnerJoinIcon = ({
-  width: _width10 = 32,
-  height: _height10 = 32,
+  width: _width0 = 32,
+  height: _height0 = 32,
   style
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width10,
-  height: _height10,
+  width: _width0,
+  height: _height0,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'join_inner icon',
@@ -2280,13 +2285,13 @@ const InnerJoinIcon = ({
   })
 });
 const UpArrowIcon = ({
-  width: _width11 = 16,
-  height: _height11 = 17
+  width: _width1 = 16,
+  height: _height1 = 17
 }) => jsx("svg", {
   className: 'sort-arrow',
   viewBox: '0 0 32 34',
-  width: _width11,
-  height: _height11,
+  width: _width1,
+  height: _height1,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'arrow_up icon',
@@ -2295,13 +2300,13 @@ const UpArrowIcon = ({
   })
 });
 const DownArrowIcon = ({
-  width: _width12 = 16,
-  height: _height12 = 17
+  width: _width10 = 16,
+  height: _height10 = 17
 }) => jsx("svg", {
   className: 'sort-arrow',
   viewBox: '0 0 32 34',
-  width: _width12,
-  height: _height12,
+  width: _width10,
+  height: _height10,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'arrow_down icon',
@@ -2310,13 +2315,13 @@ const DownArrowIcon = ({
   })
 });
 const CloseIcon = ({
-  width: _width13 = 16,
-  height: _height13 = 16
+  width: _width11 = 16,
+  height: _height11 = 16
 }) => jsx("svg", {
   className: 'closeIcon',
   viewBox: '0 0 32 32',
-  width: _width13,
-  height: _height13,
+  width: _width11,
+  height: _height11,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'close icon',
@@ -2325,12 +2330,12 @@ const CloseIcon = ({
   })
 });
 const AddIcon = ({
-  width: _width14 = 16,
-  height: _height14 = 16
+  width: _width12 = 16,
+  height: _height12 = 16
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width14,
-  height: _height14,
+  width: _width12,
+  height: _height12,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'add icon',
@@ -2339,12 +2344,12 @@ const AddIcon = ({
   })
 });
 const TableIcon = ({
-  width: _width15 = 18,
-  height: _height15 = 18
+  width: _width13 = 18,
+  height: _height13 = 18
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width15,
-  height: _height15,
+  width: _width13,
+  height: _height13,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'table2 icon',
@@ -2353,12 +2358,12 @@ const TableIcon = ({
   })
 });
 const SearchIcon = ({
-  width: _width16 = 16,
-  height: _height16 = 16
+  width: _width14 = 16,
+  height: _height14 = 16
 }) => jsx("svg", {
   viewBox: '0 0 32 32',
-  width: _width16,
-  height: _height16,
+  width: _width14,
+  height: _height14,
   fill: 'currentcolor',
   role: 'img',
   "aria-label": 'search icon',
@@ -3617,7 +3622,9 @@ const Portal = /*#__PURE__*/forwardRef((props, ref) => {
     initRef.current = true;
   }
   useEffect(() => {
-    didUpdate?.(props, containerRef.current);
+    setTimeout(() => {
+      didUpdate?.(props, containerRef.current);
+    }, 0);
   });
   useEffect(() => {
     return () => {
@@ -5767,7 +5774,7 @@ const TableData = props => {
               newMetaList.subquery = newList;
               newMetaList.table = {
                 ...newList[0].table,
-                alias: '',
+                alias: newMetaList.table.alias || '',
                 tableUuid: uuidv4('table')
               };
               const items = getSubColumns(newList);
@@ -7842,8 +7849,8 @@ const Filter = props => {
     } = store.preProps;
     let newMeta = store.metaList[groupIndex].list.slice();
     let index = findIndex(store.metaList[groupIndex].list, meta);
-    let _value = position ? [] : newMeta[index].filter[i]?.subquery || [];
-    let oldList = position ? [] : cloneDeep(newMeta[index].filter[i]?.subquery || []);
+    let _value = position ? [] : newMeta[index].filter[i]?.notExists || [];
+    let oldList = position ? [] : cloneDeep(newMeta[index].filter[i]?.notExists || []);
     let _toolbar = notExistsToolbar || toolbar;
     _toolbar = _toolbar.filter(v => v !== 'group'); // 子查询不需要分组
     let zIndex = store.popupContainer.current ? getMaxZIndexInParents(store.popupContainer.current) : null;
@@ -7869,7 +7876,7 @@ const Filter = props => {
                 return;
               }
               const _tem = {
-                subquery: newList,
+                notExists: newList,
                 quotes: buildSqlQuery(newList),
                 condition: '',
                 table: '',
@@ -8056,7 +8063,7 @@ const Filter = props => {
               if (typeof v === 'string') {
                 return v;
               } else if (v.type === Filter_TypeEnum.NOT_EXISTS) {
-                return `${buildSqlQuery(v.subquery)}`;
+                return `${buildSqlQuery(v.notExists)}`;
               } else {
                 return v.quotes;
               }
@@ -8727,8 +8734,8 @@ const Sort = props => {
     let value = {
       table: '',
       tableId: '',
-      tableUuid: uuidv4('table'),
-      fieldUuid: uuidv4('field'),
+      tableUuid: '',
+      fieldUuid: '',
       fieldAlias: '',
       alias: '',
       name: '',