@gingkoo/pandora-metabase 0.0.1-alpha.6 → 0.0.1-alpha.8

package/README.md

@@ -42,7 +42,6 @@ export type ToolbarType =
 export interface MetaBaseProps {
   loading?: boolean; // 加载状态
   btnText?: string;	//按钮文字
-  showPermissionTable?: boolean; // 是否显示权限表
 	showFields?:boolean ; //是否显示字段
   tableNameTpl?: string; //表名
   fieldNameTpl?: string; //字段名

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v0.0.1-alpha.6
+ * @gingkoo/pandora-metabase v0.0.1-alpha.8
  */
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -2165,30 +2165,31 @@ configure({
 });
 let metaKey = 1;
 const SummarizeAlias = 'source';
+const defaultMetaList = [{
+  metaKey,
+  type: TypeEnum.data,
+  table: {
+    name: '',
+    alias: '',
+    datasourceId: '',
+    datasourceName: ''
+  },
+  columns: []
+}];
+const defaultToolbar = ['filter', 'summarize', 'joinData', 'customColumn', 'sort', 'rowLimit'];
 class SqlVisionStore {
   constructor() {
     makeAutoObservable(this);
   }
-  showPermissionTable = false; // 开启权限表
-  showFields = true; // 开启权限表
+  showFields = true; // 显示字段
   //工具列表
-  toolbar = ['filter', 'summarize', 'joinData', 'permissionTable', 'customColumn', 'sort', 'rowLimit'];
+  toolbar = defaultToolbar;
   fieldNameTpl = '${name}';
   tableNameTpl = '${name}';
   sourceList = []; // 数据源列表
   _cacheSource2TableMap = {}; // 数据源id 对应数据集列表
   _cacheColumnsMap = {};
-  metaList = [{
-    metaKey,
-    type: TypeEnum.data,
-    table: {
-      name: '',
-      alias: '',
-      datasourceId: '',
-      datasourceName: ''
-    },
-    columns: []
-  }];
+  metaList = defaultMetaList;
   popupData = {
     visible: false,
     node: null,
@@ -2203,6 +2204,9 @@ class SqlVisionStore {
     }
     return false;
   }
+  showToolbar(name) {
+    return !!~this.toolbar.indexOf(name);
+  }
   fetchDatasetFn = async () => {};
   fetchColumnsFn = async () => {};
   setFetchDatasetFn(fn) {
@@ -2222,10 +2226,21 @@ class SqlVisionStore {
     return _tables;
   }
   // 查询表字段
-  async fetchColumns(tableName, datasourceId, callback) {
+  async fetchColumns(table, datasourceId, callback) {
+    let {
+      alias,
+      datasourceName,
+      datasourceId: did,
+      // @ts-ignore
+      column,
+      // @ts-ignore
+      groupSql,
+      ...extra
+    } = table;
+    let tableName = table.name;
     let columns = this.getColumns(tableName);
     if (!columns.length) {
-      columns = await this.fetchColumnsFn(tableName, datasourceId);
+      columns = await this.fetchColumnsFn(extra, datasourceId);
       runInAction(() => {
         this.setColumns(tableName, columns);
       });
@@ -2238,10 +2253,8 @@ class SqlVisionStore {
       this.metaList = data.map((v, i) => {
         // 设置右侧column
         if (v.table2?.datasourceId && v.columns.length < 1) {
-          // let newMetaList = this.metaList.slice() as MetaData[];
           let newMeta = data.slice();
-          let tableName = newMeta[i].table2.name;
-          this.fetchColumns(tableName, newMeta[i].table2.datasourceId, columns => {
+          this.fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, columns => {
             newMeta[i].columns = columns;
             this.setMeta(newMeta);
           });
@@ -2251,10 +2264,8 @@ class SqlVisionStore {
         }
         // 设置column
         if (v.table?.datasourceId && v.columns.length < 1) {
-          // let newMetaList = this.metaList.slice() as MetaData[];
           let newMeta = data.slice();
-          let tableName = newMeta[i].table.name;
-          this.fetchColumns(tableName, newMeta[i].table.datasourceId, columns => {
+          this.fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, columns => {
             newMeta[i].columns = columns;
             this.setMeta(newMeta);
           });
@@ -2268,17 +2279,7 @@ class SqlVisionStore {
       });
       metaKey = Math.max.apply(null, this.metaList.map(v => Number(v.metaKey)));
     } else {
-      this.setMeta([{
-        metaKey,
-        type: TypeEnum.data,
-        table: {
-          name: '',
-          alias: '',
-          datasourceId: '',
-          datasourceName: ''
-        },
-        columns: []
-      }]);
+      this.setMeta(defaultMetaList);
     }
   }
   setSourceList(list) {
@@ -2414,9 +2415,6 @@ class SqlVisionStore {
   setClosable(payload) {
     this.popupClosable = payload;
   }
-  setShowPermissionTable(show) {
-    this.showPermissionTable = show;
-  }
   setShowFields(show) {
     this.showFields = show;
   }
@@ -2429,6 +2427,13 @@ class SqlVisionStore {
   setTableNameTpl(tpl) {
     this.tableNameTpl = tpl;
   }
+  reset() {
+    this.setSourceList([]);
+    this.setMeta(defaultMetaList);
+    this.setToolbar(defaultToolbar);
+    this._cacheSource2TableMap = {};
+    this._cacheColumnsMap = {};
+  }
 }
 const sqlVisionStore = new SqlVisionStore();
 const Store = /*#__PURE__*/React__default.createContext(sqlVisionStore);
@@ -4645,7 +4650,7 @@ const NextDom = props => {
   // @ts-ignore
   if (!store.metaList[0].table.name) return null;
   let available = findNextIcon(store, props);
-  if (!store.showPermissionTable) {
+  if (!store.showToolbar(TypeEnum.permissionTable)) {
     available = available.filter(v => v !== TypeEnum.permissionTable);
   }
   let size = judgeSize(store, props, available.length);
@@ -4693,9 +4698,8 @@ const TableData = props => {
         onChange: data => {
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
             let newMetaList = store.metaList.slice()[0];
-            let tableName = data.name;
             newMetaList.table = data;
-            store.fetchColumns(tableName, data.datasourceId, columns => {
+            store.fetchColumns(data, data.datasourceId, columns => {
               newMetaList.columns = columns;
               // ① 主表动了 其他都得重新选
               store.setMeta([newMetaList]);
@@ -4832,7 +4836,7 @@ const JoinData = props => {
                 alias = `${tableName}_2`;
               }
             }
-            newMeta[index].table2 = {
+            let _table2 = {
               ...data,
               name: tableName,
               alias,
@@ -4840,7 +4844,8 @@ const JoinData = props => {
               datasourceId: data.datasourceId,
               datasourceName: data.datasourceName
             };
-            store.fetchColumns(tableName, data.datasourceId, columns => {
+            newMeta[index].table2 = _table2;
+            store.fetchColumns(_table2, data.datasourceId, columns => {
               newMeta[index].columns = columns;
               // 关联表变了 下面模块全部删除
               newMeta = newMeta.filter((v, i) => i <= index);
@@ -6708,37 +6713,33 @@ const Metabase = observer(props => {
 const SqlVisionBuilder = /*#__PURE__*/React__default.forwardRef((props, ref) => {
   let {
     loading = false,
-    showPermissionTable = false,
     showFields = true,
     getTables,
     getColumns,
     tableNameTpl = '${name}',
     fieldNameTpl = '${name}',
-    toolbar = ['filter', 'summarize', 'joinData', 'permissionTable', 'customColumn', 'sort', 'rowLimit']
+    toolbar = ['filter', 'summarize', 'joinData', 'customColumn', 'sort', 'rowLimit']
   } = props;
   const store = useStore();
-  const [preData, setPreData] = useState([]);
   useEffect(() => {
     getTables && store.setFetchDatasetFn(getTables);
     getColumns && store.setFetchColumnsFn(getColumns);
   }, []);
   useEffect(() => {
-    store.setShowPermissionTable(showPermissionTable);
     store.setShowFields(showFields);
     store.setToolbar(toolbar || []);
     store.setFieldNameTpl(fieldNameTpl || '${name}');
     store.setTableNameTpl(tableNameTpl || '${name}');
-  }, [showFields, showPermissionTable, toolbar, fieldNameTpl, tableNameTpl]);
+  }, [showFields, toolbar, fieldNameTpl, tableNameTpl]);
   React__default.useImperativeHandle(ref, () => ({
     setDatasource: list => {
       store.setSourceList(list);
     },
     setPreData: data => {
       store.setPreData(data);
-      setPreData(data);
     },
     reset: () => {
-      store.setPreData(preData);
+      store.reset();
     }
   }));
   // ② 表集合没有查出来前 不加载页面