@gingkoo/pandora-metabase 1.0.113 → 1.0.115

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;
+  var _storage$_metabaseCop, _caseList2;
   // 响应 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),
@@ -97,10 +97,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     });
     return map;
   }, [otherTypes]);
-  var _useState3 = (0, _react.useState)((0, _cloneDeep["default"])(value)),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    caseList = _useState4[0],
-    setCaseListState = _useState4[1];
+  var caseList = value || [];
+  // const [caseList, setCaseListState] = useState<AtomsItem[]>(cloneDeep(value));
   var caseListRef = (0, _react.useRef)(caseList);
   var isSettingCaseList = (0, _react.useRef)(false);
   var operatorList = (0, _react.useMemo)(function () {
@@ -110,23 +108,23 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       return _utils3.operatorList;
     }
   }, [store.operatorList]);
-  var _useState5 = (0, _react.useState)(''),
+  var _useState3 = (0, _react.useState)(''),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    oldCode = _useState4[0],
+    setOldCode = _useState4[1];
+  var _useState5 = (0, _react.useState)('code'),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    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 () {
+    previewMode = _useState6[0],
+    setPreviewMode = _useState6[1];
+  var _useState7 = (0, _react.useState)(function () {
       if (store.copyType.includes(_types.FormulaTypeEnum.ALL)) {
         return true;
       }
       return store.copyType.includes(_type);
     }),
-    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    isCopy = _useState0[0],
-    setIsCopy = _useState0[1];
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    isCopy = _useState8[0],
+    setIsCopy = _useState8[1];
   // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
   // );
   var formulaList = (0, _react.useMemo)(function () {
@@ -135,10 +133,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   (0, _react.useEffect)(function () {
     setOldCode(getPreviewStr(caseList));
   }, []);
-  var _useState1 = (0, _react.useState)(''),
-    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
-    filterVal = _useState10[0],
-    setFilterVal = _useState10[1];
+  var _useState9 = (0, _react.useState)(''),
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    filterVal = _useState0[0],
+    setFilterVal = _useState0[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -150,39 +148,40 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       }
     }).join(' ');
     isSettingCaseList.current = true;
-    setCaseListState(data);
+    // setCaseListState(data);
+    caseList = data;
     caseListRef.current = data;
     onChange === null || onChange === void 0 || onChange(data, quotes);
   };
-  var _useState11 = (0, _react.useState)(-1),
-    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    ind = _useState12[0],
-    setInd = _useState12[1];
+  var _useState1 = (0, _react.useState)(-1),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    ind = _useState10[0],
+    setInd = _useState10[1];
   var filterCustomType = store.filterCustomType;
   var _ref = (0, _react.useRef)(null);
-  var _useState13 = (0, _react.useState)({
+  var _useState11 = (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),
-    errorInfo = _useState14[0],
-    setErrorInfo = _useState14[1];
-  var _useState15 = (0, _react.useState)(false),
-    _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-    isCheck = _useState16[0],
-    setIsCheck = _useState16[1];
+    isCheck = _useState14[0],
+    setIsCheck = _useState14[1];
   var myInstanceIdRef = (0, _react.useRef)(Math.random().toString(36).slice(2));
-  var _useState17 = (0, _react.useState)(!!window.__sqb_selection_active__),
+  var _useState15 = (0, _react.useState)(!!window.__sqb_selection_active__),
+    _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
+    globalSelectionActive = _useState16[0],
+    setGlobalSelectionActive = _useState16[1];
+  var _useState17 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
     _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
-    globalSelectionActive = _useState18[0],
-    setGlobalSelectionActive = _useState18[1];
-  var _useState19 = (0, _react.useState)(window.__sqb_selection_owner__ || null),
+    globalSelectionOwner = _useState18[0],
+    setGlobalSelectionOwner = _useState18[1];
+  var _useState19 = (0, _react.useState)([]),
     _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
-    globalSelectionOwner = _useState20[0],
-    setGlobalSelectionOwner = _useState20[1];
-  var _useState21 = (0, _react.useState)([]),
-    _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
-    selectedIndices = _useState22[0],
-    setSelectedIndices = _useState22[1];
+    selectedIndices = _useState20[0],
+    setSelectedIndices = _useState20[1];
   (0, _react.useEffect)(function () {
     // Skip if this update came from setCaseList (to avoid infinite loop)
     if (isSettingCaseList.current) {
@@ -483,7 +482,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     } : (0, _utils3.getTemplateItem)(type);
     if (position === 'add') {
       _caseList.push(temItem);
-      _ind = index + 1;
+      _ind = _caseList.length - 1;
     } else if (position === 'before') {
       _caseList.splice(index, 0, temItem);
       _ind = index;
@@ -828,7 +827,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       var listSource = (currentOtherType === null || currentOtherType === void 0 ? void 0 : currentOtherType.list) || [];
       return (0, _jsxRuntime.jsx)(_itemName["default"], {
         isError: !!(v.id || v.val) && !(0, _utils3.getConstantLabel)(listSource, v.id || v.val),
-        message: "\u5E38\u91CF\u4E22\u5931",
+        message: "".concat(currentOtherType === null || currentOtherType === void 0 ? void 0 : currentOtherType.label, "\u4E22\u5931"),
         children: (0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames["default"])("Sqb-TableName", {
             notSelected: !v.val
@@ -1012,7 +1011,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           },
           children: "\u6E05\u9664\u590D\u5236"
         })]
-      }), caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
+      }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.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/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;
+  var _storage$_metabaseCop, _caseList2;
   // 响应 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),
@@ -89,10 +89,8 @@ var FormulaList = forwardRef(function (props, ref) {
     });
     return map;
   }, [otherTypes]);
-  var _useState3 = useState(cloneDeep(value)),
-    _useState4 = _slicedToArray(_useState3, 2),
-    caseList = _useState4[0],
-    setCaseListState = _useState4[1];
+  var caseList = value || [];
+  // const [caseList, setCaseListState] = useState<AtomsItem[]>(cloneDeep(value));
   var caseListRef = useRef(caseList);
   var isSettingCaseList = useRef(false);
   var operatorList = useMemo(function () {
@@ -102,23 +100,23 @@ var FormulaList = forwardRef(function (props, ref) {
       return __operatorList;
     }
   }, [store.operatorList]);
-  var _useState5 = useState(''),
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    oldCode = _useState4[0],
+    setOldCode = _useState4[1];
+  var _useState5 = useState('code'),
     _useState6 = _slicedToArray(_useState5, 2),
-    oldCode = _useState6[0],
-    setOldCode = _useState6[1];
-  var _useState7 = useState('code'),
-    _useState8 = _slicedToArray(_useState7, 2),
-    previewMode = _useState8[0],
-    setPreviewMode = _useState8[1];
-  var _useState9 = useState(function () {
+    previewMode = _useState6[0],
+    setPreviewMode = _useState6[1];
+  var _useState7 = useState(function () {
       if (store.copyType.includes(FormulaTypeEnum.ALL)) {
         return true;
       }
       return store.copyType.includes(_type);
     }),
-    _useState0 = _slicedToArray(_useState9, 2),
-    isCopy = _useState0[0],
-    setIsCopy = _useState0[1];
+    _useState8 = _slicedToArray(_useState7, 2),
+    isCopy = _useState8[0],
+    setIsCopy = _useState8[1];
   // const [formulaList, setFunctionList] = useState<{ [params: string]: FormulaTemplatesItem }>(
   // );
   var formulaList = useMemo(function () {
@@ -127,10 +125,10 @@ var FormulaList = forwardRef(function (props, ref) {
   useEffect(function () {
     setOldCode(getPreviewStr(caseList));
   }, []);
-  var _useState1 = useState(''),
-    _useState10 = _slicedToArray(_useState1, 2),
-    filterVal = _useState10[0],
-    setFilterVal = _useState10[1];
+  var _useState9 = useState(''),
+    _useState0 = _slicedToArray(_useState9, 2),
+    filterVal = _useState0[0],
+    setFilterVal = _useState0[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -142,39 +140,40 @@ var FormulaList = forwardRef(function (props, ref) {
       }
     }).join(' ');
     isSettingCaseList.current = true;
-    setCaseListState(data);
+    // setCaseListState(data);
+    caseList = data;
     caseListRef.current = data;
     onChange === null || onChange === void 0 || onChange(data, quotes);
   };
-  var _useState11 = useState(-1),
-    _useState12 = _slicedToArray(_useState11, 2),
-    ind = _useState12[0],
-    setInd = _useState12[1];
+  var _useState1 = useState(-1),
+    _useState10 = _slicedToArray(_useState1, 2),
+    ind = _useState10[0],
+    setInd = _useState10[1];
   var filterCustomType = store.filterCustomType;
   var _ref = useRef(null);
-  var _useState13 = useState({
+  var _useState11 = useState({
       isError: false
     }),
+    _useState12 = _slicedToArray(_useState11, 2),
+    errorInfo = _useState12[0],
+    setErrorInfo = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    errorInfo = _useState14[0],
-    setErrorInfo = _useState14[1];
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    isCheck = _useState16[0],
-    setIsCheck = _useState16[1];
+    isCheck = _useState14[0],
+    setIsCheck = _useState14[1];
   var myInstanceIdRef = useRef(Math.random().toString(36).slice(2));
-  var _useState17 = useState(!!window.__sqb_selection_active__),
+  var _useState15 = useState(!!window.__sqb_selection_active__),
+    _useState16 = _slicedToArray(_useState15, 2),
+    globalSelectionActive = _useState16[0],
+    setGlobalSelectionActive = _useState16[1];
+  var _useState17 = useState(window.__sqb_selection_owner__ || null),
     _useState18 = _slicedToArray(_useState17, 2),
-    globalSelectionActive = _useState18[0],
-    setGlobalSelectionActive = _useState18[1];
-  var _useState19 = useState(window.__sqb_selection_owner__ || null),
+    globalSelectionOwner = _useState18[0],
+    setGlobalSelectionOwner = _useState18[1];
+  var _useState19 = useState([]),
     _useState20 = _slicedToArray(_useState19, 2),
-    globalSelectionOwner = _useState20[0],
-    setGlobalSelectionOwner = _useState20[1];
-  var _useState21 = useState([]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    selectedIndices = _useState22[0],
-    setSelectedIndices = _useState22[1];
+    selectedIndices = _useState20[0],
+    setSelectedIndices = _useState20[1];
   useEffect(function () {
     // Skip if this update came from setCaseList (to avoid infinite loop)
     if (isSettingCaseList.current) {
@@ -475,7 +474,7 @@ var FormulaList = forwardRef(function (props, ref) {
     } : getTemplateItem(type);
     if (position === 'add') {
       _caseList.push(temItem);
-      _ind = index + 1;
+      _ind = _caseList.length - 1;
     } else if (position === 'before') {
       _caseList.splice(index, 0, temItem);
       _ind = index;
@@ -820,7 +819,7 @@ var FormulaList = forwardRef(function (props, ref) {
       var listSource = (currentOtherType === null || currentOtherType === void 0 ? void 0 : currentOtherType.list) || [];
       return _jsx(ItemName, {
         isError: !!(v.id || v.val) && !getConstantLabel(listSource, v.id || v.val),
-        message: "\u5E38\u91CF\u4E22\u5931",
+        message: "".concat(currentOtherType === null || currentOtherType === void 0 ? void 0 : currentOtherType.label, "\u4E22\u5931"),
         children: _jsxs("div", {
           className: cx("Sqb-TableName", {
             notSelected: !v.val
@@ -1004,7 +1003,7 @@ var FormulaList = forwardRef(function (props, ref) {
           },
           children: "\u6E05\u9664\u590D\u5236"
         })]
-      }), caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
+      }), (_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
         return _jsxs(React.Fragment, {
           children: [copyDom(i), _jsxs("div", {
             className: cx('Sqb-Filter-item', {

package/package.json

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