shineout 1.10.9 → 1.10.12-beta.1

package/css/Datum/Form.js

@@ -51,6 +51,7 @@ function () {
     this.$events = {}; // handle global errors
 
     this.$errors = {};
+    this.updateLock = false;
     this.deepSetOptions = {
       removeUndefined: removeUndefined,
       forceSet: true
@@ -73,6 +74,10 @@ function () {
     this.dispatch(_types.RESET_TOPIC);
   };
 
+  _proto.setLock = function setLock(lock) {
+    this.updateLock = lock;
+  };
+
   _proto.get = function get(name) {
     var _this = this;
 
@@ -243,13 +248,20 @@ function () {
     return (0, _clone.deepClone)(this.$values);
   };
 
-  _proto.setValue = function setValue(values, type, forceSet) {
+  _proto.setValue = function setValue(v, type, forceSet) {
     var _this6 = this;
 
-    if (values === void 0) {
-      values = {};
+    if (v === void 0) {
+      v = {};
     }
 
+    var values = (0, _is.isObject)(v) ? v : {};
+
+    if (values !== v) {
+      console.warn('Form value must be an Object');
+    } // 兼容 value 传入 null 等错误等值
+
+
     if (!forceSet && (0, _deepEql.default)(values, this.$values)) return;
     this.$values = (0, _clone.deepClone)(values); // wait render end.
 
@@ -299,7 +311,9 @@ function () {
     delete this.$inputNames[name];
     delete this.$validator[name];
     delete this.$errors[name];
-    delete this.$defaultValues[name];
+    delete this.$defaultValues[name]; // when  setData due to unmount not delete value
+
+    if (this.updateLock) return;
     if (!(0, _objects.deepHas)(this.$values, name)) return;
     (0, _objects.deepRemove)(this.$values, name);
 

package/css/Datum/List.js

@@ -124,6 +124,10 @@ function () {
     return flatten;
   };
 
+  _proto.setLock = function setLock(lock) {
+    this.updateLock = lock;
+  };
+
   _proto.add = function add(data, _, childrenKey, unshift) {
     var _this2 = this;
 

package/css/Datum/hoc.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _func = require("../utils/func");
 
-var _shallowEqual = _interopRequireDefault(require("../utils/shallowEqual"));
-
 var _strings = require("../utils/strings");
 
 var _types = require("./types");
@@ -97,11 +95,14 @@ var _default = (0, _func.curry)(function (options, Origin) {
     var _proto = _class.prototype;
 
     _proto.componentDidMount = function componentDidMount() {
+      this.datum.setLock(false);
       this.prevValues = this.props[key];
     };
 
     _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
       // update datum.onchange
+      this.datum.setLock(false);
+
       if (prevProps.onChange !== this.props.onChange) {
         this.datum.onChange = this.props.onChange;
       }
@@ -127,6 +128,7 @@ var _default = (0, _func.curry)(function (options, Origin) {
 
       if (type === 'form' && values !== this.prevValues) {
         this.setValue(this.props.initValidate ? undefined : _types.IGNORE_VALIDATE);
+        this.datum.setLock(true);
         this.prevValues = values;
       }
 

package/css/Form/index.d.ts

@@ -388,7 +388,7 @@ export interface FormFieldSetProps<Value> {
    *
    * default:
    */
-  empty?: (onInsert: Value) => ReactNode;
+   empty?: (onInsert: (value: Value) => void) => ReactNode;
 
   /**
    * Validation rules

package/css/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.10.9' }
+export default { utils, version: '1.10.12-beta.1' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

@@ -224,6 +224,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.10.9'
+  version: '1.10.12-beta.1'
 };
 exports.default = _default;

package/dist/shineout.js

@@ -16847,6 +16847,7 @@ function () {
     this.$events = {}; // handle global errors
 
     this.$errors = {};
+    this.updateLock = false;
     this.deepSetOptions = {
       removeUndefined: removeUndefined,
       forceSet: true
@@ -16869,6 +16870,11 @@ function () {
       this.handleChange();
       this.dispatch(_types__WEBPACK_IMPORTED_MODULE_10__["RESET_TOPIC"]);
     }
+  }, {
+    key: "setLock",
+    value: function setLock(lock) {
+      this.updateLock = lock;
+    }
   }, {
     key: "get",
     value: function get(name) {
@@ -17058,9 +17064,16 @@ function () {
     value: function setValue() {
       var _this6 = this;
 
-      var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var v = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var type = arguments.length > 1 ? arguments[1] : undefined;
       var forceSet = arguments.length > 2 ? arguments[2] : undefined;
+      var values = Object(_utils_is__WEBPACK_IMPORTED_MODULE_8__["isObject"])(v) ? v : {};
+
+      if (values !== v) {
+        console.warn('Form value must be an Object');
+      } // 兼容 value 传入 null 等错误等值
+
+
       if (!forceSet && deep_eql__WEBPACK_IMPORTED_MODULE_4___default()(values, this.$values)) return;
       this.$values = Object(_utils_clone__WEBPACK_IMPORTED_MODULE_6__["deepClone"])(values); // wait render end.
 
@@ -17112,7 +17125,9 @@ function () {
       delete this.$inputNames[name];
       delete this.$validator[name];
       delete this.$errors[name];
-      delete this.$defaultValues[name];
+      delete this.$defaultValues[name]; // when  setData due to unmount not delete value
+
+      if (this.updateLock) return;
       if (!Object(_utils_objects__WEBPACK_IMPORTED_MODULE_7__["deepHas"])(this.$values, name)) return;
       Object(_utils_objects__WEBPACK_IMPORTED_MODULE_7__["deepRemove"])(this.$values, name);
 
@@ -17361,6 +17376,11 @@ function () {
       if (keys.length) this.$cachedFlatten.set(key, flatten);
       return flatten;
     }
+  }, {
+    key: "setLock",
+    value: function setLock(lock) {
+      this.updateLock = lock;
+    }
   }, {
     key: "add",
     value: function add(data, _, childrenKey, unshift) {
@@ -18119,11 +18139,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! prop-types */ "prop-types");
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var _utils_func__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils/func */ "./src/utils/func.js");
-/* harmony import */ var _utils_shallowEqual__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/shallowEqual */ "./src/utils/shallowEqual.js");
-/* harmony import */ var _utils_strings__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../utils/strings */ "./src/utils/strings.js");
-/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./types */ "./src/Datum/types.js");
-/* harmony import */ var _List__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./List */ "./src/Datum/List.js");
-/* harmony import */ var _Form__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./Form */ "./src/Datum/Form.js");
+/* harmony import */ var _utils_strings__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/strings */ "./src/utils/strings.js");
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./types */ "./src/Datum/types.js");
+/* harmony import */ var _List__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./List */ "./src/Datum/List.js");
+/* harmony import */ var _Form__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./Form */ "./src/Datum/Form.js");
 
 
 
@@ -18169,10 +18188,9 @@ function _createSuper2(Derived) {
 
 
 
-
 var types = {
-  form: _Form__WEBPACK_IMPORTED_MODULE_13__["default"],
-  list: _List__WEBPACK_IMPORTED_MODULE_12__["default"]
+  form: _Form__WEBPACK_IMPORTED_MODULE_12__["default"],
+  list: _List__WEBPACK_IMPORTED_MODULE_11__["default"]
 };
 /* harmony default export */ __webpack_exports__["default"] = (Object(_utils_func__WEBPACK_IMPORTED_MODULE_8__["curry"])(function (options, Origin) {
   var _class, _temp;
@@ -18224,8 +18242,8 @@ var types = {
           ops[key] = props[key];
         }
 
-        if ("default".concat(Object(_utils_strings__WEBPACK_IMPORTED_MODULE_10__["capitalize"])(key)) in props) {
-          ops["default".concat(Object(_utils_strings__WEBPACK_IMPORTED_MODULE_10__["capitalize"])(key))] = props["default".concat(Object(_utils_strings__WEBPACK_IMPORTED_MODULE_10__["capitalize"])(key))];
+        if ("default".concat(Object(_utils_strings__WEBPACK_IMPORTED_MODULE_9__["capitalize"])(key)) in props) {
+          ops["default".concat(Object(_utils_strings__WEBPACK_IMPORTED_MODULE_9__["capitalize"])(key))] = props["default".concat(Object(_utils_strings__WEBPACK_IMPORTED_MODULE_9__["capitalize"])(key))];
         }
 
         _this.datum = new Datum(Object.assign(ops, datum));
@@ -18241,12 +18259,15 @@ var types = {
     Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_createClass__WEBPACK_IMPORTED_MODULE_2__["default"])(_class, [{
       key: "componentDidMount",
       value: function componentDidMount() {
+        this.datum.setLock(false);
         this.prevValues = this.props[key];
       }
     }, {
       key: "componentDidUpdate",
       value: function componentDidUpdate(prevProps) {
         // update datum.onchange
+        this.datum.setLock(false);
+
         if (prevProps.onChange !== this.props.onChange) {
           this.datum.onChange = this.props.onChange;
         }
@@ -18274,11 +18295,12 @@ var types = {
         var values = this.props[key];
 
         if (type === 'form' && values !== this.prevValues) {
-          this.setValue(this.props.initValidate ? undefined : _types__WEBPACK_IMPORTED_MODULE_11__["IGNORE_VALIDATE"]);
+          this.setValue(this.props.initValidate ? undefined : _types__WEBPACK_IMPORTED_MODULE_10__["IGNORE_VALIDATE"]);
+          this.datum.setLock(true);
           this.prevValues = values;
         }
 
-        if (type === 'list') this.setValue(_types__WEBPACK_IMPORTED_MODULE_11__["WITH_OUT_DISPATCH"]); // delete props[key]
+        if (type === 'list') this.setValue(_types__WEBPACK_IMPORTED_MODULE_10__["WITH_OUT_DISPATCH"]); // delete props[key]
 
         return (
           /*#__PURE__*/
@@ -18287,7 +18309,7 @@ var types = {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 93,
+              lineNumber: 95,
               columnNumber: 14
             }
           }))
@@ -61399,7 +61421,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.10.9'
+  version: '1.10.12-beta.1'
 });