uview-pro 0.0.4 → 0.0.6

package/components/u-avatar-cropper/weCropper.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 /**
  * we-cropper v1.3.9
  * (c) 2020 dlhandsome

package/components/u-button/u-button.vue

@@ -15,7 +15,7 @@
         :hover-stay-time="Number(hoverStayTime)"
         :disabled="disabled"
         :form-type="formType"
-        :open-type="openType"
+        :open-type="disabled || loading ? undefined : openType"
         :app-parameter="appParameter"
         :hover-stop-propagation="hoverStopPropagation"
         :send-message-title="sendMessageTitle"
@@ -25,11 +25,15 @@
         :session-from="sessionFrom"
         :send-message-img="sendMessageImg"
         :show-message-card="showMessageCard"
-        @getphonenumber="getphonenumber"
+        @getAuthorize="getAuthorize"
         @getuserinfo="getuserinfo"
+        @contact="contact"
+        @getphonenumber="getphonenumber"
         @error="error"
-        @opensetting="opensetting"
         @launchapp="launchapp"
+        @opensetting="opensetting"
+        @chooseavatar="chooseavatar"
+        @agreeprivacyauthorization="agreeprivacyauthorization"
         :style="[
             customStyle,
             {
@@ -57,7 +61,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, nextTick } from 'vue';
+import { ref, computed, nextTick, type PropType } from 'vue';
 import { $u } from '../../';
 
 defineOptions({
@@ -74,7 +78,7 @@ defineOptions({
  * @property {Boolean} plain 按钮是否镂空，背景色透明
  * @property {Boolean} disabled 是否禁用
  * @property {Boolean} hair-line 是否显示按钮的细边框(默认true)
- * @property {Boolean} shape 按钮外观形状，见文档说明
+ * @property {String} shape 按钮外观形状，见文档说明
  * @property {Boolean} loading 按钮名称前是否带 loading 图标(App-nvue 平台，在 ios 上为雪花，Android上为圆圈)
  * @property {String} form-type 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
  * @property {String} open-type 开放能力
@@ -83,23 +87,60 @@ defineOptions({
  * @property {Number} hover-start-time 按住后多久出现点击态，单位毫秒
  * @property {Number} hover-stay-time 手指松开后点击态保留时间，单位毫秒
  * @property {Object} custom-style 对按钮的自定义样式，对象形式，见文档说明
+ * @property {String} app-parameter 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
+ * @property {Boolean} hover-stop-propagation 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
+ * @property {String} lang 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
+ * @property {String} session-from 会话来源，open-type="contact"时有效。只微信小程序有效
+ * @property {String} send-message-title 会话内消息卡片标题，open-type="contact"时有效
+ * @property {String} send-message-path 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
+ * @property {String} send-message-img 会话内消息卡片图片，open-type="contact"时有效
+ * @property {Boolean} show-message-card 是否显示会话内消息卡片，open-type="contact"时有效
+ * @property {Number|String} throttle-time 节流，一定时间内只能触发一次，单位毫秒
+ * @property {String} scope 支付宝小程序，当 open-type 为 getAuthorize 时有效。可选值：'phoneNumber' | 'userInfo'
  * @event {Function} click 按钮点击
  * @event {Function} getphonenumber open-type="getPhoneNumber"时有效
  * @event {Function} getuserinfo 用户点击该按钮时，会返回获取到的用户信息，从返回参数的detail中获取到的值同uni.getUserInfo
  * @event {Function} error 当使用开放能力时，发生错误的回调
  * @event {Function} opensetting 在打开授权设置页并关闭后回调
  * @event {Function} launchapp 打开 APP 成功的回调
+ * @event {Function} contact 客服消息回调
+ * @event {Function} chooseavatar 头像选择回调
+ * @event {Function} agreeprivacyauthorization 用户点击允许授权回调
  * @example <u-button>月落</u-button>
  */
 
-const emit = defineEmits<{
-    (e: 'click', event: any): void;
-    (e: 'getphonenumber', res: any): void;
-    (e: 'getuserinfo', res: any): void;
-    (e: 'error', res: any): void;
-    (e: 'opensetting', res: any): void;
-    (e: 'launchapp', res: any): void;
-}>();
+const emit = defineEmits(['click', 'getuserinfo', 'contact', 'getphonenumber', 'error', 'launchapp', 'opensetting', 'chooseavatar', 'agreeprivacyauthorization']);
+
+type ButtonScope = 'phoneNumber' | 'userInfo';
+
+type ButtonOpenType =
+    | 'feedback'
+    | 'share'
+    | 'getUserInfo'
+    | 'contact'
+    | 'getPhoneNumber'
+    | 'launchApp'
+    | 'openSetting'
+    | 'chooseAvatar'
+    | 'getAuthorize'
+    | 'lifestyle'
+    | 'contactShare'
+    | 'openGroupProfile'
+    | 'openGuildProfile'
+    | 'openPublicProfile'
+    | 'shareMessageToFriend'
+    | 'addFriend'
+    | 'addColorSign'
+    | 'addGroupApp'
+    | 'addToFavorites'
+    | 'chooseAddress'
+    | 'chooseInvoiceTitle'
+    | 'login'
+    | 'subscribe'
+    | 'favorite'
+    | 'watchLater'
+    | 'openProfile'
+    | 'agreePrivacyAuthorization';
 
 const props = defineProps({
     /** 是否细边框 */
@@ -116,8 +157,10 @@ const props = defineProps({
     disabled: { type: Boolean, default: false },
     /** 是否加载中 */
     loading: { type: Boolean, default: false },
+    /** 支付宝小程序，当 open-type 为 getAuthorize 时有效 */
+    scope: { type: String as PropType<ButtonScope>, default: '' },
     /** 开放能力，具体请看uniapp稳定关于button组件部分说明 */
-    openType: { type: String, default: '' },
+    openType: { type: String as PropType<ButtonOpenType>, default: '' },
     /** 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件 */
     formType: { type: String, default: '' },
     /** 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效 */
@@ -278,32 +321,66 @@ function getElQuery(): Promise<any[]> {
 /**
  * open-type="getPhoneNumber"时有效
  */
-function getphonenumber(res: any) {
-    emit('getphonenumber', res);
+function getphonenumber(event: any) {
+    emit('getphonenumber', event);
 }
 /**
  * 用户点击该按钮时，会返回获取到的用户信息，从返回参数的detail中获取到的值同uni.getUserInfo
  */
-function getuserinfo(res: any) {
-    emit('getuserinfo', res);
+function getuserinfo(event: any) {
+    emit('getuserinfo', event);
 }
 /**
  * 当使用开放能力时，发生错误的回调
  */
-function error(res: any) {
-    emit('error', res);
+function error(event: any) {
+    emit('error', event);
 }
 /**
  * 在打开授权设置页并关闭后回调
  */
-function opensetting(res: any) {
-    emit('opensetting', res);
+function opensetting(event: any) {
+    emit('opensetting', event);
 }
 /**
  * 打开 APP 成功的回调
  */
-function launchapp(res: any) {
-    emit('launchapp', res);
+function launchapp(event: any) {
+    emit('launchapp', event);
+}
+
+/**
+ * 支付宝小程序授权
+ * @param event
+ */
+function getAuthorize(event: any) {
+    if (props.scope === 'phoneNumber') {
+        getphonenumber(event);
+    } else if (props.scope === 'userInfo') {
+        getuserinfo(event);
+    }
+}
+
+/**
+ * 客服消息回调
+ * @param event
+ */
+function contact(event: any) {
+    emit('contact', event);
+}
+/**
+ * 头像选择回调
+ * @param event
+ */
+function chooseavatar(event: any) {
+    emit('chooseavatar', event);
+}
+/**
+ * 用户点击允许授权回调
+ * @param event
+ */
+function agreeprivacyauthorization(event: any) {
+    emit('agreeprivacyauthorization', event);
 }
 </script>
 

package/components/u-city-select/u-city-select.vue

@@ -0,0 +1,244 @@
+<template>
+    <u-popup
+        v-model="popupValue"
+        mode="bottom"
+        :popup="false"
+        :mask="true"
+        :closeable="true"
+        :safe-area-inset-bottom="true"
+        close-icon-color="#ffffff"
+        :z-index="uZIndex"
+        :maskCloseAble="props.maskCloseAble"
+        @close="close"
+    >
+        <u-tabs v-if="popupValue" :list="genTabsList" :is-scroll="true" :current="tabsIndex" @change="tabsChange" ref="tabs"></u-tabs>
+        <view class="area-box">
+            <view class="u-flex" :class="{ change: isChange }">
+                <!-- 省 -->
+                <view class="area-item">
+                    <view class="u-padding-10 u-bg-gray" style="height: 100%">
+                        <scroll-view :scroll-y="true" style="height: 100%">
+                            <u-cell-group>
+                                <u-cell-item v-for="(item, index) in provincesList" :title="item.label" :arrow="false" :index="index" :key="index" @click="provinceChange(index)">
+                                    <template v-if="isChooseP && province === index" #right-icon>
+                                        <u-icon size="34" name="checkbox-mark"></u-icon>
+                                    </template>
+                                </u-cell-item>
+                            </u-cell-group>
+                        </scroll-view>
+                    </view>
+                </view>
+                <!-- 市 -->
+                <view class="area-item">
+                    <view class="u-padding-10 u-bg-gray" style="height: 100%">
+                        <scroll-view :scroll-y="true" style="height: 100%">
+                            <u-cell-group v-if="isChooseP">
+                                <u-cell-item v-for="(item, index) in citys" :title="item.label" :arrow="false" :index="index" :key="index" @click="cityChange(index)">
+                                    <template v-if="isChooseC && city === index" #right-icon>
+                                        <u-icon size="34" name="checkbox-mark"></u-icon>
+                                    </template>
+                                </u-cell-item>
+                            </u-cell-group>
+                        </scroll-view>
+                    </view>
+                </view>
+                <!-- 区 -->
+                <view class="area-item">
+                    <view class="u-padding-10 u-bg-gray" style="height: 100%">
+                        <scroll-view :scroll-y="true" style="height: 100%">
+                            <u-cell-group v-if="isChooseC">
+                                <u-cell-item v-for="(item, index) in areas" :title="item.label" :arrow="false" :index="index" :key="index" @click="areaChange(index)">
+                                    <template v-if="isChooseA && area === index" #right-icon>
+                                        <u-icon size="34" name="checkbox-mark"></u-icon>
+                                    </template>
+                                </u-cell-item>
+                            </u-cell-group>
+                        </scroll-view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted } from 'vue';
+import provinces from '../../libs/util/province';
+import citysData from '../../libs/util/city';
+import areasData from '../../libs/util/area';
+import type { PropType } from 'vue';
+
+defineOptions({
+    name: 'u-city-select'
+});
+
+/**
+ * u-city-select 城市选择器
+ * @description 用于选择省、市、区三级行政区域，支持回显和自定义初始值。
+ * @property {Boolean} modelValue 控制弹窗显示与隐藏（v-model）
+ * @property {Array} defaultRegion 默认选中的省市区名称数组，如 ['广东省', '广州市', '天河区']
+ * @property {Array} areaCode 默认选中的省市区编码数组，如 ['440000', '440100', '440106']
+ * @property {Boolean} maskCloseAble 是否允许点击遮罩关闭弹窗（默认 true）
+ * @property {String|Number} zIndex 弹窗层级（默认 0，自动适配）
+ * @event update:modelValue v-model 绑定值变化时触发
+ * @event city-change 选择省市区后触发，返回选中的省市区对象
+ * @example <u-city-select v-model="show" :defaultRegion="['广东省','广州市','天河区']" @city-change="onChange"></u-city-select>
+ */
+
+// props 定义
+const props = defineProps({
+    modelValue: { type: Boolean, default: false },
+    defaultRegion: { type: Array as PropType<string[]>, default: () => [] },
+    areaCode: { type: Array as PropType<string[]>, default: () => [] },
+    maskCloseAble: { type: Boolean, default: true },
+    zIndex: { type: [String, Number], default: 0 }
+});
+
+// emits 定义
+const emit = defineEmits(['update:modelValue', 'city-change']);
+
+// 省市区选择相关响应式数据
+const cityValue = ref('');
+const isChooseP = ref(false); // 是否已选省
+const province = ref(0); // 省下标
+const provincesList = ref(provinces);
+const isChooseC = ref(false); // 是否已选市
+const city = ref(0); // 市下标
+const citys = ref(citysData[0]);
+const isChooseA = ref(false); // 是否已选区
+const area = ref(0); // 区下标
+const areas = ref(areasData[0][0]);
+const tabsIndex = ref(0);
+
+// v-model 双向绑定
+const popupValue = computed({
+    get: () => props.modelValue,
+    set: val => emit('update:modelValue', val)
+});
+
+// 是否切换到区级
+const isChange = computed(() => tabsIndex.value > 1);
+
+// 顶部 tab 列表
+const genTabsList = computed(() => {
+    const tabsList = [{ name: '请选择' }];
+    if (isChooseP.value) {
+        tabsList[0].name = provincesList.value[province.value].label;
+        tabsList[1] = { name: '请选择' };
+    }
+    if (isChooseC.value) {
+        tabsList[1].name = citys.value[city.value].label;
+        tabsList[2] = { name: '请选择' };
+    }
+    if (isChooseA.value) {
+        tabsList[2].name = areas.value[area.value].label;
+    }
+    return tabsList;
+});
+
+// z-index 计算
+const uZIndex = computed(() => (props.zIndex ? props.zIndex : (uni as any).$u?.zIndex?.popup || 1075));
+
+// 初始化选中项
+function init() {
+    if (props.areaCode.length === 3) {
+        setProvince('', props.areaCode[0]);
+        setCity('', props.areaCode[1]);
+        setArea('', props.areaCode[2]);
+    } else if (props.defaultRegion.length === 3) {
+        setProvince(props.defaultRegion[0], '');
+        setCity(props.defaultRegion[1], '');
+        setArea(props.defaultRegion[2], '');
+    }
+}
+
+// 选中省
+function setProvince(label = '', value = '') {
+    provincesList.value.forEach((v, k) => {
+        if (value ? v.value == value : v.label == label) {
+            provinceChange(k);
+        }
+    });
+}
+// 选中市
+function setCity(label = '', value = '') {
+    citys.value.forEach((v, k) => {
+        if (value ? v.value == value : v.label == label) {
+            cityChange(k);
+        }
+    });
+}
+// 选中区
+function setArea(label = '', value = '') {
+    areas.value.forEach((v, k) => {
+        if (value ? v.value == value : v.label == label) {
+            isChooseA.value = true;
+            area.value = k;
+        }
+    });
+}
+
+// 关闭弹窗
+function close() {
+    emit('update:modelValue', false);
+}
+// tab 切换
+function tabsChange(index: number) {
+    tabsIndex.value = index;
+}
+// 省点击
+function provinceChange(index: number) {
+    isChooseP.value = true;
+    isChooseC.value = false;
+    isChooseA.value = false;
+    province.value = index;
+    citys.value = citysData[index];
+    tabsIndex.value = 1;
+}
+// 市点击
+function cityChange(index: number) {
+    isChooseC.value = true;
+    isChooseA.value = false;
+    city.value = index;
+    areas.value = areasData[province.value][index];
+    tabsIndex.value = 2;
+}
+// 区点击
+function areaChange(index: number) {
+    isChooseA.value = true;
+    area.value = index;
+    const result = {
+        province: provincesList.value[province.value],
+        city: citys.value[city.value],
+        area: areas.value[area.value]
+    };
+    emit('city-change', result);
+    close();
+}
+
+// 挂载时初始化
+onMounted(init);
+</script>
+
+<style lang="scss">
+.area-box {
+    width: 100%;
+    overflow: hidden;
+    height: 800rpx;
+
+    > view {
+        width: 150%;
+        transition: transform 0.3s ease-in-out 0s;
+        transform: translateX(0);
+
+        &.change {
+            transform: translateX(-33.3333333%);
+        }
+    }
+
+    .area-item {
+        width: 33.3333333%;
+        height: 800rpx;
+    }
+}
+</style>

package/components/u-column-notice/u-column-notice.vue

@@ -187,6 +187,7 @@ const vertical = computed(() => {
 const computeBgColor = computed(() => {
     if (props.bgColor) return props.bgColor;
     else if (props.type === 'none') return 'transparent';
+    else return '';
 });
 
 /**
@@ -223,6 +224,7 @@ function change(e: { detail: { current: number } }) {
 
 <style lang="scss" scoped>
 @import '../../libs/css/style.components.scss';
+
 .u-notice-bar {
     width: 100%;
     @include vue-flex;
@@ -232,6 +234,7 @@ function change(e: { detail: { current: number } }) {
     padding: 18rpx 24rpx;
     overflow: hidden;
 }
+
 .u-swiper {
     font-size: 26rpx;
     height: 32rpx;
@@ -240,14 +243,17 @@ function change(e: { detail: { current: number } }) {
     flex: 1;
     margin-left: 12rpx;
 }
+
 .u-swiper-item {
     @include vue-flex;
     align-items: center;
     overflow: hidden;
 }
+
 .u-news-item {
     overflow: hidden;
 }
+
 .u-right-icon {
     margin-left: 12rpx;
     /* #ifndef APP-NVUE */
@@ -255,6 +261,7 @@ function change(e: { detail: { current: number } }) {
     /* #endif */
     align-items: center;
 }
+
 .u-left-icon {
     /* #ifndef APP-NVUE */
     display: inline-flex;

package/components/u-icon/u-icon.vue

@@ -111,31 +111,31 @@ const props = defineProps({
      * @default '#606266'
      */
     labelColor: { type: String, default: '#606266' },
-	/**
-	 * label与图标的距离(横向排列)，单位rpx（默认6）
-	 * @default '6'
-	 */
-	marginLeft: { type: [String, Number], default: '6' },
-	/**
-	 * label与图标的距离(竖向排列)，单位rpx（默认6）
-	 * @default '6'
-	 */
-	marginTop: { type: [String, Number], default: '6' },
-	/**
-	 * label与图标的距离(竖向排列)，单位rpx（默认6）
-	 * @default '6'
-	 */
-	marginRight: { type: [String, Number], default: '6' },
-	/**
-	 * label与图标的距离(竖向排列)，单位rpx（默认6）
-	 * @default '6'
-	 */
-	marginBottom: { type: [String, Number], default: '6' },
+    /**
+     * label与图标的距离(横向排列)，单位rpx（默认6）
+     * @default '6'
+     */
+    marginLeft: { type: [String, Number], default: '6' },
+    /**
+     * label与图标的距离(竖向排列)，单位rpx（默认6）
+     * @default '6'
+     */
+    marginTop: { type: [String, Number], default: '6' },
+    /**
+     * label与图标的距离(竖向排列)，单位rpx（默认6）
+     * @default '6'
+     */
+    marginRight: { type: [String, Number], default: '6' },
+    /**
+     * label与图标的距离(竖向排列)，单位rpx（默认6）
+     * @default '6'
+     */
+    marginBottom: { type: [String, Number], default: '6' },
     /**
      * label与图标的距离，单位rpx，权重高于 margin
      * @default ''
      */
-	space: { type: [String, Number], default: '' },
+    space: { type: [String, Number], default: '' },
     /**
      * 图片的mode，参考uni-app image组件
      * @default 'widthFix'

package/components/u-number-keyboard/u-number-keyboard.vue

@@ -78,6 +78,8 @@ const numList = computed(() => {
             return $u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, cardX, 0]);
         }
     }
+    // 默认返回数字键盘
+    return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
 });
 
 /**

package/components/u-rate/u-rate.vue

@@ -2,9 +2,9 @@
     <view class="u-rate" :id="elId" @touchmove.stop.prevent="touchMove">
         <view class="u-star-wrap" v-for="(item, index) in count" :key="index" :class="[elClass]">
             <u-icon
-                :name="activeIndex > index ? elActiveIcon : inactiveIcon"
+                :name="String(activeIndex > index ? elActiveIcon : inactiveIcon)"
                 @click="click(index + 1, $event)"
-                :color="activeIndex > index ? elActiveColor : inactiveColor"
+                :color="String(activeIndex > index ? elActiveColor : inactiveColor)"
                 :custom-style="{
                     fontSize: size + 'rpx',
                     padding: `0 ${Number(gutter) / 2 + 'rpx'}`
@@ -197,10 +197,17 @@ watch(
 /**
  * 计算当前星星的显示小数部分（半星）
  */
-const decimal = computed(() => {
+const decimal = computed((): number => {
     if (props.disabled) {
-        return (Number(activeIndex.value) * 100) % 100;
+        // 只在允许半星时才返回小数部分，否则始终为0
+        if (props.allowHalf) {
+            // 计算当前激活星星的小数部分（如3.5星，返回50）
+            const val = Number(activeIndex.value);
+            return (val - Math.floor(val)) * 100;
+        }
+        return 0;
     } else if (props.allowHalf) {
+        // 允许半星时，返回50，否则0
         return 50;
     }
     return 0;

package/components/u-row-notice/u-row-notice.vue

@@ -147,6 +147,7 @@ const textStyle = computed(() => {
 const computeBgColor = computed(() => {
     if (props.bgColor) return props.bgColor;
     else if (props.type === 'none') return 'transparent';
+    else return '';
 });
 
 /**
@@ -223,32 +224,38 @@ function getMore() {
 
 <style lang="scss" scoped>
 @import '../../libs/css/style.components.scss';
+
 .u-notice-bar {
     padding: 18rpx 24rpx;
     overflow: hidden;
 }
+
 .u-direction-row {
     @include vue-flex;
     align-items: center;
     justify-content: space-between;
 }
+
 .u-left-icon {
     /* #ifndef APP-NVUE */
     display: inline-flex;
     /* #endif */
     align-items: center;
 }
+
 .u-notice-box {
     flex: 1;
     @include vue-flex;
     overflow: hidden;
     margin-left: 12rpx;
 }
+
 .u-right-icon {
     margin-left: 12rpx;
     display: inline-flex;
     align-items: center;
 }
+
 .u-notice-content {
     animation: u-loop-animation 10s linear infinite both;
     text-align: right;
@@ -257,15 +264,18 @@ function getMore() {
     @include vue-flex;
     flex-wrap: nowrap;
 }
+
 .u-notice-text {
     font-size: 26rpx;
     word-break: keep-all;
     white-space: nowrap;
 }
+
 @keyframes u-loop-animation {
     0% {
         transform: translate3d(0, 0, 0);
     }
+
     100% {
         transform: translate3d(-100%, 0, 0);
     }

package/components/u-tabbar/u-tabbar.vue

@@ -35,7 +35,8 @@
             ></view>
         </view>
         <!-- 这里加上一个48rpx的高度,是为了增高有凸起按钮时的防塌陷高度(也即按钮凸出来部分的高度) -->
-        <view class="u-fixed-placeholder safe-area-inset-bottom" :style="{ height: `calc(${$u.addUnit(props.height)} + ${props.midButton ? 48 : 0}rpx)` }"></view>
+        <!-- calc 计算0时单位不一致会计算失败，这里+1px -->
+        <view class="u-fixed-placeholder safe-area-inset-bottom" :style="{ height: `calc(${$u.addUnit(props.height)} + ${props.midButton ? '48rpx' : '1px'})` }"></view>
     </view>
 </template>
 
@@ -261,6 +262,7 @@ function getMidButtonLeft() {
     /* #ifndef APP-NVUE */
     box-sizing: content-box;
     /* #endif */
+    height: 50px;
 }
 .u-tabbar {
     &__content {