@gingkoo/pandora-metabase 1.0.139 → 1.0.141

package/README.md

@@ -73,9 +73,8 @@ export interface OptionItem {
 }
 
 export interface SqlVisionBuilderRef {
-  setDatasource: (list: DatasourceType[]) => void; // 设置数据源列表
-  setPreData: (data: MetaListType[]) => void; // 设置回显数据
   reset: () => void; // 重置到上次设置的数据
+  getConfig: () => MetaListType[]; // 获取当前最新配置
 }
 
 ```
@@ -126,4 +125,4 @@ export interface SqlVisionBuilderRef {
 			console.log(v);
 		}}
 	/>
-```
+```

package/lib/cjs/components/dialog/expression/index.js

@@ -86,6 +86,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
     isNext = _useState12[0],
     setIsNext = _useState12[1];
+  var showLeftFormula = Boolean(formula.type);
   var setParentClosable = function setParentClosable(closable) {
     if (parentPopupChannel === 'secondary') {
       store.setClosable2(closable);
@@ -789,7 +790,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
             className: 'span-name',
             onClick: goPrevPage,
             children: [(0, _jsxRuntime.jsx)(_icons.LeftArrowIcon, {}), getName(curColumn.lhs)]
-          }), leftFormula()]
+          }), showLeftFormula && leftFormula()]
         }), (0, _jsxRuntime.jsxs)("div", {
           className: 'right-info',
           children: [filterCustomType && (0, _jsxRuntime.jsx)(_pandora.Dropdown, {

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

@@ -104,7 +104,12 @@ var useStore = function useStore() {
   var _useState25 = (0, _react.useState)(defaultMeta),
     _useState26 = (0, _slicedToArray2["default"])(_useState25, 2),
     metaList = _useState26[0],
-    _setMeta = _useState26[1];
+    setMetaState = _useState26[1];
+  var latestMetaListRef = (0, _react.useRef)((0, _cloneDeep["default"])(defaultMeta));
+  var _setMeta = (0, _react.useCallback)(function (data) {
+    latestMetaListRef.current = (0, _cloneDeep["default"])(data);
+    setMetaState(data);
+  }, []);
   var _useState27 = (0, _react.useState)({
       visible: false,
       node: null,
@@ -480,6 +485,7 @@ var useStore = function useStore() {
     var _ref7 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7(curData, groupInd) {
       var changeObj,
         _metaList,
+        prevMeta,
         newMeta,
         isChange,
         _args7 = arguments;
@@ -487,10 +493,11 @@ var useStore = function useStore() {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             changeObj = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : {};
-            _metaList = _args7.length > 3 && _args7[3] !== undefined ? _args7[3] : metaList;
-            newMeta = (0, _cloneDeep["default"])(_metaList);
+            _metaList = _args7.length > 3 ? _args7[3] : undefined;
+            prevMeta = (0, _cloneDeep["default"])(_metaList || latestMetaListRef.current);
+            newMeta = (0, _cloneDeep["default"])(prevMeta);
             if (newMeta[groupInd]) {
-              newMeta[groupInd].list = curData;
+              newMeta[groupInd].list = (0, _cloneDeep["default"])(curData);
               _setMeta(newMeta);
             }
             if (!(changeObj === 'init')) {
@@ -500,13 +507,13 @@ var useStore = function useStore() {
             return _context7.abrupt("return");
           case 1:
             _context7.next = 2;
-            return fetchChangeFn.current((0, _utils.splitByUnion)(_metaList), changeObj, {
+            return fetchChangeFn.current((0, _utils.splitByUnion)(newMeta), changeObj, {
               isExit: isExit
             });
           case 2:
             isChange = _context7.sent;
             if (isChange === false) {
-              _setMeta(_metaList);
+              _setMeta(prevMeta);
             }
           case 3:
           case "end":
@@ -777,7 +784,7 @@ var useStore = function useStore() {
     };
     var groupList = ((_metaList$groupIndex = metaList[groupIndex]) === null || _metaList$groupIndex === void 0 ? void 0 : _metaList$groupIndex.list) || [];
     var getJoinKey = function getJoinKey(table1, table2) {
-      return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '');
+      return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.name) || '');
     };
     var existingJoinKeys = new Set();
     groupList.forEach(function (item) {
@@ -914,6 +921,9 @@ var useStore = function useStore() {
     set_cacheSource2TableMap({});
     set_cacheColumnsMap({});
   };
+  var getCurrentMetaList = function getCurrentMetaList() {
+    return (0, _cloneDeep["default"])(latestMetaListRef.current);
+  };
   return {
     showFields: showFields,
     setShowFields: setShowFields,
@@ -958,6 +968,7 @@ var useStore = function useStore() {
     setDataset: setDataset,
     getDataset: getDataset,
     reset: reset,
+    getCurrentMetaList: getCurrentMetaList,
     setProps: setProps,
     preProps: preProps.current,
     showSubquery: showSubquery,

package/lib/cjs/index.js

@@ -128,6 +128,13 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     return {
       reset: function reset() {
         store.reset();
+      },
+      getConfig: function getConfig() {
+        var metaList = (0, _utils.normalizeLegacySummarizeForSave)((0, _utils.splitByUnion)(store.getCurrentMetaList()));
+        if (metaList[0]) {
+          metaList[0].patchVersion = '1.1.0';
+        }
+        return metaList;
       }
     };
   });

package/lib/cjs/types.d.ts

@@ -76,4 +76,5 @@ export interface DatasourceType {
 }
 export interface SqlVisionBuilderRef {
     reset: () => void;
+    getConfig: () => MetaListType[];
 }

package/lib/es/components/dialog/expression/index.js

@@ -78,6 +78,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     isNext = _useState12[0],
     setIsNext = _useState12[1];
+  var showLeftFormula = Boolean(formula.type);
   var setParentClosable = function setParentClosable(closable) {
     if (parentPopupChannel === 'secondary') {
       store.setClosable2(closable);
@@ -781,7 +782,7 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
             className: 'span-name',
             onClick: goPrevPage,
             children: [_jsx(LeftArrowIcon, {}), getName(curColumn.lhs)]
-          }), leftFormula()]
+          }), showLeftFormula && leftFormula()]
         }), _jsxs("div", {
           className: 'right-info',
           children: [filterCustomType && _jsx(Dropdown, {

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

@@ -7,7 +7,7 @@ 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";
-import { useEffect, useState, useRef, useMemo } from 'react';
+import { useEffect, useState, useRef, useMemo, useCallback } from 'react';
 import { uuidv4, getAlias, isSameColumnByIdFirst } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
 import { splitByUnion } from '../utils';
@@ -98,7 +98,12 @@ var useStore = function useStore() {
   var _useState25 = useState(defaultMeta),
     _useState26 = _slicedToArray(_useState25, 2),
     metaList = _useState26[0],
-    _setMeta = _useState26[1];
+    setMetaState = _useState26[1];
+  var latestMetaListRef = useRef(cloneDeep(defaultMeta));
+  var _setMeta = useCallback(function (data) {
+    latestMetaListRef.current = cloneDeep(data);
+    setMetaState(data);
+  }, []);
   var _useState27 = useState({
       visible: false,
       node: null,
@@ -474,6 +479,7 @@ var useStore = function useStore() {
     var _ref7 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee7(curData, groupInd) {
       var changeObj,
         _metaList,
+        prevMeta,
         newMeta,
         isChange,
         _args7 = arguments;
@@ -481,10 +487,11 @@ var useStore = function useStore() {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             changeObj = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : {};
-            _metaList = _args7.length > 3 && _args7[3] !== undefined ? _args7[3] : metaList;
-            newMeta = cloneDeep(_metaList);
+            _metaList = _args7.length > 3 ? _args7[3] : undefined;
+            prevMeta = cloneDeep(_metaList || latestMetaListRef.current);
+            newMeta = cloneDeep(prevMeta);
             if (newMeta[groupInd]) {
-              newMeta[groupInd].list = curData;
+              newMeta[groupInd].list = cloneDeep(curData);
               _setMeta(newMeta);
             }
             if (!(changeObj === 'init')) {
@@ -494,13 +501,13 @@ var useStore = function useStore() {
             return _context7.abrupt("return");
           case 1:
             _context7.next = 2;
-            return fetchChangeFn.current(splitByUnion(_metaList), changeObj, {
+            return fetchChangeFn.current(splitByUnion(newMeta), changeObj, {
               isExit: isExit
             });
           case 2:
             isChange = _context7.sent;
             if (isChange === false) {
-              _setMeta(_metaList);
+              _setMeta(prevMeta);
             }
           case 3:
           case "end":
@@ -771,7 +778,7 @@ var useStore = function useStore() {
     };
     var groupList = ((_metaList$groupIndex = metaList[groupIndex]) === null || _metaList$groupIndex === void 0 ? void 0 : _metaList$groupIndex.list) || [];
     var getJoinKey = function getJoinKey(table1, table2) {
-      return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '');
+      return "".concat((table1 === null || table1 === void 0 ? void 0 : table1.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.id) || '', "_").concat((table2 === null || table2 === void 0 ? void 0 : table2.name) || '');
     };
     var existingJoinKeys = new Set();
     groupList.forEach(function (item) {
@@ -908,6 +915,9 @@ var useStore = function useStore() {
     set_cacheSource2TableMap({});
     set_cacheColumnsMap({});
   };
+  var getCurrentMetaList = function getCurrentMetaList() {
+    return cloneDeep(latestMetaListRef.current);
+  };
   return {
     showFields: showFields,
     setShowFields: setShowFields,
@@ -952,6 +962,7 @@ var useStore = function useStore() {
     setDataset: setDataset,
     getDataset: getDataset,
     reset: reset,
+    getCurrentMetaList: getCurrentMetaList,
     setProps: setProps,
     preProps: preProps.current,
     showSubquery: showSubquery,

package/lib/es/index.js

@@ -8,7 +8,7 @@ import './locale/zh';
 import { __ } from './locale';
 import Loading from './common/Loading';
 import Metabase from './components/metabase';
-import { reassembleByUnion, patchData } from './utils';
+import { reassembleByUnion, patchData, splitByUnion, normalizeLegacySummarizeForSave } from './utils';
 import cloneDeep from 'lodash/cloneDeep';
 var EMPTY_ARRAY = [];
 var SqlVisionBuilder = React.forwardRef(function (props, ref) {
@@ -119,6 +119,13 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     return {
       reset: function reset() {
         store.reset();
+      },
+      getConfig: function getConfig() {
+        var metaList = normalizeLegacySummarizeForSave(splitByUnion(store.getCurrentMetaList()));
+        if (metaList[0]) {
+          metaList[0].patchVersion = '1.1.0';
+        }
+        return metaList;
       }
     };
   });

package/lib/es/types.d.ts

@@ -76,4 +76,5 @@ export interface DatasourceType {
 }
 export interface SqlVisionBuilderRef {
     reset: () => void;
+    getConfig: () => MetaListType[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.139",
+  "version": "1.0.141",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",