@lemon-fe/components 1.3.0 → 1.3.2

package/es/data-grid/components/custom-panel/index.js

@@ -1,3 +1,7 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -62,28 +66,6 @@ export default function CustomColumnPanel(params) {
     setState(columnApi.getColumnState());
   }, 16);
   var handleChangeKeywords = useDebounce(setKeywords, 200);
-  useEffect(function () {
-    var handler = function handler(e) {
-      if ((e.type === 'columnMoved' || e.type === 'columnResized') && !e.finished) {
-        return;
-      }
-      handleColumnState();
-    };
-    api.addEventListener('columnVisible', handler);
-    api.addEventListener('columnMoved', handler);
-    api.addEventListener('columnPinned', handler);
-    api.addEventListener('columnResized', handler);
-    api.addEventListener('columnValueChanged', handler);
-    api.addEventListener('newColumnsLoaded', handler);
-    return function () {
-      api.removeEventListener('columnVisible', handler);
-      api.removeEventListener('columnMoved', handler);
-      api.removeEventListener('columnPinned', handler);
-      api.removeEventListener('columnResized', handler);
-      api.removeEventListener('columnValueChanged', handler);
-      api.removeEventListener('newColumnsLoaded', handler);
-    };
-  }, []);
   var list = useMemo(function () {
     var items = [];
     var prevPath = [];
@@ -195,17 +177,60 @@ export default function CustomColumnPanel(params) {
   var grid = useGridStore(function (val) {
     return val.grid;
   });
-  var _useRequest = useRequest(function () {
-      return grid.saveFields();
-    }, {
+  var _useRequest = useRequest( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(source) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return grid.saveFields();
+            case 2:
+              return _context.abrupt("return", source);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }(), {
       loadingState: true,
-      onSuccess: function onSuccess() {
-        grid.api.closeToolPanel();
-        message.success(dataGridLocale.operationSuccessText);
+      onSuccess: function onSuccess(source) {
+        if (source === 'panel') {
+          grid.api.closeToolPanel();
+          message.success(dataGridLocale.operationSuccessText);
+        }
       }
     }),
     save = _useRequest.run,
     loading = _useRequest.loading;
+  useEffect(function () {
+    var handler = function handler(e) {
+      if ((e.type === 'columnMoved' || e.type === 'columnResized') && !e.finished) {
+        return;
+      }
+      if ((e.type === 'columnMoved' || e.type === 'columnResized' || e.type === 'columnPinned') && e.source !== 'api' && enableSave) {
+        save('ui');
+      }
+      handleColumnState();
+    };
+    api.addEventListener('columnVisible', handler);
+    api.addEventListener('columnMoved', handler);
+    api.addEventListener('columnPinned', handler);
+    api.addEventListener('columnResized', handler);
+    api.addEventListener('columnValueChanged', handler);
+    api.addEventListener('newColumnsLoaded', handler);
+    return function () {
+      api.removeEventListener('columnVisible', handler);
+      api.removeEventListener('columnMoved', handler);
+      api.removeEventListener('columnPinned', handler);
+      api.removeEventListener('columnResized', handler);
+      api.removeEventListener('columnValueChanged', handler);
+      api.removeEventListener('newColumnsLoaded', handler);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: prefix('column-panel')
   }, /*#__PURE__*/React.createElement("div", {
@@ -364,7 +389,9 @@ export default function CustomColumnPanel(params) {
   }, dataGridLocale.resetText), enableSave ? /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     loading: loading,
-    onClick: save,
+    onClick: function onClick() {
+      return save('panel');
+    },
     size: "small"
   }, dataGridLocale.saveText) : null)), /*#__PURE__*/React.createElement(FieldModal, {
     open: field,

package/es/filter/index.js

@@ -392,8 +392,8 @@ function Filter(originalProps) {
               value: form.getFieldsValue()
             };
             next.push(newItem);
-            setActive(next.length - 1);
             setTabs(next);
+            setActive(next.length - 1);
             saveSearches(next, 'set', newItem);
             _context3.next = 29;
             break;

package/es/select-view/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { CSSProperties, ReactElement } from 'react';
+import type { CSSProperties, ForwardedRef, ReactElement } from 'react';
 import { type DataGridRef } from '../data-grid';
 import type { ColType, CustomColumnData, DataGridProps, PaginationType, SortType } from '../data-grid/typings';
 import type { FilterProps } from '../filter/typings';
@@ -88,5 +88,8 @@ export interface SelectViewProps<RecordType, ParamsType> extends Pick<DataGridPr
      */
     customDataGridProps?: DataGridProps<RecordType>;
 }
-declare const _default: React.ForwardRefExoticComponent<SelectViewProps<Record<string | number, any>, Record<string, any>> & React.RefAttributes<DataGridRef<Record<string | number, any>>>>;
+declare function SelectView<RecordType extends Record<string | number, any>, ParamsType extends Record<string, any>>(originalProps: SelectViewProps<RecordType, ParamsType>, ref?: ForwardedRef<DataGridRef<RecordType>>): JSX.Element;
+declare const _default: <RecordType extends Record<string | number, any>, ParamsType extends Record<string, any>>(props: SelectViewProps<RecordType, ParamsType> & {
+    ref?: React.ForwardedRef<DataGridRef<RecordType>> | undefined;
+}) => JSX.Element;
 export default _default;

package/es/select-view/index.js

@@ -27,7 +27,7 @@ import { parseLocalTemplate } from "../locale/locale";
 import { mergeProp, prefixClassName } from "../utils";
 import classNames from 'classnames';
 import { get } from 'lodash';
-export default /*#__PURE__*/forwardRef(function SelectView(originalProps, _ref4) {
+function SelectView(originalProps, _ref4) {
   var emptyValue = useMemo(function () {
     return [];
   }, []);
@@ -327,4 +327,5 @@ export default /*#__PURE__*/forwardRef(function SelectView(originalProps, _ref4)
     spinning: true,
     className: prefix('spin')
   }) : null);
-});
+}
+export default /*#__PURE__*/forwardRef(SelectView);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "793ddaa1c937e067e29b649e5c04b377d3693b4e"
+  "gitHead": "8b6588d8dae10edade1c6950ff006d078f7e7741"
 }