@gingkoo/pandora-metabase 1.0.23 → 1.0.25

package/lib/cjs/components/icons.js

@@ -176,12 +176,12 @@ var LeftJoinIcon = exports.LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-var InnerJoinIcon = exports.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;
+var InnerJoinIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -195,11 +195,11 @@ var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref0) {
     })
   });
 };
-var UpArrowIcon = exports.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;
+var UpArrowIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -213,11 +213,11 @@ var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref1) {
     })
   });
 };
-var DownArrowIcon = exports.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;
+var DownArrowIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -231,11 +231,11 @@ var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref10) {
     })
   });
 };
-var CloseIcon = exports.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;
+var CloseIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -249,11 +249,11 @@ var CloseIcon = exports.CloseIcon = function CloseIcon(_ref11) {
     })
   });
 };
-var AddIcon = exports.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;
+var AddIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -266,11 +266,11 @@ var AddIcon = exports.AddIcon = function AddIcon(_ref12) {
     })
   });
 };
-var TableIcon = exports.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;
+var TableIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -283,11 +283,11 @@ var TableIcon = exports.TableIcon = function TableIcon(_ref13) {
     })
   });
 };
-var SearchIcon = exports.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;
+var SearchIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,

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

@@ -55,7 +55,7 @@ var Metabase = function Metabase(props) {
   var onSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var intercept, _metaList;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             intercept = false; // 是否返回
@@ -69,17 +69,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/cjs/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/cjs/components/modules/components/Wrapper.js

@@ -32,19 +32,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _couterRef$current;
-      return _regenerator["default"].wrap(function (_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 1;
+            _context.next = 2;
             return (0, _helper.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 (0, _helper.sleep)(500);
-          case 2:
+          case 6:
             setMaxHeight('auto');
-          case 3:
+          case 7:
           case "end":
             return _context.stop();
         }

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

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

package/lib/cjs/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/cjs/components/modules/enum/filter-enum.js

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

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

@@ -14,7 +14,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _pandora = require("@gingkoo/pandora");
 var _pandoraIcons = require("@gingkoo/pandora-icons");
-var _index2 = _interopRequireDefault(require("../../index"));
+var _index = _interopRequireDefault(require("../../index"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _helper = require("../../utils/helper");
@@ -44,7 +44,7 @@ var ExpressionsEnum;
   ExpressionsEnum["RIGHT"] = "rhs";
 })(ExpressionsEnum || (ExpressionsEnum = {}));
 var getText = function getText(v) {
-  return (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _types.AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), _types.AtomsTypeEnum.EXPRESSION, 'joinData.expression'), _types.AtomsTypeEnum.OPERATOR, 'customColumn.operator')[v];
+  return (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _types.AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), _types.AtomsTypeEnum.EXPRESSION, 'joinData.expression'), _types.AtomsTypeEnum.OPERATOR, 'customColumn.operator'), _types.AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
 };
 var menuTypes = [{
   key: _types.AtomsTypeEnum.JOIN_DEFAULT,
@@ -55,6 +55,9 @@ var menuTypes = [{
 }, {
   key: _types.AtomsTypeEnum.OPERATOR,
   label: (0, _locale.__)(getText(_types.AtomsTypeEnum.OPERATOR))
+}, {
+  key: _types.AtomsTypeEnum.COLLECTION,
+  label: (0, _locale.__)(getText(_types.AtomsTypeEnum.COLLECTION))
 }];
 var menuOperator = operators.map(function (v) {
   return {
@@ -63,7 +66,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 = (0, _useProvider.useStore)();
@@ -74,6 +77,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);
@@ -377,7 +381,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) {
@@ -693,10 +697,10 @@ var JoinData = function JoinData(props) {
         // value={(((newMeta[index] as MetaJoin).expressions[_ind] as AtomsExpression)[position])[`type`]}
         list: [{
           value: _types.AtomsTypeEnum.INPUT_STRING,
-          label: (0, _locale.__)('SqlQueryBuilder.input')
+          label: (0, _locale.__)('customColumn.input')
         }, {
           value: _types.AtomsTypeEnum.INPUT_NUMBER,
-          label: (0, _locale.__)('SqlQueryBuilder.numberInput')
+          label: (0, _locale.__)('customColumn.numberInput')
         }, {
           value: _types.AtomsTypeEnum.CONSTANT,
           label: (0, _locale.__)('customColumn.constant')
@@ -782,7 +786,7 @@ var JoinData = function JoinData(props) {
       title: (0, _locale.__)('SqlQueryBuilder.subquery'),
       transparentMask: true,
       content: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: (0, _jsxRuntime.jsx)(_index2["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
+        children: (0, _jsxRuntime.jsx)(_index["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
           showSubquery: store._showSubquery,
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),
@@ -860,30 +864,23 @@ var JoinData = function JoinData(props) {
       }),
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-          var _index, newMeta;
-          return _regenerator["default"].wrap(function (_context) {
+          var index, newMeta;
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (alias) {
-                  _context.next = 1;
-                  break;
-                }
-                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
-                return _context.abrupt("return", false);
-              case 1:
-                if (!(alias.length > 30)) {
-                  _context.next = 2;
+                if ((0, _utils.isValidSQLAlias)(alias)) {
+                  _context.next = 3;
                   break;
                 }
-                _pandora.Toast.warning('别名长度不能超过30');
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 2:
-                _index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
+              case 3:
+                index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
                 newMeta = store.metaList[groupIndex].list.slice();
-                newMeta[_index].table2.alias = alias;
-                newMeta = (0, _utils.changeTableAlias)(newMeta, newMeta[_index].table2);
+                newMeta[index].table2.alias = alias;
+                newMeta = (0, _utils.changeTableAlias)(newMeta, newMeta[index].table2);
                 store.setMeta(newMeta, groupIndex);
-              case 3:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -929,7 +926,8 @@ var JoinData = function JoinData(props) {
     var i = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
     var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
-    var item = null;
+    var item = (0, _dialog.getTemplateItem)(type);
+    console.log('🚀 ~ addExpression ~ item:', item);
     if (type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
       item = {
         lhs: [{
@@ -998,15 +996,6 @@ var JoinData = function JoinData(props) {
         type: type
       };
     }
-    if (type === _types.AtomsTypeEnum.EXPRESSION) {
-      item = {
-        lhs: [],
-        condition: '',
-        rhs: [],
-        quotes: '',
-        type: type
-      };
-    }
     if (!item) {
       return;
     }
@@ -1362,7 +1351,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 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+            if (v.type === _types.AtomsTypeEnum.COLLECTION) {
+              return (0, _jsxRuntime.jsxs)("div", {
+                className: (0, _classnames["default"])(" Sqb-collection-box"),
+                children: [(0, _jsxRuntime.jsx)("div", {
+                  children: (0, _jsxRuntime.jsx)(_dialog.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);
+                    }
+                  })
+                }), (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+                  title: (0, _locale.__)('SqlQueryBuilder.add'),
+                  children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
+                    trigger: ['click'],
+                    onChange: function onChange(key) {
+                      addExpression(key, i);
+                    },
+                    droplist: menuTypes,
+                    children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+                      disabled: meta.readonly,
+                      primary: true,
+                      ghost: true,
+                      className: 'mr-2 operator-icon',
+                      icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfPlus, {})
+                    })
+                  })
+                }), (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+                  title: (0, _locale.__)('SqlQueryBuilder.del'),
+                  children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+                    disabled: meta.readonly,
+                    danger: true,
+                    className: 'mr-2 operator-icon',
+                    icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
+                    onClick: function onClick() {
+                      var index = (0, _utils.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 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
             title: (0, _locale.__)('SqlQueryBuilder.add'),
             children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
               trigger: ['click'],
@@ -1378,7 +1420,7 @@ var JoinData = function JoinData(props) {
                 icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfPlus, {})
               })
             })
-          }), columnsSelected && store.showFields && (0, _jsxRuntime.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 && (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: (0, _locale.__)('SqlQueryBuilder.columns')

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

@@ -240,29 +240,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 (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (fieldAlias) {
-                  _context.next = 1;
+                if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
+                  _context.next = 3;
                   break;
                 }
-                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(fieldAlias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                _pandora.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 = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].by[i]);
                 store.setMeta(newMeta, groupIndex);
-              case 3:
+              case 8:
               case "end":
                 return _context.stop();
             }

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

@@ -248,29 +248,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 (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (fieldAlias) {
-                  _context.next = 1;
+                if ((0, _utils.isValidSQLAlias)(fieldAlias)) {
+                  _context.next = 3;
                   break;
                 }
-                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(fieldAlias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                _pandora.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 = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].group[i]);
                 store.setMeta(newMeta, groupIndex);
-              case 3:
+              case 8:
               case "end":
                 return _context.stop();
             }

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

@@ -27,7 +27,7 @@ var _header = _interopRequireDefault(require("./components/header"));
 var _useProvider = require("../../hooks/use-provider");
 var _excluded = ["subToolbar", "toolbar"];
 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 = (0, _useProvider.useStore)();
@@ -47,7 +47,7 @@ var TableData = function TableData(props) {
               tableUuid: (0, _helper.uuidv4)('table'),
               alias: (0, _helper.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);
@@ -91,28 +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 (_context) {
+          return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (alias) {
-                  _context.next = 1;
+                if ((0, _utils.isValidSQLAlias)(alias)) {
+                  _context.next = 3;
                   break;
                 }
-                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 1:
-                if (!(alias.length > 30)) {
-                  _context.next = 2;
-                  break;
-                }
-                _pandora.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 = (0, _utils.changeTableAlias)(newMetaList, newMetaList[0].table);
                 store.setMeta(newMetaList, groupIndex);
-              case 3:
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -266,7 +259,7 @@ var TableData = function TableData(props) {
               icon: (0, _jsxRuntime.jsx)(_pandoraIcons.RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && (0, _jsxRuntime.jsx)("div", {
+          }), selected && store.showFields && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: (0, _locale.__)('SqlQueryBuilder.columns')

package/lib/cjs/components/popup.js

@@ -19,7 +19,8 @@ var React = _interopRequireWildcard(require("react"));
 var _helperDom = require("../utils/helper-dom");
 var _event = require("../utils/event");
 var _Portal = _interopRequireDefault(require("../common/Portal"));
-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 _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 _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) {