@gingkoo/pandora-metabase 1.0.130 → 1.0.131

package/lib/es/utils/helper.js

@@ -1,5 +1,106 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { TypeEnum } from '../store/enum';
+var normalizeId = function normalizeId(val) {
+  if (val === undefined || val === null) return '';
+  return "".concat(val);
+};
+var hasBoth = function hasBoth(left, right) {
+  return Boolean(left && right);
+};
+export var getTableIdFirstKey = function getTableIdFirstKey() {
+  var table = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var datasourceId = normalizeId(table.datasourceId);
+  var tableId = normalizeId(table.id || table.tableId);
+  if (tableId) return "".concat(datasourceId, "|id:").concat(tableId);
+  var tableUuid = normalizeId(table.tableUuid);
+  if (tableUuid) return "".concat(datasourceId, "|uuid:").concat(tableUuid);
+  var tableName = normalizeId(table.name || table.tableName);
+  var tableAlias = normalizeId(table.alias || table.tableAlias);
+  return tableName ? "".concat(datasourceId, "|name:").concat(tableName, "|alias:").concat(tableAlias) : 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] : {};
+  var leftDatasourceId = normalizeId(left.datasourceId);
+  var rightDatasourceId = normalizeId(right.datasourceId);
+  if (hasBoth(leftDatasourceId, rightDatasourceId) && leftDatasourceId !== rightDatasourceId) {
+    return false;
+  }
+  var leftTableId = normalizeId(left.id || left.tableId);
+  var rightTableId = normalizeId(right.id || right.tableId);
+  if (hasBoth(leftTableId, rightTableId)) {
+    return leftTableId === rightTableId;
+  }
+  var leftTableName = normalizeId(left.name || left.tableName);
+  var rightTableName = normalizeId(right.name || right.tableName);
+  if (hasBoth(leftTableName, rightTableName)) {
+    if (leftTableName !== rightTableName) {
+      return false;
+    }
+    var leftTableAlias = normalizeId(left.alias || left.tableAlias);
+    var rightTableAlias = normalizeId(right.alias || right.tableAlias);
+    if (hasBoth(leftTableAlias, rightTableAlias)) {
+      return leftTableAlias === rightTableAlias;
+    }
+    return true;
+  }
+  var leftTableUuid = normalizeId(left.tableUuid);
+  var rightTableUuid = normalizeId(right.tableUuid);
+  if (hasBoth(leftTableUuid, rightTableUuid)) {
+    return leftTableUuid === rightTableUuid;
+  }
+  return false;
+};
+export var getColumnIdFirstKey = function getColumnIdFirstKey() {
+  var column = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var tableKey = getTableIdFirstKey(column);
+  var fieldId = normalizeId(column.fieldId || column.id);
+  if (fieldId) return "".concat(tableKey, "|fieldId:").concat(fieldId);
+  var fieldUuid = normalizeId(column.fieldUuid);
+  if (fieldUuid) return "".concat(tableKey, "|fieldUuid:").concat(fieldUuid);
+  var fieldName = normalizeId(column.fieldName || column.name);
+  var fieldAlias = normalizeId(column.fieldAlias);
+  return fieldName ? "".concat(tableKey, "|fieldName:").concat(fieldName, "|alias:").concat(fieldAlias) : tableKey;
+};
+export var isSameColumnByIdFirst = function isSameColumnByIdFirst() {
+  var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var right = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var leftDatasourceId = normalizeId(left.datasourceId);
+  var rightDatasourceId = normalizeId(right.datasourceId);
+  if (hasBoth(leftDatasourceId, rightDatasourceId) && leftDatasourceId !== rightDatasourceId) {
+    return false;
+  }
+  var leftTableId = normalizeId(left.tableId);
+  var rightTableId = normalizeId(right.tableId);
+  if (hasBoth(leftTableId, rightTableId) && leftTableId !== rightTableId) {
+    return false;
+  }
+  var leftTableUuid = normalizeId(left.tableUuid);
+  var rightTableUuid = normalizeId(right.tableUuid);
+  if (hasBoth(leftTableUuid, rightTableUuid) && leftTableUuid !== rightTableUuid) {
+    var leftTableName = normalizeId(left.tableName || left.table);
+    var rightTableName = normalizeId(right.tableName || right.table);
+    if (!hasBoth(leftTableName, rightTableName) || leftTableName !== rightTableName) {
+      return false;
+    }
+  }
+  var leftFieldId = normalizeId(left.fieldId || left.id);
+  var rightFieldId = normalizeId(right.fieldId || right.id);
+  if (hasBoth(leftFieldId, rightFieldId)) {
+    return leftFieldId === rightFieldId;
+  }
+  var leftFieldUuid = normalizeId(left.fieldUuid);
+  var rightFieldUuid = normalizeId(right.fieldUuid);
+  if (hasBoth(leftFieldUuid, rightFieldUuid)) {
+    return leftFieldUuid === rightFieldUuid;
+  }
+  var leftFieldName = normalizeId(left.fieldName || left.name);
+  var rightFieldName = normalizeId(right.fieldName || right.name);
+  if (hasBoth(leftFieldName, rightFieldName)) {
+    return leftFieldName === rightFieldName;
+  }
+  return false;
+};
 export var throttle = function throttle(fn) {
   var wait = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
   if (typeof fn !== 'function') return function () {

package/lib/es/utils/transformSql.js

@@ -519,7 +519,6 @@ var _handleJoinData = function _handleJoinData(joinData) {
       tableName_zh: v.table2.name_zh,
       datasourceId: v.table2.datasourceId || '',
       datasourceName: v.table2.datasourceName || '',
-      datasourceType: v.table2.datasourceType || '',
       joinCondition: joinCondition,
       joinType: v.joinType,
       subQuery: subQuery,
@@ -563,7 +562,6 @@ var _handleNesting = function handleNesting(data) {
     obj.tableId = tableData.table.id;
     obj.datasourceId = tableData.table.datasourceId;
     obj.datasourceName = tableData.table.datasourceName;
-    obj.datasourceType = tableData.table.datasourceType;
     if (tableData.isSubquery && Array.isArray(tableData.subquery)) {
       obj.tableSubQuery = tableData.subquery;
     }

package/lib/es/utils.js

@@ -10,7 +10,7 @@ import { TypeEnum, SQL_COLUMN_TYPE } from './store/enum';
 import { AtomsTypeEnum } from './store/types';
 import { summarizeByToSql, summarizeToSql } from './store/helper';
 import { transformSql } from './utils/transformSql';
-import { uuidv4 } from './utils/helper';
+import { isSameColumnByIdFirst, isSameTableByIdFirst, uuidv4 } from './utils/helper';
 import cloneDeep from 'lodash/cloneDeep';
 import { patchMetas } from './hooks/patch';
 export var findIndex = function findIndex(arr, item) {
@@ -131,7 +131,7 @@ export var getSubColumns = function getSubColumns(metaList) {
       _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
         var _v$sql;
         return _objectSpread(_objectSpread({}, v), {}, {
-          name: v.fieldAlias || v.name || v.quotes,
+          name: v.name || v.quotes,
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
           realName: ((_v$sql = v.sql) === null || _v$sql === void 0 || (_v$sql = _v$sql.split(' AS ')) === null || _v$sql === void 0 ? void 0 : _v$sql[1]) || '',
@@ -145,7 +145,7 @@ export var getSubColumns = function getSubColumns(metaList) {
       _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
         var _v$sql2;
         return _objectSpread(_objectSpread({}, v), {}, {
-          name: v.fieldAlias || v.name || v.quotes,
+          name: v.name || v.quotes,
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
           realName: ((_v$sql2 = v.sql) === null || _v$sql2 === void 0 || (_v$sql2 = _v$sql2.split(' AS ')) === null || _v$sql2 === void 0 ? void 0 : _v$sql2[1]) || '',
@@ -171,7 +171,11 @@ export var getSubColumns = function getSubColumns(metaList) {
         });
         return {
           alias: v.table2.alias,
-          table: v.table2.name,
+          name: v.table2.name,
+          id: v.table2.id,
+          tableUuid: v.table2.tableUuid,
+          datasourceId: v.table2.datasourceId,
+          datasourceName: v.table2.datasourceName,
           columns: columns
         };
       }));
@@ -189,7 +193,11 @@ export var getSubColumns = function getSubColumns(metaList) {
         });
         return {
           alias: v.table.alias,
-          table: v.table.name,
+          name: v.table.name,
+          id: v.table.id,
+          tableUuid: v.table.tableUuid,
+          datasourceId: v.table.datasourceId,
+          datasourceName: v.table.datasourceName,
           columns: columns
         };
       } else if (v.type === TypeEnum.joinData) {
@@ -203,7 +211,11 @@ export var getSubColumns = function getSubColumns(metaList) {
         });
         return {
           alias: v.table2.alias,
-          table: v.table2.name,
+          name: v.table2.name,
+          id: v.table2.id,
+          tableUuid: v.table2.tableUuid,
+          datasourceId: v.table2.datasourceId,
+          datasourceName: v.table2.datasourceName,
           columns: _columns
         };
       } else if (v.type === TypeEnum.customColumn) {
@@ -222,7 +234,8 @@ export var getSubColumns = function getSubColumns(metaList) {
         return {
           columns: _columns2,
           alias: '',
-          table: __('SqlQueryBuilder.customColumn')
+          name: __('SqlQueryBuilder.customColumn'),
+          id: __('SqlQueryBuilder.customColumn')
         };
       } else {
         return {
@@ -808,8 +821,7 @@ var stripSummarizeTableFields = function stripSummarizeTableFields(record) {
     tableUuid: '',
     alias: '',
     datasourceId: '',
-    datasourceName: '',
-    datasourceType: ''
+    datasourceName: ''
   });
 };
 var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
@@ -827,7 +839,6 @@ var createSummarizeFieldAtom = function createSummarizeFieldAtom(record) {
     tableUuid: record.tableUuid || '',
     datasourceName: record.datasourceName || '',
     datasourceId: record.datasourceId || '',
-    datasourceType: record.datasourceType || '',
     type: AtomsTypeEnum.FIELD
   };
 };
@@ -986,17 +997,21 @@ var _isError = function isError(item, data) {
         return true;
       } else {
         var _tables$_datasourceId2;
-        return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
-          if (field.id === undefined) {
-            return field.name !== fieldName;
-          }
-          return field.name !== fieldName || field.id !== fieldId;
+        var fields = (tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2[tableId + tableAlias]) || [];
+        return fields.every(function (field) {
+          return !isSameColumnByIdFirst(_objectSpread(_objectSpread({}, field), {}, {
+            datasourceId: _datasourceId,
+            tableId: tableId
+          }), item);
         });
       }
     } else {
       var _tables$_datasourceId3, _tables$_datasourceId4;
       var hasField = (_tables$_datasourceId3 = tables === null || tables === void 0 || (_tables$_datasourceId4 = tables[_datasourceId]) === null || _tables$_datasourceId4 === void 0 || (_tables$_datasourceId4 = _tables$_datasourceId4[tableId + tableAlias]) === null || _tables$_datasourceId4 === void 0 ? void 0 : _tables$_datasourceId4.some(function (v) {
-        return v.name === fieldName && (v.id === undefined || v.id === fieldId);
+        return isSameColumnByIdFirst(_objectSpread(_objectSpread({}, v), {}, {
+          datasourceId: _datasourceId,
+          tableId: tableId
+        }), item);
       })) !== null && _tables$_datasourceId3 !== void 0 ? _tables$_datasourceId3 : false;
       return !hasField;
     }
@@ -1085,19 +1100,24 @@ function setNewField(field, data) {
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var table = _step3.value;
-      if (table.name !== field.tableName) {
+      if (!isSameTableByIdFirst(table, {
+        datasourceId: field.datasourceId,
+        id: field.tableId,
+        name: field.tableName,
+        alias: field.tableAlias,
+        tableUuid: field.tableUuid
+      })) {
         continue;
       }
       field.datasourceId = table.datasourceId || '';
       field.datasourceName = table.datasourceName || '';
-      field.datasourceType = table.datasourceType || '';
       field.tableId = table.id || '';
       field.tableName = table.name || '';
       field.tableAlias = table.alias || '';
       field.tableUuid = table.tableUuid || '';
       field.tableNameZh = table.name_zh || '';
       var matchedColumn = table.columns.find(function (col) {
-        return col.name === field.fieldName;
+        return isSameColumnByIdFirst(col, field);
       });
       if (matchedColumn) {
         field.fieldId = matchedColumn.id || '';

package/package.json

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