@gingkoo/pandora-metabase 1.0.110 → 1.0.112

package/lib/cjs/components/dialog/formula-list/index.js

@@ -40,7 +40,7 @@ var _excluded = ["notExistsToolbar", "toolbar"],
   _excluded2 = ["subToolbar", "notExistsColumns", "showFields", "isExit", "toolbar"]; // import './index.less';
 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); }
 var FormulaList = (0, _react.forwardRef)(function (props, ref) {
-  var _storage$_metabaseCop, _caseList2;
+  var _storage$_metabaseCop;
   // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
   var _useState = (0, _react.useState)((_storage["default"] === null || _storage["default"] === void 0 || (_storage$_metabaseCop = _storage["default"]._metabaseCopyItems) === null || _storage$_metabaseCop === void 0 ? void 0 : _storage$_metabaseCop.length) || 0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -61,7 +61,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     };
   }, []);
   var store = (0, _useProvider.useStore)();
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     data = props.data,
     exitData = props.exitData,
     onChange = props.onChange,
@@ -74,8 +75,12 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     check = props.check,
     _props$_type = props._type,
     _type = _props$_type === void 0 ? 'filter' : _props$_type;
-  var caseList = value || [];
+  var _useState3 = (0, _react.useState)((0, _cloneDeep["default"])(value)),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    caseList = _useState4[0],
+    setCaseListState = _useState4[1];
   var caseListRef = (0, _react.useRef)(caseList);
+  var isSettingCaseList = (0, _react.useRef)(false);
   var operatorList = (0, _react.useMemo)(function () {
     if (store.operatorList.length > 0) {
       return store.operatorList;
@@ -83,23 +88,23 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       return _utils3.operatorList;
     }
   }, [store.operatorList]);
-  var _useState3 = (0, _react.useState)(''),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    oldCode = _useState4[0],
-    setOldCode = _useState4[1];
-  var _useState5 = (0, _react.useState)('code'),
+  var _useState5 = (0, _react.useState)(''),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    previewMode = _useState6[0],
-    setPreviewMode = _useState6[1];
-  var _useState7 = (0, _react.useState)(function () {
+    oldCode = _useState6[0],
+    setOldCode = _useState6[1];
+  var _useState7 = (0, _react.useState)('code'),
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    previewMode = _useState8[0],
+    setPreviewMode = _useState8[1];
+  var _useState9 = (0, _react.useState)(function () {
       if (store.copyType.includes(_types.FormulaTypeEnum.ALL)) {
         return true;
       }
       return store.copyType.includes(_type);
     }),
-    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    isCopy = _useState8[0],
-    setIsCopy = _useState8[1];
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    isCopy = _useState0[0],
+    setIsCopy = _useState0[1];
   // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
   // );
   var formulaList = (0, _react.useMemo)(function () {
@@ -108,10 +113,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   (0, _react.useEffect)(function () {
     setOldCode(getPreviewStr(caseList));
   }, []);
-  var _useState9 = (0, _react.useState)(''),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    filterVal = _useState0[0],
-    setFilterVal = _useState0[1];
+  var _useState1 = (0, _react.useState)(''),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    filterVal = _useState10[0],
+    setFilterVal = _useState10[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -122,47 +127,46 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         return v.val;
       }
     }).join(' ');
-    onChange === null || onChange === void 0 || onChange(data, quotes);
-    caseList = data;
+    isSettingCaseList.current = true;
+    setCaseListState(data);
     caseListRef.current = data;
+    onChange === null || onChange === void 0 || onChange(data, quotes);
   };
-  var _useState1 = (0, _react.useState)(-1),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    ind = _useState10[0],
-    setInd = _useState10[1];
+  var _useState11 = (0, _react.useState)(-1),
+    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+    ind = _useState12[0],
+    setInd = _useState12[1];
   var filterCustomType = store.filterCustomType;
   var _ref = (0, _react.useRef)(null);
-  var _useState11 = (0, _react.useState)({
+  var _useState13 = (0, _react.useState)({
       isError: false
     }),
-    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    errorInfo = _useState12[0],
-    setErrorInfo = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
     _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-    isCheck = _useState14[0],
-    setIsCheck = _useState14[1];
-  var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
-  var _useState15 = (0, _react.useState)(!!window.__sqb_selection_active__),
+    errorInfo = _useState14[0],
+    setErrorInfo = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
     _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-    globalSelectionActive = _useState16[0],
-    setGlobalSelectionActive = _useState16[1];
-  var _useState17 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
+    isCheck = _useState16[0],
+    setIsCheck = _useState16[1];
+  var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
+  var _useState17 = (0, _react.useState)(!!window.__sqb_selection_active__),
     _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
-    globalSelectionOwner = _useState18[0],
-    setGlobalSelectionOwner = _useState18[1];
-  var _useState19 = (0, _react.useState)([]),
+    globalSelectionActive = _useState18[0],
+    setGlobalSelectionActive = _useState18[1];
+  var _useState19 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
     _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
-    selectedIndices = _useState20[0],
-    setSelectedIndices = _useState20[1];
+    globalSelectionOwner = _useState20[0],
+    setGlobalSelectionOwner = _useState20[1];
+  var _useState21 = (0, _react.useState)([]),
+    _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
+    selectedIndices = _useState22[0],
+    setSelectedIndices = _useState22[1];
   (0, _react.useEffect)(function () {
-    var leftBrackets = caseList.filter(function (v) {
-      return v.type === _types.AtomsTypeEnum.OPERATOR && v.val === '(';
-    }).length;
-    var rightBrackets = caseList.filter(function (v) {
-      return v.type === _types.AtomsTypeEnum.OPERATOR && v.val === ')';
-    }).length;
-    // setIsSqlError(leftBrackets != rightBrackets);
+    // Skip if this update came from setCaseList (to avoid infinite loop)
+    if (isSettingCaseList.current) {
+      isSettingCaseList.current = false;
+      return;
+    }
     var _errorInfo = (0, _utils3.validateExpressionIntegrity)(caseList);
     setErrorInfo(_errorInfo);
   }, [caseList]);
@@ -945,7 +949,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           },
           children: "\u6E05\u9664\u590D\u5236"
         })]
-      }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
+      }), caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
         return (0, _jsxRuntime.jsxs)(_react["default"].Fragment, {
           children: [copyDom(i), (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])('Sqb-Filter-item', {

package/lib/cjs/components/dialog/select-column-multiple/index.js

@@ -201,6 +201,17 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList(newData);
   };
   // const _condition = value?.condition || '';
+  if (data.length < 1) {
+    return (0, _jsxRuntime.jsx)("div", {
+      className: 'Sqb-SelectColumns--box',
+      children: (0, _jsxRuntime.jsx)("div", {
+        className: 'Sqb-SelectColumns--empty',
+        children: (0, _jsxRuntime.jsx)(_pandora.Empty, {
+          content: '暂无数据'
+        })
+      })
+    });
+  }
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [(0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames["default"])("Sqb-SelectColumns--box ".concat(theme)),

package/lib/cjs/components/modules/components/meta-icon.js

@@ -383,9 +383,25 @@ var NextDom = function NextDom(props) {
       children: sortList(available).filter(function (v) {
         return ~store.toolbar.indexOf(v);
       }).map(function (v) {
-        return (0, _jsxRuntime.jsx)(MetaIconDom, {
-          type: v
-        }, v);
+        var info = IconTypeMap.get(v);
+        return (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+          title: size === IconSIzeEnum.SMALL ? info.name : '',
+          placement: 'top',
+          children: (0, _jsxRuntime.jsx)("button", {
+            className: (0, _classnames["default"])("Sqb-button ".concat(info.className || ''), {
+              small: size === IconSIzeEnum.SMALL,
+              large: size === IconSIzeEnum.LARGE
+            }),
+            onClick: function onClick() {
+              return handleClick(v);
+            },
+            children: (0, _jsxRuntime.jsxs)("div", {
+              children: [info.icon, size === IconSIzeEnum.LARGE ? (0, _jsxRuntime.jsx)("div", {
+                children: info.name
+              }) : '']
+            })
+          })
+        });
       })
     })]
   });

package/lib/cjs/index.js

@@ -54,8 +54,10 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     showSubquery = _props$showSubquery === void 0 ? true : _props$showSubquery,
     _props$subShowSubquer = props.subShowSubquery,
     subShowSubquery = _props$subShowSubquer === void 0 ? false : _props$subShowSubquer,
-    constantList = props.constantList,
-    formulaTemplates = props.formulaTemplates,
+    _props$constantList = props.constantList,
+    constantList = _props$constantList === void 0 ? EMPTY_ARRAY : _props$constantList,
+    _props$formulaTemplat = props.formulaTemplates,
+    formulaTemplates = _props$formulaTemplat === void 0 ? EMPTY_ARRAY : _props$formulaTemplat,
     _props$ignoreGroupByT = props.ignoreGroupByType,
     ignoreGroupByType = _props$ignoreGroupByT === void 0 ? false : _props$ignoreGroupByT,
     _props$filterCustomTy = props.filterCustomType,

package/lib/es/components/dialog/formula-list/index.js

@@ -32,7 +32,7 @@ import ItemName from '../../modules/components/item-name';
 import DiffViewer from '../diff-viewer';
 import storage from '../../../utils/storage';
 var FormulaList = forwardRef(function (props, ref) {
-  var _storage$_metabaseCop, _caseList2;
+  var _storage$_metabaseCop;
   // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
   var _useState = useState((storage === null || storage === void 0 || (_storage$_metabaseCop = storage._metabaseCopyItems) === null || _storage$_metabaseCop === void 0 ? void 0 : _storage$_metabaseCop.length) || 0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -53,7 +53,8 @@ var FormulaList = forwardRef(function (props, ref) {
     };
   }, []);
   var store = useStore();
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     data = props.data,
     exitData = props.exitData,
     onChange = props.onChange,
@@ -66,8 +67,12 @@ var FormulaList = forwardRef(function (props, ref) {
     check = props.check,
     _props$_type = props._type,
     _type = _props$_type === void 0 ? 'filter' : _props$_type;
-  var caseList = value || [];
+  var _useState3 = useState(cloneDeep(value)),
+    _useState4 = _slicedToArray(_useState3, 2),
+    caseList = _useState4[0],
+    setCaseListState = _useState4[1];
   var caseListRef = useRef(caseList);
+  var isSettingCaseList = useRef(false);
   var operatorList = useMemo(function () {
     if (store.operatorList.length > 0) {
       return store.operatorList;
@@ -75,23 +80,23 @@ var FormulaList = forwardRef(function (props, ref) {
       return __operatorList;
     }
   }, [store.operatorList]);
-  var _useState3 = useState(''),
-    _useState4 = _slicedToArray(_useState3, 2),
-    oldCode = _useState4[0],
-    setOldCode = _useState4[1];
-  var _useState5 = useState('code'),
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
-    previewMode = _useState6[0],
-    setPreviewMode = _useState6[1];
-  var _useState7 = useState(function () {
+    oldCode = _useState6[0],
+    setOldCode = _useState6[1];
+  var _useState7 = useState('code'),
+    _useState8 = _slicedToArray(_useState7, 2),
+    previewMode = _useState8[0],
+    setPreviewMode = _useState8[1];
+  var _useState9 = useState(function () {
       if (store.copyType.includes(FormulaTypeEnum.ALL)) {
         return true;
       }
       return store.copyType.includes(_type);
     }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    isCopy = _useState8[0],
-    setIsCopy = _useState8[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    isCopy = _useState0[0],
+    setIsCopy = _useState0[1];
   // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
   // );
   var formulaList = useMemo(function () {
@@ -100,10 +105,10 @@ var FormulaList = forwardRef(function (props, ref) {
   useEffect(function () {
     setOldCode(getPreviewStr(caseList));
   }, []);
-  var _useState9 = useState(''),
-    _useState0 = _slicedToArray(_useState9, 2),
-    filterVal = _useState0[0],
-    setFilterVal = _useState0[1];
+  var _useState1 = useState(''),
+    _useState10 = _slicedToArray(_useState1, 2),
+    filterVal = _useState10[0],
+    setFilterVal = _useState10[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -114,47 +119,46 @@ var FormulaList = forwardRef(function (props, ref) {
         return v.val;
       }
     }).join(' ');
-    onChange === null || onChange === void 0 || onChange(data, quotes);
-    caseList = data;
+    isSettingCaseList.current = true;
+    setCaseListState(data);
     caseListRef.current = data;
+    onChange === null || onChange === void 0 || onChange(data, quotes);
   };
-  var _useState1 = useState(-1),
-    _useState10 = _slicedToArray(_useState1, 2),
-    ind = _useState10[0],
-    setInd = _useState10[1];
+  var _useState11 = useState(-1),
+    _useState12 = _slicedToArray(_useState11, 2),
+    ind = _useState12[0],
+    setInd = _useState12[1];
   var filterCustomType = store.filterCustomType;
   var _ref = useRef(null);
-  var _useState11 = useState({
+  var _useState13 = useState({
       isError: false
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    errorInfo = _useState12[0],
-    setErrorInfo = _useState12[1];
-  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    isCheck = _useState14[0],
-    setIsCheck = _useState14[1];
-  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
-  var _useState15 = useState(!!window.__sqb_selection_active__),
+    errorInfo = _useState14[0],
+    setErrorInfo = _useState14[1];
+  var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    globalSelectionActive = _useState16[0],
-    setGlobalSelectionActive = _useState16[1];
-  var _useState17 = useState(window.__sqb_selection_owner__ || null),
+    isCheck = _useState16[0],
+    setIsCheck = _useState16[1];
+  var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
+  var _useState17 = useState(!!window.__sqb_selection_active__),
     _useState18 = _slicedToArray(_useState17, 2),
-    globalSelectionOwner = _useState18[0],
-    setGlobalSelectionOwner = _useState18[1];
-  var _useState19 = useState([]),
+    globalSelectionActive = _useState18[0],
+    setGlobalSelectionActive = _useState18[1];
+  var _useState19 = useState(window.__sqb_selection_owner__ || null),
     _useState20 = _slicedToArray(_useState19, 2),
-    selectedIndices = _useState20[0],
-    setSelectedIndices = _useState20[1];
+    globalSelectionOwner = _useState20[0],
+    setGlobalSelectionOwner = _useState20[1];
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    selectedIndices = _useState22[0],
+    setSelectedIndices = _useState22[1];
   useEffect(function () {
-    var leftBrackets = caseList.filter(function (v) {
-      return v.type === AtomsTypeEnum.OPERATOR && v.val === '(';
-    }).length;
-    var rightBrackets = caseList.filter(function (v) {
-      return v.type === AtomsTypeEnum.OPERATOR && v.val === ')';
-    }).length;
-    // setIsSqlError(leftBrackets != rightBrackets);
+    // Skip if this update came from setCaseList (to avoid infinite loop)
+    if (isSettingCaseList.current) {
+      isSettingCaseList.current = false;
+      return;
+    }
     var _errorInfo = validateExpressionIntegrity(caseList);
     setErrorInfo(_errorInfo);
   }, [caseList]);
@@ -937,7 +941,7 @@ var FormulaList = forwardRef(function (props, ref) {
           },
           children: "\u6E05\u9664\u590D\u5236"
         })]
-      }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
+      }), caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
         return _jsxs(React.Fragment, {
           children: [copyDom(i), _jsxs("div", {
             className: cx('Sqb-Filter-item', {

package/lib/es/components/dialog/select-column-multiple/index.js

@@ -11,6 +11,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  */
 import './index.less';
 import { useEffect, useState } from 'react';
+import { Empty } from '@gingkoo/pandora';
 import { Button } from '@gingkoo/pandora';
 import cloneDeep from 'lodash/cloneDeep';
 import cx from 'classnames';
@@ -196,6 +197,17 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList(newData);
   };
   // const _condition = value?.condition || '';
+  if (data.length < 1) {
+    return _jsx("div", {
+      className: 'Sqb-SelectColumns--box',
+      children: _jsx("div", {
+        className: 'Sqb-SelectColumns--empty',
+        children: _jsx(Empty, {
+          content: '暂无数据'
+        })
+      })
+    });
+  }
   return _jsxs(_Fragment, {
     children: [_jsx("div", {
       className: cx("Sqb-SelectColumns--box ".concat(theme)),

package/lib/es/components/modules/components/meta-icon.js

@@ -373,9 +373,25 @@ var NextDom = function NextDom(props) {
       children: sortList(available).filter(function (v) {
         return ~store.toolbar.indexOf(v);
       }).map(function (v) {
-        return _jsx(MetaIconDom, {
-          type: v
-        }, v);
+        var info = IconTypeMap.get(v);
+        return _jsx(Tooltip, {
+          title: size === IconSIzeEnum.SMALL ? info.name : '',
+          placement: 'top',
+          children: _jsx("button", {
+            className: cx("Sqb-button ".concat(info.className || ''), {
+              small: size === IconSIzeEnum.SMALL,
+              large: size === IconSIzeEnum.LARGE
+            }),
+            onClick: function onClick() {
+              return handleClick(v);
+            },
+            children: _jsxs("div", {
+              children: [info.icon, size === IconSIzeEnum.LARGE ? _jsx("div", {
+                children: info.name
+              }) : '']
+            })
+          })
+        });
       })
     })]
   });

package/lib/es/index.js

@@ -44,8 +44,10 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     showSubquery = _props$showSubquery === void 0 ? true : _props$showSubquery,
     _props$subShowSubquer = props.subShowSubquery,
     subShowSubquery = _props$subShowSubquer === void 0 ? false : _props$subShowSubquer,
-    constantList = props.constantList,
-    formulaTemplates = props.formulaTemplates,
+    _props$constantList = props.constantList,
+    constantList = _props$constantList === void 0 ? EMPTY_ARRAY : _props$constantList,
+    _props$formulaTemplat = props.formulaTemplates,
+    formulaTemplates = _props$formulaTemplat === void 0 ? EMPTY_ARRAY : _props$formulaTemplat,
     _props$ignoreGroupByT = props.ignoreGroupByType,
     ignoreGroupByType = _props$ignoreGroupByT === void 0 ? false : _props$ignoreGroupByT,
     _props$filterCustomTy = props.filterCustomType,

package/package.json

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