@gingkoo/pandora-metabase 1.0.81 → 1.0.83

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

@@ -8,6 +8,7 @@ import { getHelper } from '../../utils';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
+import ItemWrapper from './components/item-wrapper';
 import { useStore } from '../../hooks/use-provider';
 import { uuidv4 } from '../../utils/helper';
 import ItemName from './components/item-name';
@@ -113,23 +114,28 @@ var PermissionTable = function PermissionTable(props) {
       className: "Sqb-hover-parent",
       children: [_jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'gray-text',
         title: __('SqlQueryBuilder.permissionTable'),
         onClose: function onClose() {
           return store.delMeta(meta, groupIndex);
         }
-      }), _jsx("div", {
-        className: "Sqb-item--content",
+      }), _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
         children: _jsx("div", {
-          className: "Sqb-NotebookCell gray-bg",
-          children: _jsx(ItemName, {
-            isError: tableIsError(),
-            children: _jsx("div", {
-              className: cx("Sqb-TableName", {
-                notSelected: !selected
-              }),
-              onClick: selectTable,
-              children: selected ? "".concat(meta.table.datasourceName ? "".concat(meta.table.datasourceName, ".") : '').concat(meta.table.name === SummarizeAlias ? PrevResult : meta.table.name) : __('SqlQueryBuilder.pickPermissionTable')
+          className: "Sqb-item--content",
+          children: _jsx("div", {
+            className: "Sqb-NotebookCell gray-bg",
+            children: _jsx(ItemName, {
+              isError: tableIsError(),
+              children: _jsx("div", {
+                className: cx("Sqb-TableName", {
+                  notSelected: !selected
+                }),
+                onClick: selectTable,
+                children: selected ? "".concat(meta.table.datasourceName ? "".concat(meta.table.datasourceName, ".") : '').concat(meta.table.name === SummarizeAlias ? PrevResult : meta.table.name) : __('SqlQueryBuilder.pickPermissionTable')
+              })
             })
           })
         })

package/lib/es/components/modules/row-limit.js

@@ -6,6 +6,7 @@ import { findIndex } from '../../utils';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
+import ItemWrapper from './components/item-wrapper';
 import { useStore } from '../../hooks/use-provider';
 var RowLimit = function RowLimit(props) {
   var meta = props.meta,
@@ -24,24 +25,29 @@ var RowLimit = function RowLimit(props) {
       className: cx("Sqb-hover-parent"),
       children: [_jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'gray-text',
         title: __('SqlQueryBuilder.rowLimit'),
         onClose: function onClose() {
           return store.delMeta(meta, groupIndex);
         }
-      }), _jsx("div", {
-        className: cx("Sqb-item--content"),
+      }), _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
         children: _jsx("div", {
-          className: cx("Sqb-NotebookCell gray-bg"),
-          children: _jsx(InputNumber, {
-            value: meta.limit,
-            min: 1,
-            style: {
-              width: 200
-            },
-            onChange: handleChange,
-            placeholder: __('rowLimit.pleaseEnter'),
-            precision: 0
+          className: cx("Sqb-item--content"),
+          children: _jsx("div", {
+            className: cx("Sqb-NotebookCell gray-bg"),
+            children: _jsx(InputNumber, {
+              value: meta.limit,
+              min: 1,
+              style: {
+                width: 200
+              },
+              onChange: handleChange,
+              placeholder: __('rowLimit.pleaseEnter'),
+              precision: 0
+            })
           })
         })
       }), _jsx(NextDom, {

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

@@ -12,6 +12,7 @@ import { SelectColumnMultiple } from '../dialog';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
+import ItemWrapper from './components/item-wrapper';
 import { useStore } from '../../hooks/use-provider';
 import ItemName from './components/item-name';
 var Sort = function Sort(props) {
@@ -235,39 +236,44 @@ var Sort = function Sort(props) {
       className: cx("Sqb-hover-parent"),
       children: [_jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'gray-text',
         title: __('SqlQueryBuilder.sort'),
         onClose: function onClose() {
           return store.delMeta(meta, groupIndex);
         }
-      }), _jsx("div", {
-        className: cx("Sqb-item--content"),
-        children: _jsxs("div", {
-          className: cx("Sqb-NotebookCell gray-bg"),
-          children: [sort.map(function (v, i) {
-            return _jsx(ItemName, {
-              isError: isError(v.expression, getColumns()),
-              children: _jsxs("div", {
-                className: "Sqb-TableName gray-name",
-                onClick: function onClick() {
-                  return handleSort(i);
-                },
-                children: [v.sort === SortEnum.asc ? _jsx(UpArrowIcon, {}) : _jsx(DownArrowIcon, {}), getName(v.expression), _jsx("span", {
-                  style: {
-                    fontSize: 0
-                  },
-                  onClick: function onClick(e) {
-                    return delSortColumn(e, i);
+      }), _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
+        children: _jsx("div", {
+          className: cx("Sqb-item--content"),
+          children: _jsxs("div", {
+            className: cx("Sqb-NotebookCell gray-bg"),
+            children: [sort.map(function (v, i) {
+              return _jsx(ItemName, {
+                isError: isError(v.expression, getColumns()),
+                children: _jsxs("div", {
+                  className: "Sqb-TableName gray-name",
+                  onClick: function onClick() {
+                    return handleSort(i);
                   },
-                  children: _jsx(CloseIcon, {})
-                })]
-              }, i)
-            }, i);
-          }), _jsx("div", {
-            className: "Sqb-TableName gray-name",
-            onClick: addSortColumn,
-            children: _jsx(AddIcon, {})
-          })]
+                  children: [v.sort === SortEnum.asc ? _jsx(UpArrowIcon, {}) : _jsx(DownArrowIcon, {}), getName(v.expression), _jsx("span", {
+                    style: {
+                      fontSize: 0
+                    },
+                    onClick: function onClick(e) {
+                      return delSortColumn(e, i);
+                    },
+                    children: _jsx(CloseIcon, {})
+                  })]
+                }, i)
+              }, i);
+            }), _jsx("div", {
+              className: "Sqb-TableName gray-name",
+              onClick: addSortColumn,
+              children: _jsx(AddIcon, {})
+            })]
+          })
         })
       }), _jsx(NextDom, {
         meta: meta,

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

@@ -4,6 +4,7 @@ import { __ } from '../../../locale';
 import Wrapper from '../components/Wrapper';
 import NextDom from '../components/meta-icon';
 import Header from '../components/header';
+import ItemWrapper from '../components/item-wrapper';
 import GroupBy from './group-by';
 import SelectIndex from './select-index';
 import { useStore } from '../../../hooks/use-provider';
@@ -17,6 +18,7 @@ var Summarize = function Summarize(props) {
       className: cx("Sqb-hover-parent"),
       children: [_jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'green-text',
         title: __('SqlQueryBuilder.summarize'),
         onClose: function onClose() {
@@ -25,26 +27,30 @@ var Summarize = function Summarize(props) {
           });
           store.delMeta(meta, groupIndex);
         }
-      }), _jsx("div", {
-        className: cx("Sqb-item--content"),
-        children: _jsxs("div", {
-          className: 'flex-row',
-          children: [_jsx("div", {
-            className: "Sqb-NotebookCell green-bg",
-            children: _jsx(SelectIndex, {
-              meta: meta,
-              groupIndex: groupIndex
-            })
-          }), _jsx("div", {
-            className: 'pass',
-            children: __('SqlQueryBuilder.by')
-          }), _jsx("div", {
-            className: "Sqb-NotebookCell green-bg",
-            children: _jsx(GroupBy, {
-              meta: meta,
-              groupIndex: groupIndex
-            })
-          })]
+      }), _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
+        children: _jsx("div", {
+          className: cx("Sqb-item--content"),
+          children: _jsxs("div", {
+            className: 'flex-row',
+            children: [_jsx("div", {
+              className: "Sqb-NotebookCell green-bg",
+              children: _jsx(SelectIndex, {
+                meta: meta,
+                groupIndex: groupIndex
+              })
+            }), _jsx("div", {
+              className: 'pass',
+              children: __('SqlQueryBuilder.by')
+            }), _jsx("div", {
+              className: "Sqb-NotebookCell green-bg",
+              children: _jsx(GroupBy, {
+                meta: meta,
+                groupIndex: groupIndex
+              })
+            })]
+          })
         })
       }), _jsx(NextDom, {
         meta: meta,

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

@@ -21,6 +21,7 @@ import { SelectTable, SelectColumn } from '../dialog';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
+import ItemWrapper from './components/item-wrapper';
 import { ExclamationCircleFill } from '@gingkoo/pandora-icons';
 import { useStore } from '../../hooks/use-provider';
 var TableData = function TableData(props) {
@@ -291,141 +292,146 @@ var TableData = function TableData(props) {
       className: "Sqb-hover-parent",
       children: [_jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         isDataModule: props.groupIndex === 0,
         title: __('SqlQueryBuilder.data')
-      }), _jsx("div", {
-        className: "Sqb-item--content",
-        children: _jsxs("div", {
-          className: "Sqb-NotebookCell",
-          children: [meta.isSubquery ? _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$table4;
-                        e.stopPropagation();
-                        onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+      }), _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
+        children: _jsx("div", {
+          className: "Sqb-item--content",
+          children: _jsxs("div", {
+            className: "Sqb-NotebookCell",
+            children: [meta.isSubquery ? _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$table4;
+                          e.stopPropagation();
+                          onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.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$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
-          }) : _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$table7;
-                        e.stopPropagation();
-                        onChangeTableAlias(((_meta$table7 = meta.table) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.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$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+            }) : _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$table7;
+                          e.stopPropagation();
+                          onChangeTableAlias(((_meta$table7 = meta.table) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) || '');
+                        }
                       }
-                    }
-                  })
-                }) : null;
-              }()
-            })
-            // <Tooltip
-            //   title={__(
-            //     tableIsError()
-            //       ? isDel
-            //         ? 'metabase.verify'
-            //         : 'SqlQueryBuilder.repeatAlias'
-            //       : 'SqlQueryBuilder.alias',
-            //   )}
-            // >
-            //   <Button
-            //     danger={tableIsError()}
-            //     className={cx(':Sqb-TableName-as', {
-            //       isError: tableIsError(),
-            //     })}
-            //     shape='circle'
-            //     style={
-            //       isDel
-            //         ? {
-            //             fontSize: 18,
-            //             backgroundColor: '#fff',
-            //             width: 'auto',
-            //             height: 'auto',
-            //           }
-            //         : {}
-            //     }
-            //     iconOnly
-            //     primary={!isDel}
-            //     icon={isDel ? <ExclamationCircleFill /> : 'As'}
-            //     size='small'
-            //     onClick={(e) => {
-            //       e.stopPropagation();
-            //       onChangeTableAlias(meta.table?.alias || '');
-            //     }}
-            //   ></Button>
-            // </Tooltip>
-            , selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table8 = meta.table) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
-          }), store.showSubquery && _jsx(Tooltip, {
-            title: __('SqlQueryBuilder.switchSubQuery'),
-            children: _jsx(Button, {
-              disabled: meta.readonly,
-              primary: meta.isSubquery,
-              ghost: true,
-              className: cx('mr-2 operator-icon', _defineProperty({}, 'subquery-icon', !meta.isSubquery)),
-              icon: _jsx(RelatedWork, {}),
-              onClick: switchSubQuery
-            })
-          }), selected && store.showFields && !store.isExit && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
-            className: "Sqb-TableColumns",
-            onClick: selectColumns,
-            children: __('SqlQueryBuilder.columns')
-          })]
+                    })
+                  }) : null;
+                }()
+              })
+              // <Tooltip
+              //   title={__(
+              //     tableIsError()
+              //       ? isDel
+              //         ? 'metabase.verify'
+              //         : 'SqlQueryBuilder.repeatAlias'
+              //       : 'SqlQueryBuilder.alias',
+              //   )}
+              // >
+              //   <Button
+              //     danger={tableIsError()}
+              //     className={cx(':Sqb-TableName-as', {
+              //       isError: tableIsError(),
+              //     })}
+              //     shape='circle'
+              //     style={
+              //       isDel
+              //         ? {
+              //             fontSize: 18,
+              //             backgroundColor: '#fff',
+              //             width: 'auto',
+              //             height: 'auto',
+              //           }
+              //         : {}
+              //     }
+              //     iconOnly
+              //     primary={!isDel}
+              //     icon={isDel ? <ExclamationCircleFill /> : 'As'}
+              //     size='small'
+              //     onClick={(e) => {
+              //       e.stopPropagation();
+              //       onChangeTableAlias(meta.table?.alias || '');
+              //     }}
+              //   ></Button>
+              // </Tooltip>
+              , selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table8 = meta.table) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
+            }), store.showSubquery && _jsx(Tooltip, {
+              title: __('SqlQueryBuilder.switchSubQuery'),
+              children: _jsx(Button, {
+                disabled: meta.readonly,
+                primary: meta.isSubquery,
+                ghost: true,
+                className: cx('mr-2 operator-icon', _defineProperty({}, 'subquery-icon', !meta.isSubquery)),
+                icon: _jsx(RelatedWork, {}),
+                onClick: switchSubQuery
+              })
+            }), selected && store.showFields && (!store.isExit || store.isSubquery) && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
+              className: "Sqb-TableColumns",
+              onClick: selectColumns,
+              children: __('SqlQueryBuilder.columns')
+            })]
+          })
         })
       }), _jsx(NextDom, {
         meta: meta,

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

@@ -3,6 +3,7 @@ import cx from 'classnames';
 import { __ } from '../../locale';
 import Wrapper from './components/Wrapper';
 import Header from './components/header';
+import ItemWrapper from './components/item-wrapper';
 import SelectList from '../dialog/select-list';
 import { UnionEnum } from '../../store/enum';
 import { useStore } from '../../hooks/use-provider';
@@ -42,20 +43,25 @@ var RowLimit = function RowLimit(props) {
       className: cx("Sqb-hover-parent"),
       children: [_jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         title: __('SqlQueryBuilder.union'),
         onClose: function onClose() {
           return store.delMeta(meta, groupIndex);
         }
-      }), _jsx("div", {
-        className: cx("Sqb-item--content"),
+      }), _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
         children: _jsx("div", {
-          className: cx("Sqb-NotebookCell"),
+          className: cx("Sqb-item--content"),
           children: _jsx("div", {
-            className: "Sqb-TableName",
-            onClick: function onClick(e) {
-              return selectOperator(e);
-            },
-            children: union
+            className: cx("Sqb-NotebookCell"),
+            children: _jsx("div", {
+              className: "Sqb-TableName",
+              onClick: function onClick(e) {
+                return selectOperator(e);
+              },
+              children: union
+            })
           })
         })
       })]