@gingkoo/pandora-metabase 1.0.82 → 1.0.84

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

@@ -24,6 +24,7 @@ var _dialog = require("../dialog");
 var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
 var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
 var _header = _interopRequireDefault(require("./components/header"));
+var _itemWrapper = _interopRequireDefault(require("./components/item-wrapper"));
 var _itemName = _interopRequireDefault(require("./components/item-name"));
 var CustomColumn = function CustomColumn(props) {
   var meta = props.meta,
@@ -316,42 +317,47 @@ var CustomColumn = function CustomColumn(props) {
       className: "Sqb-hover-parent",
       children: [(0, _jsxRuntime.jsx)(_header["default"], {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'gray-text',
         title: (0, _locale.__)('SqlQueryBuilder.customColumn'),
         onClose: function onClose() {
           closePopup();
           store.delMeta(meta, groupIndex);
         }
-      }), (0, _jsxRuntime.jsx)("div", {
-        className: "Sqb-item--content",
-        children: (0, _jsxRuntime.jsxs)("div", {
-          className: "Sqb-NotebookCell gray-bg",
-          children: [meta.customColumn.map(function (v, i) {
-            return (0, _jsxRuntime.jsx)(_itemName["default"], {
-              isError: (0, _utils.isError)(v.formulaList, getColumns()),
-              children: (0, _jsxRuntime.jsxs)("div", {
-                className: (0, _classnames["default"])("Sqb-TableName gray-name"),
-                onClick: function onClick(e) {
-                  return showSubQuery(e, i);
-                },
-                children: [v.name, (0, _jsxRuntime.jsx)("span", {
-                  style: {
-                    fontSize: 0
-                  },
+      }), (0, _jsxRuntime.jsx)(_itemWrapper["default"], {
+        meta: meta,
+        groupIndex: groupIndex,
+        children: (0, _jsxRuntime.jsx)("div", {
+          className: "Sqb-item--content",
+          children: (0, _jsxRuntime.jsxs)("div", {
+            className: "Sqb-NotebookCell gray-bg",
+            children: [meta.customColumn.map(function (v, i) {
+              return (0, _jsxRuntime.jsx)(_itemName["default"], {
+                isError: (0, _utils.isError)(v.formulaList, getColumns()),
+                children: (0, _jsxRuntime.jsxs)("div", {
+                  className: (0, _classnames["default"])("Sqb-TableName gray-name"),
                   onClick: function onClick(e) {
-                    return handleDel(e, i);
+                    return showSubQuery(e, i);
                   },
-                  children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-                })]
-              })
-            }, i);
-          }), (0, _jsxRuntime.jsx)("div", {
-            className: "Sqb-TableName gray-name",
-            onClick: function onClick(e) {
-              showSubQuery(e, -1);
-            },
-            children: (0, _jsxRuntime.jsx)(_icons.AddIcon, {})
-          })]
+                  children: [v.name, (0, _jsxRuntime.jsx)("span", {
+                    style: {
+                      fontSize: 0
+                    },
+                    onClick: function onClick(e) {
+                      return handleDel(e, i);
+                    },
+                    children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+                  })]
+                })
+              }, i);
+            }), (0, _jsxRuntime.jsx)("div", {
+              className: "Sqb-TableName gray-name",
+              onClick: function onClick(e) {
+                showSubQuery(e, -1);
+              },
+              children: (0, _jsxRuntime.jsx)(_icons.AddIcon, {})
+            })]
+          })
         })
       }), (0, _jsxRuntime.jsx)(_metaIcon["default"], {
         meta: meta,

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

@@ -18,6 +18,7 @@ var _types = require("../../store/types");
 var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
 var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
 var _header = _interopRequireDefault(require("./components/header"));
+var _itemWrapper = _interopRequireDefault(require("./components/item-wrapper"));
 var _useProvider = require("../../hooks/use-provider");
 // import { customTypes, operatorList } from './enum/filter-enum';
 
@@ -173,26 +174,31 @@ var Filter = function Filter(props) {
       className: "Sqb-hover-parent",
       children: [!meta.isPermanent ? (0, _jsxRuntime.jsx)(_header["default"], {
         meta: meta,
+        groupIndex: groupIndex,
         className: 'purple-text',
         title: (0, _locale.__)('SqlQueryBuilder.filter'),
         onClose: function onClose() {
           closePopup();
           store.delMeta(meta, groupIndex);
         }
-      }) : null, (0, _jsxRuntime.jsx)("div", {
-        className: "Sqb-item--content",
-        children: (0, _jsxRuntime.jsx)(_formulaList["default"]
-        // customTypes={customTypes}
-        // operatorList={operatorList}
-        , {
+      }) : null, (0, _jsxRuntime.jsx)(_itemWrapper["default"], {
+        meta: meta,
+        groupIndex: groupIndex,
+        children: (0, _jsxRuntime.jsx)("div", {
+          className: "Sqb-item--content",
+          children: (0, _jsxRuntime.jsx)(_formulaList["default"]
           // 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);
+            }
+          })
         })
       }), (0, _jsxRuntime.jsx)(_metaIcon["default"], {
         meta: meta,