shineout 3.6.7-beta.5 → 3.6.7-beta.7

package/cjs/date-picker/date-picker.js

@@ -4,8 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _react = require("react");
 var _base = require("@sheinx/base");
 var _shineoutStyle = require("@sheinx/shineout-style");
+var _hooks = require("@sheinx/hooks");
 var _useFieldCommon = _interopRequireDefault(require("../hooks/use-field-common"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,5 +30,30 @@ var BaseDatePicker = function BaseDatePicker(props) {
   }, props));
 };
 var _default = exports.default = function _default(props) {
-  return (0, _useFieldCommon.default)(props, BaseDatePicker);
+  var _useConfig = (0, _base.useConfig)(),
+    locale = _useConfig.locale;
+
+  // datepicker 默认值需要提格式化前处理，否则内部会根据 format 进行格式化并再次触发 onChange，参考 v1 v2 的 value hoc 行为
+  var defaultValue = (0, _react.useMemo)(function () {
+    if (props.defaultValue) {
+      var options = {
+        timeZone: props.timeZone,
+        weekStartsOn: Number((0, _base.getLocale)(locale, 'startOfWeek'))
+      };
+      var type = props.type || 'date';
+      var format = (0, _hooks.getFormat)(props.format, type);
+      var dateArr = (0, _hooks.convertValueToDateArr)(props.defaultValue, format, options);
+      var formattedDefaultValue = (0, _hooks.getFormatValueArr)({
+        dateArr: dateArr,
+        format: format,
+        type: type,
+        options: options
+      });
+      return props.range ? formattedDefaultValue : formattedDefaultValue[0];
+    }
+    return props.defaultValue;
+  }, []);
+  return (0, _useFieldCommon.default)(_objectSpread(_objectSpread({}, props), {}, {
+    defaultValue: defaultValue
+  }), BaseDatePicker);
 };

package/cjs/index.js

@@ -514,5 +514,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.6.7-beta.5'
+  version: '3.6.7-beta.7'
 };

package/dist/shineout.js

@@ -12217,7 +12217,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.6.7-beta.5');
+/* harmony default export */ var version = ('3.6.7-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -44348,6 +44348,18 @@ var getDefaultMode = function getDefaultMode(type) {
   var mode = getTypeMode(type);
   return [mode, mode];
 };
+var getFormatValueArr = function getFormatValueArr(opts) {
+  var dateArr = opts.dateArr,
+    format = opts.format,
+    clearWithUndefined = opts.clearWithUndefined,
+    options = opts.options,
+    type = opts.type;
+  var fmt = use_datepicker_format_getFormat(format, type);
+  return dateArr.map(function (item) {
+    if (!item) return clearWithUndefined ? undefined : '';
+    return util.format(item, fmt, options);
+  });
+};
 var useDatePickerFormat = function useDatePickerFormat(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -47067,6 +47079,8 @@ var DatePicker = function DatePicker(props0) {
 
 
 
+
+
 var date_picker_jssStyle = {
   datePicker: useDatePickerStyle,
   button: useButtonStyle,
@@ -47080,7 +47094,32 @@ var BaseDatePicker = function BaseDatePicker(props) {
   }, props));
 };
 /* harmony default export */ var src_date_picker_date_picker_0 = (function (props) {
-  return use_field_common(props, BaseDatePicker);
+  var _useConfig = useConfig(),
+    locale = _useConfig.locale;
+
+  // datepicker 默认值需要提格式化前处理，否则内部会根据 format 进行格式化并再次触发 onChange，参考 v1 v2 的 value hoc 行为
+  var defaultValue = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (props.defaultValue) {
+      var options = {
+        timeZone: props.timeZone,
+        weekStartsOn: Number(getLocale(locale, 'startOfWeek'))
+      };
+      var type = props.type || 'date';
+      var format = use_datepicker_format_getFormat(props.format, type);
+      var dateArr = convertValueToDateArr(props.defaultValue, format, options);
+      var formattedDefaultValue = getFormatValueArr({
+        dateArr: dateArr,
+        format: format,
+        type: type,
+        options: options
+      });
+      return props.range ? formattedDefaultValue : formattedDefaultValue[0];
+    }
+    return props.defaultValue;
+  }, []);
+  return use_field_common(objectSpread2_default()(objectSpread2_default()({}, props), {}, {
+    defaultValue: defaultValue
+  }), BaseDatePicker);
 });
 ;// CONCATENATED MODULE: ./src/date-picker/index.ts
 
@@ -49533,7 +49572,8 @@ var useForm = function useForm(props) {
       resetTime: 0,
       mounted: false,
       unmounted: false,
-      removeLock: false
+      removeLock: false,
+      settingMap: {}
     }),
     context = _React$useRef.current;
   var update = function update(name) {
@@ -49770,6 +49810,8 @@ 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) {
@@ -49780,6 +49822,13 @@ var useForm = function useForm(props) {
           });
         }
       });
+
+      // 设置 settingMap 的值为 false，表示该字段设置值完成
+      setTimeout(function () {
+        values.forEach(function (key) {
+          delete context.settingMap[key];
+        });
+      });
     });
 
     // 获取vals的所有key,包括嵌套对象的key
@@ -49960,11 +50009,18 @@ var useForm = function useForm(props) {
       context.updateMap[n].add(updateFn);
       var shouldTriggerResetChange = context.removeArr.has(n);
       context.removeArr.delete(n);
-      var shouldTriggerDefaultChange = df !== undefined && deepGet(context.value, n) === undefined;
+      var currentValue = deepGet(context.value, n);
+      var shouldTriggerDefaultChange = df !== undefined && currentValue === undefined;
       if (shouldTriggerDefaultChange || shouldTriggerResetChange) {
         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, df, deepSetOptions);
+          deepSet(v, n, _defaultValue, deepSetOptions);
         });
         update(n);
       }
@@ -70121,7 +70177,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.7-beta.5'
+  version: '3.6.7-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;