vxe-pc-ui 4.3.56 → 4.3.58

package/lib/index.umd.js

@@ -2338,7 +2338,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/core.js
-const coreVersion = "4.0.27";
+const coreVersion = "4.0.28";
 const VxeCore = {
   coreVersion,
   uiVersion: '',
@@ -2876,7 +2876,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-const version = "4.0.27";
+const version = "4.0.28";
 const log = {
   create: createLog,
   warn: createLog('warn', `v${version}`),
@@ -4140,14 +4140,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.3.56"}`;
+const log_version = `ui v${"4.3.58"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.3.56";
+const ui_version = "4.3.58";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -11070,15 +11070,19 @@ function toFloatValueFixed(inputValue, digitsValue) {
         dLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(dValue, dateLabelFormat, {
           firstDay: firstDayOfWeek
         });
-        // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+        // 周选择器，由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年，例如
+        // '2024-12-31' 'yyyy-MM-dd W' >> '2024-12-31 1'
+        // '2025-01-01' 'yyyy-MM-dd W' >> '2025-01-01 1'
         if (dateLabelFormat && type === 'week') {
-          const firstWeekDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek);
-          if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+          const weekNum = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(dValue, firstDayOfWeek);
+          const weekDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(dValue, 0, weekNum === 1 ? (6 + firstDayOfWeek) % 7 : firstDayOfWeek, firstDayOfWeek);
+          const weekFullYear = weekDate.getFullYear();
+          if (weekFullYear !== dValue.getFullYear()) {
             const yyIndex = dateLabelFormat.indexOf('yyyy');
             if (yyIndex > -1) {
               const yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4));
               if (yyNum && !isNaN(yyNum)) {
-                dLabel = dLabel.replace(`${yyNum}`, `${yyNum - 1}`);
+                dLabel = dLabel.replace(`${yyNum}`, `${weekFullYear}`);
               }
             }
           }
@@ -11137,7 +11141,10 @@ function toFloatValueFixed(inputValue, digitsValue) {
       reactData.inputValue = props.multiple ? computeDateMultipleLabel.value : reactData.datePanelLabel;
     };
     const dateCheckMonth = date => {
-      const month = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(date, 0, 'first');
+      const firstDayOfWeek = computeFirstDayOfWeek.value;
+      const weekNum = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(date, firstDayOfWeek);
+      const weekStartDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(date, 0, firstDayOfWeek, firstDayOfWeek);
+      const month = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(weekNum === 1 ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(weekStartDate, 6) : date, 0, 'first');
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(month, reactData.selectMonth)) {
         reactData.selectMonth = month;
       }
@@ -11454,7 +11461,11 @@ function toFloatValueFixed(inputValue, digitsValue) {
     };
     // 日期
     const dateMonthHandle = (date, offsetMonth) => {
-      reactData.selectMonth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(date, offsetMonth, 'first');
+      const firstDayOfWeek = computeFirstDayOfWeek.value;
+      const weekNum = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(date, firstDayOfWeek);
+      const weekStartDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(date, 0, firstDayOfWeek, firstDayOfWeek);
+      const month = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(weekNum === 1 ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(weekStartDate, 6) : date, offsetMonth, 'first');
+      reactData.selectMonth = month;
     };
     const dateNowHandle = () => {
       const currentDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');
@@ -14898,15 +14909,19 @@ const Countdown = VxeCountdown;
         dLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(dValue, dateLabelFormat, {
           firstDay: firstDayOfWeek
         });
-        // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+        // 周选择器，由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年，例如
+        // '2024-12-31' 'yyyy-MM-dd W' >> '2024-12-31 1'
+        // '2025-01-01' 'yyyy-MM-dd W' >> '2025-01-01 1'
         if (dateLabelFormat && type === 'week') {
-          const firstWeekDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek);
-          if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+          const weekNum = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(dValue, firstDayOfWeek);
+          const weekDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(dValue, 0, weekNum === 1 ? (6 + firstDayOfWeek) % 7 : firstDayOfWeek, firstDayOfWeek);
+          const weekFullYear = weekDate.getFullYear();
+          if (weekFullYear !== dValue.getFullYear()) {
             const yyIndex = dateLabelFormat.indexOf('yyyy');
             if (yyIndex > -1) {
               const yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4));
               if (yyNum && !isNaN(yyNum)) {
-                dLabel = dLabel.replace(`${yyNum}`, `${yyNum - 1}`);
+                dLabel = dLabel.replace(`${yyNum}`, `${weekFullYear}`);
               }
             }
           }
@@ -14944,7 +14959,10 @@ const Countdown = VxeCountdown;
       reactData.inputValue = props.multiple ? computeDateMultipleLabel.value : reactData.datePanelLabel;
     };
     const dateCheckMonth = date => {
-      const month = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(date, 0, 'first');
+      const firstDayOfWeek = computeFirstDayOfWeek.value;
+      const weekNum = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(date, firstDayOfWeek);
+      const weekStartDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(date, 0, firstDayOfWeek, firstDayOfWeek);
+      const month = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(weekNum === 1 ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(weekStartDate, 6) : date, 0, 'first');
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(month, reactData.selectMonth)) {
         reactData.selectMonth = month;
       }
@@ -15108,7 +15126,11 @@ const Countdown = VxeCountdown;
     };
     // 日期
     const dateMonthHandle = (date, offsetMonth) => {
-      reactData.selectMonth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(date, offsetMonth, 'first');
+      const firstDayOfWeek = computeFirstDayOfWeek.value;
+      const weekNum = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(date, firstDayOfWeek);
+      const weekStartDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(date, 0, firstDayOfWeek, firstDayOfWeek);
+      const month = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(weekNum === 1 ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(weekStartDate, 6) : date, offsetMonth, 'first');
+      reactData.selectMonth = month;
     };
     const dateNowHandle = () => {
       const currentDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(Date.now(), 0, 'first');