@gingkoo/pandora-metabase 1.0.132 → 1.0.134

package/lib/cjs/components/dialog/select-column/index.js

@@ -79,7 +79,7 @@ var SelectColumn = function SelectColumn(_ref) {
     var originalData = (0, _cloneDeep["default"])(originList);
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
-        return (0, _helper.isSameColumnByIdFirst)(col, item);
+        return (0, _helper.isSameColumnByIdName)(col, item);
       });
       return match ? (0, _cloneDeep["default"])(match) : item;
     });

package/lib/cjs/components/dialog/select-column-multiple/index.js

@@ -100,15 +100,13 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var getSelectedFieldKey = function getSelectedFieldKey(field) {
     if (!field) return '';
     var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
-    var fieldKey = field.tableId === _helper.SummarizeAlias ? field.fieldAlias || '' : "".concat(field.fieldId).concat(field.fieldAlias || '');
+    var fieldKey = "".concat(field.fieldId || '', "|").concat(field.fieldName || '');
     return "".concat(tableKey, "|").concat(fieldKey);
   };
   var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
     var tableKey = getFieldTableKey(tableId, tableUuid);
-    if (isSummarizeColumn) {
-      return "".concat(tableKey, "|").concat(column.fieldAlias || column.name || '');
-    }
-    return "".concat(tableKey, "|").concat(column.id || column.name).concat(column.fieldAlias || '');
+    var fieldKey = "".concat(column.id || '', "|").concat(column.name || '');
+    return "".concat(tableKey, "|").concat(fieldKey);
   };
   var isActive = function isActive(id_alias, tableId, tableUuid) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
@@ -164,9 +162,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       onSelect === null || onSelect === void 0 || onSelect(_data, getQuotes(_data));
       return;
     }
-    var selectedKey = getSelectedFieldKey(val);
     var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey;
+      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdName)(v, val);
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != curTable) {
@@ -181,7 +178,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey);
+        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdName)(v, val));
       });
     }
     var curTableItem = data.find(function (v) {
@@ -192,7 +189,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _value = _value.filter(function (item2) {
       return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
         if (item2.tableId === _helper.SummarizeAlias) {
-          return (item1.fieldAlias || item1.name) === item2.fieldAlias;
+          return (0, _helper2.isSameColumnByIdName)(item2, item1);
         }
         return (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, item1), {}, {
           tableId: curTableId,
@@ -287,11 +284,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   if (isGroup) {
                     changeValue(tableUuid);
                   }
-                  if (tableUuid !== curTable) {
-                    setCurTable(tableUuid);
-                    setValue([]);
-                    onSelect === null || onSelect === void 0 || onSelect([], '');
-                  }
                   if (!isMultiple) return void 0;
                   var newTables = (0, _cloneDeep["default"])(tableList);
                   if (open) {
@@ -354,8 +346,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   name = v.name;
                 var columnKey = getColumnKey(v, isSummarize, tableId || '', tableUuid);
                 var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
-                var fieldName = isSummarize ? '' : name || '';
-                var fieldId = isSummarize ? '' : v.id || name || '';
+                var fieldName = name || '';
+                var fieldId = v.id || '';
                 var fieldNameZh = isSummarize ? '' : v.name_zh || '';
                 var groupe = _enum.SQL_GROUP_TYPE.STRING;
                 if (~_const.NUMBER_GROUP.indexOf(database_type)) {

package/lib/cjs/components/dialog/select-join-column/index.js

@@ -251,7 +251,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
               if (~_const.DATE_GROUP.indexOf(database_type)) {
                 groupe = _enum.SQL_GROUP_TYPE.DATE;
               }
-              var showCondition = (0, _helper2.isSameColumnByIdFirst)(curColumn, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+              var showCondition = (0, _helper2.isSameColumnByIdName)(curColumn, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
                 tableId: tableId,
                 tableUuid: tableUuid,
                 datasourceId: datasourceId
@@ -260,7 +260,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 className: (0, _classnames["default"])("Sqb-List-section"),
                 children: (0, _jsxRuntime.jsxs)("div", {
                   className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                    active: curTable === tableUuid && (0, _helper2.isSameColumnByIdFirst)(value, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                    active: curTable === tableUuid && (0, _helper2.isSameColumnByIdName)(value, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
                       tableId: tableId,
                       tableUuid: tableUuid,
                       datasourceId: datasourceId

package/lib/cjs/components/dialog/select-join-column-multiple/index.js

@@ -76,7 +76,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   }, [_value]);
   var isActive = function isActive(field) {
     return value.filter(function (v) {
-      return (0, _helper2.isSameColumnByIdFirst)(v, field);
+      return (0, _helper2.isSameColumnByIdName)(v, field);
     }).length > 0;
   };
   (0, _react.useEffect)(function () {
@@ -109,7 +109,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   }
   var changeValue = function changeValue(table, val) {
     var isHas = value.filter(function (v) {
-      return (0, _helper2.isSameColumnByIdFirst)(v, val);
+      return (0, _helper2.isSameColumnByIdName)(v, val);
     }).length > 0;
     var _value = (0, _toConsumableArray2["default"])(value);
     if (table.tableUuid != curTable.tableUuid) {
@@ -119,7 +119,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return !(0, _helper2.isSameColumnByIdFirst)(v, val);
+        return !(0, _helper2.isSameColumnByIdName)(v, val);
       });
     }
     setValue(_value);
@@ -240,6 +240,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   onClick: function onClick() {
                     changeValue(tableItem, {
                       fieldId: fieldId || v.id,
+                      fieldName: v.name,
                       fieldAlias: v.fieldAlias || v.name,
                       fieldUuid: v.fieldUuid,
                       quotes: v.fieldAlias || v.name

package/lib/cjs/components/dialog/select-permission-table/index.js

@@ -67,7 +67,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
             className: (0, _classnames["default"])("Sqb-List-section"),
             children: (0, _jsxRuntime.jsx)("div", {
               className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                active: (0, _helper.isSameTableByIdFirst)(value, v)
+                active: (0, _helper.isSameTableByIdName)(value, v)
               }),
               onClick: function onClick() {
                 onChange(v);

package/lib/cjs/components/dialog/select-table/index.js

@@ -333,7 +333,7 @@ var SelectTable = function SelectTable(_ref) {
                   className: (0, _classnames["default"])("Sqb-List-section"),
                   children: (0, _jsxRuntime.jsx)("div", {
                     className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                      active: (0, _helper.isSameTableByIdFirst)(value, tableValue)
+                      active: (0, _helper.isSameTableByIdName)(value, tableValue)
                     }),
                     onClick: function onClick() {
                       onChange(tableValue);
@@ -455,7 +455,7 @@ var SelectTable = function SelectTable(_ref) {
               className: (0, _classnames["default"])("Sqb-List-section"),
               children: (0, _jsxRuntime.jsx)("div", {
                 className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                  active: (0, _helper.isSameTableByIdFirst)(value, tableValue)
+                  active: (0, _helper.isSameTableByIdName)(value, tableValue)
                 }),
                 onClick: function onClick() {
                   onChange(tableValue);

package/lib/cjs/utils/helper.d.ts

@@ -1,4 +1,6 @@
 import type { MetaListType } from '../store/types';
+export declare const isSameTableByIdName: (left?: any, right?: any) => boolean;
+export declare const isSameColumnByIdName: (left?: any, right?: any) => boolean;
 export declare const getTableIdFirstKey: (table?: any) => string;
 export declare const isSameTableByIdFirst: (left?: any, right?: any) => boolean;
 export declare const getColumnIdFirstKey: (column?: any) => string;

package/lib/cjs/utils/helper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+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;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _enum = require("../store/enum");
 var normalizeId = function normalizeId(val) {
@@ -14,6 +14,40 @@ var normalizeId = function normalizeId(val) {
 var hasBoth = function hasBoth(left, right) {
   return Boolean(left && right);
 };
+var getTableIdNameParts = function getTableIdNameParts() {
+  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return {
+    id: normalizeId(table.id || table.tableId),
+    name: normalizeId(table.name || table.tableName || table.table)
+  };
+};
+var getColumnIdNameParts = function getColumnIdNameParts() {
+  var column = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return {
+    id: normalizeId(column.fieldId || column.id),
+    name: normalizeId(column.fieldName || column.name)
+  };
+};
+var isSameTableByIdName = exports.isSameTableByIdName = function isSameTableByIdName() {
+  var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var leftIdentity = getTableIdNameParts(left);
+  var rightIdentity = getTableIdNameParts(right);
+  if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
+    return false;
+  }
+  return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
+};
+var isSameColumnByIdName = exports.isSameColumnByIdName = function isSameColumnByIdName() {
+  var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var leftIdentity = getColumnIdNameParts(left);
+  var rightIdentity = getColumnIdNameParts(right);
+  if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
+    return false;
+  }
+  return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
+};
 var getTableIdFirstKey = exports.getTableIdFirstKey = function getTableIdFirstKey() {
   var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var datasourceId = normalizeId(table.datasourceId);

package/lib/es/components/dialog/select-column/index.js

@@ -12,7 +12,7 @@ import { ChangeType } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NotSelectIcon, SelectIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
-import { getColumnIdFirstKey, isSameColumnByIdFirst, uuidv4 } from '../../../utils/helper';
+import { getColumnIdFirstKey, isSameColumnByIdName, uuidv4 } from '../../../utils/helper';
 import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
 import { SearchIcon } from '../../icons';
 var SelectColumn = function SelectColumn(_ref) {
@@ -73,7 +73,7 @@ var SelectColumn = function SelectColumn(_ref) {
     var originalData = cloneDeep(originList);
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
-        return isSameColumnByIdFirst(col, item);
+        return isSameColumnByIdName(col, item);
       });
       return match ? cloneDeep(match) : item;
     });

package/lib/es/components/dialog/select-column-multiple/index.js

@@ -13,7 +13,7 @@ import { AtomsTypeEnum } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { isSameColumnByIdFirst, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
+import { isSameColumnByIdFirst, isSameColumnByIdName, replaceTpl, mergeNameAlias, uuidv4 } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -94,15 +94,13 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var getSelectedFieldKey = function getSelectedFieldKey(field) {
     if (!field) return '';
     var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
-    var fieldKey = field.tableId === SummarizeAlias ? field.fieldAlias || '' : "".concat(field.fieldId).concat(field.fieldAlias || '');
+    var fieldKey = "".concat(field.fieldId || '', "|").concat(field.fieldName || '');
     return "".concat(tableKey, "|").concat(fieldKey);
   };
   var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
     var tableKey = getFieldTableKey(tableId, tableUuid);
-    if (isSummarizeColumn) {
-      return "".concat(tableKey, "|").concat(column.fieldAlias || column.name || '');
-    }
-    return "".concat(tableKey, "|").concat(column.id || column.name).concat(column.fieldAlias || '');
+    var fieldKey = "".concat(column.id || '', "|").concat(column.name || '');
+    return "".concat(tableKey, "|").concat(fieldKey);
   };
   var isActive = function isActive(id_alias, tableId, tableUuid) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
@@ -158,9 +156,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       onSelect === null || onSelect === void 0 || onSelect(_data, getQuotes(_data));
       return;
     }
-    var selectedKey = getSelectedFieldKey(val);
     var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey;
+      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdName(v, val);
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != curTable) {
@@ -175,7 +172,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey);
+        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && isSameColumnByIdName(v, val));
       });
     }
     var curTableItem = data.find(function (v) {
@@ -186,7 +183,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _value = _value.filter(function (item2) {
       return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
         if (item2.tableId === SummarizeAlias) {
-          return (item1.fieldAlias || item1.name) === item2.fieldAlias;
+          return isSameColumnByIdName(item2, item1);
         }
         return isSameColumnByIdFirst(_objectSpread(_objectSpread({}, item1), {}, {
           tableId: curTableId,
@@ -281,11 +278,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   if (isGroup) {
                     changeValue(tableUuid);
                   }
-                  if (tableUuid !== curTable) {
-                    setCurTable(tableUuid);
-                    setValue([]);
-                    onSelect === null || onSelect === void 0 || onSelect([], '');
-                  }
                   if (!isMultiple) return void 0;
                   var newTables = cloneDeep(tableList);
                   if (open) {
@@ -348,8 +340,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   name = v.name;
                 var columnKey = getColumnKey(v, isSummarize, tableId || '', tableUuid);
                 var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
-                var fieldName = isSummarize ? '' : name || '';
-                var fieldId = isSummarize ? '' : v.id || name || '';
+                var fieldName = name || '';
+                var fieldId = v.id || '';
                 var fieldNameZh = isSummarize ? '' : v.name_zh || '';
                 var groupe = SQL_GROUP_TYPE.STRING;
                 if (~NUMBER_GROUP.indexOf(database_type)) {

package/lib/es/components/dialog/select-join-column/index.js

@@ -11,7 +11,7 @@ import { SummarizeAlias } from '../../../store/helper';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { getColumnIdFirstKey, isSameColumnByIdFirst, replaceTpl, mergeNameAlias } from '../../../utils/helper';
+import { getColumnIdFirstKey, isSameColumnByIdName, replaceTpl, mergeNameAlias } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2, RightArrowIcon } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -244,7 +244,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
               if (~DATE_GROUP.indexOf(database_type)) {
                 groupe = SQL_GROUP_TYPE.DATE;
               }
-              var showCondition = isSameColumnByIdFirst(curColumn, _objectSpread(_objectSpread({}, v), {}, {
+              var showCondition = isSameColumnByIdName(curColumn, _objectSpread(_objectSpread({}, v), {}, {
                 tableId: tableId,
                 tableUuid: tableUuid,
                 datasourceId: datasourceId
@@ -253,7 +253,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 className: cx("Sqb-List-section"),
                 children: _jsxs("div", {
                   className: cx("Sqb-List-item mx-2", {
-                    active: curTable === tableUuid && isSameColumnByIdFirst(value, _objectSpread(_objectSpread({}, v), {}, {
+                    active: curTable === tableUuid && isSameColumnByIdName(value, _objectSpread(_objectSpread({}, v), {}, {
                       tableId: tableId,
                       tableUuid: tableUuid,
                       datasourceId: datasourceId

package/lib/es/components/dialog/select-join-column-multiple/index.js

@@ -11,7 +11,7 @@ import { SummarizeAlias } from '../../../store/helper';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { getColumnIdFirstKey, isSameColumnByIdFirst, replaceTpl, mergeNameAlias } from '../../../utils/helper';
+import { getColumnIdFirstKey, isSameColumnByIdName, replaceTpl, mergeNameAlias } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -69,7 +69,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   }, [_value]);
   var isActive = function isActive(field) {
     return value.filter(function (v) {
-      return isSameColumnByIdFirst(v, field);
+      return isSameColumnByIdName(v, field);
     }).length > 0;
   };
   useEffect(function () {
@@ -102,7 +102,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   }
   var changeValue = function changeValue(table, val) {
     var isHas = value.filter(function (v) {
-      return isSameColumnByIdFirst(v, val);
+      return isSameColumnByIdName(v, val);
     }).length > 0;
     var _value = _toConsumableArray(value);
     if (table.tableUuid != curTable.tableUuid) {
@@ -112,7 +112,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return !isSameColumnByIdFirst(v, val);
+        return !isSameColumnByIdName(v, val);
       });
     }
     setValue(_value);
@@ -233,6 +233,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   onClick: function onClick() {
                     changeValue(tableItem, {
                       fieldId: fieldId || v.id,
+                      fieldName: v.name,
                       fieldAlias: v.fieldAlias || v.name,
                       fieldUuid: v.fieldUuid,
                       quotes: v.fieldAlias || v.name

package/lib/es/components/dialog/select-permission-table/index.js

@@ -6,7 +6,7 @@ import cx from 'classnames';
 import cloneDeep from 'lodash/cloneDeep';
 import { __ } from '../../../locale';
 import { TableIcon, SearchIcon } from '../../icons';
-import { getTableIdFirstKey, isSameTableByIdFirst, mergeNameAlias } from '../../../utils/helper';
+import { getTableIdFirstKey, isSameTableByIdName, mergeNameAlias } from '../../../utils/helper';
 var PrevResult = 'Previous results';
 var SelectPermissionTable = function SelectPermissionTable(_ref) {
   var _ref$data = _ref.data,
@@ -60,7 +60,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
             className: cx("Sqb-List-section"),
             children: _jsx("div", {
               className: cx("Sqb-List-item mx-2", {
-                active: isSameTableByIdFirst(value, v)
+                active: isSameTableByIdName(value, v)
               }),
               onClick: function onClick() {
                 onChange(v);

package/lib/es/components/dialog/select-table/index.js

@@ -8,7 +8,7 @@ import './index.less';
 import React, { useState, useEffect, useMemo, useRef } from 'react';
 import cx from 'classnames';
 import { Tag } from '@gingkoo/pandora';
-import { getTableIdFirstKey, isSameTableByIdFirst, uuidv4 } from '../../../utils/helper';
+import { getTableIdFirstKey, isSameTableByIdName, uuidv4 } from '../../../utils/helper';
 import { useStore } from '../../../hooks/use-provider';
 import Loading from '../../../common/Loading';
 import { __ } from '../../../locale';
@@ -325,7 +325,7 @@ var SelectTable = function SelectTable(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: isSameTableByIdFirst(value, tableValue)
+                      active: isSameTableByIdName(value, tableValue)
                     }),
                     onClick: function onClick() {
                       onChange(tableValue);
@@ -447,7 +447,7 @@ var SelectTable = function SelectTable(_ref) {
               className: cx("Sqb-List-section"),
               children: _jsx("div", {
                 className: cx("Sqb-List-item mx-2", {
-                  active: isSameTableByIdFirst(value, tableValue)
+                  active: isSameTableByIdName(value, tableValue)
                 }),
                 onClick: function onClick() {
                   onChange(tableValue);

package/lib/es/utils/helper.d.ts

@@ -1,4 +1,6 @@
 import type { MetaListType } from '../store/types';
+export declare const isSameTableByIdName: (left?: any, right?: any) => boolean;
+export declare const isSameColumnByIdName: (left?: any, right?: any) => boolean;
 export declare const getTableIdFirstKey: (table?: any) => string;
 export declare const isSameTableByIdFirst: (left?: any, right?: any) => boolean;
 export declare const getColumnIdFirstKey: (column?: any) => string;

package/lib/es/utils/helper.js

@@ -7,6 +7,40 @@ var normalizeId = function normalizeId(val) {
 var hasBoth = function hasBoth(left, right) {
   return Boolean(left && right);
 };
+var getTableIdNameParts = function getTableIdNameParts() {
+  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return {
+    id: normalizeId(table.id || table.tableId),
+    name: normalizeId(table.name || table.tableName || table.table)
+  };
+};
+var getColumnIdNameParts = function getColumnIdNameParts() {
+  var column = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return {
+    id: normalizeId(column.fieldId || column.id),
+    name: normalizeId(column.fieldName || column.name)
+  };
+};
+export var isSameTableByIdName = function isSameTableByIdName() {
+  var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var leftIdentity = getTableIdNameParts(left);
+  var rightIdentity = getTableIdNameParts(right);
+  if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
+    return false;
+  }
+  return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
+};
+export var isSameColumnByIdName = function isSameColumnByIdName() {
+  var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var leftIdentity = getColumnIdNameParts(left);
+  var rightIdentity = getColumnIdNameParts(right);
+  if (!(leftIdentity.id || leftIdentity.name) || !(rightIdentity.id || rightIdentity.name)) {
+    return false;
+  }
+  return leftIdentity.id === rightIdentity.id && leftIdentity.name === rightIdentity.name;
+};
 export var getTableIdFirstKey = function getTableIdFirstKey() {
   var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var datasourceId = normalizeId(table.datasourceId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.132",
+  "version": "1.0.134",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",