@gingkoo/pandora-metabase 1.0.126 → 1.0.128

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

@@ -101,7 +101,7 @@ var JoinData = function JoinData(props) {
             return _context.abrupt("return");
           case 1:
             _context.next = 2;
-            return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId);
+            return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId, meta.table2.datasourceType);
           case 2:
             tables = _context.sent;
             names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
@@ -143,6 +143,7 @@ var JoinData = function JoinData(props) {
         name_zh: prevGroupBy.alias,
         datasourceId: '',
         datasourceName: '',
+        datasourceType: '',
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
@@ -187,6 +188,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -202,7 +204,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName
+            datasourceName: v.table.datasourceName,
+            datasourceType: v.table.datasourceType
           }));
         } else if (v.type === TypeEnum.joinData) {
           mo.push({
@@ -213,7 +216,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           });
         }
         return mo;
@@ -229,6 +233,7 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || uuidv4('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
+      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -253,6 +258,7 @@ var JoinData = function JoinData(props) {
         name_zh: prevGroupBy.alias,
         datasourceId: '',
         datasourceName: '',
+        datasourceType: '',
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group2 = prevGroupBy.group) !== null && _prevGroupBy$group2 !== void 0 && _prevGroupBy$group2.length) {
@@ -297,6 +303,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -312,7 +319,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName
+            datasourceName: v.table.datasourceName,
+            datasourceType: v.table.datasourceType
           }));
         } else if (v.type === TypeEnum.joinData) {
           mo.push({
@@ -323,7 +331,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           });
         }
         return mo;
@@ -337,6 +346,7 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || uuidv4('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
+      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     return data;
@@ -381,7 +391,8 @@ var JoinData = function JoinData(props) {
         name: prevGroupBy.alias,
         name_zh: prevGroupBy.alias,
         datasourceId: '',
-        datasourceName: ''
+        datasourceName: '',
+        datasourceType: ''
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group3 = prevGroupBy.group) !== null && _prevGroupBy$group3 !== void 0 && _prevGroupBy$group3.length) {}
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by3 = prevGroupBy.by) !== null && _prevGroupBy$by3 !== void 0 && _prevGroupBy$by3.length) {}
@@ -401,6 +412,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: []
           };
         }));
@@ -416,7 +428,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || uuidv4('table'),
             columns: [],
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName
+            datasourceName: v.table.datasourceName,
+            datasourceType: v.table.datasourceType
           });
         } else if (v.type === TypeEnum.joinData) {
           mo.push({
@@ -427,7 +440,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: [],
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           });
         }
         return mo;
@@ -463,6 +477,7 @@ var JoinData = function JoinData(props) {
       alias: meta.table2.alias,
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
+      datasourceType: meta.table2.datasourceType,
       tableUuid: meta.table2.tableUuid || ''
     };
     !meta.readonly && store.setPopup({
@@ -473,9 +488,25 @@ var JoinData = function JoinData(props) {
         tableFlat: store.tableFlat,
         data: store.sourceList,
         value: value,
+        onDatasourceTypeChange: function onDatasourceTypeChange(data) {
+          var newMeta = cloneDeep(store.metaList[groupIndex].list);
+          var joinMeta = newMeta[index];
+          joinMeta.table2 = _objectSpread(_objectSpread(_objectSpread({}, joinMeta.table2), data), {}, {
+            datasourceType: data.datasourceType
+          });
+          joinMeta.columns = joinMeta.columns.map(function (column) {
+            return _objectSpread(_objectSpread({}, column), {}, {
+              datasourceType: data.datasourceType
+            });
+          });
+          store.setMeta(newMeta, groupIndex, {
+            obj: data,
+            type: ChangeType.table2
+          });
+        },
         onChange: function onChange(data) {
           var tableName = data.name;
-          if (meta.table2.name !== tableName || meta.table2.datasourceId !== data.datasourceId) {
+          if (meta.table2.name !== tableName || meta.table2.datasourceId !== data.datasourceId || meta.table2.datasourceType !== data.datasourceType) {
             var _store$preProps;
             var newMeta = cloneDeep(store.metaList[groupIndex].list);
             var alias = getAlias(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
@@ -487,7 +518,8 @@ var JoinData = function JoinData(props) {
               fieldUuid: '',
               quotes: '',
               datasourceId: data.datasourceId,
-              datasourceName: data.datasourceName
+              datasourceName: data.datasourceName,
+              datasourceType: data.datasourceType
             });
             newMeta[index].table2 = _table2;
             initExpressions(newMeta);
@@ -525,6 +557,7 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
+        datasourceType: '',
         type: AtomsTypeEnum.FIELD
       }],
       condition: '',
@@ -541,6 +574,7 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
+        datasourceType: '',
         type: AtomsTypeEnum.FIELD
       }],
       type: AtomsTypeEnum.JOIN_DEFAULT
@@ -585,6 +619,7 @@ var JoinData = function JoinData(props) {
           alias: prevGroupBy.alias,
           datasourceId: '',
           datasourceName: '',
+          datasourceType: '',
           columns: []
         };
         if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group4 = prevGroupBy.group) !== null && _prevGroupBy$group4 !== void 0 && _prevGroupBy$group4.length) {
@@ -629,6 +664,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -644,7 +680,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || uuidv4('table'),
               columns: v.columns,
               datasourceId: v.table.datasourceId,
-              datasourceName: v.table.datasourceName
+              datasourceName: v.table.datasourceName,
+              datasourceType: v.table.datasourceType
             });
           } else if (v.type === TypeEnum.joinData) {
             mo.push({
@@ -655,7 +692,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName
+              datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType
             });
           }
           return mo;
@@ -676,6 +714,7 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || uuidv4('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
+        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -704,6 +743,7 @@ var JoinData = function JoinData(props) {
           alias: prevGroupBy.alias,
           datasourceId: '',
           datasourceName: '',
+          datasourceType: '',
           columns: []
         };
         if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group5 = prevGroupBy.group) !== null && _prevGroupBy$group5 !== void 0 && _prevGroupBy$group5.length) {
@@ -748,6 +788,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -763,7 +804,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || uuidv4('table'),
               columns: v.columns,
               datasourceId: v.table.datasourceId,
-              datasourceName: v.table.datasourceName
+              datasourceName: v.table.datasourceName,
+              datasourceType: v.table.datasourceType
             });
           } else if (v.type === TypeEnum.joinData) {
             mo.push({
@@ -774,7 +816,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || uuidv4('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName
+              datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType
             });
           }
           return mo;
@@ -795,6 +838,7 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || uuidv4('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
+        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -823,6 +867,7 @@ var JoinData = function JoinData(props) {
             tableUuid: '',
             datasourceName: '',
             datasourceId: '',
+            datasourceType: '',
             type: AtomsTypeEnum.FIELD
           }];
           store.setMeta(newMeta, groupIndex, {
@@ -919,6 +964,7 @@ var JoinData = function JoinData(props) {
               tableUuid: '',
               datasourceName: '',
               datasourceId: '',
+              datasourceType: '',
               type: AtomsTypeEnum.FIELD
             }];
           }
@@ -983,10 +1029,13 @@ var JoinData = function JoinData(props) {
                 });
               });
               newMeta[index].columns = newColumns.map(function (newCol) {
+                var _existingCol$select;
                 var existingCol = newMeta[index].columns.find(function (oldCol) {
-                  return oldCol.name === newCol.name;
+                  return newCol.fieldUuid && oldCol.fieldUuid === newCol.fieldUuid || newCol.fieldAlias && oldCol.fieldAlias === newCol.fieldAlias || oldCol.name === newCol.name;
+                });
+                var _column = _objectSpread(_objectSpread({}, newCol), {}, {
+                  select: (_existingCol$select = existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) !== null && _existingCol$select !== void 0 ? _existingCol$select : newCol.select
                 });
-                var _column = existingCol ? existingCol : newCol;
                 _column.select = store.isSelectFields || _column.select;
                 return _column;
               });
@@ -1106,6 +1155,7 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
+          datasourceType: '',
           type: AtomsTypeEnum.FIELD
         }],
         condition: '',
@@ -1122,6 +1172,7 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
+          datasourceType: '',
           type: AtomsTypeEnum.FIELD
         }],
         type: type

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

@@ -35,7 +35,8 @@ var PermissionTable = function PermissionTable(props) {
         tableUuid: uuidv4('table'),
         alias: prevGroupBy.alias,
         datasourceId: '',
-        datasourceName: ''
+        datasourceName: '',
+        datasourceType: ''
       };
       data = [_data];
       var joinData = prevList.filter(function (v) {
@@ -52,7 +53,8 @@ var PermissionTable = function PermissionTable(props) {
             tableUuid: v.table2.tableUuid,
             id: v.table2.id,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           };
         }));
       }
@@ -66,7 +68,8 @@ var PermissionTable = function PermissionTable(props) {
             id: v.table.id,
             tableUuid: v.table.tableUuid,
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName
+            datasourceName: v.table.datasourceName,
+            datasourceType: v.table.datasourceType
           });
         } else if (v.type === TypeEnum.joinData) {
           mo.push({
@@ -76,7 +79,8 @@ var PermissionTable = function PermissionTable(props) {
             id: v.table2.id,
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           });
         }
         return mo;

package/lib/es/components/modules/sort.js

@@ -83,7 +83,8 @@ var Sort = function Sort(props) {
             id: v.table2.id,
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           };
         } else {
           return {

package/lib/es/components/modules/summarize/group-by.js

@@ -14,7 +14,7 @@ import { TypeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4, getAlias } from '../../../utils/helper';
-import { isExistsError, isValidSQLAlias } from '../../../utils';
+import { changeFieldAlias, isExistsError, isValidSQLAlias } from '../../../utils';
 import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
 import FormulaList from '../../dialog/formula-list';
@@ -39,7 +39,13 @@ var _getSummaryText = function getSummaryText() {
       return [lhs, item.condition, rhs].filter(Boolean).join(' ').trim();
     }
     if (item.type === AtomsTypeEnum.AND_OR) {
-      return "".concat(item.operator || 'and', " ( ").concat(_getSummaryText(item.list || []), " )").replace(/\s+/g, ' ').trim();
+      var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
+      if (hasBinarySides) {
+        var leftText = _getSummaryText(item.leftAtoms || []);
+        var rightText = _getSummaryText(item.rightAtoms || []);
+        return "( ".concat(leftText, " ").concat(item.operator || 'and', " ").concat(rightText, " )").replace(/\s+/g, ' ').trim();
+      }
+      return "".concat(item.operator || 'and', " ( ").concat(_getSummaryText(item.atoms || []), " )").replace(/\s+/g, ' ').trim();
     }
     if (item.type === AtomsTypeEnum.CASE_WHEN) {
       return item.quotes || 'case when';
@@ -96,6 +102,7 @@ var GroupByEditor = function GroupByEditor(_ref) {
           tableUuid: value.tableUuid || '',
           datasourceName: value.datasourceName || '',
           datasourceId: value.datasourceId || '',
+          datasourceType: value.datasourceType || '',
           type: AtomsTypeEnum.FIELD
         };
         return [fieldAtom];
@@ -215,6 +222,7 @@ var GroupBy = function GroupBy(props) {
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: v.columns
           };
         }));
@@ -230,6 +238,7 @@ var GroupBy = function GroupBy(props) {
             tableUuid: v.table.tableUuid,
             datasourceId: v.table.datasourceId,
             datasourceName: v.table.datasourceName,
+            datasourceType: v.table.datasourceType,
             columns: v.columns
           };
         } else if (v.type === TypeEnum.joinData) {
@@ -241,6 +250,7 @@ var GroupBy = function GroupBy(props) {
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: v.columns
           };
         } else {
@@ -299,6 +309,7 @@ var GroupBy = function GroupBy(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
+      datasourceType: '',
       atoms: [],
       summarizeType: MetaSummarize_Enum.BY
     };
@@ -359,6 +370,7 @@ var GroupBy = function GroupBy(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].by[i].fieldAlias = fieldAlias;
                 newMeta[index].by[i].sql = summarizeByToSql(newMeta[index].by[i]);
+                newMeta = changeFieldAlias(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].by,
                   type: ChangeType.by
@@ -384,7 +396,8 @@ var GroupBy = function GroupBy(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: ''
+        datasourceId: '',
+        datasourceType: ''
       });
     });
   };
@@ -403,6 +416,7 @@ var GroupBy = function GroupBy(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
+      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     });
   };
@@ -426,13 +440,13 @@ var GroupBy = function GroupBy(props) {
           if (_found) return _found;
         }
         if (item.type === AtomsTypeEnum.AND_OR) {
-          var _found2 = _getFirstField(item.list || []);
+          var _found2 = _getFirstField([].concat(_toConsumableArray(item.leftAtoms || []), _toConsumableArray(item.rightAtoms || []), _toConsumableArray(item.atoms || [])));
           if (_found2) return _found2;
         }
         if (item.type === AtomsTypeEnum.CASE_WHEN) {
-          var _found3 = _getFirstField(item.caseValue || []) || (item.branches || []).map(function (branch) {
-            return _getFirstField([].concat(_toConsumableArray(branch.when || []), _toConsumableArray(branch.then || [])));
-          }).find(Boolean) || _getFirstField(item.elseValue || []);
+          var _found3 = _getFirstField(item.caseAtoms || []) || (item.whenClauses || []).map(function (branch) {
+            return _getFirstField([].concat(_toConsumableArray(branch.whenAtoms || []), _toConsumableArray(branch.thenAtoms || [])));
+          }).find(Boolean) || _getFirstField(item.elseAtoms || []);
           if (_found3) return _found3;
         }
         if (item.type === AtomsTypeEnum.EXISTS || item.type === AtomsTypeEnum.NOT_EXISTS) {

package/lib/es/components/modules/summarize/select-index.js

@@ -13,7 +13,7 @@ import { summarizeToSql } from '../../../store/helper';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4 } from '../../../utils/helper';
 import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
-import { isExistsError, isValidSQLAlias } from '../../../utils';
+import { changeFieldAlias, isExistsError, isValidSQLAlias } from '../../../utils';
 import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
 import { SelectSummarize } from '../../dialog';
@@ -198,6 +198,7 @@ var SelectIndex = function SelectIndex(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
+      datasourceType: '',
       summarizeType: MetaSummarize_Enum.GROUP
     };
     store.setPopup2({
@@ -275,6 +276,7 @@ var SelectIndex = function SelectIndex(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].group[i].fieldAlias = fieldAlias;
                 newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias);
+                newMeta = changeFieldAlias(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].group,
                   type: ChangeType.group
@@ -300,7 +302,8 @@ var SelectIndex = function SelectIndex(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: ''
+        datasourceId: '',
+        datasourceType: ''
       });
     });
   };
@@ -319,6 +322,7 @@ var SelectIndex = function SelectIndex(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
+      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     });
   };
@@ -345,13 +349,13 @@ var SelectIndex = function SelectIndex(props) {
           if (_found) return _found;
         }
         if (item.type === AtomsTypeEnum.AND_OR) {
-          var _found2 = _getFirstField(item.list || []);
+          var _found2 = _getFirstField([].concat(_toConsumableArray(item.leftAtoms || []), _toConsumableArray(item.rightAtoms || []), _toConsumableArray(item.atoms || [])));
           if (_found2) return _found2;
         }
         if (item.type === AtomsTypeEnum.CASE_WHEN) {
-          var _found3 = _getFirstField(item.caseValue || []) || (item.branches || []).map(function (branch) {
-            return _getFirstField([].concat(_toConsumableArray(branch.when || []), _toConsumableArray(branch.then || [])));
-          }).find(Boolean) || _getFirstField(item.elseValue || []);
+          var _found3 = _getFirstField(item.caseAtoms || []) || (item.whenClauses || []).map(function (branch) {
+            return _getFirstField([].concat(_toConsumableArray(branch.whenAtoms || []), _toConsumableArray(branch.thenAtoms || [])));
+          }).find(Boolean) || _getFirstField(item.elseAtoms || []);
           if (_found3) return _found3;
         }
         if (item.type === AtomsTypeEnum.EXISTS || item.type === AtomsTypeEnum.NOT_EXISTS) {

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

@@ -53,7 +53,7 @@ var TableData = function TableData(props) {
             return _context.abrupt("return");
           case 1:
             _context.next = 2;
-            return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table.datasourceId);
+            return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table.datasourceId, meta.table.datasourceType);
           case 2:
             tables = _context.sent;
             names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
@@ -88,8 +88,25 @@ var TableData = function TableData(props) {
         data: store.sourceList,
         sourceTable: store.sourceTable || [],
         value: meta.table,
+        onDatasourceTypeChange: function onDatasourceTypeChange(data) {
+          var newMetas = store.metaList[groupIndex].list.slice();
+          var newMetaList = newMetas[0];
+          newMetaList.table = _objectSpread(_objectSpread(_objectSpread({}, newMetaList.table), data), {}, {
+            datasourceType: data.datasourceType
+          });
+          newMetaList.columns = newMetaList.columns.map(function (column) {
+            return _objectSpread(_objectSpread({}, column), {}, {
+              datasourceType: data.datasourceType
+            });
+          });
+          newMetas[0] = newMetaList;
+          store.setMeta(newMetas, groupIndex, {
+            obj: data,
+            type: ChangeType.datasource
+          });
+        },
         onChange: function onChange(data) {
-          if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
+          if (meta.table.datasourceId !== data.datasourceId || meta.table.datasourceType !== data.datasourceType || meta.table.name !== data.name) {
             var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];
             newMetaList.table = _objectSpread(_objectSpread({}, data), {}, {
@@ -223,10 +240,13 @@ var TableData = function TableData(props) {
                 });
               });
               newMetaList.columns = newColumns.map(function (newCol) {
+                var _existingCol$select;
                 var existingCol = newMetaList.columns.find(function (oldCol) {
-                  return oldCol.name === newCol.name;
+                  return newCol.fieldUuid && oldCol.fieldUuid === newCol.fieldUuid || newCol.fieldAlias && oldCol.fieldAlias === newCol.fieldAlias || oldCol.name === newCol.name;
+                });
+                var _column = _objectSpread(_objectSpread({}, newCol), {}, {
+                  select: (_existingCol$select = existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) !== null && _existingCol$select !== void 0 ? _existingCol$select : newCol.select
                 });
-                var _column = existingCol ? existingCol : newCol;
                 _column.select = store.isSelectFields || _column.select;
                 return _column;
               });
@@ -258,7 +278,8 @@ var TableData = function TableData(props) {
       id: '',
       alias: '',
       datasourceName: '',
-      datasourceId: ''
+      datasourceId: '',
+      datasourceType: ''
     };
     store.setMeta(newMetaList, groupIndex);
   };