sard-uniapp 1.17.1 → 1.19.0

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+# [1.19.0](https://github.com/sutras/sard-uniapp/compare/v1.18.0...v1.19.0) (2025-06-10)
+
+
+### Bug Fixes
+
+* 修复 dialog 命令式回调选项参数问题 ([5af4fd8](https://github.com/sutras/sard-uniapp/commit/5af4fd81b6528501f2103b8db1b40a14f6186926))
+* 修复 form fields 错乱删除问题 ([8250da9](https://github.com/sutras/sard-uniapp/commit/8250da9770152a4f6a93e873c70c01e13c91ce56))
+* 修复cascader组件因值不存在时不显示列表的问题 ([4bae371](https://github.com/sutras/sard-uniapp/commit/4bae37167ccd88db3286d3bc233dfa250cfad4f9))
+* 修复picker最后一列在安卓偏移问题 ([a041836](https://github.com/sutras/sard-uniapp/commit/a04183687b4291c04a0c5381dbc8fbf0b0f5afba))
+
+
+### Features
+
+* button 新增 square 属性 ([41db4ac](https://github.com/sutras/sard-uniapp/commit/41db4acd6804f52e02cff5eeb3eaaf005dfc7f5e))
+* dropdown 新增 before-close 属性 ([3407a6b](https://github.com/sutras/sard-uniapp/commit/3407a6b5a9cb4038c7d63de9bfdb81498e6afd76))
+* 新增 swipe-action 组件 ([9a390c6](https://github.com/sutras/sard-uniapp/commit/9a390c61d036a016d2ee8d706130589e3ca4009c))
+
+
+
+# [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/README.md

@@ -46,6 +46,11 @@
 
 ## 如何维护
 
+### 前提条件
+
+- 确保 node >= 20
+- 建议使用 pnpm
+
 ### 克隆仓库到本地
 
 ```bash

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>
@@ -79,6 +79,7 @@ export default  _defineComponent({
     theme: { type: String, required: false },
     size: { type: String, required: false },
     round: { type: Boolean, required: false },
+    square: { type: Boolean, required: false },
     disabled: { type: Boolean, required: false },
     loading: { type: Boolean, required: false },
     loadingType: { type: String, required: false },
@@ -162,6 +163,7 @@ export default  _defineComponent({
         bem.m(props.type),
         bem.m(`${props.type}-${props.theme}`),
         bem.m("round", props.round),
+        bem.m("square", props.square),
         bem.m("disabled", isDisabled.value),
         bem.m("loading", props.loading),
         bem.m("block", props.icon || props.inline ? false : props.block),

package/components/button/common.d.ts

@@ -6,6 +6,7 @@ export interface ButtonProps {
     theme?: 'primary' | 'secondary' | 'success' | 'info' | 'warning' | 'danger' | 'neutral';
     size?: 'mini' | 'small' | 'medium' | 'large';
     round?: boolean;
+    square?: boolean;
     disabled?: boolean;
     loading?: boolean;
     loadingType?: 'clock' | 'circular';

package/components/button/index.scss

@@ -190,6 +190,15 @@
     }
   }
 
+  // # 方形按钮
+  @include m(square) {
+    border-radius: 0;
+
+    &::after {
+      border-radius: 0;
+    }
+  }
+
   // # active 状态
   @include m(default, pale, mild, outline, text) {
     &:not(#{bem($b: button, $m: disabled)}):not(

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/cascader/cascader.vue

@@ -153,6 +153,13 @@ export default  _defineComponent({
               selected: null
             });
           }
+        } else {
+          nextTabs = [
+            {
+              options: props.options || [],
+              selected: null
+            }
+          ];
         }
       }
       if (nextTabs) {

package/components/cascader-input/cascader-input.vue

@@ -103,7 +103,7 @@ export default  _defineComponent({
     function getOutletText(options, value, fieldKeys) {
       const selectedOptions = getSelectedOptionsByValue(options, value, fieldKeys);
       if (!selectedOptions) {
-        return "";
+        return isNullish(value) ? "" : String(value);
       }
       const labels = selectedOptions.map((option) => option[fieldKeys.label]);
       return labels.join("/");

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/crop-image/crop-image.vue

@@ -109,7 +109,7 @@ import {
 import {
   defaultCropImageProps
 } from "./common";
-import { useDragPinch, useSetTimeout } from "../../use";
+import { useDragPinch, useTimeout } from "../../use";
 import { useTranslate } from "../locale";
 import SarPopup from "../popup/popup.vue";
 import SarIcon from "../icon/icon.vue";
@@ -186,23 +186,23 @@ export default  _defineComponent({
     });
     const rotate = ref(0);
     const actualRotate = ref(0);
-    const [onRotateEnd] = useSetTimeout(() => {
+    const { start: onRotateEnd } = useTimeout(() => {
       actualRotate.value = rotate.value;
-    });
+    }, 150 + 100);
     watch(rotate, () => {
-      onRotateEnd(150 + 100);
+      onRotateEnd();
     });
     const isRotating = computed(() => rotate.value !== actualRotate.value);
     const isStillRotating = ref(false);
-    const [stopRotateLater, cancelStopRotate] = useSetTimeout(() => {
+    const { start: stopRotateLater, stop: cancelStopRotate } = useTimeout(() => {
       isStillRotating.value = false;
-    });
+    }, 150);
     watch(isRotating, () => {
       cancelStopRotate();
       if (isRotating.value) {
         isStillRotating.value = true;
       } else {
-        stopRotateLater(150);
+        stopRotateLater();
       }
     });
     const maskStyle = computed(() => {

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;