sard-uniapp 1.19.4 → 1.20.0

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

@@ -33,11 +33,11 @@ import SarDatetimeRangePicker from "../datetime-range-picker/datetime-range-pick
 import {
   defaultDatetimeRangePickerInputProps
 } from "./common";
-import { formatDate, isEmptyBinding, toDate } from "../../utils";
+import { isEmptyBinding, toDate } from "../../utils";
 import {
-  getInitialValue,
   getMaxDate,
-  getMinDate
+  getMinDate,
+  normalizeRangeValue
 } from "../datetime-picker/common";
 import { useFormPopout } from "../../use";
 /**
@@ -50,7 +50,7 @@ import { useFormPopout } from "../../use";
  * @property {(Date | string)[]} modelValue 绑定的值，默认值：-。
  * @property {(letter: DatetimeLetter, value: number, date: Date, index: number) => boolean} filter 选项的过滤函数，默认值：-。
  * @property {(letter: DatetimeLetter, option: DatetimeColumnOption, date: Date, index: number) => string | void |undefined} formatter 选项的格式化函数，默认值：-。
- * @property {string [详见特殊符号](../guide/date#日期格式特殊符号)} valueFormat 绑定值的格式，不指定则绑定值为 Date 对象，默认值：-。
+ * @property {string [详见特殊符号](../utilities/date#日期格式特殊符号)} valueFormat 绑定值的格式，不指定则绑定值为 Date 对象，默认值：-。
  * @property {string[]} tabs 设置起始和结束标签页标题，默认值：-。
  * @property {string} popoutClass 弹窗框根元素类名，默认值：-。
  * @property {StyleValue} popoutStyle 弹窗框根元素样式，默认值：-。
@@ -104,10 +104,13 @@ export default  _defineComponent({
     });
     const { innerVisible, innerValue, popoutValue, onChange, onConfirm } = useFormPopout(props, emit, {
       onConfirmBefore() {
-        if (!popoutValue.value) {
-          const initialValue = getInitialValue(minDate.value, maxDate.value);
-          const singleValue = props.valueFormat ? formatDate(initialValue, props.valueFormat) : initialValue;
-          popoutValue.value = [singleValue, singleValue];
+        if (!popoutValue.value || Array.isArray(popoutValue.value) && popoutValue.value.filter(Boolean).length < 2) {
+          popoutValue.value = normalizeRangeValue(
+            minDate.value,
+            maxDate.value,
+            popoutValue.value,
+            props.valueFormat
+          );
         }
       }
     });

package/components/floating-bubble/floating-bubble.vue

@@ -23,7 +23,7 @@ import {
   getBoundingClientRect,
   uniqid,
   getWindowInfo,
-  minmax
+  clamp
 } from "../../utils";
 import {
   defaultFloatingBubbleProps
@@ -132,8 +132,8 @@ export default  _defineComponent({
         const deltaY = event.touches[0].clientY - downCoord.y;
         x = bubbleRect.left + deltaX;
         y = bubbleRect.top + deltaY;
-        x = minmax(x, getMinX(), getMaxX());
-        y = minmax(y, getMinY(), getMaxY());
+        x = clamp(x, getMinX(), getMaxX());
+        y = clamp(y, getMinY(), getMaxY());
         if (props.axis === "y") {
           x = getMaxX();
         } else if (props.axis === "x") {

package/components/form/README.md

@@ -160,25 +160,25 @@ import FormItem from 'sard-uniapp/components/form-item/form-item.vue'
 
 ### FormProps
 
-| 属性                     | 描述                                                                               | 类型                                                       | 默认值                                              |
-| ------------------------ | ---------------------------------------------------------------------------------- | ---------------------------------------------------------- | --------------------------------------------------- |
-| root-class               | 组件根元素类名                                                                     | string                                                     | -                                                   |
-| root-style               | 组件根元素样式                                                                     | StyleValue                                                 | -                                                   |
-| model                    | 表单数据对象                                                                       | Record\<string, any>                                       | -                                                   |
-| rules                    | 表单验证规则                                                                       | FormRules                                                  | -                                                   |
-| validate-trigger         | 设置字段校验的时机                                                                 | TriggerType                                                | change                                              |
-| validate-on-rule-change  | 是否在 `rules` 属性改变后立即触发一次验证                                          | boolean                                                    | true                                                |
-| direction                | 表单排列方向                                                                       | 'horizontal' \| 'vertical'                                 | 'horizontal'                                        |
-| label-width              | 标签宽度                                                                           | string                                                     | -                                                   |
-| label-align              | 标签水平对齐方式                                                                   | 'start' \| 'center' \| 'end'                               | 'start'                                             |
-| label-valign             | 标签垂直对齐方式                                                                   | 'start' \| 'center' \| 'end'                               | 'start'                                             |
-| star-position            | 必填星号在标签的左边或右边                                                         | 'left' \| 'right'                                          | 'left'                                              |
-| hide-star                | 是否隐藏必填时的星号                                                               | boolean                                                    | false                                               |
-| show-error               | 是否显示校验错误信息                                                               | boolean                                                    | true                                                |
-| scroll-to-first-error    | 当校验失败时，滚动到第一个错误表单项                                               | boolean                                                    | false                                               |
-| scroll-into-view-options | 自定义滚动配置选项                                                                 | [ScrollIntoViewOptions](../guide/scroll-into-view-options) | {position: 'nearest', startOffset: 0, endOffset: 0} |
-| disabled                 | 是否禁用该表单内的所有组件。 如果设置为 `true`, 它将覆盖内部组件的 `disabled` 属性 | boolean                                                    | false                                               |
-| readonly                 | 是否只读该表单内的所有组件。 如果设置为 `true`, 它将覆盖内部组件的 `readonly` 属性 | boolean                                                    | false                                               |
+| 属性                     | 描述                                                                               | 类型                                                                 | 默认值                                              |
+| ------------------------ | ---------------------------------------------------------------------------------- | -------------------------------------------------------------------- | --------------------------------------------------- |
+| root-class               | 组件根元素类名                                                                     | string                                                               | -                                                   |
+| root-style               | 组件根元素样式                                                                     | StyleValue                                                           | -                                                   |
+| model                    | 表单数据对象                                                                       | Record\<string, any>                                                 | -                                                   |
+| rules                    | 表单验证规则                                                                       | FormRules                                                            | -                                                   |
+| validate-trigger         | 设置字段校验的时机                                                                 | TriggerType                                                          | change                                              |
+| validate-on-rule-change  | 是否在 `rules` 属性改变后立即触发一次验证                                          | boolean                                                              | true                                                |
+| direction                | 表单排列方向                                                                       | 'horizontal' \| 'vertical'                                           | 'horizontal'                                        |
+| label-width              | 标签宽度                                                                           | string                                                               | -                                                   |
+| label-align              | 标签水平对齐方式                                                                   | 'start' \| 'center' \| 'end'                                         | 'start'                                             |
+| label-valign             | 标签垂直对齐方式                                                                   | 'start' \| 'center' \| 'end'                                         | 'start'                                             |
+| star-position            | 必填星号在标签的左边或右边                                                         | 'left' \| 'right'                                                    | 'left'                                              |
+| hide-star                | 是否隐藏必填时的星号                                                               | boolean                                                              | false                                               |
+| show-error               | 是否显示校验错误信息                                                               | boolean                                                              | true                                                |
+| scroll-to-first-error    | 当校验失败时，滚动到第一个错误表单项                                               | boolean                                                              | false                                               |
+| scroll-into-view-options | 自定义滚动配置选项                                                                 | [ScrollIntoViewOptions](../utilities/geometry#ScrollIntoViewOptions) | {position: 'nearest', startOffset: 0, endOffset: 0} |
+| disabled                 | 是否禁用该表单内的所有组件。 如果设置为 `true`, 它将覆盖内部组件的 `disabled` 属性 | boolean                                                              | false                                               |
+| readonly                 | 是否只读该表单内的所有组件。 如果设置为 `true`, 它将覆盖内部组件的 `readonly` 属性 | boolean                                                              | false                                               |
 
 ### FormSlots
 

package/components/form/form.vue

@@ -36,7 +36,7 @@ import { useTranslate } from "../locale";
  * @property {boolean} hideStar 是否隐藏必填时的星号，默认值：false。
  * @property {boolean} showError 是否显示校验错误信息，默认值：true。
  * @property {boolean} scrollToFirstError 当校验失败时，滚动到第一个错误表单项，默认值：false。
- * @property {[ScrollIntoViewOptions](../guide/scroll-into-view-options)} scrollIntoViewOptions 自定义滚动配置选项，默认值：{position: 'nearest', startOffset: 0, endOffset: 0}。
+ * @property {[ScrollIntoViewOptions](../utilities/geometry#ScrollIntoViewOptions)} scrollIntoViewOptions 自定义滚动配置选项，默认值：{position: 'nearest', startOffset: 0, endOffset: 0}。
  * @property {boolean} disabled 是否禁用该表单内的所有组件。 如果设置为 `true`, 它将覆盖内部组件的 `disabled` 属性，默认值：false。
  * @property {boolean} readonly 是否只读该表单内的所有组件。 如果设置为 `true`, 它将覆盖内部组件的 `readonly` 属性，默认值：false。
  */
@@ -150,9 +150,7 @@ export default  _defineComponent({
           validate().catch(noop);
         }
       },
-      {
-        deep: true
-      }
+      { deep: true, flush: "post" }
     );
     provide(
       formContextSymbol,

package/components/form-item/form-item.vue

@@ -129,6 +129,18 @@ export default  _defineComponent({
         validateState.value = props.error ? "error" : "";
       }
     );
+    watch(
+      () => props.rules,
+      () => {
+        if (validateMessage.value) {
+          validate().catch(noop);
+        }
+      },
+      {
+        deep: true,
+        flush: "post"
+      }
+    );
     const shouldShowError = computed(() => {
       return props.showError && formContext.showError && validateMessage.value;
     });

package/components/icon/icon.d.ts

@@ -1,7 +1,7 @@
 import { type IconProps } from './common';
 declare const _default: import("vue").DefineComponent<IconProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<IconProps> & Readonly<{}>, {
-    separate: boolean;
     name: string;
+    separate: boolean;
     family: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/components/indexes/README.md

@@ -32,6 +32,10 @@ import IndexesAnchor from 'sard-uniapp/components/indexes-anchor/indexes-anchor.
 
 @code('${DEMO_PATH}/indexes/demo/AreaCodeSearch.vue')
 
+### 全屏
+
+@code('${DEMO_PATH}/indexes/demo/FullPage.vue')
+
 ## API
 
 ### IndexesProps

package/components/indexes-nav/indexes-nav.vue

@@ -46,7 +46,7 @@ import {
   createBem,
   uniqid,
   getBoundingClientRect,
-  minmax
+  clamp
 } from "../../utils";
 import { useMouseDown, useTransition } from "../../use";
 import { defaultConfig } from "../config";
@@ -106,7 +106,7 @@ export default  _defineComponent({
         return;
       }
       const offsetY = touch.clientY - navRect.value.top;
-      const itemIndex = minmax(
+      const itemIndex = clamp(
         Math.floor(offsetY / itemSize),
         0,
         props.anchors.length - 1

package/components/keyboard/common.d.ts

@@ -23,5 +23,4 @@ export declare const digitKeys: string[];
 export declare const idcardKeys: string[];
 export declare const chineseKeys: string[];
 export declare const englishKeys: string[];
-export declare function shuffle(arr: any[]): any[];
-export declare function getRandomKeys(): any[];
+export declare function getRandomKeys(): string[];

package/components/keyboard/common.js

@@ -1,4 +1,5 @@
 import { defaultConfig } from '../config';
+import { shuffle } from '../../utils';
 export const defaultKeyboardProps = defaultConfig.keyboard;
 export const numberKeys = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'];
 export const digitKeys = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0'];
@@ -92,16 +93,6 @@ export const englishKeys = [
     'N',
     'M',
 ];
-export function shuffle(arr) {
-    const newArr = arr.slice();
-    for (let i = arr.length - 1; i >= 0; i--) {
-        const randomIndex = ~~(Math.random() * (i + 1));
-        const randomItem = newArr[randomIndex];
-        newArr[randomIndex] = newArr[i];
-        newArr[i] = randomItem;
-    }
-    return newArr;
-}
 export function getRandomKeys() {
-    return shuffle(numberKeys);
+    return shuffle(numberKeys.slice());
 }

package/components/keyboard/keyboard.d.ts

@@ -4,11 +4,11 @@ declare const __VLS_component: import("vue").DefineComponent<KeyboardProps, {
     shuffle: () => void;
     toggle: () => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    input: (key: string) => any;
     delete: () => any;
+    input: (key: string) => any;
 }, string, import("vue").PublicProps, Readonly<KeyboardProps> & Readonly<{
-    onInput?: ((key: string) => any) | undefined;
     onDelete?: (() => any) | undefined;
+    onInput?: ((key: string) => any) | undefined;
 }>, {
     type: "number" | "digit" | "idcard" | "random" | "plate";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/components/list-item/index.scss

@@ -58,6 +58,8 @@
     flex: auto;
     font-size: var(--sar-list-item-title-font-size);
     line-height: var(--sar-list-item-title-line-height);
+    word-wrap: break-word;
+    word-break: break-word;
   }
 
   @include e(description) {
@@ -66,6 +68,8 @@
     font-size: var(--sar-list-item-description-font-size);
     line-height: var(--sar-list-item-description-line-height);
     color: var(--sar-list-item-description-color);
+    word-wrap: break-word;
+    word-break: break-word;
   }
 
   @include e(value) {

package/components/locale/index.d.ts

@@ -1,3 +1,4 @@
+import { type App, type InjectionKey, type Ref } from 'vue';
 export declare const currentLocale: import("vue").ShallowRef<Record<string, any>, Record<string, any>>;
 export interface LocaleTranslate {
     (chainOrData?: string | Record<string, number | string>, data?: Record<string, number | string>): string;
@@ -8,3 +9,6 @@ export declare function useTranslate(prefix?: string): {
     select: (chain?: string) => any;
 };
 export declare function setLocale(locale: Record<string, any>): void;
+export declare const localeContextSymbol: InjectionKey<Ref<string>>;
+export declare function useLocaleProvide<T extends Record<string, any>>(app: App, languages: T, defaultLocale: keyof T): void;
+export declare function useLocale(): Ref<string, string> | undefined;

package/components/locale/index.js

@@ -1,4 +1,4 @@
-import { shallowRef, computed } from 'vue';
+import { shallowRef, computed, inject, ref, watch, } from 'vue';
 import zhCN from './lang/zh-CN';
 import { chainGet } from '../../utils';
 export const currentLocale = shallowRef(zhCN);
@@ -42,3 +42,16 @@ export function useTranslate(prefix = '') {
 export function setLocale(locale) {
     currentLocale.value = locale;
 }
+export const localeContextSymbol = Symbol('locale-context');
+export function useLocaleProvide(app, languages, defaultLocale) {
+    const locale = ref(defaultLocale);
+    watch(locale, () => {
+        setLocale(languages[locale.value]);
+    }, {
+        immediate: true,
+    });
+    app.provide(localeContextSymbol, locale);
+}
+export function useLocale() {
+    return inject(localeContextSymbol);
+}

package/components/locale/lang/en-US.d.ts

@@ -103,6 +103,10 @@ declare const _default: {
         confirm: string;
         cancel: string;
     };
+    readMore: {
+        fold: string;
+        unfold: string;
+    };
     signature: {
         confirm: string;
         clear: string;

package/components/locale/lang/en-US.js

@@ -104,6 +104,10 @@ export default {
         confirm: 'Ok',
         cancel: 'Cancel',
     },
+    readMore: {
+        fold: 'fold',
+        unfold: 'unfold',
+    },
     signature: {
         confirm: 'Ok',
         clear: 'Clear',

package/components/locale/lang/zh-CN.d.ts

@@ -103,6 +103,10 @@ declare const _default: {
         confirm: string;
         cancel: string;
     };
+    readMore: {
+        fold: string;
+        unfold: string;
+    };
     signature: {
         confirm: string;
         clear: string;

package/components/locale/lang/zh-CN.js

@@ -104,6 +104,10 @@ export default {
         confirm: '确定',
         cancel: '取消',
     },
+    readMore: {
+        fold: '收起',
+        unfold: '展开',
+    },
     signature: {
         confirm: '确定',
         clear: '清空',

package/components/marquee/README.md

@@ -29,10 +29,16 @@ import Marquee from 'sard-uniapp/components/marquee/marquee.vue'
 `Marquee` 组件是通过 `animation` 来实现高效的滚动动画的，
 会根据内容高度或宽度动态设置动画时长，以实现固定速率滚动。
 
-如果 `Marquee` 挂载时机比插槽内容靠前，即插槽内容数据需要通过接口异步获取再渲染的，
+@info
+
+在 <sup>1.20</sup>之前，如果 `Marquee` 挂载时机比插槽内容靠前，即插槽内容数据需要通过接口异步获取再渲染的，
 需要手动调用 `update` 方法来更新动画时长。
 
-@code('${DEMO_PATH}/marquee/demo/Reset.vue')
+在 <sup>1.20</sup>之后，会监听内容尺寸变化，自动调用更新方法，无需手动调用。
+
+@endinfo
+
+@code('${DEMO_PATH}/marquee/demo/Async.vue')
 
 ### 水平方向
 

package/components/marquee/marquee.vue

@@ -2,6 +2,7 @@
   <view :class="marqueeClass" :style="marqueeStyle">
     <view :id="wrapperId" :class="bem.e('wrapper')" :style="wrapperStyle">
       <slot></slot>
+      <sar-resize-sensor @resize="onResize" />
     </view>
   </view>
 </template>
@@ -16,6 +17,7 @@ import {
   uniqid,
   getBoundingClientRect
 } from "../../utils";
+import SarResizeSensor from "../resize-sensor/resize-sensor.vue";
 import {
   defaultMarqueeProps
 } from "./common";
@@ -28,6 +30,9 @@ import { useTimeout } from "../../use";
  * @property {number} delay 挂载后，延迟动画时间（单位 ms），避免进入页面时卡顿，默认值：1000。
  */
 export default  _defineComponent({
+  components: {
+    SarResizeSensor,
+  },
   ...{
     options: {
       virtualHost: true,
@@ -65,6 +70,9 @@ export default  _defineComponent({
     onMounted(() => {
       updateLater();
     });
+    const onResize = () => {
+      update();
+    };
     __expose({
       update
     });
@@ -80,7 +88,7 @@ export default  _defineComponent({
         animationPlayState: duration.value ? "running" : "paused"
       });
     });
-    const __returned__ = { props, bem, instance, wrapperId, duration, update, updateLater, marqueeClass, marqueeStyle, wrapperStyle };
+    const __returned__ = { props, bem, instance, wrapperId, duration, update, updateLater, onResize, marqueeClass, marqueeStyle, wrapperStyle, SarResizeSensor };
     return __returned__;
   }
 });

package/components/notice-bar/README.md

@@ -28,10 +28,16 @@ import NoticeBar from 'sard-uniapp/components/notice-bar/notice-bar.vue'
 `NoticeBar` 组件是通过 `animation` 来实现高效的滚动动画的，
 会根据内容宽度动态设置动画时长，以实现固定速率滚动。
 
-如果 `NoticeBar` 挂载时机比插槽内容靠前，即插槽内容数据需要通过接口异步获取再渲染的，
+@info
+
+在 <sup>1.20</sup>之前， 如果 `NoticeBar` 挂载时机比插槽内容靠前，即插槽内容数据需要通过接口异步获取再渲染的，
 需要手动调用 `update` 方法来更新动画时长。
 
-@code('${DEMO_PATH}/notice-bar/demo/Reset.vue')
+在 <sup>1.20</sup>之后，会监听内容尺寸变化，自动调用更新方法，无需手动调用。
+
+@endinfo
+
+@code('${DEMO_PATH}/notice-bar/demo/Async.vue')
 
 ### 强制滚动
 

package/components/notice-bar/notice-bar.vue

@@ -13,6 +13,7 @@
         @animationend="onAnimationEnd"
       >
         <slot></slot>
+        <sar-resize-sensor @resize="onResize" />
       </view>
     </view>
     <view
@@ -41,6 +42,7 @@ import {
   getBoundingClientRect
 } from "../../utils";
 import SarIcon from "../icon/icon.vue";
+import SarResizeSensor from "../resize-sensor/resize-sensor.vue";
 import {
   defaultNoticeBarProps
 } from "./common";
@@ -65,6 +67,7 @@ import { useTimeout } from "../../use";
 export default  _defineComponent({
   components: {
     SarIcon,
+    SarResizeSensor,
   },
   ...{
     options: {
@@ -130,13 +133,6 @@ export default  _defineComponent({
         firstLap.value = false;
       }
     };
-    const innerVisible = ref(props.visible);
-    const onRightIconClick = () => {
-      if (props.closable) {
-        innerVisible.value = false;
-        emit("close");
-      }
-    };
     const { start: updateLater } = useTimeout(
       () => {
         update();
@@ -148,6 +144,16 @@ export default  _defineComponent({
         updateLater();
       }
     });
+    const onResize = () => {
+      update();
+    };
+    const innerVisible = ref(props.visible);
+    const onRightIconClick = () => {
+      if (props.closable) {
+        innerVisible.value = false;
+        emit("close");
+      }
+    };
     const onClick = (event) => {
       emit("click", event);
     };
@@ -181,7 +187,7 @@ export default  _defineComponent({
         animationDuration: `${firstLap.value ? wrapperData.value.first : wrapperData.value.later}ms`
       });
     });
-    const __returned__ = { props, emit, bem, instance, contentId, wrapperId, shouldScroll, wrapperData, getWidth, update, firstLap, onAnimationEnd, innerVisible, onRightIconClick, updateLater, onClick, noticeBarClass, noticeBarStyle, wrapperStyle, SarIcon };
+    const __returned__ = { props, emit, bem, instance, contentId, wrapperId, shouldScroll, wrapperData, getWidth, update, firstLap, onAnimationEnd, updateLater, onResize, innerVisible, onRightIconClick, onClick, noticeBarClass, noticeBarStyle, wrapperStyle, SarIcon, SarResizeSensor };
     return __returned__;
   }
 });

package/components/notify/notify.d.ts

@@ -9,9 +9,9 @@ declare const _default: import("vue").DefineComponent<NotifyProps, {
     onClick?: ((event: any) => any) | undefined;
     "onUpdate:visible"?: ((event: any) => any) | undefined;
 }>, {
+    timeout: number;
     type: "primary" | "success" | "warning" | "error";
     position: "top" | "bottom";
     duration: number;
-    timeout: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/components/notify-agent/notify-agent.d.ts

@@ -1,9 +1,9 @@
 import { type NotifyAgentProps } from './common';
 declare const _default: import("vue").DefineComponent<NotifyAgentProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<NotifyAgentProps> & Readonly<{}>, {
+    timeout: number;
     type: "primary" | "success" | "warning" | "error";
     id: string;
     position: "top" | "bottom";
     duration: number;
-    timeout: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/components/pagination/pagination.vue

@@ -49,7 +49,7 @@
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
 import { computed, ref, watch } from "vue";
-import { classNames, stringifyStyle, createBem, minmax } from "../../utils";
+import { classNames, stringifyStyle, createBem, clamp } from "../../utils";
 import { useTranslate } from "../locale";
 import {
   getPageRange,
@@ -145,7 +145,7 @@ export default  _defineComponent({
         const isPrevMulti = i === 0 && page !== 1;
         const isNextMulti = i === length - 1 && page !== innerPageCount.value;
         const type = isPrevMulti ? -1 : isNextMulti ? 1 : 0;
-        page = type === 0 ? page : minmax(
+        page = type === 0 ? page : clamp(
           innerCurrent.value + type * props.multiCount,
           1,
           innerPageCount.value

package/components/popover/utils.js

@@ -1,4 +1,4 @@
-import { getWindowInfo, minmax } from '../../utils';
+import { getWindowInfo, clamp } from '../../utils';
 const directions = ['top', 'right', 'bottom', 'left'];
 function getReverseDirection(direction) {
     const index = directions.indexOf(direction);
@@ -77,7 +77,7 @@ export function getPopoverPosition(refRect, popperRect, { refGap, position, view
         };
         const offset = strategies[side]();
         // 确保处于屏幕内
-        return minmax(offset, viewportGap, axisWindowSize - popperRect[axisSizeName] - viewportGap);
+        return clamp(offset, viewportGap, axisWindowSize - popperRect[axisSizeName] - viewportGap);
     }
     function getDirectionOffset() {
         const strategies = {
@@ -96,7 +96,7 @@ export function getPopoverPosition(refRect, popperRect, { refGap, position, view
         };
         const offset = strategies[direction]();
         // 确保处于屏幕内
-        return minmax(offset, viewportGap, crossAxisWindowSize - popperRect[crossAxisSizeName] - viewportGap);
+        return clamp(offset, viewportGap, crossAxisWindowSize - popperRect[crossAxisSizeName] - viewportGap);
     }
     popperStyle[crossAxis] = getDirectionOffset();
     popperStyle[axis] = getSideOffset();
@@ -120,7 +120,7 @@ export function getPopoverPosition(refRect, popperRect, { refGap, position, view
             Math.max(refRect[axis], finalPopperRect[axis]);
         const offset = extra + intersection / 2;
         // 确保箭头位于popper之内
-        return minmax(offset, arrowSize, popperRect[axisSizeName] - arrowSize);
+        return clamp(offset, arrowSize, popperRect[axisSizeName] - arrowSize);
     }
     arrowStyle[axis] = getArrowOffset();
     arrowStyle[crossAxis] = getArrowCrossOffset(direction, popperRect);

package/components/pull-down-refresh/common.d.ts

@@ -19,7 +19,7 @@ export declare const defaultPullDownRefreshProps: () => {
     doneDuration: number;
 };
 export declare const pullDownRefreshProps: {
-    rootStyle: (ObjectConstructor | ArrayConstructor | StringConstructor)[];
+    rootStyle: (StringConstructor | ObjectConstructor | ArrayConstructor)[];
     rootClass: StringConstructor;
     threshold: {
         type: NumberConstructor;

package/components/radio/common.d.ts

@@ -24,6 +24,7 @@ export interface RadioEmits {
 export declare const defaultOptionKeys: {
     label: string;
     value: string;
+    disabled: string;
 };
 export type RadioGroupOption = {
     [key: PropertyKey]: any;

package/components/radio/common.js

@@ -2,6 +2,7 @@ import { defaultConfig } from '../config';
 export const defaultOptionKeys = {
     label: 'label',
     value: 'value',
+    disabled: 'disabled',
 };
 export const defaultRadioGroupProps = defaultConfig.radioGroup;
 export const radioContextSymbol = Symbol('radio-context');

package/components/radio-input/radio-input.vue

@@ -23,6 +23,8 @@
       :options="options"
       :option-keys="optionKeys"
       :validate-event="validateEvent"
+      :searchable="searchable"
+      :filter-placeholder="filterPlaceholder"
       @change="onChange"
     />
   </sar-popout-input>
@@ -56,6 +58,8 @@ import { usePopoutInput } from "../../use";
  * @property {StyleValue} popoutStyle 弹窗框根元素样式，默认值：-。
  * @property {boolean} visible 是否显示弹出框，默认值：-。
  * @property {string} title 弹出框标题，默认值：-。
+ * @property {boolean} searchable 是否可搜索，默认值：false。
+ * @property {string} filterPlaceholder 搜索输入框占位符内容，默认值：-。
  * @property {boolean} clearable 是否显示清空按钮，默认值：false。
  * @property {string} placeholder 输入框占位符内容，默认值：-。
  * @property {() => any} valueOnClear 设置点击清除按钮后的值，默认值：() => undefined。
@@ -80,6 +84,8 @@ export default  _defineComponent({
     title: { type: String, required: false },
     popoutClass: { type: String, required: false },
     popoutStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
+    searchable: { type: Boolean, required: false },
+    filterPlaceholder: { type: String, required: false },
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     modelValue: { type: null, required: false },