@ccs-ui/rc-pro 2.5.1 → 2.5.3-alpha.1

package/es/atom/_api.d.ts

@@ -48,12 +48,18 @@ export type AtomFilterInstance = {
 export type AtomFilterProps = PropsWithCss & {
     /** 查询方法 */
     onSearch?: () => void;
+    /** 查询条件改变方法 */
+    onValuesChange?: (values: any) => void;
+    /** 隐藏查询按钮 */
+    hideSearchBtn?: boolean;
     /** filter ref 获取查询条件数据方法 */
     filterRef?: React.RefObject<AtomFilterInstance>;
     /** 展开查询条件 @default false */
     expandForm?: boolean;
     /** 查询form 初始值 */
     formInitValues?: FormProps['initialValues'];
+    /** 查询布局, horizontal: 水平布局, auto: 自动布局 @default auto */
+    formLayout?: 'horizontal' | 'auto';
     /** 查询条件集合 */
     formItems?: AtomFormItems;
     /** form item label 宽度 */
@@ -122,7 +128,7 @@ export type AtomPageRequestProps<RecordType> = {
     /** 接口字段指定 */
     fieldNames?: PageFieldNames;
     /** 获取查询条件的方法 */
-    getFormValues?: () => Promise<any>;
+    getFormValues?: () => Promise<any> | (() => any);
     /** 列过滤和排序字段 */
     onFilterOrder?: () => {
         filters: RecordType;

package/es/atom/filter.d.ts

@@ -2,9 +2,12 @@ import React from 'react';
 import { AtomFilterInstance } from './_api';
 declare const _default: React.ForwardRefExoticComponent<import("../ccs").PropsWithCss & {
     onSearch?: (() => void) | undefined;
+    onValuesChange?: ((values: any) => void) | undefined;
+    hideSearchBtn?: boolean | undefined;
     filterRef?: React.RefObject<AtomFilterInstance> | undefined;
     expandForm?: boolean | undefined;
     formInitValues?: import("antd/es/form/interface").Store | undefined;
+    formLayout?: "horizontal" | "auto" | undefined;
     formItems?: import("./_api").AtomFormItems | undefined;
     formItemLabelWidth?: string | number | undefined;
     extra?: React.ReactNode;

package/es/atom/filter.js

@@ -2,11 +2,14 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 var _excluded = ["onFormat"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -32,10 +35,15 @@ function AtomFilter(props, ref) {
     expandForm = _props$expandForm === void 0 ? false : _props$expandForm,
     _props$formItems = props.formItems,
     formItems = _props$formItems === void 0 ? [] : _props$formItems,
+    requestParam = props.requestParam,
+    hideSearchBtn = props.hideSearchBtn,
+    _props$formLayout = props.formLayout,
+    formLayout = _props$formLayout === void 0 ? 'auto' : _props$formLayout,
     formInitValues = props.formInitValues,
     formItemLabelWidth = props.formItemLabelWidth,
-    requestParam = props.requestParam,
-    onSearch = props.onSearch;
+    onSearch = props.onSearch,
+    onValuesChange = props.onValuesChange;
+  var isAutoLayout = formLayout === 'auto';
   var classPrefix = "".concat(classAtomPrefix, "-filter");
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -71,33 +79,48 @@ function AtomFilter(props, ref) {
   }, [hasMore]);
 
   // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
-  var getFormValues = function getFormValues() {
-    // 表单值
-    var formValues = form.getFieldsValue();
-
-    // 删除无意义字段
-    if (formValues) {
-      var _delField = Object.keys(formValues).filter(function (k) {
-        return k.startsWith('_') && k.endsWith('_');
-      });
-      if (_delField.length > 0) {
-        _delField.forEach(function (d) {
-          return delete formValues[d];
-        });
-      }
-    }
+  var getFormValues = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var formValues, _delField;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return form.validateFields();
+          case 2:
+            formValues = _context.sent;
+            // 删除无意义字段
+            if (formValues) {
+              _delField = Object.keys(formValues).filter(function (k) {
+                return k.startsWith('_') && k.endsWith('_');
+              });
+              if (_delField.length > 0) {
+                _delField.forEach(function (d) {
+                  return delete formValues[d];
+                });
+              }
+            }
 
-    // 格式化条件，格式化结果数据
-    Object.keys(formValues).forEach(function (k) {
-      if (formValues[k] !== undefined) {
-        var s = formItems.find(function (f) {
-          return f.name === k;
-        });
-        if (s !== null && s !== void 0 && s.onFormat) formValues[k] = s.onFormat(formValues[k]);
-      }
-    });
-    return _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues);
-  };
+            // 格式化条件，格式化结果数据
+            Object.keys(formValues).forEach(function (k) {
+              if (formValues[k] !== undefined) {
+                var s = formItems.find(function (f) {
+                  return f.name === k;
+                });
+                if (s !== null && s !== void 0 && s.onFormat) formValues[k] = s.onFormat(formValues[k]);
+              }
+            });
+            return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getFormValues() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   useImperativeHandle(ref, function () {
     return {
       getFormValues: getFormValues,
@@ -163,20 +186,40 @@ function AtomFilter(props, ref) {
         return setIsExpand(!isExpand);
       },
       children: isExpand ? '收起' : '展开'
-    }), /*#__PURE__*/_jsx(Button, {
+    }), hideSearchBtn !== true && /*#__PURE__*/_jsx(Button, {
       type: "primary",
       htmlType: "submit",
       children: "\u67E5\u8BE2"
     }), extra]
   });
-  var formStyles = {
+  var formStyles = isAutoLayout ? {
     flexWrap: isExpand ? 'wrap' : 'nowrap'
+  } : {
+    flexWrap: 'wrap',
+    gap: 10
   };
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  var renderItems = formItems.map(function (_ref2) {
+    var onFormat = _ref2.onFormat,
+      item = _objectWithoutProperties(_ref2, _excluded);
+    return /*#__PURE__*/_jsx(CcsForm.Item, _objectSpread(_objectSpread(_objectSpread({}, item), formItemLabelWidth ? {
+      label: /*#__PURE__*/_jsx("div", {
+        style: {
+          width: formItemLabelWidth
+        },
+        children: item.label
+      })
+    } : undefined), {}, {
+      className: isAutoLayout ? "".concat(classPrefix, "-form-item") : '',
+      children: item.value || item.children
+    }), item.name);
+  });
   return /*#__PURE__*/_jsx(ProBaseItem, {
     style: style,
     className: className,
     children: (formItems.length > 0 || onSearch) && /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsx(CcsAtom.Resize, {
+      children: [isAutoLayout && /*#__PURE__*/_jsx(CcsAtom.Resize, {
         targetRef: formItemsRef,
         onResize: resizeFn
       }), /*#__PURE__*/_jsxs(Form, {
@@ -186,7 +229,8 @@ function AtomFilter(props, ref) {
         layout: "inline",
         style: formStyles,
         preserve: false,
-        children: [/*#__PURE__*/_jsx("div", {
+        onValuesChange: onValuesChange,
+        children: [isAutoLayout ? /*#__PURE__*/_jsx("div", {
           style: {
             height: isExpand ? 'auto' : controlHeight
           },
@@ -194,30 +238,14 @@ function AtomFilter(props, ref) {
           children: /*#__PURE__*/_jsxs("div", {
             className: "".concat(classPrefix, "-").concat(isExpand && hasMore ? 'expand' : 'collapse'),
             ref: formItemsRef,
-            children: [
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            formItems.map(function (_ref) {
-              var onFormat = _ref.onFormat,
-                item = _objectWithoutProperties(_ref, _excluded);
-              return /*#__PURE__*/_jsx(CcsForm.Item, _objectSpread(_objectSpread(_objectSpread({}, item), formItemLabelWidth ? {
-                label: /*#__PURE__*/_jsx("div", {
-                  style: {
-                    width: formItemLabelWidth
-                  },
-                  children: item.label
-                })
-              } : undefined), {}, {
-                className: "".concat(classPrefix, "-form-item"),
-                children: item.value || item.children
-              }), item.name);
-            }), /*#__PURE__*/_jsx("div", {
+            children: [renderItems, /*#__PURE__*/_jsx("div", {
               style: {
                 height: 1
               },
               ref: endItemRef
             }), isExpand && renderSearchBtn]
           })
-        }), !isExpand && renderSearchBtn]
+        }) : renderItems, !isExpand && renderSearchBtn]
       })]
     })
   });

package/es/atom/index.d.ts

@@ -20,9 +20,12 @@ declare const Atom: {
     /** 数据过滤 */
     Filter: import("react").ForwardRefExoticComponent<import("../ccs").PropsWithCss & {
         onSearch?: (() => void) | undefined;
+        onValuesChange?: ((values: any) => void) | undefined;
+        hideSearchBtn?: boolean | undefined;
         filterRef?: import("react").RefObject<import("../ccs").AtomFilterInstance> | undefined;
         expandForm?: boolean | undefined;
         formInitValues?: import("antd/es/form/interface").Store | undefined;
+        formLayout?: "horizontal" | "auto" | undefined;
         formItems?: import("../ccs").AtomFormItems | undefined;
         formItemLabelWidth?: string | number | undefined;
         extra?: import("react").ReactNode;

package/es/atom/usePageRequest.d.ts

@@ -4,6 +4,6 @@ import { AtomPageRequestProps } from './_api';
 export default function usePageRequest<RecordType>({ auth, rowKey, pagination, emptyDefaultOne, fieldNames: fieldNamesParams, onEvent, getFormValues, onFilterOrder, onRequestCustom, request: httpRequest, }: AtomPageRequestProps<RecordType>): {
     data: CCS.TableData<RecordType>;
     isAuth: boolean;
-    onRequest: (this: any, eventType: CCS.DataEvent, pageNo?: any, pageSize?: any, record?: RecordType | undefined) => Promise<void>;
+    onRequest: (this: any, args_0?: any, record?: RecordType | undefined) => Promise<void>;
     onChangeData: (this: any, data: any) => void;
 };

package/es/atom/usePageRequest.js

@@ -70,166 +70,171 @@ export default function usePageRequest(_ref) {
   }, [auth]);
 
   // 获取数据
-  var onRequest = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(eventType) {
-      var pageNo,
-        pageSize,
-        record,
-        filterValues,
-        fieldNames,
-        _ref3,
-        _ref3$filters,
-        fsFilters,
-        _ref3$pageNo,
-        fsPageNo,
-        _ref3$pageSize,
-        fsPageSize,
-        _ref3$orderProps,
-        fsOrderProps,
-        fsQuery,
-        params,
-        _ref4,
-        filters,
-        orderProps,
-        requestResult,
-        dataSource,
-        total,
-        newData,
-        _args = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            pageNo = _args.length > 1 && _args[1] !== undefined ? _args[1] : 1;
-            pageSize = _args.length > 2 && _args[2] !== undefined ? _args[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
-            record = _args.length > 3 ? _args[3] : undefined;
-            if (!(!isAuth || !httpRequest)) {
-              _context.next = 6;
-              break;
-            }
-            onEvent === null || onEvent === void 0 || onEvent(eventType);
-            return _context.abrupt("return");
-          case 6:
-            _context.next = 8;
-            return getFormValues === null || getFormValues === void 0 ? void 0 : getFormValues();
-          case 8:
-            _context.t0 = _context.sent;
-            if (_context.t0) {
-              _context.next = 11;
-              break;
-            }
-            _context.t0 = {};
-          case 11:
-            filterValues = _context.t0;
-            // 接口字段指定
-            fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), fieldNamesParams); // 请求字段
-            _ref3 = fieldNames.requestParam || {}, _ref3$filters = _ref3.filters, fsFilters = _ref3$filters === void 0 ? ['filters'] : _ref3$filters, _ref3$pageNo = _ref3.pageNo, fsPageNo = _ref3$pageNo === void 0 ? ['pageNo'] : _ref3$pageNo, _ref3$pageSize = _ref3.pageSize, fsPageSize = _ref3$pageSize === void 0 ? ['pageSize'] : _ref3$pageSize, _ref3$orderProps = _ref3.orderProps, fsOrderProps = _ref3$orderProps === void 0 ? ['orderProps'] : _ref3$orderProps, fsQuery = _ref3.query; // 构建请求参数
-            params = {};
-            if (fsQuery && fsQuery.length > 0) {
-              onSetObj(params, _toConsumableArray(fsQuery), filterValues);
-            } else {
-              params = filterValues;
-            }
-            if (pagination !== false) {
-              // 分页
-              onSetObj(params, _toConsumableArray(fsPageNo), pageNo);
-              onSetObj(params, _toConsumableArray(fsPageSize), pageSize);
-            }
+  var onRequest = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3,
+      _ref3$pageNo,
+      pageNo,
+      _ref3$pageSize,
+      pageSize,
+      eventType,
+      record,
+      filterValues,
+      fieldNames,
+      _ref4,
+      _ref4$filters,
+      fsFilters,
+      _ref4$pageNo,
+      fsPageNo,
+      _ref4$pageSize,
+      fsPageSize,
+      _ref4$orderProps,
+      fsOrderProps,
+      fsQuery,
+      params,
+      _ref5,
+      filters,
+      orderProps,
+      requestResult,
+      dataSource,
+      total,
+      newData,
+      _args = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _ref3 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
+            pageNo: Number,
+            pageSize: Number,
+            eventType: DataEvent
+          }, _ref3$pageNo = _ref3.pageNo, pageNo = _ref3$pageNo === void 0 ? 1 : _ref3$pageNo, _ref3$pageSize = _ref3.pageSize, pageSize = _ref3$pageSize === void 0 ? (pagination ? pagination.defaultPageSize : 10) || 10 : _ref3$pageSize, eventType = _ref3.eventType;
+          record = _args.length > 1 ? _args[1] : undefined;
+          if (!(!isAuth || !httpRequest)) {
+            _context.next = 5;
+            break;
+          }
+          onEvent === null || onEvent === void 0 || onEvent(eventType);
+          return _context.abrupt("return");
+        case 5:
+          _context.next = 7;
+          return getFormValues === null || getFormValues === void 0 ? void 0 : getFormValues();
+        case 7:
+          _context.t0 = _context.sent;
+          if (_context.t0) {
+            _context.next = 10;
+            break;
+          }
+          _context.t0 = {};
+        case 10:
+          filterValues = _context.t0;
+          // 接口字段指定
+          fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), fieldNamesParams); // 请求字段
+          _ref4 = fieldNames.requestParam || {}, _ref4$filters = _ref4.filters, fsFilters = _ref4$filters === void 0 ? ['filters'] : _ref4$filters, _ref4$pageNo = _ref4.pageNo, fsPageNo = _ref4$pageNo === void 0 ? ['pageNo'] : _ref4$pageNo, _ref4$pageSize = _ref4.pageSize, fsPageSize = _ref4$pageSize === void 0 ? ['pageSize'] : _ref4$pageSize, _ref4$orderProps = _ref4.orderProps, fsOrderProps = _ref4$orderProps === void 0 ? ['orderProps'] : _ref4$orderProps, fsQuery = _ref4.query; // 构建请求参数
+          params = {};
+          if (fsQuery && fsQuery.length > 0) {
+            onSetObj(params, _toConsumableArray(fsQuery), filterValues);
+          } else {
+            params = filterValues;
+          }
+          if (pagination !== false) {
+            // 分页
+            onSetObj(params, _toConsumableArray(fsPageNo), pageNo);
+            onSetObj(params, _toConsumableArray(fsPageSize), pageSize);
+          }
 
-            // 列过滤或排序参数
-            _ref4 = (onFilterOrder === null || onFilterOrder === void 0 ? void 0 : onFilterOrder()) || {}, filters = _ref4.filters, orderProps = _ref4.orderProps;
-            if (filters && Object.keys(filters).length > 0) {
-              onSetObj(params, _toConsumableArray(fsFilters), filters);
-            }
-            if (orderProps && orderProps.length > 0) {
-              onSetObj(params, _toConsumableArray(fsOrderProps), orderProps);
-            }
+          // 列过滤或排序参数
+          _ref5 = (onFilterOrder === null || onFilterOrder === void 0 ? void 0 : onFilterOrder()) || {}, filters = _ref5.filters, orderProps = _ref5.orderProps;
+          if (filters && Object.keys(filters).length > 0) {
+            onSetObj(params, _toConsumableArray(fsFilters), filters);
+          }
+          if (orderProps && orderProps.length > 0) {
+            onSetObj(params, _toConsumableArray(fsOrderProps), orderProps);
+          }
 
-            // 异步树
-            if (!onRequestCustom) {
-              _context.next = 23;
-              break;
-            }
-            onRequestCustom(eventType, params.query || params, record);
-            return _context.abrupt("return");
-          case 23:
-            // 事件回调，请求中
-            onEvent === null || onEvent === void 0 || onEvent(eventType, {
-              loading: true,
-              params: params
+          // 异步树
+          if (!onRequestCustom) {
+            _context.next = 22;
+            break;
+          }
+          onRequestCustom(eventType, params.query || params, record);
+          return _context.abrupt("return");
+        case 22:
+          // 事件回调，请求中
+          onEvent === null || onEvent === void 0 || onEvent(eventType, {
+            loading: true,
+            params: params
+          });
+
+          // 发起请求
+          setData(function (d) {
+            return _objectSpread(_objectSpread({}, d), {}, {
+              loading: true
             });
+          });
+          _context.next = 26;
+          return httpRequest(params);
+        case 26:
+          requestResult = _context.sent;
+          // 事件回调，请求完成
+          onEvent === null || onEvent === void 0 || onEvent(eventType, {
+            loading: false,
+            params: params,
+            data: requestResult
+          });
 
-            // 发起请求
-            setData(function (d) {
-              return _objectSpread(_objectSpread({}, d), {}, {
-                loading: true
-              });
+          // 请求结果
+          if (!requestResult) {
+            _context.next = 38;
+            break;
+          }
+          // 获取table数据
+          dataSource = getDataByNamePath(requestResult, fieldNames.dataSource); // 默认添加一条数据
+          if (emptyDefaultOne && dataSource && dataSource.length === 0) {
+            dataSource.push(_defineProperty({}, rowKey || 'id', '0'));
+          }
+          // 数据总数
+          total = getDataByNamePath(requestResult, fieldNames.total);
+          if (!(total === undefined || dataSource === undefined)) {
+            _context.next = 36;
+            break;
+          }
+          newData = {
+            dataSource: dataSource,
+            pageSize: pageSize,
+            current: pageNo,
+            total: total,
+            loading: false
+          };
+          setData(newData);
+          return _context.abrupt("return");
+        case 36:
+          // 当前页无数据，返回上一页
+          if (!dataSource.length && pageNo !== 1) {
+            onRequest({
+              pageNo: pageNo - 1,
+              eventType: DataEvent.Reload
             });
-            _context.next = 27;
-            return httpRequest(params);
-          case 27:
-            requestResult = _context.sent;
-            // 事件回调，请求完成
-            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+          } else {
+            setData({
+              current: pageNo,
+              pageSize: pageSize,
               loading: false,
-              params: params,
-              data: requestResult
-            });
-
-            // 请求结果
-            if (!requestResult) {
-              _context.next = 39;
-              break;
-            }
-            // 获取table数据
-            dataSource = getDataByNamePath(requestResult, fieldNames.dataSource); // 默认添加一条数据
-            if (emptyDefaultOne && dataSource && dataSource.length === 0) {
-              dataSource.push(_defineProperty({}, rowKey || 'id', '0'));
-            }
-            // 数据总数
-            total = getDataByNamePath(requestResult, fieldNames.total);
-            if (!(total === undefined || dataSource === undefined)) {
-              _context.next = 37;
-              break;
-            }
-            newData = {
               dataSource: dataSource,
-              pageSize: pageSize,
-              current: pageNo,
-              total: total,
+              total: total || 0
+            });
+          }
+          return _context.abrupt("return");
+        case 38:
+          setData(function (d) {
+            return _objectSpread(_objectSpread({}, d), {}, {
               loading: false
-            };
-            setData(newData);
-            return _context.abrupt("return");
-          case 37:
-            // 当前页无数据，返回上一页
-            if (!dataSource.length && pageNo !== 1) {
-              onRequest(DataEvent.Reload, pageNo - 1);
-            } else {
-              setData({
-                current: pageNo,
-                pageSize: pageSize,
-                loading: false,
-                dataSource: dataSource,
-                total: total || 0
-              });
-            }
-            return _context.abrupt("return");
-          case 39:
-            setData(function (d) {
-              return _objectSpread(_objectSpread({}, d), {}, {
-                loading: false
-              });
             });
-          case 40:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }());
+          });
+        case 39:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
 
   // 更新数据
   var onChangeData = useMemoizedFn(function (data) {

package/es/config.js

@@ -120,11 +120,10 @@ function AppConfig(_ref) {
       },
       children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(DialogElementsHolder, {
         ref: dialogHolderRef
-      }, "modal-drawer-holder"), (watermark === null || watermark === void 0 ? void 0 : watermark.content) && /*#__PURE__*/_jsx(WaterMarkRelative, {
-        content: watermark.content,
+      }, "modal-drawer-holder"), (watermark === null || watermark === void 0 ? void 0 : watermark.content) && /*#__PURE__*/_jsx(WaterMarkRelative, _objectSpread({
         fontColor: "rgba(0,0,0,.15)",
         zIndex: 105
-      })]
+      }, watermark))]
     })
   }));
 }

package/es/editor/lexical/base/index.js

@@ -5,7 +5,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useAppConfig } from "../../..";
-import useInputCss from "../../../hooks/use-input-css";
 import { LexicalComposer } from '@lexical/react/LexicalComposer';
 import { ContentEditable } from '@lexical/react/LexicalContentEditable';
 import { LexicalErrorBoundary } from '@lexical/react/LexicalErrorBoundary';
@@ -14,6 +13,7 @@ import { LinkPlugin } from '@lexical/react/LexicalLinkPlugin';
 import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin';
 import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin';
 import React from 'react';
+import useInputCss from "../../../hooks/use-input-css";
 import ImagesPlugin from "../plugins/image";
 import "./index.less";
 import ToolbarPlugin from "./toolbar";