@gingkoo/pandora-metabase 1.0.137 → 1.0.139

package/lib/es/components/metabase/helper.less

@@ -1,3 +1,39 @@
+.scroller::-webkit-scrollbar {
+  width: 4px;
+  height: 100%;
+  background: transparent;
+}
+
+.scroller::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
+.scroller-x::-webkit-scrollbar {
+  width: 100%;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller.scroller-x::-webkit-scrollbar {
+  width: 4px;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller-x::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
 .mx-4 {
   margin-left: 1rem;
   margin-right: 1rem;

package/lib/es/components/metabase/index.js

@@ -17,7 +17,7 @@ import Popup from '../popup';
 import { useStore } from '../../hooks/use-provider';
 import storage from '../../utils/storage';
 var VisualBox = Styled.div.attrs({
-  className: 'visual-box'
+  className: 'visual-box scroller'
 })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
 var Metabase = function Metabase(props) {
   var _props$btnText = props.btnText,

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

@@ -32,7 +32,19 @@ import { SelectTable, SelectJoin, SelectColumnMultiple, SelectColumn, Expression
 import { ExclamationCircleFill } from '@gingkoo/pandora-icons';
 import { useStore } from '../../hooks/use-provider';
 var PrevResult = 'Previous results';
-var operators = ['AND', 'OR', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='];
+var normalizeJoinOperator = function normalizeJoinOperator(val) {
+  return String(val).toUpperCase() === 'OR' ? 'OR' : 'AND';
+};
+var isJoinOperator = function isJoinOperator(item) {
+  return (item === null || item === void 0 ? void 0 : item.type) === AtomsTypeEnum.OPERATOR;
+};
+var menuJoinOperator = [{
+  key: 'AND',
+  label: 'AND'
+}, {
+  key: 'OR',
+  label: 'OR'
+}];
 var FlagLocation;
 (function (FlagLocation) {
   FlagLocation["TABLE_1"] = "table1";
@@ -44,7 +56,7 @@ var ExpressionsEnum;
   ExpressionsEnum["RIGHT"] = "rhs";
 })(ExpressionsEnum || (ExpressionsEnum = {}));
 var getText = function getText(v) {
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), AtomsTypeEnum.EXPRESSION, 'joinData.expression'), AtomsTypeEnum.OPERATOR, 'customColumn.operator'), AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
+  return _defineProperty(_defineProperty(_defineProperty({}, AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), AtomsTypeEnum.EXPRESSION, 'joinData.expression'), AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
 };
 var menuTypes = [{
   key: AtomsTypeEnum.JOIN_DEFAULT,
@@ -52,19 +64,10 @@ var menuTypes = [{
 }, {
   key: AtomsTypeEnum.EXPRESSION,
   label: __(getText(AtomsTypeEnum.EXPRESSION))
-}, {
-  key: AtomsTypeEnum.OPERATOR,
-  label: __(getText(AtomsTypeEnum.OPERATOR))
 }, {
   key: AtomsTypeEnum.COLLECTION,
   label: __(getText(AtomsTypeEnum.COLLECTION))
 }];
-var menuOperator = operators.map(function (v) {
-  return {
-    key: v,
-    label: v
-  };
-});
 var JoinData = function JoinData(props) {
   var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table4, _meta$table5, _meta$table7, _meta$table8, _meta$table9, _meta$table0, _meta$expressions, _meta$table1, _meta$table10, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
@@ -125,6 +128,26 @@ var JoinData = function JoinData(props) {
       tableIsDel();
     }, 0);
   }, [meta]);
+  useEffect(function () {
+    var expressions = meta.expressions || [];
+    var hasInvalidOperator = expressions.some(function (item) {
+      return item.type === AtomsTypeEnum.OPERATOR && item.val !== normalizeJoinOperator(item.val);
+    });
+    if (!hasInvalidOperator) {
+      return;
+    }
+    var currentIndex = findIndex(store.metaList[groupIndex].list, meta);
+    var newMeta = store.metaList[groupIndex].list.slice();
+    newMeta[currentIndex].expressions = expressions.map(function (item) {
+      if (item.type !== AtomsTypeEnum.OPERATOR) {
+        return item;
+      }
+      return _objectSpread(_objectSpread({}, item), {}, {
+        val: normalizeJoinOperator(item.val)
+      });
+    });
+    store.setMeta(newMeta, groupIndex);
+  }, [meta.expressions]);
   var getTableColumns = function getTableColumns() {
     var data = [];
     var _getHelper2 = getHelper(store.metaList[groupIndex].list, meta),
@@ -968,7 +991,8 @@ var JoinData = function JoinData(props) {
               var _store$preProps3;
               newMeta[index].subquery = newList;
               newMeta[index].table2 = _objectSpread(_objectSpread({}, newList[0].table), {}, {
-                alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
+                alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || []),
+                tableUuid: newMeta[index].table2.tableUuid || uuidv4('table')
               });
               var items = getSubColumns(newList);
               var subQueryTable = newMeta[index].table2;
@@ -1059,10 +1083,26 @@ var JoinData = function JoinData(props) {
       onCancel: function onCancel() {}
     });
   };
+  var cleanJoinOperators = function cleanJoinOperators(expressions) {
+    for (var i = expressions.length - 1; i >= 0; i--) {
+      if (isJoinOperator(expressions[i]) && (i === 0 || i === expressions.length - 1 || isJoinOperator(expressions[i - 1]))) {
+        expressions.splice(i, 1);
+      }
+    }
+  };
   var changeOperator = function changeOperator(key, i) {
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
-    newMeta[index].expressions[i].val = key;
+    var operator = newMeta[index].expressions[i];
+    operator.val = normalizeJoinOperator(key);
+    store.setMeta(newMeta, groupIndex);
+  };
+  var removeExpression = function removeExpression(i) {
+    var index = findIndex(store.metaList[groupIndex].list, meta);
+    var newMeta = store.metaList[groupIndex].list.slice();
+    var expressions = newMeta[index].expressions;
+    expressions.splice(i, 1);
+    cleanJoinOperators(expressions);
     store.setMeta(newMeta, groupIndex);
   };
   var changeExpression = function changeExpression(e, i) {
@@ -1128,19 +1168,15 @@ var JoinData = function JoinData(props) {
         }],
         type: type
       };
-      store.setMeta(newMeta, groupIndex);
-    }
-    if (type === AtomsTypeEnum.OPERATOR) {
-      item = {
-        val: 'AND',
-        type: type
-      };
     }
     if (!item) {
       return;
     }
     if (i >= 0) {
-      newMeta[index].expressions.splice(i + 1, 0, item);
+      newMeta[index].expressions.splice(i + 1, 0, {
+        val: 'AND',
+        type: AtomsTypeEnum.OPERATOR
+      }, item);
     } else {
       newMeta[index].expressions.push(item);
     }
@@ -1455,16 +1491,14 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: _jsx(FfLine, {}),
                       onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
+                        removeExpression(i);
                       }
                     })
                   })]
                 }, i);
               }
               if (v.type === AtomsTypeEnum.OPERATOR) {
+                var operator = normalizeJoinOperator(v.val);
                 return _jsxs("div", {
                   className: cx("Sqb-where block"),
                   children: [i == 0 && _jsx("span", {
@@ -1475,41 +1509,12 @@ var JoinData = function JoinData(props) {
                     onChange: function onChange(key) {
                       changeOperator(key, i);
                     },
-                    droplist: menuOperator,
+                    droplist: menuJoinOperator,
                     children: _jsx(Button, {
+                      disabled: meta.readonly,
                       className: 'ml-2 mr-4 text-gray-500',
                       type: 'link',
-                      children: v.val
-                    })
-                  }), _jsx(Tooltip, {
-                    title: __('SqlQueryBuilder.add'),
-                    children: _jsx(Dropdown, {
-                      trigger: ['click'],
-                      onChange: function onChange(key) {
-                        addExpression(key, i);
-                      },
-                      droplist: menuTypes,
-                      children: _jsx(Button, {
-                        disabled: meta.readonly,
-                        primary: true,
-                        ghost: true,
-                        className: 'mr-2 operator-icon',
-                        icon: _jsx(FfPlus, {})
-                      })
-                    })
-                  }), _jsx(Tooltip, {
-                    title: __('SqlQueryBuilder.del'),
-                    children: _jsx(Button, {
-                      disabled: meta.readonly,
-                      danger: true,
-                      className: 'mr-2 operator-icon',
-                      icon: _jsx(FfLine, {}),
-                      onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
-                      }
+                      children: operator
                     })
                   })]
                 }, i);
@@ -1555,10 +1560,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: _jsx(FfLine, {}),
                       onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
+                        removeExpression(i);
                       }
                     })
                   })]
@@ -1609,10 +1611,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: _jsx(FfLine, {}),
                       onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
+                        removeExpression(i);
                       }
                     })
                   })]

package/lib/es/utils/helper.js

@@ -112,11 +112,7 @@ export var isSameColumnByIdFirst = function isSameColumnByIdFirst() {
   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;
-    }
+    return false;
   }
   var leftFieldId = normalizeId(left.fieldId || left.id);
   var rightFieldId = normalizeId(right.fieldId || right.id);

package/lib/es/utils.d.ts

@@ -4,6 +4,7 @@ import { DataType } from './components/dialog/select-column-multiple';
 export declare const findIndex: <T>(arr: T[], item: T) => number;
 export declare const findMetaKey: <T>(arr: T[], item: T) => number;
 export declare const getMetaTabels: (data: MetaListType[]) => any;
+export declare const getSubQueryColumnInstanceUuid: (column: any, tableUuid?: string) => string;
 export declare const getColumnsTables: (data: DataType[]) => any;
 interface HelperResultType {
     ExistAboveGroupBy: boolean;

package/lib/es/utils.js

@@ -7,7 +7,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["list"];
 import { __, isEn } from './locale';
 import { TypeEnum, SQL_COLUMN_TYPE } from './store/enum';
-import { AtomsTypeEnum } from './store/types';
+import { MetaSummarize_Enum, AtomsTypeEnum } from './store/types';
 import { SummarizeAlias, summarizeByToSql, summarizeToSql } from './store/helper';
 import { transformSql } from './utils/transformSql';
 import { isSameColumnByIdFirst, isSameTableByIdFirst, uuidv4 } from './utils/helper';
@@ -40,6 +40,15 @@ var SUB_QUERY_OUTPUT_COLUMN_KEY = '__subQueryOutputColumn';
 var isSubQueryOutputColumn = function isSubQueryOutputColumn(column) {
   return Boolean((column === null || column === void 0 ? void 0 : column.summarizeType) && (column === null || column === void 0 ? void 0 : column[SUB_QUERY_OUTPUT_COLUMN_KEY]));
 };
+var getSubQueryColumnSourceKey = function getSubQueryColumnSourceKey(column) {
+  var columnMeta = column;
+  return [column.datasourceId || '', column.tableUuid || '', column.tableId || '', column.table || columnMeta.tableName || '', columnMeta.fieldId || column.id || '', column.name || '', column.realName || ''].join('|');
+};
+export var getSubQueryColumnInstanceUuid = function getSubQueryColumnInstanceUuid(column) {
+  var tableUuid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var sourceKey = getSubQueryColumnSourceKey(column);
+  return [tableUuid || column.tableUuid || '', column.summarizeType || '', sourceKey].join('|');
+};
 export var getColumnsTables = function getColumnsTables(data) {
   var obj = {};
   data.map(function (v) {
@@ -137,7 +146,8 @@ var normalizeSubQueryColumn = function normalizeSubQueryColumn(column) {
     name_zh: column.name_zh || column.quotes || '',
     id: column.id || column.fieldId || outputName,
     realName: column.realName || column.name || '',
-    fieldAlias: ''
+    fieldAlias: '',
+    fieldUuid: column.fieldUuid || getSubQueryColumnInstanceUuid(column)
   });
 };
 var getOuterSubQueryFieldAlias = function getOuterSubQueryFieldAlias(existingCol, newCol) {
@@ -171,6 +181,20 @@ var isSameSubQueryOutputColumn = function isSameSubQueryOutputColumn(oldCol, new
   var newIdentity = getSubQueryOutputIdentity(newCol);
   return Boolean(oldIdentity && newIdentity && oldIdentity === newIdentity);
 };
+var isSameColumnTableInstance = function isSameColumnTableInstance(oldCol, newCol) {
+  var oldColumn = oldCol;
+  var newColumn = newCol;
+  if (oldColumn.tableUuid && newColumn.tableUuid) {
+    return oldColumn.tableUuid === newColumn.tableUuid;
+  }
+  if (oldColumn.datasourceId && newColumn.datasourceId && oldColumn.datasourceId !== newColumn.datasourceId) {
+    return false;
+  }
+  if (oldColumn.tableId && newColumn.tableId && oldColumn.tableId !== newColumn.tableId) {
+    return false;
+  }
+  return true;
+};
 export var mergeSubQueryColumns = function mergeSubQueryColumns(columns) {
   var oldColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var isSelectFields = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -178,6 +202,9 @@ export var mergeSubQueryColumns = function mergeSubQueryColumns(columns) {
     var newColumn = newCol;
     var existingCol = oldColumns.find(function (oldCol) {
       var oldColumn = oldCol;
+      if (!isSameColumnTableInstance(oldCol, newCol)) {
+        return false;
+      }
       if (oldColumn.fieldUuid && newColumn.fieldUuid) {
         return oldColumn.fieldUuid === newColumn.fieldUuid;
       }
@@ -392,6 +419,7 @@ export var getSubColumns = function getSubColumns(metaList) {
           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]) || '',
           database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
           special_type: '',
+          summarizeType: MetaSummarize_Enum.GROUP,
           select: true
         }));
       }));
@@ -404,6 +432,7 @@ export var getSubColumns = function getSubColumns(metaList) {
           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]) || '',
           database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
           special_type: '',
+          summarizeType: MetaSummarize_Enum.BY,
           select: true
         }));
       }));
@@ -754,8 +783,8 @@ var syncAtomQuotesList = function syncAtomQuotesList(items) {
   return items.map(syncAtomQuotes);
 };
 var isSameAliasTargetTable = function isSameAliasTargetTable(item, target) {
-  if (target.tableUuid && item.tableUuid && item.tableUuid === target.tableUuid) {
-    return true;
+  if (target.tableUuid && item.tableUuid) {
+    return item.tableUuid === target.tableUuid;
   }
   if (target.datasourceId && item.datasourceId && item.datasourceId !== target.datasourceId) {
     return false;
@@ -766,15 +795,32 @@ var isSameAliasTargetTable = function isSameAliasTargetTable(item, target) {
   return Boolean(target.tableName && item.tableName && item.tableName === target.tableName);
 };
 var isAliasTargetField = function isAliasTargetField(item, target) {
+  var sameTable = isSameAliasTargetTable(item, target);
   if (target.uuid && item.fieldUuid && item.fieldUuid === target.uuid) {
-    return true;
+    return sameTable || !(target.tableUuid || target.tableId || target.tableName);
   }
-  var sameTable = isSameAliasTargetTable(item, target);
   if (target.fieldId && item.fieldId && item.fieldId === target.fieldId) {
     return sameTable || !target.tableId;
   }
   return Boolean(target.fieldName && item.fieldName && item.fieldName === target.fieldName && sameTable);
 };
+var isAliasTargetSummarizeRecord = function isAliasTargetSummarizeRecord(record, target) {
+  return isAliasTargetField({
+    fieldName: record.name || '',
+    fieldNameZh: record.name_zh || '',
+    fieldAlias: record.fieldAlias || '',
+    fieldUuid: record.fieldUuid || '',
+    fieldId: record.fieldId || record.id || '',
+    tableName: record.table || '',
+    tableNameZh: '',
+    tableId: record.tableId || '',
+    tableAlias: record.alias || '',
+    tableUuid: record.tableUuid || '',
+    datasourceName: record.datasourceName || '',
+    datasourceId: record.datasourceId || '',
+    type: AtomsTypeEnum.FIELD
+  }, target);
+};
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     var nextItem;
@@ -1004,7 +1050,7 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
         if (groupAtoms && groupAtoms.length > 0) {
           group.atoms = _changeAlias(groupAtoms, aliasTarget, AliasType.field);
           group.sql = summarizeToSql(v.group, group).sql;
-        } else if (group.fieldUuid === uuid) {
+        } else if (isAliasTargetSummarizeRecord(group, aliasTarget)) {
           group.fieldAlias = alias;
           group.sql = summarizeToSql(v.group, group).sql;
         }
@@ -1013,7 +1059,7 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
         if (by.atoms && by.atoms.length > 0) {
           by.atoms = _changeAlias(by.atoms, aliasTarget, AliasType.field);
           by.sql = summarizeByToSql(by);
-        } else if (by.fieldUuid === uuid) {
+        } else if (isAliasTargetSummarizeRecord(by, aliasTarget)) {
           by.fieldAlias = alias;
           by.sql = summarizeByToSql(by);
         }
@@ -1237,12 +1283,60 @@ var hasLoadedColumnData = function hasLoadedColumnData() {
     return Array.isArray(table === null || table === void 0 ? void 0 : table.columns) && table.columns.length > 0;
   });
 };
+var normalizeIdentityValue = function normalizeIdentityValue(val) {
+  if (val === undefined || val === null) return '';
+  return "".concat(val);
+};
+var isSourceLikeDatasource = function isSourceLikeDatasource(datasourceId) {
+  return !datasourceId || datasourceId === 'source';
+};
+var isSameErrorCheckTable = function isSameErrorCheckTable(table, item) {
+  var itemDatasourceId = normalizeIdentityValue(item.datasourceId);
+  var tableDatasourceId = normalizeIdentityValue(table.datasourceId);
+  if (!isSourceLikeDatasource(itemDatasourceId) && !isSourceLikeDatasource(tableDatasourceId) && itemDatasourceId !== tableDatasourceId) {
+    return false;
+  }
+  var itemTableId = normalizeIdentityValue(item.tableId);
+  var tableId = normalizeIdentityValue(table.id);
+  if (itemTableId && tableId && itemTableId !== tableId) {
+    return false;
+  }
+  var itemTableAlias = normalizeIdentityValue(item.tableAlias);
+  var tableAlias = normalizeIdentityValue(table.alias);
+  if (itemTableAlias && tableAlias && itemTableAlias !== tableAlias) {
+    return false;
+  }
+  var itemTableName = normalizeIdentityValue(item.tableName);
+  var tableName = normalizeIdentityValue(table.name);
+  return Boolean(itemTableId && tableId && itemTableId === tableId || itemTableAlias && tableAlias && itemTableAlias === tableAlias || item.tableUuid && table.tableUuid && item.tableUuid === table.tableUuid || itemTableName && tableName && itemTableName === tableName);
+};
+var isSameErrorCheckColumn = function isSameErrorCheckColumn(field, item) {
+  if (isSameColumnByIdFirst(field, item)) {
+    return true;
+  }
+  if (!(field !== null && field !== void 0 && field.summarizeType)) {
+    return false;
+  }
+  var itemValues = [item.fieldId, item.id, item.fieldUuid, item.fieldName, item.fieldAlias].map(normalizeIdentityValue).filter(Boolean);
+  var fieldValues = [field.fieldId, field.id, field.fieldUuid, field.fieldName, field.name, field.fieldAlias, field.realName].map(normalizeIdentityValue).filter(Boolean);
+  return itemValues.some(function (value) {
+    return fieldValues.includes(value);
+  });
+};
+var getErrorCheckFields = function getErrorCheckFields(item, data) {
+  var tables = data.filter(function (table) {
+    return isSameErrorCheckTable(table, item);
+  });
+  if (!tables.length) return null;
+  return tables.flatMap(function (table) {
+    return table.columns || [];
+  });
+};
 var _isError = function isError(item) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   if (!hasLoadedColumnData(data)) {
     return false;
   }
-  var tables = getColumnsTables(data);
   if (!item) {
     return false;
   }
@@ -1252,49 +1346,21 @@ var _isError = function isError(item) {
     });
   }
   if (item.type === AtomsTypeEnum.FIELD) {
-    var datasourceId = item.datasourceId,
-      _item$tableId = item.tableId,
-      tableId = _item$tableId === void 0 ? '' : _item$tableId,
-      _item$tableAlias = item.tableAlias,
-      tableAlias = _item$tableAlias === void 0 ? '' : _item$tableAlias,
-      fieldName = item.fieldName,
-      fieldId = item.fieldId;
-    var _datasourceId = datasourceId || 'source';
-    if (tableId === 'source') {
-      _datasourceId = 'source';
-    }
+    var _item$tableId = item.tableId,
+      tableId = _item$tableId === void 0 ? '' : _item$tableId;
     if (!tableId) {
       return false;
     }
-    if (_datasourceId === 'source') {
-      var _tables$_datasourceId;
-      var fields = tables === null || tables === void 0 || (_tables$_datasourceId = tables[_datasourceId]) === null || _tables$_datasourceId === void 0 ? void 0 : _tables$_datasourceId[tableId + tableAlias];
-      if (!fields) {
-        return true;
-      } else if (!fields.length) {
-        return false;
-      } else {
-        return fields.every(function (field) {
-          return !isSameColumnByIdFirst(_objectSpread(_objectSpread({}, field), {}, {
-            datasourceId: _datasourceId,
-            tableId: tableId
-          }), item);
-        });
-      }
-    } else {
-      var _tables$_datasourceId2, _fields$some;
-      var _fields = tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2[tableId + tableAlias];
-      if (_fields && !_fields.length) {
-        return false;
-      }
-      var hasField = (_fields$some = _fields === null || _fields === void 0 ? void 0 : _fields.some(function (v) {
-        return isSameColumnByIdFirst(_objectSpread(_objectSpread({}, v), {}, {
-          datasourceId: _datasourceId,
-          tableId: tableId
-        }), item);
-      })) !== null && _fields$some !== void 0 ? _fields$some : false;
-      return !hasField;
+    var fields = getErrorCheckFields(item, data);
+    if (!fields) {
+      return true;
     }
+    if (!fields.length) {
+      return false;
+    }
+    return !fields.some(function (field) {
+      return isSameErrorCheckColumn(field, item);
+    });
   }
   if (item.type === AtomsTypeEnum.EXPRESSION) {
     var lhsHasError = _isError(item.lhs, data);

package/package.json

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