@teamix/pro 1.2.32 → 1.3.0

package/lib/form/Filter/LightFilter.js

@@ -11,13 +11,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _reactive = require("@formily/reactive");
-
 var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -46,24 +44,32 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var filterValue = (0, _react.useRef)(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-light'
-  }); // input类组件的按钮
-
-  var onBtnClick = (0, _react.useCallback)(function () {
-    onChange && onChange((0, _reactive.toJS)(form.values));
-  }, [form]); // 筛选提交切换
+  });
+  (0, _react.useEffect)(function () {
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = filterValue.current;
+    }
+  }, []); // 筛选提交切换
 
   var onFilterChange = (0, _react.useCallback)(function (value) {
     filterValue.current = value;
-  }, [form]); // onChange
 
-  var onCurrentChange = (0, _react.useCallback)(function (values) {
-    onChange && onChange(_defineProperty({}, filterValue.current, values[filterValue.current]));
-  }, [onChange, filterValue.current]);
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = value;
+    }
+  }, [form]); // 实际输出onFilter
+
+  var onFilter = (0, _react.useCallback)(function () {
+    var key = filterValue.current;
+    var value = form.values[key];
+    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value));
+  }, [onChange]);
   var LightSchema = (0, _react.useMemo)(function () {
     return [{
       component: 'LightFilter',
@@ -71,7 +77,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         defaultFilterValue: defaultFilterValue,
         onFilterChange: onFilterChange,
         buttonProps: {
-          onClick: onBtnClick
+          onClick: onFilter
         }
       },
       children: schema
@@ -83,7 +89,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }
       }
     }];
-  }, [schema, onBtnClick, onFilterChange, defaultFilterValue]);
+  }, [schema, onFilter, onFilterChange, defaultFilterValue]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
     className: (0, _classnames.default)(prefixCls, props.className),
@@ -92,7 +98,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     breakpoints: [],
     bordered: false,
     onSubmit: onSubmit,
-    onChange: onCurrentChange
+    onChange: onFilter
   }));
 });
 var _default = LightFilter;

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

@@ -1,13 +1,9 @@
 import React from 'react';
-import type { IFilterProps } from '../typing';
+import { QueryFilterLayout } from './Layout';
+import type { QueryFilterProps } from '../typing';
 import './index.scss';
 /**
- * 简单筛选
+ * 查询筛选
  */
-declare const SimpleFilter: React.FC<IFilterProps>;
-/**
- * 高级筛选
- */
-declare const AdvancedFilter: React.FC<IFilterProps>;
-export { AdvancedFilter, SimpleFilter };
-export default AdvancedFilter;
+declare const QueryFilter: React.FC<QueryFilterProps>;
+export { QueryFilter, QueryFilterLayout };