@gingkoo/pandora-metabase 1.0.24 → 1.0.25

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

@@ -8,7 +8,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useState, useRef, useMemo } from 'react';
 import { uuidv4 } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
-import { getSubColumns } from '../utils';
+import { getSubColumns, findIndex } from '../utils';
 var metaKey = 1;
 export var SummarizeAlias = 'source';
 var useStore = function useStore() {
@@ -55,69 +55,69 @@ var useStore = function useStore() {
     toolbar = _useState8[0],
     setToolbar = _useState8[1]; //工具列表
   var _useState9 = 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([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    fieldNameTpl = _useState10[0],
+    setFieldNameTpl = _useState10[1]; //显示字段
+  var _useState11 = useState('${name}'),
     _useState12 = _slicedToArray(_useState11, 2),
-    sourceList = _useState12[0],
-    setSourceList = _useState12[1]; //数据源列表
+    tableNameTpl = _useState12[0],
+    setTableNameTpl = _useState12[1]; //显示字段
   var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    constantList = _useState14[0],
-    setConstantList = _useState14[1]; //常量列表
+    sourceList = _useState14[0],
+    setSourceList = _useState14[1]; //数据源列表
   var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    formulaTemplates = _useState16[0],
-    setFormulaTemplates = _useState16[1]; //公式配置数组
-  var _useState17 = useState(false),
+    constantList = _useState16[0],
+    setConstantList = _useState16[1]; //常量列表
+  var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    ignoreGroupByType = _useState18[0],
-    setIgnoreGroupByType = _useState18[1]; // 忽略groupBy类型
+    formulaTemplates = _useState18[0],
+    setFormulaTemplates = _useState18[1]; //公式配置数组
   var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    filterCustomType = _useState20[0],
-    setfilterCustomType = _useState20[1]; // 过滤器自定义类型
-  var _useState21 = useState({}),
+    ignoreGroupByType = _useState20[0],
+    setIgnoreGroupByType = _useState20[1]; // 忽略groupBy类型
+  var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    _cacheSource2TableMap = _useState22[0],
-    set_cacheSource2TableMap = _useState22[1]; //数据源id 对应数据集列表
+    filterCustomType = _useState22[0],
+    setfilterCustomType = _useState22[1]; // 过滤器自定义类型
   var _useState23 = useState({}),
     _useState24 = _slicedToArray(_useState23, 2),
-    _cacheColumnsMap = _useState24[0],
-    set_cacheColumnsMap = _useState24[1]; //数据源id 对应数据集列表
-  var _useState25 = useState(defaultMeta),
+    _cacheSource2TableMap = _useState24[0],
+    set_cacheSource2TableMap = _useState24[1]; //数据源id 对应数据集列表
+  var _useState25 = useState({}),
     _useState26 = _slicedToArray(_useState25, 2),
-    metaList = _useState26[0],
-    _setMeta = _useState26[1]; //数据源id 对应数据集列表
-  var _useState27 = useState({
+    _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({
       visible: false,
       node: null,
       content: null
     }),
-    _useState28 = _slicedToArray(_useState27, 2),
-    popupData = _useState28[0],
-    setPopup = _useState28[1]; //弹窗
-  var _useState29 = useState({
+    _useState30 = _slicedToArray(_useState29, 2),
+    popupData = _useState30[0],
+    setPopup = _useState30[1]; //弹窗
+  var _useState31 = 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),
-    popupClosable = _useState32[0],
-    setClosable = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    popupData2 = _useState32[0],
+    setPopup2 = _useState32[1]; //弹窗
   var _useState33 = useState(true),
     _useState34 = _slicedToArray(_useState33, 2),
-    popupClosable2 = _useState34[0],
-    setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+    popupClosable = _useState34[0],
+    setClosable = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState35 = useState(true),
+    _useState36 = _slicedToArray(_useState35, 2),
+    popupClosable2 = _useState36[0],
+    setClosable2 = _useState36[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -142,14 +142,21 @@ var useStore = function useStore() {
       var summarizeItems = item.list.filter(function (v) {
         return v.type === TypeEnum.summarize;
       });
+      var index = findIndex(item.list, summarizeItems[summarizeItems.length - 1]);
       // 如果没有汇总项，默认显示主列
       if (summarizeItems.length === 0) {
-        return true;
+        return {
+          showColumn: true,
+          index: -1
+        };
       }
       // 如果只有一个汇总项，并且 group 和 by 都为空，则也显示主列
       var onlyItem = summarizeItems[0];
       var hasGroupOrBy = Array.isArray(onlyItem.group) && onlyItem.group.length > 0 || Array.isArray(onlyItem.by) && onlyItem.by.length > 0;
-      return !hasGroupOrBy;
+      return {
+        showColumn: !hasGroupOrBy,
+        index: index
+      };
     });
   }, [metaList]);
   // const showMainColumn = useMemo(() => {
@@ -170,23 +177,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 (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context.next = 1;
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return", tables);
-          case 1:
-            _context.next = 2;
+          case 3:
+            _context.next = 5;
             return fetchDatasetFn.current(datasourceId);
-          case 2:
+          case 5:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
             return _context.abrupt("return", _tables);
-          case 3:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -200,38 +207,60 @@ var useStore = function useStore() {
   //  fetchDataset():
   // 查询表字段
   var fetchColumns = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(table, datasourceId, callback) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(table, datasourceId) {
       var _columns2;
-      var _table$alias, alias, datasourceName, did, column, extra, tableName, columns, _columns;
-      return _regeneratorRuntime.wrap(function (_context2) {
+      var oldColumns,
+        callback,
+        selectId,
+        _table$alias,
+        alias,
+        datasourceName,
+        did,
+        column,
+        extra,
+        tableName,
+        columns,
+        _columns,
+        _args2 = arguments;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            oldColumns = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : [];
+            callback = _args2.length > 3 ? _args2[3] : undefined;
+            // 获取之前选中的数据
+            selectId = oldColumns.filter(function (v) {
+              return v.select;
+            }).map(function (v) {
+              return v.id;
+            });
             _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 = 2;
+              _context2.next = 11;
               break;
             }
-            _context2.next = 1;
+            _context2.next = 9;
             return fetchColumnsFn.current(extra, datasourceId);
-          case 1:
+          case 9:
             columns = _context2.sent;
             setColumns(tableName, columns);
-          case 2:
+          case 11:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
+              var select = selectId.includes(v.id);
               return _objectSpread(_objectSpread({}, v), {}, {
-                fieldUuid: v.fieldAlias || uuidv4('field')
+                select: select,
+                fieldUuid: v.fieldUuid || uuidv4('field')
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 3:
+          case 13:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    return function fetchColumns(_x2, _x3, _x4) {
+    return function fetchColumns(_x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -287,8 +316,8 @@ var useStore = function useStore() {
           //   newMeta[i] = setFilterQuotes(newMeta[i]);
           // }
           // 设置右侧column
-          if ((_v$table = v.table2) !== null && _v$table !== void 0 && _v$table.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, function () {
+          if ((_v$table = v.table2) !== null && _v$table !== void 0 && _v$table.datasourceId) {
+            fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, v.columns, function () {
               var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
               if (v.isSubquery) {
                 var newColumns = [];
@@ -305,8 +334,8 @@ var useStore = function useStore() {
             return _objectSpread({}, v);
           }
           // 设置column
-          if ((_v$table2 = v.table) !== null && _v$table2 !== void 0 && _v$table2.datasourceId && v.columns.length < 1) {
-            fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, function () {
+          if ((_v$table2 = v.table) !== null && _v$table2 !== void 0 && _v$table2.datasourceId) {
+            fetchColumns(newMeta[i].table, newMeta[i].table.datasourceId, v.columns, function () {
               var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
               if (v.isSubquery) {
                 var newColumns = [];

package/lib/es/locale/en.js

@@ -49,8 +49,9 @@ export default register('en', {
   'SqlQueryBuilder.visualize': 'visualize',
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
-  'SqlQueryBuilder.aliasCannotEmpty': 'Alias cannot be empty',
+  'SqlQueryBuilder.aliasForRules': 'Please modify the alias according to the rules, and ensure its length does not exceed 30 characters',
   'customColumn.operator': 'operator',
+  'customColumn.collection': 'collection',
   'customColumn.field': 'field',
   'customColumn.constant': 'constant',
   'customColumn.str': 'string',

package/lib/es/locale/zh.js

@@ -45,8 +45,9 @@ export default register('zh', {
   'SqlQueryBuilder.visualize': '可视化',
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
-  'SqlQueryBuilder.aliasCannotEmpty': '别名不能为空',
+  'SqlQueryBuilder.aliasForRules': '请按规则修改别名，且长度不能超过30',
   'customColumn.operator': '操作符',
+  'customColumn.collection': '自定义组合',
   'customColumn.field': '字段',
   'customColumn.constant': '常量',
   'customColumn.str': '字符串',

package/lib/es/utils.d.ts

@@ -14,6 +14,7 @@ interface HelperResultType {
 }
 export declare const getHelper: (list: MetaListType[], item: MetaListType) => HelperResultType;
 export declare const getSubColumns: (metaList: any) => DataType[];
+export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
 export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias">) => MetaListType[];
 export declare function splitByUnion(data: any): any[];

package/lib/es/utils.js

@@ -241,11 +241,22 @@ var _changeAlias = function changeAlias(items, val, type) {
         });
       }
       return v;
+    } else if (v.type === AtomsTypeEnum.FORMULA) {
+      v.args = _changeAlias(v.args, val, type);
+      return v;
+    } else if (v.type === AtomsTypeEnum.COLLECTION) {
+      v.list = _changeAlias(v.list, val, type);
+      return v;
     } else {
       return v;
     }
   });
 };
+export function isValidSQLAlias(str) {
+  if (!str) return false;
+  var regex = /^[A-Za-z_][A-Za-z0-9_]{0,29}$/;
+  return regex.test(str);
+}
 export var changeTableAlias = function changeTableAlias(list, curObj) {
   var _cloneDeep = cloneDeep(curObj),
     tableUuid = _cloneDeep.tableUuid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",
@@ -27,7 +27,7 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@gingkoo/pandora": "1.2.0",
+    "@gingkoo/pandora": "1.2.3",
     "@gingkoo/pandora-hooks": "1.0.5",
     "@gingkoo/pandora-icons": "0.0.1-alpha.28",
     "dayjs": "^1.11.11",