@teamix/pro 1.5.0 → 1.6.0-beta.1

package/lib/form/Components/ProField/mapDateFormat.js

@@ -4,73 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _shared = require("@formily/shared");
-
 var _utils = require("@teamix/utils");
-
 var _moment = _interopRequireDefault(require("moment"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 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; }
-
 var moment = function moment(date, format) {
   return (0, _moment.default)((date === null || date === void 0 ? void 0 : date.toDate) ? date.toDate() : date, format);
 };
-
 var momentable = function momentable(value, format) {
   return Array.isArray(value) ? value.map(function (val) {
     return moment(val, format);
   }) : value ? moment(value, format) : value;
 };
-
 var formatMomentValue = function formatMomentValue(value, format, placeholder) {
   var formatDate = function formatDate(date, format) {
     var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     if (!date) return placeholder;
-
     if ((0, _utils.isArr)(format)) {
       var _format = format[i];
-
       if ((0, _utils.isFn)(_format)) {
         return _format(date);
       }
-
       if ((0, _shared.isEmpty)(_format)) {
         return date;
       }
-
       return moment(date).format(_format);
     } else {
       if ((0, _utils.isFn)(format)) {
         return format(date);
       }
-
       if ((0, _shared.isEmpty)(format)) {
         return date;
       }
-
       return moment(date).format(format);
     }
   };
-
   if ((0, _utils.isArr)(value)) {
     return value.map(function (val, index) {
       return formatDate(val, format, index);
@@ -79,11 +56,9 @@ var formatMomentValue = function formatMomentValue(value, format, placeholder) {
     return value ? formatDate(value, format) : value || placeholder;
   }
 };
-
 var mapDateFormatDatePicker2 = function mapDateFormatDatePicker2(type) {
   var getDefaultFormat = function getDefaultFormat(props) {
     var _type = props['type'] || type;
-
     if (_type === 'month') {
       return 'YYYY-MM';
     } else if (_type === 'quarter') {
@@ -93,10 +68,8 @@ var mapDateFormatDatePicker2 = function mapDateFormatDatePicker2(type) {
     } else if (_type === 'week') {
       return 'YYYY-wo';
     }
-
     return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
   };
-
   return function (props) {
     var format = props['format'] || getDefaultFormat(props);
     var _onChange = props.onChange;
@@ -111,14 +84,11 @@ var mapDateFormatDatePicker2 = function mapDateFormatDatePicker2(type) {
     });
   };
 };
-
 var mapDateFormat = function mapDateFormat(props, field) {
   var _ref = field.component || [],
-      _ref2 = _slicedToArray(_ref, 1),
-      component = _ref2[0];
-
+    _ref2 = _slicedToArray(_ref, 1),
+    component = _ref2[0];
   return {};
 };
-
 var _default = mapDateFormat;
 exports.default = _default;

package/lib/form/Components/Text/index.js

@@ -4,39 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _utils = require("@teamix/utils");
-
 require("./index.scss");
-
 var _excluded = ["children", "className"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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 _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; }
-
 var Text = function Text(_ref) {
   var children = _ref.children,
-      className = _ref.className,
-      otherProps = _objectWithoutProperties(_ref, _excluded);
-
+    className = _ref.className,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-text');
-  return /*#__PURE__*/_react.default.createElement("span", _objectSpread({
+  return /*#__PURE__*/_react.default.createElement("span", _extends({
     className: (0, _classnames.default)(prefixCls(), className)
   }, otherProps), children);
 };
-
 var _default = Text;
 exports.default = _default;

package/lib/form/Filter/AdvancedFilter.js

@@ -1,67 +1,47 @@
 "use strict";
 
 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); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _utils = require("@teamix/utils");
-
 var _ProForm = _interopRequireDefault(require("../ProForm"));
-
 var _utils2 = require("../utils");
-
 var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
-
 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); }
-
 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 _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 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 _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; }
-
 /**
  * 高级筛选
  */
 var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      onSubmit = props.onSubmit,
-      onReset = props.onReset,
-      layout = props.layout,
-      labelAlign = props.labelAlign,
-      wrapperAlign = props.wrapperAlign,
-      labelCol = props.labelCol,
-      wrapperCol = props.wrapperCol,
-      breakpoints = props.breakpoints,
-      gridProps = props.gridProps,
-      forceClear = props.forceClear,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
+  var _ref = props,
+    schema = _ref.schema,
+    onSubmit = _ref.onSubmit,
+    onReset = _ref.onReset,
+    layout = _ref.layout,
+    labelAlign = _ref.labelAlign,
+    wrapperAlign = _ref.wrapperAlign,
+    labelCol = _ref.labelCol,
+    wrapperCol = _ref.wrapperCol,
+    breakpoints = _ref.breakpoints,
+    gridProps = _ref.gridProps,
+    forceClear = _ref.forceClear,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
@@ -107,7 +87,6 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [schema, onReset]);
   (0, _react.useEffect)(function () {
     var _otherProps$form;
-
     otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$form = otherProps.form) === null || _otherProps$form === void 0 ? void 0 : _otherProps$form.clearFormGraph('AdvancedFilterReset');
   }, [onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
@@ -127,11 +106,11 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       wrapperCol: wrapperCol
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: gridSchema,
     feedbackLayout: "popover"
-  }, otherProps), getTeamixLayout), {}, {
+  }, otherProps, getTeamixLayout, {
     onSubmit: onSubmit
   }));
 });

package/lib/form/Filter/Layout.js

@@ -1,63 +1,42 @@
 "use strict";
 
 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); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.QueryFilterLayout = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _components = require("@alicloudfe/components");
-
 var _icon = _interopRequireDefault(require("@teamix/icon"));
-
 var _utils = require("@teamix/utils");
-
 require("./layout.scss");
-
 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 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 _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; }
-
 var QueryFilterLayout = function QueryFilterLayout(_ref) {
   var className = _ref.className,
-      addonBefore = _ref.addonBefore,
-      addonAfter = _ref.addonAfter,
-      inlineContent = _ref.inlineContent,
-      panelContent = _ref.panelContent,
-      count = _ref.count,
-      expand = _ref.expand,
-      onExpand = _ref.onExpand,
-      children = _ref.children;
+    addonBefore = _ref.addonBefore,
+    addonAfter = _ref.addonAfter,
+    inlineContent = _ref.inlineContent,
+    panelContent = _ref.panelContent,
+    count = _ref.count,
+    expand = _ref.expand,
+    onExpand = _ref.onExpand,
+    children = _ref.children;
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-layout');
-
   var _useState = (0, _react.useState)(!!expand),
-      _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
   var onClick = (0, _react.useCallback)(function () {
     setVisible(!visible);
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(!visible);
@@ -96,5 +75,4 @@ var QueryFilterLayout = function QueryFilterLayout(_ref) {
     className: prefixCls('children')
   }, children));
 };
-
 exports.QueryFilterLayout = QueryFilterLayout;

package/lib/form/Filter/LightFilter.js

@@ -1,53 +1,38 @@
 "use strict";
 
 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); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _reactive = require("@formily/reactive");
-
 var _utils = require("@teamix/utils");
-
 var _ProForm = _interopRequireDefault(require("../ProForm"));
-
 var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "filterValues", "activeFilterValueRef"];
-
 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 _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; }
-
 /**
  * 轻量筛选
  */
 var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _schema$;
-
-  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 _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 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 () {
@@ -59,22 +44,22 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     if (activeFilterValueRef) {
       activeFilterValueRef.current = filterValue.current;
     }
-  }, []); // 筛选提交切换
+  }, []);
 
+  // 筛选提交切换
   var onFilterChange = (0, _react.useCallback)(function (value) {
     filterValue.current = value;
-
     if (activeFilterValueRef) {
       activeFilterValueRef.current = value;
     }
-  }, [form]); // 实际输出onFilter
+  }, [form]);
 
+  // 实际输出onFilter
   var onFilter = (0, _react.useCallback)(function () {
     var _Object$keys;
-
     var key = filterValue.current;
-    var value = form.values[key]; // 删除旧值
-
+    var value = form.values[key];
+    // 删除旧值
     (_Object$keys = Object.keys(form.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (item) {
       if (item !== key) {
         form.setValuesIn(item, undefined);
@@ -106,7 +91,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   (0, _react.useEffect)(function () {
     lightFilterObs.onFilter = onFilter;
   }, [onFilter]);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({}, otherProps, {
     scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
       lightFilterObs: lightFilterObs
     }),

package/lib/form/Filter/SimpleFilter.js

@@ -1,36 +1,23 @@
 "use strict";
 
 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); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _utils = require("@teamix/utils");
-
 var _ProForm = _interopRequireDefault(require("../ProForm"));
-
 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; }
-
 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; }
-
 // 初始化Search组件，内置部分属性
 var initializeSearch = function initializeSearch(schema) {
   var searchName = '';
@@ -46,7 +33,6 @@ var initializeSearch = function initializeSearch(schema) {
         }, item.props)
       });
     }
-
     return item;
   });
   return {
@@ -54,25 +40,21 @@ var initializeSearch = function initializeSearch(schema) {
     initializedSchema: initializedSchema
   };
 };
+
 /**
  * 简单筛选
  */
-
-
 var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var searchValue = (0, _react.useRef)(undefined);
-
-  var schema = props.schema,
-      onChange = props.onChange,
-      onSubmit = props.onSubmit,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
+  var _ref = props,
+    schema = _ref.schema,
+    onChange = _ref.onChange,
+    onSubmit = _ref.onSubmit,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-simple');
-
   var _initializeSearch = initializeSearch(schema),
-      searchName = _initializeSearch.searchName,
-      initializedSchema = _initializeSearch.initializedSchema;
-
+    searchName = _initializeSearch.searchName,
+    initializedSchema = _initializeSearch.initializedSchema;
   var simpleSchema = (0, _react.useMemo)(function () {
     return [{
       component: 'FormFlex',
@@ -102,12 +84,11 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [onChange, searchName, searchValue.current]);
   (0, _react.useEffect)(function () {
     var _props$form$initialVa, _props$form$initialVa2;
-
     // 处理Search组件，缓存input的默认值
     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, _objectSpread(_objectSpread({}, otherProps), {}, {
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({}, otherProps, {
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: simpleSchema,
     feedbackLayout: "popover",