@teamix/pro 1.2.33 → 1.3.1

package/es/actions/dialog-form.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ProFormProps, ProFormSchema } from '../form';
+import { ProFormProps, ProFormSchema, ProFormType } from '../form';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
 export interface DialogFormAction extends DialogAction {
@@ -12,9 +12,14 @@ export interface DialogFormAction extends DialogAction {
     /**
      * @deprecated 建议使用 schema 配置 ProFormProps 代替
      */
-    formProps?: Omit<ProFormProps, 'schema'>;
-    /** 同时支持两种配置方式，如果想完整定制表单，可使用完整的表单配置项 ProFormProps，否则可以只配置 ProFormSchema */
-    schema: ProFormSchema | ProFormProps;
+    formProps?: Omit<ProFormProps, 'schema' | 'form'>;
+    /** 同时支持两种配置方式:
+     * 如果想完整定制表单，可使用完整的表单配置项 ProFormProps，但不可以传 form 字段，可以通过 formRef 获取内部 form 实例。
+     * 否则可以只配置 ProFormSchema
+     */
+    schema: ProFormSchema | Omit<ProFormProps, 'form'>;
+    /** 外部传来的 formRef，用于获取内置 form 实例 */
+    formRef?: React.MutableRefObject<ProFormType | undefined>;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/es/actions/dialog-form.js

@@ -1,5 +1,5 @@
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
 
 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); }
 
@@ -89,7 +89,8 @@ var DialogForm = function DialogForm(props) {
       schema = props.schema,
       formProps = props.formProps,
       context = props.context,
-      formRef = props.formRef;
+      formRef = props.formRef,
+      innerFormRef = props.innerFormRef;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
@@ -106,7 +107,11 @@ var DialogForm = function DialogForm(props) {
 
   var history = useHistory();
   useEffect(function () {
-    formRef.current = form;
+    if (formRef) {
+      formRef.current = form;
+    }
+
+    innerFormRef.current = form;
 
     if (initialRequest) {
       setLoading(true);
@@ -141,9 +146,10 @@ export function useDialogFormAction(action, context) {
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
+      propsFormRef = action.formRef,
       others = _objectWithoutProperties(action, _excluded2);
 
-  var formRef = /*#__PURE__*/createRef();
+  var innerFormRef = /*#__PURE__*/createRef();
   return useDialogAction(Object.assign({
     size: size,
     closeable: true,
@@ -157,13 +163,14 @@ export function useDialogFormAction(action, context) {
         context: contentContext
       };
       return /*#__PURE__*/React.createElement(DialogForm, _objectSpread({
-        formRef: formRef
+        innerFormRef: innerFormRef,
+        formRef: propsFormRef
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
-        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -199,7 +206,7 @@ export function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: formRef.current.values
+                    fields: innerFormRef.current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -215,9 +222,9 @@ export function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _formRef$current;
+      var _innerFormRef$current;
 
-      _onFinish && _onFinish((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
     }
   }, others), context);
 }

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;