@gingkoo/pandora-metabase 1.0.61 → 1.0.63

package/lib/es/components/dialog/select-join-column/index.js

@@ -123,7 +123,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         tableName = v.name,
         _v$datasourceName = v.datasourceName,
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
-      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias);
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias, store.tableEnableAlias)) : mergeNameAlias(tableName, tableAlias, store.tableEnableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
         // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return _objectSpread({}, v);
@@ -213,8 +213,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: _jsx("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias),
-                    children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias)
+                    title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias, store.tableEnableAlias)) : mergeNameAlias(table, tableAlias, store.tableEnableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias, store.tableEnableAlias)) : mergeNameAlias(table, tableAlias, store.tableEnableAlias)
                   })
                 }), isMultiple && _jsx("span", {
                   className: 'List-title-arrow',

package/lib/es/components/dialog/select-join-column-multiple/index.js

@@ -187,8 +187,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: _jsx("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias),
-                    children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias)
+                    title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias, store.tableEnableAlias)) : mergeNameAlias(table, tableAlias, store.tableEnableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias, store.tableEnableAlias)) : mergeNameAlias(table, tableAlias, store.tableEnableAlias)
                   })
                 }), isMultiple && _jsx("span", {
                   className: 'List-title-arrow',

package/lib/es/components/dialog/select-permission-table/index.d.ts

@@ -10,6 +10,7 @@ interface PropsType {
     value: MetaData_TableType;
     onChange: (reocrd: MetaData_TableType) => void;
     didUpdate?: Function;
+    tableEnableAlias: boolean;
 }
-declare const SelectPermissionTable: ({ data, value, onChange, didUpdate }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectPermissionTable: ({ data, value, onChange, didUpdate, tableEnableAlias, }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectPermissionTable;

package/lib/es/components/dialog/select-permission-table/index.js

@@ -19,7 +19,8 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     value = _ref.value,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
-    didUpdate = _ref.didUpdate;
+    didUpdate = _ref.didUpdate,
+    tableEnableAlias = _ref.tableEnableAlias;
   var _useState = useState(data.slice()),
     _useState2 = _slicedToArray(_useState, 2),
     datasource = _useState2[0],
@@ -31,7 +32,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     var val = e.target.value;
     var newList = cloneDeep(data.slice());
     setDatasource(newList.filter(function (v) {
-      return ~(v.datasourceName + '.' + mergeNameAlias(v.name, v.alias)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+      return ~(v.datasourceName + '.' + mergeNameAlias(v.name, v.alias, tableEnableAlias)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
     }));
   }
   return _jsx("div", {
@@ -77,7 +78,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 }), _jsx("div", {
                   children: _jsxs("h4", {
                     className: 'List-item-title ml-2',
-                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : mergeNameAlias(v.name, v.alias)]
+                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : mergeNameAlias(v.name, v.alias, tableEnableAlias)]
                   })
                 })]
               })

package/lib/es/components/dialog/select-table/index.d.ts

@@ -9,9 +9,11 @@ import { MetaData_TableType } from '../../../store/types';
 import { DatasourceType } from '../../../types';
 interface PropsType {
     data: DatasourceType[];
+    sourceTable: any[];
     value: MetaData_TableType;
     onChange: (reocrd: MetaData_TableType) => void;
     didUpdate?: Function;
+    tableFlat?: boolean;
 }
-declare const SelectTable: ({ data, value, onChange, didUpdate }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectTable: ({ data, sourceTable, value, onChange, didUpdate, tableFlat, }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectTable;

package/lib/es/components/dialog/select-table/index.js

@@ -22,10 +22,14 @@ import { TableIcon, SearchIcon, DataSourceIcon, LeftArrowIcon } from '../../icon
 var SelectTable = function SelectTable(_ref) {
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
+    _ref$sourceTable = _ref.sourceTable,
+    sourceTable = _ref$sourceTable === void 0 ? [] : _ref$sourceTable,
     value = _ref.value,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
-    didUpdate = _ref.didUpdate;
+    didUpdate = _ref.didUpdate,
+    _ref$tableFlat = _ref.tableFlat,
+    tableFlat = _ref$tableFlat === void 0 ? false : _ref$tableFlat;
   var store = useStore();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -34,18 +38,22 @@ var SelectTable = function SelectTable(_ref) {
   var _useState3 = useState(data.slice()),
     _useState4 = _slicedToArray(_useState3, 1),
     datasource = _useState4[0];
-  var _useState5 = useState([]),
+  var _useState5 = useState(sourceTable.slice()),
     _useState6 = _slicedToArray(_useState5, 2),
-    list = _useState6[0],
-    setList = _useState6[1];
+    datasourceTable = _useState6[0],
+    setDatasourceTable = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    originList = _useState8[0],
-    setOriginList = _useState8[1];
-  var _useState9 = useState(value),
+    list = _useState8[0],
+    setList = _useState8[1];
+  var _useState9 = useState([]),
     _useState0 = _slicedToArray(_useState9, 2),
-    val = _useState0[0],
-    setVal = _useState0[1];
+    originList = _useState0[0],
+    setOriginList = _useState0[1];
+  var _useState1 = useState(value),
+    _useState10 = _slicedToArray(_useState1, 2),
+    val = _useState10[0],
+    setVal = _useState10[1];
   useEffect(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -86,6 +94,21 @@ var SelectTable = function SelectTable(_ref) {
       return ~(v.name + (v.name_zh || '')).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
     }));
   }
+  function onInput1(e) {
+    var val = e.target.value;
+    var newList = cloneDeep(sourceTable.slice());
+    var _new = newList.map(function (v) {
+      var _v$children;
+      return _objectSpread(_objectSpread({}, v), {}, {
+        children: v === null || v === void 0 || (_v$children = v.children) === null || _v$children === void 0 ? void 0 : _v$children.filter(function (v) {
+          return ~(v.name + (v.name_zh || '')).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+        })
+      });
+    }).filter(function (v) {
+      return v.children.length > 0;
+    });
+    setDatasourceTable(_new);
+  }
   function goPrevPage() {
     setVal({
       datasourceId: '',
@@ -97,6 +120,78 @@ var SelectTable = function SelectTable(_ref) {
       alias: ''
     });
   }
+  if (tableFlat) {
+    return _jsx("div", {
+      className: cx("Sqb-SelectTable--box pb-2"),
+      children: _jsx("div", {
+        style: {
+          minWidth: 300
+        },
+        children: _jsxs("div", {
+          style: {
+            width: '100%'
+          },
+          children: [_jsx("div", {
+            className: cx("Sqb-List-section"),
+            children: _jsxs("div", {
+              className: cx("Sqb-List-search m-2 rounded-lg"),
+              children: [_jsx("span", {
+                className: 'px-2',
+                children: _jsx(SearchIcon, {})
+              }), _jsx("input", {
+                autoFocus: true,
+                type: 'text',
+                className: 'p-2',
+                placeholder: __('data.search'),
+                onInput: onInput1
+              })]
+            })
+          }), datasourceTable.map(function (table) {
+            var _table$children;
+            return _jsxs(_Fragment, {
+              children: [_jsx("div", {
+                className: cx("Sqb-List-title mx-4 pb-2 pt-2"),
+                children: table.datasourceName
+              }), Array.isArray(table.children) && (table === null || table === void 0 || (_table$children = table.children) === null || _table$children === void 0 ? void 0 : _table$children.map(function (v) {
+                var _val = {
+                  datasourceId: table.datasourceId,
+                  datasourceName: table.datasourceName,
+                  name: '',
+                  name_zh: '',
+                  id: '',
+                  tableUuid: uuidv4('table'),
+                  alias: ''
+                };
+                return _jsx("div", {
+                  className: cx("Sqb-List-section"),
+                  children: _jsx("div", {
+                    className: cx("Sqb-List-item mx-2", {
+                      active: value.name === v.name
+                    }),
+                    onClick: function onClick() {
+                      onChange(_objectSpread(_objectSpread({}, _val), v));
+                    },
+                    children: _jsxs("a", {
+                      className: 'p-2',
+                      children: [_jsx("span", {
+                        className: 'List-item-icon',
+                        children: _jsx(TableIcon, {})
+                      }), _jsx("div", {
+                        children: _jsx("h4", {
+                          className: 'List-item-title ml-2',
+                          children: replaceTpl(store.tableNameTpl, v)
+                        })
+                      })]
+                    })
+                  })
+                }, v.name);
+              }))]
+            });
+          })]
+        })
+      })
+    });
+  }
   var nextPage = !val.datasourceId;
   // 没有选 数据源 先选数据源
   if (nextPage) {

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/metabase/index.less

@@ -51,7 +51,6 @@
       width: 66.6667%;
       box-sizing: border-box;
 
-      .Sqb-Custom-input,
       .sqb-Custom-input {
         border-radius: 0;
         padding: 0;

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

@@ -501,6 +501,7 @@ var JoinData = function JoinData(props) {
       visible: true,
       node: node,
       content: _jsx(SelectPermissionTable, {
+        tableEnableAlias: store.tableEnableAlias,
         data: data,
         value: newMeta[index][table_type],
         onChange: function onChange(data) {
@@ -542,6 +543,8 @@ var JoinData = function JoinData(props) {
       visible: true,
       node: e.currentTarget,
       content: _jsx(SelectTable, {
+        sourceTable: store.sourceTable || [],
+        tableFlat: store.tableFlat,
         data: store.sourceList,
         value: value,
         onChange: function onChange(data) {
@@ -1343,7 +1346,7 @@ var JoinData = function JoinData(props) {
       if (meta.table1.name === SummarizeAlias) {
         return PrevResult;
       } else {
-        return "".concat(meta.table1.datasourceName, ".").concat(mergeNameAlias(meta.table1.name, meta.table1.alias));
+        return "".concat(meta.table1.datasourceName, ".").concat(mergeNameAlias(meta.table1.name, meta.table1.alias, store.tableEnableAlias));
       }
     } else {
       return '';

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

@@ -85,6 +85,7 @@ var PermissionTable = function PermissionTable(props) {
       visible: true,
       node: e.currentTarget,
       content: _jsx(SelectPermissionTable, {
+        tableEnableAlias: store.tableEnableAlias,
         data: data,
         value: meta.table,
         onChange: function onChange(data) {

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

@@ -81,7 +81,9 @@ var TableData = function TableData(props) {
       visible: true,
       node: e.currentTarget,
       content: _jsx(SelectTable, {
+        tableFlat: store.tableFlat,
         data: store.sourceList,
+        sourceTable: store.sourceTable || [],
         value: meta.table,
         onChange: function onChange(data) {
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {

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;