@gingkoo/pandora-metabase 1.0.81 → 1.0.83

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

@@ -19,6 +19,7 @@ import { CustomColumnPopup } 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 ItemName from './components/item-name';
 import { useStore } from '../../hooks/use-provider';
 var CustomColumn = function CustomColumn(props) {
@@ -312,42 +313,47 @@ var CustomColumn = function CustomColumn(props) {
       className: "Sqb-hover-parent",
       children: [_jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'gray-text',
         title: __('SqlQueryBuilder.customColumn'),
         onClose: function onClose() {
           closePopup();
           store.delMeta(meta, groupIndex);
         }
-      }), _jsx("div", {
-        className: "Sqb-item--content",
-        children: _jsxs("div", {
-          className: "Sqb-NotebookCell gray-bg",
-          children: [meta.customColumn.map(function (v, i) {
-            return _jsx(ItemName, {
-              isError: isError(v.formulaList, getColumns()),
-              children: _jsxs("div", {
-                className: cx("Sqb-TableName gray-name"),
-                onClick: function onClick(e) {
-                  return showSubQuery(e, i);
-                },
-                children: [v.name, _jsx("span", {
-                  style: {
-                    fontSize: 0
-                  },
+      }), _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
+        children: _jsx("div", {
+          className: "Sqb-item--content",
+          children: _jsxs("div", {
+            className: "Sqb-NotebookCell gray-bg",
+            children: [meta.customColumn.map(function (v, i) {
+              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, {})
-                })]
-              })
-            }, i);
-          }), _jsx("div", {
-            className: "Sqb-TableName gray-name",
-            onClick: function onClick(e) {
-              showSubQuery(e, -1);
-            },
-            children: _jsx(AddIcon, {})
-          })]
+                  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",
+              onClick: function onClick(e) {
+                showSubQuery(e, -1);
+              },
+              children: _jsx(AddIcon, {})
+            })]
+          })
         })
       }), _jsx(NextDom, {
         meta: meta,

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

@@ -11,6 +11,7 @@ import { ChangeType } from '../../store/types';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
+import ItemWrapper from './components/item-wrapper';
 // import { customTypes, operatorList } from './enum/filter-enum';
 import { useStore } from '../../hooks/use-provider';
 var Filter = function Filter(props) {
@@ -165,26 +166,31 @@ var Filter = function Filter(props) {
       className: "Sqb-hover-parent",
       children: [!meta.isPermanent ? _jsx(Header, {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'purple-text',
         title: __('SqlQueryBuilder.filter'),
         onClose: function onClose() {
           closePopup();
           store.delMeta(meta, groupIndex);
         }
-      }) : null, _jsx("div", {
-        className: "Sqb-item--content",
-        children: _jsx(FormulaList
-        // customTypes={customTypes}
-        // operatorList={operatorList}
-        , {
+      }) : null, _jsx(ItemWrapper, {
+        meta: meta,
+        groupIndex: groupIndex,
+        children: _jsx("div", {
+          className: "Sqb-item--content",
+          children: _jsx(FormulaList
           // customTypes={customTypes}
           // operatorList={operatorList}
-          value: filter,
-          data: getPreColumns(),
-          exitData: getColumns(),
-          onChange: function onChange(val) {
-            selectFilter(val);
-          }
+          , {
+            // customTypes={customTypes}
+            // operatorList={operatorList}
+            value: filter,
+            data: getPreColumns(),
+            exitData: getColumns(),
+            onChange: function onChange(val) {
+              selectFilter(val);
+            }
+          })
         })
       }), _jsx(NextDom, {
         meta: meta,