@nutui/nutui-react-taro 3.0.1 → 3.0.2

package/dist/es/packages/form/useform.js

@@ -1,303 +1,371 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import Schema from "async-validator";
+import { merge, recursive } from "../../utils/merge";
 export var SECRET = 'NUT_FORM_INTERNAL';
 /**
  * 用于存储表单的数据
- */ var FormStore = function FormStore() {
+ */ var FormStore = /*#__PURE__*/ function() {
     "use strict";
-    var _this = this;
-    var _this1 = this;
-    _class_call_check(this, FormStore);
-    var _this2 = this;
-    // 初始化数据
-    _define_property(this, "initialValues", {});
-    _define_property(this, "updateList", []);
-    // 存放表单中所有的数据 eg. {password: "ddd",username: "123"}
-    _define_property(this, "store", {});
-    // 所有的组件实例
-    _define_property(this, "fieldEntities", []);
-    // 校验成功或失败的回调，onFinish、onFinishFailed
-    _define_property(this, "callbacks", {});
-    _define_property(this, "errors", {});
-    /**
+    function FormStore() {
+        var _this = this;
+        var _this1 = this;
+        _class_call_check(this, FormStore);
+        var _this2 = this;
+        // 初始化数据
+        _define_property(this, "initialValues", {});
+        _define_property(this, "updateList", []);
+        // 存放表单中所有的数据 eg. {password: "ddd",username: "123"}
+        _define_property(this, "store", {});
+        // 所有的组件实例
+        _define_property(this, "fieldEntities", []);
+        // 校验成功或失败的回调，onFinish、onFinishFailed
+        _define_property(this, "callbacks", {});
+        _define_property(this, "errors", {});
+        /**
    * 注册组件实例
    * @param field
    */ _define_property(this, "registerField", function(field) {
-        _this.fieldEntities.push(field);
-        return function() {
-            _this.fieldEntities = _this.fieldEntities.filter(function(item) {
-                return item !== field;
-            });
-            if (_this.store) {
-                delete _this.store[field.props.name];
-            }
-        };
-    });
-    /**
+            _this.fieldEntities.push(field);
+            return function() {
+                _this.fieldEntities = _this.fieldEntities.filter(function(item) {
+                    return item !== field;
+                });
+            };
+        });
+        /**
    * 获取 formItem 的值
    * @param name
    */ _define_property(this, "getFieldValue", function(name) {
-        var _this_store;
-        return (_this_store = _this.store) === null || _this_store === void 0 ? void 0 : _this_store[name];
-    });
-    /**
+            var _this_store;
+            return (_this_store = _this.store) === null || _this_store === void 0 ? void 0 : _this_store[name];
+        });
+        /**
    * 获取全部字段
    */ _define_property(this, "getFieldsValue", function(nameList) {
-        if (typeof nameList === 'boolean') {
-            return JSON.parse(JSON.stringify(_this.store));
-        }
-        var fieldsValue = {};
-        nameList.forEach(function(field) {
-            fieldsValue[field] = _this.getFieldValue(field);
+            if (typeof nameList === 'boolean') {
+                return JSON.parse(JSON.stringify(_this.store));
+            }
+            var fieldsValue = {};
+            nameList.forEach(function(field) {
+                fieldsValue[field] = _this.getFieldValue(field);
+            });
+            return fieldsValue;
         });
-        return fieldsValue;
-    });
-    /**
+        /**
    * 设置 form 的初始值，之后在 reset 的时候使用
    * @param values
    * @param init
-   */ _define_property(this, "setInitialValues", function(values, init) {
-        if (init) {
-            _this.initialValues = values;
-            _this.store = values;
-        }
-    });
-    /**
+   */ _define_property(this, "setInitialValues", function(initialValues, init) {
+            _this.initialValues = initialValues || {};
+            if (init) {
+                var nextStore = merge(initialValues, _this.store);
+                _this.updateStore(nextStore);
+                _this.notifyWatch();
+            }
+        });
+        /**
    * 存储组件数据
    * @param newStore { [name]: newValue }
    */ _define_property(this, "setFieldsValue", function(newStore) {
-        var needValidate = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-        _this1.store = _object_spread({}, _this1.store, newStore);
-        _this1.fieldEntities.forEach(function(entity) {
-            var name = entity.props.name;
-            Object.keys(newStore).forEach(function(key) {
-                if (key === name) {
-                    entity.onStoreChange('update');
+            var nextStore = recursive(true, _this.store, newStore);
+            _this.updateStore(nextStore);
+            _this.fieldEntities.forEach(function(entity) {
+                var name = entity.props.name;
+                Object.keys(newStore).forEach(function(key) {
+                    if (key === name) {
+                        entity.onStoreChange('update');
+                    }
+                });
+            });
+            _this.updateList.forEach(function(item) {
+                var shouldUpdate = item.condition;
+                if (typeof item.condition === 'function') {
+                    shouldUpdate = item.condition();
+                }
+                if (shouldUpdate) {
+                    item.entity.onStoreChange('update');
                 }
             });
+            _this.notifyWatch();
         });
-        _this1.updateList.forEach(function(item) {
-            var shouldUpdate = item.condition;
-            if (typeof item.condition === 'function') {
-                shouldUpdate = item.condition();
-            }
-            if (shouldUpdate) {
-                item.entity.onStoreChange('update');
-            }
+        _define_property(this, "setFieldValue", function(name, value) {
+            var store = _define_property({}, name, value);
+            _this.setFieldsValue(store);
+            _this.notifyWatch([
+                name
+            ]);
         });
-        needValidate && _this1.validateFields();
-    });
-    _define_property(this, "setCallback", function(callback) {
-        _this.callbacks = _object_spread({}, _this.callbacks, callback);
-    });
-    _define_property(this, "validateEntities", /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(entity, errs) {
-            var _entity_props, name, _entity_props_rules, rules, descriptor, validator, _this_store, param, errors, _errs;
+        _define_property(this, "setCallback", function(callback) {
+            _this.callbacks = _object_spread({}, _this.callbacks, callback);
+        });
+        _define_property(this, "validateEntities", /*#__PURE__*/ function() {
+            var _ref = _async_to_generator(function(entity, errs) {
+                var _entity_props, name, _entity_props_rules, rules, descriptor, validator, _this_store, param, errors, _errs;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            _entity_props = entity.props, name = _entity_props.name, _entity_props_rules = _entity_props.rules, rules = _entity_props_rules === void 0 ? [] : _entity_props_rules;
+                            if (!name) {
+                                console.warn('Form field missing name property');
+                                return [
+                                    2
+                                ];
+                            }
+                            descriptor = {};
+                            if (rules.length) {
+                                // 多条校验规则
+                                if (rules.length > 1) {
+                                    descriptor[name] = [];
+                                    rules.forEach(function(v) {
+                                        descriptor[name].push(v);
+                                    });
+                                } else {
+                                    descriptor[name] = rules[0];
+                                }
+                            }
+                            validator = new Schema(descriptor);
+                            _state.label = 1;
+                        case 1:
+                            _state.trys.push([
+                                1,
+                                3,
+                                4,
+                                5
+                            ]);
+                            return [
+                                4,
+                                validator.validate(_define_property({}, name, (_this_store = _this2.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
+                            ];
+                        case 2:
+                            _state.sent();
+                            return [
+                                3,
+                                5
+                            ];
+                        case 3:
+                            param = _state.sent();
+                            errors = param.errors;
+                            if (errors) {
+                                ;
+                                (_errs = errs).push.apply(_errs, _to_consumable_array(errors));
+                                _this2.errors[name] = errors;
+                            }
+                            return [
+                                3,
+                                5
+                            ];
+                        case 4:
+                            if (!errs || errs.length === 0) {
+                                _this2.errors[name] = [];
+                            }
+                            return [
+                                7
+                            ];
+                        case 5:
+                            entity.onStoreChange('validate');
+                            return [
+                                2
+                            ];
+                    }
+                });
+            });
+            return function(entity, errs) {
+                return _ref.apply(this, arguments);
+            };
+        }());
+        _define_property(this, "validateFields", /*#__PURE__*/ function() {
+            var _ref = _async_to_generator(function(nameList) {
+                var filterEntities, errs;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            filterEntities = [];
+                            // this.errors.length = 0
+                            if (!nameList || nameList.length === 0) {
+                                filterEntities = _this2.fieldEntities;
+                            } else {
+                                filterEntities = _this2.fieldEntities.filter(function(param) {
+                                    var name = param.props.name;
+                                    return nameList.includes(name);
+                                });
+                            }
+                            errs = [];
+                            return [
+                                4,
+                                Promise.all(filterEntities.map(/*#__PURE__*/ function() {
+                                    var _ref = _async_to_generator(function(entity) {
+                                        return _ts_generator(this, function(_state) {
+                                            switch(_state.label){
+                                                case 0:
+                                                    return [
+                                                        4,
+                                                        _this2.validateEntities(entity, errs)
+                                                    ];
+                                                case 1:
+                                                    _state.sent();
+                                                    return [
+                                                        2
+                                                    ];
+                                            }
+                                        });
+                                    });
+                                    return function(entity) {
+                                        return _ref.apply(this, arguments);
+                                    };
+                                }()))
+                            ];
+                        case 1:
+                            _state.sent();
+                            return [
+                                2,
+                                errs
+                            ];
+                    }
+                });
+            });
+            return function(nameList) {
+                return _ref.apply(this, arguments);
+            };
+        }());
+        _define_property(this, "submit", /*#__PURE__*/ _async_to_generator(function() {
+            var errors, _this_callbacks_onFinish, _this_callbacks, _this_callbacks_onFinishFailed, _this_callbacks1;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        _entity_props = entity.props, name = _entity_props.name, _entity_props_rules = _entity_props.rules, rules = _entity_props_rules === void 0 ? [] : _entity_props_rules;
-                        descriptor = {};
-                        if (rules.length) {
-                            // 多条校验规则
-                            if (rules.length > 1) {
-                                descriptor[name] = [];
-                                rules.forEach(function(v) {
-                                    descriptor[name].push(v);
-                                });
-                            } else {
-                                descriptor[name] = rules[0];
-                            }
-                        }
-                        validator = new Schema(descriptor);
-                        _state.label = 1;
-                    case 1:
-                        _state.trys.push([
-                            1,
-                            3,
-                            4,
-                            5
-                        ]);
                         return [
                             4,
-                            validator.validate(_define_property({}, name, (_this_store = _this2.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
+                            _this2.validateFields()
                         ];
-                    case 2:
-                        _state.sent();
-                        return [
-                            3,
-                            5
-                        ];
-                    case 3:
-                        param = _state.sent();
-                        errors = param.errors;
-                        if (errors) {
+                    case 1:
+                        errors = _state.sent();
+                        if (errors.length === 0) {
                             ;
-                            (_errs = errs).push.apply(_errs, _to_consumable_array(errors));
-                            _this2.errors[name] = errors;
-                        }
-                        return [
-                            3,
-                            5
-                        ];
-                    case 4:
-                        if (!errs || errs.length === 0) {
-                            _this2.errors[name] = [];
+                            (_this_callbacks_onFinish = (_this_callbacks = _this2.callbacks).onFinish) === null || _this_callbacks_onFinish === void 0 ? void 0 : _this_callbacks_onFinish.call(_this_callbacks, _this2.store);
+                        } else if (errors.length > 0) {
+                            ;
+                            (_this_callbacks_onFinishFailed = (_this_callbacks1 = _this2.callbacks).onFinishFailed) === null || _this_callbacks_onFinishFailed === void 0 ? void 0 : _this_callbacks_onFinishFailed.call(_this_callbacks1, _this2.store, errors);
                         }
-                        return [
-                            7
-                        ];
-                    case 5:
-                        entity.onStoreChange('validate');
                         return [
                             2
                         ];
                 }
             });
-        });
-        return function(entity, errs) {
-            return _ref.apply(this, arguments);
-        };
-    }());
-    _define_property(this, "validateFields", /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(nameList) {
-            var filterEntities, errs;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        filterEntities = [];
-                        _this2.errors.length = 0;
-                        if (!nameList || nameList.length === 0) {
-                            filterEntities = _this2.fieldEntities;
-                        } else {
-                            filterEntities = _this2.fieldEntities.filter(function(param) {
-                                var name = param.props.name;
-                                return nameList.includes(name);
-                            });
+        }));
+        _define_property(this, "resetFields", function(namePaths) {
+            if (namePaths && namePaths.length) {
+                namePaths.forEach(function(path) {
+                    _this.errors[path] = null;
+                    _this.fieldEntities.forEach(function(entity) {
+                        var name = entity.props.name;
+                        if (name === path) {
+                            if (path in _this.initialValues) {
+                                _this.updateStore(_define_property({}, path, _this.initialValues[path]));
+                            } else {
+                                delete _this.store[path];
+                            }
+                            entity.onStoreChange('reset');
                         }
-                        errs = [];
-                        return [
-                            4,
-                            Promise.all(filterEntities.map(/*#__PURE__*/ function() {
-                                var _ref = _async_to_generator(function(entity) {
-                                    return _ts_generator(this, function(_state) {
-                                        switch(_state.label){
-                                            case 0:
-                                                return [
-                                                    4,
-                                                    _this2.validateEntities(entity, errs)
-                                                ];
-                                            case 1:
-                                                _state.sent();
-                                                return [
-                                                    2
-                                                ];
-                                        }
-                                    });
-                                });
-                                return function(entity) {
-                                    return _ref.apply(this, arguments);
-                                };
-                            }()))
-                        ];
-                    case 1:
-                        _state.sent();
-                        return [
-                            2,
-                            errs
-                        ];
-                }
+                    });
+                });
+            } else {
+                var nextStore = merge({}, _this.initialValues);
+                _this.updateStore(nextStore);
+                _this.fieldEntities.forEach(function(entity) {
+                    entity.onStoreChange('reset');
+                });
+            }
+        });
+        // 监听事件
+        _define_property(this, "registerUpdate", function(field, shouldUpdate) {
+            _this.updateList.push({
+                entity: field,
+                condition: shouldUpdate
             });
+            return function() {
+                _this.updateList = _this.updateList.filter(function(i) {
+                    return i.entity !== field;
+                });
+            };
         });
-        return function(nameList) {
-            return _ref.apply(this, arguments);
-        };
-    }());
-    _define_property(this, "submit", /*#__PURE__*/ _async_to_generator(function() {
-        var errors, _this_callbacks_onFinish, _this_callbacks, _this_callbacks_onFinishFailed, _this_callbacks1;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        _this2.validateFields()
-                    ];
-                case 1:
-                    errors = _state.sent();
-                    if (errors.length === 0) {
-                        ;
-                        (_this_callbacks_onFinish = (_this_callbacks = _this2.callbacks).onFinish) === null || _this_callbacks_onFinish === void 0 ? void 0 : _this_callbacks_onFinish.call(_this_callbacks, _this2.store);
-                    } else if (errors.length > 0) {
-                        ;
-                        (_this_callbacks_onFinishFailed = (_this_callbacks1 = _this2.callbacks).onFinishFailed) === null || _this_callbacks_onFinishFailed === void 0 ? void 0 : _this_callbacks_onFinishFailed.call(_this_callbacks1, _this2.store, errors);
-                    }
-                    return [
-                        2
-                    ];
+        _define_property(this, "dispatch", function(param) {
+            var name = param.name;
+            _this.validateFields([
+                name
+            ]);
+        });
+        _define_property(this, "getInternal", function(key) {
+            if (key === SECRET) {
+                return {
+                    registerField: _this.registerField,
+                    setCallback: _this.setCallback,
+                    setInitialValues: _this.setInitialValues,
+                    dispatch: _this.dispatch,
+                    store: _this.store,
+                    fieldEntities: _this.fieldEntities,
+                    registerUpdate: _this.registerUpdate,
+                    registerWatch: _this.registerWatch
+                };
             }
         });
-    }));
-    _define_property(this, "resetFields", function() {
-        _this.errors.length = 0;
-        _this.store = _this.initialValues;
-        _this.fieldEntities.forEach(function(entity) {
-            entity.onStoreChange('reset');
+        _define_property(this, "getForm", function() {
+            return {
+                getFieldValue: _this.getFieldValue,
+                getFieldsValue: _this.getFieldsValue,
+                setFieldsValue: _this.setFieldsValue,
+                setFieldValue: _this.setFieldValue,
+                resetFields: _this.resetFields,
+                validateFields: _this.validateFields,
+                submit: _this.submit,
+                errors: _this.errors,
+                getInternal: _this.getInternal
+            };
         });
-    });
-    // 监听事件
-    _define_property(this, "registerUpdate", function(field, shouldUpdate) {
-        _this.updateList.push({
-            entity: field,
-            condition: shouldUpdate
+        _define_property(this, "watchList", []);
+        _define_property(this, "registerWatch", function(callback) {
+            _this.watchList.push(callback);
+            return function() {
+                _this.watchList = _this.watchList.filter(function(fn) {
+                    return fn !== callback;
+                });
+            };
         });
-        return function() {
-            _this.updateList = _this.updateList.filter(function(i) {
-                return i.entity !== field;
-            });
+        _define_property(this, "notifyWatch", function() {
+            var namePath = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+            if (_this1.watchList.length) {
+                var allValues;
+                if (!namePath || namePath.length === 0) {
+                    allValues = _this1.getFieldsValue(true);
+                } else {
+                    allValues = _this1.getFieldsValue(namePath);
+                }
+                _this1.watchList.forEach(function(callback) {
+                    callback(allValues, namePath);
+                });
+            }
+        });
+        this.callbacks = {
+            onFinish: function() {},
+            onFinishFailed: function() {}
         };
-    });
-    _define_property(this, "dispatch", function(param) {
-        var name = param.name;
-        _this.validateFields([
-            name
-        ]);
-    });
-    _define_property(this, "getInternal", function(key) {
-        if (key === SECRET) {
-            return {
-                registerField: _this.registerField,
-                setCallback: _this.setCallback,
-                setInitialValues: _this.setInitialValues,
-                dispatch: _this.dispatch,
-                store: _this.store,
-                fieldEntities: _this.fieldEntities,
-                registerUpdate: _this.registerUpdate
-            };
+    }
+    _create_class(FormStore, [
+        {
+            key: "updateStore",
+            value: function updateStore(nextStore) {
+                this.store = nextStore;
+            }
         }
-    });
-    _define_property(this, "getForm", function() {
-        return {
-            getFieldValue: _this.getFieldValue,
-            getFieldsValue: _this.getFieldsValue,
-            setFieldsValue: _this.setFieldsValue,
-            resetFields: _this.resetFields,
-            validateFields: _this.validateFields,
-            submit: _this.submit,
-            errors: _this.errors,
-            getInternal: _this.getInternal
-        };
-    });
-    this.callbacks = {
-        onFinish: function() {},
-        onFinishFailed: function() {}
-    };
-};
+    ]);
+    return FormStore;
+}();
 export var useForm = function(form) {
     var formRef = useRef();
     if (!formRef.current) {
@@ -312,3 +380,23 @@ export var useForm = function(form) {
         formRef.current
     ];
 };
+export var useWatch = function(path, form) {
+    var formInstance = form.getInternal(SECRET);
+    var _useState = _sliced_to_array(useState(), 2), value = _useState[0], setValue = _useState[1];
+    useEffect(function() {
+        var unsubscribe = formInstance.registerWatch(function(data, namePath) {
+            var value = data[path];
+            setValue(value);
+        });
+        var initialValue = form.getFieldsValue(true);
+        if (value !== initialValue[path]) {
+            setValue(initialValue[path]);
+        }
+        return function() {
+            return unsubscribe();
+        };
+    }, [
+        form
+    ]);
+    return value;
+};

package/dist/es/packages/formitem/formitem.d.ts

@@ -76,6 +76,7 @@ export declare class FormItem extends React.Component<Partial<FormItemProps>, {
     getControlled: (children: React.ReactElement) => any;
     refresh: () => void;
     onStoreChange: (type?: string) => void;
+    getClassNameWithDirection(className: string): string;
     renderLayout: (childNode: React.ReactNode) => React.JSX.Element;
     render(): React.JSX.Element;
 }