uview-pro 0.6.18 → 0.6.19

package/components/u-pagination/u-pagination.vue

@@ -1,102 +1,102 @@
-<template>
-    <view class="u-pagination" :style="$u.toStyle(customStyle)" :class="customClass">
-        <u-button
-            custom-class="custom-class"
-            shape="circle"
-            type="info"
-            size="medium"
-            :throttle-time="0"
-            :disabled="current <= 1"
-            @click="handleChange('prev')"
-        >
-            <u-icon v-if="showIcon" :name="prevIcon"></u-icon>
-            <text v-else>{{ getPrevText }}</text>
-        </u-button>
-        <view class="u-pagination-text">
-            <slot>
-                <u-text type="primary" :text="current"></u-text>
-                <text> / </text>
-                <text>{{ totalPages }}</text>
-            </slot>
-        </view>
-        <u-button
-            custom-class="custom-class"
-            shape="circle"
-            type="info"
-            size="medium"
-            :throttle-time="0"
-            :disabled="current >= totalPages"
-            @click="handleChange('next')"
-        >
-            <u-icon v-if="showIcon" :name="nextIcon"></u-icon>
-            <text v-else>{{ getNextText }}</text>
-        </u-button>
-    </view>
-</template>
-
-<script lang="ts">
-export default {
-    name: 'u-pagination',
-    options: {
-        addGlobalClass: true,
-        // #ifndef MP-TOUTIAO
-        virtualHost: true,
-        // #endif
-        styleIsolation: 'shared'
-    }
-};
-</script>
-
-<script setup lang="ts">
-import { computed } from 'vue';
-import { type PaginationEmits, PaginationProps } from './types';
-import type { PaginationDirection } from '../../types/global';
-import { $u, useLocale } from '../../';
-import uButton from '../u-button/u-button.vue';
-import uIcon from '../u-icon/u-icon.vue';
-import uText from '../u-text/u-text.vue';
-
-const { t } = useLocale();
-
-const props = defineProps(PaginationProps);
-const emit = defineEmits<PaginationEmits>();
-
-const current = defineModel({ type: Number, default: 1 });
-
-// 自动计算总页数
-const totalPages = computed(() => {
-    const size = props.pageSize || 10;
-    return Math.ceil((props.total || 0) / size);
-});
-
-// 国际化计算属性
-const getPrevText = computed(() => props.prevText || t('uPagination.prevText'));
-const getNextText = computed(() => props.nextText || t('uPagination.nextText'));
-
-// 切换分页
-function handleChange(type: PaginationDirection) {
-    // 先计算新值，确保获取到的是更新后的值
-    const newCurrent = type === 'prev' ? current.value - 1 : current.value + 1;
-
-    // 更新 current 值
-    current.value = newCurrent;
-
-    // current为当前页，type值为：next/prev，表示点击的是上一页还是下一页
-    // 使用计算后的新值，而不是 current.value，避免异步更新导致的值不同步问题
-    emit('change', { type, current: newCurrent });
-}
-</script>
-
-<style scoped lang="scss">
-.u-pagination {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    :deep(.custom-class) {
-        margin: 0;
-        padding: 0 30rpx;
-        min-width: 120rpx;
-    }
-}
-</style>
+<template>
+    <view class="u-pagination" :style="$u.toStyle(customStyle)" :class="customClass">
+        <u-button
+            custom-class="custom-class"
+            shape="circle"
+            type="info"
+            size="medium"
+            :throttle-time="0"
+            :disabled="current <= 1"
+            @click="handleChange('prev')"
+        >
+            <u-icon v-if="showIcon" :name="prevIcon"></u-icon>
+            <text v-else>{{ getPrevText }}</text>
+        </u-button>
+        <view class="u-pagination-text">
+            <slot>
+                <u-text type="primary" :text="current"></u-text>
+                <text> / </text>
+                <text>{{ totalPages }}</text>
+            </slot>
+        </view>
+        <u-button
+            custom-class="custom-class"
+            shape="circle"
+            type="info"
+            size="medium"
+            :throttle-time="0"
+            :disabled="current >= totalPages"
+            @click="handleChange('next')"
+        >
+            <u-icon v-if="showIcon" :name="nextIcon"></u-icon>
+            <text v-else>{{ getNextText }}</text>
+        </u-button>
+    </view>
+</template>
+
+<script lang="ts">
+export default {
+    name: 'u-pagination',
+    options: {
+        addGlobalClass: true,
+        // #ifndef MP-TOUTIAO
+        virtualHost: true,
+        // #endif
+        styleIsolation: 'shared'
+    }
+};
+</script>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { type PaginationEmits, PaginationProps } from './types';
+import type { PaginationDirection } from '../../types/global';
+import { $u, useLocale } from '../../';
+import uButton from '../u-button/u-button.vue';
+import uIcon from '../u-icon/u-icon.vue';
+import uText from '../u-text/u-text.vue';
+
+const { t } = useLocale();
+
+const props = defineProps(PaginationProps);
+const emit = defineEmits<PaginationEmits>();
+
+const current = defineModel({ type: Number, default: 1 });
+
+// 自动计算总页数
+const totalPages = computed(() => {
+    const size = props.pageSize || 10;
+    return Math.ceil((props.total || 0) / size);
+});
+
+// 国际化计算属性
+const getPrevText = computed(() => props.prevText || t('uPagination.prevText'));
+const getNextText = computed(() => props.nextText || t('uPagination.nextText'));
+
+// 切换分页
+function handleChange(type: PaginationDirection) {
+    // 先计算新值，确保获取到的是更新后的值
+    const newCurrent = type === 'prev' ? current.value - 1 : current.value + 1;
+
+    // 更新 current 值
+    current.value = newCurrent;
+
+    // current为当前页，type值为：next/prev，表示点击的是上一页还是下一页
+    // 使用计算后的新值，而不是 current.value，避免异步更新导致的值不同步问题
+    emit('change', { type, current: newCurrent });
+}
+</script>
+
+<style scoped lang="scss">
+.u-pagination {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    :deep(.custom-class) {
+        margin: 0;
+        padding: 0 30rpx;
+        min-width: 120rpx;
+    }
+}
+</style>

package/components/u-picker/types.ts

@@ -1,140 +1,140 @@
-import type { ExtractPropTypes, PropType } from 'vue';
-import type { PickerMode, PickerParams } from '../../types/global';
-import { getColor } from '../../';
-import zIndex from '../../libs/config/zIndex';
-
-const defaultParams: PickerParams = {
-    year: true,
-    month: true,
-    day: true,
-    hour: false,
-    minute: false,
-    second: false,
-    province: true,
-    city: true,
-    area: true,
-    timestamp: true
-};
-/**
- * PickerProps 选择器 props 类型定义
- * @description 支持时间、地区、单列、多列等多种模式
- */
-export const PickerProps = {
-    /** 自定义根节点样式 */
-    customStyle: {
-        type: [String, Object] as PropType<string | Record<string, any>>,
-        default: () => ({})
-    },
-    /** 自定义根节点样式类 */
-    customClass: {
-        type: String as unknown as PropType<string>,
-        default: ''
-    },
-    /** picker中需要显示的参数 */
-    params: {
-        type: Object as PropType<PickerParams>,
-        default: () => defaultParams
-    },
-    /** 当mode=selector或者mode=multiSelector时，提供的数组 */
-    range: {
-        type: Array as PropType<any[]>,
-        default: () => []
-    },
-    /** 当mode=selector或者mode=multiSelector时，提供的默认选中的下标 */
-    defaultSelector: {
-        type: Array as PropType<any[]>,
-        default: () => [0]
-    },
-    /** 是否保留用户上次确认的选择（true：优先使用已保存选择；false：优先使用外部传入的 defaultSelector/defaultTime/defaultRegion） */
-    preserveSelection: {
-        type: Boolean,
-        default: true
-    },
-    /** 当 range 是一个 Array<Object> 时，通过 range-key 来指定 Object 中 key 的值作为选择器显示内容 */
-    rangeKey: {
-        type: String,
-        default: ''
-    },
-    /** 模式选择，region-地区类型，time-时间类型，selector-单列模式，multiSelector-多列模式 */
-    mode: {
-        type: String as PropType<PickerMode>,
-        default: 'time'
-    },
-    /** 年份开始时间 */
-    startYear: {
-        type: [String, Number] as PropType<number | string>,
-        default: 1950
-    },
-    /** 年份结束时间 */
-    endYear: {
-        type: [String, Number] as PropType<number | string>,
-        default: 2050
-    },
-    /** "取消"按钮的颜色 */
-    cancelColor: {
-        type: String,
-        default: () => getColor('contentColor')
-    },
-    /** "确定"按钮的颜色 */
-    confirmColor: {
-        type: String,
-        default: () => getColor('primary')
-    },
-    /** 默认显示的时间，2025-07-02 || 2025-07-02 13:01:00 || 2025/07/02 */
-    defaultTime: {
-        type: String,
-        default: ''
-    },
-    /** 默认显示的地区，可传类似["河北省", "秦皇岛市", "北戴河区"] */
-    defaultRegion: {
-        type: Array as PropType<any[]>,
-        default: () => []
-    },
-    /** 时间模式时，是否显示后面的年月日中文提示 */
-    showTimeTag: {
-        type: Boolean,
-        default: true
-    },
-    /** 默认显示地区的编码，defaultRegion和areaCode同时存在，areaCode优先，可传类似["13", "1303", "130304"] */
-    areaCode: {
-        type: Array as PropType<any[]>,
-        default: () => []
-    },
-    /** 是否开启底部安全区适配 */
-    safeAreaInsetBottom: {
-        type: Boolean,
-        default: false
-    },
-    /** 是否允许通过点击遮罩关闭Picker */
-    maskCloseAble: {
-        type: Boolean,
-        default: true
-    },
-    /** 通过双向绑定控制组件的弹出与收起 */
-    modelValue: {
-        type: [Boolean, String, Number, Array, Object] as PropType<any>,
-        default: false
-    },
-    /** 弹出的z-index值 */
-    zIndex: {
-        type: [String, Number] as PropType<number | string>,
-        default: zIndex.popup
-    },
-    /** 顶部标题 */
-    title: {
-        type: String,
-        default: ''
-    },
-    /** 取消按钮的文字 */
-    cancelText: {
-        type: String,
-        default: ''
-    },
-    /** 确认按钮的文字 */
-    confirmText: {
-        type: String,
-        default: ''
-    }
-};
-
-export type PickerProps = ExtractPropTypes<typeof PickerProps>;
+import type { ExtractPropTypes, PropType } from 'vue';
+import type { PickerMode, PickerParams } from '../../types/global';
+import { getColor } from '../../';
+import zIndex from '../../libs/config/zIndex';
+
+const defaultParams: PickerParams = {
+    year: true,
+    month: true,
+    day: true,
+    hour: false,
+    minute: false,
+    second: false,
+    province: true,
+    city: true,
+    area: true,
+    timestamp: true
+};
+/**
+ * PickerProps 选择器 props 类型定义
+ * @description 支持时间、地区、单列、多列等多种模式
+ */
+export const PickerProps = {
+    /** 自定义根节点样式 */
+    customStyle: {
+        type: [String, Object] as PropType<string | Record<string, any>>,
+        default: () => ({})
+    },
+    /** 自定义根节点样式类 */
+    customClass: {
+        type: String as unknown as PropType<string>,
+        default: ''
+    },
+    /** picker中需要显示的参数 */
+    params: {
+        type: Object as PropType<PickerParams>,
+        default: () => defaultParams
+    },
+    /** 当mode=selector或者mode=multiSelector时，提供的数组 */
+    range: {
+        type: Array as PropType<any[]>,
+        default: () => []
+    },
+    /** 当mode=selector或者mode=multiSelector时，提供的默认选中的下标 */
+    defaultSelector: {
+        type: Array as PropType<any[]>,
+        default: () => [0]
+    },
+    /** 是否保留用户上次确认的选择（true：优先使用已保存选择；false：优先使用外部传入的 defaultSelector/defaultTime/defaultRegion） */
+    preserveSelection: {
+        type: Boolean,
+        default: true
+    },
+    /** 当 range 是一个 Array<Object> 时，通过 range-key 来指定 Object 中 key 的值作为选择器显示内容 */
+    rangeKey: {
+        type: String,
+        default: ''
+    },
+    /** 模式选择，region-地区类型，time-时间类型，selector-单列模式，multiSelector-多列模式 */
+    mode: {
+        type: String as PropType<PickerMode>,
+        default: 'time'
+    },
+    /** 年份开始时间 */
+    startYear: {
+        type: [String, Number] as PropType<number | string>,
+        default: 1950
+    },
+    /** 年份结束时间 */
+    endYear: {
+        type: [String, Number] as PropType<number | string>,
+        default: 2050
+    },
+    /** "取消"按钮的颜色 */
+    cancelColor: {
+        type: String,
+        default: () => getColor('contentColor')
+    },
+    /** "确定"按钮的颜色 */
+    confirmColor: {
+        type: String,
+        default: () => getColor('primary')
+    },
+    /** 默认显示的时间，2025-07-02 || 2025-07-02 13:01:00 || 2025/07/02 */
+    defaultTime: {
+        type: String,
+        default: ''
+    },
+    /** 默认显示的地区，可传类似["河北省", "秦皇岛市", "北戴河区"] */
+    defaultRegion: {
+        type: Array as PropType<any[]>,
+        default: () => []
+    },
+    /** 时间模式时，是否显示后面的年月日中文提示 */
+    showTimeTag: {
+        type: Boolean,
+        default: true
+    },
+    /** 默认显示地区的编码，defaultRegion和areaCode同时存在，areaCode优先，可传类似["13", "1303", "130304"] */
+    areaCode: {
+        type: Array as PropType<any[]>,
+        default: () => []
+    },
+    /** 是否开启底部安全区适配 */
+    safeAreaInsetBottom: {
+        type: Boolean,
+        default: false
+    },
+    /** 是否允许通过点击遮罩关闭Picker */
+    maskCloseAble: {
+        type: Boolean,
+        default: true
+    },
+    /** 通过双向绑定控制组件的弹出与收起 */
+    modelValue: {
+        type: [Boolean, String, Number, Array, Object] as PropType<any>,
+        default: false
+    },
+    /** 弹出的z-index值 */
+    zIndex: {
+        type: [String, Number] as PropType<number | string>,
+        default: zIndex.popup
+    },
+    /** 顶部标题 */
+    title: {
+        type: String,
+        default: ''
+    },
+    /** 取消按钮的文字 */
+    cancelText: {
+        type: String,
+        default: ''
+    },
+    /** 确认按钮的文字 */
+    confirmText: {
+        type: String,
+        default: ''
+    }
+};
+
+export type PickerProps = ExtractPropTypes<typeof PickerProps>;