@gingkoo/pandora-metabase 1.0.129 → 1.0.131

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

@@ -12,7 +12,7 @@ import { __ } from '../../locale';
 import { ChangeType } from '../../store/types';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
-import { uuidv4, getAlias } from '../../utils/helper';
+import { uuidv4, getAlias, isSameColumnByIdFirst, isSameTableByIdFirst } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { changeTableAlias, getSubColumns, isValidSQLAlias, isExistsError } from '../../utils';
 import { RelatedWork } from '@gingkoo/pandora-icons';
@@ -27,7 +27,7 @@ import ItemWrapper from './components/item-wrapper';
 import { ExclamationCircleFill } from '@gingkoo/pandora-icons';
 import { useStore } from '../../hooks/use-provider';
 var TableData = function TableData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table5, _meta$table6, _meta$table8, _meta$table9, _store$showMainColumn;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table4, _meta$table5, _meta$table7, _meta$table8, _store$showMainColumn;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
@@ -39,13 +39,13 @@ var TableData = function TableData(props) {
     setIsDel = _useState2[1];
   var tableIsDel = function () {
     var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
-      var _meta$table, _meta$table2;
-      var tableName, tables, names;
+      var _meta$table;
+      var tableInfo, tables;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            tableName = (_meta$table = meta.table) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
-            if (meta !== null && meta !== void 0 && (_meta$table2 = meta.table) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
+            tableInfo = meta.table;
+            if (meta !== null && meta !== void 0 && (_meta$table = meta.table) !== null && _meta$table !== void 0 && _meta$table.datasourceId) {
               _context.next = 1;
               break;
             }
@@ -53,13 +53,12 @@ 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, meta.table.datasourceType);
+            return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table.datasourceId);
           case 2:
             tables = _context.sent;
-            names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
-              return v.name;
-            })) || [];
-            if (!names.includes(tableName)) {
+            if (!(tables !== null && tables !== void 0 && tables.some(function (v) {
+              return isSameTableByIdFirst(tableInfo, v);
+            }))) {
               setIsDel(true);
             } else {
               setIsDel(false);
@@ -88,25 +87,8 @@ 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.datasourceType !== data.datasourceType || meta.table.name !== data.name) {
+          if (!isSameTableByIdFirst(meta.table, data)) {
             var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];
             newMetaList.table = _objectSpread(_objectSpread({}, data), {}, {
@@ -233,20 +215,23 @@ var TableData = function TableData(props) {
               });
               var items = getSubColumns(newList);
               var newColumns = items.flatMap(function (item) {
-                return item.columns;
+                return item.columns.map(function (column) {
+                  return _objectSpread(_objectSpread({}, column), {}, {
+                    tableId: column.tableId || column.id || item.id,
+                    tableUuid: column.tableUuid || item.tableUuid,
+                    datasourceId: column.datasourceId || item.datasourceId || ''
+                  });
+                });
               }).map(function (v) {
                 return _objectSpread(_objectSpread({}, v), {}, {
                   select: false
                 });
               });
               newMetaList.columns = newColumns.map(function (newCol) {
-                var _existingCol$select;
                 var existingCol = newMetaList.columns.find(function (oldCol) {
-                  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
+                  return isSameColumnByIdFirst(oldCol, newCol);
                 });
+                var _column = existingCol ? existingCol : newCol;
                 _column.select = store.isSelectFields || _column.select;
                 return _column;
               });
@@ -278,17 +263,16 @@ var TableData = function TableData(props) {
       id: '',
       alias: '',
       datasourceName: '',
-      datasourceId: '',
-      datasourceType: ''
+      datasourceId: ''
     };
     store.setMeta(newMetaList, groupIndex);
   };
   var tableIsError = function tableIsError() {
-    var _store$preProps3, _meta$table3;
+    var _store$preProps3, _meta$table2;
     var aliass = ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 || (_store$preProps3 = _store$preProps3.notExistsColumns) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.map(function (v) {
       return v.alias;
     })) || [];
-    var tableAlias = (_meta$table3 = meta.table) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias;
+    var tableAlias = (_meta$table2 = meta.table) === null || _meta$table2 === void 0 ? void 0 : _meta$table2.alias;
     if (tableAlias && aliass.includes(tableAlias) || isDel) {
       return true;
     }
@@ -343,15 +327,15 @@ var TableData = function TableData(props) {
                         size: 'small',
                         onClick: function onClick(e) {
                           if (store.tableEnableAlias) {
-                            var _meta$table4;
+                            var _meta$table3;
                             e.stopPropagation();
-                            onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                            onChangeTableAlias(((_meta$table3 = meta.table) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias) || '');
                           }
                         }
                       })
                     }) : null;
                   }()
-                }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+                }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table4 = meta.table) !== null && _meta$table4 !== void 0 && _meta$table4.alias && store.tableEnableAlias ? "as ".concat((_meta$table5 = meta.table) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
               })
             }) : _jsxs("div", {
               className: cx("Sqb-TableName", {
@@ -382,15 +366,15 @@ var TableData = function TableData(props) {
                       size: 'small',
                       onClick: function onClick(e) {
                         if (store.tableEnableAlias) {
-                          var _meta$table7;
+                          var _meta$table6;
                           e.stopPropagation();
-                          onChangeTableAlias(((_meta$table7 = meta.table) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) || '');
+                          onChangeTableAlias(((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) || '');
                         }
                       }
                     })
                   }) : null;
                 }()
-              }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table8 = meta.table) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
+              }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table7 = meta.table) !== null && _meta$table7 !== void 0 && _meta$table7.alias && store.tableEnableAlias ? "as ".concat((_meta$table8 = meta.table) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.alias) : '') : __('SqlQueryBuilder.pickTable')]
             }), store.showSubquery && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.switchSubQuery'),
               children: _jsx(Button, {

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

@@ -5,10 +5,10 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["alias", "datasourceName", "datasourceId", "datasourceType", "column"];
+var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState, useRef, useMemo } from 'react';
-import { uuidv4, getAlias } from '../utils/helper';
+import { uuidv4, getAlias, isSameColumnByIdFirst } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
 import { splitByUnion } from '../utils';
 import storage from '../utils/storage';
@@ -28,7 +28,6 @@ var useStore = function useStore() {
       alias: '',
       datasourceId: '',
       datasourceName: '',
-      datasourceType: '',
       tableUuid: uuidv4('table')
     },
     columns: []
@@ -313,97 +312,10 @@ var useStore = function useStore() {
     });
   }, [metaList]);
   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 = cloneDeep(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 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee4(source) {
       var results;
@@ -413,17 +325,15 @@ var useStore = function useStore() {
             _context4.next = 1;
             return Promise.all(source.map(function () {
               var _ref4 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee3(v) {
-                var datasourceType, tables;
+                var tables;
                 return _regeneratorRuntime.wrap(function (_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
                     case 0:
-                      datasourceType = getDefaultDatasourceType(v);
                       _context3.next = 1;
-                      return fetchDataset(v.datasourceId, datasourceType);
+                      return fetchDataset(v.datasourceId);
                     case 1:
                       tables = _context3.sent;
                       return _context3.abrupt("return", _objectSpread(_objectSpread({}, v), {}, {
-                        datasourceType: datasourceType,
                         children: tables
                       }));
                     case 2:
@@ -454,34 +364,24 @@ var useStore = function useStore() {
   };
   var fetchDataset = function () {
     var _ref5 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee5(datasourceId) {
-      var _preProps$current;
-      var datasourceType,
-        force,
-        tables,
-        fetchTables,
-        _tables,
-        _args5 = arguments;
+      var tables, _tables;
       return _regeneratorRuntime.wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            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)) {
+            tables = getDataset(datasourceId);
+            if (!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 fetchTables(datasourceId, {
-              isExit: isExit,
-              datasourceType: datasourceType
+            return fetchDatasetFn.current(datasourceId, {
+              isExit: isExit
             });
           case 2:
             _tables = _context5.sent;
-            setDataset(datasourceId, _tables, datasourceType);
+            setDataset(datasourceId, _tables);
             return _context5.abrupt("return", _tables);
           case 3:
           case "end":
@@ -507,11 +407,9 @@ var useStore = function useStore() {
         alias,
         datasourceName,
         did,
-        datasourceType,
         column,
         extra,
         tableName,
-        tableCacheKey,
         columns,
         _columns,
         _args6 = arguments;
@@ -536,33 +434,29 @@ var useStore = function useStore() {
               selectId = [];
               isSelect = false;
             }
-            _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, datasourceType = table.datasourceType, column = table.column, extra = _objectWithoutProperties(table, _excluded);
+            _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, extra = _objectWithoutProperties(table, _excluded);
             tableName = table.name;
-            tableCacheKey = getDatasetCacheKey("".concat(datasourceId, "_").concat(tableName), datasourceType || '');
-            columns = getColumns(tableCacheKey);
+            columns = getColumns(tableName);
             if (columns.length) {
               _context6.next = 2;
               break;
             }
             _context6.next = 1;
             return fetchColumnsFn.current(extra, datasourceId, {
-              isExit: _isExit,
-              datasourceType: datasourceType
+              isExit: _isExit
             });
           case 1:
             columns = _context6.sent;
-            setColumns(tableCacheKey, columns);
+            setColumns(tableName, 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] || {};
+              var obj = oldColumns.find(function (oldColumn) {
+                return isSameColumnByIdFirst(oldColumn, v);
+              });
+              var select = selectId.includes(v.id) || Boolean(obj === null || obj === void 0 ? void 0 : obj.select);
               return _objectSpread(_objectSpread(_objectSpread({}, 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 || uuidv4('field')
+                fieldUuid: (obj === null || obj === void 0 ? void 0 : obj.fieldUuid) || v.fieldUuid || uuidv4('field')
               });
             });
             typeof callback === 'function' && callback(_columns);
@@ -628,16 +522,7 @@ 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 || 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 () {
@@ -645,8 +530,6 @@ 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 _objectSpread({}, v);
@@ -657,8 +540,6 @@ 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 _objectSpread({}, v);
@@ -777,7 +658,6 @@ var useStore = function useStore() {
         tableUuid: '',
         datasourceId: '',
         datasourceName: '',
-        datasourceType: '',
         fieldAlias: '',
         fieldUuid: '',
         fields: []
@@ -789,7 +669,6 @@ 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: []
@@ -807,8 +686,7 @@ var useStore = function useStore() {
           alias: '',
           tableUuid: '',
           datasourceId: '',
-          datasourceName: '',
-          datasourceType: ''
+          datasourceName: ''
         },
         columns: [],
         expressions: []
@@ -863,8 +741,7 @@ var useStore = function useStore() {
           alias: '',
           tableUuid: '',
           datasourceId: '',
-          datasourceName: '',
-          datasourceType: ''
+          datasourceName: ''
         }
       };
     }
@@ -1019,14 +896,12 @@ 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 = _objectSpread({}, _cacheSource2TableMap);
-    map[getDatasetCacheKey(datasourceId, datasourceType)] = tables;
+    map[datasourceId] = tables;
     set_cacheSource2TableMap(map);
   };
   var getDataset = function getDataset(datasourceId) {
-    var datasourceType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    return _cacheSource2TableMap[getDatasetCacheKey(datasourceId, datasourceType)] || [];
+    return _cacheSource2TableMap[datasourceId] || [];
   };
   var reset = function reset() {
     _setMeta(defaultMeta);

package/lib/es/index.js

@@ -73,16 +73,10 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
   var store = useData();
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
-  }, [getTables]);
-  useEffect(function () {
     getColumns && store.setFetchColumnsFn(getColumns);
-  }, [getColumns]);
-  useEffect(function () {
     onChange && store.setFetchChangeFn(onChange);
-  }, [onChange]);
-  useEffect(function () {
     getModuleDiffCode && store.setFetchDiffFn(getModuleDiffCode);
-  }, [getModuleDiffCode]);
+  }, []);
   useEffect(function () {
     store.setProps(props);
   }, [props]);

package/lib/es/locale/en.js

@@ -169,6 +169,7 @@ export default register('en', {
   'metabase.validationFailed': 'Validation failed. Do you still want to save?',
   'metabase.validationFilter': 'The filter configuration is incorrect. Saving is prohibited!',
   'metabase.validationFormula': 'The formula configuration is incorrect. Saving is prohibited!',
+  'metabase.validationFormulaSave': 'The formula configuration is incorrect. Do you still want to save?',
   'metabase.prompt': 'Prompt',
   'metabase.copy': 'Copy',
   'metabase.copySuccess': 'Copy success',

package/lib/es/locale/zh.js

@@ -169,6 +169,7 @@ export default register('zh', {
   'metabase.validationFailed': '校验未通过，是否依然保存？',
   'metabase.validationFilter': '过滤器配置有误，禁止保存！',
   'metabase.validationFormula': '公式配置有误，禁止保存！',
+  'metabase.validationFormulaSave': '公式配置有误，是否依然保存？',
   'metabase.prompt': '提示',
   'metabase.copy': '复制',
   'metabase.copySuccess': '复制成功',

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

@@ -123,7 +123,6 @@ export interface AtomsField {
     tableUuid: string;
     datasourceName: string;
     datasourceId: string;
-    datasourceType?: string;
     type: AtomsTypeEnum.FIELD;
 }
 export interface AtomsInputString {
@@ -189,20 +188,23 @@ export interface TableType {
     id: string;
     alias: string;
     tableUuid: string;
+    table_type?: string;
 }
 export type MetaData_TableType = TableType & DatasourceType;
 export interface MetaData_ColumnsType {
     name: string;
     id: string;
+    fieldId?: string;
     name_zh?: string;
     fieldAlias: string;
     fieldUuid: string;
+    tableId?: string;
+    tableUuid?: string;
     realName?: string;
     database_type: SQL_COLUMN_TYPE | '';
     special_type: SpecialType | '';
     datasourceId: string;
     datasourceName: string;
-    datasourceType?: string;
     select: boolean;
     summarizeType?: MetaSummarize_Enum;
 }
@@ -231,7 +233,6 @@ export interface MetaJoin_TalbeType {
     alias: string;
     datasourceName: string;
     datasourceId: string;
-    datasourceType?: string;
     quotes?: string;
     columns?: MetaData_ColumnsType[];
 }
@@ -291,7 +292,6 @@ export interface MetaSummarize_Group {
     quotes: string;
     datasourceId: string;
     datasourceName: string;
-    datasourceType?: string;
     atoms?: AtomsItem[];
     summarizeType: MetaSummarize_Enum;
     [params: string]: any;
@@ -309,7 +309,6 @@ export interface MetaSummarize_By {
     id: string;
     datasourceId: string;
     datasourceName: string;
-    datasourceType?: string;
     realName?: string;
     sql: string;
     database_type: SQL_COLUMN_TYPE | '';

package/lib/es/types.d.ts

@@ -10,7 +10,6 @@ export interface MetaListProps {
 }
 export interface FetchOptions {
     isExit: boolean;
-    datasourceType?: string;
 }
 export interface MetabaseProps {
     loading?: boolean;
@@ -71,16 +70,9 @@ 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/es/utils/helper.d.ts

@@ -1,4 +1,8 @@
 import type { MetaListType } from '../store/types';
+export declare const getTableIdFirstKey: (table?: any) => string;
+export declare const isSameTableByIdFirst: (left?: any, right?: any) => boolean;
+export declare const getColumnIdFirstKey: (column?: any) => string;
+export declare const isSameColumnByIdFirst: (left?: any, right?: any) => boolean;
 export declare const throttle: (fn: Function, wait?: number) => Function;
 export declare const debounce: (fn: Function, wait?: number) => () => void;
 export type ScreenType = {