@gingkoo/pandora-metabase 1.0.62 → 1.0.64

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

@@ -144,16 +144,20 @@ var useStore = function useStore() {
     setFieldEnableAlias = _useState42[1]; // 字段名是否开启别名
   var _useState43 = (0, _react.useState)(true),
     _useState44 = (0, _slicedToArray2["default"])(_useState43, 2),
-    isSelectFields = _useState44[0],
-    setIsSelectFields = _useState44[1]; // 是否默认勾选字段
-  var _useState45 = (0, _react.useState)(false),
+    groupByEnableAlias = _useState44[0],
+    setGroupByEnableAlias = _useState44[1]; // 聚合是否开启别名
+  var _useState45 = (0, _react.useState)(true),
     _useState46 = (0, _slicedToArray2["default"])(_useState45, 2),
-    tableFlat = _useState46[0],
-    setTableFlat = _useState46[1]; // 是否平铺数据表
-  var _useState47 = (0, _react.useState)([]),
+    isSelectFields = _useState46[0],
+    setIsSelectFields = _useState46[1]; // 是否默认勾选字段
+  var _useState47 = (0, _react.useState)(false),
     _useState48 = (0, _slicedToArray2["default"])(_useState47, 2),
-    sourceTable = _useState48[0],
-    setSourceTable = _useState48[1];
+    tableFlat = _useState48[0],
+    setTableFlat = _useState48[1]; // 是否平铺数据表
+  var _useState49 = (0, _react.useState)([]),
+    _useState50 = (0, _slicedToArray2["default"])(_useState49, 2),
+    sourceTable = _useState50[0],
+    setSourceTable = _useState50[1];
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -732,6 +736,8 @@ var useStore = function useStore() {
     setTableEnableAlias: setTableEnableAlias,
     fieldEnableAlias: fieldEnableAlias,
     setFieldEnableAlias: setFieldEnableAlias,
+    groupByEnableAlias: groupByEnableAlias,
+    setGroupByEnableAlias: setGroupByEnableAlias,
     isSelectFields: isSelectFields,
     setIsSelectFields: setIsSelectFields,
     tableFlat: tableFlat,

package/lib/cjs/index.js

@@ -62,6 +62,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     tableEnableAlias = _props$tableEnableAli === void 0 ? true : _props$tableEnableAli,
     _props$fieldEnableAli = props.fieldEnableAlias,
     fieldEnableAlias = _props$fieldEnableAli === void 0 ? true : _props$fieldEnableAli,
+    _props$groupByEnableA = props.groupByEnableAlias,
+    groupByEnableAlias = _props$groupByEnableA === void 0 ? true : _props$groupByEnableA,
     _props$isSelectFields = props.isSelectFields,
     isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields,
     _props$tableFlat = props.tableFlat,
@@ -96,9 +98,10 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setIsExit(isExit);
     store.setTableEnableAlias(tableEnableAlias);
     store.setFieldEnableAlias(fieldEnableAlias);
+    store.setGroupByEnableAlias(groupByEnableAlias);
     store.setIsSelectFields(isSelectFields);
     store.setTableFlat(tableFlat);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields, tableFlat]);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/types.d.ts

@@ -40,6 +40,7 @@ export interface MetabaseProps {
     isExit?: boolean;
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
+    groupByEnableAlias?: boolean;
     isSelectFields?: boolean;
     tableFlat?: boolean;
     onChange?: (newData: MetaListType[], curData: {

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

@@ -151,8 +151,10 @@ var Metabase = function Metabase(props) {
           disabled: saveLoading,
           onClick: onCheck,
           children: btnText || __('SqlQueryBuilder.visualize')
-        }) : null, store.popupContainer.current && _jsx(Popup, {
-          container: store.popupData.container || store.popupContainer.current,
+        }) : null, store.popupContainer.current && _jsx(Popup
+        // container={store.popupData.container || store.popupContainer.current}
+        , {
+          // container={store.popupData.container || store.popupContainer.current}
           visible: store.popupData.visible,
           node: store.popupData.node,
           closable: store.popupClosable,
@@ -162,8 +164,10 @@ var Metabase = function Metabase(props) {
             });
           },
           children: popupContent
-        }), store.popupContainer.current && _jsx(Popup, {
-          container: store.popupData2.container || store.popupContainer.current,
+        }), store.popupContainer.current && _jsx(Popup
+        // container={store.popupData2.container || store.popupContainer.current}
+        , {
+          // container={store.popupData2.container || store.popupContainer.current}
           visible: store.popupData2.visible,
           node: store.popupData2.node,
           closable: store.popupClosable2,

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

@@ -336,7 +336,7 @@ var GroupBy = function GroupBy(props) {
             return handleUpdate(e, i);
           },
           children: [v.quotes && _jsx(_Fragment, {
-            children: store.fieldEnableAlias && _jsx(Tooltip, {
+            children: store.groupByEnableAlias && _jsx(Tooltip, {
               title: !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias) ? __('SqlQueryBuilder.aliasForRules') : __('SqlQueryBuilder.alias'),
               children: _jsx(Button, {
                 className: cx(':Sqb-TableName-as :Sqb-TableName green-name', _defineProperty({}, 'isError', !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias))),

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

@@ -334,7 +334,7 @@ var SelectIndex = function SelectIndex(props) {
             return handleUpdate(e, i);
           },
           children: [v.quotes && _jsx(_Fragment, {
-            children: store.fieldEnableAlias && _jsx(Tooltip, {
+            children: store.groupByEnableAlias && _jsx(Tooltip, {
               title: !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias) ? __('SqlQueryBuilder.aliasForRules') : __('SqlQueryBuilder.alias'),
               children: _jsx(Button, {
                 className: cx(':Sqb-TableName-as :Sqb-TableName green-name', _defineProperty({}, 'isError', !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias))),

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

@@ -1,109 +1,47 @@
 import * as React from 'react';
+interface PropsType {
+    visible: boolean;
+    children: React.ReactNode;
+    hideVisible: () => void;
+    node: HTMLElement;
+    innerSpacing?: number;
+    zIndex?: string | number;
+    closable?: boolean;
+}
 interface StateType {
     popupRefreshKey: number;
 }
-export declare function generateTrigger(PortalComponent: any): {
-    new (props: PropsType): {
-        resizeObserver: ResizeObserver | null;
-        resetId: number;
-        ref: any;
-        componentDidMount(): void;
-        componentDidUpdate(prevProps: PropsType): void;
-        componentWillUnmount(): void;
-        refreshPopup: () => void;
-        initResizeObserver: () => void;
-        bindEvent: () => void;
-        closePopup: () => void;
-        attachParent: (popupContainer: HTMLSpanElement) => void;
-        getCurrentNodePos: () => {
-            x: number;
-            y: number;
-            t: number;
-            h: any;
-        };
-        getContainer: () => HTMLSpanElement;
-        getComponent: () => import("react/jsx-runtime").JSX.Element;
-        didUpdate: () => void | false;
-        render(): import("react/jsx-runtime").JSX.Element | null;
-        context: unknown;
-        setState<K extends "popupRefreshKey">(state: StateType | ((prevState: Readonly<StateType>, props: Readonly<PropsType>) => StateType | Pick<StateType, K> | null) | Pick<StateType, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<PropsType>;
-        state: Readonly<StateType>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        shouldComponentUpdate?(nextProps: Readonly<PropsType>, nextState: Readonly<StateType>, nextContext: any): boolean;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<PropsType>, prevState: Readonly<StateType>): any;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<PropsType>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<PropsType>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<PropsType>, nextState: Readonly<StateType>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<PropsType>, nextState: Readonly<StateType>, nextContext: any): void;
-    };
-    defaultProps: {
+declare class TriggerInternal extends React.Component<PropsType, StateType> {
+    private resizeObserver;
+    private resetId;
+    private popupContainer;
+    private contentResizeObserver;
+    private scrollHeightCheckTimer;
+    private lastScrollHeight;
+    private handleClickOutside;
+    static defaultProps: {
         visible: boolean;
-        children: null;
+        closable: boolean;
+        innerSpacing: number;
     };
-    contextType?: React.Context<any> | undefined;
-};
-declare const _default: {
-    new (props: PropsType): {
-        resizeObserver: ResizeObserver | null;
-        resetId: number;
-        ref: any;
-        componentDidMount(): void;
-        componentDidUpdate(prevProps: PropsType): void;
-        componentWillUnmount(): void;
-        refreshPopup: () => void;
-        initResizeObserver: () => void;
-        bindEvent: () => void;
-        closePopup: () => void;
-        attachParent: (popupContainer: HTMLSpanElement) => void;
-        getCurrentNodePos: () => {
-            x: number;
-            y: number;
-            t: number;
-            h: any;
-        };
-        getContainer: () => HTMLSpanElement;
-        getComponent: () => import("react/jsx-runtime").JSX.Element;
-        didUpdate: () => void | false;
-        render(): import("react/jsx-runtime").JSX.Element | null;
-        context: unknown;
-        setState<K extends "popupRefreshKey">(state: StateType | ((prevState: Readonly<StateType>, props: Readonly<PropsType>) => StateType | Pick<StateType, K> | null) | Pick<StateType, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<PropsType>;
-        state: Readonly<StateType>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        shouldComponentUpdate?(nextProps: Readonly<PropsType>, nextState: Readonly<StateType>, nextContext: any): boolean;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<PropsType>, prevState: Readonly<StateType>): any;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<PropsType>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<PropsType>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<PropsType>, nextState: Readonly<StateType>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<PropsType>, nextState: Readonly<StateType>, nextContext: any): void;
-    };
-    defaultProps: {
-        visible: boolean;
-        children: null;
-    };
-    contextType?: React.Context<any> | undefined;
-};
-export default _default;
-interface PropsType {
-    visible: boolean;
-    children: any;
-    hideVisible: Function;
-    node: any;
-    innerSpacing?: number;
-    container?: HTMLDivElement;
-    zIndex?: string | null;
-    closable?: boolean;
+    ref: React.RefObject<HTMLDivElement>;
+    constructor(props: PropsType);
+    componentDidMount(): void;
+    componentDidUpdate(prevProps: PropsType): void;
+    componentWillUnmount(): void;
+    private mountPopup;
+    private unmountPopup;
+    private cleanup;
+    private refreshPopup;
+    private initContentResizeObserver;
+    private startScrollHeightCheck;
+    private closePopup;
+    private createPopupContainer;
+    private getContainer;
+    private getComponent;
+    private didUpdate;
+    render(): import("react/jsx-runtime").JSX.Element | null;
 }
+export declare function generateTrigger(PortalComponent: any): typeof TriggerInternal;
+declare const _default: typeof TriggerInternal;
+export default _default;