@teamix/pro 1.2.32 → 1.3.0

package/es/actions/dialog-form.js

@@ -1,5 +1,11 @@
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
+
+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); }
+
+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(); }
 
@@ -27,7 +33,7 @@ import React, { useState, useEffect, createRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Loading } from '@alicloudfe/components';
 import ProForm, { createForm } from '../form';
-import { getTargetValue } from '@teamix/utils';
+import { getTargetValue, resolveMaybePromiseMethod } from '@teamix/utils';
 import { doRequest } from './request';
 import useDialogAction from './dialog';
 import { addContext } from './utils';
@@ -134,6 +140,7 @@ export function useDialogFormAction(action, context) {
       _action$size = action.size,
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
+      propsBeforeRequest = action.beforeRequest,
       others = _objectWithoutProperties(action, _excluded2);
 
   var formRef = /*#__PURE__*/createRef();
@@ -154,13 +161,55 @@ export function useDialogFormAction(action, context) {
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
-    beforeRequest: function beforeRequest() {
-      return new Promise(function (resolve) {
-        formRef.current.validate().then(function () {
-          resolve({
-            fields: formRef.current.values
-          });
-        }).catch(function () {
+    beforeRequest: function beforeRequest(context) {
+      return new Promise(function (resolve, reject) {
+        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var beforeRequestContext, requestContext;
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  if (!propsBeforeRequest) {
+                    _context.next = 13;
+                    break;
+                  }
+
+                  _context.prev = 1;
+                  _context.next = 4;
+                  return resolveMaybePromiseMethod(propsBeforeRequest, context);
+
+                case 4:
+                  beforeRequestContext = _context.sent;
+                  _context.next = 10;
+                  break;
+
+                case 7:
+                  _context.prev = 7;
+                  _context.t0 = _context["catch"](1);
+                  beforeRequestContext = false;
+
+                case 10:
+                  if (!(beforeRequestContext === false)) {
+                    _context.next = 13;
+                    break;
+                  }
+
+                  reject(false);
+                  return _context.abrupt("return");
+
+                case 13:
+                  requestContext = Object.assign({
+                    fields: formRef.current.values
+                  }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
+                  resolve(requestContext);
+
+                case 15:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[1, 7]]);
+        }))).catch(function () {
           resolve(false);
         });
       });

package/es/form/Filter/AdvancedFilter.js

@@ -1,4 +1,4 @@
-var _excluded = ["schema", "onSubmit", "onReset", "onResetClick", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"];
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "forceClear"];
 
 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; }
 
@@ -35,12 +35,12 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
   var schema = props.schema,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
-      onResetClick = props.onResetClick,
       layout = props.layout,
       labelAlign = props.labelAlign,
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
       wrapperCol = props.wrapperCol,
+      forceClear = props.forceClear,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = usePrefixCls('', {
@@ -71,7 +71,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
-              onClick: onResetClick,
+              forceClear: !!forceClear,
               children: getMessage('reset')
             }
           }, {
@@ -86,7 +86,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
         }]
       }])
     }];
-  }, [schema, onReset, onResetClick]);
+  }, [schema, onReset]);
   var getTeamixLayout = useMemo(function () {
     return {
       breakpoints: [990],

package/es/form/Filter/LightFilter.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
 
 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; }
 
@@ -10,9 +10,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-import React, { memo, useMemo, useCallback, useRef } from 'react';
+import React, { memo, useMemo, useCallback, useRef, useEffect } from 'react';
 import cls from 'classnames';
-import { toJS } from '@formily/reactive';
 import { usePrefixCls } from '@teamix/utils';
 import ProForm from '../ProForm';
 /**
@@ -27,24 +26,32 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var filterValue = useRef(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter-light'
-  }); // input类组件的按钮
-
-  var onBtnClick = useCallback(function () {
-    onChange && onChange(toJS(form.values));
-  }, [form]); // 筛选提交切换
+  });
+  useEffect(function () {
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = filterValue.current;
+    }
+  }, []); // 筛选提交切换
 
   var onFilterChange = useCallback(function (value) {
     filterValue.current = value;
-  }, [form]); // onChange
 
-  var onCurrentChange = useCallback(function (values) {
-    onChange && onChange(_defineProperty({}, filterValue.current, values[filterValue.current]));
-  }, [onChange, filterValue.current]);
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = value;
+    }
+  }, [form]); // 实际输出onFilter
+
+  var onFilter = 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 = useMemo(function () {
     return [{
       component: 'LightFilter',
@@ -52,7 +59,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
         defaultFilterValue: defaultFilterValue,
         onFilterChange: onFilterChange,
         buttonProps: {
-          onClick: onBtnClick
+          onClick: onFilter
         }
       },
       children: schema
@@ -64,7 +71,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
         }
       }
     }];
-  }, [schema, onBtnClick, onFilterChange, defaultFilterValue]);
+  }, [schema, onFilter, onFilterChange, defaultFilterValue]);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
     className: cls(prefixCls, props.className),
@@ -73,7 +80,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
     breakpoints: [],
     bordered: false,
     onSubmit: onSubmit,
-    onChange: onCurrentChange
+    onChange: onFilter
   }));
 });
 export default LightFilter;

package/es/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 };