@gingkoo/pandora-metabase 1.0.143-alpha.0 → 1.0.143-alpha.2

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

@@ -85,7 +85,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 })]
               })
             })
-          }, (0, _helper.getTableIdFirstKey)(v));
+          }, (0, _helper.getTableIdNameKey)(v));
         })]
       })
     })

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

@@ -351,7 +351,7 @@ var SelectTable = function SelectTable(_ref) {
                       })]
                     })
                   })
-                }, (0, _helper.getTableIdFirstKey)(tableValue));
+                }, (0, _helper.getTableIdNameKey)(tableValue));
               }))]
             }, table.datasourceId);
           })]
@@ -473,7 +473,7 @@ var SelectTable = function SelectTable(_ref) {
                   })]
                 })
               })
-            }, (0, _helper.getTableIdFirstKey)(tableValue));
+            }, (0, _helper.getTableIdNameKey)(tableValue));
           })]
         })]
       })

package/lib/cjs/components/modules/join-data.js

@@ -112,7 +112,7 @@ var JoinData = function JoinData(props) {
           case 2:
             tables = _context.sent;
             if (!(tables !== null && tables !== void 0 && tables.some(function (v) {
-              return (0, _helper.isSameTableByIdFirst)(tableInfo, v);
+              return (0, _helper.isSameTableByIdName)(tableInfo, v);
             }))) {
               setIsDel(true);
             } else {
@@ -501,7 +501,7 @@ var JoinData = function JoinData(props) {
         value: value,
         onChange: function onChange(data) {
           var tableName = data.name;
-          if (!(0, _helper.isSameTableByIdFirst)(meta.table2, data)) {
+          if (!(0, _helper.isSameTableByIdName)(meta.table2, data)) {
             var _store$preProps;
             var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
             var aliasMetaList = newMeta.filter(function (_, i) {

package/lib/cjs/components/modules/permission-table.js

@@ -96,7 +96,7 @@ var PermissionTable = function PermissionTable(props) {
         data: data,
         value: meta.table,
         onChange: function onChange(data) {
-          if (!(0, _helper.isSameTableByIdFirst)(meta.table, data)) {
+          if (!(0, _helper.isSameTableByIdName)(meta.table, data)) {
             meta.table = data;
           }
           store.setPopup({

package/lib/cjs/components/modules/table-data.js

@@ -62,7 +62,7 @@ var TableData = function TableData(props) {
           case 2:
             tables = _context.sent;
             if (!(tables !== null && tables !== void 0 && tables.some(function (v) {
-              return (0, _helper.isSameTableByIdFirst)(tableInfo, v);
+              return (0, _helper.isSameTableByIdName)(tableInfo, v);
             }))) {
               setIsDel(true);
             } else {
@@ -93,7 +93,7 @@ var TableData = function TableData(props) {
         sourceTable: store.sourceTable || [],
         value: meta.table,
         onChange: function onChange(data) {
-          if (!(0, _helper.isSameTableByIdFirst)(meta.table, data)) {
+          if (!(0, _helper.isSameTableByIdName)(meta.table, data)) {
             var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];
             newMetaList.table = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {

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

@@ -2,6 +2,7 @@ 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 getTableIdNameKey: (table?: any) => string;
 export declare const isSameTableByIdFirst: (left?: any, right?: any) => boolean;
 export declare const getColumnIdFirstKey: (column?: any) => string;
 export declare const isSameColumnByIdFirst: (left?: any, right?: any) => boolean;

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.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;
+exports.uuidv4 = exports.throttle = exports.sleep = exports.replaceTpl = exports.mobx2Object = exports.mergeNameAlias = exports.isSameTableByIdName = exports.isSameTableByIdFirst = exports.isSameColumnByIdName = exports.isSameColumnByIdFirst = exports.getUrlParams = exports.getTableIdNameKey = 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) {
@@ -59,6 +59,18 @@ var getTableIdFirstKey = exports.getTableIdFirstKey = function getTableIdFirstKe
   var tableAlias = normalizeId(table.alias || table.tableAlias);
   return tableName ? "".concat(datasourceId, "|name:").concat(tableName, "|alias:").concat(tableAlias) : datasourceId;
 };
+var getTableIdNameKey = exports.getTableIdNameKey = function getTableIdNameKey() {
+  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var datasourceId = normalizeId(table.datasourceId);
+  var tableId = normalizeId(table.id || table.tableId);
+  var tableName = normalizeId(table.name || table.tableName || table.table);
+  var tableAlias = normalizeId(table.alias || table.tableAlias);
+  if (tableId || tableName) {
+    return "".concat(datasourceId, "|id:").concat(tableId, "|name:").concat(tableName, "|alias:").concat(tableAlias);
+  }
+  var tableUuid = normalizeId(table.tableUuid);
+  return tableUuid ? "".concat(datasourceId, "|uuid:").concat(tableUuid) : datasourceId;
+};
 var isSameTableByIdFirst = exports.isSameTableByIdFirst = function isSameTableByIdFirst() {
   var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

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, isSameTableByIdName, mergeNameAlias } from '../../../utils/helper';
+import { getTableIdNameKey, isSameTableByIdName, mergeNameAlias } from '../../../utils/helper';
 var PrevResult = 'Previous results';
 var SelectPermissionTable = function SelectPermissionTable(_ref) {
   var _ref$data = _ref.data,
@@ -78,7 +78,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 })]
               })
             })
-          }, getTableIdFirstKey(v));
+          }, getTableIdNameKey(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, isSameTableByIdName, uuidv4 } from '../../../utils/helper';
+import { getTableIdNameKey, isSameTableByIdName, uuidv4 } from '../../../utils/helper';
 import { useStore } from '../../../hooks/use-provider';
 import Loading from '../../../common/Loading';
 import { __ } from '../../../locale';
@@ -343,7 +343,7 @@ var SelectTable = function SelectTable(_ref) {
                       })]
                     })
                   })
-                }, getTableIdFirstKey(tableValue));
+                }, getTableIdNameKey(tableValue));
               }))]
             }, table.datasourceId);
           })]
@@ -465,7 +465,7 @@ var SelectTable = function SelectTable(_ref) {
                   })]
                 })
               })
-            }, getTableIdFirstKey(tableValue));
+            }, getTableIdNameKey(tableValue));
           })]
         })]
       })

package/lib/es/components/modules/join-data.js

@@ -12,7 +12,7 @@ import { Button, Tooltip, Input, Modal2, Modal, Toast, Dropdown, InputNumber } f
 import { FfPlus, FfLine, Repeat, RelatedWork } from '@gingkoo/pandora-icons';
 import Metabase from '../../index';
 import cloneDeep from 'lodash/cloneDeep';
-import { uuidv4, getAlias, mergeNameAlias, isSameTableByIdFirst } from '../../utils/helper';
+import { uuidv4, getAlias, mergeNameAlias, isSameTableByIdName } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { getConstantLabel } from '../dialog/formula-list/utils';
 import { __ } from '../../locale';
@@ -107,7 +107,7 @@ var JoinData = function JoinData(props) {
           case 2:
             tables = _context.sent;
             if (!(tables !== null && tables !== void 0 && tables.some(function (v) {
-              return isSameTableByIdFirst(tableInfo, v);
+              return isSameTableByIdName(tableInfo, v);
             }))) {
               setIsDel(true);
             } else {
@@ -496,7 +496,7 @@ var JoinData = function JoinData(props) {
         value: value,
         onChange: function onChange(data) {
           var tableName = data.name;
-          if (!isSameTableByIdFirst(meta.table2, data)) {
+          if (!isSameTableByIdName(meta.table2, data)) {
             var _store$preProps;
             var newMeta = cloneDeep(store.metaList[groupIndex].list);
             var aliasMetaList = newMeta.filter(function (_, i) {

package/lib/es/components/modules/permission-table.js

@@ -10,7 +10,7 @@ import NextDom from './components/meta-icon';
 import Header from './components/header';
 import ItemWrapper from './components/item-wrapper';
 import { useStore } from '../../hooks/use-provider';
-import { isSameTableByIdFirst, uuidv4 } from '../../utils/helper';
+import { isSameTableByIdName, uuidv4 } from '../../utils/helper';
 import ItemName from './components/item-name';
 import { SummarizeAlias } from '../../store/helper';
 var PrevResult = 'Previous results';
@@ -90,7 +90,7 @@ var PermissionTable = function PermissionTable(props) {
         data: data,
         value: meta.table,
         onChange: function onChange(data) {
-          if (!isSameTableByIdFirst(meta.table, data)) {
+          if (!isSameTableByIdName(meta.table, data)) {
             meta.table = data;
           }
           store.setPopup({

package/lib/es/components/modules/table-data.js

@@ -12,7 +12,7 @@ import { __ } from '../../locale';
 import { ChangeType } from '../../store/types';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
-import { uuidv4, getAlias, isSameTableByIdFirst } from '../../utils/helper';
+import { uuidv4, getAlias, isSameTableByIdName } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { changeTableAlias, getSubColumns, mergeSubQueryColumns, isValidSQLAlias, isExistsError, syncSubQueryFieldReferences } from '../../utils';
 import { RelatedWork } from '@gingkoo/pandora-icons';
@@ -56,7 +56,7 @@ var TableData = function TableData(props) {
           case 2:
             tables = _context.sent;
             if (!(tables !== null && tables !== void 0 && tables.some(function (v) {
-              return isSameTableByIdFirst(tableInfo, v);
+              return isSameTableByIdName(tableInfo, v);
             }))) {
               setIsDel(true);
             } else {
@@ -87,7 +87,7 @@ var TableData = function TableData(props) {
         sourceTable: store.sourceTable || [],
         value: meta.table,
         onChange: function onChange(data) {
-          if (!isSameTableByIdFirst(meta.table, data)) {
+          if (!isSameTableByIdName(meta.table, data)) {
             var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];
             newMetaList.table = _objectSpread(_objectSpread({}, data), {}, {

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

@@ -2,6 +2,7 @@ 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 getTableIdNameKey: (table?: any) => string;
 export declare const isSameTableByIdFirst: (left?: any, right?: any) => boolean;
 export declare const getColumnIdFirstKey: (column?: any) => string;
 export declare const isSameColumnByIdFirst: (left?: any, right?: any) => boolean;

package/lib/es/utils/helper.js

@@ -52,6 +52,18 @@ export var getTableIdFirstKey = function getTableIdFirstKey() {
   var tableAlias = normalizeId(table.alias || table.tableAlias);
   return tableName ? "".concat(datasourceId, "|name:").concat(tableName, "|alias:").concat(tableAlias) : datasourceId;
 };
+export var getTableIdNameKey = function getTableIdNameKey() {
+  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var datasourceId = normalizeId(table.datasourceId);
+  var tableId = normalizeId(table.id || table.tableId);
+  var tableName = normalizeId(table.name || table.tableName || table.table);
+  var tableAlias = normalizeId(table.alias || table.tableAlias);
+  if (tableId || tableName) {
+    return "".concat(datasourceId, "|id:").concat(tableId, "|name:").concat(tableName, "|alias:").concat(tableAlias);
+  }
+  var tableUuid = normalizeId(table.tableUuid);
+  return tableUuid ? "".concat(datasourceId, "|uuid:").concat(tableUuid) : datasourceId;
+};
 export var isSameTableByIdFirst = function isSameTableByIdFirst() {
   var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.143-alpha.0",
+  "version": "1.0.143-alpha.2",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",