@gingkoo/pandora-metabase 1.0.125 → 1.0.127

package/lib/cjs/hooks/use-state.js

@@ -19,7 +19,7 @@ var _enum = require("../store/enum");
 var _utils = require("../utils");
 var _storage = _interopRequireDefault(require("../utils/storage"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
+var _excluded = ["alias", "datasourceName", "datasourceId", "datasourceType", "column"];
 var metaKey = 1;
 var SummarizeAlias = exports.SummarizeAlias = 'source';
 var useStore = function useStore() {
@@ -34,6 +34,7 @@ var useStore = function useStore() {
       alias: '',
       datasourceId: '',
       datasourceName: '',
+      datasourceType: '',
       tableUuid: (0, _helper.uuidv4)('table')
     },
     columns: []
@@ -318,10 +319,97 @@ var useStore = function useStore() {
     });
   }, [metaList]);
   (0, _react.useEffect)(function () {
+    if (sourceList.length) {
+      var metaListWithDefaultType = fillDefaultDatasourceTypeInMetaList(metaList, isExit);
+      if (metaListWithDefaultType !== metaList) {
+        setPreData(metaListWithDefaultType, isSubquery, isExit);
+      }
+    }
     if (tableFlat) {
       getSourceTable(sourceList);
     }
   }, [sourceList, isExit, tableFlat]);
+  var getDefaultDatasourceType = function getDefaultDatasourceType(datasource) {
+    var _datasource$datasourc;
+    return (datasource === null || datasource === void 0 ? void 0 : datasource.defaultDatasourceType) || (datasource === null || datasource === void 0 ? void 0 : datasource.datasourceType) || (datasource === null || datasource === void 0 || (_datasource$datasourc = datasource.datasourceTypeList) === null || _datasource$datasourc === void 0 || (_datasource$datasourc = _datasource$datasourc[0]) === null || _datasource$datasourc === void 0 ? void 0 : _datasource$datasourc.value) || '';
+  };
+  var getActiveSourceList = function getActiveSourceList() {
+    var _props$exitSourceList, _props$sourceList;
+    var _isExit = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : isExit;
+    var props = preProps.current || {};
+    if (_isExit && (_props$exitSourceList = props.exitSourceList) !== null && _props$exitSourceList !== void 0 && _props$exitSourceList.length) {
+      return props.exitSourceList;
+    }
+    if ((_props$sourceList = props.sourceList) !== null && _props$sourceList !== void 0 && _props$sourceList.length) {
+      return props.sourceList;
+    }
+    return sourceList;
+  };
+  var getDefaultDatasourceTypeById = function getDefaultDatasourceTypeById(datasourceId) {
+    var _isExit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isExit;
+    if (!datasourceId) return '';
+    var datasource = getActiveSourceList(_isExit).find(function (item) {
+      return item.datasourceId === datasourceId;
+    });
+    return getDefaultDatasourceType(datasource);
+  };
+  var fillDefaultDatasourceTypeInTable = function fillDefaultDatasourceTypeInTable(table) {
+    var _isExit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isExit;
+    if (!(table !== null && table !== void 0 && table.datasourceId) || table.datasourceType) return false;
+    var defaultDatasourceType = getDefaultDatasourceTypeById(table.datasourceId, _isExit);
+    if (!defaultDatasourceType) return false;
+    table.datasourceType = defaultDatasourceType;
+    return true;
+  };
+  var fillDefaultDatasourceTypeInColumns = function fillDefaultDatasourceTypeInColumns(columns, datasourceType) {
+    if (!datasourceType || !Array.isArray(columns)) return false;
+    var changed = false;
+    columns.forEach(function (column) {
+      if (!column.datasourceType) {
+        column.datasourceType = datasourceType;
+        changed = true;
+      }
+    });
+    return changed;
+  };
+  var _fillDefaultDatasourceTypeInList = function fillDefaultDatasourceTypeInList(list) {
+    var _isExit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isExit;
+    if (!Array.isArray(list)) return false;
+    var changed = false;
+    list.forEach(function (item) {
+      if (item.table) {
+        changed = fillDefaultDatasourceTypeInTable(item.table, _isExit) || changed;
+        changed = fillDefaultDatasourceTypeInColumns(item.columns, item.table.datasourceType) || changed;
+      }
+      if (item.table1) {
+        changed = fillDefaultDatasourceTypeInTable(item.table1, _isExit) || changed;
+      }
+      if (item.table2) {
+        changed = fillDefaultDatasourceTypeInTable(item.table2, _isExit) || changed;
+        changed = fillDefaultDatasourceTypeInColumns(item.columns, item.table2.datasourceType) || changed;
+      }
+      if (Array.isArray(item.subquery)) {
+        changed = _fillDefaultDatasourceTypeInList(item.subquery, _isExit) || changed;
+      }
+    });
+    return changed;
+  };
+  var fillDefaultDatasourceTypeInMetaList = function fillDefaultDatasourceTypeInMetaList() {
+    var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var _isExit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isExit;
+    if (!data.length) return data;
+    var nextData = (0, _cloneDeep["default"])(data);
+    var changed = false;
+    nextData.forEach(function (group) {
+      changed = _fillDefaultDatasourceTypeInList(group.list, _isExit) || changed;
+      changed = _fillDefaultDatasourceTypeInList(group.subquery, _isExit) || changed;
+    });
+    return changed ? nextData : data;
+  };
+  var getDatasetCacheKey = function getDatasetCacheKey(datasourceId) {
+    var datasourceType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    return datasourceType ? "".concat(datasourceId, "__").concat(datasourceType) : datasourceId;
+  };
   var getSourceTable = function () {
     var _ref3 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee4(source) {
       var results;
@@ -331,15 +419,17 @@ var useStore = function useStore() {
             _context4.next = 1;
             return Promise.all(source.map(function () {
               var _ref4 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3(v) {
-                var tables;
+                var datasourceType, tables;
                 return _regenerator["default"].wrap(function (_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
                     case 0:
+                      datasourceType = getDefaultDatasourceType(v);
                       _context3.next = 1;
-                      return fetchDataset(v.datasourceId);
+                      return fetchDataset(v.datasourceId, datasourceType);
                     case 1:
                       tables = _context3.sent;
                       return _context3.abrupt("return", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                        datasourceType: datasourceType,
                         children: tables
                       }));
                     case 2:
@@ -370,24 +460,34 @@ var useStore = function useStore() {
   };
   var fetchDataset = function () {
     var _ref5 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5(datasourceId) {
-      var tables, _tables;
+      var _preProps$current;
+      var datasourceType,
+        force,
+        tables,
+        fetchTables,
+        _tables,
+        _args5 = arguments;
       return _regenerator["default"].wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            tables = getDataset(datasourceId);
-            if (!tables.length) {
+            datasourceType = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : '';
+            force = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : false;
+            tables = getDataset(datasourceId, datasourceType);
+            if (!(!force && tables.length)) {
               _context5.next = 1;
               break;
             }
             return _context5.abrupt("return", tables);
           case 1:
+            fetchTables = ((_preProps$current = preProps.current) === null || _preProps$current === void 0 ? void 0 : _preProps$current.getTables) || fetchDatasetFn.current;
             _context5.next = 2;
-            return fetchDatasetFn.current(datasourceId, {
-              isExit: isExit
+            return fetchTables(datasourceId, {
+              isExit: isExit,
+              datasourceType: datasourceType
             });
           case 2:
             _tables = _context5.sent;
-            setDataset(datasourceId, _tables);
+            setDataset(datasourceId, _tables, datasourceType);
             return _context5.abrupt("return", _tables);
           case 3:
           case "end":
@@ -413,9 +513,11 @@ var useStore = function useStore() {
         alias,
         datasourceName,
         did,
+        datasourceType,
         column,
         extra,
         tableName,
+        tableCacheKey,
         columns,
         _columns,
         _args6 = arguments;
@@ -440,26 +542,31 @@ var useStore = function useStore() {
               selectId = [];
               isSelect = false;
             }
-            _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, extra = (0, _objectWithoutProperties2["default"])(table, _excluded);
+            _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, datasourceType = table.datasourceType, column = table.column, extra = (0, _objectWithoutProperties2["default"])(table, _excluded);
             tableName = table.name;
-            columns = getColumns(tableName);
+            tableCacheKey = getDatasetCacheKey("".concat(datasourceId, "_").concat(tableName), datasourceType || '');
+            columns = getColumns(tableCacheKey);
             if (columns.length) {
               _context6.next = 2;
               break;
             }
             _context6.next = 1;
             return fetchColumnsFn.current(extra, datasourceId, {
-              isExit: _isExit
+              isExit: _isExit,
+              datasourceType: datasourceType
             });
           case 1:
             columns = _context6.sent;
-            setColumns(tableName, columns);
+            setColumns(tableCacheKey, columns);
           case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               var select = selectId.includes(v.id);
               var obj = {};
               obj = oldObj[v.id] || {};
               return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, obj), v), {}, {
+                datasourceId: obj.datasourceId || v.datasourceId || did || datasourceId || '',
+                datasourceName: obj.datasourceName || v.datasourceName || datasourceName || '',
+                datasourceType: obj.datasourceType || v.datasourceType || datasourceType || '',
                 select: isSelect || select,
                 fieldUuid: obj.fieldUuid || v.fieldUuid || (0, _helper.uuidv4)('field')
               });
@@ -527,7 +634,16 @@ var useStore = function useStore() {
           var _v$table, _v$table2;
           var newMeta = item.list;
           if (v.table) {
+            fillDefaultDatasourceTypeInTable(v.table, _isExit);
             v.table.tableUuid = v.table.tableUuid || (0, _helper.uuidv4)('table');
+            fillDefaultDatasourceTypeInColumns(v.columns, v.table.datasourceType);
+          }
+          if (v.table1) {
+            fillDefaultDatasourceTypeInTable(v.table1, _isExit);
+          }
+          if (v.table2) {
+            fillDefaultDatasourceTypeInTable(v.table2, _isExit);
+            fillDefaultDatasourceTypeInColumns(v.columns, v.table2.datasourceType);
           }
           if ((_v$table = v.table2) !== null && _v$table !== void 0 && _v$table.datasourceId) {
             fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, v.columns, function () {
@@ -535,6 +651,8 @@ var useStore = function useStore() {
               if (v.isSubquery) {} else {
                 newMeta[i].columns = columns || [];
               }
+              fillDefaultDatasourceTypeInTable(newMeta[i].table2, _isExit);
+              fillDefaultDatasourceTypeInColumns(newMeta[i].columns, newMeta[i].table2.datasourceType);
               setMeta(newMeta, groupIndex, 'init', data);
             }, false, _isSubquery, _isExit);
             return (0, _objectSpread2["default"])({}, v);
@@ -545,6 +663,8 @@ var useStore = function useStore() {
               if (v.isSubquery) {} else {
                 newMeta[i].columns = columns || [];
               }
+              fillDefaultDatasourceTypeInTable(newMeta[i].table, _isExit);
+              fillDefaultDatasourceTypeInColumns(newMeta[i].columns, newMeta[i].table.datasourceType);
               setMeta(newMeta, groupIndex, 'init', data);
             }, false, _isSubquery, _isExit);
             return (0, _objectSpread2["default"])({}, v);
@@ -663,6 +783,7 @@ var useStore = function useStore() {
         tableUuid: '',
         datasourceId: '',
         datasourceName: '',
+        datasourceType: '',
         fieldAlias: '',
         fieldUuid: '',
         fields: []
@@ -674,6 +795,7 @@ var useStore = function useStore() {
           name_zh: mainTable.table.name_zh,
           datasourceId: mainTable.table.datasourceId,
           datasourceName: mainTable.table.datasourceName,
+          datasourceType: mainTable.table.datasourceType || '',
           fieldAlias: '',
           fieldUuid: '',
           fields: []
@@ -691,7 +813,8 @@ var useStore = function useStore() {
           alias: '',
           tableUuid: '',
           datasourceId: '',
-          datasourceName: ''
+          datasourceName: '',
+          datasourceType: ''
         },
         columns: [],
         expressions: []
@@ -746,7 +869,8 @@ var useStore = function useStore() {
           alias: '',
           tableUuid: '',
           datasourceId: '',
-          datasourceName: ''
+          datasourceName: '',
+          datasourceType: ''
         }
       };
     }
@@ -901,12 +1025,14 @@ var useStore = function useStore() {
     return _cacheColumnsMap[tableId] || [];
   };
   var setDataset = function setDataset(datasourceId, tables) {
+    var datasourceType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
     var map = (0, _objectSpread2["default"])({}, _cacheSource2TableMap);
-    map[datasourceId] = tables;
+    map[getDatasetCacheKey(datasourceId, datasourceType)] = tables;
     set_cacheSource2TableMap(map);
   };
   var getDataset = function getDataset(datasourceId) {
-    return _cacheSource2TableMap[datasourceId] || [];
+    var datasourceType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    return _cacheSource2TableMap[getDatasetCacheKey(datasourceId, datasourceType)] || [];
   };
   var reset = function reset() {
     _setMeta(defaultMeta);

package/lib/cjs/index.js

@@ -82,10 +82,16 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
   var store = (0, _useState["default"])();
   (0, _react.useEffect)(function () {
     getTables && store.setFetchDatasetFn(getTables);
+  }, [getTables]);
+  (0, _react.useEffect)(function () {
     getColumns && store.setFetchColumnsFn(getColumns);
+  }, [getColumns]);
+  (0, _react.useEffect)(function () {
     onChange && store.setFetchChangeFn(onChange);
+  }, [onChange]);
+  (0, _react.useEffect)(function () {
     getModuleDiffCode && store.setFetchDiffFn(getModuleDiffCode);
-  }, []);
+  }, [getModuleDiffCode]);
   (0, _react.useEffect)(function () {
     store.setProps(props);
   }, [props]);

package/lib/cjs/store/types.d.ts

@@ -85,20 +85,22 @@ export interface AtomsExpression {
     formula?: Filter_Formula;
     type: AtomsTypeEnum.EXPRESSION;
 }
-export interface AtomsCaseWhenBranch {
-    when: AtomsItem[];
-    then: AtomsItem[];
+export interface AtomsCaseWhenClause {
+    whenAtoms: AtomsItem[];
+    thenAtoms: AtomsItem[];
 }
 export interface AtomsCaseWhen {
-    caseValue?: AtomsItem[];
-    branches: AtomsCaseWhenBranch[];
-    elseValue?: AtomsItem[];
+    caseAtoms?: AtomsItem[];
+    whenClauses: AtomsCaseWhenClause[];
+    elseAtoms?: AtomsItem[];
     quotes: string;
     type: AtomsTypeEnum.CASE_WHEN;
 }
 export interface AtomsAndOr {
     operator: 'and' | 'or';
-    list: AtomsItem[];
+    leftAtoms?: AtomsItem[];
+    rightAtoms?: AtomsItem[];
+    atoms?: AtomsItem[];
     quotes: string;
     type: AtomsTypeEnum.AND_OR;
 }
@@ -121,6 +123,7 @@ export interface AtomsField {
     tableUuid: string;
     datasourceName: string;
     datasourceId: string;
+    datasourceType?: string;
     type: AtomsTypeEnum.FIELD;
 }
 export interface AtomsInputString {
@@ -199,6 +202,7 @@ export interface MetaData_ColumnsType {
     special_type: SpecialType | '';
     datasourceId: string;
     datasourceName: string;
+    datasourceType?: string;
     select: boolean;
     summarizeType?: MetaSummarize_Enum;
 }
@@ -227,6 +231,7 @@ export interface MetaJoin_TalbeType {
     alias: string;
     datasourceName: string;
     datasourceId: string;
+    datasourceType?: string;
     quotes?: string;
     columns?: MetaData_ColumnsType[];
 }
@@ -286,6 +291,7 @@ export interface MetaSummarize_Group {
     quotes: string;
     datasourceId: string;
     datasourceName: string;
+    datasourceType?: string;
     atoms?: AtomsItem[];
     summarizeType: MetaSummarize_Enum;
     [params: string]: any;
@@ -303,6 +309,7 @@ export interface MetaSummarize_By {
     id: string;
     datasourceId: string;
     datasourceName: string;
+    datasourceType?: string;
     realName?: string;
     sql: string;
     database_type: SQL_COLUMN_TYPE | '';

package/lib/cjs/types.d.ts

@@ -10,6 +10,7 @@ export interface MetaListProps {
 }
 export interface FetchOptions {
     isExit: boolean;
+    datasourceType?: string;
 }
 export interface MetabaseProps {
     loading?: boolean;
@@ -70,9 +71,16 @@ export interface OptionItem {
     label: string;
     icon?: React.ReactNode;
 }
+export interface DatasourceTypeOption {
+    value: string;
+    label: string;
+}
 export interface DatasourceType {
     datasourceId: string;
     datasourceName: string;
+    defaultDatasourceType?: string;
+    datasourceType?: string;
+    datasourceTypeList?: DatasourceTypeOption[];
 }
 export interface SqlVisionBuilderRef {
     reset: () => void;

package/lib/cjs/utils/transformSql.js

@@ -39,7 +39,8 @@ var BlockTypeEnum = {
   notExists: 'notExists',
   exists: 'exists',
   FORMULA: 'FORMULA',
-  collection: 'collection'
+  collection: 'collection',
+  andOr: 'andOr'
 };
 var SummarizeAlias = 'source';
 var SQL_GROUP_TYPE = {
@@ -72,7 +73,7 @@ var _recursionArr2 = function _recursionArr(arr) {
   }
   return obj;
 };
-var _handleBaseType2Sql8 = exports.handleBaseType2Sql = function handleBaseType2Sql(list) {
+var _handleBaseType2Sql1 = exports.handleBaseType2Sql = function handleBaseType2Sql(list) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var sql = '';
   var constants = [];
@@ -134,11 +135,11 @@ var _handleBaseType2Sql8 = exports.handleBaseType2Sql = function handleBaseType2
     if (type === BlockTypeEnum.joinDefault) {
       var lhs = item.lhs,
         rhs = item.rhs;
-      var _handleBaseType2Sql = _handleBaseType2Sql8(lhs, db),
+      var _handleBaseType2Sql = _handleBaseType2Sql1(lhs, db),
         leftSql = _handleBaseType2Sql.sql,
         leftSqlItems = _handleBaseType2Sql.sql_items,
         joinDefaultLeftConstants = _handleBaseType2Sql.constants;
-      var _handleBaseType2Sql2 = _handleBaseType2Sql8(rhs, db),
+      var _handleBaseType2Sql2 = _handleBaseType2Sql1(rhs, db),
         rightSql = _handleBaseType2Sql2.sql,
         rightSqlItems = _handleBaseType2Sql2.sql_items,
         joinDefaultRightConstants = _handleBaseType2Sql2.constants;
@@ -176,11 +177,11 @@ var _handleBaseType2Sql8 = exports.handleBaseType2Sql = function handleBaseType2
         condition = item.condition,
         database_type = item.database_type,
         formula = item.formula;
-      var _handleBaseType2Sql3 = _handleBaseType2Sql8(_lhs, db),
+      var _handleBaseType2Sql3 = _handleBaseType2Sql1(_lhs, db),
         _leftSql = _handleBaseType2Sql3.sql,
         _leftSqlItems = _handleBaseType2Sql3.sql_items,
         _joinDefaultLeftConstants = _handleBaseType2Sql3.constants;
-      var _handleBaseType2Sql4 = _handleBaseType2Sql8(_rhs, db),
+      var _handleBaseType2Sql4 = _handleBaseType2Sql1(_rhs, db),
         _rightSql = _handleBaseType2Sql4.sql,
         _rightSqlItems = _handleBaseType2Sql4.sql_items,
         _joinDefaultRightConstants = _handleBaseType2Sql4.constants;
@@ -452,13 +453,13 @@ var _handleBaseType2Sql8 = exports.handleBaseType2Sql = function handleBaseType2
     if (type === BlockTypeEnum.FORMULA) {
       var argSqlList = (Array.isArray(item.args) ? item.args : []).map(function (arg) {
         if ((arg === null || arg === void 0 ? void 0 : arg.type) === BlockTypeEnum.collection) {
-          var _handleBaseType2Sql5 = _handleBaseType2Sql8(arg.list, db),
+          var _handleBaseType2Sql5 = _handleBaseType2Sql1(arg.list, db),
             collectionSql = _handleBaseType2Sql5.sql,
             collectionConstants = _handleBaseType2Sql5.constants;
           constants.push.apply(constants, (0, _toConsumableArray2["default"])(collectionConstants));
           return collectionSql.trim();
         }
-        var _handleBaseType2Sql6 = _handleBaseType2Sql8([arg], db),
+        var _handleBaseType2Sql6 = _handleBaseType2Sql1([arg], db),
           nestedSql = _handleBaseType2Sql6.sql,
           nestedConstants = _handleBaseType2Sql6.constants;
         constants.push.apply(constants, (0, _toConsumableArray2["default"])(nestedConstants));
@@ -467,12 +468,32 @@ var _handleBaseType2Sql8 = exports.handleBaseType2Sql = function handleBaseType2
       sql += " ".concat(item.name, "(").concat(argSqlList.join(', '), ")");
     }
     if (type === BlockTypeEnum.collection) {
-      var _handleBaseType2Sql7 = _handleBaseType2Sql8(item.list, db),
+      var _handleBaseType2Sql7 = _handleBaseType2Sql1(item.list, db),
         collectionSql = _handleBaseType2Sql7.sql,
         collectionConstants = _handleBaseType2Sql7.constants;
       sql += " ".concat(collectionSql);
       constants.push.apply(constants, (0, _toConsumableArray2["default"])(collectionConstants));
     }
+    if (type === BlockTypeEnum.andOr) {
+      var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
+      if (hasBinarySides) {
+        var _handleBaseType2Sql8 = _handleBaseType2Sql1(item.leftAtoms || [], db),
+          _leftSql2 = _handleBaseType2Sql8.sql,
+          leftConstants = _handleBaseType2Sql8.constants;
+        var _handleBaseType2Sql9 = _handleBaseType2Sql1(item.rightAtoms || [], db),
+          _rightSql2 = _handleBaseType2Sql9.sql,
+          rightConstants = _handleBaseType2Sql9.constants;
+        constants.push.apply(constants, (0, _toConsumableArray2["default"])(leftConstants).concat((0, _toConsumableArray2["default"])(rightConstants)));
+        var operator = (item.operator || 'and').toUpperCase();
+        sql += " (".concat(_leftSql2.trim(), " ").concat(operator, " ").concat(_rightSql2.trim(), ")");
+      } else {
+        var _handleBaseType2Sql0 = _handleBaseType2Sql1(item.atoms || [], db),
+          atomsSql = _handleBaseType2Sql0.sql,
+          nestedConstants = _handleBaseType2Sql0.constants;
+        constants.push.apply(constants, (0, _toConsumableArray2["default"])(nestedConstants));
+        sql += " ".concat((item.operator || 'and').toUpperCase(), " (").concat(atomsSql.trim(), ")");
+      }
+    }
   });
   return {
     sql: sql,
@@ -493,9 +514,9 @@ var _handleJoinData = function _handleJoinData(joinData) {
     if (isSubquery) {
       subQuery = subquery;
     }
-    var _handleBaseType2Sql9 = _handleBaseType2Sql8(expressions, db),
-      sql = _handleBaseType2Sql9.sql,
-      joinConstants = _handleBaseType2Sql9.constants;
+    var _handleBaseType2Sql10 = _handleBaseType2Sql1(expressions, db),
+      sql = _handleBaseType2Sql10.sql,
+      joinConstants = _handleBaseType2Sql10.constants;
     var joinCondition = "on ".concat(sql);
     constants = joinConstants;
     return {
@@ -504,6 +525,7 @@ 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,
@@ -547,6 +569,7 @@ 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;
     }
@@ -578,9 +601,9 @@ var _handleNesting = function handleNesting(data) {
     var customColumnsConstants = [];
     var handleCustomColumn = function handleCustomColumn(data) {
       return data.map(function (it) {
-        var _handleBaseType2Sql0 = _handleBaseType2Sql8(it.formulaList, db),
-          field_sql = _handleBaseType2Sql0.sql,
-          constants = _handleBaseType2Sql0.constants;
+        var _handleBaseType2Sql11 = _handleBaseType2Sql1(it.formulaList, db),
+          field_sql = _handleBaseType2Sql11.sql,
+          constants = _handleBaseType2Sql11.constants;
         customColumnsConstants.push.apply(customColumnsConstants, (0, _toConsumableArray2["default"])(constants));
         return {
           field_sql: "".concat(field_sql, " as ").concat(it.name),
@@ -595,9 +618,9 @@ var _handleNesting = function handleNesting(data) {
     obj.customColumnsConstants = customColumnsConstants;
   }
   if (filterData && filterData.filter.length) {
-    var _handleBaseType2Sql1 = _handleBaseType2Sql8(filterData.filter, db),
-      sql = _handleBaseType2Sql1.sql,
-      constants = _handleBaseType2Sql1.constants;
+    var _handleBaseType2Sql12 = _handleBaseType2Sql1(filterData.filter, db),
+      sql = _handleBaseType2Sql12.sql,
+      constants = _handleBaseType2Sql12.constants;
     obj.filters = 'WHERE ' + sql;
     obj.filtersConstants = constants;
   }
@@ -622,7 +645,7 @@ var _handleNesting = function handleNesting(data) {
     if (summarize.by.length) {
       obj.groupBy.groupColumns = summarize.by.map(function (v) {
         var _v$atoms;
-        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql8(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
+        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql1(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
         queryColumns.push({
           field_sql: "".concat(fieldSql, " as ").concat(v.fieldAlias),
           read_name: '',
@@ -640,8 +663,8 @@ var _handleNesting = function handleNesting(data) {
   }
   if (sortData && sortData.sort.length) {
     obj.orderInfos = "ORDER BY ".concat(sortData.sort.map(function (v) {
-      var _handleBaseType2Sql10 = _handleBaseType2Sql8(v.expression, db),
-        sql = _handleBaseType2Sql10.sql;
+      var _handleBaseType2Sql13 = _handleBaseType2Sql1(v.expression, db),
+        sql = _handleBaseType2Sql13.sql;
       return "".concat(sql, " ").concat(v.sort);
     }).join(', '));
   }

package/lib/cjs/utils.d.ts

@@ -1,5 +1,5 @@
 import { TypeEnum } from './store/enum';
-import { MetaListType, MetaSummarize, MetaData_TableType, MetaData_ColumnsType, AtomsItem } from './store/types';
+import { MetaListType, MetaSummarize, MetaSummarize_Group, MetaSummarize_By, MetaData_TableType, MetaData_ColumnsType, AtomsItem } from './store/types';
 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;
@@ -24,7 +24,7 @@ export declare const getHelper: (list: MetaListType[], item: MetaListType) => He
 export declare const getSubColumns: (metaList: any) => DataType[];
 export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
-export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias">) => MetaListType[];
+export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias"> & Partial<Pick<MetaData_ColumnsType, "id" | "name" | "datasourceId">> & Partial<Pick<MetaSummarize_Group | MetaSummarize_By, "table" | "tableId" | "tableUuid" | "fieldId" | "name">>) => MetaListType[];
 export declare function splitByUnion(data: any): any[];
 export declare const normalizeLegacySummarizeForSave: (metas?: MetaListType[]) => MetaListType[];
 export declare const getObjTem: (arr: any[]) => any;