@gingkoo/pandora-metabase 1.0.87 → 1.0.89

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

@@ -39,20 +39,20 @@ var TableData = function TableData(props) {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _meta$table, _meta$table2;
       var tableName, tables, names;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             tableName = (_meta$table = meta.table) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
             if (meta !== null && meta !== void 0 && (_meta$table2 = meta.table) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
-              _context.next = 1;
+              _context.next = 4;
               break;
             }
             setIsDel(false);
             return _context.abrupt("return");
-          case 1:
-            _context.next = 2;
+          case 4:
+            _context.next = 6;
             return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table.datasourceId);
-          case 2:
+          case 6:
             tables = _context.sent;
             names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
               return v.name;
@@ -62,7 +62,7 @@ var TableData = function TableData(props) {
             } else {
               setIsDel(false);
             }
-          case 3:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -148,16 +148,16 @@ var TableData = function TableData(props) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
           var newMetaList;
-          return _regeneratorRuntime.wrap(function (_context2) {
+          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 if (isValidSQLAlias(alias)) {
-                  _context2.next = 1;
+                  _context2.next = 3;
                   break;
                 }
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context2.abrupt("return", false);
-              case 1:
+              case 3:
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = changeTableAlias(newMetaList, newMetaList[0].table);
@@ -165,7 +165,7 @@ var TableData = function TableData(props) {
                   obj: newMetaList[0].table,
                   type: ChangeType.tableAlias
                 });
-              case 2:
+              case 7:
               case "end":
                 return _context2.stop();
             }

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

@@ -1,7 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -58,133 +58,146 @@ 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]; //是否可关闭 如果弹框里面再弹框 则不可关闭
-  var _useState35 = useState({}),
+    popupClosable = _useState34[0],
+    setClosable = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState35 = useState(true),
     _useState36 = _slicedToArray(_useState35, 2),
-    currentTable = _useState36[0],
-    setCurrentTable = _useState36[1]; // 当前存在的表
-  var _useState37 = useState(false),
+    popupClosable2 = _useState36[0],
+    setClosable2 = _useState36[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
+  var _useState37 = useState({}),
     _useState38 = _slicedToArray(_useState37, 2),
-    isExit = _useState38[0],
-    setIsExit = _useState38[1]; // 是否是notExit
+    currentTable = _useState38[0],
+    setCurrentTable = _useState38[1]; // 当前存在的表
   var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    isSubquery = _useState40[0],
-    setIsSubquery = _useState40[1]; // 是否是子查询
-  var _useState41 = useState(true),
+    isExit = _useState40[0],
+    setIsExit = _useState40[1]; // 是否是notExit
+  var _useState41 = useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    tableEnableAlias = _useState42[0],
-    setTableEnableAlias = _useState42[1]; // 表名是否开启别名
+    isSubquery = _useState42[0],
+    setIsSubquery = _useState42[1]; // 是否是子查询
   var _useState43 = useState(true),
     _useState44 = _slicedToArray(_useState43, 2),
-    fieldEnableAlias = _useState44[0],
-    setFieldEnableAlias = _useState44[1]; // 字段名是否开启别名
+    tableEnableAlias = _useState44[0],
+    setTableEnableAlias = _useState44[1]; // 表名是否开启别名
   var _useState45 = useState(true),
     _useState46 = _slicedToArray(_useState45, 2),
-    groupByEnableAlias = _useState46[0],
-    setGroupByEnableAlias = _useState46[1]; // 聚合是否开启别名
+    fieldEnableAlias = _useState46[0],
+    setFieldEnableAlias = _useState46[1]; // 字段名是否开启别名
   var _useState47 = useState(true),
     _useState48 = _slicedToArray(_useState47, 2),
-    isSelectFields = _useState48[0],
-    setIsSelectFields = _useState48[1]; // 是否默认勾选字段
-  var _useState49 = useState(false),
+    groupByEnableAlias = _useState48[0],
+    setGroupByEnableAlias = _useState48[1]; // 聚合是否开启别名
+  var _useState49 = useState(true),
     _useState50 = _slicedToArray(_useState49, 2),
-    tableFlat = _useState50[0],
-    setTableFlat = _useState50[1]; // 是否平铺数据表
-  var _useState51 = useState([]),
+    isSelectFields = _useState50[0],
+    setIsSelectFields = _useState50[1]; // 是否默认勾选字段
+  var _useState51 = useState(false),
     _useState52 = _slicedToArray(_useState51, 2),
-    sourceTable = _useState52[0],
-    setSourceTable = _useState52[1];
+    tableFlat = _useState52[0],
+    setTableFlat = _useState52[1]; // 是否平铺数据表
   var _useState53 = useState([]),
     _useState54 = _slicedToArray(_useState53, 2),
-    copyType = _useState54[0],
-    setCopyType = _useState54[1]; // 复制类型
-  var _useState55 = useState(false),
+    sourceTable = _useState54[0],
+    setSourceTable = _useState54[1];
+  var _useState55 = useState([]),
     _useState56 = _slicedToArray(_useState55, 2),
-    metabaseCopy = _useState56[0],
-    setMetabaseCopy = _useState56[1]; // 是否开启复制功能
+    copyType = _useState56[0],
+    setCopyType = _useState56[1]; // 复制类型
   var _useState57 = useState(false),
     _useState58 = _slicedToArray(_useState57, 2),
-    moduleDiff = _useState58[0],
-    setModuleDiff = _useState58[1]; // 是否开启模块比对功能
-  var _useState59 = useState([]),
+    metabaseCopy = _useState58[0],
+    setMetabaseCopy = _useState58[1]; // 是否开启复制功能
+  var _useState59 = useState(false),
     _useState60 = _slicedToArray(_useState59, 2),
-    sourceData = _useState60[0],
-    setSourceData = _useState60[1]; // 原始数据
-  var _useState61 = useState(false),
+    moduleDiff = _useState60[0],
+    setModuleDiff = _useState60[1]; // 是否开启模块比对功能
+  var _useState61 = useState([]),
     _useState62 = _slicedToArray(_useState61, 2),
-    moduleCopy = _useState62[0],
-    setModuleCopy = _useState62[1]; // 是否开启模块复制功能
+    sourceData = _useState62[0],
+    setSourceData = _useState62[1]; // 原始数据
   var _useState63 = useState(false),
     _useState64 = _slicedToArray(_useState63, 2),
-    isMetabaseCopy = _useState64[0],
-    setIsMetabaseCopy = _useState64[1]; // 是否开启勾选组复制
-  var _useState65 = useState(storage._metabaseCopyModule || []),
+    moduleCopy = _useState64[0],
+    setModuleCopy = _useState64[1]; // 是否开启模块复制功能
+  var _useState65 = useState(false),
     _useState66 = _slicedToArray(_useState65, 2),
-    metabaseCopyModule = _useState66[0],
-    setMetabaseCopyModule = _useState66[1]; // 复制的内容
+    isMetabaseCopy = _useState66[0],
+    setIsMetabaseCopy = _useState66[1]; // 是否开启勾选组复制
+  var _useState67 = useState(storage._metabaseCopyModule || []),
+    _useState68 = _slicedToArray(_useState67, 2),
+    metabaseCopyModule = _useState68[0],
+    setMetabaseCopyModule = _useState68[1]; // 复制的内容
+  var setFormulaTemplates = function setFormulaTemplates(data) {
+    var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
+      var children = v.children.map(function (vv) {
+        return _objectSpread(_objectSpread({}, vv), {}, {
+          id: vv.id || vv.name
+        });
+      });
+      return _objectSpread(_objectSpread({}, v), {}, {
+        children: children
+      });
+    });
+    _setFormulaTemplates(newData);
+  };
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -210,20 +223,20 @@ var useStore = function useStore() {
         newCode,
         data,
         _args = arguments;
-      return _regeneratorRuntime.wrap(function (_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             oldCode = _args.length > 0 && _args[0] !== undefined ? _args[0] : [];
             newCode = _args.length > 1 ? _args[1] : undefined;
-            _context.next = 1;
+            _context.next = 4;
             return fetchDiffFn.current({
               oldCode: oldCode,
               newCode: newCode
             });
-          case 1:
+          case 4:
             data = _context.sent;
             return _context.abrupt("return", data);
-          case 2:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -273,24 +286,24 @@ var useStore = function useStore() {
   var getSourceTable = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(source) {
       var results;
-      return _regeneratorRuntime.wrap(function (_context3) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.next = 1;
+            _context3.next = 2;
             return Promise.all(source.map(/*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(v) {
                 var tables;
-                return _regeneratorRuntime.wrap(function (_context2) {
+                return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:
-                      _context2.next = 1;
+                      _context2.next = 2;
                       return fetchDataset(v.datasourceId);
-                    case 1:
+                    case 2:
                       tables = _context2.sent;
                       return _context2.abrupt("return", _objectSpread(_objectSpread({}, v), {}, {
                         children: tables
                       }));
-                    case 2:
+                    case 4:
                     case "end":
                       return _context2.stop();
                   }
@@ -300,10 +313,10 @@ var useStore = function useStore() {
                 return _ref3.apply(this, arguments);
               };
             }()));
-          case 1:
+          case 2:
             results = _context3.sent;
             setSourceTable(results || []);
-          case 2:
+          case 4:
           case "end":
             return _context3.stop();
         }
@@ -331,25 +344,25 @@ var useStore = function useStore() {
   var fetchDataset = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(datasourceId) {
       var tables, _tables;
-      return _regeneratorRuntime.wrap(function (_context4) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context4.next = 1;
+              _context4.next = 3;
               break;
             }
             return _context4.abrupt("return", tables);
-          case 1:
-            _context4.next = 2;
+          case 3:
+            _context4.next = 5;
             return fetchDatasetFn.current(datasourceId, {
               isExit: isExit
             });
-          case 2:
+          case 5:
             _tables = _context4.sent;
             setDataset(datasourceId, _tables);
             return _context4.abrupt("return", _tables);
-          case 3:
+          case 8:
           case "end":
             return _context4.stop();
         }
@@ -382,7 +395,7 @@ var useStore = function useStore() {
         columns,
         _columns,
         _args5 = arguments;
-      return _regeneratorRuntime.wrap(function (_context5) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             oldColumns = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : [];
@@ -408,17 +421,17 @@ var useStore = function useStore() {
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context5.next = 2;
+              _context5.next = 16;
               break;
             }
-            _context5.next = 1;
+            _context5.next = 14;
             return fetchColumnsFn.current(extra, datasourceId, {
               isExit: _isExit
             });
-          case 1:
+          case 14:
             columns = _context5.sent;
             setColumns(tableName, columns);
-          case 2:
+          case 16:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
               var select = selectId.includes(v.id);
               var obj = {};
@@ -429,7 +442,7 @@ var useStore = function useStore() {
               });
             });
             typeof callback === 'function' && callback(_columns);
-          case 3:
+          case 18:
           case "end":
             return _context5.stop();
         }
@@ -446,7 +459,7 @@ var useStore = function useStore() {
         newMeta,
         isChange,
         _args6 = arguments;
-      return _regeneratorRuntime.wrap(function (_context6) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             changeObj = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
@@ -458,22 +471,22 @@ var useStore = function useStore() {
             }
             // 过滤掉初始化
             if (!(changeObj === 'init')) {
-              _context6.next = 1;
+              _context6.next = 6;
               break;
             }
             return _context6.abrupt("return");
-          case 1:
-            _context6.next = 2;
+          case 6:
+            _context6.next = 8;
             return fetchChangeFn.current(splitByUnion(_metaList), changeObj, {
               isExit: isExit
             });
-          case 2:
+          case 8:
             isChange = _context6.sent;
             // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }
-          case 3:
+          case 10:
           case "end":
             return _context6.stop();
         }

package/lib/es/store/types.d.ts

@@ -71,6 +71,7 @@ export interface AtomsFormula {
     arity?: Arity;
     quotes: string;
     name: string;
+    id?: string;
     type: AtomsTypeEnum.FORMULA;
 }
 export interface AtomsExpression {
@@ -365,6 +366,7 @@ export interface PopupData {
 }
 export interface FormulaTemplatesItem {
     name: string;
+    id: string;
     args: {
         type: AtomsTypeEnum;
         check?: string | null;

package/lib/es/utils/transformSql.js

@@ -597,9 +597,9 @@ var _handleNesting = function handleNesting(data) {
     var customColumnsConstants = [];
     var handleCustomColumn = function handleCustomColumn(data) {
       return data.map(function (it) {
-        var _handleBaseType2Sql0 = _handleBaseType2Sql8(it.formulaList, db),
-          field_sql = _handleBaseType2Sql0.sql,
-          constants = _handleBaseType2Sql0.constants;
+        var _handleBaseType2Sql10 = _handleBaseType2Sql8(it.formulaList, db),
+          field_sql = _handleBaseType2Sql10.sql,
+          constants = _handleBaseType2Sql10.constants;
         customColumnsConstants.push.apply(customColumnsConstants, _toConsumableArray(constants));
         return {
           field_sql: "".concat(field_sql, " as ").concat(it.name),
@@ -614,9 +614,9 @@ var _handleNesting = function handleNesting(data) {
     obj.customColumnsConstants = customColumnsConstants;
   }
   if (filterData && filterData.filter.length) {
-    var _handleBaseType2Sql1 = _handleBaseType2Sql8(filterData.filter, db),
-      sql = _handleBaseType2Sql1.sql,
-      constants = _handleBaseType2Sql1.constants;
+    var _handleBaseType2Sql11 = _handleBaseType2Sql8(filterData.filter, db),
+      sql = _handleBaseType2Sql11.sql,
+      constants = _handleBaseType2Sql11.constants;
     obj.filters = 'WHERE ' + sql;
     obj.filtersConstants = constants;
   }
@@ -661,8 +661,8 @@ var _handleNesting = function handleNesting(data) {
   }
   if (sortData && sortData.sort.length) {
     obj.orderInfos = "ORDER BY ".concat(sortData.sort.map(function (v) {
-      var _handleBaseType2Sql10 = _handleBaseType2Sql8(v.expression, db),
-        sql = _handleBaseType2Sql10.sql;
+      var _handleBaseType2Sql12 = _handleBaseType2Sql8(v.expression, db),
+        sql = _handleBaseType2Sql12.sql;
       return "".concat(sql, " ").concat(v.sort);
     }).join(', '));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.87",
+  "version": "1.0.89",
   "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.20-alpha.1",
+    "@gingkoo/pandora": "1.2.20-alpha.2",
     "@gingkoo/pandora-hooks": "1.0.5",
     "@gingkoo/pandora-icons": "0.0.1-alpha.28",
     "@types/diff": "^8.0.0",