@gingkoo/pandora-metabase 1.0.61 → 1.0.63

package/lib/es/hooks/use-state.js

@@ -1,11 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useState, useRef, useMemo } from 'react';
+import { useEffect, useState, useRef, useMemo } from 'react';
 import { uuidv4 } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
 import { splitByUnion } from '../utils';
@@ -140,6 +140,14 @@ var useStore = function useStore() {
     _useState44 = _slicedToArray(_useState43, 2),
     isSelectFields = _useState44[0],
     setIsSelectFields = _useState44[1]; // 是否默认勾选字段
+  var _useState45 = useState(false),
+    _useState46 = _slicedToArray(_useState45, 2),
+    tableFlat = _useState46[0],
+    setTableFlat = _useState46[1]; // 是否平铺数据表
+  var _useState47 = useState([]),
+    _useState48 = _slicedToArray(_useState47, 2),
+    sourceTable = _useState48[0],
+    setSourceTable = _useState48[1];
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -185,6 +193,55 @@ var useStore = function useStore() {
       };
     });
   }, [metaList]);
+  useEffect(function () {
+    if (tableFlat) {
+      getSourceTable(sourceList);
+    }
+  }, [sourceList, isExit, tableFlat]);
+  // 获取所有数据表
+  var getSourceTable = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(source) {
+      var results;
+      return _regeneratorRuntime.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 1;
+            return Promise.all(source.map(/*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(v) {
+                var tables;
+                return _regeneratorRuntime.wrap(function (_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.next = 1;
+                      return fetchDataset(v.datasourceId);
+                    case 1:
+                      tables = _context.sent;
+                      return _context.abrupt("return", _objectSpread(_objectSpread({}, v), {}, {
+                        children: tables
+                      }));
+                    case 2:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              return function (_x2) {
+                return _ref2.apply(this, arguments);
+              };
+            }()));
+          case 1:
+            results = _context2.sent;
+            setSourceTable(results || []);
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getSourceTable(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   // const showMainColumn = useMemo(() => {
   //   let summarizeList = metaList.filter((v) => v.type === TypeEnum.summarize);
   //   if (
@@ -201,41 +258,41 @@ var useStore = function useStore() {
     return !!~toolbar.indexOf(name);
   };
   var fetchDataset = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(datasourceId) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(datasourceId) {
       var tables, _tables;
-      return _regeneratorRuntime.wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime.wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context.next = 1;
+              _context3.next = 1;
               break;
             }
-            return _context.abrupt("return", tables);
+            return _context3.abrupt("return", tables);
           case 1:
-            _context.next = 2;
+            _context3.next = 2;
             return fetchDatasetFn.current(datasourceId, {
               isExit: isExit
             });
           case 2:
-            _tables = _context.sent;
+            _tables = _context3.sent;
             setDataset(datasourceId, _tables);
-            return _context.abrupt("return", _tables);
+            return _context3.abrupt("return", _tables);
           case 3:
           case "end":
-            return _context.stop();
+            return _context3.stop();
         }
-      }, _callee);
+      }, _callee3);
     }));
-    return function fetchDataset(_x) {
-      return _ref.apply(this, arguments);
+    return function fetchDataset(_x3) {
+      return _ref3.apply(this, arguments);
     };
   }();
   // 根据数据源id查询集合列表
   //  fetchDataset():
   // 查询表字段
   var fetchColumns = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(table, datasourceId) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(table, datasourceId) {
       var _columns2;
       var oldColumns,
         callback,
@@ -251,13 +308,13 @@ var useStore = function useStore() {
         tableName,
         columns,
         _columns,
-        _args2 = arguments;
-      return _regeneratorRuntime.wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+        _args4 = arguments;
+      return _regeneratorRuntime.wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            oldColumns = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : [];
-            callback = _args2.length > 3 ? _args2[3] : undefined;
-            isSelect = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : isSelectFields;
+            oldColumns = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : [];
+            callback = _args4.length > 3 ? _args4[3] : undefined;
+            isSelect = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : isSelectFields;
             // 获取之前选中的数据
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
@@ -272,15 +329,15 @@ var useStore = function useStore() {
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context2.next = 2;
+              _context4.next = 2;
               break;
             }
-            _context2.next = 1;
+            _context4.next = 1;
             return fetchColumnsFn.current(extra, datasourceId, {
               isExit: isExit
             });
           case 1:
-            columns = _context2.sent;
+            columns = _context4.sent;
             setColumns(tableName, columns);
           case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
@@ -295,26 +352,26 @@ var useStore = function useStore() {
             typeof callback === 'function' && callback(_columns);
           case 3:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee4);
     }));
-    return function fetchColumns(_x2, _x3) {
-      return _ref2.apply(this, arguments);
+    return function fetchColumns(_x4, _x5) {
+      return _ref4.apply(this, arguments);
     };
   }();
   var setMeta = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(curData, groupInd) {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(curData, groupInd) {
       var changeObj,
         _metaList,
         newMeta,
         isChange,
-        _args3 = arguments;
-      return _regeneratorRuntime.wrap(function (_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+        _args5 = arguments;
+      return _regeneratorRuntime.wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            changeObj = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {};
-            _metaList = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : metaList;
+            changeObj = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : {};
+            _metaList = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : metaList;
             newMeta = cloneDeep(_metaList);
             if (newMeta[groupInd]) {
               newMeta[groupInd].list = curData;
@@ -322,29 +379,29 @@ var useStore = function useStore() {
             }
             // 过滤掉初始化
             if (!(changeObj === 'init')) {
-              _context3.next = 1;
+              _context5.next = 1;
               break;
             }
-            return _context3.abrupt("return");
+            return _context5.abrupt("return");
           case 1:
-            _context3.next = 2;
+            _context5.next = 2;
             return fetchChangeFn.current(splitByUnion(_metaList), changeObj, {
               isExit: isExit
             });
           case 2:
-            isChange = _context3.sent;
+            isChange = _context5.sent;
             // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }
           case 3:
           case "end":
-            return _context3.stop();
+            return _context5.stop();
         }
-      }, _callee3);
+      }, _callee5);
     }));
-    return function setMeta(_x4, _x5) {
-      return _ref3.apply(this, arguments);
+    return function setMeta(_x6, _x7) {
+      return _ref5.apply(this, arguments);
     };
   }();
   // 回显
@@ -670,7 +727,11 @@ var useStore = function useStore() {
     fieldEnableAlias: fieldEnableAlias,
     setFieldEnableAlias: setFieldEnableAlias,
     isSelectFields: isSelectFields,
-    setIsSelectFields: setIsSelectFields
+    setIsSelectFields: setIsSelectFields,
+    tableFlat: tableFlat,
+    setTableFlat: setTableFlat,
+    getSourceTable: getSourceTable,
+    sourceTable: sourceTable
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -53,7 +53,9 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$fieldEnableAli = props.fieldEnableAlias,
     fieldEnableAlias = _props$fieldEnableAli === void 0 ? true : _props$fieldEnableAli,
     _props$isSelectFields = props.isSelectFields,
-    isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields;
+    isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields,
+    _props$tableFlat = props.tableFlat,
+    tableFlat = _props$tableFlat === void 0 ? false : _props$tableFlat;
   var store = useData();
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -85,7 +87,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setTableEnableAlias(tableEnableAlias);
     store.setFieldEnableAlias(fieldEnableAlias);
     store.setIsSelectFields(isSelectFields);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields]);
+    store.setTableFlat(tableFlat);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields, tableFlat]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/types.d.ts

@@ -41,6 +41,7 @@ export interface MetabaseProps {
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     isSelectFields?: boolean;
+    tableFlat?: boolean;
     onChange?: (newData: MetaListType[], curData: {
         data: any;
         type: ChangeType;

package/lib/es/utils/helper.d.ts

@@ -17,4 +17,4 @@ export declare const replaceTpl: (inputString: string, values: {
 }) => string;
 export declare const uuidv4: (prefix?: string) => string;
 export declare const getAlias: (name: string | undefined, list: MetaListType[], columns?: any[]) => string;
-export declare const mergeNameAlias: (name: string, alias: string) => string;
+export declare const mergeNameAlias: (name: string, alias: string, isEnable: boolean) => string;

package/lib/es/utils/helper.js

@@ -182,6 +182,6 @@ export var getAlias = function getAlias() {
   var nextIndex = Math.max.apply(Math, _toConsumableArray(uniqueIndexes)) + 1;
   return "".concat(name, "_").concat(nextIndex);
 };
-export var mergeNameAlias = function mergeNameAlias(name, alias) {
-  return name + (alias ? "\uFF08".concat(alias, "\uFF09") : '');
+export var mergeNameAlias = function mergeNameAlias(name, alias, isEnable) {
+  return name + (alias && isEnable ? "\uFF08".concat(alias, "\uFF09") : '');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",