uview-pro 0.0.4 → 0.0.5

package/changelog.md

@@ -1,3 +1,32 @@
+## 0.0.5（2025-08-19）
+
+### ✨ Features | 新功能
+
+-   新增 u-city-select 城市选择器组件 ([0eb4806](https://gitee.com/anyup/uView-Pro/commit/0eb4806db3be39e1a6c6f33c9ea511d8445da884))
+-   完善 u-button 的 open-type 支持类型 ([37c0db5](https://gitee.com/anyup/uView-Pro/commit/37c0db527258bca57dbd55d7013b633230489853))
+
+### 🐛 Bug Fixes | Bug 修复
+
+-   u-upload 暴露 lists 属性 ([09f8424](https://gitee.com/anyup/uView-Pro/commit/09f8424774baaee3b6fc7a42458949f8d5903951))
+-   u-upload 深度监听文件列表变化并优化事件触发 ([a41a571](https://gitee.com/anyup/uView-Pro/commit/a41a5719ddf9d6793b78c55a13025bbdc88fdfe3))
+
+### 🚀 Demos | 示例页面优化
+
+-   优化关于页面布局和内容 ([ad5f6a4](https://gitee.com/anyup/uView-Pro/commit/ad5f6a47847999268b43b8c5dbf1a34cb8f70802))
+-   删除分类数据文件 ([5ed7a11](https://gitee.com/anyup/uView-Pro/commit/5ed7a1113db58ff493ad606296a210358348affe))
+-   重构 index list 页面 ([13d780e](https://gitee.com/anyup/uView-Pro/commit/13d780ea5acc4c8eed72062482735df826d4b37a))
+-   更新商场菜单组件引用 ([a5f1bf3](https://gitee.com/anyup/uView-Pro/commit/a5f1bf3f256705d6cad028d60701b4b0544332de))
+-   修改图片地址 ([c459893](https://gitee.com/anyup/uView-Pro/commit/c459893848936aa9a44e7bda3277ab1428109869))
+-   重构 upload 上传组件示例页面 ([686831d](https://gitee.com/anyup/uView-Pro/commit/686831de357aca67bbf7015e2f0696cf6bf48164))
+-   优化多个组件的代码结构和样式 ([f2af44c](https://gitee.com/anyup/uView-Pro/commit/f2af44ca1710334495e4c4fad99d04027b3788f8))
+-   添加提交规范相关配置文件 git-cz/husky/changelog ([d93b816](https://gitee.com/anyup/uView-Pro/commit/d93b816a5a3e468c4bc45e3161d7c006cba5fbf6))
+-   优化 deepClone 和 deepMerge 页面的结果展示 ([b0daa70](https://gitee.com/anyup/uView-Pro/commit/b0daa700b6a385e037d38dc1f10b3612596e2403))
+-   新增优惠券模板 ([1b77762](https://gitee.com/anyup/uView-Pro/commit/1b777621615f7ebe9d83606d53650987c8b2c4e0))
+-   更新 easycom 配置说明，一定要放在 custom 里，否则不生效 ([fc14bf9](https://gitee.com/anyup/uView-Pro/commit/fc14bf90cb77088d258e20e79e3d25820f37e97e))
+-   添加模板示例页面 ([3336af4](https://gitee.com/anyup/uView-Pro/commit/3336af406161648d18578c988d9b3ad79b86059a))
+-   新增模版相关页面 ([8925a02](https://gitee.com/anyup/uView-Pro/commit/8925a02f9fa88f4742d984f2ff02909afc6ad0d7))
+-   重构 request 类，优化泛型支持 ([d7b2e6a](https://gitee.com/anyup/uView-Pro/commit/d7b2e6a224d96f717e5bdbaf09edb19b712ced47))
+
 ## 0.0.4（2025-08-14）
 
 ### 新增
@@ -31,3 +60,105 @@
 -   兼容安卓，iOS，微信小程序，H5 等
 -   详尽的文档支持，现代化的演示效果
 -   按需引入，精简打包体积
+
+### 基础组件（8）
+
+-   Color 色彩
+-   Icon 图标
+-   Image 图片
+-   Button 按钮
+-   Layout 布局
+-   Cell 单元格
+-   Badge 徽标数
+-   Tag 标签
+
+---
+
+### 表单组件（15）
+
+-   Form 表单
+-   Calendar 日历
+-   Select 列选择器
+-   Keyboard 键盘
+-   Picker 选择器
+-   Rate 评分
+-   Search 搜索
+-   NumberBox 步进器
+-   Upload 上传
+-   VerificationCode 验证码倒计时
+-   Field 输入框
+-   Checkbox 复选框
+-   Radio 单选框
+-   Switch 开关选择器
+-   Slider 滑动选择器
+
+---
+
+### 数据组件（4）
+
+-   Progress 进度条
+-   Table 表格
+-   CountDown 倒计时
+-   CountTo 数字滚动
+
+---
+
+### 反馈组件（10）
+
+-   ActionSheet 操作菜单
+-   AlertTips 警告提示
+-   Toast 消息提示
+-   NoticeBar 滚动通知
+-   TopTips 顶部提示
+-   SwipeAction 滑动单元格
+-   Collapse 折叠面板
+-   Popup 弹出层
+-   Modal 模态框
+-   fullScreen 压窗屏
+
+---
+
+### 布局组件（11）
+
+-   Line 线条
+-   Card 卡片
+-   Mask 遮罩层
+-   NoNetwork 无网络提示
+-   Grid 宫格布局
+-   Swiper 轮播图
+-   TimeLine 时间轴
+-   Skeleton 骨架屏
+-   Sticky 吸顶
+-   Waterfall 瀑布流
+-   Divider 分割线
+
+---
+
+### 导航组件（11）
+
+-   Dropdown 下拉菜单
+-   Tabbar 底部导航栏
+-   BackTop 返回顶部
+-   Navbar 导航栏
+-   Tabs 标签
+-   TabsSwiper 全屏选项卡
+-   Subsection 分段器
+-   IndexList 索引列表
+-   Steps 步骤条
+-   Empty 内容为空
+-   Section 查看更多
+
+---
+
+### 其他组件（8）
+
+-   MessageInput 验证码输入
+-   Loadmore 加载更多
+-   ReadMore 展开阅读更多
+-   LazyLoad 懒加载
+-   Gap 间隔槽
+-   Avatar 头像
+-   Link 超链接
+-   Loading 加载动画
+
+---

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-upload/u-upload.vue

@@ -95,6 +95,8 @@ defineOptions({
  * @event {Function} on-progress 图片上传过程中的进度变化过程触发
  * @event {Function} on-uploaded 所有图片上传完毕触发
  * @event {Function} on-choose-complete 每次选择图片后触发，只是让外部可以得知每次选择后，内部的文件列表
+ * @event {Function} on-choose-fail 文件选择失败时触发
+ * @event {Function} on-list-change 文件列表发生变化时触发
  * @example <u-upload :action="action" :file-list="fileList" ></u-upload>
  */
 
@@ -193,13 +195,17 @@ watch(
             !tmp && lists.value.push({ url: value.url, error: false, progress: 100 });
         });
     },
-    { immediate: true }
+    { immediate: true, deep: true }
 );
 
 // 监听 lists 变化，发出事件
-watch(lists, n => {
-    emit('on-list-change', n, props.index);
-});
+watch(
+    lists,
+    n => {
+        emit('on-list-change', n, props.index);
+    },
+    { deep: true }
+);
 
 /**
  * 清除列表
@@ -502,7 +508,7 @@ function checkFileExt(file: any) {
     return noArrowExt;
 }
 
-defineExpose({ clear, reUpload, selectFile, upload, retry, remove, doPreviewImage });
+defineExpose({ clear, reUpload, selectFile, upload, retry, remove, doPreviewImage, lists });
 </script>
 
 <style lang="scss" scoped>

package/libs/request/auto-http.ts

@@ -0,0 +1,76 @@
+import deepMerge from '../function/deepMerge';
+
+export function isFunction(f: any): boolean {
+    return typeof f === 'function';
+}
+
+export function isPromise(p: any): boolean {
+    return !!(p && p.then && p.catch);
+}
+
+export function isArray(arr: any) {
+    return Object.prototype.toString.call(arr) === '[object Array]';
+}
+
+/**
+ * 构建基础类
+ */
+class Builder<T> {
+    instance: any;
+
+    constructor(instance: any) {
+        this.instance = instance;
+    }
+    /**
+     *
+     * @param urlConfig url 配置表
+     * @param extra 其他请求方法对象
+     * @returns Object
+     */
+    dispatch(urlConfig: Record<string, any>, extra: Record<string, any> = {}): Record<string, any> {
+        const builder: Record<string, any> = {};
+        // 创建 API
+        Object.keys(urlConfig).forEach(name => {
+            builder[name] = this.use.bind(this, urlConfig[name]);
+        });
+        return { ...builder, ...extra };
+    }
+    /**
+     * 发送请求
+     * @param {*} urlConfig : url 配置表
+     * @demo urlConfig = { login: { url: '/user/login', method: 'GET', loading: true } }
+     * @param {*} config : 开放配置，用户主动配置的
+     * @demo api.login({ params: { username: "admin" } })
+     * @returns Promise
+     */
+    use(urlConfig: Record<string, any>, config: Record<string, any> = {}): Promise<T> {
+        // 请求地址
+        let url = config?.url ?? urlConfig.url;
+        // 兼容 restful url，如果是使用url为function，则为restful格式
+        if (config.url && isFunction(config.url)) {
+            url = `${urlConfig.url}${config.url()}`;
+        }
+        // 请求类型，get,post,put,delete
+        const method = config?.method ?? urlConfig?.method ?? 'GET';
+        // 如果有自定义的工厂函数基础类
+        const options = { ...deepMerge(urlConfig, config), url, method };
+        if (isFunction(this.instance) || isPromise(this.instance)) {
+            return this.instance(options);
+        }
+        // 如果是使用的 instance
+        // 默认的请求基础类
+        return this.instance.request(options);
+    }
+}
+
+/**
+ * Http 基础类
+ */
+class AutoHttp {
+    static get Builder() {
+        return Builder;
+    }
+    constructor() {}
+}
+
+export { AutoHttp };

package/libs/request/uni-http.ts

@@ -3,6 +3,7 @@
  * 基于 Promise 对象实现更简单的 request 使用方式，支持请求和响应拦截
  * @author anyup
  */
+import deepMerge from '../function/deepMerge';
 
 // 请求内容类型枚举
 export enum ContentType {
@@ -20,28 +21,28 @@ export type HttpHeaderType = Record<string, string>;
 // 请求配置类型
 export interface HttpRequestConfig {
     baseURL?: string;
-    url?: string;
+    url?: string | Function;
     header?: HttpHeaderType;
-    data?: any;
+    data?: unknown;
     method?: HttpMethod;
     dataType?: string;
     responseType?: string;
-    success?: (res: any) => void;
-    fail?: (err: any) => void;
-    complete?: (res: any) => void;
-    [key: string]: any;
+    success?: (res: unknown) => void;
+    fail?: (err: unknown) => void;
+    complete?: (res: unknown) => void;
+    [key: string]: unknown;
 }
 
 // 拦截器类型
-export interface Interceptor<T = any> {
-    handler?: (arg: T, P: typeof Promise) => any;
-    onerror?: (arg: T, P: typeof Promise) => any;
-    complete?: (arg: T, P: typeof Promise) => any;
+export interface Interceptor<T = unknown> {
+    handler?: (arg: T, P: typeof Promise) => unknown;
+    onerror?: (arg: T, P: typeof Promise) => unknown;
+    complete?: (arg: T, P: typeof Promise) => unknown;
     use: (...args: any[]) => void;
     lock?: () => void;
     unlock?: () => void;
     clear?: () => void;
-    p?: Promise<any> | null;
+    p?: Promise<unknown> | null;
 }
 
 /**
@@ -81,15 +82,17 @@ export class Builder {
     /**
      * 发送请求
      */
-    use(urlConfig: Record<string, any>, data?: any, config: HttpRequestConfig = {}) {
-        let url: string = config.url || urlConfig.url;
-        const append: string = config.append || '';
-        url = url + append;
-        const defaultFn = (res: any) => res;
-        const successFn: (res: any) => any = config.success || defaultFn;
-        // 只传递一个参数，避免类型不符
-        const callbackFn = (res: any) => successFn(res);
-        return this.http.request({ url, data, ...urlConfig, ...config }).then(callbackFn);
+    use<T = unknown>(urlConfig: Record<string, any>, data?: unknown, config: HttpRequestConfig = {}): Promise<T> {
+        // 请求地址
+        let url = config?.url ?? urlConfig.url;
+        // 兼容 restful url，如果是使用url为function，则为restful格式
+        if (config.url && typeof config.url === 'function') {
+            url = `${urlConfig.url}${config.url()}`;
+        }
+        // 请求类型，get,post,put,delete
+        const method = config?.method ?? urlConfig?.method ?? 'GET';
+        const options = { ...deepMerge(urlConfig, config), url, method };
+        return this.http.request<T>(options);
     }
 }
 
@@ -154,11 +157,13 @@ export class Http {
     /**
      * 设置 data
      */
-    setData(data: any) {
+    setData(data: unknown) {
         if (isArray(data)) {
             this.config.data = data;
+        } else if (isObject(data) && isObject(this.config.data)) {
+            this.config.data = { ...(this.config.data as object), ...(data as object) };
         } else {
-            this.config.data = { ...this.config.data, ...data };
+            this.config.data = data;
         }
         return this;
     }
@@ -176,7 +181,7 @@ export class Http {
      * @returns Promise
      * 说明：配置优先级 实时传递的 options > 公共配置的 config
      */
-    request<T = any>(options: HttpRequestConfig = {}): Promise<T> {
+    request<T = unknown>(options: HttpRequestConfig = {}): Promise<T> {
         if (!options) options = {};
         // 请求体
         const data = options.data || {};
@@ -191,8 +196,10 @@ export class Http {
         // 请求体：优先级为：实时传递的 > 公共配置的
         if (isArray(data)) {
             options.data = data;
+        } else if (isObject(data) && isObject(this.config.data)) {
+            options.data = { ...(this.config.data as object), ...(data as object) };
         } else {
-            options.data = { ...this.config.data, ...data };
+            options.data = data;
         }
 
         // 拦截器处理
@@ -201,11 +208,11 @@ export class Http {
         const responseInterceptor = interceptors.response;
         const requestInterceptorHandler = requestInterceptor.handler;
 
-        return new Promise((resolve: (value: T) => void, reject: (reason?: any) => void) => {
-            function isPromise(p: any): p is Promise<any> {
-                return p && typeof p.then === 'function' && typeof p.catch === 'function';
+        return new Promise((resolve: (value: T) => void, reject: (reason?: unknown) => void) => {
+            function isPromise(p: unknown): p is Promise<unknown> {
+                return !!p && typeof (p as any).then === 'function' && typeof (p as any).catch === 'function';
             }
-            function enqueueIfLocked(promise: Promise<any> | null | undefined, callback: () => void) {
+            function enqueueIfLocked(promise: Promise<unknown> | null | undefined, callback: () => void) {
                 if (promise) {
                     promise.then(() => {
                         callback();
@@ -214,31 +221,27 @@ export class Http {
                     callback();
                 }
             }
-            function onresult(
-                handler: ((arg: any, P: typeof Promise) => any) | undefined,
-                response: any,
-                type: number
-            ) {
+            function onresult(handler: ((arg: unknown, P: typeof Promise) => unknown) | undefined, response: unknown, type: number) {
                 enqueueIfLocked(responseInterceptor.p, function () {
                     if (handler) {
-                        response.request = options;
+                        (response as any).request = options;
                         const ret = handler.call(responseInterceptor, response, Promise);
                         response = ret === undefined ? response : ret;
                     }
                     if (!isPromise(response)) {
                         response = Promise[type === 0 ? 'resolve' : 'reject'](response);
                     }
-                    response
-                        .then((d: any) => {
-                            resolve(d.data);
+                    (response as Promise<unknown>)
+                        .then((d: unknown) => {
+                            resolve((d as any).data as T);
                         })
-                        .catch((e: any) => {
+                        .catch((e: unknown) => {
                             reject(e);
                         });
                 });
             }
-            options.complete = (response: any) => {
-                const statusCode: number = response.statusCode;
+            (options as any).complete = (response: unknown) => {
+                const statusCode: number = (response as any).statusCode;
                 let type = 0;
                 if ((statusCode >= 200 && statusCode < 300) || statusCode === 304) {
                     type = 0;
@@ -251,26 +254,32 @@ export class Http {
             };
             enqueueIfLocked(requestInterceptor.p, () => {
                 options = Object.assign({}, this.config, options);
-                options.requestId = new Date().getTime();
-                let ret: any = options;
+                (options as any).requestId = new Date().getTime();
+                let ret: unknown = options;
                 if (requestInterceptorHandler) {
                     ret = requestInterceptorHandler.call(requestInterceptor, options, Promise) || options;
                 }
                 if (!isPromise(ret)) {
                     ret = Promise.resolve(ret);
                 }
-                ret.then(
-                    (d: any) => {
+                (ret as Promise<unknown>).then(
+                    (d: unknown) => {
                         if (d === options) {
-                            d.url = d.url && d.url.indexOf('http') !== 0 ? d.baseURL + d.url : d.url;
-                            d.url = d.restURL ? d.url + d.restURL : d.url;
-                            d.method = d.method.toUpperCase();
-                            d.method === 'UPLOAD' ? uni.uploadFile(d) : uni.request(d);
+                            // 这里断言为 any，兼容 baseURL、restURL、url、method 等属性
+                            const req = d as any;
+                            req.url = req.url && req.url.indexOf('http') !== 0 ? req.baseURL + req.url : req.url;
+                            req.url = req.restURL ? req.url + req.restURL : req.url;
+                            req.method = req.method.toUpperCase();
+                            if (req.method === 'UPLOAD') {
+                                uni.uploadFile(req);
+                            } else {
+                                uni.request(req);
+                            }
                         } else {
-                            resolve(d);
+                            resolve(d as T);
                         }
                     },
-                    (err: any) => {
+                    (err: unknown) => {
                         reject(err);
                     }
                 );
@@ -281,29 +290,81 @@ export class Http {
     /**
      * 并发请求
      */
-    all<T = any>(promises: Promise<T>[]): Promise<T[]> {
+    all<T = unknown>(promises: Promise<T>[]): Promise<T[]> {
         return Promise.all(promises);
     }
 
-    // 动态方法扩展：get/post/put/patch/head/delete/upload
-    [key: string]: any;
-}
-
-['get', 'post', 'put', 'patch', 'head', 'delete', 'upload'].forEach(e => {
-    Http.prototype[e] = function (url: string, data?: any, option?: HttpRequestConfig) {
-        return this.request(merge({ url, data, method: e.toUpperCase() }, option));
-    };
-});
+    /**
+     * GET 请求
+     */
+    get<T = unknown>(url: string, data?: unknown, option?: HttpRequestConfig): Promise<T> {
+        return this.request<T>(merge({ url, data, method: 'GET' }, option));
+    }
+    /**
+     * POST 请求
+     */
+    post<T = unknown>(url: string, data?: unknown, option?: HttpRequestConfig): Promise<T> {
+        return this.request<T>(merge({ url, data, method: 'POST' }, option));
+    }
+    /**
+     * PUT 请求
+     */
+    put<T = unknown>(url: string, data?: unknown, option?: HttpRequestConfig): Promise<T> {
+        return this.request<T>(merge({ url, data, method: 'PUT' }, option));
+    }
+    /**
+     * PATCH 请求
+     */
+    patch<T = unknown>(url: string, data?: unknown, option?: HttpRequestConfig): Promise<T> {
+        return this.request<T>(merge({ url, data, method: 'PATCH' }, option));
+    }
+    /**
+     * HEAD 请求
+     */
+    head<T = unknown>(url: string, data?: unknown, option?: HttpRequestConfig): Promise<T> {
+        return this.request<T>(merge({ url, data, method: 'HEAD' }, option));
+    }
+    /**
+     * DELETE 请求
+     */
+    delete<T = unknown>(url: string, data?: unknown, option?: HttpRequestConfig): Promise<T> {
+        return this.request<T>(merge({ url, data, method: 'DELETE' }, option));
+    }
+    /**
+     * UPLOAD 文件上传
+     */
+    upload<T = unknown>(url: string, data?: unknown, option?: HttpRequestConfig): Promise<T> {
+        return this.request<T>(merge({ url, data, method: 'UPLOAD' }, option));
+    }
 
-['lock', 'unlock', 'clear'].forEach(e => {
-    Http.prototype[e] = function () {
-        const fn = this.interceptors.request[e as keyof Interceptor];
+    /**
+     * 拦截器锁定
+     */
+    lock(): void {
+        const fn = this.interceptors.request.lock;
         if (typeof fn === 'function') {
-            // 只传递 this 作为上下文，不传参数，适配所有类型
-            (fn as () => void).call(this.interceptors.request);
+            fn.call(this.interceptors.request);
         }
-    };
-});
+    }
+    /**
+     * 拦截器解锁
+     */
+    unlock(): void {
+        const fn = this.interceptors.request.unlock;
+        if (typeof fn === 'function') {
+            fn.call(this.interceptors.request);
+        }
+    }
+    /**
+     * 拦截器清空
+     */
+    clear(): void {
+        const fn = this.interceptors.request.clear;
+        if (typeof fn === 'function') {
+            fn.call(this.interceptors.request);
+        }
+    }
+}
 
 // 数据合并
 function merge(a: any, b: any): any {

package/package.json

@@ -1,9 +1,9 @@
 {
     "id": "uview-pro",
     "name": "uview-pro",
-    "displayName": "uView Pro是uni-app全面兼容Vue3+TS的uni-app生态框架，70+精选组件",
-    "version": "0.0.4",
-    "description": "uView Pro，是uni-app全面兼容Vue3的uni-app生态框架，70+精选组件已使用TypeScript重构，已全面支持uni-app Vue3.0",
+    "displayName": "uView Pro是uni-app全面支持Vue3+TS的uni-app生态框架，70+精选组件",
+    "version": "0.0.5",
+    "description": "uView Pro，是uni-app全面支持Vue3的uni-app生态框架，70+精选组件已使用TypeScript重构，已全面支持uni-app Vue3.0",
     "main": "index.ts",
     "module": "index.ts",
     "browser": "index.ts",
@@ -58,6 +58,8 @@
                     "app-vue": "y",
                     "app-nvue": "n",
                     "app-uvue": "n",
+                    "app-android": "y",
+                    "app-ios": "y",
                     "app-harmony": "u"
                 },
                 "H5-mobile": {

package/readme.md

@@ -69,7 +69,7 @@ uView Pro QQ 交流群： [点击进入](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027
 
 <table class="table">
     <tr>
-        <td><img src="https://ik.imagekit.io/anyup/images/social/weixin-chat.png" width="250" height="345" ></td>
+        <td><img src="https://ik.imagekit.io/anyup/images/social/weixin-chat.png?updatedAt=1755597368053" width="250" height="345" ></td>
         <td><img src="https://ik.imagekit.io/anyup/images/social/qq-chat.png" width="250" height="345" ></td>
     </tr>
     <tr>
@@ -112,6 +112,7 @@ pnpm add uview-pro
 import { createSSRApp } from 'vue';
 // npm安装方式
 import uViewPro from 'uview-pro';
+
 // uni_modules安装方式
 // import uViewPro from '@/uni_modules/uview-pro';
 
@@ -154,11 +155,14 @@ export function createApp() {
 // pages.json
 {
     "easycom": {
-        // uni_modules安装的方式需要前面的"@/uni_modules/"，npm安装的方式无需"@/"，以下方式任选其一
-        // npm安装方式
-        "^u-(.*)": "uview-pro/components/u-$1/u-$1.vue"
-        // uni_modules安装方式
-        // "^u-(.*)": "@/uni_modules/uview-pro/components/u-$1/u-$1.vue"
+        // 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
+        "custom": {
+            // uni_modules安装的方式需要前面的"@/uni_modules/"，npm安装的方式无需"@/"，以下方式任选其一
+            // npm安装方式
+            "^u-(.*)": "uview-pro/components/u-$1/u-$1.vue"
+            // uni_modules安装方式
+            // "^u-(.*)": "@/uni_modules/uview-pro/components/u-$1/u-$1.vue"
+        }
     },
     // 此为本身已有的内容
     "pages": [