@gingkoo/pandora-metabase 0.0.18 → 0.0.20

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v0.0.18
+ * @gingkoo/pandora-metabase v0.0.20
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -108,6 +108,140 @@ var EleComponentEnum;
   EleComponentEnum["select"] = "select";
 })(EleComponentEnum || (EleComponentEnum = {}));
 
+const findIndex = (arr, item) => {
+  return arr.indexOf(item);
+};
+const getHelper = (list, item) => {
+  let types = list.map(v => v.type);
+  let curIndex = list.indexOf(item);
+  let leftTypes = types.slice(0, curIndex); // 当前元素上面的所有元素 （不包含自己）
+  let rightTypes = types.slice(curIndex + 1); // 当前元素下面的所有元素 （不包含自己）
+  let leftList = list.slice(0, curIndex);
+  let rightList = list.slice(curIndex + 1);
+  let ExistAboveGroupBy = false;
+  let ExistBelowGroupBy = false;
+  let prevTypes = [];
+  let nextTypes = [];
+  let prevList = [];
+  let nextList = [];
+  let prevGroupBy;
+  let nextGroupBy;
+  if (~leftTypes.indexOf(TypeEnum.summarize)) {
+    ExistAboveGroupBy = true;
+    let i = leftTypes.lastIndexOf(TypeEnum.summarize);
+    prevTypes = leftTypes.slice(i + 1);
+    prevList = leftList.slice(i + 1);
+    prevGroupBy = list[i];
+  }
+  if (~rightTypes.indexOf(TypeEnum.summarize)) {
+    ExistBelowGroupBy = true;
+    let i = rightTypes.indexOf(TypeEnum.summarize);
+    nextTypes = rightTypes.slice(0, i);
+    nextList = rightList.slice(0, i);
+    nextGroupBy = list[curIndex + i + 1];
+  }
+  return {
+    ExistAboveGroupBy,
+    ExistBelowGroupBy,
+    prevTypes,
+    nextTypes,
+    prevList,
+    nextList,
+    prevGroupBy,
+    nextGroupBy
+  };
+};
+// 获取子查询的字段
+const getSubColumns = metaList => {
+  let obj = {
+    metaKey: -1,
+    type: TypeEnum.customColumn,
+    customColumn: [{
+      name: '',
+      // 用户起的别名
+      formula: '' // 公式}];
+    }]
+  };
+  let {
+    ExistAboveGroupBy,
+    prevList,
+    prevGroupBy
+  } = getHelper([...metaList, obj], obj);
+  let data;
+  if (ExistAboveGroupBy) {
+    let _data = {
+      table: prevGroupBy.alias,
+      alias: prevGroupBy.alias,
+      columns: []
+    };
+    if (prevGroupBy?.group?.length) {
+      _data.columns = _data.columns.concat(prevGroupBy.group.map(v => {
+        return {
+          name_zh: v.quotes,
+          ...v,
+          name: v.quotes,
+          realName: v.sql?.split(' AS ')?.[1] || '',
+          // name_zh: '',
+          database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
+          special_type: '',
+          select: true
+        };
+      }));
+    }
+    if (prevGroupBy?.by?.length) {
+      _data.columns = _data.columns.concat(prevGroupBy.by.map(v => {
+        return {
+          name_zh: v.quotes,
+          ...v,
+          name: v.quotes,
+          realName: v.sql?.split(' AS ')?.[1] || '',
+          // name_zh: '',
+          database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
+          special_type: '',
+          select: true
+        };
+      }));
+    }
+    data = [_data];
+    let joinData = prevList.filter(v => v.type === TypeEnum.joinData)
+    // @ts-ignore
+    .filter(v => v && v.table2.name);
+    if (joinData.length) {
+      data = data.concat(
+      // @ts-ignore
+      joinData.map(v => {
+        return {
+          alias: v.table2.alias,
+          table: v.table2.name,
+          columns: v.columns
+        };
+      }));
+    }
+  } else {
+    // @ts-ignore
+    data = metaList.slice().map(v => {
+      if (v.type === TypeEnum.data) {
+        return {
+          alias: v.table.alias,
+          table: v.table.name,
+          columns: v.columns
+        };
+      } else if (v.type === TypeEnum.joinData) {
+        return {
+          alias: v.table2.alias,
+          table: v.table2.name,
+          columns: v.columns
+        };
+      } else {
+        return {
+          table: null
+        };
+      }
+    }).filter(v => v.table);
+  }
+  return data;
+};
+
 let metaKey = 1;
 const SummarizeAlias$1 = 'source';
 const useStore = () => {
@@ -202,7 +336,14 @@ const useStore = () => {
         if (v.table2?.datasourceId && v.columns.length < 1) {
           let newMeta = data.slice();
           fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, columns => {
-            newMeta[i].columns = columns;
+            if (v.isSubquery) {
+              let newColumns = [];
+              const items = getSubColumns(v.subquery);
+              newColumns = items.flatMap(item => item.columns);
+              newMeta[i].columns = newColumns;
+            } else {
+              newMeta[i].columns = columns;
+            }
             setMeta(newMeta);
           });
           return {
@@ -213,7 +354,14 @@ const useStore = () => {
         if (v.table?.datasourceId && v.columns.length < 1) {
           let newMeta = data.slice();
           fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, columns => {
-            newMeta[i].columns = columns;
+            if (v.isSubquery) {
+              let newColumns = [];
+              const items = getSubColumns(v.subquery);
+              newColumns = items.flatMap(item => item.columns);
+              newMeta[i].columns = newColumns;
+            } else {
+              newMeta[i].columns = columns;
+            }
             setMeta(newMeta);
           });
           return {
@@ -4813,50 +4961,6 @@ const Wrapper = ({
   });
 };
 
-const findIndex = (arr, item) => {
-  return arr.indexOf(item);
-};
-const getHelper = (list, item) => {
-  let types = list.map(v => v.type);
-  let curIndex = list.indexOf(item);
-  let leftTypes = types.slice(0, curIndex); // 当前元素上面的所有元素 （不包含自己）
-  let rightTypes = types.slice(curIndex + 1); // 当前元素下面的所有元素 （不包含自己）
-  let leftList = list.slice(0, curIndex);
-  let rightList = list.slice(curIndex + 1);
-  let ExistAboveGroupBy = false;
-  let ExistBelowGroupBy = false;
-  let prevTypes = [];
-  let nextTypes = [];
-  let prevList = [];
-  let nextList = [];
-  let prevGroupBy;
-  let nextGroupBy;
-  if (~leftTypes.indexOf(TypeEnum.summarize)) {
-    ExistAboveGroupBy = true;
-    let i = leftTypes.lastIndexOf(TypeEnum.summarize);
-    prevTypes = leftTypes.slice(i + 1);
-    prevList = leftList.slice(i + 1);
-    prevGroupBy = list[i];
-  }
-  if (~rightTypes.indexOf(TypeEnum.summarize)) {
-    ExistBelowGroupBy = true;
-    let i = rightTypes.indexOf(TypeEnum.summarize);
-    nextTypes = rightTypes.slice(0, i);
-    nextList = rightList.slice(0, i);
-    nextGroupBy = list[curIndex + i + 1];
-  }
-  return {
-    ExistAboveGroupBy,
-    ExistBelowGroupBy,
-    prevTypes,
-    nextTypes,
-    prevList,
-    nextList,
-    prevGroupBy,
-    nextGroupBy
-  };
-};
-
 var IconSIzeEnum;
 (function (IconSIzeEnum) {
   IconSIzeEnum["SMALL"] = "small";
@@ -5279,95 +5383,6 @@ const JoinData = props => {
       })
     });
   }
-  function _getColumns(metaList) {
-    let obj = {
-      metaKey: -1,
-      type: TypeEnum.customColumn,
-      customColumn: [{
-        name: '',
-        // 用户起的别名
-        formula: '' // 公式}];
-      }]
-    };
-    let {
-      ExistAboveGroupBy,
-      prevList,
-      prevGroupBy
-    } = getHelper([...metaList, obj], obj);
-    let data;
-    if (ExistAboveGroupBy) {
-      let _data = {
-        table: prevGroupBy.alias,
-        alias: prevGroupBy.alias,
-        columns: []
-      };
-      if (prevGroupBy?.group?.length) {
-        _data.columns = _data.columns.concat(prevGroupBy.group.map(v => {
-          return {
-            name_zh: v.quotes,
-            ...v,
-            name: v.quotes,
-            realName: v.sql?.split(' AS ')?.[1] || '',
-            // name_zh: '',
-            database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
-            special_type: '',
-            select: true
-          };
-        }));
-      }
-      if (prevGroupBy?.by?.length) {
-        _data.columns = _data.columns.concat(prevGroupBy.by.map(v => {
-          return {
-            name_zh: v.quotes,
-            ...v,
-            name: v.quotes,
-            realName: v.sql?.split(' AS ')?.[1] || '',
-            // name_zh: '',
-            database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
-            special_type: '',
-            select: true
-          };
-        }));
-      }
-      data = [_data];
-      let joinData = prevList.filter(v => v.type === TypeEnum.joinData)
-      // @ts-ignore
-      .filter(v => v && v.table2.name);
-      if (joinData.length) {
-        data = data.concat(
-        // @ts-ignore
-        joinData.map(v => {
-          return {
-            alias: v.table2.alias,
-            table: v.table2.name,
-            columns: v.columns
-          };
-        }));
-      }
-    } else {
-      // @ts-ignore
-      data = metaList.slice(0, index).map(v => {
-        if (v.type === TypeEnum.data) {
-          return {
-            alias: v.table.alias,
-            table: v.table.name,
-            columns: v.columns
-          };
-        } else if (v.type === TypeEnum.joinData) {
-          return {
-            alias: v.table2.alias,
-            table: v.table2.name,
-            columns: v.columns
-          };
-        } else {
-          return {
-            table: null
-          };
-        }
-      }).filter(v => v.table);
-    }
-    return data;
-  }
   function selectTable(e) {
     let value = {
       name: meta.table2.name,
@@ -5739,6 +5754,7 @@ const JoinData = props => {
     let oldList = cloneDeep(newMeta[index].subquery);
     let o = Modal2.openModal({
       title: __('SqlQueryBuilder.subquery'),
+      transparentMask: true,
       content: jsx(Fragment, {
         children: jsx(SqlVisionBuilder, {
           ...other,
@@ -5759,11 +5775,11 @@ const JoinData = props => {
                 column: '',
                 column_id: ''
               };
-              const items = _getColumns(newList);
+              const items = getSubColumns(newList);
               const newColumns = items.flatMap(item => item.columns);
               newMeta[index].columns = newColumns;
               newMeta[index].expressions = [];
-              store.setPreData(newMeta);
+              store.setMeta(newMeta);
               o.close();
             } catch (e) {
               console.warn(e);