@gingkoo/pandora-metabase 1.0.27 → 1.0.28

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

@@ -17,8 +17,10 @@ var _types = require("../../../store/types");
 var _selectJoinColumn = _interopRequireDefault(require("../../dialog/select-join-column"));
 var _pandora = require("@gingkoo/pandora");
 var _helper = require("../../../utils/helper");
+var _itemName = _interopRequireDefault(require("../components/item-name"));
 var _icons = require("../../icons");
 var _useProvider = require("../../../hooks/use-provider");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var GroupBy = function GroupBy(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
@@ -88,6 +90,8 @@ var GroupBy = function GroupBy(props) {
             tableUuid: v.table2.tableUuid,
             tableId: v.table2.id,
             table: v.table2.name,
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName,
             columns: v.columns
           };
         }));
@@ -101,6 +105,8 @@ var GroupBy = function GroupBy(props) {
             table: v.table.name,
             tableUuid: v.table.tableUuid,
             tableId: v.table.id,
+            datasourceId: v.table.datasourceId,
+            datasourceName: v.table.datasourceName,
             columns: v.columns
           };
         } else if (v.type === _enum.TypeEnum.joinData) {
@@ -109,6 +115,8 @@ var GroupBy = function GroupBy(props) {
             table: v.table2.name,
             tableId: v.table2.id,
             tableUuid: v.table2.tableUuid,
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName,
             columns: v.columns
           };
         } else {
@@ -146,11 +154,9 @@ var GroupBy = function GroupBy(props) {
               fieldAlias: fieldAlias
             });
           });
-          if (value.quotes !== data.quotes) {
-            newMeta = newMeta.filter(function (_, _i) {
-              return _i <= index;
-            });
-          }
+          // if (value.quotes !== data.quotes) {
+          //   newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
+          // }
           store.setMeta(newMeta, groupIndex);
           closePopup();
         }
@@ -216,9 +222,7 @@ var GroupBy = function GroupBy(props) {
     newMeta[index].by = by.filter(function (_, i) {
       return i !== itemId;
     });
-    newMeta = newMeta.filter(function (_, _i) {
-      return _i <= index;
-    });
+    // newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
     store.setMeta(newMeta, groupIndex);
   }
   function closePopup() {
@@ -240,22 +244,22 @@ var GroupBy = function GroupBy(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newMeta;
-          return _regenerator["default"].wrap(function _callee$(_context) {
+          return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
-                  _context.next = 3;
+                  _context.next = 1;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 3:
+              case 1:
                 newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
                 newMeta[index].by[i].fieldAlias = fieldAlias;
                 newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex);
-              case 8:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -269,36 +273,84 @@ var GroupBy = function GroupBy(props) {
       onCancel: function onCancel() {}
     });
   };
+  var _getColumns = function _getColumns() {
+    return getColumns().map(function (v) {
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        name: v.table,
+        id: v.tableId,
+        name_zh: '',
+        tableUuid: v.tableUuid,
+        alias: v.alias,
+        // 线上的都为空，默认会标红。 等统一格式后可隐藏
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '' // 数据源id
+      });
+    });
+  };
+  var getField = function getField(v) {
+    var _v = (0, _cloneDeep["default"])(v);
+    return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _v), {}, {
+      fieldName: v.name,
+      // 字段名
+      fieldNameZh: v.name_zh,
+      // 字段中文名
+      fieldAlias: v.fieldAlias,
+      // 别名
+      fieldUuid: v.fieldUuid,
+      // uuid
+      fieldId: v.fieldId,
+      // 字段id
+      tableName: v.table,
+      // 表名
+      tableNameZh: '',
+      tableId: v.tableId,
+      // 表名
+      tableAlias: v.alias,
+      // 别名
+      tableUuid: v.tableUuid,
+      // 表唯一标识
+      // 线上的都为空，默认会标红。 等统一格式后可隐藏
+      datasourceName: '',
+      // 数据源名
+      datasourceId: '',
+      // 数据源id
+      type: _types.AtomsTypeEnum.FIELD
+    });
+  };
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [meta.by.map(function (v, i) {
-      return (0, _jsxRuntime.jsxs)("div", {
-        className: "Sqb-TableName green-name",
-        onClick: function onClick(e) {
-          return handleUpdate(e, i);
-        },
-        children: [v.quotes && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-          title: (0, _locale.__)('SqlQueryBuilder.alias'),
-          children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-            className: ':Sqb-TableName-as :Sqb-TableName green-name',
-            shape: 'circle',
-            iconOnly: true,
-            primary: true,
-            icon: 'As',
-            size: 'small',
-            onClick: function onClick(e) {
-              e.stopPropagation();
-              onChangeFieldAlias((v === null || v === void 0 ? void 0 : v.fieldAlias) || '', i);
-            }
-          })
-        }), "".concat(v.quotes, " ").concat(v.fieldAlias ? "as ".concat(v.fieldAlias) : ''), (0, _jsxRuntime.jsx)("span", {
-          style: {
-            fontSize: 0
-          },
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: (0, _utils.isError)(getField(v), _getColumns()),
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: "Sqb-TableName green-name",
           onClick: function onClick(e) {
-            return handleDel(e, i);
+            return handleUpdate(e, i);
           },
-          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-        })]
+          children: [v.quotes && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+            title: (0, _locale.__)('SqlQueryBuilder.alias'),
+            children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+              className: ':Sqb-TableName-as :Sqb-TableName green-name',
+              shape: 'circle',
+              iconOnly: true,
+              primary: true,
+              icon: 'As',
+              size: 'small',
+              onClick: function onClick(e) {
+                e.stopPropagation();
+                onChangeFieldAlias((v === null || v === void 0 ? void 0 : v.fieldAlias) || '', i);
+              }
+            })
+          }), "".concat(v.quotes, " ").concat(v.fieldAlias ? "as ".concat(v.fieldAlias) : ''), (0, _jsxRuntime.jsx)("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, i);
+            },
+            children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+          })]
+        })
       }, i);
     }), (0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames["default"])("Sqb-TableName green-name", {

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

@@ -17,9 +17,11 @@ var _helper = require("../../../store/helper");
 var _pandora = require("@gingkoo/pandora");
 var _helper2 = require("../../../utils/helper");
 var _types = require("../../../store/types");
+var _itemName = _interopRequireDefault(require("../components/item-name"));
 var _icons = require("../../icons");
 var _dialog = require("../../dialog");
 var _useProvider = require("../../../hooks/use-provider");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var SelectIndex = function SelectIndex(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
@@ -153,11 +155,9 @@ var SelectIndex = function SelectIndex(props) {
               fieldAlias: fieldAlias
             });
           });
-          if (value.quotes !== data.quotes) {
-            newMeta = newMeta.filter(function (_, _i) {
-              return _i <= index;
-            });
-          }
+          // if (value.quotes !== data.quotes) {
+          //   newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
+          // }
           store.setMeta(newMeta, groupIndex);
           closePopup();
         }
@@ -223,9 +223,7 @@ var SelectIndex = function SelectIndex(props) {
     newMeta[index].group = group.filter(function (_, i) {
       return i !== itemId;
     });
-    newMeta = newMeta.filter(function (_, _i) {
-      return _i <= index;
-    });
+    // newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
     store.setMeta(newMeta, groupIndex);
   }
   function closePopup() {
@@ -248,22 +246,22 @@ var SelectIndex = function SelectIndex(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newMeta;
-          return _regenerator["default"].wrap(function _callee$(_context) {
+          return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
-                  _context.next = 3;
+                  _context.next = 1;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 3:
+              case 1:
                 newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMeta[index].group[i].fieldAlias = fieldAlias;
                 newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
                 newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex);
-              case 8:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -277,36 +275,84 @@ var SelectIndex = function SelectIndex(props) {
       onCancel: function onCancel() {}
     });
   };
+  var _getColumns = function _getColumns() {
+    return getColumns().map(function (v) {
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        name: v.table,
+        id: v.tableId,
+        name_zh: '',
+        tableUuid: v.tableUuid,
+        alias: v.alias,
+        // 线上的都为空，默认会标红。 等统一格式后可隐藏
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '' // 数据源id
+      });
+    });
+  };
+  var getField = function getField(v) {
+    var _v = (0, _cloneDeep["default"])(v);
+    return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _v), {}, {
+      fieldName: v.name,
+      // 字段名
+      fieldNameZh: v.name_zh,
+      // 字段中文名
+      fieldAlias: v.fieldAlias,
+      // 别名
+      fieldUuid: v.fieldUuid,
+      // uuid
+      fieldId: v.fieldId,
+      // 字段id
+      tableName: v.table,
+      // 表名
+      tableNameZh: '',
+      tableId: v.tableId,
+      // 表名
+      tableAlias: v.alias,
+      // 别名
+      tableUuid: v.tableUuid,
+      // 表唯一标识
+      // 线上的都为空，默认会标红。 等统一格式后可隐藏
+      datasourceName: '',
+      // 数据源名
+      datasourceId: '',
+      // 数据源id
+      type: _types.AtomsTypeEnum.FIELD
+    });
+  };
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [meta.group.map(function (v, i) {
-      return (0, _jsxRuntime.jsxs)("div", {
-        className: "Sqb-TableName green-name",
-        onClick: function onClick(e) {
-          return handleUpdate(e, i);
-        },
-        children: [v.quotes && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-          title: (0, _locale.__)('SqlQueryBuilder.alias'),
-          children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-            className: ':Sqb-TableName-as :Sqb-TableName green-name',
-            shape: 'circle',
-            iconOnly: true,
-            primary: true,
-            icon: 'As',
-            size: 'small',
-            onClick: function onClick(e) {
-              e.stopPropagation();
-              onChangeFieldAlias((v === null || v === void 0 ? void 0 : v.fieldAlias) || '', i);
-            }
-          })
-        }), "".concat(v.quotes, " ").concat(v.fieldAlias ? "as ".concat(v.fieldAlias) : ''), (0, _jsxRuntime.jsx)("span", {
-          style: {
-            fontSize: 0
-          },
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: (0, _utils.isError)(getField(v), _getColumns()),
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: "Sqb-TableName green-name",
           onClick: function onClick(e) {
-            return handleDel(e, i);
+            return handleUpdate(e, i);
           },
-          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-        })]
+          children: [v.quotes && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+            title: (0, _locale.__)('SqlQueryBuilder.alias'),
+            children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+              className: ':Sqb-TableName-as :Sqb-TableName green-name',
+              shape: 'circle',
+              iconOnly: true,
+              primary: true,
+              icon: 'As',
+              size: 'small',
+              onClick: function onClick(e) {
+                e.stopPropagation();
+                onChangeFieldAlias((v === null || v === void 0 ? void 0 : v.fieldAlias) || '', i);
+              }
+            })
+          }), "".concat(v.quotes, " ").concat(v.fieldAlias ? "as ".concat(v.fieldAlias) : ''), (0, _jsxRuntime.jsx)("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, i);
+            },
+            children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+          })]
+        })
       }, i);
     }), (0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames["default"])("Sqb-TableName green-name", {

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

@@ -91,21 +91,21 @@ var TableData = function TableData(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newMetaList;
-          return _regenerator["default"].wrap(function _callee$(_context) {
+          return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if ((0, _utils.isValidSQLAlias)(alias)) {
-                  _context.next = 3;
+                  _context.next = 1;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 3:
+              case 1:
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = (0, _utils.changeTableAlias)(newMetaList, newMetaList[0].table);
                 store.setMeta(newMetaList, groupIndex);
-              case 7:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -141,7 +141,7 @@ var TableData = function TableData(props) {
           showSubquery: store._showSubquery,
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),
-          value: val,
+          value: (0, _cloneDeep["default"])(val),
           onOk: function onOk(newList) {
             try {
               // 子查询未改变不做操作
@@ -158,7 +158,15 @@ var TableData = function TableData(props) {
               var newColumns = items.flatMap(function (item) {
                 return item.columns;
               });
-              newMetaList.columns = newColumns;
+              // newMetaList.columns = newColumns;
+              newMetaList.columns = newColumns.map(function (newCol) {
+                // 查找旧列中是否有相同 name 的列
+                var existingCol = newMetaList.columns.find(function (oldCol) {
+                  return oldCol.name === newCol.name;
+                });
+                // 如果存在，返回旧列；否则返回新列
+                return existingCol ? existingCol : newCol;
+              });
               // (newMeta[index] as MetaJoin).expressions = [];
               store.setMeta([newMetaList], groupIndex);
               o.close();

package/lib/cjs/components/popup.js

@@ -19,8 +19,7 @@ var React = _interopRequireWildcard(require("react"));
 var _helperDom = require("../utils/helper-dom");
 var _event = require("../utils/event");
 var _Portal = _interopRequireDefault(require("../common/Portal"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, (0, _isNativeReflectConstruct2["default"])() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function returnDocument(element) {
   if (element) {

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

@@ -62,69 +62,73 @@ var useStore = function useStore() {
     toolbar = _useState8[0],
     setToolbar = _useState8[1]; //工具列表
   var _useState9 = (0, _react.useState)('${name}'),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    fieldNameTpl = _useState10[0],
-    setFieldNameTpl = _useState10[1]; //显示字段
-  var _useState11 = (0, _react.useState)('${name}'),
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    fieldNameTpl = _useState0[0],
+    setFieldNameTpl = _useState0[1]; //显示字段
+  var _useState1 = (0, _react.useState)('${name}'),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    tableNameTpl = _useState10[0],
+    setTableNameTpl = _useState10[1]; //显示字段
+  var _useState11 = (0, _react.useState)([]),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    tableNameTpl = _useState12[0],
-    setTableNameTpl = _useState12[1]; //显示字段
+    sourceList = _useState12[0],
+    setSourceList = _useState12[1]; //数据源列表
   var _useState13 = (0, _react.useState)([]),
     _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-    sourceList = _useState14[0],
-    setSourceList = _useState14[1]; //数据源列表
+    constantList = _useState14[0],
+    setConstantList = _useState14[1]; //常量列表
   var _useState15 = (0, _react.useState)([]),
     _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-    constantList = _useState16[0],
-    setConstantList = _useState16[1]; //常量列表
-  var _useState17 = (0, _react.useState)([]),
+    formulaTemplates = _useState16[0],
+    setFormulaTemplates = _useState16[1]; //公式配置数组
+  var _useState17 = (0, _react.useState)(false),
     _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
-    formulaTemplates = _useState18[0],
-    setFormulaTemplates = _useState18[1]; //公式配置数组
+    ignoreGroupByType = _useState18[0],
+    setIgnoreGroupByType = _useState18[1]; // 忽略groupBy类型
   var _useState19 = (0, _react.useState)(false),
     _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
-    ignoreGroupByType = _useState20[0],
-    setIgnoreGroupByType = _useState20[1]; // 忽略groupBy类型
-  var _useState21 = (0, _react.useState)(false),
+    filterCustomType = _useState20[0],
+    setfilterCustomType = _useState20[1]; // 过滤器自定义类型
+  var _useState21 = (0, _react.useState)({}),
     _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
-    filterCustomType = _useState22[0],
-    setfilterCustomType = _useState22[1]; // 过滤器自定义类型
+    _cacheSource2TableMap = _useState22[0],
+    set_cacheSource2TableMap = _useState22[1]; //数据源id 对应数据集列表
   var _useState23 = (0, _react.useState)({}),
     _useState24 = (0, _slicedToArray2["default"])(_useState23, 2),
-    _cacheSource2TableMap = _useState24[0],
-    set_cacheSource2TableMap = _useState24[1]; //数据源id 对应数据集列表
-  var _useState25 = (0, _react.useState)({}),
+    _cacheColumnsMap = _useState24[0],
+    set_cacheColumnsMap = _useState24[1]; //数据源id 对应数据集列表
+  var _useState25 = (0, _react.useState)(defaultMeta),
     _useState26 = (0, _slicedToArray2["default"])(_useState25, 2),
-    _cacheColumnsMap = _useState26[0],
-    set_cacheColumnsMap = _useState26[1]; //数据源id 对应数据集列表
-  var _useState27 = (0, _react.useState)(defaultMeta),
-    _useState28 = (0, _slicedToArray2["default"])(_useState27, 2),
-    metaList = _useState28[0],
-    _setMeta = _useState28[1]; //数据源id 对应数据集列表
-  var _useState29 = (0, _react.useState)({
+    metaList = _useState26[0],
+    _setMeta = _useState26[1]; //数据源id 对应数据集列表
+  var _useState27 = (0, _react.useState)({
       visible: false,
       node: null,
       content: null
     }),
-    _useState30 = (0, _slicedToArray2["default"])(_useState29, 2),
-    popupData = _useState30[0],
-    setPopup = _useState30[1]; //弹窗
-  var _useState31 = (0, _react.useState)({
+    _useState28 = (0, _slicedToArray2["default"])(_useState27, 2),
+    popupData = _useState28[0],
+    setPopup = _useState28[1]; //弹窗
+  var _useState29 = (0, _react.useState)({
       visible: false,
       node: null,
       content: null
     }),
+    _useState30 = (0, _slicedToArray2["default"])(_useState29, 2),
+    popupData2 = _useState30[0],
+    setPopup2 = _useState30[1]; //弹窗
+  var _useState31 = (0, _react.useState)(true),
     _useState32 = (0, _slicedToArray2["default"])(_useState31, 2),
-    popupData2 = _useState32[0],
-    setPopup2 = _useState32[1]; //弹窗
+    popupClosable = _useState32[0],
+    setClosable = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   var _useState33 = (0, _react.useState)(true),
     _useState34 = (0, _slicedToArray2["default"])(_useState33, 2),
-    popupClosable = _useState34[0],
-    setClosable = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
-  var _useState35 = (0, _react.useState)(true),
+    popupClosable2 = _useState34[0],
+    setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState35 = (0, _react.useState)({}),
     _useState36 = (0, _slicedToArray2["default"])(_useState35, 2),
-    popupClosable2 = _useState36[0],
-    setClosable2 = _useState36[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    currentTable = _useState36[0],
+    setCurrentTable = _useState36[1]; // 当前存在的表
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -184,23 +188,23 @@ var useStore = function useStore() {
   var fetchDataset = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(datasourceId) {
       var tables, _tables;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context.next = 3;
+              _context.next = 1;
               break;
             }
             return _context.abrupt("return", tables);
-          case 3:
-            _context.next = 5;
+          case 1:
+            _context.next = 2;
             return fetchDatasetFn.current(datasourceId);
-          case 5:
+          case 2:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
             return _context.abrupt("return", _tables);
-          case 8:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -229,7 +233,7 @@ var useStore = function useStore() {
         columns,
         _columns,
         _args2 = arguments;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+      return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             oldColumns = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : [];
@@ -239,20 +243,22 @@ var useStore = function useStore() {
               return v.select;
             }).map(function (v) {
               return v.id;
+            }).filter(function (v) {
+              return v;
             });
             _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);
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context2.next = 11;
+              _context2.next = 2;
               break;
             }
-            _context2.next = 9;
+            _context2.next = 1;
             return fetchColumnsFn.current(extra, datasourceId);
-          case 9:
+          case 1:
             columns = _context2.sent;
             setColumns(tableName, columns);
-          case 11:
+          case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               var select = selectId.includes(v.id);
               return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
@@ -261,7 +267,7 @@ var useStore = function useStore() {
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 13:
+          case 3:
           case "end":
             return _context2.stop();
         }
@@ -277,19 +283,6 @@ var useStore = function useStore() {
     _setMeta(newMeta);
   };
   // 回显
-  var setFilterQuotes = function setFilterQuotes(newMeta) {
-    newMeta.filter = newMeta.filter.map(function (v) {
-      if (!v.expression) {
-        return {
-          expression: (0, _objectSpread2["default"])({}, v),
-          type: v.type
-        };
-      } else {
-        return (0, _objectSpread2["default"])({}, v);
-      }
-    });
-    return newMeta;
-  };
   var setPreData = function setPreData(data) {
     // let patchVersion = (data?.[0]?.list?.[0] as any)?.patchVersion || '';
     if (data.length) {
@@ -516,7 +509,7 @@ var useStore = function useStore() {
     if (meta.type === _enum.TypeEnum.joinData) {
       if (meta.table2.name) {
         var _metaList2 = newMeta.filter(function (v, i) {
-          return i < index;
+          return i != index;
         });
         setMeta(_metaList2, groupIndex);
         return void 0;