@teamix/pro 1.6.0-beta.4 → 1.6.0-beta.5

package/lib/form/Filter/LightFilter.js

@@ -13,7 +13,6 @@ var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue",
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-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 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; }
@@ -24,15 +23,14 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  */
 var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _schema$;
-  var _ref = props,
-    form = _ref.form,
-    schema = _ref.schema,
-    onSubmit = _ref.onSubmit,
-    onChange = _ref.onChange,
-    defaultFilterValue = _ref.defaultFilterValue,
-    filterValues = _ref.filterValues,
-    activeFilterValueRef = _ref.activeFilterValueRef,
-    otherProps = _objectWithoutProperties(_ref, _excluded);
+  var form = props.form,
+    schema = props.schema,
+    onSubmit = props.onSubmit,
+    onChange = props.onChange,
+    defaultFilterValue = props.defaultFilterValue,
+    filterValues = props.filterValues,
+    activeFilterValueRef = props.activeFilterValueRef,
+    otherProps = _objectWithoutProperties(props, _excluded);
   var filterValue = (0, _react.useRef)(defaultFilterValue || (schema === null || schema === void 0 ? void 0 : (_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-light');
   var lightFilterObs = (0, _react.useMemo)(function () {
@@ -45,7 +43,6 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       activeFilterValueRef.current = filterValue.current;
     }
   }, []);
-
   // 筛选提交切换
   var onFilterChange = (0, _react.useCallback)(function (value) {
     filterValue.current = value;
@@ -53,7 +50,6 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       activeFilterValueRef.current = value;
     }
   }, [form]);
-
   // 实际输出onFilter
   var onFilter = (0, _react.useCallback)(function () {
     var _Object$keys;
@@ -91,7 +87,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   (0, _react.useEffect)(function () {
     lightFilterObs.onFilter = onFilter;
   }, [onFilter]);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({}, otherProps, {
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
       lightFilterObs: lightFilterObs
     }),

package/lib/form/Filter/SimpleFilter.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { FilterProps } from '../typing';
+/**
+ * 简单筛选
+ */
+declare const SimpleFilter: React.FC<FilterProps>;
+export default SimpleFilter;

package/lib/form/Filter/SimpleFilter.js

@@ -12,7 +12,6 @@ var _excluded = ["schema", "onChange", "onSubmit"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-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 _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 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; }
@@ -40,17 +39,15 @@ var initializeSearch = function initializeSearch(schema) {
     initializedSchema: initializedSchema
   };
 };
-
 /**
  * 简单筛选
  */
 var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var searchValue = (0, _react.useRef)(undefined);
-  var _ref = props,
-    schema = _ref.schema,
-    onChange = _ref.onChange,
-    onSubmit = _ref.onSubmit,
-    otherProps = _objectWithoutProperties(_ref, _excluded);
+  var schema = props.schema,
+    onChange = props.onChange,
+    onSubmit = props.onSubmit,
+    otherProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-simple');
   var _initializeSearch = initializeSearch(schema),
     searchName = _initializeSearch.searchName,
@@ -88,7 +85,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) === null || _props$form$initialVa === void 0 ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) === null || _props$form$initialVa2 === void 0 ? void 0 : _props$form$initialVa2[1];
     searchValue.current = (0, _utils.isValid)(searchDefaultValue) ? searchDefaultValue : '';
   }, []);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({}, otherProps, {
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: simpleSchema,
     feedbackLayout: "popover",

package/lib/form/Filter/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { QueryFilterLayout } from './Layout';
+import type { QueryFilterProps } from '../typing';
+import './index.scss';
+/**
+ * 查询筛选
+ */
+declare const QueryFilter: React.FC<QueryFilterProps>;
+export { QueryFilter, QueryFilterLayout };

package/lib/form/Filter/index.js

@@ -31,12 +31,14 @@ var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "fo
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-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 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 _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 _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, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $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 defineProperty(generator, "_invoke", { value: makeInvokeMethod(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; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(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); } }; } 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, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), 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 (val) { var object = Object(val), 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(); }
@@ -97,7 +99,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     onInit = _useBindUrl.onInit,
     onFilter = _useBindUrl.onFilter,
     onReset = _useBindUrl.onReset;
-
   // onInit
   var initialRequestRef = (0, _react.useRef)(!!(props === null || props === void 0 ? void 0 : props.initialRequest));
   var filterEnable = (0, _react.useRef)('waiting');
@@ -144,7 +145,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       return _ref.apply(this, arguments);
     };
   }();
-
   // 配置当前激活的form实例
   var setCurrentForm = function setCurrentForm(formName) {
     currentFormName.current = formName;
@@ -237,9 +237,19 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
           };
         }();
       }
+      // 自定义updateDataSource
+      if (!formRef.current.updateDataSource) {
+        formRef.current.updateDataSource = function (query, params) {
+          [simpleForm, lightForm, advancedForm].forEach(function (f) {
+            var $query = f.query(query).take();
+            if ($query) {
+              $query.data.refresh = params;
+            }
+          });
+        };
+      }
     }
   };
-
   // 创建简单筛选表单实例
   var simpleForm = (0, _react.useMemo)(function () {
     return (0, _core.createForm)({
@@ -291,7 +301,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     light: lightForm,
     advanced: advancedForm
   };
-
   // 获取筛选数据Label
   var getFilterDisplayValues = (0, _react.useCallback)(function (form) {
     var displayValues = (0, _useFormDisplayValues.getFormDisplayValues)(form);
@@ -326,23 +335,19 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     });
     return filterData;
   }, []);
-
   // 设置筛选数据
   var configFilterItem = (0, _react.useCallback)(function (form) {
     filterItem.current = getFilterDisplayValues(form);
   }, []);
-
   // 设置标签数据
   var configTag = (0, _react.useCallback)(function () {
     setTagDataSource(filterItem.current);
   }, []);
-
   // 更新标签数据
   var updateTags = (0, _react.useCallback)(function (form) {
     configFilterItem(form);
     configTag();
   }, []);
-
   // 展开收起高级筛选
   var toggleAdvancedFilter = (0, _react.useCallback)(function () {
     var result = !panelVisible;
@@ -360,7 +365,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     setPanelVisible(result);
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(result);
   }, [panelVisible, configTag]);
-
   // 简单搜索Filter
   var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(values) {
@@ -383,7 +387,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       return _ref7.apply(this, arguments);
     };
   }(), [onFilter]);
-
   // 简单搜索Change
   var onSimpleChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
     if (currentFormName.current === 'simple') {
@@ -393,7 +396,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       }
     }
   }, [onChange, onSimpleFilter]);
-
   // 轻量搜索Filter
   var onLightFilter = (0, _react.useCallback)(function (values) {
     var _Object$keys;
@@ -406,7 +408,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     advancedForm.setValues(clearKeys);
     updateTags(advancedForm);
   }, [onFilter]);
-
   // 轻量搜索Change
   var onLightChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
     if (currentFormName.current === 'light') {
@@ -416,7 +417,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       }
     }
   }, [onChange, onLightFilter]);
-
   // 高级搜索Filter
   var onAdvancedFilter = (0, _react.useCallback)(function (values) {
     setCurrentForm('advanced');
@@ -427,7 +427,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       forceClear: true
     });
   }, [onFilter]);
-
   // 高级搜索Reset
   var onAdvancedReset = (0, _react.useCallback)(function () {
     setCurrentForm('advanced');
@@ -438,14 +437,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       forceClear: true
     });
   }, [onReset]);
-
   // 高级搜索Change
   var onAdvancedChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
     if (currentFormName.current === 'advanced') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
     }
   }, [onChange]);
-
   // 关闭标签清空表单字段值
   var onTagClose = (0, _react.useCallback)(function (key, index) {
     var newValue = undefined;
@@ -457,7 +454,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     updateTags(advancedForm);
     onFilter((0, _reactive.toJS)(advancedForm.values));
   }, [onFilter]);
-
   // initialRequest 的回调
   var onInitialComplete = (0, _react.useCallback)(function (form) {
     initialRequestRef.current = false;
@@ -465,7 +461,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       loading: initialRequestRef.current
     });
   }, []);
-
   // 组件挂载
   (0, _react.useEffect)(function () {
     setCurrentForm(currentFormName.current);
@@ -480,9 +475,8 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     inlineContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _utils.cls)(prefixCls('inline', {
         'inline-hidden': purePanel || hasRequired
-      }) // hasRequired 为辅助检测
-      )
-    }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _extends({}, otherProps, {
+      }))
+    }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       defaultFilterValue: defaultFilterValue,
       filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
@@ -490,13 +484,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onChange: onLightChange
     }))) : /*#__PURE__*/_react.default.createElement("div", {
       className: prefixCls('inline')
-    }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _extends({}, otherProps, {
+    }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
       onChange: onSimpleChange,
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
-    panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _extends({}, otherProps, {
+    panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: advancedForm,
       onChange: onAdvancedChange,
       onSubmit: onAdvancedFilter,

package/lib/form/Filter/index.scss

@@ -41,6 +41,7 @@ $query-filter: #{$teamix-pro-form}-query-filter;
       width: inherit;
       input {
         width: inherit;
+        display: block;
       }
     }
   }

package/lib/form/Filter/index2.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import type { IFilterProps } from '../typing';
+import './index2.scss';
+/**
+ * 简单筛选
+ */
+declare const SimpleFilter: React.FC<IFilterProps>;
+/**
+ * 高级筛选
+ */
+declare const AdvancedFilter: React.FC<IFilterProps>;
+export { AdvancedFilter, SimpleFilter };
+export default AdvancedFilter;

package/lib/form/Filter/index2.js

@@ -15,7 +15,6 @@ var _excluded = ["schema", "triggerType", "onFilter"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-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 _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); }
@@ -41,16 +40,14 @@ var getEventProps = function getEventProps(triggerType, onFilter) {
   };
   return eventMap[triggerType];
 };
-
 /**
  * 简单筛选
  */
 var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var _ref = props,
-    schema = _ref.schema,
-    triggerType = _ref.triggerType,
-    onFilter = _ref.onFilter,
-    otherProps = _objectWithoutProperties(_ref, _excluded);
+  var schema = props.schema,
+    triggerType = props.triggerType,
+    onFilter = props.onFilter,
+    otherProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-simple');
   var simpleSchema = (0, _react.useMemo)(function () {
     return [{
@@ -71,11 +68,11 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }];
   }, [schema, triggerType]);
   var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     feedbackLayout: "popover",
     breakpoints: [],
     inset: true
-  }, otherProps, eventProps, {
+  }, otherProps), eventProps), {}, {
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: simpleSchema
   }));
@@ -84,7 +81,6 @@ exports.SimpleFilter = SimpleFilter;
 SimpleFilter.defaultProps = {
   triggerType: 'change'
 };
-
 /**
  * 高级筛选
  */
@@ -92,16 +88,15 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var form = (0, _react.useMemo)(function () {
     return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)();
   }, []);
-  var _ref2 = props,
-    schema = _ref2.schema,
-    triggerType = _ref2.triggerType,
-    onFilter = _ref2.onFilter,
-    onReset = _ref2.onReset,
-    layout = _ref2.layout,
-    labelAlign = _ref2.labelAlign,
-    wrapperAlign = _ref2.wrapperAlign,
-    labelCol = _ref2.labelCol,
-    wrapperCol = _ref2.wrapperCol;
+  var schema = props.schema,
+    triggerType = props.triggerType,
+    onFilter = props.onFilter,
+    onReset = props.onReset,
+    layout = props.layout,
+    labelAlign = props.labelAlign,
+    wrapperAlign = props.wrapperAlign,
+    labelCol = props.labelCol,
+    wrapperCol = props.wrapperCol;
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
@@ -158,9 +153,9 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     };
   }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     feedbackLayout: "popover"
-  }, props, eventProps, getTeamixLayout, {
+  }, props), eventProps), getTeamixLayout), {}, {
     form: form,
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: gridSchema,

package/lib/form/Filter/index2.scss

@@ -11,6 +11,7 @@
       width: inherit;
       input {
         width: inherit;
+        display: block;
       }
     }
   }

package/lib/form/Filter/useBindUrl.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (bindUrl: any, functions: any, formRef: any) => any;
+export default _default;

package/lib/form/Filter/useBindUrl.js

@@ -42,13 +42,11 @@ var _default = function _default(bindUrl, functions, formRef) {
       }
     }) : options;
   };
-
   // 通过 useUrlState 获取 url 上的参数和 url 配置方法
   var _ref4 = bindUrl ? (0, _hooks.useUrlState)(undefined, initializeBindUrl((0, _utils.isPlainObj)(bindUrl) ? bindUrl : {})) : [],
     _ref5 = _slicedToArray(_ref4, 2),
     urlState = _ref5[0],
     setUrlState = _ref5[1];
-
   // 输出配置url参数的函数
   var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref6) {
     var _ref7 = _slicedToArray(_ref6, 2),
@@ -60,7 +58,6 @@ var _default = function _default(bindUrl, functions, formRef) {
     };
     return prev;
   }, {});
-
   // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
   var setValuesByUrlState = function setValuesByUrlState(form) {
     if (urlState) {

package/lib/form/Filter/useSpecialProps.d.ts

@@ -0,0 +1,6 @@
+declare const useSpecialProps: (props: any) => {
+    hasDefault: boolean;
+    hasChangeDefault: boolean;
+    hasRequired: boolean;
+};
+export default useSpecialProps;

package/lib/form/ProForm/addCascadeEffect.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (form: any, schema: any, scope: any) => void;
+export default _default;

package/lib/form/ProForm/customComponent.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const customComponent: (component: React.FC<any>) => React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
+export { customComponent };

package/lib/form/ProForm/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { ProFormProps } from '../typing';
+import './index.scss';
+declare const _default: React.FC<ProFormProps>;
+export default _default;

package/lib/form/ProForm/index.js

@@ -23,11 +23,12 @@ var _useAutoLayout = _interopRequireDefault(require("./useAutoLayout"));
 var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 var _validate = _interopRequireDefault(require("../locales/validate"));
 require("./index.scss");
+var _parseSchema = require("../utils/parseSchema");
+var _aspect = require("../../utils/aspect");
 var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-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 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; }
@@ -76,7 +77,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     onInitialComplete = _ref.onInitialComplete,
     className = _ref.className,
     validateFirst = _ref.validateFirst,
-    schema = _ref.schema,
+    schemaProps = _ref.schema,
     children = _ref.children,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var formRef = (0, _react.useRef)();
@@ -87,6 +88,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
     context: context
   });
+  var schema = (0, _react.useMemo)(function () {
+    return (0, _parseSchema.parseSchema)(schemaProps !== null && schemaProps !== void 0 ? schemaProps : []);
+  }, [schemaProps]);
   var form = (0, _react.useMemo)(function () {
     var nextForm = outerForm || (0, _core.createForm)({
       validateFirst: validateFirst
@@ -96,7 +100,6 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, [outerForm]);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form');
   // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
-
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), _ProField.default);
   var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit, context);
   var autoTeamixLayout = (0, _useAutoLayout.default)(_objectSpread(_objectSpread({}, otherProps), {}, {
@@ -114,7 +117,6 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       });
     }
   }, []);
-
   // 添加 onChange 事件
   (0, _react.useMemo)(function () {
     if (onChangeType === 'form') {
@@ -140,9 +142,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     // 配置国际化
     (0, _core.setValidateLanguage)((0, _utils.getLanguage)() || 'zh-cn');
   }, []);
-  return /*#__PURE__*/_react.default.createElement(_formily.Form, _extends({
+  return /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _utils.cls)(prefixCls(), className)
-  }, otherProps, autoTeamixLayout, {
+  }, otherProps), autoTeamixLayout), {}, {
     form: form,
     onAutoSubmit: onAutoSubmit,
     onAutoSubmitFailed: onSubmitFailed
@@ -160,5 +162,5 @@ ProForm.defaultProps = {
   breakpoints: true,
   labelAlign: 'left'
 };
-var _default = ProForm;
+var _default = (0, _aspect.ProComponentAspect)(ProForm, 'ProForm');
 exports.default = _default;

package/lib/form/ProForm/useAutoLayout.d.ts

@@ -0,0 +1,9 @@
+declare const useAutoLayout: ({ breakpoints: outBreakpoints, layout, labelAlign, wrapperAlign, labelCol: outLabelCol, wrapperCol: outWrapperCol, autoLayout, schema, }: any, formRef: any) => {
+    breakpoints: any;
+    layout: any;
+    labelAlign: any;
+    wrapperAlign: any;
+    labelCol: any;
+    wrapperCol: any;
+};
+export default useAutoLayout;