shineout 3.3.6 → 3.3.7-beta.1

package/cjs/index.js

@@ -476,5 +476,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.3.6'
+  version: '3.3.7-beta.1'
 };

package/dist/shineout.js

@@ -11968,7 +11968,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.3.6');
+/* harmony default export */ var version = ('3.3.7-beta.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -38413,11 +38413,11 @@ function useFormControl(props) {
       if (inForm && controlFunc) {
         if (isArray(name)) {
           name.forEach(function (n) {
-            controlFunc.unbind(n, reserveAble);
+            controlFunc.unbind(n, reserveAble, validateFiled, update);
             updateError(n, undefined);
           });
         } else {
-          controlFunc.unbind(name, reserveAble);
+          controlFunc.unbind(name, reserveAble, validateFiled, update);
           updateError(name, undefined);
         }
       }
@@ -38884,6 +38884,10 @@ var checkbox_group_Group = function Group(props0) {
     } else {
       datum.remove(raw);
     }
+    if (children && /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(children)) {
+      var _children$props$onCha, _children$props;
+      (_children$props$onCha = (_children$props = children.props).onChange) === null || _children$props$onCha === void 0 || _children$props$onCha.call(_children$props, checked ? children.props.htmlValue : undefined, checked, children.props.htmlValue);
+    }
   });
   var isChecked = usePersistFn(function (d) {
     return datum.check(d);
@@ -45210,8 +45214,10 @@ var useForm = function useForm(props) {
     var _context$flowMap$glob;
     if (!name) {
       Object.keys(context.updateMap).forEach(function (key) {
-        var _context$updateMap$ke, _context$updateMap;
-        (_context$updateMap$ke = (_context$updateMap = context.updateMap)[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.call(_context$updateMap, context.value, context.errors, context.serverErrors);
+        var _context$updateMap$ke;
+        (_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (update) {
+          update(context.value, context.errors, context.serverErrors);
+        });
       });
       Object.keys(context.flowMap).forEach(function (key) {
         context.flowMap[key].forEach(function (update) {
@@ -45221,8 +45227,10 @@ var useForm = function useForm(props) {
     } else {
       var names = isArray(name) ? name : [name];
       names.forEach(function (key) {
-        var _context$updateMap$ke2, _context$updateMap2, _context$flowMap$key;
-        (_context$updateMap$ke2 = (_context$updateMap2 = context.updateMap)[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.call(_context$updateMap2, context.value, context.errors, context.serverErrors);
+        var _context$updateMap$ke2, _context$flowMap$key;
+        (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
+          update(context.value, context.errors, context.serverErrors);
+        });
         (_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
           update();
         });
@@ -45278,9 +45286,11 @@ var useForm = function useForm(props) {
       }) : Object.keys(context.validateMap);
       var validates = files2.map(function (key) {
         var validateField = context.validateMap[key];
-        return validateField(key, deepGet(context.value, key), context.value, config);
+        return Array.from(validateField).map(function (validate) {
+          return validate(key, deepGet(context.value, key), context.value, config);
+        });
       });
-      Promise.all(validates).then(function (results) {
+      Promise.all(validates.flat()).then(function (results) {
         var error = results.find(function (n) {
           return n !== true;
         });
@@ -45325,8 +45335,10 @@ var useForm = function useForm(props) {
       Object.keys(vals).forEach(function (key) {
         deepSet(draft, key, vals[key], deepSetOptions);
         if (option.validate) {
-          var _context$validateMap$, _context$validateMap;
-          (_context$validateMap$ = (_context$validateMap = context.validateMap)[key]) === null || _context$validateMap$ === void 0 || _context$validateMap$.call(_context$validateMap, key, vals[key], current(draft));
+          var _context$validateMap$;
+          (_context$validateMap$ = context.validateMap[key]) === null || _context$validateMap$ === void 0 || _context$validateMap$.forEach(function (validate) {
+            validate(key, vals[key], current(draft));
+          });
         }
       });
     });
@@ -45470,12 +45482,17 @@ var useForm = function useForm(props) {
   var controlFunc = use_latest_obj({
     bind: function bind(n, df, validate, updateFn) {
       if (context.names.has(n)) {
-        console.error("name \"".concat(n, "\" already exist"));
-        return;
+        console.warn("name \"".concat(n, "\" already exist"));
       }
       context.names.add(n);
-      context.validateMap[n] = validate;
-      context.updateMap[n] = updateFn;
+      if (!context.validateMap[n]) {
+        context.validateMap[n] = new Set();
+      }
+      context.validateMap[n].add(validate);
+      if (!context.updateMap[n]) {
+        context.updateMap[n] = new Set();
+      }
+      context.updateMap[n].add(updateFn);
       context.removeArr.delete(n);
       if (df !== undefined && deepGet(context.value, n) === undefined) {
         if (!context.mounted) context.defaultValues[n] = df;
@@ -45485,11 +45502,19 @@ var useForm = function useForm(props) {
       }
       update(n);
     },
-    unbind: function unbind(n, reserveAble) {
-      delete context.validateMap[n];
-      delete context.defaultValues[n];
-      delete context.updateMap[n];
-      context.names.delete(n);
+    unbind: function unbind(n, reserveAble, validateFiled, update) {
+      var validateFieldSet = context.validateMap[n];
+      if (validateFiled && validateFieldSet.has(validateFiled)) {
+        validateFieldSet.delete(validateFiled);
+      }
+      var updateFieldSet = context.updateMap[n];
+      if (update && updateFieldSet.has(update)) {
+        updateFieldSet.delete(update);
+      }
+      if (validateFieldSet.size === 0 && updateFieldSet.size === 0) {
+        context.names.delete(n);
+        delete context.defaultValues[n];
+      }
       if (!reserveAble && !context.removeLock) {
         addRemove(n);
       }
@@ -45564,12 +45589,12 @@ var useForm = function useForm(props) {
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
     // 服务端错误更新
     if (!props.error) context.serverErrors = {};else {
-      var _errors = Object.keys(props.error).reduce(function (prev, cur) {
+      var errors = Object.keys(props.error).reduce(function (prev, cur) {
         var item = props.error[cur];
         var error = item instanceof Error ? item : new Error(item);
         return objectSpread2_default()(objectSpread2_default()({}, prev), {}, defineProperty_default()({}, cur, error));
       }, {});
-      context.serverErrors = _errors;
+      context.serverErrors = errors;
     }
     update();
   }, [props.error]);
@@ -63929,7 +63954,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.6'
+  version: '3.3.7-beta.1'
 });
 }();
 /******/ 	return __webpack_exports__;