shineout 3.7.0-beta.40 → 3.7.0-beta.41

package/cjs/grid/grid.d.ts

@@ -1,3 +1,6 @@
 import { GridProps } from './grid.type';
-declare const _default: (props: GridProps) => import("react/jsx-runtime").JSX.Element;
-export default _default;
+declare const GridWithStyle: {
+    (props: GridProps): import("react/jsx-runtime").JSX.Element;
+    isGrid: boolean;
+};
+export default GridWithStyle;

package/cjs/grid/grid.js

@@ -13,11 +13,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var _default = exports.default = function _default(props) {
+var GridWithStyle = function GridWithStyle(props) {
   var jssStyle = {
     grid: _shineoutStyle.useGridStyle
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.Grid, _objectSpread({
     jssStyle: jssStyle
   }, props));
-};
+};
+GridWithStyle.isGrid = true;
+var _default = exports.default = GridWithStyle;

package/cjs/index.js

@@ -522,5 +522,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.7.0-beta.40'
+  version: '3.7.0-beta.41'
 };

package/dist/shineout.js

@@ -12227,7 +12227,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.7.0-beta.40');
+/* harmony default export */ var version = ('3.7.0-beta.41');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -50059,8 +50059,7 @@ var useForm = function useForm(props) {
       resetTime: 0,
       mounted: false,
       unmounted: false,
-      removeLock: false,
-      settingMap: {}
+      removeLock: false
     }),
     context = _React$useRef.current;
   var update = function update(name) {
@@ -50297,8 +50296,6 @@ var useForm = function useForm(props) {
         // upload组件返回的可能是函数: (prev) => [...prev, file]
         var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
         deepSet(draft, key, valueOfKey, deepSetOptions);
-        // 设置 settingMap 用于标记该字段正在被设置值
-        context.settingMap[key] = true;
       });
       values.forEach(function (key) {
         if (option.validate) {
@@ -50309,13 +50306,6 @@ var useForm = function useForm(props) {
           });
         }
       });
-
-      // 设置 settingMap 的值为 false，表示该字段设置值完成
-      setTimeout(function () {
-        values.forEach(function (key) {
-          delete context.settingMap[key];
-        });
-      });
     });
 
     // 获取vals的所有key,包括嵌套对象的key
@@ -50494,20 +50484,11 @@ var useForm = function useForm(props) {
         context.updateMap[n] = new Set();
       }
       context.updateMap[n].add(updateFn);
-      var shouldTriggerResetChange = context.removeArr.has(n);
       context.removeArr.delete(n);
-      var currentValue = deepGet(context.value, n);
-      var shouldTriggerDefaultChange = df !== undefined && currentValue === undefined;
-      if (shouldTriggerDefaultChange || shouldTriggerResetChange) {
+      if (df !== undefined && deepGet(context.value, n) === undefined) {
         if (!context.mounted) context.defaultValues[n] = df;
-        var _defaultValue = df;
-
-        // 如果组件是重新 bind ，比如更改了 key 或者通过三元表达式切换了组件但 name 都是相同的情况下，在切换过程中改了 value 的值（比如通过 datum.set），需要阻止 defaultValue 的上位，按照当前的 value 来设置 defaultValue
-        if (shouldTriggerResetChange && context.settingMap[n]) {
-          _defaultValue = currentValue !== undefined ? currentValue : df;
-        }
         onChange(function (v) {
-          deepSet(v, n, _defaultValue, deepSetOptions);
+          deepSet(v, n, df, deepSetOptions);
         });
         update(n);
       }
@@ -51629,7 +51610,7 @@ var grid_excluded = ["width", "offset", "responsive", "stretch", "children", "gu
 
 
 
-var Gird = function Gird(props) {
+var Grid = function Grid(props) {
   var _jssStyle$grid;
   var _props$width = props.width,
     width = _props$width === void 0 ? 1 : _props$width,
@@ -51688,21 +51669,23 @@ var Gird = function Gird(props) {
     })
   }));
 };
-Gird.isGrid = true;
-/* harmony default export */ var grid_grid = (Gird);
+Grid.isGrid = true;
+/* harmony default export */ var grid_grid = (Grid);
 ;// CONCATENATED MODULE: ./src/grid/grid.tsx
 
 
 
 
-/* harmony default export */ var src_grid_grid = (function (props) {
+var GridWithStyle = function GridWithStyle(props) {
   var jssStyle = {
     grid: useGridStyle
   };
   return /*#__PURE__*/(0,jsx_runtime.jsx)(grid_grid, objectSpread2_default()({
     jssStyle: jssStyle
   }, props));
-});
+};
+GridWithStyle.isGrid = true;
+/* harmony default export */ var src_grid_grid = (GridWithStyle);
 ;// CONCATENATED MODULE: ./src/grid/index.ts
 
 var GridComp = src_grid_grid;
@@ -71308,7 +71291,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.40'
+  version: '3.7.0-beta.41'
 });
 }();
 /******/ 	return __webpack_exports__;