@gingkoo/pandora-metabase 1.0.146 → 1.0.148

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

@@ -18,6 +18,7 @@ import { changeTableAlias, getSubColumns, mergeSubQueryColumns, isValidSQLAlias,
 import { RelatedWork } from '@gingkoo/pandora-icons';
 import cloneDeep from 'lodash/cloneDeep';
 import ItemName from './components/item-name';
+import RightClickValue from '../right-click-value';
 import { SelectTable, SelectColumn } from '../dialog';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
@@ -292,14 +293,58 @@ var TableData = function TableData(props) {
             className: "Sqb-NotebookCell",
             children: [meta.isSubquery ? _jsx(ItemName, {
               isError: isExistsError(meta.subquery || [], store.existsError),
+              children: _jsx(RightClickValue, {
+                value: meta,
+                children: _jsxs("div", {
+                  className: cx("Sqb-TableName", {
+                    notSelected: !subQuerySelected
+                  }),
+                  onClick: function onClick() {
+                    showSubQuery(meta.subquery);
+                  },
+                  children: [subQuerySelected && _jsx(_Fragment, {
+                    children: function () {
+                      var showButton = store.tableEnableAlias || tableIsError() && isDel;
+                      var icon = isDel ? _jsx(ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
+                      return showButton ? _jsx(Tooltip, {
+                        title: __(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
+                        children: _jsx(Button, {
+                          danger: tableIsError(),
+                          className: cx(':Sqb-TableName-as', {
+                            isError: tableIsError()
+                          }),
+                          shape: 'circle',
+                          style: isDel ? {
+                            fontSize: 18,
+                            backgroundColor: '#fff',
+                            width: 'auto',
+                            height: 'auto'
+                          } : {},
+                          iconOnly: true,
+                          primary: !isDel,
+                          icon: icon,
+                          size: 'small',
+                          onClick: function onClick(e) {
+                            if (store.tableEnableAlias) {
+                              var _meta$table3;
+                              e.stopPropagation();
+                              onChangeTableAlias(((_meta$table3 = meta.table) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias) || '');
+                            }
+                          }
+                        })
+                      }) : null;
+                    }()
+                  }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table4 = meta.table) !== null && _meta$table4 !== void 0 && _meta$table4.alias && store.tableEnableAlias ? "as ".concat((_meta$table5 = meta.table) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+                })
+              })
+            }) : _jsx(RightClickValue, {
+              value: meta.table,
               children: _jsxs("div", {
                 className: cx("Sqb-TableName", {
-                  notSelected: !subQuerySelected
+                  notSelected: !selected
                 }),
-                onClick: function onClick() {
-                  showSubQuery(meta.subquery);
-                },
-                children: [subQuerySelected && _jsx(_Fragment, {
+                onClick: selectTable,
+                children: [selected && _jsx(_Fragment, {
                   children: function () {
                     var showButton = store.tableEnableAlias || tableIsError() && isDel;
                     var icon = isDel ? _jsx(ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
@@ -323,54 +368,16 @@ var TableData = function TableData(props) {
                         size: 'small',
                         onClick: function onClick(e) {
                           if (store.tableEnableAlias) {
-                            var _meta$table3;
+                            var _meta$table6;
                             e.stopPropagation();
-                            onChangeTableAlias(((_meta$table3 = meta.table) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias) || '');
+                            onChangeTableAlias(((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) || '');
                           }
                         }
                       })
                     }) : null;
                   }()
-                }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table4 = meta.table) !== null && _meta$table4 !== void 0 && _meta$table4.alias && store.tableEnableAlias ? "as ".concat((_meta$table5 = meta.table) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+                }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table7 = meta.table) !== null && _meta$table7 !== void 0 && _meta$table7.alias && store.tableEnableAlias ? "as ".concat((_meta$table8 = meta.table) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.alias) : '') : __('SqlQueryBuilder.pickTable')]
               })
-            }) : _jsxs("div", {
-              className: cx("Sqb-TableName", {
-                notSelected: !selected
-              }),
-              onClick: selectTable,
-              children: [selected && _jsx(_Fragment, {
-                children: function () {
-                  var showButton = store.tableEnableAlias || tableIsError() && isDel;
-                  var icon = isDel ? _jsx(ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
-                  return showButton ? _jsx(Tooltip, {
-                    title: __(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
-                    children: _jsx(Button, {
-                      danger: tableIsError(),
-                      className: cx(':Sqb-TableName-as', {
-                        isError: tableIsError()
-                      }),
-                      shape: 'circle',
-                      style: isDel ? {
-                        fontSize: 18,
-                        backgroundColor: '#fff',
-                        width: 'auto',
-                        height: 'auto'
-                      } : {},
-                      iconOnly: true,
-                      primary: !isDel,
-                      icon: icon,
-                      size: 'small',
-                      onClick: function onClick(e) {
-                        if (store.tableEnableAlias) {
-                          var _meta$table6;
-                          e.stopPropagation();
-                          onChangeTableAlias(((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) || '');
-                        }
-                      }
-                    })
-                  }) : null;
-                }()
-              }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table7 = meta.table) !== null && _meta$table7 !== void 0 && _meta$table7.alias && store.tableEnableAlias ? "as ".concat((_meta$table8 = meta.table) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.alias) : '') : __('SqlQueryBuilder.pickTable')]
             }), store.showSubquery && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.switchSubQuery'),
               children: _jsx(Button, {

package/lib/es/components/modules/union.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { UnionEnum } from '../../store/enum';
 interface PropsType {
     store?: any;
@@ -5,5 +6,5 @@ interface PropsType {
     union: UnionEnum;
     groupIndex: number;
 }
-declare const RowLimit: (props: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const RowLimit: (props: PropsType) => React.JSX.Element;
 export default RowLimit;

package/lib/es/components/popup.d.ts

@@ -41,7 +41,7 @@ declare class TriggerInternal extends React.Component<PropsType, StateType> {
     private getContainer;
     private getComponent;
     private didUpdate;
-    render(): import("react/jsx-runtime").JSX.Element | null;
+    render(): React.JSX.Element | null;
 }
 export declare function generateTrigger(PortalComponent: any): typeof TriggerInternal;
 declare const _default: typeof TriggerInternal;

package/lib/es/components/right-click-menu.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+export type RightClickMenuState = {
+    x: number;
+    y: number;
+    item: any;
+    itemText: string;
+    target: HTMLElement;
+};
+export declare const openSqbRightClickMenu: (store: any, event: React.MouseEvent<HTMLElement>, setMenuState?: (state: RightClickMenuState | null) => void) => void;
+interface SqbRightClickMenuProps {
+    popupZIndex?: number;
+    state?: RightClickMenuState | null;
+    setState?: (state: RightClickMenuState | null) => void;
+}
+declare const SqbRightClickMenu: ({ popupZIndex, state, setState }: SqbRightClickMenuProps) => React.JSX.Element | null;
+export default SqbRightClickMenu;

package/lib/es/components/right-click-menu.js

@@ -0,0 +1,172 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from 'react';
+import cx from 'classnames';
+import { normalizeLegacySummarizeForSave, splitByUnion } from '../utils';
+import { useStore } from '../hooks/use-provider';
+var findRightClickTarget = function findRightClickTarget(target) {
+  var element = target instanceof HTMLElement ? target : null;
+  while (element) {
+    var _element$classList, _element$classList2, _element$classList3;
+    if ((_element$classList = element.classList) !== null && _element$classList !== void 0 && _element$classList.contains('Sqb-TableName') || (_element$classList2 = element.classList) !== null && _element$classList2 !== void 0 && _element$classList2.contains(':Sqb-TableName') && !((_element$classList3 = element.classList) !== null && _element$classList3 !== void 0 && _element$classList3.contains('operator-trigger'))) {
+      return element;
+    }
+    element = element.parentElement;
+  }
+  return null;
+};
+var getRightClickTriggerText = function getRightClickTriggerText(element) {
+  return (element.innerText || '').replace(/\s+/g, ' ').trim();
+};
+var getRightClickTriggerValue = function getRightClickTriggerValue(store, element, triggerText) {
+  var valueId = element.getAttribute('data-right-click-id');
+  if (valueId) {
+    var registeredValue = store.getRightClickButtonValue(valueId);
+    if (registeredValue !== undefined && registeredValue !== null) {
+      return registeredValue;
+    }
+  }
+  return triggerText;
+};
+var isEmptyRightClickTriggerValue = function isEmptyRightClickTriggerValue(value) {
+  if (value === undefined || value === null) return true;
+  if (typeof value === 'string') return !value.trim();
+  if (Array.isArray(value)) return value.length === 0;
+  if (_typeof(value) === 'object') {
+    if (value.type === 'exists' || value.type === 'notExists') {
+      return !Array.isArray(value.notExists) || value.notExists.length === 0;
+    }
+    if (value.type === 'FORMULA') {
+      return !String(value.name || '').trim();
+    }
+  }
+  return false;
+};
+export var openSqbRightClickMenu = function openSqbRightClickMenu(store, event, setMenuState) {
+  var _store$getRightClickM;
+  var rightClickMenu = store.rightClickMenu || [];
+  var onRightClickMenuClick = (_store$getRightClickM = store.getRightClickMenuClick) === null || _store$getRightClickM === void 0 ? void 0 : _store$getRightClickM.call(store);
+  var setState = setMenuState || store.setRightClickMenuState;
+  if (!Array.isArray(rightClickMenu) || rightClickMenu.length === 0 || typeof onRightClickMenuClick !== 'function') {
+    return;
+  }
+  var target = findRightClickTarget(event.target);
+  if (!target || target.classList.contains('notSelected')) {
+    setState(null);
+    return;
+  }
+  var itemText = getRightClickTriggerText(target);
+  var item = getRightClickTriggerValue(store, target, itemText);
+  if (isEmptyRightClickTriggerValue(item)) {
+    setState(null);
+    return;
+  }
+  event.preventDefault();
+  event.stopPropagation();
+  setState({
+    x: event.clientX,
+    y: event.clientY,
+    item: item,
+    itemText: itemText,
+    target: target
+  });
+};
+var SqbRightClickMenu = function SqbRightClickMenu(_ref) {
+  var popupZIndex = _ref.popupZIndex,
+    state = _ref.state,
+    setState = _ref.setState;
+  var store = useStore();
+  var _store$rightClickMenu = store.rightClickMenu,
+    rightClickMenu = _store$rightClickMenu === void 0 ? [] : _store$rightClickMenu;
+  var rightClickMenuState = state === undefined ? store.rightClickMenuState : state;
+  var setRightClickMenuState = setState || store.setRightClickMenuState;
+  var handleRightClickMenuItem = function () {
+    var _ref2 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(menuItem) {
+      var _store$getRightClickM2;
+      var onRightClickMenuClick, shouldClose;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!rightClickMenuState || menuItem.disabled)) {
+              _context.next = 1;
+              break;
+            }
+            return _context.abrupt("return");
+          case 1:
+            onRightClickMenuClick = (_store$getRightClickM2 = store.getRightClickMenuClick) === null || _store$getRightClickM2 === void 0 ? void 0 : _store$getRightClickM2.call(store);
+            if (!(typeof onRightClickMenuClick !== 'function')) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            _context.next = 3;
+            return onRightClickMenuClick({
+              item: rightClickMenuState.item,
+              itemText: rightClickMenuState.itemText,
+              menuValue: menuItem.value,
+              menuItem: menuItem,
+              data: normalizeLegacySummarizeForSave(splitByUnion(store.metaList)),
+              target: rightClickMenuState.target
+            });
+          case 3:
+            shouldClose = _context.sent;
+            if (shouldClose === true) {
+              setRightClickMenuState(null);
+            }
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleRightClickMenuItem(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    if (!rightClickMenuState) return;
+    var closeRightClickMenu = function closeRightClickMenu() {
+      return setRightClickMenuState(null);
+    };
+    window.addEventListener('click', closeRightClickMenu);
+    window.addEventListener('scroll', closeRightClickMenu, true);
+    window.addEventListener('resize', closeRightClickMenu);
+    return function () {
+      window.removeEventListener('click', closeRightClickMenu);
+      window.removeEventListener('scroll', closeRightClickMenu, true);
+      window.removeEventListener('resize', closeRightClickMenu);
+    };
+  }, [rightClickMenuState]);
+  if (!rightClickMenuState) return null;
+  return _jsx("div", {
+    className: 'Sqb-right-click-menu',
+    style: {
+      left: rightClickMenuState.x,
+      top: rightClickMenuState.y,
+      zIndex: popupZIndex ? popupZIndex + 10 : 9999
+    },
+    onClick: function onClick(event) {
+      return event.stopPropagation();
+    },
+    onContextMenu: function onContextMenu(event) {
+      return event.preventDefault();
+    },
+    children: rightClickMenu.map(function (menuItem) {
+      return _jsx("button", {
+        type: 'button',
+        className: cx('Sqb-right-click-menu-item', {
+          disabled: menuItem.disabled
+        }),
+        disabled: menuItem.disabled,
+        onClick: function onClick() {
+          return handleRightClickMenuItem(menuItem);
+        },
+        children: menuItem.label
+      }, menuItem.value);
+    })
+  });
+};
+export default SqbRightClickMenu;

package/lib/es/components/right-click-value.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+interface RightClickValueProps {
+    value: any;
+    children: React.ReactElement;
+}
+declare const RightClickValue: ({ value, children }: RightClickValueProps) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+export declare const useRightClickValue: (value: any) => string;
+export default RightClickValue;

package/lib/es/components/right-click-value.js

@@ -0,0 +1,25 @@
+import React, { useEffect, useRef } from 'react';
+import { useStore } from '../hooks/use-provider';
+var RightClickValue = function RightClickValue(_ref) {
+  var value = _ref.value,
+    children = _ref.children;
+  var valueId = useRightClickValue(value);
+  return React.cloneElement(children, {
+    'data-right-click-id': valueId
+  });
+};
+export var useRightClickValue = function useRightClickValue(value) {
+  var store = useStore();
+  var valueIdRef = useRef();
+  if (!valueIdRef.current) {
+    valueIdRef.current = "sqb-right-click-".concat(Math.random().toString(36).slice(2));
+  }
+  useEffect(function () {
+    store.setRightClickButtonValue(valueIdRef.current, value);
+    return function () {
+      store.removeRightClickButtonValue(valueIdRef.current);
+    };
+  }, [store, value]);
+  return valueIdRef.current;
+};
+export default RightClickValue;

package/lib/es/hooks/use-provider.d.ts

@@ -6,6 +6,6 @@ interface ProviderProps {
     value: ContextProps;
     children: React.ReactNode;
 }
-export declare const Provider: ({ value, children }: ProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Provider: ({ value, children }: ProviderProps) => React.JSX.Element;
 export declare const useStore: any;
 export {};

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

@@ -188,38 +188,67 @@ var useStore = function useStore() {
     _useState64 = _slicedToArray(_useState63, 2),
     showFormulaDiff = _useState64[0],
     setShowFormulaDiff = _useState64[1];
-  var _useState65 = useState(false),
+  var _useState65 = useState(true),
     _useState66 = _slicedToArray(_useState65, 2),
-    hasFormulaSqlCode = _useState66[0],
-    setHasFormulaSqlCode = _useState66[1];
+    matchBrackets = _useState66[0],
+    setMatchBrackets = _useState66[1];
   var _useState67 = useState(false),
     _useState68 = _slicedToArray(_useState67, 2),
-    hasFormulaDiffCode = _useState68[0],
-    setHasFormulaDiffCode = _useState68[1];
-  var _useState69 = useState([]),
+    hasFormulaSqlCode = _useState68[0],
+    setHasFormulaSqlCode = _useState68[1];
+  var _useState69 = useState(false),
     _useState70 = _slicedToArray(_useState69, 2),
-    sourceData = _useState70[0],
-    setSourceData = _useState70[1];
-  var _useState71 = useState(false),
+    hasFormulaDiffCode = _useState70[0],
+    setHasFormulaDiffCode = _useState70[1];
+  var _useState71 = useState([]),
     _useState72 = _slicedToArray(_useState71, 2),
-    moduleCopy = _useState72[0],
-    setModuleCopy = _useState72[1];
+    sourceData = _useState72[0],
+    setSourceData = _useState72[1];
   var _useState73 = useState(false),
     _useState74 = _slicedToArray(_useState73, 2),
-    isMetabaseCopy = _useState74[0],
-    setIsMetabaseCopy = _useState74[1];
+    moduleCopy = _useState74[0],
+    setModuleCopy = _useState74[1];
   var _useState75 = useState(false),
     _useState76 = _slicedToArray(_useState75, 2),
-    joinAliasConflictCheck = _useState76[0],
-    setJoinAliasConflictCheck = _useState76[1];
-  var _useState77 = useState([]),
+    isMetabaseCopy = _useState76[0],
+    setIsMetabaseCopy = _useState76[1];
+  var _useState77 = useState(false),
     _useState78 = _slicedToArray(_useState77, 2),
-    existsError = _useState78[0],
-    setExistsError = _useState78[1];
-  var _useState79 = useState(storage._metabaseCopyModule || []),
+    joinAliasConflictCheck = _useState78[0],
+    setJoinAliasConflictCheck = _useState78[1];
+  var _useState79 = useState([]),
     _useState80 = _slicedToArray(_useState79, 2),
-    metabaseCopyModule = _useState80[0],
-    setMetabaseCopyModule = _useState80[1];
+    existsError = _useState80[0],
+    setExistsError = _useState80[1];
+  var rightClickButtonValueMap = useRef({});
+  var _useState81 = useState([]),
+    _useState82 = _slicedToArray(_useState81, 2),
+    rightClickMenu = _useState82[0],
+    setRightClickMenu = _useState82[1];
+  var _useState83 = useState(null),
+    _useState84 = _slicedToArray(_useState83, 2),
+    rightClickMenuState = _useState84[0],
+    setRightClickMenuState = _useState84[1];
+  var rightClickMenuClickRef = useRef();
+  var _useState85 = useState(storage._metabaseCopyModule || []),
+    _useState86 = _slicedToArray(_useState85, 2),
+    metabaseCopyModule = _useState86[0],
+    setMetabaseCopyModule = _useState86[1];
+  var setRightClickMenuClick = function setRightClickMenuClick(fn) {
+    rightClickMenuClickRef.current = fn;
+  };
+  var getRightClickMenuClick = function getRightClickMenuClick() {
+    return rightClickMenuClickRef.current;
+  };
+  var setRightClickButtonValue = function setRightClickButtonValue(id, value) {
+    rightClickButtonValueMap.current[id] = value;
+  };
+  var removeRightClickButtonValue = function removeRightClickButtonValue(id) {
+    delete rightClickButtonValueMap.current[id];
+  };
+  var getRightClickButtonValue = function getRightClickButtonValue(id) {
+    return rightClickButtonValueMap.current[id];
+  };
   var setFormulaTemplates = function setFormulaTemplates(data) {
     var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
       var children = v.children.map(function (vv) {
@@ -1088,6 +1117,8 @@ var useStore = function useStore() {
     setShowFormulaSql: setShowFormulaSql,
     showFormulaDiff: showFormulaDiff,
     setShowFormulaDiff: setShowFormulaDiff,
+    matchBrackets: matchBrackets,
+    setMatchBrackets: setMatchBrackets,
     hasFormulaSqlCode: hasFormulaSqlCode,
     hasFormulaDiffCode: hasFormulaDiffCode,
     sourceData: sourceData,
@@ -1111,7 +1142,16 @@ var useStore = function useStore() {
     setExistsErrorFn: setExistsErrorFn,
     existsError: existsError,
     joinAliasConflictCheck: joinAliasConflictCheck,
-    setJoinAliasConflictCheck: setJoinAliasConflictCheck
+    setJoinAliasConflictCheck: setJoinAliasConflictCheck,
+    setRightClickButtonValue: setRightClickButtonValue,
+    removeRightClickButtonValue: removeRightClickButtonValue,
+    getRightClickButtonValue: getRightClickButtonValue,
+    rightClickMenu: rightClickMenu,
+    setRightClickMenu: setRightClickMenu,
+    rightClickMenuState: rightClickMenuState,
+    setRightClickMenuState: setRightClickMenuState,
+    setRightClickMenuClick: setRightClickMenuClick,
+    getRightClickMenuClick: getRightClickMenuClick
   };
 };
 export default useStore;

package/lib/es/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import './locale/en';
 import './locale/zh';
-import type { MetabaseProps, SqlVisionBuilderRef, DatasourceType } from './types';
+import type { MetabaseProps, SqlVisionBuilderRef, DatasourceType, MetabaseRightClickMenuItem, MetabaseRightClickMenuClickParams } from './types';
 import type { MetaListType, ToolbarType } from './store/types';
 declare const SqlVisionBuilder: React.ForwardRefExoticComponent<MetabaseProps & React.RefAttributes<SqlVisionBuilderRef>>;
 export default SqlVisionBuilder;
-export { MetabaseProps, DatasourceType, MetaListType, ToolbarType, SqlVisionBuilderRef };
+export { MetabaseProps, DatasourceType, MetaListType, ToolbarType, SqlVisionBuilderRef, MetabaseRightClickMenuItem, MetabaseRightClickMenuClickParams, };

package/lib/es/index.js

@@ -72,6 +72,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     showFormulaSql = _props$showFormulaSql === void 0 ? true : _props$showFormulaSql,
     _props$showFormulaDif = props.showFormulaDiff,
     showFormulaDiff = _props$showFormulaDif === void 0 ? true : _props$showFormulaDif,
+    _props$matchBrackets = props.matchBrackets,
+    matchBrackets = _props$matchBrackets === void 0 ? true : _props$matchBrackets,
     _props$joinAliasConfl = props.joinAliasConflictCheck,
     joinAliasConflictCheck = _props$joinAliasConfl === void 0 ? false : _props$joinAliasConfl,
     _props$operatorList = props.operatorList,
@@ -124,11 +126,12 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setModuleDiff(moduleDiff);
     store.setShowFormulaSql(showFormulaSql);
     store.setShowFormulaDiff(showFormulaDiff);
+    store.setMatchBrackets(matchBrackets);
     store.setIsSubquery(isSubquery);
     store.setModuleCopy(moduleCopy);
     store.setJoinAliasConflictCheck(joinAliasConflictCheck);
     store.setOperatorList(operatorList || []);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, showFormulaSql, showFormulaDiff, getFormulaSqlCode, getFormulaDiffCode, isSubquery, moduleCopy, joinAliasConflictCheck, operatorList]);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, showFormulaSql, showFormulaDiff, matchBrackets, getFormulaSqlCode, getFormulaDiffCode, isSubquery, moduleCopy, joinAliasConflictCheck, operatorList]);
   React.useImperativeHandle(ref, function () {
     return {
       reset: function reset() {

package/lib/es/types.d.ts

@@ -26,6 +26,20 @@ export interface FormulaDiffCodeParams {
     oldCode: AtomsItem[];
     newCode: AtomsItem[];
 }
+export interface MetabaseRightClickMenuItem {
+    label: React.ReactNode;
+    value: React.Key;
+    disabled?: boolean;
+    [key: string]: any;
+}
+export interface MetabaseRightClickMenuClickParams {
+    item: any;
+    itemText: string;
+    menuValue: React.Key;
+    menuItem: MetabaseRightClickMenuItem;
+    data: MetaListType[];
+    target?: HTMLElement;
+}
 export interface MetabaseProps {
     loading?: boolean;
     btnText?: string;
@@ -69,6 +83,9 @@ export interface MetabaseProps {
     moduleCopy?: boolean;
     showFormulaSql?: boolean;
     showFormulaDiff?: boolean;
+    matchBrackets?: boolean;
+    rightClickMenu?: MetabaseRightClickMenuItem[];
+    onRightClickMenuClick?: (params: MetabaseRightClickMenuClickParams) => boolean | void | Promise<boolean | void>;
     joinAliasConflictCheck?: boolean;
     getModuleDiffCode?: (obj: {
         oldCode: MetaListType;

package/lib/es/utils.js

@@ -225,7 +225,7 @@ export var mergeSubQueryColumns = function mergeSubQueryColumns(columns) {
       name_zh: existingCol ? existingCol.name_zh || '' : newColumn.name_zh || '',
       fieldAlias: getOuterSubQueryFieldAlias(existingCol, newCol),
       fieldUuid: newCol.fieldUuid || (existingCol === null || existingCol === void 0 ? void 0 : existingCol.fieldUuid) || uuidv4('field'),
-      select: isSelectFields || Boolean(existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) || Boolean(newCol.select)
+      select: existingCol ? Boolean(existingCol.select) : isSelectFields || Boolean(newCol.select)
     }, newColumn.summarizeType ? _defineProperty({}, SUB_QUERY_OUTPUT_COLUMN_KEY, true) : {});
     return nextCol;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.146",
+  "version": "1.0.148",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",
@@ -27,7 +27,7 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@gingkoo/pandora": "1.2.20-alpha.6",
+    "@gingkoo/pandora": "1.2.20-alpha.7",
     "@gingkoo/pandora-hooks": "1.0.5",
     "@gingkoo/pandora-icons": "0.0.1-alpha.28",
     "@types/diff": "^8.0.0",