@teamix/pro 1.5.0 → 1.6.0-beta.1

package/es/form/Filter/index.js

@@ -1,39 +1,21 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "bindUrl", "onFilter", "onInit", "onReset", "onExpand", "onChange", "form"];
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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 _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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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); }
-
 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(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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; }
-
 import React, { memo, useCallback, useMemo, useState, useRef, useEffect } from 'react';
 import debounce from 'lodash.debounce';
 import { Tag } from '@alicloudfe/components';
@@ -53,39 +35,34 @@ import './index.scss';
 /**
  * 查询筛选
  */
-
 var QueryFilter = /*#__PURE__*/memo(function (props) {
   var addonAfter = props.addonAfter,
-      addonBefore = props.addonBefore,
-      mode = props.mode,
-      purePanel = props.purePanel,
-      expand = props.expand,
-      formRef = props.formRef,
-      defaultFilterValue = props.defaultFilterValue,
-      filterValues = props.filterValues,
-      filterDebounce = props.filterDebounce,
-      bindUrl = props.bindUrl,
-      outerFilter = props.onFilter,
-      outerInit = props.onInit,
-      outerReset = props.onReset,
-      onExpand = props.onExpand,
-      onChange = props.onChange,
-      form = props.form,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
+    addonBefore = props.addonBefore,
+    mode = props.mode,
+    purePanel = props.purePanel,
+    expand = props.expand,
+    formRef = props.formRef,
+    defaultFilterValue = props.defaultFilterValue,
+    filterValues = props.filterValues,
+    filterDebounce = props.filterDebounce,
+    bindUrl = props.bindUrl,
+    outerFilter = props.onFilter,
+    outerInit = props.onInit,
+    outerReset = props.onReset,
+    onExpand = props.onExpand,
+    onChange = props.onChange,
+    form = props.form,
+    otherProps = _objectWithoutProperties(props, _excluded);
   var _useSpecialProps = useSpecialProps(props),
-      hasRequired = _useSpecialProps.hasRequired;
-
+    hasRequired = _useSpecialProps.hasRequired;
   var _useState = useState(!!expand),
-      _useState2 = _slicedToArray(_useState, 2),
-      panelVisible = _useState2[0],
-      setPanelVisible = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    panelVisible = _useState2[0],
+    setPanelVisible = _useState2[1];
   var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      tagDataSource = _useState4[0],
-      setTagDataSource = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    tagDataSource = _useState4[0],
+    setTagDataSource = _useState4[1];
   var filterItem = useRef([]);
   var defaultFormName = mode === 'panel' ? 'advanced' : 'simple';
   var currentFormName = useRef(defaultFormName);
@@ -94,62 +71,53 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   var prefixCls = usePrefixCls('teamix-pro-form-query-filter');
   var debounceFun = debounce(function (fun, props) {
     return fun(props);
-  }, filterDebounce); // 绑定URL
-
+  }, filterDebounce);
+  // 绑定URL
   var _useBindUrl = useBindUrl(bindUrl, {
-    onInit: outerInit,
-    onFilter: outerFilter,
-    onReset: outerReset
-  }, currentForm),
-      setValuesByUrlState = _useBindUrl.setValuesByUrlState,
-      onInit = _useBindUrl.onInit,
-      onFilter = _useBindUrl.onFilter,
-      onReset = _useBindUrl.onReset; // onInit
-
-
+      onInit: outerInit,
+      onFilter: outerFilter,
+      onReset: outerReset
+    }, currentForm),
+    setValuesByUrlState = _useBindUrl.setValuesByUrlState,
+    onInit = _useBindUrl.onInit,
+    onFilter = _useBindUrl.onFilter,
+    onReset = _useBindUrl.onReset;
+
+  // onInit
   var initialRequestRef = useRef(!!(props === null || props === void 0 ? void 0 : props.initialRequest));
   var filterEnable = useRef('waiting');
-
   var onFormInit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(form) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(form) {
       var loadingField;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               form.setState({
                 loading: initialRequestRef.current
               }); // 借用 form.loading 触发 onFormReact
-
               loadingField = Object.values(form.fields).filter(function (field) {
                 return !!field.loading;
               }); // 等待mounted + 字段loading结束 + initialRequest结束 => 表单默认值初始化完成
-
               if (!(form.mounted && !loadingField.length && !form.loading)) {
                 _context.next = 10;
                 break;
               }
-
               onFormInit = undefined; // init后销毁 isFormInit 方法
-
               setValuesByUrlState(form); // 配置URL参数到表单
-
               if (!outerInit) {
                 _context.next = 10;
                 break;
               }
-
               _context.next = 8;
               return form.validate();
-
             case 8:
-              onInit(toJS(form.values)); // 设置Tag
-
+              onInit(toJS(form.values));
+              // 设置Tag
               if (mode === 'panel') {
                 configFilterItem(advancedForm);
                 !panelVisible && configTag();
               }
-
             case 10:
             case "end":
               return _context.stop();
@@ -157,49 +125,42 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         }
       }, _callee);
     }));
-
     return function onFormInit(_x) {
       return _ref.apply(this, arguments);
     };
-  }(); // 配置当前激活的form实例
-
+  }();
 
+  // 配置当前激活的form实例
   var setCurrentForm = function setCurrentForm(formName) {
     currentFormName.current = formName;
     currentForm.current = formMap[formName];
     var form = currentForm.current;
-
     if (formRef) {
-      formRef.current = form; // 自定义updateTags方法
-
+      formRef.current = form;
+      // 自定义updateTags方法
       if (!formRef.current.updateTags) {
         formRef.current.updateTags = function () {
           updateTags(form);
         };
-      } // 自定义setAsyncValues方法
-
-
+      }
+      // 自定义setAsyncValues方法
       if (!formRef.current.setAsyncValues) {
         formRef.current.setAsyncValues = /*#__PURE__*/function () {
-          var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-            return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     form.setValues(values);
-
                     if (!(filterEnable.current === 'filter' && formName === 'advanced')) {
                       _context2.next = 6;
                       break;
                     }
-
                     _context2.next = 4;
                     return form.validate();
-
                   case 4:
                     onFilter(toJS(form.values));
                     updateTags(form);
-
                   case 6:
                   case "end":
                     return _context2.stop();
@@ -207,30 +168,25 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
               }
             }, _callee2);
           }));
-
           return function (_x2) {
             return _ref2.apply(this, arguments);
           };
         }();
-      } // 自定义triggerFilter方法
-
-
+      }
+      // 自定义triggerFilter方法
       if (!formRef.current.triggerFilter) {
-        formRef.current.triggerFilter = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-          return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        formRef.current.triggerFilter = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) {
               switch (_context3.prev = _context3.next) {
                 case 0:
                   _context3.next = 2;
                   return form.validate();
-
                 case 2:
                   onFilter(toJS(form.values));
-
                   if (formName === 'advanced') {
                     updateTags(form);
                   }
-
                 case 4:
                 case "end":
                   return _context3.stop();
@@ -238,25 +194,22 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
             }
           }, _callee3);
         }));
-      } // 自定义triggerReset方法
-
-
+      }
+      // 自定义triggerReset方法
       if (!formRef.current.triggerReset) {
         formRef.current.triggerReset = /*#__PURE__*/function () {
-          var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(config) {
-            return regeneratorRuntime.wrap(function _callee4$(_context4) {
+          var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(config) {
+            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
                     simpleForm.reset('*', config);
                     lightForm.reset('*', config);
                     advancedForm.reset('*', config);
-
                     if (formName === 'advanced') {
                       onReset(toJS(advancedForm.values));
                       updateTags(form);
                     }
-
                   case 4:
                   case "end":
                     return _context4.stop();
@@ -264,16 +217,15 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
               }
             }, _callee4);
           }));
-
           return function (_x3) {
             return _ref4.apply(this, arguments);
           };
         }();
       }
     }
-  }; // 创建简单筛选表单实例
-
+  };
 
+  // 创建简单筛选表单实例
   var simpleForm = useMemo(function () {
     return createForm({
       validateFirst: true,
@@ -281,7 +233,6 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         onFormReact(function (form) {
           if (mode === 'inline') {
             var _onFormInit;
-
             (_onFormInit = onFormInit) === null || _onFormInit === void 0 ? void 0 : _onFormInit(form).finally(function () {
               return filterEnable.current = 'filter';
             });
@@ -289,8 +240,8 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         });
       }
     });
-  }, [form]); // 创建轻量筛选表单实例
-
+  }, [form]);
+  // 创建轻量筛选表单实例
   var lightForm = useMemo(function () {
     return createForm({
       validateFirst: true,
@@ -300,8 +251,8 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         });
       }
     });
-  }, [form]); // 创建高级筛选表单实例
-
+  }, [form]);
+  // 创建高级筛选表单实例
   var advancedForm = useMemo(function () {
     return createForm({
       validateFirst: true,
@@ -309,7 +260,6 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         onFormReact(function (form) {
           if (mode === 'panel') {
             var _onFormInit2;
-
             (_onFormInit2 = onFormInit) === null || _onFormInit2 === void 0 ? void 0 : _onFormInit2(form).finally(function () {
               return filterEnable.current = 'filter';
             });
@@ -325,25 +275,22 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     simple: simpleForm,
     light: lightForm,
     advanced: advancedForm
-  }; // 获取筛选数据Label
+  };
 
+  // 获取筛选数据Label
   var getFilterDisplayValues = useCallback(function (form) {
     var displayValues = getFormDisplayValues(form);
     var originalData = Object.entries(displayValues);
     var filterData = [];
     originalData.forEach(function (_ref5) {
       var _data$displayValue;
-
       var _ref6 = _slicedToArray(_ref5, 2),
-          key = _ref6[0],
-          data = _ref6[1];
-
+        key = _ref6[0],
+        data = _ref6[1];
       var value = (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value;
       var component = data.component;
-
       if (component === 'SelectGroup') {
         var _data$value;
-
         (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.forEach(function (item, index) {
           filterData.push({
             key: key,
@@ -363,24 +310,27 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       }
     });
     return filterData;
-  }, []); // 设置筛选数据
+  }, []);
 
+  // 设置筛选数据
   var configFilterItem = useCallback(function (form) {
     filterItem.current = getFilterDisplayValues(form);
-  }, []); // 设置标签数据
+  }, []);
 
+  // 设置标签数据
   var configTag = useCallback(function () {
     setTagDataSource(filterItem.current);
-  }, []); // 更新标签数据
+  }, []);
 
+  // 更新标签数据
   var updateTags = useCallback(function (form) {
     configFilterItem(form);
     configTag();
-  }, []); // 展开收起高级筛选
+  }, []);
 
+  // 展开收起高级筛选
   var toggleAdvancedFilter = useCallback(function () {
     var result = !panelVisible;
-
     if (result) {
       // 展开高级筛选，Light回填Advanced
       if (currentFormName.current === 'light') {
@@ -392,23 +342,21 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       // 收起高级筛选，配置标签数据
       configTag();
     }
-
     setPanelVisible(result);
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(result);
-  }, [panelVisible, configTag]); // 简单搜索Filter
+  }, [panelVisible, configTag]);
 
+  // 简单搜索Filter
   var onSimpleFilter = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values) {
-      return regeneratorRuntime.wrap(function _callee5$(_context5) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(values) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
               return simpleForm.validate();
-
             case 2:
               onFilter(values);
-
             case 3:
             case "end":
               return _context5.stop();
@@ -416,91 +364,94 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         }
       }, _callee5);
     }));
-
     return function (_x4) {
       return _ref7.apply(this, arguments);
     };
-  }(), [onFilter]); // 简单搜索Change
+  }(), [onFilter]);
 
+  // 简单搜索Change
   var onSimpleChange = useCallback(function (values, fieldValue, fieldName) {
     if (currentFormName.current === 'simple') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
-
       if (filterEnable.current === 'filter') {
         debounceFun(onSimpleFilter, values);
       }
     }
-  }, [onChange, onSimpleFilter]); // 轻量搜索Filter
+  }, [onChange, onSimpleFilter]);
 
+  // 轻量搜索Filter
   var onLightFilter = useCallback(function (values) {
     var _Object$keys;
-
-    onFilter(values); // 清空advancedForm的值
-
+    onFilter(values);
+    // 清空advancedForm的值
     var clearKeys = {};
     (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
       clearKeys[key] = undefined;
     });
     advancedForm.setValues(clearKeys);
     updateTags(advancedForm);
-  }, [onFilter]); // 轻量搜索Change
+  }, [onFilter]);
 
+  // 轻量搜索Change
   var onLightChange = useCallback(function (values, fieldValue, fieldName) {
     if (currentFormName.current === 'light') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
-
       if (filterEnable.current === 'filter') {
         debounceFun(onLightFilter, values);
       }
     }
-  }, [onChange, onLightFilter]); // 高级搜索Filter
+  }, [onChange, onLightFilter]);
 
+  // 高级搜索Filter
   var onAdvancedFilter = useCallback(function (values) {
     setCurrentForm('advanced');
     onFilter(values);
-    configFilterItem(advancedForm); // 清空lightForm的值
-
+    configFilterItem(advancedForm);
+    // 清空lightForm的值
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onFilter]); // 高级搜索Reset
+  }, [onFilter]);
 
+  // 高级搜索Reset
   var onAdvancedReset = useCallback(function () {
     setCurrentForm('advanced');
     onReset(toJS(advancedForm.values));
-    configFilterItem(advancedForm); // 清空lightForm的值
-
+    configFilterItem(advancedForm);
+    // 清空lightForm的值
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onReset]); // 高级搜索Change
+  }, [onReset]);
 
+  // 高级搜索Change
   var onAdvancedChange = useCallback(function (values, fieldValue, fieldName) {
     if (currentFormName.current === 'advanced') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
     }
-  }, [onChange]); // 关闭标签清空表单字段值
+  }, [onChange]);
 
+  // 关闭标签清空表单字段值
   var onTagClose = useCallback(function (key, index) {
     var newValue = undefined;
-
     if (isNum(index)) {
       newValue = _toConsumableArray(advancedForm.getValuesIn(key));
       newValue.splice(index, 1);
     }
-
     advancedForm.setValuesIn(key, newValue);
     updateTags(advancedForm);
     onFilter(toJS(advancedForm.values));
-  }, [onFilter]); // initialRequest 的回调
+  }, [onFilter]);
 
+  // initialRequest 的回调
   var onInitialComplete = useCallback(function (form) {
     initialRequestRef.current = false;
     form.setState({
       loading: initialRequestRef.current
     });
-  }, []); // 组件挂载
+  }, []);
 
+  // 组件挂载
   useEffect(function () {
     setCurrentForm(currentFormName.current);
   }, []);
@@ -514,8 +465,9 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     inlineContent: mode === 'panel' ? /*#__PURE__*/React.createElement("div", {
       className: cls(prefixCls('inline', {
         'inline-hidden': purePanel || hasRequired
-      }))
-    }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+      }) // hasRequired 为辅助检测
+      )
+    }, /*#__PURE__*/React.createElement(LightFilter, _extends({}, otherProps, {
       defaultFilterValue: defaultFilterValue,
       filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
@@ -523,13 +475,13 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       onChange: onLightChange
     }))) : /*#__PURE__*/React.createElement("div", {
       className: prefixCls('inline')
-    }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    }, /*#__PURE__*/React.createElement(SimpleFilter, _extends({}, otherProps, {
       form: simpleForm,
       onChange: onSimpleChange,
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
-    panelContent: mode === 'panel' ? /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    panelContent: mode === 'panel' ? /*#__PURE__*/React.createElement(AdvancedFilter, _extends({}, otherProps, {
       form: advancedForm,
       onChange: onAdvancedChange,
       onSubmit: onAdvancedFilter,
@@ -538,10 +490,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     })) : null
   }, mode === 'panel' && !panelVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref8) {
     var key = _ref8.key,
-        label = _ref8.label,
-        value = _ref8.value,
-        type = _ref8.type,
-        index = _ref8.index;
+      label = _ref8.label,
+      value = _ref8.value,
+      type = _ref8.type,
+      index = _ref8.index;
     return /*#__PURE__*/React.createElement(Tag.Closeable, {
       key: isNum(index) ? key + label : key,
       afterClose: function afterClose() {