@gingkoo/pandora-metabase 1.0.118 → 1.0.119

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

@@ -14,6 +14,7 @@ import Metabase from '../../index';
 import isEqual from 'lodash/isEqual';
 import cloneDeep from 'lodash/cloneDeep';
 import { uuidv4, getAlias, mergeNameAlias } from '../../utils/helper';
+import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { getConstantLabel } from '../dialog/formula-list/utils';
 import { __ } from '../../locale';
 import { findIndex, getSubColumns } from '../../utils';
@@ -84,8 +85,8 @@ var JoinData = function JoinData(props) {
     _useState2 = _slicedToArray(_useState, 2),
     isDel = _useState2[0],
     setIsDel = _useState2[1];
-  var tableIsDel = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var tableIsDel = function () {
+    var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
       var _meta$table, _meta$table2;
       var tableName, tables, names;
       return _regeneratorRuntime.wrap(function (_context) {
@@ -126,20 +127,12 @@ var JoinData = function JoinData(props) {
       tableIsDel();
     }, 0);
   }, [meta]);
-  // const ref = useRef(null);
-  // useEffect(() => {
-  //   let newMetaList = store.metaList[groupIndex].list.slice();
-  //   newMetaList[index] = setQuotes(meta);
-  //   store.setMeta(newMetaList, groupIndex);
-  // }, []);
-  // 获取表格列
   var getTableColumns = function getTableColumns() {
     var data = [];
     var _getHelper2 = getHelper(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper2.ExistAboveGroupBy,
       prevList = _getHelper2.prevList,
       prevGroupBy = _getHelper2.prevGroupBy;
-    // 获取左侧表
     if (ExistAboveGroupBy) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
@@ -228,8 +221,6 @@ var JoinData = function JoinData(props) {
         return v.tableUuid === meta.table1.tableUuid;
       });
     }
-    // 获取右侧表
-    // 添加table2
     data = data.concat([{
       alias: meta.table2.alias,
       name: meta.table2.name,
@@ -240,7 +231,6 @@ var JoinData = function JoinData(props) {
       datasourceName: meta.table2.datasourceName,
       columns: meta.columns
     }]);
-    // 过滤为table1选中的表
     var newMeta = store.metaList[groupIndex].list.slice();
     data = data.filter(function (v) {
       return newMeta[index][FlagLocation.TABLE_1].tableUuid == v.tableUuid || newMeta[index][FlagLocation.TABLE_1].name == SummarizeAlias || newMeta[index][FlagLocation.TABLE_2].tableUuid == v.tableUuid;
@@ -253,7 +243,6 @@ var JoinData = function JoinData(props) {
       ExistAboveGroupBy = _getHelper3.ExistAboveGroupBy,
       prevList = _getHelper3.prevList,
       prevGroupBy = _getHelper3.prevGroupBy;
-    // 获取左侧表
     if (ExistAboveGroupBy) {
       var _prevGroupBy$group2, _prevGroupBy$by2;
       var _data = {
@@ -339,10 +328,7 @@ var JoinData = function JoinData(props) {
         }
         return mo;
       }, []);
-      // .filter((v: DataType) => v.tableUuid === meta.table1.tableUuid);
     }
-    // 获取右侧表
-    // 添加table2
     data = data.concat([{
       alias: meta.table2.alias,
       name: meta.table2.name,
@@ -353,21 +339,8 @@ var JoinData = function JoinData(props) {
       datasourceName: meta.table2.datasourceName,
       columns: meta.columns
     }]);
-    // 过滤为table1选中的表
-    // let newMeta = store.metaList[groupIndex].list.slice();
-    // data = data.filter((v) => {
-    //   return (
-    //     ((newMeta[index] as MetaJoin)[FlagLocation.TABLE_1] as MetaJoin_TalbeType).tableUuid ==
-    //       v.tableUuid ||
-    //     ((newMeta[index] as MetaJoin)[FlagLocation.TABLE_1] as MetaJoin_TalbeType).name ==
-    //       SummarizeAlias ||
-    //     ((newMeta[index] as MetaJoin)[FlagLocation.TABLE_2] as MetaJoin_TalbeType).tableUuid ==
-    //       v.tableUuid
-    //   );
-    // });
     return data;
   };
-  // 字段列表
   function selectColumns(e) {
     var columns = meta.columns;
     !meta.readonly && store.setPopup({
@@ -391,7 +364,6 @@ var JoinData = function JoinData(props) {
   }
   function selectLeftTable(e) {
     var node = e.currentTarget;
-    // let type: ExpressionsEnum = node.getAttribute('v-data');
     var _ind = Number(node.getAttribute('v-index'));
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var table_type = FlagLocation.TABLE_1;
@@ -410,40 +382,9 @@ var JoinData = function JoinData(props) {
         name_zh: prevGroupBy.alias,
         datasourceId: '',
         datasourceName: ''
-        // columns: [],
       };
-      if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group3 = prevGroupBy.group) !== null && _prevGroupBy$group3 !== void 0 && _prevGroupBy$group3.length) {
-        // _data.columns = _data.columns.concat(
-        //   prevGroupBy.group.map((v: MetaSummarize_Group) => {
-        //     return {
-        //       ...v,
-        //       name: v.name || v.quotes,
-        //       name_zh: v.name_zh || v.quotes,
-        //       id: v.id || v.fieldId,
-        //       database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
-        //       special_type: '',
-        //       sql: v.sql,
-        //       select: true,
-        //     };
-        //   }),
-        // );
-      }
-      if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by3 = prevGroupBy.by) !== null && _prevGroupBy$by3 !== void 0 && _prevGroupBy$by3.length) {
-        // _data.columns = _data.columns.concat(
-        //   prevGroupBy.by.map((v: MetaSummarize_By) => {
-        //     return {
-        //       ...v,
-        //       name: v.name || v.quotes,
-        //       name_zh: v.name_zh || v.quotes,
-        //       id: v.id || v.fieldId,
-        //       database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
-        //       special_type: '',
-        //       sql: v.sql,
-        //       select: true,
-        //     };
-        //   }),
-        // );
-      }
+      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) {}
       data = [_data];
       var joinData = prevList.filter(function (v) {
         return v.type === TypeEnum.joinData;
@@ -492,15 +433,7 @@ var JoinData = function JoinData(props) {
         return mo;
       }, []);
     }
-    // // 过滤为table1选中的表
     var newMeta = cloneDeep(store.metaList[groupIndex].list);
-    // if (((newMeta[index] as MetaJoin)[FlagLocation.TABLE_1] as MetaJoin_TalbeType).name) {
-    //   data = data.filter((v) => {
-    //     return (
-    //       ((newMeta[index] as MetaJoin)[FlagLocation.TABLE_1] as MetaJoin_TalbeType).name == v.table
-    //     );
-    //   });
-    // }
     !meta.readonly && store.setPopup({
       visible: true,
       node: node,
@@ -509,17 +442,6 @@ var JoinData = function JoinData(props) {
         data: data,
         value: newMeta[index][table_type],
         onChange: function onChange(data) {
-          // if (table_type === FlagLocation.TABLE_1) {
-          // if (
-          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).datasourceId !==
-          //     data.datasourceId ||
-          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).name !==
-          //     data.name ||
-          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).alias !==
-          //     data.alias
-          // ) {
-          // }
-          // }
           newMeta[index][table_type] = data;
           initExpressions(newMeta);
           store.setMeta(newMeta, groupIndex, {
@@ -571,8 +493,6 @@ var JoinData = function JoinData(props) {
             initExpressions(newMeta);
             store.fetchColumns(_table2, data.datasourceId, [], function (columns) {
               newMeta[index].columns = columns;
-              // 关联表变了 下面模块全部删除
-              // newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);
               store.setMeta(newMeta, groupIndex, {
                 obj: data,
                 type: ChangeType.table2
@@ -587,79 +507,45 @@ var JoinData = function JoinData(props) {
       })
     });
   }
-  // 切换表后重置数据
   function initExpressions(newMeta) {
-    // let newMeta: MetaListType[] = store.metaList[groupIndex].list.slice();
     if (newMeta[index].expressions && newMeta[index].expressions.length > 0) {
       return;
     }
     newMeta[index].expressions = [{
       lhs: [{
         fieldName: '',
-        // 字段名
         fieldNameZh: '',
-        // 字段中文名
         fieldAlias: '',
-        // 别名
         fieldUuid: '',
-        // uuid
         fieldId: '',
-        // 字段id
-        // quotes?: string; // 字段展示的 不知道有没有用
         tableName: '',
-        // 表名
         tableNameZh: '',
         tableId: '',
-        // 表名
         tableAlias: '',
-        // 别名
         tableUuid: '',
-        // 表唯一标识
         datasourceName: '',
-        // 数据源名
         datasourceId: '',
-        // 数据源id
         type: AtomsTypeEnum.FIELD
       }],
       condition: '',
       rhs: [{
         fieldName: '',
-        // 字段名
         fieldNameZh: '',
-        // 字段中文名
         fieldAlias: '',
-        // 别名
         fieldUuid: '',
-        // uuid
         fieldId: '',
-        // 字段id
-        // quotes?: string; // 字段展示的 不知道有没有用
         tableName: '',
-        // 表名
         tableNameZh: '',
         tableId: '',
-        // 表名
         tableAlias: '',
-        // 别名
         tableUuid: '',
-        // 表唯一标识
         datasourceName: '',
-        // 数据源名
         datasourceId: '',
-        // 数据源id
         type: AtomsTypeEnum.FIELD
       }],
-      // quotes: '',
       type: AtomsTypeEnum.JOIN_DEFAULT
     }];
     store.setMeta(newMeta, groupIndex);
-    // if (
-    //   ((newMeta[index] as MetaJoin).table1.name &&
-    //     (newMeta[index] as MetaJoin).table2.name &&
-    //     !(newMeta[index] as MetaJoin)?.expressions) ||
-    //   (newMeta[index] as MetaJoin)?.expressions?.length < 1
-    // ) {
-    // }
   }
   function selectJoin(e) {
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -775,7 +661,6 @@ var JoinData = function JoinData(props) {
           return mo;
         }, []);
       }
-      // 过滤为table1选中的表
       var newMeta = store.metaList[groupIndex].list.slice();
       if (newMeta[index][FlagLocation.TABLE_1].name) {
         data = data.filter(function (v) {
@@ -895,7 +780,6 @@ var JoinData = function JoinData(props) {
           return mo;
         }, []);
       }
-      // 过滤为table1选中的表
       var newMeta = store.metaList[groupIndex].list.slice();
       if (newMeta[index][FlagLocation.TABLE_1].name) {
         data = data.filter(function (v) {
@@ -914,7 +798,6 @@ var JoinData = function JoinData(props) {
         columns: meta.columns
       }];
     }
-    // 字段为空，或只存在聚合且聚合为空时
     if (data.length < 1 || Array.isArray(data) && ((_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.length) === 1 && ((_data3 = data) === null || _data3 === void 0 || (_data3 = _data3[0]) === null || _data3 === void 0 ? void 0 : _data3.name) === SummarizeAlias && ((_data4 = data) === null || _data4 === void 0 || (_data4 = _data4[0]) === null || _data4 === void 0 || (_data4 = _data4.columns) === null || _data4 === void 0 ? void 0 : _data4.length) < 1) {
       Toast.warning(__('SqlQueryBuilder.pleaseSelectTable'));
     }
@@ -923,43 +806,25 @@ var JoinData = function JoinData(props) {
       node: node,
       content: _jsx(SelectColumnMultiple, {
         data: data,
-        // tableInfo={tableInfo}
         value: meta.expressions[_ind][_position],
         theme: ColumnsPopupThemeEnum.skyBlue,
         onSelect: function onSelect(fields, quotes) {
           var newMeta = store.metaList[groupIndex].list.slice();
           newMeta[index].expressions[_ind][_position] = fields.length > 0 ? fields : [{
             fieldName: '',
-            // 字段名
             fieldNameZh: '',
-            // 字段中文名
             fieldAlias: '',
-            // 别名
             fieldUuid: '',
-            // uuid
             fieldId: '',
-            // 字段id
-            // quotes?: string; // 字段展示的 不知道有没有用
             tableName: '',
-            // 表名
             tableNameZh: '',
             tableId: '',
-            // 表名
             tableAlias: '',
-            // 别名
             tableUuid: '',
-            // 表唯一标识
             datasourceName: '',
-            // 数据源名
             datasourceId: '',
-            // 数据源id
             type: AtomsTypeEnum.FIELD
           }];
-          // (
-          //   ((newMeta[index] as MetaJoin).expressions[_ind] as AtomsExpression)[_position][
-          //     _ind2
-          //   ] as AtomsField
-          // ).quotes = quotes;
           store.setMeta(newMeta, groupIndex, {
             obj: fields,
             type: ChangeType[_position]
@@ -1003,7 +868,6 @@ var JoinData = function JoinData(props) {
       visible: false
     });
   }
-  // 修改输入框类型
   function onChangeType(e, _ref2) {
     var _ref2$position = _ref2.position,
       position = _ref2$position === void 0 ? 'rhs' : _ref2$position,
@@ -1013,10 +877,7 @@ var JoinData = function JoinData(props) {
     store.setPopup({
       visible: true,
       node: e.currentTarget,
-      content: _jsx(SelectList
-      // value={(((newMeta[index] as MetaJoin).expressions[_ind] as AtomsExpression)[position])[`type`]}
-      , {
-        // value={(((newMeta[index] as MetaJoin).expressions[_ind] as AtomsExpression)[position])[`type`]}
+      content: _jsx(SelectList, {
         list: [{
           value: AtomsTypeEnum.INPUT_STRING,
           label: __('customColumn.input')
@@ -1047,28 +908,17 @@ var JoinData = function JoinData(props) {
           if (type === AtomsTypeEnum.FIELD) {
             newMeta[index].expressions[_ind][position] = [{
               fieldName: '',
-              // 字段名
               fieldNameZh: '',
-              // 字段中文名
               fieldAlias: '',
-              // 别名
               fieldUuid: '',
-              // uuid
               fieldId: '',
-              // 字段id
               tableName: '',
-              // 表名
               tableNameZh: '',
               tableId: '',
-              // 表名
               tableAlias: '',
-              // 别名
               tableUuid: '',
-              // 表唯一标识
               datasourceName: '',
-              // 数据源名
               datasourceId: '',
-              // 数据源id
               type: AtomsTypeEnum.FIELD
             }];
           }
@@ -1084,13 +934,11 @@ var JoinData = function JoinData(props) {
       index1 = _ref3$index === void 0 ? 0 : _ref3$index,
       _ref3$index2 = _ref3.index2,
       index2 = _ref3$index2 === void 0 ? 0 : _ref3$index2;
-    // : 'rhs'
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     newMeta[index].expressions[index1][position][index2].val = val;
     store.setMeta(newMeta, groupIndex);
   }
-  // 子查询弹窗
   var showSubQuery = function showSubQuery() {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var _store$preProps2 = store.preProps,
@@ -1099,16 +947,18 @@ var JoinData = function JoinData(props) {
       isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded);
+    var childModalZIndex = getTopLayerZIndex() + 1;
     var newMeta = cloneDeep(store.metaList[groupIndex].list);
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var oldList = cloneDeep(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
-    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = Modal2.openModal({
+      zIndex: childModalZIndex,
       title: __('SqlQueryBuilder.subquery'),
       transparentMask: true,
       content: _jsx(_Fragment, {
         children: _jsx(Metabase, _objectSpread(_objectSpread({}, other), {}, {
+          popupZIndex: childModalZIndex + 1,
           showSubquery: store._showSubquery,
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
@@ -1116,7 +966,6 @@ var JoinData = function JoinData(props) {
           onOk: function onOk(newList) {
             try {
               var _store$preProps3;
-              // 子查询未改变不做操作
               if (isEqual(newList, oldList)) {
                 o.close();
                 return;
@@ -1124,7 +973,6 @@ var JoinData = function JoinData(props) {
               newMeta[index].subquery = newList;
               newMeta[index].table2 = _objectSpread(_objectSpread({}, newList[0].table), {}, {
                 alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
-                // fields: [],
               });
               var items = getSubColumns(newList);
               var newColumns = items.flatMap(function (item) {
@@ -1135,30 +983,21 @@ var JoinData = function JoinData(props) {
                 });
               });
               newMeta[index].columns = newColumns.map(function (newCol) {
-                // 查找旧列中是否有相同 name 的列
                 var existingCol = newMeta[index].columns.find(function (oldCol) {
                   return oldCol.name === newCol.name;
                 });
-                // 如果存在，返回旧列；否则返回新列
-                // return existingCol ? existingCol : newCol;
                 var _column = existingCol ? existingCol : newCol;
                 _column.select = store.isSelectFields || _column.select;
-                // 如果存在，返回旧列；否则返回新列
                 return _column;
               });
-              // (newMeta[index] as MetaJoin).columns = newColumns;
               initExpressions(newMeta);
-              // 关联表变了 下面模块全部删除
-              // newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);
               store.setMeta(newMeta, groupIndex, {
                 obj: newList,
                 type: ChangeType.subQuery
               });
               tableIsDel();
               o.close();
-            } catch (e) {
-              console.warn(e);
-            } finally {
+            } catch (e) {} finally {
               o.close();
             }
           }
@@ -1167,31 +1006,16 @@ var JoinData = function JoinData(props) {
       onClose: function onClose() {}
     });
   };
-  // 切换子查询
   var switchSubQuery = function switchSubQuery() {
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
     newMeta[index].isSubquery = !newMeta[index].isSubquery;
-    // (newMeta[index] as MetaJoin).table2 = {
-    //   quotes: '',
-    //   name: '', // 表名
-    //   name_zh: '', // 表名
-    //   tableUuid: '',
-    //   id: '', // 表名
-    //   alias: '', // 表别名
-    //   datasourceName: '', // 数据源名
-    //   datasourceId: '', // 数据源id
-    //   // groupSql: '', //如果table1 是结果集 那么这个字段 就有值，放结果集的别名
-    // };
-    // (newMeta[index] as MetaJoin).expressions = [];
-    // (newMeta[index] as MetaJoin).subquery = [];
     store.setMeta(newMeta, groupIndex);
   };
   var onChangeTableAlias = function onChangeTableAlias(val) {
     var alias = val || '';
     Modal.confirm({
       title: __('SqlQueryBuilder.alias'),
-      // 设置别名
       content: _jsx(Input, {
         defaultValue: alias,
         onChange: function onChange(val) {
@@ -1199,7 +1023,7 @@ var JoinData = function JoinData(props) {
         }
       }),
       onOk: function () {
-        var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _onOk = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2() {
           var index, newMeta;
           return _regeneratorRuntime.wrap(function (_context2) {
             while (1) switch (_context2.prev = _context2.next) {
@@ -1233,7 +1057,6 @@ var JoinData = function JoinData(props) {
       onCancel: function onCancel() {}
     });
   };
-  // 修改连接符
   var changeOperator = function changeOperator(key, i) {
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
@@ -1263,7 +1086,6 @@ var JoinData = function JoinData(props) {
       })
     });
   };
-  // 添加表达式
   var addExpression = function addExpression(type) {
     var i = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
     var index = findIndex(store.metaList[groupIndex].list, meta);
@@ -1273,60 +1095,35 @@ var JoinData = function JoinData(props) {
       item = {
         lhs: [{
           fieldName: '',
-          // 字段名
           fieldNameZh: '',
-          // 字段中文名
           fieldAlias: '',
-          // 别名
           fieldUuid: '',
-          // uuid
           fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
           tableName: '',
-          // 表名
           tableNameZh: '',
           tableId: '',
-          // 表名
           tableAlias: '',
-          // 别名
           tableUuid: '',
-          // 表唯一标识
           datasourceName: '',
-          // 数据源名
           datasourceId: '',
-          // 数据源id
           type: AtomsTypeEnum.FIELD
         }],
         condition: '',
         rhs: [{
           fieldName: '',
-          // 字段名
           fieldNameZh: '',
-          // 字段中文名
           fieldAlias: '',
-          // 别名
           fieldUuid: '',
-          // uuid
           fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
           tableName: '',
-          // 表名
           tableNameZh: '',
           tableId: '',
-          // 表名
           tableAlias: '',
-          // 别名
           tableUuid: '',
-          // 表唯一标识
           datasourceName: '',
-          // 数据源名
           datasourceId: '',
-          // 数据源id
           type: AtomsTypeEnum.FIELD
         }],
-        // quotes: '',
         type: type
       };
       store.setMeta(newMeta, groupIndex);
@@ -1543,43 +1340,7 @@ var JoinData = function JoinData(props) {
                     })
                   }) : null;
                 }()
-              })
-              // <Tooltip
-              //   title={__(
-              //     tableIsError()
-              //       ? isDel
-              //         ? 'metabase.verify'
-              //         : 'SqlQueryBuilder.repeatAlias'
-              //       : 'SqlQueryBuilder.alias',
-              //   )}
-              // >
-              //   <Button
-              //     danger={tableIsError()}
-              //     className={cx(':Sqb-TableName-as', {
-              //       isError: tableIsError(),
-              //     })}
-              //     shape='circle'
-              //     style={
-              //       isDel
-              //         ? {
-              //             fontSize: 18,
-              //             backgroundColor: '#fff',
-              //             width: 'auto',
-              //             height: 'auto',
-              //           }
-              //         : {}
-              //     }
-              //     iconOnly
-              //     primary={!isDel}
-              //     icon={isDel ? <ExclamationCircleFill /> : 'As'}
-              //     size='small'
-              //     onClick={(e) => {
-              //       e.stopPropagation();
-              //       onChangeTableAlias(meta.table2?.alias || '');
-              //     }}
-              //   ></Button>
-              // </Tooltip>
-              , 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.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table2) === 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$table5 = meta.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
             }) : _jsxs("div", {
               className: cx("Sqb-TableName", {
                 notSelected: !table2Selected
@@ -1617,43 +1378,7 @@ var JoinData = function JoinData(props) {
                     })
                   }) : null;
                 }()
-              })
-              // <Tooltip
-              //   title={__(
-              //     tableIsError()
-              //       ? isDel
-              //         ? 'metabase.verify'
-              //         : 'SqlQueryBuilder.repeatAlias'
-              //       : 'SqlQueryBuilder.alias',
-              //   )}
-              // >
-              //   <Button
-              //     danger={tableIsError()}
-              //     className={cx(':Sqb-TableName-as', {
-              //       isError: tableIsError(),
-              //     })}
-              //     shape='circle'
-              //     style={
-              //       isDel
-              //         ? {
-              //             fontSize: 18,
-              //             backgroundColor: '#fff',
-              //             width: 'auto',
-              //             height: 'auto',
-              //           }
-              //         : {}
-              //     }
-              //     iconOnly
-              //     primary={!isDel}
-              //     icon={isDel ? <ExclamationCircleFill /> : 'As'}
-              //     size='small'
-              //     onClick={(e) => {
-              //       e.stopPropagation();
-              //       onChangeTableAlias(meta.table2?.alias || '');
-              //     }}
-              //   ></Button>
-              // </Tooltip>
-              , table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table8 = meta.table2) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
+              }), table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table8 = meta.table2) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
             }), store.showSubquery && _jsx(Tooltip, {
               title: __('SqlQueryBuilder.switchSubQuery'),
               children: _jsx(Button, {
@@ -1847,11 +1572,8 @@ var JoinData = function JoinData(props) {
                   }), _jsx(FormulaList, {
                     _type: FormulaTypeEnum.JOIN_DATA,
                     otherTypes: (_store$preProps5 = store.preProps) === null || _store$preProps5 === void 0 ? void 0 : _store$preProps5.otherTypes,
-                    // showPreview={false}
-                    // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
                     value: v.list,
                     data: getCollectionTableColumns(),
-                    // ref={ref}
                     onChange: function onChange(data, _quotes) {
                       var newMeta = store.metaList[groupIndex].list.slice();
                       newMeta[index].expressions[i].list = data;