@gingkoo/pandora-metabase 1.0.131 → 1.0.133

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 (19) hide show
  1. package/lib/cjs/components/dialog/select-column/index.js +1 -1
  2. package/lib/cjs/components/dialog/select-column-multiple/index.js +8 -11
  3. package/lib/cjs/components/dialog/select-join-column/index.js +2 -2
  4. package/lib/cjs/components/dialog/select-join-column-multiple/index.js +4 -3
  5. package/lib/cjs/components/dialog/select-permission-table/index.js +1 -1
  6. package/lib/cjs/components/dialog/select-table/index.js +2 -2
  7. package/lib/cjs/components/modules/join-data.js +4 -1
  8. package/lib/cjs/utils/helper.d.ts +2 -0
  9. package/lib/cjs/utils/helper.js +35 -1
  10. package/lib/es/components/dialog/select-column/index.js +2 -2
  11. package/lib/es/components/dialog/select-column-multiple/index.js +9 -12
  12. package/lib/es/components/dialog/select-join-column/index.js +3 -3
  13. package/lib/es/components/dialog/select-join-column-multiple/index.js +5 -4
  14. package/lib/es/components/dialog/select-permission-table/index.js +2 -2
  15. package/lib/es/components/dialog/select-table/index.js +3 -3
  16. package/lib/es/components/modules/join-data.js +4 -1
  17. package/lib/es/utils/helper.d.ts +2 -0
  18. package/lib/es/utils/helper.js +34 -0
  19. package/package.json +1 -1
package/lib/cjs/components/dialog/select-column/index.js CHANGED
@@ -79,7 +79,7 @@ var SelectColumn = function SelectColumn(_ref) {
79
79
  var originalData = (0, _cloneDeep["default"])(originList);
80
80
  var mergedColumns = originalData.map(function (item) {
81
81
  var match = columns.find(function (col) {
82
- return (0, _helper.isSameColumnByIdFirst)(col, item);
82
+ return (0, _helper.isSameColumnByIdName)(col, item);
83
83
  });
84
84
  return match ? (0, _cloneDeep["default"])(match) : item;
85
85
  });
package/lib/cjs/components/dialog/select-column-multiple/index.js CHANGED
@@ -100,15 +100,13 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
100
100
  var getSelectedFieldKey = function getSelectedFieldKey(field) {
101
101
  if (!field) return '';
102
102
  var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
103
- var fieldKey = field.tableId === _helper.SummarizeAlias ? field.fieldAlias || '' : "".concat(field.fieldId).concat(field.fieldAlias || '');
103
+ var fieldKey = "".concat(field.fieldId || '', "|").concat(field.fieldName || '');
104
104
  return "".concat(tableKey, "|").concat(fieldKey);
105
105
  };
106
106
  var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
107
107
  var tableKey = getFieldTableKey(tableId, tableUuid);
108
- if (isSummarizeColumn) {
109
- return "".concat(tableKey, "|").concat(column.fieldAlias || column.name || '');
110
- }
111
- return "".concat(tableKey, "|").concat(column.id || column.name).concat(column.fieldAlias || '');
108
+ var fieldKey = "".concat(column.id || '', "|").concat(column.name || '');
109
+ return "".concat(tableKey, "|").concat(fieldKey);
112
110
  };
113
111
  var isActive = function isActive(id_alias, tableId, tableUuid) {
114
112
  return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
@@ -164,9 +162,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
164
162
  onSelect === null || onSelect === void 0 || onSelect(_data, getQuotes(_data));
165
163
  return;
166
164
  }
167
- var selectedKey = getSelectedFieldKey(val);
168
165
  var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
169
- return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey;
166
+ return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdName)(v, val);
170
167
  }).length) > 0;
171
168
  var _value = value.slice();
172
169
  if (tableUuid != curTable) {
@@ -181,7 +178,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
181
178
  _value.push(val);
182
179
  } else {
183
180
  _value = _value.filter(function (v) {
184
- return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey);
181
+ return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdName)(v, val));
185
182
  });
186
183
  }
187
184
  var curTableItem = data.find(function (v) {
@@ -192,7 +189,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
192
189
  _value = _value.filter(function (item2) {
193
190
  return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
194
191
  if (item2.tableId === _helper.SummarizeAlias) {
195
- return (item1.fieldAlias || item1.name) === item2.fieldAlias;
192
+ return (0, _helper2.isSameColumnByIdName)(item2, item1);
196
193
  }
197
194
  return (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, item1), {}, {
198
195
  tableId: curTableId,
@@ -354,8 +351,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
354
351
  name = v.name;
355
352
  var columnKey = getColumnKey(v, isSummarize, tableId || '', tableUuid);
356
353
  var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
357
- var fieldName = isSummarize ? '' : name || '';
358
- var fieldId = isSummarize ? '' : v.id || name || '';
354
+ var fieldName = name || '';
355
+ var fieldId = v.id || '';
359
356
  var fieldNameZh = isSummarize ? '' : v.name_zh || '';
360
357
  var groupe = _enum.SQL_GROUP_TYPE.STRING;
361
358
  if (~_const.NUMBER_GROUP.indexOf(database_type)) {
package/lib/cjs/components/dialog/select-join-column/index.js CHANGED
@@ -251,7 +251,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
251
251
  if (~_const.DATE_GROUP.indexOf(database_type)) {
252
252
  groupe = _enum.SQL_GROUP_TYPE.DATE;
253
253
  }
254
- var showCondition = (0, _helper2.isSameColumnByIdFirst)(curColumn, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
254
+ var showCondition = (0, _helper2.isSameColumnByIdName)(curColumn, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
255
255
  tableId: tableId,
256
256
  tableUuid: tableUuid,
257
257
  datasourceId: datasourceId
@@ -260,7 +260,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
260
260
  className: (0, _classnames["default"])("Sqb-List-section"),
261
261
  children: (0, _jsxRuntime.jsxs)("div", {
262
262
  className: (0, _classnames["default"])("Sqb-List-item mx-2", {
263
- active: curTable === tableUuid && (0, _helper2.isSameColumnByIdFirst)(value, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
263
+ active: curTable === tableUuid && (0, _helper2.isSameColumnByIdName)(value, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
264
264
  tableId: tableId,
265
265
  tableUuid: tableUuid,
266
266
  datasourceId: datasourceId
package/lib/cjs/components/dialog/select-join-column-multiple/index.js CHANGED
@@ -76,7 +76,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
76
76
  }, [_value]);
77
77
  var isActive = function isActive(field) {
78
78
  return value.filter(function (v) {
79
- return (0, _helper2.isSameColumnByIdFirst)(v, field);
79
+ return (0, _helper2.isSameColumnByIdName)(v, field);
80
80
  }).length > 0;
81
81
  };
82
82
  (0, _react.useEffect)(function () {
@@ -109,7 +109,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
109
109
  }
110
110
  var changeValue = function changeValue(table, val) {
111
111
  var isHas = value.filter(function (v) {
112
- return (0, _helper2.isSameColumnByIdFirst)(v, val);
112
+ return (0, _helper2.isSameColumnByIdName)(v, val);
113
113
  }).length > 0;
114
114
  var _value = (0, _toConsumableArray2["default"])(value);
115
115
  if (table.tableUuid != curTable.tableUuid) {
@@ -119,7 +119,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
119
119
  _value.push(val);
120
120
  } else {
121
121
  _value = _value.filter(function (v) {
122
- return !(0, _helper2.isSameColumnByIdFirst)(v, val);
122
+ return !(0, _helper2.isSameColumnByIdName)(v, val);
123
123
  });
124
124
  }
125
125
  setValue(_value);
@@ -240,6 +240,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
240
240
  onClick: function onClick() {
241
241
  changeValue(tableItem, {
242
242
  fieldId: fieldId || v.id,
243
+ fieldName: v.name,
243
244
  fieldAlias: v.fieldAlias || v.name,
244
245
  fieldUuid: v.fieldUuid,
245
246
  quotes: v.fieldAlias || v.name
package/lib/cjs/components/dialog/select-permission-table/index.js CHANGED
@@ -67,7 +67,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
67
67
  className: (0, _classnames["default"])("Sqb-List-section"),
68
68
  children: (0, _jsxRuntime.jsx)("div", {
69
69
  className: (0, _classnames["default"])("Sqb-List-item mx-2", {
70
- active: (0, _helper.isSameTableByIdFirst)(value, v)
70
+ active: (0, _helper.isSameTableByIdName)(value, v)
71
71
  }),
72
72
  onClick: function onClick() {
73
73
  onChange(v);
package/lib/cjs/components/dialog/select-table/index.js CHANGED
@@ -333,7 +333,7 @@ var SelectTable = function SelectTable(_ref) {
333
333
  className: (0, _classnames["default"])("Sqb-List-section"),
334
334
  children: (0, _jsxRuntime.jsx)("div", {
335
335
  className: (0, _classnames["default"])("Sqb-List-item mx-2", {
336
- active: (0, _helper.isSameTableByIdFirst)(value, tableValue)
336
+ active: (0, _helper.isSameTableByIdName)(value, tableValue)
337
337
  }),
338
338
  onClick: function onClick() {
339
339
  onChange(tableValue);
@@ -455,7 +455,7 @@ var SelectTable = function SelectTable(_ref) {
455
455
  className: (0, _classnames["default"])("Sqb-List-section"),
456
456
  children: (0, _jsxRuntime.jsx)("div", {
457
457
  className: (0, _classnames["default"])("Sqb-List-item mx-2", {
458
- active: (0, _helper.isSameTableByIdFirst)(value, tableValue)
458
+ active: (0, _helper.isSameTableByIdName)(value, tableValue)
459
459
  }),
460
460
  onClick: function onClick() {
461
461
  onChange(tableValue);
package/lib/cjs/components/modules/join-data.js CHANGED
@@ -482,7 +482,10 @@ var JoinData = function JoinData(props) {
482
482
  if (!(0, _helper.isSameTableByIdFirst)(meta.table2, data)) {
483
483
  var _store$preProps;
484
484
  var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
485
- var alias = (0, _helper.getAlias)(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
485
+ var aliasMetaList = newMeta.filter(function (_, i) {
486
+ return i !== index;
487
+ });
488
+ var alias = (0, _helper.getAlias)(tableName, aliasMetaList, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
486
489
  var _table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {
487
490
  name: tableName,
488
491
  tableUuid: data.tableUuid || (0, _helper.uuidv4)('table'),
package/lib/cjs/utils/helper.d.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  import type { MetaListType } from '../store/types';
2
+ export declare const isSameTableByIdName: (left?: any, right?: any) => boolean;
3
+ export declare const isSameColumnByIdName: (left?: any, right?: any) => boolean;
2
4
  export declare const getTableIdFirstKey: (table?: any) => string;
3
5
  export declare const isSameTableByIdFirst: (left?: any, right?: any) => boolean;
4
6
  export declare const getColumnIdFirstKey: (column?: any) => string;
package/lib/cjs/utils/helper.js CHANGED
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.uuidv4 = exports.throttle = exports.sleep = exports.replaceTpl = exports.mobx2Object = exports.mergeNameAlias = exports.isSameTableByIdFirst = exports.isSameColumnByIdFirst = exports.getUrlParams = exports.getTableIdFirstKey = exports.getScreenInfo = exports.getColumnIdFirstKey = exports.getAlias = exports.fullScreen = exports.flatArray = exports.exitFullscreen = exports.debounce = void 0;
7
+ exports.uuidv4 = exports.throttle = exports.sleep = exports.replaceTpl = exports.mobx2Object = exports.mergeNameAlias = exports.isSameTableByIdName = exports.isSameTableByIdFirst = exports.isSameColumnByIdName = exports.isSameColumnByIdFirst = exports.getUrlParams = exports.getTableIdFirstKey = exports.getScreenInfo = exports.getColumnIdFirstKey = exports.getAlias = exports.fullScreen = exports.flatArray = exports.exitFullscreen = exports.debounce = void 0;
8
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
9
9
  var _enum = require("../store/enum");
10
10
  var normalizeId = function normalizeId(val) {
@@ -14,6 +14,40 @@ var normalizeId = function normalizeId(val) {
14
14
  var hasBoth = function hasBoth(left, right) {
15
15
  return Boolean(left && right);
16
16
  };
17
+ var getTableIdNameParts = function getTableIdNameParts() {
18
+ var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
19
+ return {
20
+ id: normalizeId(table.id || table.tableId),
21
+ name: normalizeId(table.name || table.tableName || table.table)
22
+ };
23
+ };
24
+ var getColumnIdNameParts = function getColumnIdNameParts() {
25
+ var column = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
26
+ return {
27
+ id: normalizeId(column.fieldId || column.id),
28
+ name: normalizeId(column.fieldName || column.name)
29
+ };
30
+ };
31
+ var isSameTableByIdName = exports.isSameTableByIdName = function isSameTableByIdName() {
32
+ var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
33
+ var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
34
+ var leftIdentity = getTableIdNameParts(left);
35
+ var rightIdentity = getTableIdNameParts(right);
36
+ if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
37
+ return false;
38
+ }
39
+ return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
40
+ };
41
+ var isSameColumnByIdName = exports.isSameColumnByIdName = function isSameColumnByIdName() {
42
+ var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
43
+ var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
44
+ var leftIdentity = getColumnIdNameParts(left);
45
+ var rightIdentity = getColumnIdNameParts(right);
46
+ if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
47
+ return false;
48
+ }
49
+ return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
50
+ };
17
51
  var getTableIdFirstKey = exports.getTableIdFirstKey = function getTableIdFirstKey() {
18
52
  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
19
53
  var datasourceId = normalizeId(table.datasourceId);
package/lib/es/components/dialog/select-column/index.js CHANGED
@@ -12,7 +12,7 @@ import { ChangeType } from '../../../store/types';
12
12
  import { __ } from '../../../locale';
13
13
  import { NotSelectIcon, SelectIcon } from '../../icons';
14
14
  import { useStore } from '../../../hooks/use-provider';
15
- import { getColumnIdFirstKey, isSameColumnByIdFirst, uuidv4 } from '../../../utils/helper';
15
+ import { getColumnIdFirstKey, isSameColumnByIdName, uuidv4 } from '../../../utils/helper';
16
16
  import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
17
17
  import { SearchIcon } from '../../icons';
18
18
  var SelectColumn = function SelectColumn(_ref) {
@@ -73,7 +73,7 @@ var SelectColumn = function SelectColumn(_ref) {
73
73
  var originalData = cloneDeep(originList);
74
74
  var mergedColumns = originalData.map(function (item) {
75
75
  var match = columns.find(function (col) {
76
- return isSameColumnByIdFirst(col, item);
76
+ return isSameColumnByIdName(col, item);
77
77
  });
78
78
  return match ? cloneDeep(match) : item;
79
79
  });
package/lib/es/components/dialog/select-column-multiple/index.js CHANGED
@@ -13,7 +13,7 @@ import { AtomsTypeEnum } from '../../../store/types';
13
13
  import { __ } from '../../../locale';
14
14
  import { NUMBER_GROUP, DATE_GROUP } from '../const';
15
15
  import { useStore } from '../../../hooks/use-provider';
16
- import { isSameColumnByIdFirst, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
16
+ import { isSameColumnByIdFirst, isSameColumnByIdName, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
17
17
  import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
18
18
  export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
19
19
  export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -94,15 +94,13 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
94
94
  var getSelectedFieldKey = function getSelectedFieldKey(field) {
95
95
  if (!field) return '';
96
96
  var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
97
- var fieldKey = field.tableId === SummarizeAlias ? field.fieldAlias || '' : "".concat(field.fieldId).concat(field.fieldAlias || '');
97
+ var fieldKey = "".concat(field.fieldId || '', "|").concat(field.fieldName || '');
98
98
  return "".concat(tableKey, "|").concat(fieldKey);
99
99
  };
100
100
  var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
101
101
  var tableKey = getFieldTableKey(tableId, tableUuid);
102
- if (isSummarizeColumn) {
103
- return "".concat(tableKey, "|").concat(column.fieldAlias || column.name || '');
104
- }
105
- return "".concat(tableKey, "|").concat(column.id || column.name).concat(column.fieldAlias || '');
102
+ var fieldKey = "".concat(column.id || '', "|").concat(column.name || '');
103
+ return "".concat(tableKey, "|").concat(fieldKey);
106
104
  };
107
105
  var isActive = function isActive(id_alias, tableId, tableUuid) {
108
106
  return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
@@ -158,9 +156,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
158
156
  onSelect === null || onSelect === void 0 || onSelect(_data, getQuotes(_data));
159
157
  return;
160
158
  }
161
- var selectedKey = getSelectedFieldKey(val);
162
159
  var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
163
- return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey;
160
+ return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdName(v, val);
164
161
  }).length) > 0;
165
162
  var _value = value.slice();
166
163
  if (tableUuid != curTable) {
@@ -175,7 +172,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
175
172
  _value.push(val);
176
173
  } else {
177
174
  _value = _value.filter(function (v) {
178
- return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey);
175
+ return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdName(v, val));
179
176
  });
180
177
  }
181
178
  var curTableItem = data.find(function (v) {
@@ -186,7 +183,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
186
183
  _value = _value.filter(function (item2) {
187
184
  return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
188
185
  if (item2.tableId === SummarizeAlias) {
189
- return (item1.fieldAlias || item1.name) === item2.fieldAlias;
186
+ return isSameColumnByIdName(item2, item1);
190
187
  }
191
188
  return isSameColumnByIdFirst(_objectSpread(_objectSpread({}, item1), {}, {
192
189
  tableId: curTableId,
@@ -348,8 +345,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
348
345
  name = v.name;
349
346
  var columnKey = getColumnKey(v, isSummarize, tableId || '', tableUuid);
350
347
  var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
351
- var fieldName = isSummarize ? '' : name || '';
352
- var fieldId = isSummarize ? '' : v.id || name || '';
348
+ var fieldName = name || '';
349
+ var fieldId = v.id || '';
353
350
  var fieldNameZh = isSummarize ? '' : v.name_zh || '';
354
351
  var groupe = SQL_GROUP_TYPE.STRING;
355
352
  if (~NUMBER_GROUP.indexOf(database_type)) {
package/lib/es/components/dialog/select-join-column/index.js CHANGED
@@ -11,7 +11,7 @@ import { SummarizeAlias } from '../../../store/helper';
11
11
  import { __ } from '../../../locale';
12
12
  import { NUMBER_GROUP, DATE_GROUP } from '../const';
13
13
  import { useStore } from '../../../hooks/use-provider';
14
- import { getColumnIdFirstKey, isSameColumnByIdFirst, replaceTpl, mergeNameAlias } from '../../../utils/helper';
14
+ import { getColumnIdFirstKey, isSameColumnByIdName, replaceTpl, mergeNameAlias } from '../../../utils/helper';
15
15
  import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2, RightArrowIcon } from '../../icons';
16
16
  export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
17
17
  export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -244,7 +244,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
244
244
  if (~DATE_GROUP.indexOf(database_type)) {
245
245
  groupe = SQL_GROUP_TYPE.DATE;
246
246
  }
247
- var showCondition = isSameColumnByIdFirst(curColumn, _objectSpread(_objectSpread({}, v), {}, {
247
+ var showCondition = isSameColumnByIdName(curColumn, _objectSpread(_objectSpread({}, v), {}, {
248
248
  tableId: tableId,
249
249
  tableUuid: tableUuid,
250
250
  datasourceId: datasourceId
@@ -253,7 +253,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
253
253
  className: cx("Sqb-List-section"),
254
254
  children: _jsxs("div", {
255
255
  className: cx("Sqb-List-item mx-2", {
256
- active: curTable === tableUuid && isSameColumnByIdFirst(value, _objectSpread(_objectSpread({}, v), {}, {
256
+ active: curTable === tableUuid && isSameColumnByIdName(value, _objectSpread(_objectSpread({}, v), {}, {
257
257
  tableId: tableId,
258
258
  tableUuid: tableUuid,
259
259
  datasourceId: datasourceId
package/lib/es/components/dialog/select-join-column-multiple/index.js CHANGED
@@ -11,7 +11,7 @@ import { SummarizeAlias } from '../../../store/helper';
11
11
  import { __ } from '../../../locale';
12
12
  import { NUMBER_GROUP, DATE_GROUP } from '../const';
13
13
  import { useStore } from '../../../hooks/use-provider';
14
- import { getColumnIdFirstKey, isSameColumnByIdFirst, replaceTpl, mergeNameAlias } from '../../../utils/helper';
14
+ import { getColumnIdFirstKey, isSameColumnByIdName, replaceTpl, mergeNameAlias } from '../../../utils/helper';
15
15
  import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
16
16
  export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
17
17
  export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -69,7 +69,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
69
69
  }, [_value]);
70
70
  var isActive = function isActive(field) {
71
71
  return value.filter(function (v) {
72
- return isSameColumnByIdFirst(v, field);
72
+ return isSameColumnByIdName(v, field);
73
73
  }).length > 0;
74
74
  };
75
75
  useEffect(function () {
@@ -102,7 +102,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
102
102
  }
103
103
  var changeValue = function changeValue(table, val) {
104
104
  var isHas = value.filter(function (v) {
105
- return isSameColumnByIdFirst(v, val);
105
+ return isSameColumnByIdName(v, val);
106
106
  }).length > 0;
107
107
  var _value = _toConsumableArray(value);
108
108
  if (table.tableUuid != curTable.tableUuid) {
@@ -112,7 +112,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
112
112
  _value.push(val);
113
113
  } else {
114
114
  _value = _value.filter(function (v) {
115
- return !isSameColumnByIdFirst(v, val);
115
+ return !isSameColumnByIdName(v, val);
116
116
  });
117
117
  }
118
118
  setValue(_value);
@@ -233,6 +233,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
233
233
  onClick: function onClick() {
234
234
  changeValue(tableItem, {
235
235
  fieldId: fieldId || v.id,
236
+ fieldName: v.name,
236
237
  fieldAlias: v.fieldAlias || v.name,
237
238
  fieldUuid: v.fieldUuid,
238
239
  quotes: v.fieldAlias || v.name
package/lib/es/components/dialog/select-permission-table/index.js CHANGED
@@ -6,7 +6,7 @@ import cx from 'classnames';
6
6
  import cloneDeep from 'lodash/cloneDeep';
7
7
  import { __ } from '../../../locale';
8
8
  import { TableIcon, SearchIcon } from '../../icons';
9
- import { getTableIdFirstKey, isSameTableByIdFirst, mergeNameAlias } from '../../../utils/helper';
9
+ import { getTableIdFirstKey, isSameTableByIdName, mergeNameAlias } from '../../../utils/helper';
10
10
  var PrevResult = 'Previous results';
11
11
  var SelectPermissionTable = function SelectPermissionTable(_ref) {
12
12
  var _ref$data = _ref.data,
@@ -60,7 +60,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
60
60
  className: cx("Sqb-List-section"),
61
61
  children: _jsx("div", {
62
62
  className: cx("Sqb-List-item mx-2", {
63
- active: isSameTableByIdFirst(value, v)
63
+ active: isSameTableByIdName(value, v)
64
64
  }),
65
65
  onClick: function onClick() {
66
66
  onChange(v);
package/lib/es/components/dialog/select-table/index.js CHANGED
@@ -8,7 +8,7 @@ import './index.less';
8
8
  import React, { useState, useEffect, useMemo, useRef } from 'react';
9
9
  import cx from 'classnames';
10
10
  import { Tag } from '@gingkoo/pandora';
11
- import { getTableIdFirstKey, isSameTableByIdFirst, uuidv4 } from '../../../utils/helper';
11
+ import { getTableIdFirstKey, isSameTableByIdName, uuidv4 } from '../../../utils/helper';
12
12
  import { useStore } from '../../../hooks/use-provider';
13
13
  import Loading from '../../../common/Loading';
14
14
  import { __ } from '../../../locale';
@@ -325,7 +325,7 @@ var SelectTable = function SelectTable(_ref) {
325
325
  className: cx("Sqb-List-section"),
326
326
  children: _jsx("div", {
327
327
  className: cx("Sqb-List-item mx-2", {
328
- active: isSameTableByIdFirst(value, tableValue)
328
+ active: isSameTableByIdName(value, tableValue)
329
329
  }),
330
330
  onClick: function onClick() {
331
331
  onChange(tableValue);
@@ -447,7 +447,7 @@ var SelectTable = function SelectTable(_ref) {
447
447
  className: cx("Sqb-List-section"),
448
448
  children: _jsx("div", {
449
449
  className: cx("Sqb-List-item mx-2", {
450
- active: isSameTableByIdFirst(value, tableValue)
450
+ active: isSameTableByIdName(value, tableValue)
451
451
  }),
452
452
  onClick: function onClick() {
453
453
  onChange(tableValue);
package/lib/es/components/modules/join-data.js CHANGED
@@ -477,7 +477,10 @@ var JoinData = function JoinData(props) {
477
477
  if (!isSameTableByIdFirst(meta.table2, data)) {
478
478
  var _store$preProps;
479
479
  var newMeta = cloneDeep(store.metaList[groupIndex].list);
480
- var alias = getAlias(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
480
+ var aliasMetaList = newMeta.filter(function (_, i) {
481
+ return i !== index;
482
+ });
483
+ var alias = getAlias(tableName, aliasMetaList, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
481
484
  var _table2 = _objectSpread(_objectSpread({}, data), {}, {
482
485
  name: tableName,
483
486
  tableUuid: data.tableUuid || uuidv4('table'),
package/lib/es/utils/helper.d.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  import type { MetaListType } from '../store/types';
2
+ export declare const isSameTableByIdName: (left?: any, right?: any) => boolean;
3
+ export declare const isSameColumnByIdName: (left?: any, right?: any) => boolean;
2
4
  export declare const getTableIdFirstKey: (table?: any) => string;
3
5
  export declare const isSameTableByIdFirst: (left?: any, right?: any) => boolean;
4
6
  export declare const getColumnIdFirstKey: (column?: any) => string;
package/lib/es/utils/helper.js CHANGED
@@ -7,6 +7,40 @@ var normalizeId = function normalizeId(val) {
7
7
  var hasBoth = function hasBoth(left, right) {
8
8
  return Boolean(left && right);
9
9
  };
10
+ var getTableIdNameParts = function getTableIdNameParts() {
11
+ var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
12
+ return {
13
+ id: normalizeId(table.id || table.tableId),
14
+ name: normalizeId(table.name || table.tableName || table.table)
15
+ };
16
+ };
17
+ var getColumnIdNameParts = function getColumnIdNameParts() {
18
+ var column = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
19
+ return {
20
+ id: normalizeId(column.fieldId || column.id),
21
+ name: normalizeId(column.fieldName || column.name)
22
+ };
23
+ };
24
+ export var isSameTableByIdName = function isSameTableByIdName() {
25
+ var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
26
+ var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
27
+ var leftIdentity = getTableIdNameParts(left);
28
+ var rightIdentity = getTableIdNameParts(right);
29
+ if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
30
+ return false;
31
+ }
32
+ return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
33
+ };
34
+ export var isSameColumnByIdName = function isSameColumnByIdName() {
35
+ var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
36
+ var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
37
+ var leftIdentity = getColumnIdNameParts(left);
38
+ var rightIdentity = getColumnIdNameParts(right);
39
+ if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
40
+ return false;
41
+ }
42
+ return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
43
+ };
10
44
  export var getTableIdFirstKey = function getTableIdFirstKey() {
11
45
  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
12
46
  var datasourceId = normalizeId(table.datasourceId);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.131",
3
+ "version": "1.0.133",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",