@gingkoo/pandora-metabase 1.0.88 → 1.0.89

package/lib/cjs/components/metabase/index.less

@@ -16,7 +16,7 @@
   &-fun-btns {
     position: absolute;
     left: 0;
-    top: 7px;
+    top: 2px;
     display: flex;
     justify-content: end;
     width: 66.6667%;

package/lib/cjs/components/modules/components/Wrapper.js

@@ -32,19 +32,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _couterRef$current;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 1;
+            _context.next = 2;
             return (0, _helper.sleep)(10);
-          case 1:
+          case 2:
             setOpacity(1);
             ((_couterRef$current = couterRef.current) === null || _couterRef$current === void 0 || (_couterRef$current = _couterRef$current.childNodes) === null || _couterRef$current === void 0 ? void 0 : _couterRef$current.length) && setMaxHeight(couterRef.current.childNodes[0].clientHeight + 16);
-            _context.next = 2;
+            _context.next = 6;
             return (0, _helper.sleep)(500);
-          case 2:
+          case 6:
             setMaxHeight('auto');
-          case 3:
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/cjs/components/modules/components/header.js

@@ -23,14 +23,14 @@ var Header = function Header(props) {
   var diff = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _oldMeta, _newMeta, _yield$store$getModul, oldCode, newCode, o;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _oldMeta = store.sourceData.slice();
             _newMeta = (0, _utils.splitByUnion)(store.metaList);
-            _context.next = 1;
+            _context.next = 4;
             return store.getModuleDiffCode(_oldMeta, _newMeta);
-          case 1:
+          case 4:
             _yield$store$getModul = _context.sent;
             oldCode = _yield$store$getModul.oldCode;
             newCode = _yield$store$getModul.newCode;
@@ -43,7 +43,7 @@ var Header = function Header(props) {
               }),
               onClose: function onClose() {}
             });
-          case 2:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/cjs/components/modules/components/meta-icon.js

@@ -19,7 +19,8 @@ var _storage = _interopRequireDefault(require("../../../utils/storage"));
 var _utils = require("../../../utils");
 var _useProvider = require("../../../hooks/use-provider");
 var _icons = require("../../icons");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 // import { type SqlVisionStoreType } from '../../../store/helper';
 
 var IconSIzeEnum;

package/lib/cjs/components/modules/custom-column.js

@@ -78,14 +78,14 @@ var CustomColumn = function CustomColumn(props) {
   function _handleUpdate() {
     _handleUpdate = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(e, i) {
       var node, newMeta, value, columns;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 1;
+            _context.next = 4;
             return (0, _helper.sleep)(100);
-          case 1:
+          case 4:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -110,7 +110,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 2:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -180,8 +180,8 @@ var CustomColumn = function CustomColumn(props) {
             tableId: v.table2.id,
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           });
         }));
       }
@@ -204,8 +204,8 @@ var CustomColumn = function CustomColumn(props) {
             tableId: v.table2.id,
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           });
         } else {
           return {

package/lib/cjs/components/modules/filter.js

@@ -99,8 +99,8 @@ var Filter = function Filter(props) {
             id: v.table2.id,
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           };
         }));
       }
@@ -128,8 +128,8 @@ var Filter = function Filter(props) {
             id: v.table2.id,
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
-            datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           };
         } else {
           return {

package/lib/cjs/components/modules/join-data.js

@@ -70,7 +70,7 @@ var menuOperator = operators.map(function (v) {
   };
 });
 var JoinData = function JoinData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table5, _meta$table6, _meta$table8, _meta$table9, _meta$table0, _meta$table1, _meta$expressions, _meta$table10, _meta$table11, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table5, _meta$table6, _meta$table8, _meta$table9, _meta$table10, _meta$table11, _meta$expressions, _meta$table12, _meta$table13, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = (0, _useProvider.useStore)();
@@ -92,20 +92,20 @@ var JoinData = function JoinData(props) {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _meta$table, _meta$table2;
       var tableName, tables, names;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tableName = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
             if ((_meta$table2 = meta.table2) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
-              _context.next = 1;
+              _context.next = 4;
               break;
             }
             setIsDel(false);
             return _context.abrupt("return");
-          case 1:
-            _context.next = 2;
+          case 4:
+            _context.next = 6;
             return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId);
-          case 2:
+          case 6:
             tables = _context.sent;
             names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
               return v.name;
@@ -115,7 +115,7 @@ var JoinData = function JoinData(props) {
             } else {
               setIsDel(false);
             }
-          case 3:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -1201,16 +1201,16 @@ var JoinData = function JoinData(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
           var index, newMeta;
-          return _regenerator["default"].wrap(function (_context2) {
+          return _regenerator["default"].wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(alias)) {
-                  _context2.next = 1;
+                  _context2.next = 3;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context2.abrupt("return", false);
-              case 1:
+              case 3:
                 index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].table2.alias = alias;
@@ -1219,7 +1219,7 @@ var JoinData = function JoinData(props) {
                   obj: newMeta[index].table2,
                   type: _types.ChangeType.tableAlias
                 });
-              case 2:
+              case 8:
               case "end":
                 return _context2.stop();
             }
@@ -1660,7 +1660,7 @@ var JoinData = function JoinData(props) {
                 icon: (0, _jsxRuntime.jsx)(_pandoraIcons.RelatedWork, {}),
                 onClick: switchSubQuery
               })
-            }), ((_meta$table0 = meta.table2) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && ((_meta$table1 = meta.table1) === null || _meta$table1 === void 0 ? void 0 : _meta$table1.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
+            }), ((_meta$table10 = meta.table2) === null || _meta$table10 === void 0 ? void 0 : _meta$table10.name) && ((_meta$table11 = meta.table1) === null || _meta$table11 === void 0 ? void 0 : _meta$table11.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
               if (v.type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
                 return (0, _jsxRuntime.jsxs)("div", {
                   className: (0, _classnames["default"])("Sqb-where block"),
@@ -1888,7 +1888,7 @@ var JoinData = function JoinData(props) {
                   })]
                 }, i);
               }
-            })), ((_meta$table10 = meta.table2) === null || _meta$table10 === void 0 ? void 0 : _meta$table10.name) && ((_meta$table11 = meta.table1) === null || _meta$table11 === void 0 ? void 0 : _meta$table11.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+            })), ((_meta$table12 = meta.table2) === null || _meta$table12 === void 0 ? void 0 : _meta$table12.name) && ((_meta$table13 = meta.table1) === null || _meta$table13 === void 0 ? void 0 : _meta$table13.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
               title: (0, _locale.__)('SqlQueryBuilder.add'),
               children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
                 trigger: ['click'],

package/lib/cjs/components/modules/summarize/group-by.js

@@ -255,16 +255,16 @@ var GroupBy = function GroupBy(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newMeta;
-          return _regenerator["default"].wrap(function (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
-                  _context.next = 1;
+                  _context.next = 3;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
+              case 3:
                 newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
                 newMeta[index].by[i].fieldAlias = fieldAlias;
@@ -273,7 +273,7 @@ var GroupBy = function GroupBy(props) {
                   obj: newMeta[index].by,
                   type: _types.ChangeType.by
                 });
-              case 2:
+              case 8:
               case "end":
                 return _context.stop();
             }

package/lib/cjs/components/modules/summarize/select-index.js

@@ -253,16 +253,16 @@ var SelectIndex = function SelectIndex(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newMeta;
-          return _regenerator["default"].wrap(function (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
-                  _context.next = 1;
+                  _context.next = 3;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
+              case 3:
                 newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMeta[index].group[i].fieldAlias = fieldAlias;
                 newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
@@ -271,7 +271,7 @@ var SelectIndex = function SelectIndex(props) {
                   obj: newMeta[index].group,
                   type: _types.ChangeType.group
                 });
-              case 2:
+              case 8:
               case "end":
                 return _context.stop();
             }

package/lib/cjs/components/modules/table-data.js

@@ -45,20 +45,20 @@ var TableData = function TableData(props) {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _meta$table, _meta$table2;
       var tableName, tables, names;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tableName = (_meta$table = meta.table) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
             if (meta !== null && meta !== void 0 && (_meta$table2 = meta.table) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
-              _context.next = 1;
+              _context.next = 4;
               break;
             }
             setIsDel(false);
             return _context.abrupt("return");
-          case 1:
-            _context.next = 2;
+          case 4:
+            _context.next = 6;
             return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table.datasourceId);
-          case 2:
+          case 6:
             tables = _context.sent;
             names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
               return v.name;
@@ -68,7 +68,7 @@ var TableData = function TableData(props) {
             } else {
               setIsDel(false);
             }
-          case 3:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -154,16 +154,16 @@ var TableData = function TableData(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
           var newMetaList;
-          return _regenerator["default"].wrap(function (_context2) {
+          return _regenerator["default"].wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(alias)) {
-                  _context2.next = 1;
+                  _context2.next = 3;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context2.abrupt("return", false);
-              case 1:
+              case 3:
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = (0, _utils.changeTableAlias)(newMetaList, newMetaList[0].table);
@@ -171,7 +171,7 @@ var TableData = function TableData(props) {
                   obj: newMetaList[0].table,
                   type: _types.ChangeType.tableAlias
                 });
-              case 2:
+              case 7:
               case "end":
                 return _context2.stop();
             }

package/lib/cjs/components/popup.js

@@ -19,7 +19,8 @@ var React = _interopRequireWildcard(require("react"));
 var _helperDom = require("../utils/helper-dom");
 var _event = require("../utils/event");
 var _Portal = _interopRequireDefault(require("../common/Portal"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, (0, _isNativeReflectConstruct2["default"])() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 var outSpacing = 10;
 var TriggerInternal = /*#__PURE__*/function (_React$Component) {