sard-uniapp 1.17.1 → 1.18.0

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [1.18.0](https://github.com/sutras/sard-uniapp/compare/v1.17.1...v1.18.0) (2025-06-06)
+
+
+### Features
+
+* datetime-picker 组件新增农历类型 ([7b0f305](https://github.com/sutras/sard-uniapp/commit/7b0f305f57ff43f322ef4a398f95415a5a9e01e0))
+* dropdown-item 组件新增显隐动画相关事件 ([83e8c52](https://github.com/sutras/sard-uniapp/commit/83e8c52e996bdc4901ea446b30d9273d0e5e956d))
+* icon支持冒号分隔符名称属性 ([7ffcd90](https://github.com/sutras/sard-uniapp/commit/7ffcd9056e006cc353aadf5cb2831edde9515719))
+
+
+
 ## [1.17.1](https://github.com/sutras/sard-uniapp/compare/v1.17.0...v1.17.1) (2025-05-30)
 
 

package/components/button/button.vue

@@ -42,7 +42,7 @@
       <sar-icon
         v-else-if="icon"
         :name="icon"
-        :family="iconFamily || 'sari'"
+        :family="iconFamily"
         :size="iconSize"
       />
     </view>

package/components/calendar-month/calendar-month.vue

@@ -34,9 +34,9 @@
 import { defineComponent as _defineComponent } from "vue";
 import { computed } from "vue";
 import {
-  getDaysInMonth,
-  getOffsetDaysFromFirstDay,
-  getDayOnFirstOfMonth,
+  getMonthDays,
+  getOffsetDaysFromMonthStart,
+  getWeekOfMonthStart,
   getPadStartDays,
   getPadEndDays,
   toDateNumber,
@@ -72,11 +72,11 @@ export default  _defineComponent({
     const props = __props;
     const emit = __emit;
     const days = computed(() => {
-      return getDaysInMonth(props.year, props.month);
+      return getMonthDays(props.year, props.month + 1);
     });
     const offsetDays = computed(() => {
-      return getOffsetDaysFromFirstDay(
-        getDayOnFirstOfMonth(props.year, props.month),
+      return getOffsetDaysFromMonthStart(
+        getWeekOfMonthStart(props.year, props.month + 1),
         props.weekStartsOn
       );
     });
@@ -87,12 +87,12 @@ export default  _defineComponent({
       }
       const padStartDays = getPadStartDays(
         props.year,
-        props.month,
+        props.month + 1,
         offsetDays.value
       );
       const padEndDays = getPadEndDays(
         props.year,
-        props.month,
+        props.month + 1,
         42 - offsetDays.value - days.value
       );
       return [...padStartDays, ...currentDays, ...padEndDays];

package/components/config/index.d.ts

@@ -115,6 +115,7 @@ export declare const defaultConfig: {
     };
     datetimePicker: {
         type: string;
+        calendar: "solar";
     };
     datetimePickerPopout: {
         validateEvent: boolean;

package/components/config/index.js

@@ -77,6 +77,7 @@ export const defaultConfig = {
     },
     datetimePicker: {
         type: 'yMd',
+        calendar: 'solar',
     },
     datetimePickerPopout: {
         validateEvent: true,

package/components/datetime-picker/common.d.ts

@@ -4,6 +4,7 @@ export interface DatetimePickerProps {
     rootStyle?: StyleValue;
     rootClass?: string;
     type?: string;
+    calendar?: 'solar' | 'lunar';
     min?: Date | string;
     max?: Date | string;
     modelValue?: Date | string;
@@ -13,6 +14,7 @@ export interface DatetimePickerProps {
 }
 export declare const defaultDatetimePickerProps: {
     type: string;
+    calendar: "solar";
 };
 export interface DatetimePickerSlots extends PickerSlots {
 }
@@ -42,8 +44,10 @@ interface Strategies {
 }
 export declare const strategies: Strategies;
 export declare const letterArray: DatetimeLetter[];
-export declare function getBoundaryValue(isMax: boolean, endDate: Date, currentDate: Date): number[];
-export declare function correctDate(date: DateEvery, minDate: Date, maxDate: Date): void;
-export declare const getColumnData: (count: number, start: number, length: number, letter: DatetimeLetter, currentDate: Date, translate: (...args: any[]) => any, filter?: (letter: DatetimeLetter, value: number, date: Date, index: number) => boolean, formatter?: (letter: DatetimeLetter, option: DatetimeColumnOption, date: Date, index: number) => string | void | undefined) => DatetimeColumnOption[];
+export declare function getBoundaryValue(calendar: 'solar' | 'lunar', isMax: boolean, endDate: Date, currentDate: Date): number[];
+export declare function correctSolarDate(date: DateEvery, minDate: Date, maxDate: Date): void;
+export declare function correctLunarDate(date: DateEvery, minDate: Date, maxDate: Date): void;
+export declare function correctDate(calendar: 'solar' | 'lunar', date: DateEvery, minDate: Date, maxDate: Date): void;
+export declare const getColumnData: (calendar: "solar" | "lunar", min: number, max: number, length: number, letter: DatetimeLetter, currentDate: Date, translate: (...args: any[]) => any, filter?: (letter: DatetimeLetter, value: number, date: Date, index: number) => boolean, formatter?: (letter: DatetimeLetter, option: DatetimeColumnOption, date: Date, index: number) => string | void | undefined) => DatetimeColumnOption[];
 export declare function getInitialValue(minDate: Date, maxDate: Date): Date;
 export {};

package/components/datetime-picker/common.js

@@ -1,4 +1,4 @@
-import { getDaysInMonth, minmax } from '../../utils';
+import { getLunarDayName, getLunarLeapMonth, getLunarLeapMonthDays, getLunarMonthDays, getLunarMonthName, getMonthDays, minmax, solarToLunar, } from '../../utils';
 import { defaultConfig } from '../config';
 export const defaultDatetimePickerProps = defaultConfig.datetimePicker;
 export const getMinDate = () => {
@@ -16,7 +16,7 @@ export const strategies = {
     s: [5, 2, 0, 59, (d) => d.getSeconds(), (d, val) => d.setSeconds(val)],
 };
 export const letterArray = ['y', 'M', 'd', 'h', 'm', 's'];
-export function getBoundaryValue(isMax, endDate, currentDate) {
+function getSolarBoundaryValue(isMax, endDate, currentDate) {
     const currEvery = [endDate.getFullYear()];
     const minOrMaxIndex = isMax ? 3 : 2;
     let aside = true;
@@ -25,7 +25,7 @@ export function getBoundaryValue(isMax, endDate, currentDate) {
         const strategy = strategies[letter];
         let minOrMax = strategy[minOrMaxIndex];
         if (isMax && letter === 'd') {
-            minOrMax = getDaysInMonth(currentDate.getFullYear(), currentDate.getMonth());
+            minOrMax = getMonthDays(currentDate.getFullYear(), currentDate.getMonth() + 1);
         }
         aside = aside && currEvery[index] === prevGetter(currentDate);
         currEvery[index + 1] = aside ? strategy[4](endDate) : minOrMax;
@@ -33,7 +33,56 @@ export function getBoundaryValue(isMax, endDate, currentDate) {
     });
     return currEvery;
 }
-export function correctDate(date, minDate, maxDate) {
+function getLunarBoundaryValue(isMax, endDate, currentDate) {
+    const lunarDate = solarToLunar(currentDate.getFullYear(), currentDate.getMonth() + 1, currentDate.getDate());
+    const lunarEndDate = solarToLunar(endDate.getFullYear(), endDate.getMonth() + 1, endDate.getDate());
+    const currEvery = [lunarEndDate.year];
+    const minOrMaxIndex = isMax ? 3 : 2;
+    let aside = true;
+    let prevGetter = strategies.y[4];
+    letterArray.slice(1).forEach((letter, index) => {
+        const prevValue = currEvery[index];
+        const strategy = strategies[letter];
+        const currGetter = strategy[4];
+        let minOrMax = strategy[minOrMaxIndex];
+        if (isMax && letter === 'd') {
+            minOrMax =
+                lunarDate.month < 0
+                    ? getLunarLeapMonthDays(lunarDate.year)
+                    : getLunarMonthDays(lunarDate.year, lunarDate.month);
+        }
+        let asideValue = 0;
+        if (aside) {
+            if (letter === 'M') {
+                aside = lunarDate.year === prevValue;
+                if (aside) {
+                    asideValue = lunarEndDate.month;
+                }
+            }
+            else if (letter === 'd') {
+                aside = lunarDate.month === prevValue;
+                if (aside) {
+                    asideValue = lunarEndDate.day;
+                }
+            }
+            else {
+                aside = prevGetter(currentDate) === prevValue;
+                if (aside) {
+                    asideValue = currGetter(currentDate);
+                }
+            }
+        }
+        currEvery[index + 1] = aside ? asideValue : minOrMax;
+        prevGetter = currGetter;
+    });
+    return currEvery;
+}
+export function getBoundaryValue(calendar, isMax, endDate, currentDate) {
+    return calendar === 'solar'
+        ? getSolarBoundaryValue(isMax, endDate, currentDate)
+        : getLunarBoundaryValue(isMax, endDate, currentDate);
+}
+export function correctSolarDate(date, minDate, maxDate) {
     let minAside = true;
     let maxAside = true;
     let prevGetter = strategies.y[4];
@@ -42,7 +91,7 @@ export function correctDate(date, minDate, maxDate) {
         let minValue = strategy[2];
         let maxValue = strategy[3];
         if (letter === 'd') {
-            maxValue = getDaysInMonth(date[0], date[1] - 1);
+            maxValue = getMonthDays(date[0], date[1]);
         }
         const currGetter = strategy[4];
         if ((minAside = minAside && prevGetter(minDate) === date[index])) {
@@ -55,18 +104,141 @@ export function correctDate(date, minDate, maxDate) {
         prevGetter = currGetter;
     });
 }
-export const getColumnData = (count, start, length, letter, currentDate, translate, filter, formatter) => {
-    let column = Array(count)
+export function correctLunarDate(date, minDate, maxDate) {
+    const lunarMinDate = solarToLunar(minDate.getFullYear(), minDate.getMonth() + 1, minDate.getDate());
+    const lunarMaxDate = solarToLunar(maxDate.getFullYear(), maxDate.getMonth() + 1, maxDate.getDate());
+    const range = [
+        {
+            value: 0,
+            edge: true,
+            date: minDate,
+            lunarDate: lunarMinDate,
+        },
+        {
+            value: 0,
+            edge: true,
+            date: maxDate,
+            lunarDate: lunarMaxDate,
+        },
+    ];
+    let prevGetter = strategies.y[4];
+    letterArray.slice(1).forEach((letter, index) => {
+        const prevValue = date[index];
+        const currIndex = index + 1;
+        const currValue = date[currIndex];
+        const strategy = strategies[letter];
+        range[0].value = strategy[2];
+        range[1].value = strategy[3];
+        if (letter === 'd') {
+            range[1].value =
+                date[1] < 0
+                    ? getLunarLeapMonthDays(date[0])
+                    : getLunarMonthDays(date[0], date[1]);
+        }
+        let currGetter = strategy[4];
+        range.forEach((point) => {
+            if (point.edge) {
+                if (letter === 'M') {
+                    point.edge = point.lunarDate.year === prevValue;
+                    if (point.edge) {
+                        point.value = point.lunarDate.month;
+                    }
+                }
+                else if (letter === 'd') {
+                    point.edge = point.lunarDate.month === prevValue;
+                    if (point.edge) {
+                        point.value = point.lunarDate.day;
+                    }
+                }
+                else {
+                    point.edge = prevGetter(point.date) === prevValue;
+                    if (point.edge) {
+                        point.value = currGetter(point.date);
+                    }
+                }
+            }
+        });
+        if (letter === 'M') {
+            let min = range[0].value;
+            let max = range[1].value;
+            let value = currValue;
+            if (min < 0) {
+                min = Math.abs(min) + 0.5;
+            }
+            else if (max < 0) {
+                max = Math.abs(max) + 0.5;
+            }
+            if (value < 0) {
+                value = Math.abs(value) + 0.5;
+            }
+            value = minmax(value, min, max);
+            date[currIndex] = value % 1 === 0.5 ? ~~value * -1 : value;
+        }
+        else {
+            date[currIndex] = minmax(currValue, range[0].value, range[1].value);
+        }
+        if (letter === 'd') {
+            currGetter = (date) => {
+                return date === minDate ? lunarMinDate.day : lunarMaxDate.day;
+            };
+        }
+        prevGetter = currGetter;
+    });
+}
+export function correctDate(calendar, date, minDate, maxDate) {
+    if (calendar === 'solar') {
+        correctSolarDate(date, minDate, maxDate);
+    }
+    else {
+        correctLunarDate(date, minDate, maxDate);
+    }
+}
+export const getColumnData = (calendar, min, max, length, letter, currentDate, translate, filter, formatter) => {
+    const lunarDate = solarToLunar(currentDate.getFullYear(), currentDate.getMonth() + 1, currentDate.getDate());
+    let column = Array(Math.abs(max) - Math.abs(min) + 1)
         .fill(0)
         .map((_, i) => ({
-        value: i + start,
+        value: i + Math.abs(min),
     }));
+    if (calendar === 'lunar' && letter === 'M') {
+        if (min < 0) {
+            column[0].value = min;
+        }
+        else if (max < 0) {
+            column.push({
+                value: max,
+            });
+        }
+        else {
+            const leapMonth = getLunarLeapMonth(lunarDate.year);
+            if (leapMonth > 0 && leapMonth > min && leapMonth < max) {
+                column.splice(column.findIndex((item) => item.value === leapMonth) + 1, 0, {
+                    value: -leapMonth,
+                });
+            }
+        }
+    }
     if (filter) {
         column = column.filter((option, i) => filter(letter, option.value, currentDate, i));
     }
     column.forEach((option) => {
         option.zerofill = String(option.value).padStart(length, '0');
-        option.label = option.zerofill + translate(letter);
+        if (calendar === 'solar') {
+            option.label = option.zerofill + translate(letter);
+        }
+        else {
+            switch (letter) {
+                case 'M':
+                    option.label = getLunarMonthName(Math.abs(option.value), option.value < 0);
+                    break;
+                case 'd':
+                    option.label = getLunarDayName(option.value);
+                    break;
+                default:
+                    option.label = option.zerofill + translate(letter);
+                    break;
+            }
+        }
     });
     if (formatter) {
         column.forEach((option, i) => {

package/components/datetime-picker/datetime-picker.d.ts

@@ -8,6 +8,7 @@ declare const __VLS_component: import("vue").DefineComponent<DatetimePickerProps
     onChange?: ((date: string | Date) => any) | undefined;
 }>, {
     type: string;
+    calendar: "solar" | "lunar";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/components/datetime-picker/datetime-picker.vue

@@ -11,7 +11,14 @@
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
 import { computed, ref, watch } from "vue";
-import { classNames, formatDate, stringifyStyle, toDate } from "../../utils";
+import {
+  classNames,
+  formatDate,
+  lunarToSolar,
+  solarToLunar,
+  stringifyStyle,
+  toDate
+} from "../../utils";
 import SarPicker from "../picker/picker.vue";
 import {
   correctDate,
@@ -39,6 +46,7 @@ export default  _defineComponent({
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     type: { type: String, required: false },
+    calendar: { type: String, required: false },
     min: { type: [Date, String], required: false },
     max: { type: [Date, String], required: false },
     modelValue: { type: [Date, String], required: false },
@@ -53,14 +61,20 @@ export default  _defineComponent({
     const emit = __emit;
     const { t } = useTranslate("datetimePicker");
     const createColumnData = (types, currentDate) => {
-      minValues = getBoundaryValue(false, minDate.value, currentDate);
-      maxValues = getBoundaryValue(true, maxDate.value, currentDate);
+      minValues = getBoundaryValue(
+        props.calendar,
+        false,
+        minDate.value,
+        currentDate
+      );
+      maxValues = getBoundaryValue(props.calendar, true, maxDate.value, currentDate);
       const getColumnDataByType = (letter) => {
         const strategy = strategies[letter];
         const index = strategy[0];
         return getColumnData(
-          maxValues[index] - minValues[index] + 1,
+          props.calendar,
           minValues[index],
+          maxValues[index],
           strategy[1],
           letter,
           currentDate,
@@ -74,14 +88,24 @@ export default  _defineComponent({
       );
     };
     const getChangedLetter = (currentDate) => {
-      const min = getBoundaryValue(false, minDate.value, currentDate);
-      const max = getBoundaryValue(true, maxDate.value, currentDate);
+      const min = getBoundaryValue(
+        props.calendar,
+        false,
+        minDate.value,
+        currentDate
+      );
+      const max = getBoundaryValue(props.calendar, true, maxDate.value, currentDate);
       return letterArray.filter(
         (_, i) => min[i] !== minValues[i] || max[i] !== maxValues[i]
       );
     };
+    let lunarYearChanged = false;
     const updateColumns = (currentDate) => {
       const changedLetter = getChangedLetter(currentDate);
+      if (props.calendar === "lunar" && !changedLetter.includes("M") && innerType.value.includes("M") && lunarYearChanged) {
+        changedLetter.push("M");
+        lunarYearChanged = false;
+      }
       if (changedLetter.length) {
         const changedColumns = createColumnData(changedLetter, currentDate);
         const nextColumns = innerType.value.map((letter) => {
@@ -96,18 +120,66 @@ export default  _defineComponent({
       }
     };
     const getDateByPickerValue = (value) => {
-      const currEvery = letterArray.map((letter) => {
-        const stratery = strategies[letter];
-        for (let i = 0, l = innerType.value.length; i < l; i++) {
-          if (innerType.value[i] === letter) {
-            return value[i];
+      let currEvery;
+      if (props.calendar === "solar") {
+        currEvery = letterArray.map((letter) => {
+          const stratery = strategies[letter];
+          for (let i = 0, l = innerType.value.length; i < l; i++) {
+            if (innerType.value[i] === letter) {
+              return value[i];
+            }
           }
+          return stratery[4](innerValue.value);
+        });
+      } else {
+        const lunarDate = solarToLunar(
+          innerValue.value.getFullYear(),
+          innerValue.value.getMonth() + 1,
+          innerValue.value.getDate()
+        );
+        const yearIndex = innerType.value.indexOf("y");
+        if (yearIndex !== -1) {
+          lunarYearChanged = lunarDate.year !== value[yearIndex];
         }
-        return stratery[4](innerValue.value);
-      });
-      correctDate(currEvery, minDate.value, maxDate.value);
-      currEvery[1]--;
-      const date = new Date(...currEvery);
+        currEvery = letterArray.map((letter) => {
+          for (let i = 0, l = innerType.value.length; i < l; i++) {
+            if (innerType.value[i] === letter) {
+              return value[i];
+            }
+          }
+          switch (letter) {
+            case "y":
+              return lunarDate.year;
+            case "M":
+              return lunarDate.month;
+            case "d":
+              return lunarDate.day;
+            default:
+              return strategies[letter][4](innerValue.value);
+          }
+        });
+      }
+      correctDate(
+        props.calendar,
+        currEvery,
+        minDate.value,
+        maxDate.value
+      );
+      let date;
+      if (props.calendar === "solar") {
+        currEvery[1]--;
+        date = new Date(...currEvery);
+      } else {
+        const solarDate = lunarToSolar(currEvery[0], currEvery[1], currEvery[2]);
+        date = new Date(
+          solarDate.year,
+          solarDate.month - 1,
+          solarDate.day,
+          currEvery[3],
+          currEvery[4],
+          currEvery[5]
+        );
+      }
       return date;
     };
     const normalizeValue = (value) => {
@@ -153,9 +225,29 @@ export default  _defineComponent({
       }
     });
     const pickerValue = computed(() => {
-      return innerType.value.map((letter) => {
-        return strategies[letter][4](innerValue.value);
-      });
+      if (props.calendar === "solar") {
+        return innerType.value.map((letter) => {
+          return strategies[letter][4](innerValue.value);
+        });
+      } else {
+        const lunarDate = solarToLunar(
+          innerValue.value.getFullYear(),
+          innerValue.value.getMonth() + 1,
+          innerValue.value.getDate()
+        );
+        return innerType.value.map((letter) => {
+          switch (letter) {
+            case "y":
+              return lunarDate.year;
+            case "M":
+              return lunarDate.month;
+            case "d":
+              return lunarDate.day;
+            default:
+              return strategies[letter][4](innerValue.value);
+          }
+        });
+      }
     });
     const columnsMap = {};
     let minValues = [];
@@ -168,7 +260,11 @@ export default  _defineComponent({
       updateColumns(nextValue);
       emitChange();
     };
-    const __returned__ = { props, emit, t, createColumnData, getChangedLetter, updateColumns, getDateByPickerValue, normalizeValue, innerType, minDate, maxDate, innerValue, get currentEmitValue() {
+    const __returned__ = { props, emit, t, createColumnData, getChangedLetter, get lunarYearChanged() {
+      return lunarYearChanged;
+    }, set lunarYearChanged(v) {
+      lunarYearChanged = v;
+    }, updateColumns, getDateByPickerValue, normalizeValue, innerType, minDate, maxDate, innerValue, get currentEmitValue() {
       return currentEmitValue;
     }, set currentEmitValue(v) {
       currentEmitValue = v;

package/components/datetime-picker-input/common.d.ts

@@ -6,6 +6,7 @@ export interface DatetimePickerInputProps extends DatetimePickerPopoutProps, Omi
 export declare const defaultDatetimePickerInputProps: () => {
     validateEvent: boolean;
     type: string;
+    calendar: "solar";
 };
 export interface DatetimePickerInputSlots extends DatetimePickerPopoutSlots {
 }

package/components/datetime-picker-input/datetime-picker-input.d.ts

@@ -11,6 +11,7 @@ declare const __VLS_component: import("vue").DefineComponent<DatetimePickerInput
 }>, {
     type: string;
     validateEvent: boolean;
+    calendar: "solar" | "lunar";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/components/datetime-picker-input/datetime-picker-input.vue

@@ -24,6 +24,7 @@
       :formatter="formatter"
       :value-format="valueFormat"
       :validate-event="validateEvent"
+      :calendar="calendar"
       @change="onChange"
     />
   </sar-popout-input>
@@ -62,6 +63,7 @@ export default  _defineComponent({
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     type: { type: String, required: false },
+    calendar: { type: String, required: false },
     min: { type: [Date, String], required: false },
     max: { type: [Date, String], required: false },
     modelValue: { type: [Date, String], required: false },

package/components/datetime-picker-popout/common.d.ts

@@ -10,6 +10,7 @@ export interface DatetimePickerPopoutProps extends DatetimePickerProps {
 export declare const defaultDatetimePickerPopoutProps: () => {
     validateEvent: boolean;
     type: string;
+    calendar: "solar";
 };
 export interface DatetimePickerPopoutSlots extends DatetimePickerSlots {
 }

package/components/datetime-picker-popout/datetime-picker-popout.d.ts

@@ -11,6 +11,7 @@ declare const __VLS_component: import("vue").DefineComponent<DatetimePickerPopou
 }>, {
     type: string;
     validateEvent: boolean;
+    calendar: "solar" | "lunar";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/components/datetime-picker-popout/datetime-picker-popout.vue

@@ -18,6 +18,7 @@
         :filter="filter"
         :formatter="formatter"
         :value-format="valueFormat"
+        :calendar="calendar"
         @change="onChange"
       />
     </template>
@@ -60,6 +61,7 @@ export default  _defineComponent({
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     type: { type: String, required: false },
+    calendar: { type: String, required: false },
     min: { type: [Date, String], required: false },
     max: { type: [Date, String], required: false },
     modelValue: { type: [Date, String], required: false },

package/components/datetime-range-picker/datetime-range-picker.vue

@@ -69,6 +69,7 @@ export default  _defineComponent({
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     type: { type: String, required: false },
+    calendar: { type: String, required: false },
     min: { type: [Date, String], required: false },
     max: { type: [Date, String], required: false },
     filter: { type: Function, required: false },

package/components/datetime-range-picker-input/datetime-range-picker-input.vue

@@ -66,6 +66,7 @@ export default  _defineComponent({
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     type: { type: String, required: false },
+    calendar: { type: String, required: false },
     min: { type: [Date, String], required: false },
     max: { type: [Date, String], required: false },
     filter: { type: Function, required: false },

package/components/datetime-range-picker-popout/datetime-range-picker-popout.vue

@@ -63,6 +63,7 @@ export default  _defineComponent({
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     type: { type: String, required: false },
+    calendar: { type: String, required: false },
     min: { type: [Date, String], required: false },
     max: { type: [Date, String], required: false },
     filter: { type: Function, required: false },

package/components/dropdown/common.d.ts

@@ -1,4 +1,5 @@
 import { type StyleValue, type Ref } from 'vue';
+import { type TransitionHookEmits } from '../popup/common';
 export interface DropdownProps {
     rootStyle?: StyleValue;
     rootClass?: string;
@@ -40,7 +41,7 @@ export declare const defaultDropdownItemProps: {
 export interface DropdownItemSlots {
     default?(props: Record<string, never>): any;
 }
-export interface DropdownItemEmits {
+export interface DropdownItemEmits extends TransitionHookEmits {
     (e: 'update:model-value', value: any): void;
     (e: 'change', value: any): void;
     (e: 'update:visible', visible: boolean): void;

package/components/dropdown-item/dropdown-item.d.ts

@@ -1,13 +1,11 @@
 import { type DropdownItemProps, type DropdownItemSlots, type DropdownOption } from '../dropdown/common';
 declare function __VLS_template(): Readonly<DropdownItemSlots> & DropdownItemSlots;
-declare const __VLS_component: import("vue").DefineComponent<DropdownItemProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    "update:model-value": (value: any) => any;
-    change: (value: any) => any;
-    "update:visible": (visible: boolean) => any;
+declare const __VLS_component: import("vue").DefineComponent<DropdownItemProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    [x: string]: any;
+} & {
+    [x: string]: any;
 }, string, import("vue").PublicProps, Readonly<DropdownItemProps> & Readonly<{
-    "onUpdate:model-value"?: ((value: any) => any) | undefined;
-    onChange?: ((value: any) => any) | undefined;
-    "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
+    [x: `on${Capitalize<any>}`]: ((...args: any) => any) | undefined;
 }>, {
     options: DropdownOption[];
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/components/dropdown-item/dropdown-item.vue

@@ -128,7 +128,7 @@ export default  _defineComponent({
     separator: { type: String, required: false },
     placeholder: { type: String, required: false }
   }, defaultDropdownItemProps),
-  emits: ["update:model-value", "change", "update:visible"],
+  emits: ["update:model-value", "change", "update:visible", "before-enter", "enter", "after-enter", "enter-cancelled", "before-leave", "leave", "after-leave", "leave-cancelled", "visible-hook"],
   setup(__props, { expose: __expose, emit: __emit }) {
     __expose();
     const props = __props;
@@ -254,6 +254,8 @@ export default  _defineComponent({
           if (name === "after-leave") {
             onAfterLeave();
           }
+          emit("visible-hook", name);
+          emit(name);
         }
       })
     );

package/components/empty/empty.vue

@@ -2,7 +2,7 @@
   <view :class="emptyClass" :style="emptyStyle">
     <view :class="bem.e('icon')" :style="iconStyle">
       <slot name="icon">
-        <sar-icon :family="iconFamily || 'sari'" :name="icon" />
+        <sar-icon :family="iconFamily" :name="icon" />
       </slot>
     </view>
     <slot name="description">

package/components/fab/fab.vue

@@ -27,7 +27,7 @@
             stringifyStyle({ background: item.background, color: item.color })
           "
         >
-          <sar-icon :family="item.iconFamily || 'sari'" :name="item.icon" />
+          <sar-icon :family="item.iconFamily" :name="item.icon" />
         </view>
       </view>
     </view>

package/components/grid-item/grid-item.vue

@@ -14,7 +14,7 @@
                   :name="icon"
                   :color="iconColor"
                   :size="iconSize"
-                  :family="iconFamily || 'sari'"
+                  :family="iconFamily"
                 />
               </slot>
             </view>

package/components/icon/icon.vue

@@ -33,12 +33,17 @@ export default  _defineComponent({
       return isFileUrl(props.name);
     });
     const iconClass = computed(() => {
+      if (isImg.value) {
+        return classNames(bem.b(), props.rootClass);
+      }
+      if (props.name.includes(":")) {
+        const [family, name] = props.name.split(":");
+        return classNames(bem.b(), family, `${family}-${name}`, props.rootClass);
+      }
       return classNames(
         bem.b(),
-        {
-          [props.family]: !isImg.value,
-          [`${props.family}-${props.name}`]: !isImg.value
-        },
+        props.family,
+        `${props.family}-${props.name}`,
         props.rootClass
       );
     });

package/components/list-item/list-item.vue

@@ -11,7 +11,7 @@
             :name="icon"
             :color="iconColor"
             :size="iconSize"
-            :family="iconFamily || 'sari'"
+            :family="iconFamily"
           />
         </slot>
       </view>

package/components/menu-item/menu-item.vue

@@ -4,7 +4,7 @@
       v-if="icon || (withIcon && direction === 'vertical')"
       :class="bem.e('icon')"
     >
-      <sar-icon v-if="icon" :name="icon" :family="iconFamily || 'sari'" />
+      <sar-icon v-if="icon" :name="icon" :family="iconFamily" />
     </view>
     <view v-if="text" :class="bem.e('text')">
       {{ text }}

package/components/navbar-item/navbar-item.vue

@@ -9,7 +9,7 @@
         v-if="icon"
         :class="bem.e('item-icon')"
         :name="icon"
-        :family="iconFamily || 'sari'"
+        :family="iconFamily"
         :size="iconSize"
       />
 

package/components/rate/rate.vue

@@ -31,7 +31,7 @@
           <template v-if="voidText">
             {{ voidText }}
           </template>
-          <sar-icon v-else :name="voidIcon" :family="iconFamily || 'sari'" />
+          <sar-icon v-else :name="voidIcon" :family="iconFamily" />
         </view>
         <view
           :class="bem.e('star')"
@@ -45,7 +45,7 @@
           <template v-if="text">
             {{ text }}
           </template>
-          <sar-icon v-else :name="icon" :family="iconFamily || 'sari'" />
+          <sar-icon v-else :name="icon" :family="iconFamily" />
         </view>
       </view>
     </view>

package/components/result/result.vue

@@ -4,7 +4,7 @@
       <view :class="iconClass">
         <sar-icon
           :name="icon || mapStatusIcon[status]"
-          :family="iconFamily || 'sari'"
+          :family="iconFamily"
           :color="iconColor"
         />
       </view>

package/components/share-sheet/share-sheet.vue

@@ -47,7 +47,7 @@
                   <sar-icon
                     v-else
                     :name="item.icon"
-                    :family="item.iconFamily || 'sari'"
+                    :family="item.iconFamily"
                   />
                 </view>
                 <view :class="bem.e('item-name')">{{ item.name }}</view>

package/components/step/step.vue

@@ -5,7 +5,7 @@
       <view :class="bem.e('icon')">
         <slot name="icon" :status="currentStatus">
           <sar-icon
-            :family="context.iconFamily || 'sari'"
+            :family="context.iconFamily"
             :name="statusIcon"
             :size="context.iconSize"
           />

package/components/tabbar-item/tabbar-item.vue

@@ -3,11 +3,7 @@
     <slot>
       <view :class="bem.e('icon')">
         <slot name="icon" :active="isCurrent">
-          <sar-icon
-            :name="icon"
-            :family="iconFamily || 'sari'"
-            :size="iconSize"
-          />
+          <sar-icon :name="icon" :family="iconFamily" :size="iconSize" />
         </slot>
         <sar-badge v-if="badge || dot" :value="badge" :dot="dot" fixed />
       </view>

package/components/timeline-item/timeline-item.vue

@@ -5,11 +5,7 @@
       <view :class="bem.e('icon-wrapper')">
         <view v-if="icon || $slots.icon" :class="bem.e('icon')">
           <slot name="icon">
-            <sar-icon
-              :name="icon"
-              :family="iconFamily || 'sari'"
-              :color="iconColor"
-            />
+            <sar-icon :name="icon" :family="iconFamily" :color="iconColor" />
           </slot>
         </view>
         <view v-else :class="bem.e('dot')"></view>

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "main": "index.js",
   "scripts": {

package/utils/date.d.ts

@@ -1,16 +1,46 @@
 export declare function isLeapYear(year: number): boolean;
-export declare function getDaysInMonth(year: number, month: number): 29 | 28 | 30 | 31;
-export declare function getDayOnFirstOfMonth(year: number, month: number): number;
+export declare function getMonthDays(year: number, month: number): number;
+export declare function getDaysInYear(date: Date): number;
+export declare function getWeekOfMonthStart(year: number, month: number): number;
 export declare function getDaysInDate(date: Date): number;
 export declare function toDateNumber(date: Date): number;
 export declare function toDateString(date: Date): string;
 export declare function toMonthNumber(date: Date): number;
 export declare function getPadStartDays(year: number, month: number, amount: number): Date[];
 export declare function getPadEndDays(year: number, month: number, amount: number): Date[];
-export declare function getOffsetDaysFromFirstDay(weekOnFirstDay: number, weekStartsOn: number): number;
+export declare function getOffsetDaysFromMonthStart(weekOnMonthStart: number, weekStartsOn: number): number;
 export declare function formatDate(date: Date, format?: string): string;
 export declare function parseDate(value: string, format?: string): Date;
 export declare function toDate(date: Date | string, valueFormat?: string): Date;
 export declare function minmaxDate(date: Date, minDate: Date, maxDate: Date): Date;
 export declare function getPrevMonthDate(date: Date): Date;
 export declare function getNextMonthDate(date: Date): Date;
+/****************************************************************
+ * 农历
+ ****************************************************************/
+export declare const lunarInfo: number[];
+export declare const springFestivals: number[][];
+export declare const baseLunarYear = 1900;
+export declare function getLunarLeapMonth(year: number): number;
+export declare function getLunarLeapMonthDays(year: number): 0 | 30 | 29;
+export declare function getLunarYearDays(year: number): number;
+export declare function getLunarMonthDays(year: number, month: number): 30 | 29;
+export declare function solarToLunar(year: number, _month: number, date: number): {
+    year: number;
+    month: number;
+    day: number;
+};
+export declare function lunarToSolar(lunarYear: number, lunarMonth: number, lunarDay: number): {
+    year: number;
+    month: number;
+    day: number;
+};
+export declare const lunarYearNames: string[];
+export declare function getLunarYearName(year: number): string;
+export declare const lunarMonthNames: string[];
+export declare function getLunarMonthName(month: number, isLeapMonth?: boolean): string;
+export declare const lunarDayNames: string[];
+export declare function getLunarDayName(day: number): string;
+export declare const heavenlyStems: string[];
+export declare const earthlyBranches: string[];
+export declare function getLunarHourName(hour: number): string;

package/utils/date.js

@@ -4,19 +4,30 @@ import { minmax } from './utils';
 export function isLeapYear(year) {
     return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
 }
-// 获取一个月中的天数
-export function getDaysInMonth(year, month) {
-    month++;
+const monthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+// 获取某月的天数
+export function getMonthDays(year, month) {
     if (month === 2) {
         return isLeapYear(year) ? 29 : 28;
     }
     else {
-        return [4, 6, 9, 11].includes(month) ? 30 : 31;
+        return monthDays[month - 1];
     }
 }
-// 获取一个月中一号对应的星期
-export function getDayOnFirstOfMonth(year, month) {
-    return new Date(year, month, 1).getDay();
+// 获取当前日期是一年中的第几天
+export function getDaysInYear(date) {
+    const year = date.getFullYear();
+    const month = date.getMonth();
+    const d = date.getDate();
+    let days = 0;
+    for (let m = 0; m < month; m++) {
+        days += getMonthDays(year, m + 1);
+    }
+    return days + d;
+}
+// 获取某月一号对应是星期几
+export function getWeekOfMonthStart(year, month) {
+    return new Date(year, month - 1, 1).getDay();
 }
 // 获取 Date 中的总天数
 export function getDaysInDate(date) {
@@ -38,7 +49,7 @@ export function toMonthNumber(date) {
 export function getPadStartDays(year, month, amount) {
     const dates = [];
     for (let i = amount - 1; i >= 0; i--) {
-        dates.push(new Date(year, month, -i));
+        dates.push(new Date(year, month - 1, -i));
     }
     return dates;
 }
@@ -46,13 +57,13 @@ export function getPadStartDays(year, month, amount) {
 export function getPadEndDays(year, month, amount) {
     const dates = [];
     for (let i = 1; i <= amount; i++) {
-        dates.push(new Date(year, month + 1, i));
+        dates.push(new Date(year, month + 1 - 1, i));
     }
     return dates;
 }
 // 获取一号偏移的天数
-export function getOffsetDaysFromFirstDay(weekOnFirstDay, weekStartsOn) {
-    return (weekOnFirstDay - weekStartsOn + 7) % 7;
+export function getOffsetDaysFromMonthStart(weekOnMonthStart, weekStartsOn) {
+    return (weekOnMonthStart - weekStartsOn + 7) % 7;
 }
 const dateTokensReg = /(YYYY|YY|MM|M|DD|D|HH|H|hh|h|mm|m|ss|s|SSS)/g;
 const dateGetters = {
@@ -147,3 +158,190 @@ export function getPrevMonthDate(date) {
 export function getNextMonthDate(date) {
     return new Date(date.getFullYear(), date.getMonth() + 1, 1);
 }
+/****************************************************************
+ * 农历
+ ****************************************************************/
+// prettier-ignore
+export const lunarInfo = [
+    0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x16a95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x092e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520, // 2100
+];
+// 1900-2100春节对应的公历日期
+// prettier-ignore
+export const springFestivals = [
+    [1, 31], [2, 19], [2, 8], [1, 29], [2, 16], [2, 4], [1, 25], [2, 13], [2, 2], [1, 22], // 1900-1909
+    [2, 10], [1, 30], [2, 18], [2, 6], [1, 26], [2, 14], [2, 3], [1, 23], [2, 11], [2, 1], // 1910-1919
+    [2, 20], [2, 8], [1, 28], [2, 16], [2, 5], [1, 24], [2, 13], [2, 2], [1, 23], [2, 10], // 1920-1929
+    [1, 30], [2, 17], [2, 6], [1, 26], [2, 14], [2, 4], [1, 24], [2, 11], [1, 31], [2, 19], // 1930-1939
+    [2, 8], [1, 27], [2, 15], [2, 5], [1, 25], [2, 13], [2, 2], [1, 22], [2, 10], [1, 29], // 1940-1949
+    [2, 17], [2, 6], [1, 27], [2, 14], [2, 3], [1, 24], [2, 12], [1, 31], [2, 18], [2, 8], // 1950-1959
+    [1, 28], [2, 15], [2, 5], [1, 25], [2, 13], [2, 2], [1, 21], [2, 9], [1, 30], [2, 17], // 1960-1969
+    [2, 6], [1, 27], [2, 15], [2, 3], [1, 23], [2, 11], [1, 31], [2, 18], [2, 7], [1, 28], // 1970-1979
+    [2, 16], [2, 5], [1, 25], [2, 13], [2, 2], [2, 20], [2, 9], [1, 29], [2, 17], [2, 6], // 1980-1989
+    [1, 27], [2, 15], [2, 4], [1, 23], [2, 10], [1, 31], [2, 19], [2, 7], [1, 28], [2, 16], // 1990-1999
+    [2, 5], [1, 24], [2, 12], [2, 1], [1, 22], [2, 9], [1, 29], [2, 18], [2, 7], [1, 26], // 2000-2009
+    [2, 14], [2, 3], [1, 23], [2, 10], [1, 31], [2, 19], [2, 8], [1, 28], [2, 16], [2, 5], // 2010-2019
+    [1, 25], [2, 12], [2, 1], [1, 22], [2, 10], [1, 29], [2, 17], [2, 6], [1, 26], [2, 13], // 2020-2029
+    [2, 3], [1, 23], [2, 11], [1, 31], [2, 19], [2, 8], [1, 28], [2, 15], [2, 4], [1, 24], // 2030-2039
+    [2, 12], [2, 1], [1, 22], [2, 10], [1, 30], [2, 17], [2, 6], [1, 26], [2, 14], [2, 2], // 2040-2049
+    [1, 23], [2, 11], [2, 1], [2, 19], [2, 8], [1, 28], [2, 15], [2, 4], [1, 24], [2, 12], // 2050-2059
+    [2, 2], [1, 21], [2, 9], [1, 29], [2, 17], [2, 5], [1, 26], [2, 14], [2, 3], [1, 23], // 2060-2069
+    [2, 11], [1, 31], [2, 19], [2, 7], [1, 27], [2, 15], [2, 5], [1, 24], [2, 12], [2, 2], // 2070-2079
+    [1, 22], [2, 9], [1, 29], [2, 17], [2, 6], [1, 26], [2, 14], [2, 3], [1, 24], [2, 10], // 2080-2089
+    [1, 30], [2, 18], [2, 7], [1, 27], [2, 15], [2, 5], [1, 25], [2, 12], [2, 1], [1, 21], // 2090-2099
+    [2, 9], // 2100
+];
+export const baseLunarYear = 1900;
+// 获取农历某年闰月的月份（0表示无闰月）
+export function getLunarLeapMonth(year) {
+    return lunarInfo[year - baseLunarYear] & 0xf;
+}
+// 获取农历某年闰月的天数
+export function getLunarLeapMonthDays(year) {
+    if (getLunarLeapMonth(year)) {
+        return lunarInfo[year - baseLunarYear] & 0x10000 ? 30 : 29;
+    }
+    return 0;
+}
+// 获取农历某年的总天数
+export function getLunarYearDays(year) {
+    let sum = 348; // 29天*12个月
+    const info = lunarInfo[year - baseLunarYear];
+    // 加上大月的天数
+    for (let i = 0x8000; i > 0x8; i >>= 1) {
+        sum += info & i ? 1 : 0;
+    }
+    // 加上闰月的天数
+    return sum + getLunarLeapMonthDays(year);
+}
+// 获取农历某年某月的天数
+export function getLunarMonthDays(year, month) {
+    return lunarInfo[year - baseLunarYear] & (0x10000 >> month) ? 30 : 29;
+}
+// 公历转农历
+export function solarToLunar(year, _month, date) {
+    // 计算输入日期与基准日期的天数差
+    const offsetDays = Math.floor((Date.UTC(year, _month - 1, date) - Date.UTC(baseLunarYear, 0, 31)) /
+        (24 * 60 * 60 * 1000));
+    // 农历年、月、日初始化
+    let lunarYear = baseLunarYear;
+    let lunarMonth = 1;
+    let lunarDay = 1;
+    let isLeapMonth = false;
+    let daysRemaining = offsetDays;
+    // 计算农历年
+    while (true) {
+        const yearDays = getLunarYearDays(lunarYear);
+        if (daysRemaining < yearDays) {
+            break;
+        }
+        daysRemaining -= yearDays;
+        lunarYear++;
+    }
+    // 计算农历月和日
+    const leapMonth = getLunarLeapMonth(lunarYear);
+    let monthDays = 0;
+    let month = 1;
+    for (; month <= 12; month++) {
+        // 处理闰月
+        if (leapMonth > 0 && month === leapMonth + 1) {
+            monthDays = getLunarLeapMonthDays(lunarYear);
+            if (daysRemaining < monthDays) {
+                isLeapMonth = true;
+                month--;
+                break;
+            }
+            daysRemaining -= monthDays;
+        }
+        monthDays = getLunarMonthDays(lunarYear, month);
+        if (daysRemaining < monthDays) {
+            break;
+        }
+        daysRemaining -= monthDays;
+    }
+    lunarMonth = month;
+    lunarDay = daysRemaining + 1;
+    return {
+        year: lunarYear,
+        month: lunarMonth * (isLeapMonth ? -1 : 1),
+        day: lunarDay,
+    };
+}
+// 农历转公历（闰月需传递负数）
+export function lunarToSolar(lunarYear, lunarMonth, lunarDay) {
+    const springFestival = springFestivals[lunarYear - baseLunarYear];
+    const solarDate = new Date(lunarYear, springFestival[0] - 1, springFestival[1]);
+    const info = lunarInfo[lunarYear - baseLunarYear];
+    const leapMonth = info & 0xf;
+    let totalDays = 0;
+    const absMonth = Math.abs(lunarMonth);
+    for (let m = 1; m < absMonth; m++) {
+        if (m === leapMonth) {
+            totalDays += getLunarLeapMonthDays(lunarYear);
+        }
+        totalDays += getLunarMonthDays(lunarYear, m);
+    }
+    if (lunarMonth < 0) {
+        totalDays += getLunarMonthDays(lunarYear, absMonth);
+    }
+    totalDays += lunarDay - 1;
+    solarDate.setDate(solarDate.getDate() + totalDays);
+    return {
+        year: solarDate.getFullYear(),
+        month: solarDate.getMonth() + 1,
+        day: solarDate.getDate(),
+    };
+}
+// 农历年份的名称
+// prettier-ignore
+export const lunarYearNames = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十'];
+export function getLunarYearName(year) {
+    return (String(year)
+        .split('')
+        .map((item) => lunarYearNames[+item])
+        .join('') + '年');
+}
+// 农历月份的名称
+// prettier-ignore
+export const lunarMonthNames = ['正', '二', '三', '四', '五', '六', '七', '八', '九', '十', '冬', '腊'];
+// 获取农历月份名称
+export function getLunarMonthName(month, isLeapMonth) {
+    return (isLeapMonth ? '闰' : '') + lunarMonthNames[month - 1] + '月';
+}
+// 农历日期的名称
+// prettier-ignore
+export const lunarDayNames = ['初一', '初二', '初三', '初四', '初五', '初六', '初七', '初八', '初九', '初十', '十一', '十二', '十三', '十四', '十五', '十六', '十七', '十八', '十九', '二十', '廿一', '廿二', '廿三', '廿四', '廿五', '廿六', '廿七', '廿八', '廿九', '三十'];
+// 获取农历日期名称
+export function getLunarDayName(day) {
+    return lunarDayNames[day - 1];
+}
+// 十天干
+// prettier-ignore
+export const heavenlyStems = ['甲', '乙', '丙', '丁', '戊', '己', '庚', '辛', '壬', '癸'];
+// 十二地支
+// prettier-ignore
+export const earthlyBranches = ['子', '丑', '寅', '卯', '辰', '巳', '午', '未', '申', '酉', '戌', '亥'];
+// 获取农历时辰名称
+export function getLunarHourName(hour) {
+    const index = Math.floor(((hour === 23 ? 0 : hour) + 1) / 2) % 12;
+    return earthlyBranches[index] + (hour % 2 === 1 ? '初' : '正');
+}