@gingkoo/pandora-metabase 1.0.27 → 1.0.28

package/lib/es/components/icons.js

@@ -169,12 +169,12 @@ export var LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-export var InnerJoinIcon = function InnerJoinIcon(_ref10) {
-  var _ref10$width = _ref10.width,
-    width = _ref10$width === void 0 ? 32 : _ref10$width,
-    _ref10$height = _ref10.height,
-    height = _ref10$height === void 0 ? 32 : _ref10$height,
-    style = _ref10.style;
+export var InnerJoinIcon = function InnerJoinIcon(_ref0) {
+  var _ref0$width = _ref0.width,
+    width = _ref0$width === void 0 ? 32 : _ref0$width,
+    _ref0$height = _ref0.height,
+    height = _ref0$height === void 0 ? 32 : _ref0$height,
+    style = _ref0.style;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -188,11 +188,11 @@ export var InnerJoinIcon = function InnerJoinIcon(_ref10) {
     })
   });
 };
-export var UpArrowIcon = function UpArrowIcon(_ref11) {
-  var _ref11$width = _ref11.width,
-    width = _ref11$width === void 0 ? 16 : _ref11$width,
-    _ref11$height = _ref11.height,
-    height = _ref11$height === void 0 ? 17 : _ref11$height;
+export var UpArrowIcon = function UpArrowIcon(_ref1) {
+  var _ref1$width = _ref1.width,
+    width = _ref1$width === void 0 ? 16 : _ref1$width,
+    _ref1$height = _ref1.height,
+    height = _ref1$height === void 0 ? 17 : _ref1$height;
   return _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -206,11 +206,11 @@ export var UpArrowIcon = function UpArrowIcon(_ref11) {
     })
   });
 };
-export var DownArrowIcon = function DownArrowIcon(_ref12) {
-  var _ref12$width = _ref12.width,
-    width = _ref12$width === void 0 ? 16 : _ref12$width,
-    _ref12$height = _ref12.height,
-    height = _ref12$height === void 0 ? 17 : _ref12$height;
+export var DownArrowIcon = function DownArrowIcon(_ref10) {
+  var _ref10$width = _ref10.width,
+    width = _ref10$width === void 0 ? 16 : _ref10$width,
+    _ref10$height = _ref10.height,
+    height = _ref10$height === void 0 ? 17 : _ref10$height;
   return _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -224,11 +224,11 @@ export var DownArrowIcon = function DownArrowIcon(_ref12) {
     })
   });
 };
-export var CloseIcon = function CloseIcon(_ref13) {
-  var _ref13$width = _ref13.width,
-    width = _ref13$width === void 0 ? 16 : _ref13$width,
-    _ref13$height = _ref13.height,
-    height = _ref13$height === void 0 ? 16 : _ref13$height;
+export var CloseIcon = function CloseIcon(_ref11) {
+  var _ref11$width = _ref11.width,
+    width = _ref11$width === void 0 ? 16 : _ref11$width,
+    _ref11$height = _ref11.height,
+    height = _ref11$height === void 0 ? 16 : _ref11$height;
   return _jsx("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -242,11 +242,11 @@ export var CloseIcon = function CloseIcon(_ref13) {
     })
   });
 };
-export var AddIcon = function AddIcon(_ref14) {
-  var _ref14$width = _ref14.width,
-    width = _ref14$width === void 0 ? 16 : _ref14$width,
-    _ref14$height = _ref14.height,
-    height = _ref14$height === void 0 ? 16 : _ref14$height;
+export var AddIcon = function AddIcon(_ref12) {
+  var _ref12$width = _ref12.width,
+    width = _ref12$width === void 0 ? 16 : _ref12$width,
+    _ref12$height = _ref12.height,
+    height = _ref12$height === void 0 ? 16 : _ref12$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -259,11 +259,11 @@ export var AddIcon = function AddIcon(_ref14) {
     })
   });
 };
-export var TableIcon = function TableIcon(_ref15) {
-  var _ref15$width = _ref15.width,
-    width = _ref15$width === void 0 ? 18 : _ref15$width,
-    _ref15$height = _ref15.height,
-    height = _ref15$height === void 0 ? 18 : _ref15$height;
+export var TableIcon = function TableIcon(_ref13) {
+  var _ref13$width = _ref13.width,
+    width = _ref13$width === void 0 ? 18 : _ref13$width,
+    _ref13$height = _ref13.height,
+    height = _ref13$height === void 0 ? 18 : _ref13$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -276,11 +276,11 @@ export var TableIcon = function TableIcon(_ref15) {
     })
   });
 };
-export var SearchIcon = function SearchIcon(_ref16) {
-  var _ref16$width = _ref16.width,
-    width = _ref16$width === void 0 ? 16 : _ref16$width,
-    _ref16$height = _ref16.height,
-    height = _ref16$height === void 0 ? 16 : _ref16$height;
+export var SearchIcon = function SearchIcon(_ref14) {
+  var _ref14$width = _ref14.width,
+    width = _ref14$width === void 0 ? 16 : _ref14$width,
+    _ref14$height = _ref14.height,
+    height = _ref14$height === void 0 ? 16 : _ref14$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,

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

@@ -7,7 +7,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import './index.less';
 import { useMemo, useState } from 'react';
 import cx from 'classnames';
-import { Button, Toast } from '@gingkoo/pandora';
+import { Button, Modal, Toast } from '@gingkoo/pandora';
 // import { toJS } from 'mobx';
 import Styled from 'styled-components';
 import Union from '../modules/union';
@@ -46,11 +46,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) {
+      Modal.confirm({
+        title: __('metabase.prompt'),
+        content: __('metabase.validationFailed'),
+        onOk: function () {
+          var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            return _regeneratorRuntime.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 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var intercept, _metaList;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             intercept = false; // 是否返回
             _metaList = splitByUnion(store.metaList);
@@ -63,21 +92,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);
@@ -120,7 +149,7 @@ var Metabase = function Metabase(props) {
           className: ":Sqb-btn",
           loading: saveLoading,
           disabled: saveLoading,
-          onClick: onSave,
+          onClick: onCheck,
           children: btnText || __('SqlQueryBuilder.visualize')
         }) : null, store.popupContainer.current && _jsx(Popup, {
           container: store.popupData.container || store.popupContainer.current,

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

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

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

@@ -25,19 +25,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _couterRef$current;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
+            _context.next = 1;
             return 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 sleep(500);
-          case 6:
+          case 2:
             setMaxHeight('auto');
-          case 7:
+          case 3:
           case "end":
             return _context.stop();
         }

package/lib/es/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/es/components/modules/components/item-name.js

@@ -0,0 +1,28 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Badge, Button, Tooltip } from '@gingkoo/pandora';
+import { ExclamationCircleFill } from '@gingkoo/pandora-icons';
+import { __ } from '../../../locale';
+var ItemName = function ItemName(props) {
+  var children = props.children,
+    isError = props.isError;
+  return _jsx(Badge, {
+    offset: [-8, 0],
+    count: isError ? _jsx(Tooltip, {
+      title: __('metabase.verify'),
+      children: _jsx(Button, {
+        className: 'isError',
+        style: {
+          width: '100%',
+          height: '100%',
+          fontSize: 18
+        },
+        danger: true,
+        size: 'small',
+        icon: _jsx(ExclamationCircleFill, {}),
+        iconOnly: true
+      })
+    }) : '',
+    children: children
+  });
+};
+export default ItemName;

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

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

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

@@ -5,8 +5,9 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Modal2 } from '@gingkoo/pandora';
 import { Provider } from '../../hooks/use-provider';
+import cx from 'classnames';
 import { __ } from '../../locale';
-import { findIndex } from '../../utils';
+import { findIndex, isError } from '../../utils';
 import { sleep, flatArray } from '../../utils/helper';
 import { getHelper } from '../../utils';
 import { TypeEnum, SQL_COLUMN_TYPE } from '../../store/enum';
@@ -17,6 +18,7 @@ import { CustomColumnPopup } from '../dialog';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
+import ItemName from './components/item-name';
 import { useStore } from '../../hooks/use-provider';
 var CustomColumn = function CustomColumn(props) {
   var meta = props.meta,
@@ -69,14 +71,14 @@ var CustomColumn = function CustomColumn(props) {
   function _handleUpdate() {
     _handleUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, i) {
       var node, newMeta, value, columns;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 4;
+            _context.next = 1;
             return sleep(100);
-          case 4:
+          case 1:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -98,7 +100,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 8:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -124,8 +126,8 @@ var CustomColumn = function CustomColumn(props) {
         tableId: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid || 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) {
@@ -157,15 +159,11 @@ var CustomColumn = function CustomColumn(props) {
       data = [_data];
       var joinData = prevList.filter(function (v) {
         return v.type === 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 _objectSpread(_objectSpread({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
@@ -178,7 +176,6 @@ var CustomColumn = function CustomColumn(props) {
         }));
       }
     } else {
-      // @ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === TypeEnum.data) {
           return _objectSpread(_objectSpread({}, v.table), {}, {
@@ -299,20 +296,23 @@ var CustomColumn = function CustomColumn(props) {
         children: _jsxs("div", {
           className: "Sqb-NotebookCell gray-bg",
           children: [meta.customColumn.map(function (v, i) {
-            return _jsxs("div", {
-              className: "Sqb-TableName gray-name",
-              onClick: function onClick(e) {
-                return showSubQuery(e, i);
-              },
-              children: [v.name, _jsx("span", {
-                style: {
-                  fontSize: 0
-                },
+            return _jsx(ItemName, {
+              isError: isError(v.formulaList, getColumns()),
+              children: _jsxs("div", {
+                className: cx("Sqb-TableName gray-name"),
                 onClick: function onClick(e) {
-                  return handleDel(e, i);
+                  return showSubQuery(e, i);
                 },
-                children: _jsx(CloseIcon, {})
-              })]
+                children: [v.name, _jsx("span", {
+                  style: {
+                    fontSize: 0
+                  },
+                  onClick: function onClick(e) {
+                    return handleDel(e, i);
+                  },
+                  children: _jsx(CloseIcon, {})
+                })]
+              })
             }, i);
           }), _jsx("div", {
             className: "Sqb-TableName gray-name",

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

@@ -40,8 +40,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) {