@gingkoo/pandora-metabase 1.0.139 → 1.0.140

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/cjs/components/dialog/expression/index.js +2 -1
  2. package/lib/cjs/hooks/use-state.js +1 -1
  3. package/lib/es/components/dialog/expression/index.js +2 -1
  4. package/lib/es/hooks/use-state.js +1 -1
  5. package/package.json +1 -1
package/lib/cjs/components/dialog/expression/index.js CHANGED
@@ -86,6 +86,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
86
86
  _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
87
87
  isNext = _useState12[0],
88
88
  setIsNext = _useState12[1];
89
+ var showLeftFormula = Boolean(formula.type);
89
90
  var setParentClosable = function setParentClosable(closable) {
90
91
  if (parentPopupChannel === 'secondary') {
91
92
  store.setClosable2(closable);
@@ -789,7 +790,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
789
790
  className: 'span-name',
790
791
  onClick: goPrevPage,
791
792
  children: [(0, _jsxRuntime.jsx)(_icons.LeftArrowIcon, {}), getName(curColumn.lhs)]
792
- }), leftFormula()]
793
+ }), showLeftFormula && leftFormula()]
793
794
  }), (0, _jsxRuntime.jsxs)("div", {
794
795
  className: 'right-info',
795
796
  children: [filterCustomType && (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
package/lib/cjs/hooks/use-state.js CHANGED
@@ -777,7 +777,7 @@ var useStore = function useStore() {
777
777
  };
778
778
  var groupList = ((_metaList$groupIndex = metaList[groupIndex]) === null || _metaList$groupIndex === void 0 ? void 0 : _metaList$groupIndex.list) || [];
779
779
  var getJoinKey = function getJoinKey(table1, table2) {
780
- return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '');
780
+ return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.name) || '');
781
781
  };
782
782
  var existingJoinKeys = new Set();
783
783
  groupList.forEach(function (item) {
package/lib/es/components/dialog/expression/index.js CHANGED
@@ -78,6 +78,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
78
78
  _useState12 = _slicedToArray(_useState11, 2),
79
79
  isNext = _useState12[0],
80
80
  setIsNext = _useState12[1];
81
+ var showLeftFormula = Boolean(formula.type);
81
82
  var setParentClosable = function setParentClosable(closable) {
82
83
  if (parentPopupChannel === 'secondary') {
83
84
  store.setClosable2(closable);
@@ -781,7 +782,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
781
782
  className: 'span-name',
782
783
  onClick: goPrevPage,
783
784
  children: [_jsx(LeftArrowIcon, {}), getName(curColumn.lhs)]
784
- }), leftFormula()]
785
+ }), showLeftFormula && leftFormula()]
785
786
  }), _jsxs("div", {
786
787
  className: 'right-info',
787
788
  children: [filterCustomType && _jsx(Dropdown, {
package/lib/es/hooks/use-state.js CHANGED
@@ -771,7 +771,7 @@ var useStore = function useStore() {
771
771
  };
772
772
  var groupList = ((_metaList$groupIndex = metaList[groupIndex]) === null || _metaList$groupIndex === void 0 ? void 0 : _metaList$groupIndex.list) || [];
773
773
  var getJoinKey = function getJoinKey(table1, table2) {
774
- return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '');
774
+ return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.name) || '');
775
775
  };
776
776
  var existingJoinKeys = new Set();
777
777
  groupList.forEach(function (item) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.139",
3
+ "version": "1.0.140",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",