shineout 3.5.3-beta.7 → 3.5.3-beta.9

package/cjs/index.js

@@ -500,5 +500,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.5.3-beta.7'
+  version: '3.5.3-beta.9'
 };

package/dist/shineout.js

@@ -12030,7 +12030,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.5.3-beta.7');
+/* harmony default export */ var version = ('3.5.3-beta.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -42234,7 +42234,13 @@ function util_toDate(day, options) {
 function getDaysOfMonth(dirtyDate, options) {
   var date = util_toDate(dirtyDate, options);
   var temp = dayjs_min_default()(transDateWithZone(date, options));
-  var current = dayjs_min_default()(transDateWithZone(date, options)).locale(getDayJsLocate(options)).startOf('month').startOf('week').hour(temp.hour()).minute(temp.minute()).second(temp.second()).millisecond(temp.millisecond());
+  var current = dayjs_min_default()(transDateWithZone(date, options)).locale(getDayJsLocate(options)).startOf('month');
+  if (options.weekStartsOn === 1) {
+    current = current.startOf('isoWeek'); // ISO week starts on Monday
+  } else {
+    current = current.startOf('week'); // Default week starts on Sunday
+  }
+  current = current.hour(temp.hour()).minute(temp.minute()).second(temp.second()).millisecond(temp.millisecond());
   var days = [];
   var index = 0;
   while (index < 42) {
@@ -43450,7 +43456,7 @@ var Day = function Day(props) {
     length: 7
   }).map(function (_, index) {
     // weekStartsOn可能是字符串，需要转换为数字，否则得到星期顺序不正确
-    var num = (props.options.weekStartsOn + index) % 7;
+    var num = (Number(props.options.weekStartsOn) + index) % 7;
     return weeks[num];
   });
   var renderWeek = function renderWeek(item) {
@@ -43605,9 +43611,6 @@ var Day = function Day(props) {
             length: len
           }).map(function (_, index) {
             var start = index * 7;
-            // console.log('======================')
-            // console.log('days, start, days[start + 3]: >>', days, start, days[start + 3])
-            // console.log('======================')
             return /*#__PURE__*/(0,jsx_runtime.jsxs)("tr", {
               className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerRow, props.type === 'week' && (styles === null || styles === void 0 ? void 0 : styles.pickerRowWeek)),
               children: [renderWeek(days[start + 3]), days.slice(start, start + 7).map(function (item, index) {
@@ -44861,7 +44864,8 @@ var DatePicker = function DatePicker(props0) {
   }
   var options = {
     timeZone: props.timeZone,
-    weekStartsOn: getLocale(locale, 'startOfWeek')
+    // 需要确保 weekStartsOn 是 number，否则后续的星期顺序计算都会出错
+    weekStartsOn: Number(getLocale(locale, 'startOfWeek'))
   };
   var inputAbleResult = useInputAble({
     value: props.value,
@@ -66968,7 +66972,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.3-beta.7'
+  version: '3.5.3-beta.9'
 });
 }();
 /******/ 	return __webpack_exports__;