@gingkoo/pandora-metabase 1.0.27 → 1.0.28

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

@@ -6,13 +6,15 @@ import cx from 'classnames';
 import { __ } from '../../../locale';
 import { findIndex, getHelper } from '../../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
-import { MetaSummarize_Enum } from '../../../store/types';
+import { MetaSummarize_Enum, AtomsTypeEnum } from '../../../store/types';
 import SelectJoinColumn from '../../dialog/select-join-column';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4 } from '../../../utils/helper';
-import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
+import { changeFieldAlias, isValidSQLAlias, isError } from '../../../utils';
+import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
+import cloneDeep from 'lodash/cloneDeep';
 var GroupBy = function GroupBy(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
@@ -82,6 +84,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
           };
         }));
@@ -95,6 +99,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 === TypeEnum.joinData) {
@@ -103,6 +109,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 {
@@ -140,11 +148,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();
         }
@@ -210,9 +216,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() {
@@ -234,22 +238,22 @@ var GroupBy = function GroupBy(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMeta;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
+          return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (isValidSQLAlias(fieldAlias)) {
-                  _context.next = 3;
+                  _context.next = 1;
                   break;
                 }
                 Toast.warning(__('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 = changeFieldAlias(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex);
-              case 8:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -263,36 +267,84 @@ var GroupBy = function GroupBy(props) {
       onCancel: function onCancel() {}
     });
   };
+  var _getColumns = function _getColumns() {
+    return getColumns().map(function (v) {
+      return _objectSpread(_objectSpread({}, 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 = cloneDeep(v);
+    return _objectSpread(_objectSpread({}, _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: AtomsTypeEnum.FIELD
+    });
+  };
   return _jsxs(_Fragment, {
     children: [meta.by.map(function (v, i) {
-      return _jsxs("div", {
-        className: "Sqb-TableName green-name",
-        onClick: function onClick(e) {
-          return handleUpdate(e, i);
-        },
-        children: [v.quotes && _jsx(Tooltip, {
-          title: __('SqlQueryBuilder.alias'),
-          children: _jsx(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) : ''), _jsx("span", {
-          style: {
-            fontSize: 0
-          },
+      return _jsx(ItemName, {
+        isError: isError(getField(v), _getColumns()),
+        children: _jsxs("div", {
+          className: "Sqb-TableName green-name",
           onClick: function onClick(e) {
-            return handleDel(e, i);
+            return handleUpdate(e, i);
           },
-          children: _jsx(CloseIcon, {})
-        })]
+          children: [v.quotes && _jsx(Tooltip, {
+            title: __('SqlQueryBuilder.alias'),
+            children: _jsx(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) : ''), _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, i);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        })
       }, i);
     }), _jsx("div", {
       className: cx("Sqb-TableName green-name", {

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

@@ -9,11 +9,13 @@ import { TypeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { summarizeToSql } from '../../../store/helper';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4 } from '../../../utils/helper';
-import { MetaSummarize_Enum } from '../../../store/types';
-import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
+import { MetaSummarize_Enum, AtomsTypeEnum } from '../../../store/types';
+import { changeFieldAlias, isValidSQLAlias, isError } from '../../../utils';
+import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
 import { SelectSummarize } from '../../dialog';
 import { useStore } from '../../../hooks/use-provider';
+import cloneDeep from 'lodash/cloneDeep';
 var SelectIndex = function SelectIndex(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex;
@@ -147,11 +149,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();
         }
@@ -217,9 +217,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() {
@@ -242,22 +240,22 @@ var SelectIndex = function SelectIndex(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMeta;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
+          return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (isValidSQLAlias(fieldAlias)) {
-                  _context.next = 3;
+                  _context.next = 1;
                   break;
                 }
                 Toast.warning(__('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 = changeFieldAlias(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex);
-              case 8:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -271,36 +269,84 @@ var SelectIndex = function SelectIndex(props) {
       onCancel: function onCancel() {}
     });
   };
+  var _getColumns = function _getColumns() {
+    return getColumns().map(function (v) {
+      return _objectSpread(_objectSpread({}, 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 = cloneDeep(v);
+    return _objectSpread(_objectSpread({}, _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: AtomsTypeEnum.FIELD
+    });
+  };
   return _jsxs(_Fragment, {
     children: [meta.group.map(function (v, i) {
-      return _jsxs("div", {
-        className: "Sqb-TableName green-name",
-        onClick: function onClick(e) {
-          return handleUpdate(e, i);
-        },
-        children: [v.quotes && _jsx(Tooltip, {
-          title: __('SqlQueryBuilder.alias'),
-          children: _jsx(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) : ''), _jsx("span", {
-          style: {
-            fontSize: 0
-          },
+      return _jsx(ItemName, {
+        isError: isError(getField(v), _getColumns()),
+        children: _jsxs("div", {
+          className: "Sqb-TableName green-name",
           onClick: function onClick(e) {
-            return handleDel(e, i);
+            return handleUpdate(e, i);
           },
-          children: _jsx(CloseIcon, {})
-        })]
+          children: [v.quotes && _jsx(Tooltip, {
+            title: __('SqlQueryBuilder.alias'),
+            children: _jsx(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) : ''), _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, i);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        })
       }, i);
     }), _jsx("div", {
       className: cx("Sqb-TableName green-name", {

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

@@ -84,21 +84,21 @@ var TableData = function TableData(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMetaList;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
+          return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (isValidSQLAlias(alias)) {
-                  _context.next = 3;
+                  _context.next = 1;
                   break;
                 }
                 Toast.warning(__('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 = changeTableAlias(newMetaList, newMetaList[0].table);
                 store.setMeta(newMetaList, groupIndex);
-              case 7:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -134,7 +134,7 @@ var TableData = function TableData(props) {
           showSubquery: store._showSubquery,
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
-          value: val,
+          value: cloneDeep(val),
           onOk: function onOk(newList) {
             try {
               // 子查询未改变不做操作
@@ -151,7 +151,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/es/hooks/use-state.js

@@ -55,69 +55,73 @@ var useStore = function useStore() {
     toolbar = _useState8[0],
     setToolbar = _useState8[1]; //工具列表
   var _useState9 = useState('${name}'),
-    _useState10 = _slicedToArray(_useState9, 2),
-    fieldNameTpl = _useState10[0],
-    setFieldNameTpl = _useState10[1]; //显示字段
-  var _useState11 = useState('${name}'),
+    _useState0 = _slicedToArray(_useState9, 2),
+    fieldNameTpl = _useState0[0],
+    setFieldNameTpl = _useState0[1]; //显示字段
+  var _useState1 = useState('${name}'),
+    _useState10 = _slicedToArray(_useState1, 2),
+    tableNameTpl = _useState10[0],
+    setTableNameTpl = _useState10[1]; //显示字段
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    tableNameTpl = _useState12[0],
-    setTableNameTpl = _useState12[1]; //显示字段
+    sourceList = _useState12[0],
+    setSourceList = _useState12[1]; //数据源列表
   var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    sourceList = _useState14[0],
-    setSourceList = _useState14[1]; //数据源列表
+    constantList = _useState14[0],
+    setConstantList = _useState14[1]; //常量列表
   var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    constantList = _useState16[0],
-    setConstantList = _useState16[1]; //常量列表
-  var _useState17 = useState([]),
+    formulaTemplates = _useState16[0],
+    setFormulaTemplates = _useState16[1]; //公式配置数组
+  var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    formulaTemplates = _useState18[0],
-    setFormulaTemplates = _useState18[1]; //公式配置数组
+    ignoreGroupByType = _useState18[0],
+    setIgnoreGroupByType = _useState18[1]; // 忽略groupBy类型
   var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    ignoreGroupByType = _useState20[0],
-    setIgnoreGroupByType = _useState20[1]; // 忽略groupBy类型
-  var _useState21 = useState(false),
+    filterCustomType = _useState20[0],
+    setfilterCustomType = _useState20[1]; // 过滤器自定义类型
+  var _useState21 = useState({}),
     _useState22 = _slicedToArray(_useState21, 2),
-    filterCustomType = _useState22[0],
-    setfilterCustomType = _useState22[1]; // 过滤器自定义类型
+    _cacheSource2TableMap = _useState22[0],
+    set_cacheSource2TableMap = _useState22[1]; //数据源id 对应数据集列表
   var _useState23 = useState({}),
     _useState24 = _slicedToArray(_useState23, 2),
-    _cacheSource2TableMap = _useState24[0],
-    set_cacheSource2TableMap = _useState24[1]; //数据源id 对应数据集列表
-  var _useState25 = useState({}),
+    _cacheColumnsMap = _useState24[0],
+    set_cacheColumnsMap = _useState24[1]; //数据源id 对应数据集列表
+  var _useState25 = useState(defaultMeta),
     _useState26 = _slicedToArray(_useState25, 2),
-    _cacheColumnsMap = _useState26[0],
-    set_cacheColumnsMap = _useState26[1]; //数据源id 对应数据集列表
-  var _useState27 = useState(defaultMeta),
-    _useState28 = _slicedToArray(_useState27, 2),
-    metaList = _useState28[0],
-    _setMeta = _useState28[1]; //数据源id 对应数据集列表
-  var _useState29 = useState({
+    metaList = _useState26[0],
+    _setMeta = _useState26[1]; //数据源id 对应数据集列表
+  var _useState27 = useState({
       visible: false,
       node: null,
       content: null
     }),
-    _useState30 = _slicedToArray(_useState29, 2),
-    popupData = _useState30[0],
-    setPopup = _useState30[1]; //弹窗
-  var _useState31 = useState({
+    _useState28 = _slicedToArray(_useState27, 2),
+    popupData = _useState28[0],
+    setPopup = _useState28[1]; //弹窗
+  var _useState29 = useState({
       visible: false,
       node: null,
       content: null
     }),
+    _useState30 = _slicedToArray(_useState29, 2),
+    popupData2 = _useState30[0],
+    setPopup2 = _useState30[1]; //弹窗
+  var _useState31 = useState(true),
     _useState32 = _slicedToArray(_useState31, 2),
-    popupData2 = _useState32[0],
-    setPopup2 = _useState32[1]; //弹窗
+    popupClosable = _useState32[0],
+    setClosable = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   var _useState33 = useState(true),
     _useState34 = _slicedToArray(_useState33, 2),
-    popupClosable = _useState34[0],
-    setClosable = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
-  var _useState35 = useState(true),
+    popupClosable2 = _useState34[0],
+    setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState35 = useState({}),
     _useState36 = _slicedToArray(_useState35, 2),
-    popupClosable2 = _useState36[0],
-    setClosable2 = _useState36[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    currentTable = _useState36[0],
+    setCurrentTable = _useState36[1]; // 当前存在的表
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -177,23 +181,23 @@ var useStore = function useStore() {
   var fetchDataset = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(datasourceId) {
       var tables, _tables;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.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();
         }
@@ -222,7 +226,7 @@ var useStore = function useStore() {
         columns,
         _columns,
         _args2 = arguments;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             oldColumns = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : [];
@@ -232,20 +236,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 = _objectWithoutProperties(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 _objectSpread(_objectSpread({}, v), {}, {
@@ -254,7 +260,7 @@ var useStore = function useStore() {
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 13:
+          case 3:
           case "end":
             return _context2.stop();
         }
@@ -270,19 +276,6 @@ var useStore = function useStore() {
     _setMeta(newMeta);
   };
   // 回显
-  var setFilterQuotes = function setFilterQuotes(newMeta) {
-    newMeta.filter = newMeta.filter.map(function (v) {
-      if (!v.expression) {
-        return {
-          expression: _objectSpread({}, v),
-          type: v.type
-        };
-      } else {
-        return _objectSpread({}, v);
-      }
-    });
-    return newMeta;
-  };
   var setPreData = function setPreData(data) {
     // let patchVersion = (data?.[0]?.list?.[0] as any)?.patchVersion || '';
     if (data.length) {
@@ -509,7 +502,7 @@ var useStore = function useStore() {
     if (meta.type === 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;

package/lib/es/locale/en.js

@@ -49,7 +49,7 @@ export default register('en', {
   'SqlQueryBuilder.visualize': 'visualize',
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
-  'SqlQueryBuilder.aliasForRules': 'Please enter letters and underscores, with a length not exceeding 30 bytes',
+  'SqlQueryBuilder.aliasForRules': 'Please enter a combination of letters, underscores, and numbers, with a length not exceeding 30 bytes',
   'customColumn.operator': 'operator',
   'customColumn.collection': 'collection',
   'customColumn.field': 'field',
@@ -155,5 +155,8 @@ export default register('en', {
   'result.queryResult': 'query result',
   'result.fieldOperations': 'field operations',
   'metabase.nextBtn': 'next step',
-  'metabase.nextOk': 'ok'
+  'metabase.nextOk': 'ok',
+  'metabase.verify': 'The table has been modified. Please select again',
+  'metabase.validationFailed': 'Validation failed. Do you still want to save?',
+  'metabase.prompt': 'Prompt'
 });