@teamix/pro 1.3.11 → 1.3.12

package/es/form/Filter/index.js

@@ -40,7 +40,7 @@ import debounce from 'lodash.debounce';
 import { Tag } from '@alicloudfe/components';
 import { createForm, onFormReact, onFormInputChange } from '@formily/core';
 import { toJS } from '@formily/reactive';
-import { usePrefixCls, isUsable, isNum, getValidValues } from '@teamix/utils';
+import { usePrefixCls, isUsable, isNum } from '@teamix/utils';
 import ProField from '../../field/index';
 import fieldTypeMap from '../fieldTypeMap';
 import { getFormDisplayValues } from '../ProForm/useFormDisplayValues';
@@ -72,7 +72,6 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var _useSpecialProps = useSpecialProps(props),
-      hasChangeDefault = _useSpecialProps.hasChangeDefault,
       hasRequired = _useSpecialProps.hasRequired;
 
   var _useState = useState(!!expand),
@@ -92,56 +91,66 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter'
   });
-  /**
-   * 处理onInit与onFilter事件的触发问题
-   */
+  var debounceFun = debounce(function (fun, props) {
+    return fun(props);
+  }, filterDebounce); // onInit
 
+  var initialRequestRef = useRef(!!(props === null || props === void 0 ? void 0 : props.initialRequest));
   var filterEnable = useRef('waiting');
 
-  var _onFormInit = function onFormInit(form, _ref) {
-    var initialRequest = _ref.initialRequest,
-        initialValues = _ref.initialValues;
+  var onFormInit = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(form) {
+      var loadingField;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              form.setState({
+                loading: initialRequestRef.current
+              }); // 借用 form.loading 触发 onFormReact
 
-    if (!form.mounted) {
-      // 借用form的loading属性来判断initialValues和initialRequest是否完成
-      form.setState({
-        loading: !!initialRequest || !!initialValues
-      });
-    }
+              loadingField = Object.values(form.fields).filter(function (field) {
+                return !!field.loading;
+              }); // 等待mounted + 字段loading结束 + initialRequest结束 => 表单默认值初始化完成
 
-    var loadingField = Object.values(form.fields).filter(function (field) {
-      return !!field.loading;
-    }); // 等待表单mounted + 字段loading结束 + form默认值初始化 => 表单初始化完成
+              if (!(form.mounted && !loadingField.length && !form.loading)) {
+                _context.next = 10;
+                break;
+              }
+
+              onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
-    if (form.mounted && !loadingField.length && !form.loading) {
-      _onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
+              filterEnable.current = 'filter';
+
+              if (!onInit) {
+                _context.next = 10;
+                break;
+              }
 
-      var values = getValidValues(form.values);
+              _context.next = 8;
+              return form.validate();
 
-      if (!isUsable(values) || !hasChangeDefault) {
-        // 表单无默认值 或 无触发onChange的默认值配置，不会触发onFilter内的onInit，所以主动触发onInit
-        filterEnable.current = 'filter';
-        setTimeout(function () {
-          onInit === null || onInit === void 0 ? void 0 : onInit(toJS(form.values));
-        }, 0);
+            case 8:
+              onInit === null || onInit === void 0 ? void 0 : onInit(toJS(form.values)); // 设置Tag
 
-        if (mode === 'panel') {
-          // 移除lightForm的默认值
-          // 设置Tag
-          configFilterItem(advancedForm);
+              if (mode === 'panel') {
+                configFilterItem(advancedForm);
+                !panelVisible && configTag();
+              }
 
-          if (!panelVisible) {
-            setTimeout(function () {
-              configTag();
-            }, 0);
+            case 10:
+            case "end":
+              return _context.stop();
           }
         }
-      } else {
-        filterEnable.current = 'initialized';
-      }
-    }
-  }; // 配置当前激活的form实例
+      }, _callee);
+    }));
+
+    return function onFormInit(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }(); // 配置当前激活的form实例
 
 
   var setCurrentForm = function setCurrentForm(formName) {
@@ -167,7 +176,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       effects: function effects() {
         onFormReact(function (form) {
           if (mode === 'inline') {
-            _onFormInit(form, props);
+            onFormInit(form);
           }
         });
       }
@@ -191,7 +200,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       effects: function effects() {
         onFormReact(function (form) {
           if (mode === 'panel') {
-            _onFormInit(form, props);
+            onFormInit(form);
           }
         });
         onFormInputChange(function (form) {
@@ -272,93 +281,62 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = useCallback( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(currentForm.current === 'simple')) {
-                _context.next = 14;
-                break;
-              }
-
-              if (!(filterEnable.current === 'initialized')) {
-                _context.next = 9;
-                break;
-              }
-
-              filterEnable.current = 'filter';
-
-              if (!hasRequired) {
-                _context.next = 6;
-                break;
-              }
-
-              _context.next = 6;
-              return simpleForm.validate();
-
-            case 6:
-              onInit === null || onInit === void 0 ? void 0 : onInit(values);
-              _context.next = 14;
-              break;
-
-            case 9:
-              if (!(filterEnable.current === 'filter')) {
-                _context.next = 14;
-                break;
-              }
-
-              if (!hasRequired) {
-                _context.next = 13;
-                break;
-              }
-
-              _context.next = 13;
+              _context2.next = 2;
               return simpleForm.validate();
 
-            case 13:
+            case 2:
               onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
 
-            case 14:
+            case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function (_x) {
+    return function (_x2) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, hasRequired, onInit]); // 简单搜索Change
+  }(), [onFilter]); // 简单搜索Change
 
   var onSimpleChange = useCallback(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'simple') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+
+      if (filterEnable.current === 'filter') {
+        debounceFun(onSimpleFilter, values);
+      }
     }
   }, [onChange]); // 轻量搜索Filter
 
   var onLightFilter = useCallback(function (values) {
-    if (currentForm.current === 'light') {
-      if (filterEnable.current === 'filter') {
-        var _Object$keys;
+    var _Object$keys;
 
-        onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值，配置Tag
+    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值
 
-        var clearKeys = {};
-        (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
-          clearKeys[key] = undefined;
-        });
-        advancedForm.setValues(clearKeys);
-        configFilterItem(advancedForm);
-        configTag();
-      }
-    }
+    var clearKeys = {};
+    (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
+      clearKeys[key] = undefined;
+    });
+    advancedForm.setValues(clearKeys); // 配置Tag
+
+    configFilterItem(advancedForm);
+    configTag();
   }, [onFilter]); // 轻量搜索Change
 
   var onLightChange = useCallback(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'light') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+
+      if (filterEnable.current === 'filter') {
+        debounceFun(onLightFilter, values);
+      }
     }
   }, [onChange]); // 高级搜索Filter
 
@@ -380,54 +358,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onReset]); // 高级搜索Init
-
-  var onAdvancedInit = useCallback( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(currentForm.current === 'advanced')) {
-                _context2.next = 9;
-                break;
-              }
-
-              if (!(filterEnable.current === 'initialized')) {
-                _context2.next = 9;
-                break;
-              }
-
-              filterEnable.current = 'filter';
-
-              if (!hasRequired) {
-                _context2.next = 6;
-                break;
-              }
-
-              _context2.next = 6;
-              return advancedForm.validate();
-
-            case 6:
-              onInit === null || onInit === void 0 ? void 0 : onInit(values);
-              configFilterItem(advancedForm);
-
-              if (!panelVisible) {
-                configTag();
-              }
-
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-
-    return function (_x2) {
-      return _ref5.apply(this, arguments);
-    };
-  }(), [hasRequired, onInit]); // 高级搜索Change
+  }, [onReset]); // 高级搜索Change
 
   var onAdvancedChange = useCallback(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'advanced') {
@@ -447,16 +378,14 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     configFilterItem(advancedForm);
     configTag();
     onFilter === null || onFilter === void 0 ? void 0 : onFilter(toJS(advancedForm.values));
-  }, [onFilter]); // initialValues和initialRequest的回调
+  }, [onFilter]); // initialRequest 的回调
 
   var onInitialComplete = useCallback(function (form) {
+    initialRequestRef.current = false;
     form.setState({
-      loading: false
+      loading: initialRequestRef.current
     });
-  }, []);
-  var debounceFun = debounce(function (fun, props) {
-    return fun(props);
-  }, filterDebounce); // 组件挂载
+  }, []); // 组件挂载
 
   useEffect(function () {
     setCurrentForm(currentForm.current);
@@ -475,37 +404,28 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onLightFilter, values);
-        onLightChange(values, fieldValue, fieldName);
-      }
+      onChange: onLightChange
     }))) : /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-inline")
     }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onSimpleFilter, values);
-        onSimpleChange(values, fieldValue, fieldName);
-      },
+      onChange: onSimpleChange,
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: advancedForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onAdvancedInit, values);
-        onAdvancedChange(values, fieldValue, fieldName);
-      },
+      onChange: onAdvancedChange,
       onSubmit: onAdvancedFilter,
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref6) {
-    var key = _ref6.key,
-        label = _ref6.label,
-        value = _ref6.value,
-        type = _ref6.type,
-        index = _ref6.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref5) {
+    var key = _ref5.key,
+        label = _ref5.label,
+        value = _ref5.value,
+        type = _ref5.type,
+        index = _ref5.index;
     return /*#__PURE__*/React.createElement(Tag.Closeable, {
       key: isNum(index) ? key + label : key,
       afterClose: function afterClose() {

package/es/form/ProForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 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,9 @@ 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, useEffect, useMemo } from 'react';
+import React, { memo, useMemo } from 'react';
 import cls from 'classnames';
-import { createForm, onFieldValueChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
+import { createForm, onFieldValueChange, onFormValuesChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { toJS } from '@formily/reactive';
 import { Form } from '@teamix/formily';
 import { usePrefixCls, getLanguage, getGlobalConfig } from '@teamix/utils';
@@ -39,6 +39,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       wrapperCol = _ref.wrapperCol,
       breakpoints = _ref.breakpoints,
       onChange = _ref.onChange,
+      onChangeType = _ref.onChangeType,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
       onInitialComplete = _ref.onInitialComplete,
@@ -85,35 +86,44 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       labelCol: mergeArrayValue([24], labelCol),
       wrapperCol: mergeArrayValue([24], wrapperCol)
     };
-  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
-
-  useEffect(function () {
-    form.removeEffects('onFieldValueChange');
-    form.addEffects('onFieldValueChange', function () {
-      onFieldValueChange('*', function (field, form) {
-        var _field$props;
-
-        onChange && onChange(toJS(form.values), toJS(field.value), (_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.name);
-      });
-    });
-  }, [form, onChange]); // 配置表单默认值
-
-  useEffect(function () {
+  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  useMemo(function () {
+    // 配置表单默认值
     if (initialValues) {
       form.setInitialValues(initialValues);
-      onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
     } else if (initialRequest) {
       useInitialRequest(initialRequest).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
-    }
-  }, []); // 配置国际化
+    } // 配置国际化
+
 
-  useEffect(function () {
     setValidateLanguage(getLanguage() || 'zh-cn');
-  }, []);
+  }, []); // 添加 onChange 事件
+
+  useMemo(function () {
+    if (onChangeType === 'form') {
+      // 使用 onFormValuesChange 无法监听具体变化字段
+      form.removeEffects('onChangeByFormValuesChange');
+      form.addEffects('onChangeByFormValuesChange', function () {
+        onFormValuesChange(function (form) {
+          onChange === null || onChange === void 0 ? void 0 : onChange(toJS(form.values));
+        });
+      });
+    } else {
+      // 使用 onFieldValueChange 无法监听数组类型值的增删
+      form.removeEffects('onChangeByFieldValueChange');
+      form.addEffects('onChangeByFieldValueChange', function () {
+        onFieldValueChange('*', function (field, form) {
+          var _field$props;
+
+          onChange === null || onChange === void 0 ? void 0 : onChange(toJS(form.values), toJS(field.value), (_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.name);
+        });
+      });
+    }
+  }, [onChange]);
   return /*#__PURE__*/React.createElement(Form, _objectSpread(_objectSpread(_objectSpread({
     className: cls(prefixCls, className)
   }, otherProps), getTeamixLayout), {}, {

package/es/form/typing.d.ts

@@ -67,6 +67,7 @@ export interface ProFormProps extends IFormLayoutProps {
     initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
     validateFirst?: boolean;
+    onChangeType?: 'form';
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;

package/es/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.11";
+declare const version = "1.3.12";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -31,6 +31,6 @@ export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.11';
+var version = '1.3.12';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };