@gingkoo/pandora-metabase 1.0.27 → 1.0.29

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

@@ -52,11 +52,40 @@ var Metabase = function Metabase(props) {
     if (!visible) return null;
     return content;
   }, [store.popupData2]);
+  var onCheck = function onCheck() {
+    var doms = store.popupContainer.current.querySelectorAll('.isError');
+    if (doms.length) {
+      _pandora.Modal.confirm({
+        title: (0, _locale.__)('metabase.prompt'),
+        content: (0, _locale.__)('metabase.validationFailed'),
+        onOk: function () {
+          var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+            return _regenerator["default"].wrap(function (_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 1;
+                  return onSave();
+                case 1:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
+          function onOk() {
+            return _onOk.apply(this, arguments);
+          }
+          return onOk;
+        }()
+      });
+    } else {
+      onSave();
+    }
+  };
   var onSave = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var intercept, _metaList;
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator["default"].wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             intercept = false; // 是否返回
             _metaList = (0, _utils.splitByUnion)(store.metaList);
@@ -69,21 +98,21 @@ var Metabase = function Metabase(props) {
               }
             });
             if (!(saveLoading || intercept)) {
-              _context.next = 6;
+              _context2.next = 1;
               break;
             }
-            return _context.abrupt("return", null);
-          case 6:
+            return _context2.abrupt("return", null);
+          case 1:
             setSaveLoading(true);
-            _context.next = 9;
+            _context2.next = 2;
             return onOk === null || onOk === void 0 ? void 0 : onOk(_metaList);
-          case 9:
+          case 2:
             setSaveLoading(false);
-          case 10:
+          case 3:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function onSave() {
       return _ref.apply(this, arguments);
@@ -126,7 +155,7 @@ var Metabase = function Metabase(props) {
           className: ":Sqb-btn",
           loading: saveLoading,
           disabled: saveLoading,
-          onClick: onSave,
+          onClick: onCheck,
           children: btnText || (0, _locale.__)('SqlQueryBuilder.visualize')
         }) : null, store.popupContainer.current && (0, _jsxRuntime.jsx)(_popup["default"], {
           container: store.popupData.container || store.popupContainer.current,

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

@@ -259,6 +259,9 @@
               }
             }
           }
+          &.isError {
+            background-color: red;
+          }
         }
 
         .ant-input-number {

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 _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
+            _context.next = 1;
             return (0, _helper.sleep)(10);
-          case 2:
+          case 1:
             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 = 6;
+            _context.next = 2;
             return (0, _helper.sleep)(500);
-          case 6:
+          case 2:
             setMaxHeight('auto');
-          case 7:
+          case 3:
           case "end":
             return _context.stop();
         }

package/lib/cjs/components/modules/components/item-name.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+interface HeaderProps {
+    children: React.ReactNode;
+    isError: boolean;
+}
+declare const ItemName: (props: HeaderProps) => import("react/jsx-runtime").JSX.Element;
+export default ItemName;

package/lib/cjs/components/modules/components/item-name.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+var _pandora = require("@gingkoo/pandora");
+var _pandoraIcons = require("@gingkoo/pandora-icons");
+var _locale = require("../../../locale");
+var ItemName = function ItemName(props) {
+  var children = props.children,
+    isError = props.isError;
+  return (0, _jsxRuntime.jsx)(_pandora.Badge, {
+    offset: [-8, 0],
+    count: isError ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+      title: (0, _locale.__)('metabase.verify'),
+      children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+        className: 'isError',
+        style: {
+          width: '100%',
+          height: '100%',
+          fontSize: 18
+        },
+        danger: true,
+        size: 'small',
+        icon: (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}),
+        iconOnly: true
+      })
+    }) : '',
+    children: children
+  });
+};
+var _default = exports["default"] = ItemName;

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

@@ -153,6 +153,9 @@ var findNextIcon = function findNextIcon(store, props) {
     } else {
       available = OrderType.slice(curLocation + 1, nextLocation);
     }
+    if (nextType === _enum.TypeEnum.joinData) {
+      available = [_enum.TypeEnum.joinData];
+    }
   }
   if (type === _enum.TypeEnum.joinData) {
     if (ExistAboveGroupBy && isLast) {
@@ -173,6 +176,9 @@ var findNextIcon = function findNextIcon(store, props) {
     if (nextType !== _enum.TypeEnum.joinData && meta.table2.name) {
       available.unshift(_enum.TypeEnum.joinData);
     }
+    if (nextType === _enum.TypeEnum.joinData) {
+      available = [_enum.TypeEnum.joinData];
+    }
   }
   if (type === _enum.TypeEnum.customColumn) {
     if (ExistAboveGroupBy && isLast) {

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

@@ -12,6 +12,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/
 var _jsxRuntime = require("react/jsx-runtime");
 var _pandora = require("@gingkoo/pandora");
 var _useProvider = require("../../hooks/use-provider");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _locale = require("../../locale");
 var _utils = require("../../utils");
 var _helper = require("../../utils/helper");
@@ -22,6 +23,7 @@ var _dialog = require("../dialog");
 var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
 var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
 var _header = _interopRequireDefault(require("./components/header"));
+var _itemName = _interopRequireDefault(require("./components/item-name"));
 var CustomColumn = function CustomColumn(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
@@ -73,14 +75,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 _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 4;
+            _context.next = 1;
             return (0, _helper.sleep)(100);
-          case 4:
+          case 1:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -102,7 +104,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 8:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -128,8 +130,8 @@ var CustomColumn = function CustomColumn(props) {
         tableId: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid || (0, _helper.uuidv4)('table'),
         alias: prevGroupBy.alias,
-        datasourceId: mainTable.table.datasourceId,
-        datasourceName: mainTable.table.datasourceName,
+        datasourceId: '',
+        datasourceName: '',
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
@@ -161,15 +163,11 @@ var CustomColumn = function CustomColumn(props) {
       data = [_data];
       var joinData = prevList.filter(function (v) {
         return v.type === _enum.TypeEnum.joinData;
-      })
-      // @ts-ignore
-      .filter(function (v) {
+      }).filter(function (v) {
         return v && v.table2.name;
       });
       if (joinData.length) {
-        data = data.concat(
-        // @ts-ignore
-        joinData.map(function (v) {
+        data = data.concat(joinData.map(function (v) {
           return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
@@ -182,7 +180,6 @@ var CustomColumn = function CustomColumn(props) {
         }));
       }
     } else {
-      // @ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === _enum.TypeEnum.data) {
           return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v.table), {}, {
@@ -303,20 +300,23 @@ var CustomColumn = function CustomColumn(props) {
         children: (0, _jsxRuntime.jsxs)("div", {
           className: "Sqb-NotebookCell gray-bg",
           children: [meta.customColumn.map(function (v, i) {
-            return (0, _jsxRuntime.jsxs)("div", {
-              className: "Sqb-TableName gray-name",
-              onClick: function onClick(e) {
-                return showSubQuery(e, i);
-              },
-              children: [v.name, (0, _jsxRuntime.jsx)("span", {
-                style: {
-                  fontSize: 0
-                },
+            return (0, _jsxRuntime.jsx)(_itemName["default"], {
+              isError: (0, _utils.isError)(v.formulaList, getColumns()),
+              children: (0, _jsxRuntime.jsxs)("div", {
+                className: (0, _classnames["default"])("Sqb-TableName gray-name"),
                 onClick: function onClick(e) {
-                  return handleDel(e, i);
+                  return showSubQuery(e, i);
                 },
-                children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-              })]
+                children: [v.name, (0, _jsxRuntime.jsx)("span", {
+                  style: {
+                    fontSize: 0
+                  },
+                  onClick: function onClick(e) {
+                    return handleDel(e, i);
+                  },
+                  children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+                })]
+              })
             }, i);
           }), (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableName gray-name",

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

@@ -47,8 +47,8 @@ var Filter = function Filter(props) {
         id: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid,
         // alias: (prevGroupBy as MetaSummarize).alias,
-        datasourceId: mainTable.table.datasourceId,
-        datasourceName: mainTable.table.datasourceName,
+        // datasourceId: mainTable.table.datasourceId,
+        // datasourceName: mainTable.table.datasourceName,
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {