@gingkoo/pandora-metabase 1.0.23 → 1.0.25

package/lib/es/components/icons.js

@@ -169,12 +169,12 @@ export var LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-export var InnerJoinIcon = function InnerJoinIcon(_ref0) {
-  var _ref0$width = _ref0.width,
-    width = _ref0$width === void 0 ? 32 : _ref0$width,
-    _ref0$height = _ref0.height,
-    height = _ref0$height === void 0 ? 32 : _ref0$height,
-    style = _ref0.style;
+export var InnerJoinIcon = function InnerJoinIcon(_ref10) {
+  var _ref10$width = _ref10.width,
+    width = _ref10$width === void 0 ? 32 : _ref10$width,
+    _ref10$height = _ref10.height,
+    height = _ref10$height === void 0 ? 32 : _ref10$height,
+    style = _ref10.style;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -188,11 +188,11 @@ export var InnerJoinIcon = function InnerJoinIcon(_ref0) {
     })
   });
 };
-export var UpArrowIcon = function UpArrowIcon(_ref1) {
-  var _ref1$width = _ref1.width,
-    width = _ref1$width === void 0 ? 16 : _ref1$width,
-    _ref1$height = _ref1.height,
-    height = _ref1$height === void 0 ? 17 : _ref1$height;
+export var UpArrowIcon = function UpArrowIcon(_ref11) {
+  var _ref11$width = _ref11.width,
+    width = _ref11$width === void 0 ? 16 : _ref11$width,
+    _ref11$height = _ref11.height,
+    height = _ref11$height === void 0 ? 17 : _ref11$height;
   return _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -206,11 +206,11 @@ export var UpArrowIcon = function UpArrowIcon(_ref1) {
     })
   });
 };
-export var DownArrowIcon = function DownArrowIcon(_ref10) {
-  var _ref10$width = _ref10.width,
-    width = _ref10$width === void 0 ? 16 : _ref10$width,
-    _ref10$height = _ref10.height,
-    height = _ref10$height === void 0 ? 17 : _ref10$height;
+export var DownArrowIcon = function DownArrowIcon(_ref12) {
+  var _ref12$width = _ref12.width,
+    width = _ref12$width === void 0 ? 16 : _ref12$width,
+    _ref12$height = _ref12.height,
+    height = _ref12$height === void 0 ? 17 : _ref12$height;
   return _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -224,11 +224,11 @@ export var DownArrowIcon = function DownArrowIcon(_ref10) {
     })
   });
 };
-export var CloseIcon = function CloseIcon(_ref11) {
-  var _ref11$width = _ref11.width,
-    width = _ref11$width === void 0 ? 16 : _ref11$width,
-    _ref11$height = _ref11.height,
-    height = _ref11$height === void 0 ? 16 : _ref11$height;
+export var CloseIcon = function CloseIcon(_ref13) {
+  var _ref13$width = _ref13.width,
+    width = _ref13$width === void 0 ? 16 : _ref13$width,
+    _ref13$height = _ref13.height,
+    height = _ref13$height === void 0 ? 16 : _ref13$height;
   return _jsx("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -242,11 +242,11 @@ export var CloseIcon = function CloseIcon(_ref11) {
     })
   });
 };
-export var AddIcon = function AddIcon(_ref12) {
-  var _ref12$width = _ref12.width,
-    width = _ref12$width === void 0 ? 16 : _ref12$width,
-    _ref12$height = _ref12.height,
-    height = _ref12$height === void 0 ? 16 : _ref12$height;
+export var AddIcon = function AddIcon(_ref14) {
+  var _ref14$width = _ref14.width,
+    width = _ref14$width === void 0 ? 16 : _ref14$width,
+    _ref14$height = _ref14.height,
+    height = _ref14$height === void 0 ? 16 : _ref14$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -259,11 +259,11 @@ export var AddIcon = function AddIcon(_ref12) {
     })
   });
 };
-export var TableIcon = function TableIcon(_ref13) {
-  var _ref13$width = _ref13.width,
-    width = _ref13$width === void 0 ? 18 : _ref13$width,
-    _ref13$height = _ref13.height,
-    height = _ref13$height === void 0 ? 18 : _ref13$height;
+export var TableIcon = function TableIcon(_ref15) {
+  var _ref15$width = _ref15.width,
+    width = _ref15$width === void 0 ? 18 : _ref15$width,
+    _ref15$height = _ref15.height,
+    height = _ref15$height === void 0 ? 18 : _ref15$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -276,11 +276,11 @@ export var TableIcon = function TableIcon(_ref13) {
     })
   });
 };
-export var SearchIcon = function SearchIcon(_ref14) {
-  var _ref14$width = _ref14.width,
-    width = _ref14$width === void 0 ? 16 : _ref14$width,
-    _ref14$height = _ref14.height,
-    height = _ref14$height === void 0 ? 16 : _ref14$height;
+export var SearchIcon = function SearchIcon(_ref16) {
+  var _ref16$width = _ref16.width,
+    width = _ref16$width === void 0 ? 16 : _ref16$width,
+    _ref16$height = _ref16.height,
+    height = _ref16$height === void 0 ? 16 : _ref16$height;
   return _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,

package/lib/es/components/metabase/index.js

@@ -49,7 +49,7 @@ var Metabase = function Metabase(props) {
   var onSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var intercept, _metaList;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             intercept = false; // 是否返回
@@ -63,17 +63,17 @@ var Metabase = function Metabase(props) {
               }
             });
             if (!(saveLoading || intercept)) {
-              _context.next = 1;
+              _context.next = 6;
               break;
             }
             return _context.abrupt("return", null);
-          case 1:
+          case 6:
             setSaveLoading(true);
-            _context.next = 2;
+            _context.next = 9;
             return onOk === null || onOk === void 0 ? void 0 : onOk(_metaList);
-          case 2:
+          case 9:
             setSaveLoading(false);
-          case 3:
+          case 10:
           case "end":
             return _context.stop();
         }

package/lib/es/components/metabase/index.less

@@ -152,6 +152,7 @@
           -webkit-box-align: center;
           align-items: center;
           cursor: pointer;
+          height: 36px;
           // &-OPERATOR {
           //   // 操作符
           //   background-color: var(--link-5);
@@ -277,6 +278,15 @@
             width: 100%;
           }
         }
+        .Sqb-collection-box {
+          display: flex;
+          align-items: center;
+          margin-bottom: 8px;
+          .Sqb-NotebookCell {
+            padding-bottom: 0;
+            padding-top: 8px;
+          }
+        }
         .operator-icon,
         .operator-icon button {
           font-size: 18px !important;

package/lib/es/components/modules/components/Wrapper.js

@@ -25,19 +25,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _couterRef$current;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 1;
+            _context.next = 2;
             return sleep(10);
-          case 1:
+          case 2:
             setOpacity(1);
             ((_couterRef$current = couterRef.current) === null || _couterRef$current === void 0 || (_couterRef$current = _couterRef$current.childNodes) === null || _couterRef$current === void 0 ? void 0 : _couterRef$current.length) && setMaxHeight(couterRef.current.childNodes[0].clientHeight + 16);
-            _context.next = 2;
+            _context.next = 6;
             return sleep(500);
-          case 2:
+          case 6:
             setMaxHeight('auto');
-          case 3:
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/es/components/modules/custom-column.js

@@ -69,14 +69,14 @@ var CustomColumn = function CustomColumn(props) {
   function _handleUpdate() {
     _handleUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, i) {
       var node, newMeta, value, columns;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 1;
+            _context.next = 4;
             return sleep(100);
-          case 1:
+          case 4:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -98,7 +98,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 2:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/es/components/modules/enum/filter-enum.d.ts

@@ -28,7 +28,12 @@ export declare enum FunctionEnum {
     'COALESCE' = "coalesce"
 }
 export declare const operatorList: string[];
-export declare const customTypes: {
+export declare const customTypes: ({
     value: AtomsTypeEnum;
     label: any;
-}[];
+    children?: undefined;
+} | {
+    value: AtomsTypeEnum;
+    label: any;
+    children: string[];
+})[];

package/lib/es/components/modules/enum/filter-enum.js

@@ -98,12 +98,12 @@ export var customTypes = [
 // 输入框
 {
   value: AtomsTypeEnum.INPUT_STRING,
-  label: __('SqlQueryBuilder.input')
+  label: __('customColumn.input')
 },
 // 数字输入框
 {
   value: AtomsTypeEnum.INPUT_NUMBER,
-  label: __('SqlQueryBuilder.numberInput')
+  label: __('customColumn.numberInput')
 },
 // 表达式
 {
@@ -115,6 +115,12 @@ export var customTypes = [
   value: AtomsTypeEnum.OPERATOR,
   label: __('customColumn.operator')
 },
+// 函数
+{
+  value: AtomsTypeEnum.FORMULA,
+  label: __('customColumn.formula'),
+  children: operatorList
+},
 // EXISTS
 {
   value: AtomsTypeEnum.NOT_EXISTS,

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

@@ -17,13 +17,13 @@ import { findIndex, getSubColumns } from '../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, JoinEnum, SQL_COLUMN_TYPE } from '../../store/enum';
 import { AtomsTypeEnum } from '../../store/types';
 import { SummarizeAlias } from '../../store/helper';
-import { getHelper, changeTableAlias } from '../../utils';
+import { getHelper, changeTableAlias, isValidSQLAlias } from '../../utils';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
 import SelectList from '../dialog/select-list';
 import { LeftJoinIcon, InnerJoinIcon } from '../icons';
-import { SelectTable, SelectJoin, SelectColumnMultiple, SelectColumn, Expression, SelectPermissionTable } from '../dialog';
+import { SelectTable, SelectJoin, SelectColumnMultiple, SelectColumn, Expression, SelectPermissionTable, FormulaList, getTemplateItem } from '../dialog';
 import { useStore } from '../../hooks/use-provider';
 var PrevResult = 'Previous results';
 var operators = ['AND', 'OR', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='];
@@ -38,7 +38,7 @@ var ExpressionsEnum;
   ExpressionsEnum["RIGHT"] = "rhs";
 })(ExpressionsEnum || (ExpressionsEnum = {}));
 var getText = function getText(v) {
-  return _defineProperty(_defineProperty(_defineProperty({}, AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), AtomsTypeEnum.EXPRESSION, 'joinData.expression'), AtomsTypeEnum.OPERATOR, 'customColumn.operator')[v];
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), AtomsTypeEnum.EXPRESSION, 'joinData.expression'), AtomsTypeEnum.OPERATOR, 'customColumn.operator'), AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
 };
 var menuTypes = [{
   key: AtomsTypeEnum.JOIN_DEFAULT,
@@ -49,6 +49,9 @@ var menuTypes = [{
 }, {
   key: AtomsTypeEnum.OPERATOR,
   label: __(getText(AtomsTypeEnum.OPERATOR))
+}, {
+  key: AtomsTypeEnum.COLLECTION,
+  label: __(getText(AtomsTypeEnum.COLLECTION))
 }];
 var menuOperator = operators.map(function (v) {
   return {
@@ -57,7 +60,7 @@ var menuOperator = operators.map(function (v) {
   };
 });
 var JoinData = function JoinData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6, _meta$table7, _meta$table8, _meta$expressions, _meta$table9, _meta$table0, _meta$expressions2;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6, _meta$table7, _meta$table8, _meta$expressions, _meta$table9, _meta$table10, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
@@ -68,6 +71,7 @@ var JoinData = function JoinData(props) {
   var table2Selected = Boolean(meta.table2.name);
   var subQuerySelected = Boolean((_meta$subquery = meta.subquery) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery[0]) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery.table) === null || _meta$subquery === void 0 ? void 0 : _meta$subquery.name);
   var columnsSelected = meta.table1.name && meta.table2.name;
+  // const ref = useRef(null);
   // useEffect(() => {
   //   let newMetaList = store.metaList[groupIndex].list.slice();
   //   newMetaList[index] = setQuotes(meta);
@@ -371,7 +375,7 @@ var JoinData = function JoinData(props) {
             });
             newMeta[index].table2 = _table2;
             initExpressions();
-            store.fetchColumns(_table2, data.datasourceId, function (columns) {
+            store.fetchColumns(_table2, data.datasourceId, [], function (columns) {
               newMeta[index].columns = columns;
               // 关联表变了 下面模块全部删除
               newMeta = newMeta.filter(function (v, i) {
@@ -687,10 +691,10 @@ var JoinData = function JoinData(props) {
         // value={(((newMeta[index] as MetaJoin).expressions[_ind] as AtomsExpression)[position])[`type`]}
         list: [{
           value: AtomsTypeEnum.INPUT_STRING,
-          label: __('SqlQueryBuilder.input')
+          label: __('customColumn.input')
         }, {
           value: AtomsTypeEnum.INPUT_NUMBER,
-          label: __('SqlQueryBuilder.numberInput')
+          label: __('customColumn.numberInput')
         }, {
           value: AtomsTypeEnum.CONSTANT,
           label: __('customColumn.constant')
@@ -854,30 +858,23 @@ var JoinData = function JoinData(props) {
       }),
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          var _index, newMeta;
-          return _regeneratorRuntime.wrap(function (_context) {
+          var index, newMeta;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (alias) {
-                  _context.next = 1;
-                  break;
-                }
-                Toast.warning(__('SqlQueryBuilder.aliasCannotEmpty'));
-                return _context.abrupt("return", false);
-              case 1:
-                if (!(alias.length > 30)) {
-                  _context.next = 2;
+                if (isValidSQLAlias(alias)) {
+                  _context.next = 3;
                   break;
                 }
-                Toast.warning('别名长度不能超过30');
+                Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 2:
-                _index = findIndex(store.metaList[groupIndex].list, meta);
+              case 3:
+                index = findIndex(store.metaList[groupIndex].list, meta);
                 newMeta = store.metaList[groupIndex].list.slice();
-                newMeta[_index].table2.alias = alias;
-                newMeta = changeTableAlias(newMeta, newMeta[_index].table2);
+                newMeta[index].table2.alias = alias;
+                newMeta = changeTableAlias(newMeta, newMeta[index].table2);
                 store.setMeta(newMeta, groupIndex);
-              case 3:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -923,7 +920,8 @@ var JoinData = function JoinData(props) {
     var i = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
-    var item = null;
+    var item = getTemplateItem(type);
+    console.log('🚀 ~ addExpression ~ item:', item);
     if (type === AtomsTypeEnum.JOIN_DEFAULT) {
       item = {
         lhs: [{
@@ -992,15 +990,6 @@ var JoinData = function JoinData(props) {
         type: type
       };
     }
-    if (type === AtomsTypeEnum.EXPRESSION) {
-      item = {
-        lhs: [],
-        condition: '',
-        rhs: [],
-        quotes: '',
-        type: type
-      };
-    }
     if (!item) {
       return;
     }
@@ -1356,7 +1345,60 @@ var JoinData = function JoinData(props) {
                 })]
               }, i);
             }
-          })), ((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$table0 = meta.table1) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && _jsx(Tooltip, {
+            if (v.type === AtomsTypeEnum.COLLECTION) {
+              return _jsxs("div", {
+                className: cx(" Sqb-collection-box"),
+                children: [_jsx("div", {
+                  children: _jsx(FormulaList
+                  // showPreview={false}
+                  // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
+                  , {
+                    // showPreview={false}
+                    // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
+                    value: v.list,
+                    data: getTableColumns(),
+                    // ref={ref}
+                    onChange: function onChange(data, _quotes) {
+                      var newMeta = store.metaList[groupIndex].list.slice();
+                      newMeta[index].expressions[i].list = data;
+                      newMeta[index].expressions[i].quotes = _quotes;
+                      store.setMeta(newMeta, groupIndex);
+                    }
+                  })
+                }), _jsx(Tooltip, {
+                  title: __('SqlQueryBuilder.add'),
+                  children: _jsx(Dropdown, {
+                    trigger: ['click'],
+                    onChange: function onChange(key) {
+                      addExpression(key, i);
+                    },
+                    droplist: menuTypes,
+                    children: _jsx(Button, {
+                      disabled: meta.readonly,
+                      primary: true,
+                      ghost: true,
+                      className: 'mr-2 operator-icon',
+                      icon: _jsx(FfPlus, {})
+                    })
+                  })
+                }), _jsx(Tooltip, {
+                  title: __('SqlQueryBuilder.del'),
+                  children: _jsx(Button, {
+                    disabled: meta.readonly,
+                    danger: true,
+                    className: 'mr-2 operator-icon',
+                    icon: _jsx(FfLine, {}),
+                    onClick: function onClick() {
+                      var index = findIndex(store.metaList[groupIndex].list, meta);
+                      var newMeta = store.metaList[groupIndex].list.slice();
+                      newMeta[index].expressions.splice(i, 1);
+                      store.setMeta(newMeta, groupIndex);
+                    }
+                  })
+                })]
+              }, i);
+            }
+          })), ((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$table10 = meta.table1) === null || _meta$table10 === void 0 ? void 0 : _meta$table10.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && _jsx(Tooltip, {
             title: __('SqlQueryBuilder.add'),
             children: _jsx(Dropdown, {
               trigger: ['click'],
@@ -1372,7 +1414,7 @@ var JoinData = function JoinData(props) {
                 icon: _jsx(FfPlus, {})
               })
             })
-          }), columnsSelected && store.showFields && _jsx("div", {
+          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && store.showFields && _jsx("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')

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

@@ -10,7 +10,7 @@ import { MetaSummarize_Enum } 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 } from '../../../utils';
+import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
 import { AddIcon, CloseIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
 var GroupBy = function GroupBy(props) {
@@ -234,29 +234,22 @@ var GroupBy = function GroupBy(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMeta;
-          return _regeneratorRuntime.wrap(function (_context) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (fieldAlias) {
-                  _context.next = 1;
+                if (isValidSQLAlias(fieldAlias)) {
+                  _context.next = 3;
                   break;
                 }
-                Toast.warning(__('SqlQueryBuilder.aliasCannotEmpty'));
+                Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(fieldAlias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                Toast.warning('别名长度不能超过30');
-                return _context.abrupt("return", false);
-              case 2:
+              case 3:
                 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 3:
+              case 8:
               case "end":
                 return _context.stop();
             }

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

@@ -10,7 +10,7 @@ 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 } from '../../../utils';
+import { changeFieldAlias, isValidSQLAlias } from '../../../utils';
 import { AddIcon, CloseIcon } from '../../icons';
 import { SelectSummarize } from '../../dialog';
 import { useStore } from '../../../hooks/use-provider';
@@ -242,29 +242,22 @@ var SelectIndex = function SelectIndex(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMeta;
-          return _regeneratorRuntime.wrap(function (_context) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (fieldAlias) {
-                  _context.next = 1;
+                if (isValidSQLAlias(fieldAlias)) {
+                  _context.next = 3;
                   break;
                 }
-                Toast.warning(__('SqlQueryBuilder.aliasCannotEmpty'));
+                Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(fieldAlias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                Toast.warning('别名长度不能超过30');
-                return _context.abrupt("return", false);
-              case 2:
+              case 3:
                 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 3:
+              case 8:
               case "end":
                 return _context.stop();
             }

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

@@ -10,7 +10,7 @@ import { __ } from '../../locale';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
 import { uuidv4, getAlias } from '../../utils/helper';
-import { changeTableAlias, getSubColumns } from '../../utils';
+import { changeTableAlias, getSubColumns, isValidSQLAlias } from '../../utils';
 import { RelatedWork } from '@gingkoo/pandora-icons';
 import cloneDeep from 'lodash/cloneDeep';
 import isEqual from 'lodash/isEqual';
@@ -20,7 +20,7 @@ import NextDom from './components/meta-icon';
 import Header from './components/header';
 import { useStore } from '../../hooks/use-provider';
 var TableData = function TableData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6, _store$showMainColumn;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = useStore();
@@ -40,7 +40,7 @@ var TableData = function TableData(props) {
               tableUuid: uuidv4('table'),
               alias: getAlias(data.name, store.metaList[groupIndex].list.slice())
             });
-            store.fetchColumns(data, data.datasourceId, function (columns) {
+            store.fetchColumns(data, data.datasourceId, [], function (columns) {
               newMetaList.columns = columns;
               // ① 主表动了 其他都得重新选
               store.setMeta([newMetaList], groupIndex);
@@ -84,28 +84,21 @@ var TableData = function TableData(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newMetaList;
-          return _regeneratorRuntime.wrap(function (_context) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (alias) {
-                  _context.next = 1;
+                if (isValidSQLAlias(alias)) {
+                  _context.next = 3;
                   break;
                 }
-                Toast.warning(__('SqlQueryBuilder.aliasCannotEmpty'));
+                Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(alias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                Toast.warning('别名长度不能超过30');
-                return _context.abrupt("return", false);
-              case 2:
+              case 3:
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = changeTableAlias(newMetaList, newMetaList[0].table);
                 store.setMeta(newMetaList, groupIndex);
-              case 3:
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -259,7 +252,7 @@ var TableData = function TableData(props) {
               icon: _jsx(RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && _jsx("div", {
+          }), selected && store.showFields && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')