@gingkoo/pandora-metabase 1.0.126 → 1.0.128

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

@@ -106,7 +106,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) {
@@ -148,6 +148,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) {
@@ -192,6 +193,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -207,7 +209,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || (0, _helper.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 === _enum.TypeEnum.joinData) {
           mo.push({
@@ -218,7 +221,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           });
         }
         return mo;
@@ -234,6 +238,7 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
+      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -258,6 +263,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) {
@@ -302,6 +308,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: v.columns || []
           };
         }));
@@ -317,7 +324,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || (0, _helper.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 === _enum.TypeEnum.joinData) {
           mo.push({
@@ -328,7 +336,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           });
         }
         return mo;
@@ -342,6 +351,7 @@ var JoinData = function JoinData(props) {
       tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
       datasourceId: meta.table2.datasourceId,
       datasourceName: meta.table2.datasourceName,
+      datasourceType: meta.table2.datasourceType,
       columns: meta.columns
     }]);
     return data;
@@ -386,7 +396,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) {}
@@ -406,6 +417,7 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             datasourceId: v.table2.datasourceId,
             datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType,
             columns: []
           };
         }));
@@ -421,7 +433,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table.tableUuid || (0, _helper.uuidv4)('table'),
             columns: [],
             datasourceId: v.table.datasourceId,
-            datasourceName: v.table.datasourceName
+            datasourceName: v.table.datasourceName,
+            datasourceType: v.table.datasourceType
           });
         } else if (v.type === _enum.TypeEnum.joinData) {
           mo.push({
@@ -432,7 +445,8 @@ var JoinData = function JoinData(props) {
             tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
             columns: [],
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName
+            datasourceName: v.table2.datasourceName,
+            datasourceType: v.table2.datasourceType
           });
         }
         return mo;
@@ -468,6 +482,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({
@@ -478,9 +493,25 @@ var JoinData = function JoinData(props) {
         tableFlat: store.tableFlat,
         data: store.sourceList,
         value: value,
+        onDatasourceTypeChange: function onDatasourceTypeChange(data) {
+          var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
+          var joinMeta = newMeta[index];
+          joinMeta.table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, joinMeta.table2), data), {}, {
+            datasourceType: data.datasourceType
+          });
+          joinMeta.columns = joinMeta.columns.map(function (column) {
+            return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
+              datasourceType: data.datasourceType
+            });
+          });
+          store.setMeta(newMeta, groupIndex, {
+            obj: data,
+            type: _types.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 = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
             var alias = (0, _helper.getAlias)(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
@@ -492,7 +523,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);
@@ -530,6 +562,7 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
+        datasourceType: '',
         type: _types.AtomsTypeEnum.FIELD
       }],
       condition: '',
@@ -546,6 +579,7 @@ var JoinData = function JoinData(props) {
         tableUuid: '',
         datasourceName: '',
         datasourceId: '',
+        datasourceType: '',
         type: _types.AtomsTypeEnum.FIELD
       }],
       type: _types.AtomsTypeEnum.JOIN_DEFAULT
@@ -590,6 +624,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) {
@@ -634,6 +669,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -649,7 +685,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || (0, _helper.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 === _enum.TypeEnum.joinData) {
             mo.push({
@@ -660,7 +697,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName
+              datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType
             });
           }
           return mo;
@@ -681,6 +719,7 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
+        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -709,6 +748,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) {
@@ -753,6 +793,7 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               datasourceId: v.table2.datasourceId,
               datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType,
               columns: v.columns
             };
           }));
@@ -768,7 +809,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table.tableUuid || (0, _helper.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 === _enum.TypeEnum.joinData) {
             mo.push({
@@ -779,7 +821,8 @@ var JoinData = function JoinData(props) {
               tableUuid: v.table2.tableUuid || (0, _helper.uuidv4)('table'),
               columns: v.columns,
               datasourceId: v.table2.datasourceId,
-              datasourceName: v.table2.datasourceName
+              datasourceName: v.table2.datasourceName,
+              datasourceType: v.table2.datasourceType
             });
           }
           return mo;
@@ -800,6 +843,7 @@ var JoinData = function JoinData(props) {
         tableUuid: meta.table2.tableUuid || (0, _helper.uuidv4)('table'),
         datasourceId: meta.table2.datasourceId,
         datasourceName: meta.table2.datasourceName,
+        datasourceType: meta.table2.datasourceType,
         columns: meta.columns
       }];
     }
@@ -828,6 +872,7 @@ var JoinData = function JoinData(props) {
             tableUuid: '',
             datasourceName: '',
             datasourceId: '',
+            datasourceType: '',
             type: _types.AtomsTypeEnum.FIELD
           }];
           store.setMeta(newMeta, groupIndex, {
@@ -924,6 +969,7 @@ var JoinData = function JoinData(props) {
               tableUuid: '',
               datasourceName: '',
               datasourceId: '',
+              datasourceType: '',
               type: _types.AtomsTypeEnum.FIELD
             }];
           }
@@ -988,10 +1034,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 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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;
               });
@@ -1111,6 +1160,7 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
+          datasourceType: '',
           type: _types.AtomsTypeEnum.FIELD
         }],
         condition: '',
@@ -1127,6 +1177,7 @@ var JoinData = function JoinData(props) {
           tableUuid: '',
           datasourceName: '',
           datasourceId: '',
+          datasourceType: '',
           type: _types.AtomsTypeEnum.FIELD
         }],
         type: type

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

@@ -41,7 +41,8 @@ var PermissionTable = function PermissionTable(props) {
         tableUuid: (0, _helper.uuidv4)('table'),
         alias: prevGroupBy.alias,
         datasourceId: '',
-        datasourceName: ''
+        datasourceName: '',
+        datasourceType: ''
       };
       data = [_data];
       var joinData = prevList.filter(function (v) {
@@ -58,7 +59,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
           };
         }));
       }
@@ -72,7 +74,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 === _enum.TypeEnum.joinData) {
           mo.push({
@@ -82,7 +85,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/cjs/components/modules/sort.js

@@ -90,7 +90,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/cjs/components/modules/summarize/group-by.js

@@ -45,7 +45,13 @@ var _getSummaryText = function getSummaryText() {
       return [lhs, item.condition, rhs].filter(Boolean).join(' ').trim();
     }
     if (item.type === _types.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 === _types.AtomsTypeEnum.CASE_WHEN) {
       return item.quotes || 'case when';
@@ -102,6 +108,7 @@ var GroupByEditor = function GroupByEditor(_ref) {
           tableUuid: value.tableUuid || '',
           datasourceName: value.datasourceName || '',
           datasourceId: value.datasourceId || '',
+          datasourceType: value.datasourceType || '',
           type: _types.AtomsTypeEnum.FIELD
         };
         return [fieldAtom];
@@ -221,6 +228,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
           };
         }));
@@ -236,6 +244,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 === _enum.TypeEnum.joinData) {
@@ -247,6 +256,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 {
@@ -305,6 +315,7 @@ var GroupBy = function GroupBy(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
+      datasourceType: '',
       atoms: [],
       summarizeType: _types.MetaSummarize_Enum.BY
     };
@@ -365,6 +376,7 @@ var GroupBy = function GroupBy(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].by[i].fieldAlias = fieldAlias;
                 newMeta[index].by[i].sql = (0, _helper2.summarizeByToSql)(newMeta[index].by[i]);
+                newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].by,
                   type: _types.ChangeType.by
@@ -390,7 +402,8 @@ var GroupBy = function GroupBy(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: ''
+        datasourceId: '',
+        datasourceType: ''
       });
     });
   };
@@ -409,6 +422,7 @@ var GroupBy = function GroupBy(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
+      datasourceType: '',
       type: _types.AtomsTypeEnum.FIELD
     });
   };
@@ -432,13 +446,13 @@ var GroupBy = function GroupBy(props) {
           if (_found) return _found;
         }
         if (item.type === _types.AtomsTypeEnum.AND_OR) {
-          var _found2 = _getFirstField(item.list || []);
+          var _found2 = _getFirstField([].concat((0, _toConsumableArray2["default"])(item.leftAtoms || []), (0, _toConsumableArray2["default"])(item.rightAtoms || []), (0, _toConsumableArray2["default"])(item.atoms || [])));
           if (_found2) return _found2;
         }
         if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {
-          var _found3 = _getFirstField(item.caseValue || []) || (item.branches || []).map(function (branch) {
-            return _getFirstField([].concat((0, _toConsumableArray2["default"])(branch.when || []), (0, _toConsumableArray2["default"])(branch.then || [])));
-          }).find(Boolean) || _getFirstField(item.elseValue || []);
+          var _found3 = _getFirstField(item.caseAtoms || []) || (item.whenClauses || []).map(function (branch) {
+            return _getFirstField([].concat((0, _toConsumableArray2["default"])(branch.whenAtoms || []), (0, _toConsumableArray2["default"])(branch.thenAtoms || [])));
+          }).find(Boolean) || _getFirstField(item.elseAtoms || []);
           if (_found3) return _found3;
         }
         if (item.type === _types.AtomsTypeEnum.EXISTS || item.type === _types.AtomsTypeEnum.NOT_EXISTS) {

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

@@ -204,6 +204,7 @@ var SelectIndex = function SelectIndex(props) {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
+      datasourceType: '',
       summarizeType: _types.MetaSummarize_Enum.GROUP
     };
     store.setPopup2({
@@ -281,6 +282,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 = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex, {
                   obj: newMeta[index].group,
                   type: _types.ChangeType.group
@@ -306,7 +308,8 @@ var SelectIndex = function SelectIndex(props) {
         tableUuid: v.tableUuid,
         alias: v.alias,
         datasourceName: '',
-        datasourceId: ''
+        datasourceId: '',
+        datasourceType: ''
       });
     });
   };
@@ -325,6 +328,7 @@ var SelectIndex = function SelectIndex(props) {
       tableUuid: v.tableUuid,
       datasourceName: '',
       datasourceId: '',
+      datasourceType: '',
       type: _types.AtomsTypeEnum.FIELD
     });
   };
@@ -351,13 +355,13 @@ var SelectIndex = function SelectIndex(props) {
           if (_found) return _found;
         }
         if (item.type === _types.AtomsTypeEnum.AND_OR) {
-          var _found2 = _getFirstField(item.list || []);
+          var _found2 = _getFirstField([].concat((0, _toConsumableArray2["default"])(item.leftAtoms || []), (0, _toConsumableArray2["default"])(item.rightAtoms || []), (0, _toConsumableArray2["default"])(item.atoms || [])));
           if (_found2) return _found2;
         }
         if (item.type === _types.AtomsTypeEnum.CASE_WHEN) {
-          var _found3 = _getFirstField(item.caseValue || []) || (item.branches || []).map(function (branch) {
-            return _getFirstField([].concat((0, _toConsumableArray2["default"])(branch.when || []), (0, _toConsumableArray2["default"])(branch.then || [])));
-          }).find(Boolean) || _getFirstField(item.elseValue || []);
+          var _found3 = _getFirstField(item.caseAtoms || []) || (item.whenClauses || []).map(function (branch) {
+            return _getFirstField([].concat((0, _toConsumableArray2["default"])(branch.whenAtoms || []), (0, _toConsumableArray2["default"])(branch.thenAtoms || [])));
+          }).find(Boolean) || _getFirstField(item.elseAtoms || []);
           if (_found3) return _found3;
         }
         if (item.type === _types.AtomsTypeEnum.EXISTS || item.type === _types.AtomsTypeEnum.NOT_EXISTS) {

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

@@ -59,7 +59,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) {
@@ -94,8 +94,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 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newMetaList.table), data), {}, {
+            datasourceType: data.datasourceType
+          });
+          newMetaList.columns = newMetaList.columns.map(function (column) {
+            return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
+              datasourceType: data.datasourceType
+            });
+          });
+          newMetas[0] = newMetaList;
+          store.setMeta(newMetas, groupIndex, {
+            obj: data,
+            type: _types.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 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {
@@ -229,10 +246,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 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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;
               });
@@ -264,7 +284,8 @@ var TableData = function TableData(props) {
       id: '',
       alias: '',
       datasourceName: '',
-      datasourceId: ''
+      datasourceId: '',
+      datasourceType: ''
     };
     store.setMeta(newMetaList, groupIndex);
   };