@teamias/rex-pro 0.0.8 → 0.0.10

package/dist/components/filter-form/v1/demo/CustomFilterForm.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/components/filter-form/v1/demo/CustomFilterForm.js

@@ -0,0 +1,334 @@
+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 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 _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); }); }; }
+import { BaseForm } from '@teamias/rex-design';
+import { FilterForm } from "../filter-form";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsx(FilterForm, {
+    requestFields: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", [{
+              label: '类目',
+              field: 'category_id',
+              valueType: 'selectDim',
+              multiple: true,
+              api: '/gms/category_search',
+              isCustom: true,
+              fieldProps: {
+                popupMatchSelectWidth: false,
+                maxTagCount: 1
+              }
+            }, {
+              label: '买手',
+              field: 'bm_staffing_id',
+              valueType: 'selectDim',
+              multiple: true,
+              api: '/gms/get_bm_users',
+              isCustom: true,
+              fieldProps: {
+                popupMatchSelectWidth: false,
+                maxTagCount: 1
+              }
+            }, {
+              label: '产品类型',
+              field: 'product_type',
+              valueType: 'select',
+              multiple: true,
+              isCustom: true,
+              fieldProps: {
+                popupMatchSelectWidth: false,
+                maxTagCount: 1
+              },
+              options: [{
+                label: '基础品',
+                value: 0
+              }, {
+                label: '组装品',
+                value: 1
+              }]
+            }, {
+              label: '成本区间',
+              field: 'avg_cost',
+              valueType: 'multipleComponents',
+              compact: true,
+              isCustom: true,
+              subItems: [{
+                valueType: 'select',
+                field: 'avg_cost',
+                defaultValue: 'avg_cost',
+                fieldProps: {
+                  allowClear: false,
+                  popupMatchSelectWidth: false,
+                  maxTagCount: 1
+                },
+                itemWidth: '100px',
+                options: [{
+                  label: '成本区间',
+                  value: 'avg_cost'
+                }]
+              }, {
+                field: ['avg_cost_min', 'avg_cost_max'],
+                valueType: 'inputNumberRange',
+                itemWidth: '150px',
+                fieldProps: []
+              }]
+            }, {
+              label: '重量区间',
+              field: 'weight_gram',
+              valueType: 'multipleComponents',
+              compact: true,
+              isCustom: true,
+              subItems: [{
+                valueType: 'select',
+                field: 'weight_gram',
+                defaultValue: 'weight_gram',
+                options: [{
+                  label: '重量区间',
+                  value: 'weight_gram'
+                }]
+              }, {
+                field: ['weight_gram_min', 'weight_gram_max'],
+                valueType: 'inputNumberRange'
+              }]
+            }, {
+              label: 'DMS区间',
+              field: 'dms',
+              valueType: 'multipleComponents',
+              compact: true,
+              isCustom: true,
+              subItems: [{
+                valueType: 'select',
+                field: 'dms',
+                defaultValue: 'dms',
+                itemWidth: 'auto',
+                fieldProps: {
+                  allowClear: false
+                },
+                options: [{
+                  label: 'DMS区间',
+                  value: 'dms'
+                }]
+              }, {
+                field: ['dms_min', 'dms_max'],
+                valueType: 'inputNumberRange',
+                formItemProps: {
+                  style: {
+                    flex: 1
+                  }
+                }
+              }]
+            }, {
+              label: '实际库存',
+              field: 'goods_stock',
+              valueType: 'multipleComponents',
+              compact: true,
+              isCustom: true,
+              subItems: [{
+                valueType: 'select',
+                field: 'goods_stock',
+                defaultValue: 'goods_stock',
+                itemWidth: 'auto',
+                fieldProps: {
+                  allowClear: false
+                },
+                options: [{
+                  label: '实际库存',
+                  value: 'goods_stock'
+                }]
+              }, {
+                field: ['goods_stock_min', 'goods_stock_max'],
+                valueType: 'inputNumberRange',
+                isCustom: true,
+                formItemProps: {
+                  style: {
+                    flex: 1
+                  }
+                }
+              }]
+            }, {
+              label: '可用库存',
+              field: 'usable_stock',
+              valueType: 'multipleComponents',
+              compact: true,
+              isCustom: true,
+              subItems: [{
+                valueType: 'select',
+                field: 'usable_stock',
+                defaultValue: 'usable_stock',
+                itemWidth: 'auto',
+                fieldProps: {
+                  allowClear: false
+                },
+                options: [{
+                  label: '可用库存',
+                  value: 'usable_stock'
+                }]
+              }, {
+                field: ['usable_stock_min', 'usable_stock_max'],
+                valueType: 'inputNumberRange',
+                formItemProps: {
+                  style: {
+                    flex: 1
+                  }
+                }
+              }]
+            }, {
+              label: '缺货库存',
+              field: 'goods_lack',
+              valueType: 'multipleComponents',
+              compact: true,
+              subItems: [{
+                valueType: 'select',
+                field: 'goods_lack',
+                defaultValue: 'goods_lack',
+                itemWidth: 'auto',
+                fieldProps: {
+                  allowClear: false
+                },
+                options: [{
+                  label: '缺货库存',
+                  value: 'goods_lack'
+                }]
+              }, {
+                field: ['goods_lack_min', 'goods_lack_max'],
+                valueType: 'inputNumberRange',
+                formItemProps: {
+                  style: {
+                    flex: 1
+                  }
+                }
+              }]
+            }, {
+              label: '是否侵权',
+              field: 'is_tort',
+              valueType: 'select',
+              options: [{
+                label: '侵权',
+                value: 1
+              }, {
+                label: '不侵权',
+                value: 2
+              }]
+            }, {
+              valueType: 'multipleComponents',
+              label: 'multipleComponents',
+              compact: true,
+              subItems: [{
+                valueType: 'select',
+                field: 'sort_key',
+                defaultValue: 'default',
+                itemWidth: '100px',
+                options: [{
+                  label: '默认排序',
+                  value: 'default'
+                }, {
+                  label: '按spu发布时间',
+                  value: 'spu_completetime'
+                }, {
+                  label: '按实际库存',
+                  value: 'goods_stock'
+                }, {
+                  label: '按可用库存',
+                  value: 'usable_stock'
+                }, {
+                  label: '按平均成本',
+                  value: 'avg_cost'
+                }, {
+                  label: '按30天售后率',
+                  value: '30day_rma_rate'
+                }, {
+                  label: '按60天售后率',
+                  value: '60day_rma_rate'
+                }]
+              }, {
+                valueType: 'select',
+                field: 'sort_val',
+                defaultValue: 'desc',
+                itemWidth: '100px',
+                options: [{
+                  label: '正序',
+                  value: 'asc'
+                }, {
+                  label: '倒序',
+                  value: 'desc'
+                }]
+              }]
+            }, {
+              valueType: 'multipleComponents',
+              compact: true,
+              subItems: [{
+                valueType: 'select',
+                defaultValue: 'keywords',
+                field: 'keyword_type',
+                itemWidth: 'auto',
+                options: [{
+                  label: '关键词(sku/spu/品名)',
+                  value: 'keywords'
+                }, {
+                  label: 'sku/spu',
+                  value: 'sku_spu'
+                }, {
+                  label: '商品名称(and)',
+                  value: 'goods_name_and'
+                }, {
+                  label: '商品名称(or)',
+                  value: 'goods_name_or'
+                }, {
+                  label: '海关编码',
+                  value: 'foreign_code'
+                }]
+              }, {
+                valueType: 'input',
+                field: 'keyword_value',
+                itemWidth: '300px'
+              }]
+            }]);
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })),
+    onFinish: function onFinish(values) {
+      console.log(values);
+    },
+    children: function children(baseProps, _ref2) {
+      var displayType = _ref2.displayType,
+        handlerSelectStyle = _ref2.handlerSelectStyle;
+      var arr = [{
+        valueType: 'multipleComponents',
+        compact: true,
+        subItems: [{
+          valueType: 'select',
+          defaultValue: 'spu_completetime1111111',
+          field: 'time_type1111111',
+          itemWidth: 'auto',
+          fieldProps: {
+            allowClear: false
+          },
+          options: [{
+            label: '开品时间',
+            value: 'spu_completetime1111111'
+          }]
+        }, {
+          valueType: 'dateRange',
+          field: ['time_start1111111', 'time_end111111'],
+          itemWidth: '240px',
+          defaultValue: -14
+        }]
+      }];
+      return /*#__PURE__*/_jsx(BaseForm, _objectSpread(_objectSpread({}, baseProps), {}, {
+        fields: displayType === 'auto' ? handlerSelectStyle(arr) : arr
+      }));
+    }
+  });
+});

package/dist/components/filter-form/v1/filter-form.js

@@ -1,5 +1,9 @@
 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); }
 var _excluded = ["itemWidth", "displayType", "form", "formRef", "requestFields", "requestFieldsUrl", "requestFieldsParams", "fieldPropsFn", "requestOptions", "initialValues", "fieldsConfig", "actionRef", "onInit", "firstTriggerInitEvent", "children"];
+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); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
@@ -16,7 +20,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 /* eslint-disable no-param-reassign */
 import { ProForm } from '@ant-design/pro-components';
 import { BaseForm, getFieldsDefaultValues, useRequestFields, useRequestFieldsConfig, useRexProConfigProvider, useStateData } from '@teamias/rex-design';
-import { Button, Skeleton, Space } from 'antd';
+import { Button, Dropdown, Skeleton, Space, Checkbox } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useImperativeHandle, useRef } from 'react';
 import { FilterFormAutoWidthStyle, FilterFormStyle } from "./style";
@@ -66,7 +70,9 @@ export var FilterForm = function FilterForm(_ref) {
         initialValues: {},
         fetchLoading: false,
         fields: [],
-        currentInit: true
+        currentInit: true,
+        customFields: [],
+        selectedCustomFields: []
       };
     }),
     state = _useStateData.state,
@@ -127,18 +133,89 @@ export var FilterForm = function FilterForm(_ref) {
   };
   useEffect(function () {
     if (loading) return;
-    var newFields = cloneDeep(fields);
+    var allFields = cloneDeep(fields);
+
+    // 分离自定义字段和普通字段
+    var customFields = allFields.filter(function (field) {
+      return field.isCustom;
+    });
+    var normalFields = allFields.filter(function (field) {
+      return !field.isCustom;
+    });
+
+    // 合并普通字段和已选择的自定义字段
+    var combinedFields = [].concat(_toConsumableArray(normalFields), _toConsumableArray(state.selectedCustomFields));
     if (displayType === 'average') {
-      state.fields = newFields;
+      state.fields = combinedFields;
+      state.customFields = customFields;
       state.currentInit = false;
       update();
     } else {
-      handlerSelectStyle(newFields);
-      state.fields = newFields;
+      handlerSelectStyle(combinedFields);
+      state.fields = combinedFields;
+      state.customFields = customFields;
       state.currentInit = false;
       update();
     }
-  }, [fields]);
+  }, [fields, state.selectedCustomFields]);
+
+  // 创建下拉菜单内容
+  var getDropdownMenu = function getDropdownMenu() {
+    var _state$customFields;
+    // 使用 Map 来快速查找已选择的字段
+    var selectedFieldsMap = new Map(state.selectedCustomFields.map(function (field) {
+      return [field.field, field];
+    }));
+    var items = (_state$customFields = state.customFields) === null || _state$customFields === void 0 ? void 0 : _state$customFields.map(function (field) {
+      var isSelected = selectedFieldsMap.has(field.field);
+      return {
+        key: field.field,
+        label: /*#__PURE__*/_jsx("div", {
+          style: {
+            display: 'flex',
+            alignItems: 'center',
+            minWidth: 200
+          },
+          onClick: function onClick(e) {
+            e.stopPropagation();
+            handleToggleCustomField(field.field);
+          },
+          children: /*#__PURE__*/_jsx(Checkbox, {
+            checked: isSelected,
+            children: field.label
+          })
+        })
+      };
+    });
+    return {
+      items: items
+    };
+  };
+
+  // 切换自定义字段的显示状态
+  var handleToggleCustomField = function handleToggleCustomField(fieldKey) {
+    // 使用 Map 来快速查找已选择的字段
+    var selectedFieldsMap = new Map(state.selectedCustomFields.map(function (field) {
+      return [field.field, field];
+    }));
+    var customFieldsMap = new Map(state.customFields.map(function (field) {
+      return [field.field, field];
+    }));
+    var isSelected = selectedFieldsMap.has(fieldKey);
+    if (isSelected) {
+      // 移除字段
+      state.selectedCustomFields = state.selectedCustomFields.filter(function (field) {
+        return field.field !== fieldKey;
+      });
+    } else {
+      // 添加字段
+      var fieldToAdd = customFieldsMap.get(fieldKey);
+      if (fieldToAdd) {
+        state.selectedCustomFields = [].concat(_toConsumableArray(state.selectedCustomFields), [fieldToAdd]);
+      }
+    }
+    update();
+  };
   useImperativeHandle(actionRef, function () {
     return {
       getAllValues: function getAllValues() {
@@ -223,6 +300,17 @@ export var FilterForm = function FilterForm(_ref) {
                   id: 'pro.components.filter-form.search',
                   defaultMessage: '查询'
                 })
+              }), state.customFields.length > 0 && /*#__PURE__*/_jsx(Dropdown, {
+                menu: getDropdownMenu(),
+                trigger: ['click'],
+                placement: "bottomLeft",
+                children: /*#__PURE__*/_jsx(Button, {
+                  type: "primary",
+                  children: formatMessage({
+                    id: 'pro.components.filter-form.custom-filters',
+                    defaultMessage: '自定义筛选条件'
+                  })
+                })
               })]
             });
           }

package/dist/components/rex-pro-table/v1/demo/BasicRexProTable.js

@@ -655,7 +655,8 @@ export default (function () {
                     }, {
                       title: '供应商',
                       dataIndex: 'factory',
-                      key: 'factory'
+                      key: 'factory',
+                      sorter: 'factory'
                     }, {
                       title: 'ASIN',
                       dataIndex: 'asin',
@@ -1071,14 +1072,21 @@ export default (function () {
             }
           },
           request: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+            var _len2,
+              args,
+              _key2,
+              _args2 = arguments;
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  console.log('调用次');
+                  for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                    args[_key2] = _args2[_key2];
+                  }
+                  console.log('调用次', args);
                   state.selectKeys = [];
                   update({});
                   return _context2.abrupt("return", JSON.parse(JSON.stringify(tableData)));
-                case 4:
+                case 5:
                 case "end":
                   return _context2.stop();
               }

package/dist/components/rex-pro-table/v1/rex-pro-table.js

@@ -13,12 +13,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { FilterForm } from "../../filter-form";
 import { ProForm } from '@ant-design/pro-components';
 import { BaseListTable, BaseTable, useRequestFieldsConfig, useRexProConfigProvider, useStateData } from '@teamias/rex-design';
 import { Card, Pagination, Skeleton, Space } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useImperativeHandle, useRef } from 'react';
-import { FilterForm } from "../../filter-form";
 import { ActionButtons } from "./components/ActionButtons";
 import { TableActionButtonGroup, ToolbarBox, Wrapper } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -321,7 +321,12 @@ var InlineRexProTable = function InlineRexProTable(_ref) {
         customEmptyText: state.customEmptyText,
         loading: state.loading,
         pagination: false,
-        extraColumns: extraColumns
+        extraColumns: extraColumns,
+        onChange: function onChange(pagination, filters, sorter) {
+          state.params.sort = JSON.parse(JSON.stringify(sorter || {}));
+          state.params.filter = JSON.parse(JSON.stringify(filters || {}));
+          action.getList(1);
+        }
       })), (_state$dataSource = state.dataSource) !== null && _state$dataSource !== void 0 && _state$dataSource.length && !hidePagination ? /*#__PURE__*/_jsx(Pagination, {
         style: {
           marginTop: 10

package/dist/components/rex-pro-table/v1/types.d.ts

@@ -1,8 +1,8 @@
+import { FilterForm, IFilterFormProps } from "../../filter-form";
 import { BaseListTable, BaseTable, RequestFieldsContainer, TButtonFilterItem } from '@teamias/rex-design';
 import { Button, DrawerProps, DropDownProps, FormInstance, GetProps, ModalProps } from 'antd';
 import { SizeType } from 'antd/es/config-provider/SizeContext';
 import { MutableRefObject, ReactNode } from 'react';
-import { FilterForm, IFilterFormProps } from "../../filter-form";
 /** 组件props */
 export interface IRexProTableProps<TF extends Record<string, unknown>, TT extends Record<string, unknown>> {
     toolbar?: {
@@ -156,7 +156,10 @@ export type TRexProTableRequestParams<T> = {
         page_size: number;
         current: number;
     };
-    sort: unknown;
+    sort: {
+        field?: string;
+        order?: 'ascend' | 'descend';
+    };
     filter: unknown;
 };
 /** 接口回调 */

package/dist/index.d.ts

@@ -22,6 +22,7 @@ export declare const proLocales: {
                 "filter-form": {
                     reset: string;
                     search: string;
+                    "custom-filters": string;
                 };
             };
         };

package/dist/locales/zh-CN.json

@@ -19,7 +19,8 @@
       },
       "filter-form": {
         "reset": "重置",
-        "search": "查询"
+        "search": "查询",
+        "custom-filters": "自定义筛选条件"
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-pro",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",