@gingkoo/pandora-metabase 1.0.133 → 1.0.135

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 (3) hide show
  1. package/lib/cjs/components/dialog/select-column-multiple/index.js +20 -14
  2. package/lib/es/components/dialog/select-column-multiple/index.js +20 -14
  3. package/package.json +1 -1
package/lib/cjs/components/dialog/select-column-multiple/index.js CHANGED
@@ -55,19 +55,24 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
55
55
  nextBtnText = _ref$nextBtnText === void 0 ? (0, _locale.__)('metabase.nextBtn') : _ref$nextBtnText,
56
56
  onNextStep = _ref.onNextStep;
57
57
  var store = (0, _useProvider.useStore)();
58
+ var selectedTableUuid = (_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableId) === _helper.SummarizeAlias ? '' : (_value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableUuid) || '';
58
59
  var _useState = (0, _react.useState)(_value),
59
60
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
60
61
  value = _useState2[0],
61
62
  setValue = _useState2[1];
62
- var _useState3 = (0, _react.useState)((_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableId) === _helper.SummarizeAlias ? '' : _value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableUuid),
63
+ var _useState3 = (0, _react.useState)(selectedTableUuid),
63
64
  _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
64
65
  curTable = _useState4[0],
65
66
  setCurTable = _useState4[1];
66
- var _useState5 = (0, _react.useState)(''),
67
+ var _useState5 = (0, _react.useState)(selectedTableUuid),
67
68
  _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
68
- searchTableText = _useState6[0],
69
- setSearchTableText = _useState6[1];
70
- var _useState7 = (0, _react.useState)(data.map(function (v, i) {
69
+ selectedTable = _useState6[0],
70
+ setSelectedTable = _useState6[1];
71
+ var _useState7 = (0, _react.useState)(''),
72
+ _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
73
+ searchTableText = _useState8[0],
74
+ setSearchTableText = _useState8[1];
75
+ var _useState9 = (0, _react.useState)(data.map(function (v, i) {
71
76
  var open = !i && !curTable ? true : v.tableUuid === curTable;
72
77
  return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
73
78
  open: open,
@@ -79,11 +84,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
79
84
  }).slice()
80
85
  });
81
86
  })),
82
- _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
83
- tableList = _useState8[0],
84
- setTableList = _useState8[1];
87
+ _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
88
+ tableList = _useState0[0],
89
+ setTableList = _useState0[1];
85
90
  (0, _react.useEffect)(function () {
86
91
  setValue(_value);
92
+ setSelectedTable(selectedTableUuid);
93
+ if (selectedTableUuid) {
94
+ setCurTable(selectedTableUuid);
95
+ }
87
96
  }, [_value]);
88
97
  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
89
98
  return tableId || tableUuid || '';
@@ -158,6 +167,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
158
167
  if (!multiple) {
159
168
  var _data = val ? [val] : [];
160
169
  setValue(_data);
170
+ setSelectedTable(tableUuid);
161
171
  setCurTable(tableUuid);
162
172
  onSelect === null || onSelect === void 0 || onSelect(_data, getQuotes(_data));
163
173
  return;
@@ -166,7 +176,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
166
176
  return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdName)(v, val);
167
177
  }).length) > 0;
168
178
  var _value = value.slice();
169
- if (tableUuid != curTable) {
179
+ if (tableUuid != selectedTable) {
170
180
  _value = [];
171
181
  }
172
182
  if (!isHas && val) {
@@ -199,6 +209,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
199
209
  });
200
210
  });
201
211
  setValue(_value);
212
+ setSelectedTable(tableUuid);
202
213
  setCurTable(tableUuid);
203
214
  onSelect === null || onSelect === void 0 || onSelect(_value, getQuotes(_value));
204
215
  };
@@ -284,11 +295,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
284
295
  if (isGroup) {
285
296
  changeValue(tableUuid);
286
297
  }
287
- if (tableUuid !== curTable) {
288
- setCurTable(tableUuid);
289
- setValue([]);
290
- onSelect === null || onSelect === void 0 || onSelect([], '');
291
- }
292
298
  if (!isMultiple) return void 0;
293
299
  var newTables = (0, _cloneDeep["default"])(tableList);
294
300
  if (open) {
package/lib/es/components/dialog/select-column-multiple/index.js CHANGED
@@ -49,19 +49,24 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
49
49
  nextBtnText = _ref$nextBtnText === void 0 ? __('metabase.nextBtn') : _ref$nextBtnText,
50
50
  onNextStep = _ref.onNextStep;
51
51
  var store = useStore();
52
+ var selectedTableUuid = (_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableId) === SummarizeAlias ? '' : (_value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableUuid) || '';
52
53
  var _useState = useState(_value),
53
54
  _useState2 = _slicedToArray(_useState, 2),
54
55
  value = _useState2[0],
55
56
  setValue = _useState2[1];
56
- var _useState3 = useState((_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableId) === SummarizeAlias ? '' : _value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableUuid),
57
+ var _useState3 = useState(selectedTableUuid),
57
58
  _useState4 = _slicedToArray(_useState3, 2),
58
59
  curTable = _useState4[0],
59
60
  setCurTable = _useState4[1];
60
- var _useState5 = useState(''),
61
+ var _useState5 = useState(selectedTableUuid),
61
62
  _useState6 = _slicedToArray(_useState5, 2),
62
- searchTableText = _useState6[0],
63
- setSearchTableText = _useState6[1];
64
- var _useState7 = useState(data.map(function (v, i) {
63
+ selectedTable = _useState6[0],
64
+ setSelectedTable = _useState6[1];
65
+ var _useState7 = useState(''),
66
+ _useState8 = _slicedToArray(_useState7, 2),
67
+ searchTableText = _useState8[0],
68
+ setSearchTableText = _useState8[1];
69
+ var _useState9 = useState(data.map(function (v, i) {
65
70
  var open = !i && !curTable ? true : v.tableUuid === curTable;
66
71
  return _objectSpread(_objectSpread({}, v), {}, {
67
72
  open: open,
@@ -73,11 +78,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
73
78
  }).slice()
74
79
  });
75
80
  })),
76
- _useState8 = _slicedToArray(_useState7, 2),
77
- tableList = _useState8[0],
78
- setTableList = _useState8[1];
81
+ _useState0 = _slicedToArray(_useState9, 2),
82
+ tableList = _useState0[0],
83
+ setTableList = _useState0[1];
79
84
  useEffect(function () {
80
85
  setValue(_value);
86
+ setSelectedTable(selectedTableUuid);
87
+ if (selectedTableUuid) {
88
+ setCurTable(selectedTableUuid);
89
+ }
81
90
  }, [_value]);
82
91
  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
83
92
  return tableId || tableUuid || '';
@@ -152,6 +161,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
152
161
  if (!multiple) {
153
162
  var _data = val ? [val] : [];
154
163
  setValue(_data);
164
+ setSelectedTable(tableUuid);
155
165
  setCurTable(tableUuid);
156
166
  onSelect === null || onSelect === void 0 || onSelect(_data, getQuotes(_data));
157
167
  return;
@@ -160,7 +170,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
160
170
  return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdName(v, val);
161
171
  }).length) > 0;
162
172
  var _value = value.slice();
163
- if (tableUuid != curTable) {
173
+ if (tableUuid != selectedTable) {
164
174
  _value = [];
165
175
  }
166
176
  if (!isHas && val) {
@@ -193,6 +203,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
193
203
  });
194
204
  });
195
205
  setValue(_value);
206
+ setSelectedTable(tableUuid);
196
207
  setCurTable(tableUuid);
197
208
  onSelect === null || onSelect === void 0 || onSelect(_value, getQuotes(_value));
198
209
  };
@@ -278,11 +289,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
278
289
  if (isGroup) {
279
290
  changeValue(tableUuid);
280
291
  }
281
- if (tableUuid !== curTable) {
282
- setCurTable(tableUuid);
283
- setValue([]);
284
- onSelect === null || onSelect === void 0 || onSelect([], '');
285
- }
286
292
  if (!isMultiple) return void 0;
287
293
  var newTables = cloneDeep(tableList);
288
294
  if (open) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.133",
3
+ "version": "1.0.135",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",