From 6cb9472225624435fd8ed85298e9c9840c0d06e8 Mon Sep 17 00:00:00 2001 From: nitmali Date: Thu, 22 Oct 2020 09:11:28 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91selec?= =?UTF-8?q?t=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC=E7=9A=84extra?= =?UTF-8?q?=E5=9C=A8=E6=9F=90=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B(0?= =?UTF-8?q?=E3=80=81''=E3=80=81false)=E6=97=A0=E6=B3=95=E5=9C=A8=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0=E4=B8=AD=E8=8E=B7=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-select/u-select.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uview-ui/components/u-select/u-select.vue b/uview-ui/components/u-select/u-select.vue index 1285845e..3c98c5f1 100644 --- a/uview-ui/components/u-select/u-select.vue +++ b/uview-ui/components/u-select/u-select.vue @@ -268,7 +268,7 @@ export default { label: tmp ? tmp[this.labelName] : null }; // 判断是否存在额外的参数，如果存在，就返回 - if(tmp && tmp.extra) data.extra = tmp.extra; + if(tmp && tmp.extra !== undefined) data.extra = tmp.extra; this.selectValue.push(data) } }, From 37fa38a930ebdcf9cc32c606cd9f349c172efdee Mon Sep 17 00:00:00 2001 From: yiruiwen <1416956117@qq.com> Date: Thu, 17 Dec 2020 21:30:18 +0800 Subject: [PATCH 02/58] =?UTF-8?q?1.=20=E5=8E=BB=E9=99=A4=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E5=88=87=E6=8D=A2=E6=97=B6=E7=9A=84=E9=9C=87?= =?UTF-8?q?=E5=8A=A8=E6=95=88=E6=9E=9C=202.=20=E4=BC=98=E5=8C=96=E5=A4=9A?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=BB=84=E5=90=88=E4=BD=BF=E7=94=A8=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=BB=84=E4=BB=B6=E5=8D=B8=E8=BD=BD=E7=94=9F?= =?UTF-8?q?=E5=91=BD=E5=91=A8=E6=9C=9F=E6=97=B6=E7=A7=BB=E9=99=A4=E5=9C=A8?= =?UTF-8?q?=E7=88=B6=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=EF=BC=8C=E9=87=8A=E6=94=BE=E8=B5=84=E6=BA=90=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E9=80=A0=E6=88=90=E6=95=B0=E6=8D=AE=E6=B7=B7=E4=B9=B1?= =?UTF-8?q?=203.=20=E4=BC=98=E5=8C=96$u.timeFormat()=E5=92=8C$u.timeFrom()?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=97=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=204.=20=E4=BC=98=E5=8C=96tabbar=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=9C=A8=E5=B0=8F=E5=B1=8F=E5=B9=95=E4=B8=AD=EF=BC=8C=E6=96=87?= =?UTF-8?q?=E5=AD=97=E5=8F=AF=E8=83=BD=E4=BC=9A=E8=A2=AB=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=205.=20=E4=BC=98=E5=8C=96=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E4=B8=AD=EF=BC=8C=E4=BF=AE=E6=94=B9header=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=BD=B1=E5=93=8D=E5=88=B0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pages/componentsA/avatar/index.vue | 10 +++++----- pages/componentsA/avatarCropper/index.vue | 4 ++-- pages/componentsA/backTop/index.vue | 8 ++++---- pages/componentsA/calendar/index.vue | 6 +++--- pages/componentsA/empty/index.vue | 2 +- pages/componentsA/field/index.vue | 10 +++++----- pages/componentsA/form/index.vue | 8 ++++---- pages/componentsA/fullScreen/index.vue | 2 +- pages/componentsA/keyboard/index.vue | 10 +++++----- pages/componentsA/modal/index.vue | 8 ++++---- pages/componentsA/navbar/index.vue | 14 +++++++------- pages/componentsA/noNetwork/index.vue | 4 ++-- pages/componentsA/select/index.vue | 4 ++-- pages/componentsA/slider/index.vue | 10 +++++----- pages/componentsA/tabs/index.vue | 8 ++++---- pages/componentsA/tag/index.vue | 12 ++++++------ pages/componentsA/toast/index.vue | 8 ++++---- pages/componentsA/topTips/index.vue | 4 ++-- pages/componentsA/verificationCode/index.vue | 4 ++-- pages/componentsB/card/index.vue | 8 ++++---- pages/componentsB/checkbox/index.vue | 16 ++++++++-------- pages/componentsB/divider/index.vue | 8 ++++---- pages/componentsB/dropdown/index.vue | 6 +++--- pages/componentsB/image/index.vue | 8 ++++---- pages/componentsB/line/index.vue | 8 ++++---- pages/componentsB/loading/index.vue | 8 ++++---- pages/componentsB/noticeBar/index.vue | 12 ++++++------ pages/componentsB/picker/index.vue | 10 +++++----- pages/componentsB/radio/index.vue | 14 +++++++------- pages/componentsB/rate/index.vue | 14 +++++++------- pages/componentsB/readMore/index.vue | 4 ++-- pages/componentsB/search/index.vue | 10 +++++----- pages/componentsB/skeleton/index.vue | 6 +++--- pages/componentsB/steps/index.vue | 8 ++++---- pages/componentsB/sticky/index.vue | 4 ++-- pages/componentsB/swipeAction/index.vue | 4 ++-- pages/componentsB/swiper/index.vue | 8 ++++---- pages/componentsB/switch/index.vue | 12 ++++++------ pages/componentsB/tabbar/index.vue | 10 +++++----- pages/componentsB/table/index.vue | 4 ++-- pages/componentsB/upload/index.vue | 8 ++++---- pages/componentsC/actionSheet/index.vue | 4 ++-- pages/componentsC/alertTips/index.vue | 8 ++++---- pages/componentsC/badge/index.vue | 12 ++++++------ pages/componentsC/button/index.vue | 14 +++++++------- pages/componentsC/cell/index.vue | 14 +++++++------- pages/componentsC/collapse/index.vue | 6 +++--- pages/componentsC/countDown/index.vue | 10 +++++----- pages/componentsC/countTo/index.vue | 10 +++++----- pages/componentsC/gap/index.vue | 6 +++--- pages/componentsC/grid/index.vue | 6 +++--- pages/componentsC/layout/index.vue | 6 +++--- pages/componentsC/link/index.vue | 4 ++-- pages/componentsC/loadmore/index.vue | 8 ++++---- pages/componentsC/mask/index.vue | 8 ++++---- pages/componentsC/messageInput/index.vue | 12 ++++++------ pages/componentsC/numberBox/index.vue | 8 ++++---- pages/componentsC/popup/index.vue | 8 ++++---- pages/componentsC/progress/index.vue | 8 ++++---- pages/componentsC/section/index.vue | 10 +++++----- pages/componentsC/subsection/index.vue | 8 ++++---- pages/library/color/index.vue | 4 ++-- pages/library/colorSwitch/index.vue | 4 ++-- pages/library/debounce/index.vue | 6 +++--- pages/library/deepMerge/index.vue | 2 +- pages/library/getRect/index.vue | 4 ++-- pages/library/globalVariable/globalData.vue | 2 +- pages/library/globalVariable/prototype.vue | 2 +- pages/library/globalVariable/vuex.vue | 2 +- pages/library/guid/index.vue | 6 +++--- pages/library/http/index.vue | 2 +- pages/library/md5/index.vue | 2 +- pages/library/queryParams/index.vue | 2 +- pages/library/random/index.vue | 2 +- pages/library/route/index.vue | 6 +++--- pages/library/test/index.vue | 8 ++++---- pages/library/timeFormat/index.vue | 4 ++-- pages/library/timeFrom/index.vue | 4 ++-- pages/library/trim/index.vue | 2 +- uview-ui/components/u-cell-item/u-cell-item.vue | 6 +++--- uview-ui/components/u-image/u-image.vue | 4 ++-- uview-ui/components/u-tabbar/u-tabbar.vue | 2 ++ uview-ui/libs/function/timeFormat.js | 2 +- uview-ui/libs/mixin/mixin.js | 14 ++++++++++++++ uview-ui/libs/request/index.js | 2 +- 86 files changed, 304 insertions(+), 288 deletions(-) diff --git a/README.md b/README.md index 2a9f00ee..cd8050cb 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ## [官方文档：https://www.uviewui.com](https://www.uviewui.com) -### [点击加群交流反馈：1084514613](https://jq.qq.com/?_wv=1027&k=uyZUkSlo) +### [点击加群交流反馈：863820668](https://jq.qq.com/?_wv=1027&k=uyZUkSlo) ## 特性 diff --git a/pages/componentsA/avatar/index.vue b/pages/componentsA/avatar/index.vue index 2689091c..d10e1a06 100644 --- a/pages/componentsA/avatar/index.vue +++ b/pages/componentsA/avatar/index.vue @@ -21,23 +21,23 @@ 模式选择 - + 性别选择 - + 等级 - + 自定义内容 - + 尺寸 - + diff --git a/pages/componentsA/avatarCropper/index.vue b/pages/componentsA/avatarCropper/index.vue index b98210e1..8347e972 100644 --- a/pages/componentsA/avatarCropper/index.vue +++ b/pages/componentsA/avatarCropper/index.vue @@ -16,11 +16,11 @@ 生成图片质量 - + 自定义参数 - + --> diff --git a/pages/componentsA/backTop/index.vue b/pages/componentsA/backTop/index.vue index 64b115b9..351f8eae 100644 --- a/pages/componentsA/backTop/index.vue +++ b/pages/componentsA/backTop/index.vue @@ -17,19 +17,19 @@ 模式 - + 组件位置 - + 显示组件的滚动条距离 - + 自定义样式 - + diff --git a/pages/componentsA/calendar/index.vue b/pages/componentsA/calendar/index.vue index e95227f7..e28cce59 100644 --- a/pages/componentsA/calendar/index.vue +++ b/pages/componentsA/calendar/index.vue @@ -19,15 +19,15 @@ 状态 - + 模式 - + 自定义样式 - + diff --git a/pages/componentsA/empty/index.vue b/pages/componentsA/empty/index.vue index 8b9d42cc..06bdff89 100644 --- a/pages/componentsA/empty/index.vue +++ b/pages/componentsA/empty/index.vue @@ -76,7 +76,7 @@ 传入slot - + diff --git a/pages/componentsA/field/index.vue b/pages/componentsA/field/index.vue index 33781e8b..5283d621 100644 --- a/pages/componentsA/field/index.vue +++ b/pages/componentsA/field/index.vue @@ -30,23 +30,23 @@ 右侧按钮 - + 显示错误信息 - + 是否必填 - + 显示左图标和右箭头 - + 第一个输入框为textarea类型 - + diff --git a/pages/componentsA/form/index.vue b/pages/componentsA/form/index.vue index 6288a55a..3b3b602d 100644 --- a/pages/componentsA/form/index.vue +++ b/pages/componentsA/form/index.vue @@ -64,19 +64,19 @@ label对齐方式 - + 边框 - + radio、checkbox样式 - + 错误提示方式 - + diff --git a/pages/componentsA/fullScreen/index.vue b/pages/componentsA/fullScreen/index.vue index 244afc0c..5e483a1f 100644 --- a/pages/componentsA/fullScreen/index.vue +++ b/pages/componentsA/fullScreen/index.vue @@ -15,7 +15,7 @@ 状态 - + diff --git a/pages/componentsA/keyboard/index.vue b/pages/componentsA/keyboard/index.vue index e82b5a6e..017c6cbd 100644 --- a/pages/componentsA/keyboard/index.vue +++ b/pages/componentsA/keyboard/index.vue @@ -19,23 +19,23 @@ 键盘开关 - + 键盘类型 - + 打乱顺序 - + 上方工具条 - + 是否显示遮罩 - + diff --git a/pages/componentsA/modal/index.vue b/pages/componentsA/modal/index.vue index 54f0ea77..85326495 100644 --- a/pages/componentsA/modal/index.vue +++ b/pages/componentsA/modal/index.vue @@ -21,21 +21,21 @@ 参数配置 状态 - + 是否显示标题 - + 自定义内容 - + 异步关闭 - + diff --git a/pages/componentsA/navbar/index.vue b/pages/componentsA/navbar/index.vue index 47badd7e..a7fed0f4 100644 --- a/pages/componentsA/navbar/index.vue +++ b/pages/componentsA/navbar/index.vue @@ -52,31 +52,31 @@ 标题长度 - + 隐藏左侧返回区域 - + 自定义左侧内容 - + 自定义右侧内容 - + 传入整体slot - + 完全自定义传入内容 - + 背景色 - + diff --git a/pages/componentsA/noNetwork/index.vue b/pages/componentsA/noNetwork/index.vue index 0b9a49bb..d5a24088 100644 --- a/pages/componentsA/noNetwork/index.vue +++ b/pages/componentsA/noNetwork/index.vue @@ -13,11 +13,11 @@ 自定义提示语 - + 自定义图标 - + diff --git a/pages/componentsA/select/index.vue b/pages/componentsA/select/index.vue index 39ad8aa5..5755f3a2 100644 --- a/pages/componentsA/select/index.vue +++ b/pages/componentsA/select/index.vue @@ -11,11 +11,11 @@ 参数配置 状态 - + 模式 - + diff --git a/pages/componentsA/slider/index.vue b/pages/componentsA/slider/index.vue index 4daf5e0c..2a08c183 100644 --- a/pages/componentsA/slider/index.vue +++ b/pages/componentsA/slider/index.vue @@ -28,25 +28,25 @@ 参数配置 自定义颜色 - + 自定义传入内容 - + 自定义尺寸 - + 步进值 - + 最大最小值 - + diff --git a/pages/componentsA/tabs/index.vue b/pages/componentsA/tabs/index.vue index f702ee50..8ccdb763 100644 --- a/pages/componentsA/tabs/index.vue +++ b/pages/componentsA/tabs/index.vue @@ -14,19 +14,19 @@ 模式选择 - + 标签个数(非滚动模式) - + 活动选项字颜色 - + 字体加粗 - + diff --git a/pages/componentsA/tag/index.vue b/pages/componentsA/tag/index.vue index d23b90f5..a890f5b0 100644 --- a/pages/componentsA/tag/index.vue +++ b/pages/componentsA/tag/index.vue @@ -11,27 +11,27 @@ 参数配置 模式选择 - + 显示内容 - + 主题选择 - + 形状 - + 尺寸 - + 关闭图标 - + diff --git a/pages/componentsA/toast/index.vue b/pages/componentsA/toast/index.vue index d25c0682..b5a250ef 100644 --- a/pages/componentsA/toast/index.vue +++ b/pages/componentsA/toast/index.vue @@ -13,19 +13,19 @@ 主题 - + 结束后自动跳转 - + 位置 - + 显示图标 - + diff --git a/pages/componentsA/topTips/index.vue b/pages/componentsA/topTips/index.vue index 0b524099..1037410e 100644 --- a/pages/componentsA/topTips/index.vue +++ b/pages/componentsA/topTips/index.vue @@ -13,11 +13,11 @@ 主题选择 - + 显示时间 - + diff --git a/pages/componentsA/verificationCode/index.vue b/pages/componentsA/verificationCode/index.vue index 01a57edd..f899defd 100644 --- a/pages/componentsA/verificationCode/index.vue +++ b/pages/componentsA/verificationCode/index.vue @@ -17,11 +17,11 @@ 倒计时间 - + 自定义提示语 - + diff --git a/pages/componentsB/card/index.vue b/pages/componentsB/card/index.vue index 731a5a48..f949f076 100644 --- a/pages/componentsB/card/index.vue +++ b/pages/componentsB/card/index.vue @@ -27,19 +27,19 @@ 左上角图标 - + 内边距 - + 底部 - + 外边框 - + diff --git a/pages/componentsB/checkbox/index.vue b/pages/componentsB/checkbox/index.vue index 283ba768..0249d543 100644 --- a/pages/componentsB/checkbox/index.vue +++ b/pages/componentsB/checkbox/index.vue @@ -28,35 +28,35 @@ 形状 - + 整体大小(单位rpx) - + 激活颜色 - + 默认选中第一个 - + 每个占一行 - + 每个宽度50% - + 最大选择数量 - + 禁用第一个 - + diff --git a/pages/componentsB/divider/index.vue b/pages/componentsB/divider/index.vue index 55a92921..95868f32 100644 --- a/pages/componentsB/divider/index.vue +++ b/pages/componentsB/divider/index.vue @@ -13,19 +13,19 @@ 提示内容 - + 单边线宽 - + 横线颜色 - + 内容样式 - + diff --git a/pages/componentsB/dropdown/index.vue b/pages/componentsB/dropdown/index.vue index 68c6552f..bbf1fc7e 100644 --- a/pages/componentsB/dropdown/index.vue +++ b/pages/componentsB/dropdown/index.vue @@ -24,15 +24,15 @@ 下边框 - + 激活颜色 - + 遮罩是否可点击 - + diff --git a/pages/componentsB/image/index.vue b/pages/componentsB/image/index.vue index 82f620b6..c2c4b911 100644 --- a/pages/componentsB/image/index.vue +++ b/pages/componentsB/image/index.vue @@ -13,22 +13,22 @@ 参数配置 状态 - + 加载中状态 - + 加载失败状态 - + 形状 - + diff --git a/pages/componentsB/line/index.vue b/pages/componentsB/line/index.vue index 9d54f54c..9615c80e 100644 --- a/pages/componentsB/line/index.vue +++ b/pages/componentsB/line/index.vue @@ -13,19 +13,19 @@ 颜色 - + 线条类型 - + 细边 - + 方向 - + diff --git a/pages/componentsB/loading/index.vue b/pages/componentsB/loading/index.vue index 42bc9091..771fecd1 100644 --- a/pages/componentsB/loading/index.vue +++ b/pages/componentsB/loading/index.vue @@ -12,19 +12,19 @@ 模式 - + 颜色(只对圆圈模式有效) - + 尺寸(单位rpx) - + 是否显示 - + diff --git a/pages/componentsB/noticeBar/index.vue b/pages/componentsB/noticeBar/index.vue index 018074db..1344ee38 100644 --- a/pages/componentsB/noticeBar/index.vue +++ b/pages/componentsB/noticeBar/index.vue @@ -15,27 +15,27 @@ 主题 - + 滚动模式 - + 是否衔接(水平模式有效) - + 状态 - + 速度 - + 图标 - + diff --git a/pages/componentsB/picker/index.vue b/pages/componentsB/picker/index.vue index 34b0bd01..bf4574fe 100644 --- a/pages/componentsB/picker/index.vue +++ b/pages/componentsB/picker/index.vue @@ -23,23 +23,23 @@ 参数配置 Picker开关 - + 模式选择 - + 默认时间 - + 显示时分秒 - + 默认地区 - + diff --git a/pages/componentsB/radio/index.vue b/pages/componentsB/radio/index.vue index d72b12cc..121f29a6 100644 --- a/pages/componentsB/radio/index.vue +++ b/pages/componentsB/radio/index.vue @@ -21,31 +21,31 @@ 形状 - + 整体大小(单位rpx) - + 激活颜色 - + 每个占一行 - + 每个宽度50% - + 默认选中第一个 - + 禁用第一个 - + diff --git a/pages/componentsB/rate/index.vue b/pages/componentsB/rate/index.vue index 16794a6f..04827e2e 100644 --- a/pages/componentsB/rate/index.vue +++ b/pages/componentsB/rate/index.vue @@ -15,31 +15,31 @@ 初始值 - + 镂空状态 - + 自定义样式 - + 自定义图标 - + 是否分层 - + 是否禁用 - + 星星数量 - + diff --git a/pages/componentsB/readMore/index.vue b/pages/componentsB/readMore/index.vue index 3003e8fd..b15cf666 100644 --- a/pages/componentsB/readMore/index.vue +++ b/pages/componentsB/readMore/index.vue @@ -20,11 +20,11 @@ 超出高度隐藏 - + 展开后可关闭 - + diff --git a/pages/componentsB/search/index.vue b/pages/componentsB/search/index.vue index 0d08818d..a6b108a5 100644 --- a/pages/componentsB/search/index.vue +++ b/pages/componentsB/search/index.vue @@ -14,23 +14,23 @@ 初始值 - + 搜索框形状 - + 清除控件 - + 右侧控件 - + 水平对齐方式 - + diff --git a/pages/componentsB/skeleton/index.vue b/pages/componentsB/skeleton/index.vue index fbd81469..a0dc027e 100644 --- a/pages/componentsB/skeleton/index.vue +++ b/pages/componentsB/skeleton/index.vue @@ -31,15 +31,15 @@ 加载状态 - + 骨架动画 - + 自定义样式 - + diff --git a/pages/componentsB/steps/index.vue b/pages/componentsB/steps/index.vue index e14f6192..e6b65ba6 100644 --- a/pages/componentsB/steps/index.vue +++ b/pages/componentsB/steps/index.vue @@ -12,19 +12,19 @@ 模式 - + 方向 - + 自定义图标 - + 当前步值 - + diff --git a/pages/componentsB/sticky/index.vue b/pages/componentsB/sticky/index.vue index ccd99315..4f793857 100644 --- a/pages/componentsB/sticky/index.vue +++ b/pages/componentsB/sticky/index.vue @@ -17,11 +17,11 @@ 吸顶高度 - + 状态 - + diff --git a/pages/componentsB/swipeAction/index.vue b/pages/componentsB/swipeAction/index.vue index 9f7b7d07..285bb041 100644 --- a/pages/componentsB/swipeAction/index.vue +++ b/pages/componentsB/swipeAction/index.vue @@ -32,11 +32,11 @@ 参数配置 状态(操作第一个) - + 禁止滑动 - + diff --git a/pages/componentsB/swiper/index.vue b/pages/componentsB/swiper/index.vue index 7d87ebab..87b21af6 100644 --- a/pages/componentsB/swiper/index.vue +++ b/pages/componentsB/swiper/index.vue @@ -14,19 +14,19 @@ 指示器模式 - + 标题 - + 指示器位置 - + 3D效果 - + diff --git a/pages/componentsB/switch/index.vue b/pages/componentsB/switch/index.vue index 36059978..e0a573d3 100644 --- a/pages/componentsB/switch/index.vue +++ b/pages/componentsB/switch/index.vue @@ -18,27 +18,27 @@ 状态 - + 颜色 - + 尺寸(单位rpx) - + 加载中 - + 禁用 - + 异步控制 - + diff --git a/pages/componentsB/tabbar/index.vue b/pages/componentsB/tabbar/index.vue index a1608535..797c4476 100644 --- a/pages/componentsB/tabbar/index.vue +++ b/pages/componentsB/tabbar/index.vue @@ -7,23 +7,23 @@ 状态 - + 凸起按钮 - + 背景色 - + 顶部边框 - + 提示角标 - + diff --git a/pages/componentsB/table/index.vue b/pages/componentsB/table/index.vue index 382c27a7..f4dcc392 100644 --- a/pages/componentsB/table/index.vue +++ b/pages/componentsB/table/index.vue @@ -38,11 +38,11 @@ 边框颜色 - + 对齐方式 - + diff --git a/pages/componentsB/upload/index.vue b/pages/componentsB/upload/index.vue index ae74a5f2..158b8a3e 100644 --- a/pages/componentsB/upload/index.vue +++ b/pages/componentsB/upload/index.vue @@ -31,19 +31,19 @@ 上传方式 - + 自定义控件(进度条和删除按钮) - + 最大上传数量 - + 自定义样式(预览区域和上传按钮) - + diff --git a/pages/componentsC/actionSheet/index.vue b/pages/componentsC/actionSheet/index.vue index ee05688c..9bceb8c5 100644 --- a/pages/componentsC/actionSheet/index.vue +++ b/pages/componentsC/actionSheet/index.vue @@ -15,11 +15,11 @@ 取消按钮 - + 点击遮罩关闭 - + diff --git a/pages/componentsC/alertTips/index.vue b/pages/componentsC/alertTips/index.vue index 3210dd9e..af9fec0f 100644 --- a/pages/componentsC/alertTips/index.vue +++ b/pages/componentsC/alertTips/index.vue @@ -14,19 +14,19 @@ 左侧图标 - + 关闭图标 - + 主题 - + 状态 - + diff --git a/pages/componentsC/badge/index.vue b/pages/componentsC/badge/index.vue index 3f4a5450..702a065c 100644 --- a/pages/componentsC/badge/index.vue +++ b/pages/componentsC/badge/index.vue @@ -10,27 +10,27 @@ 参数配置 数值显示 - + 主题选择 - + 显示点 - + 尺寸 - + 位置偏移 - + 中心点与父右上角重合 - + diff --git a/pages/componentsC/button/index.vue b/pages/componentsC/button/index.vue index 52c08015..e347336b 100644 --- a/pages/componentsC/button/index.vue +++ b/pages/componentsC/button/index.vue @@ -12,31 +12,31 @@ 主题选择 - + 尺寸大小 - + 形状 - + 镂空 - + 水波纹(感觉哪里有问题？点击顶部的按钮试试) - + 细边框 - + 加载中 - + diff --git a/pages/componentsC/cell/index.vue b/pages/componentsC/cell/index.vue index 94b95704..a81e8020 100644 --- a/pages/componentsC/cell/index.vue +++ b/pages/componentsC/cell/index.vue @@ -23,26 +23,26 @@ 更换图标 - + - - + + 自定义右侧内容 - + 描述信息 - + 更换标题 - + 右侧箭头 - + diff --git a/pages/componentsC/collapse/index.vue b/pages/componentsC/collapse/index.vue index 15d58e64..26c939a4 100644 --- a/pages/componentsC/collapse/index.vue +++ b/pages/componentsC/collapse/index.vue @@ -17,15 +17,15 @@ 手风琴模式 - + 右侧箭头 - + 自定义样式 - + diff --git a/pages/componentsC/countDown/index.vue b/pages/componentsC/countDown/index.vue index 45679d45..3b989287 100644 --- a/pages/componentsC/countDown/index.vue +++ b/pages/componentsC/countDown/index.vue @@ -15,23 +15,23 @@ 调整时间 - + 分隔符 - + 自定义样式 - + 显示天 - + 字体大小 - + diff --git a/pages/componentsC/countTo/index.vue b/pages/componentsC/countTo/index.vue index 4f54e8f4..e78d3a69 100644 --- a/pages/componentsC/countTo/index.vue +++ b/pages/componentsC/countTo/index.vue @@ -25,23 +25,23 @@ 参数配置 状态 - + 目标值 - + 滚动时间 - + 显示小数 - + 字体加粗 - + diff --git a/pages/componentsC/gap/index.vue b/pages/componentsC/gap/index.vue index 0ba63471..c998bb70 100644 --- a/pages/componentsC/gap/index.vue +++ b/pages/componentsC/gap/index.vue @@ -16,15 +16,15 @@ 参数配置 背景颜色 - + 高度 - + 上下外边距 - + diff --git a/pages/componentsC/grid/index.vue b/pages/componentsC/grid/index.vue index e6046faa..b92b47bc 100644 --- a/pages/componentsC/grid/index.vue +++ b/pages/componentsC/grid/index.vue @@ -90,15 +90,15 @@ 是否显示边框 - + 是否可滑动 - + 修改列数 - + diff --git a/pages/componentsC/layout/index.vue b/pages/componentsC/layout/index.vue index 8d05468d..1a63861b 100644 --- a/pages/componentsC/layout/index.vue +++ b/pages/componentsC/layout/index.vue @@ -28,16 +28,16 @@ 每个栅格占用栏数(演示共3个栅格) - + 分栏偏移 - + 水平排列方式(微信小程序无效) - + diff --git a/pages/componentsC/link/index.vue b/pages/componentsC/link/index.vue index bda7e5d3..dc0928f1 100644 --- a/pages/componentsC/link/index.vue +++ b/pages/componentsC/link/index.vue @@ -12,11 +12,11 @@ 下划线 - + 自定义样式 - + diff --git a/pages/componentsC/loadmore/index.vue b/pages/componentsC/loadmore/index.vue index 5631429e..3df8c5f4 100644 --- a/pages/componentsC/loadmore/index.vue +++ b/pages/componentsC/loadmore/index.vue @@ -14,19 +14,19 @@ 模式选择 - + 自定义提示语 - + 加载中图标样式 - + 没有更多时用点替代 - + diff --git a/pages/componentsC/mask/index.vue b/pages/componentsC/mask/index.vue index 420bb762..d0e77509 100644 --- a/pages/componentsC/mask/index.vue +++ b/pages/componentsC/mask/index.vue @@ -20,19 +20,19 @@ 状态 - + 缩放效果 - + 内容填充 - + 动画时长(ms) - + diff --git a/pages/componentsC/messageInput/index.vue b/pages/componentsC/messageInput/index.vue index 1b7fefd3..fd2334a6 100644 --- a/pages/componentsC/messageInput/index.vue +++ b/pages/componentsC/messageInput/index.vue @@ -14,11 +14,11 @@ 模式选择 - + 输入长度 - + @@ -27,19 +27,19 @@ 初始值 - + 呼吸灯效果 - + 是否加粗 - + 点替代输入值 - + diff --git a/pages/componentsC/numberBox/index.vue b/pages/componentsC/numberBox/index.vue index b9cd13c6..e2a677a7 100644 --- a/pages/componentsC/numberBox/index.vue +++ b/pages/componentsC/numberBox/index.vue @@ -13,19 +13,19 @@ 初始值 - + 自定义样式 - + 是否禁用 - + 步进值 - + diff --git a/pages/componentsC/popup/index.vue b/pages/componentsC/popup/index.vue index fc83892e..27633799 100644 --- a/pages/componentsC/popup/index.vue +++ b/pages/componentsC/popup/index.vue @@ -28,19 +28,19 @@ 状态 - + 弹出方向 - + 关闭按钮 - + 关闭按钮位置 - + diff --git a/pages/componentsC/progress/index.vue b/pages/componentsC/progress/index.vue index f154bf50..f50f9014 100644 --- a/pages/componentsC/progress/index.vue +++ b/pages/componentsC/progress/index.vue @@ -20,19 +20,19 @@ 模式选择 - + 增减 - + 自定义样式(线型时有效) - + 动态条纹(线型时有效) - + diff --git a/pages/componentsC/section/index.vue b/pages/componentsC/section/index.vue index 50541923..65902f50 100644 --- a/pages/componentsC/section/index.vue +++ b/pages/componentsC/section/index.vue @@ -12,23 +12,23 @@ 更换主标题 - + 竖条状态 - + 是否显示右边部分 - + 主标题粗体 - + 主标题颜色 - + diff --git a/pages/componentsC/subsection/index.vue b/pages/componentsC/subsection/index.vue index 5aa225d9..87f9852c 100644 --- a/pages/componentsC/subsection/index.vue +++ b/pages/componentsC/subsection/index.vue @@ -12,19 +12,19 @@ 模式选择(为满足演示需要，切换会有抖动，非性能问题) - + Current值 - + 活动选项字颜色 - + 字体加粗 - + diff --git a/pages/library/color/index.vue b/pages/library/color/index.vue index d9faab57..7a9f3082 100644 --- a/pages/library/color/index.vue +++ b/pages/library/color/index.vue @@ -17,11 +17,11 @@ 主题 - + 常用颜色 - + diff --git a/pages/library/colorSwitch/index.vue b/pages/library/colorSwitch/index.vue index 3ba04f62..f9af7873 100644 --- a/pages/library/colorSwitch/index.vue +++ b/pages/library/colorSwitch/index.vue @@ -14,11 +14,11 @@ GRB转HEX - + HEX转GRB - + 颜色渐变(rgb(21,21,21)-rgb(56,56,56)，分10份) diff --git a/pages/library/debounce/index.vue b/pages/library/debounce/index.vue index dbbe447b..3f93fa0a 100644 --- a/pages/library/debounce/index.vue +++ b/pages/library/debounce/index.vue @@ -20,15 +20,15 @@ 模式 - + 时间间隔 - + 执行时机 - + diff --git a/pages/library/deepMerge/index.vue b/pages/library/deepMerge/index.vue index c967694c..662fc561 100644 --- a/pages/library/deepMerge/index.vue +++ b/pages/library/deepMerge/index.vue @@ -21,7 +21,7 @@ 模式 - + diff --git a/pages/library/getRect/index.vue b/pages/library/getRect/index.vue index 91d56871..50be09a7 100644 --- a/pages/library/getRect/index.vue +++ b/pages/library/getRect/index.vue @@ -24,11 +24,11 @@ 参数配置 元素 - + 指定元素置顶 - + diff --git a/pages/library/globalVariable/globalData.vue b/pages/library/globalVariable/globalData.vue index 8f38d6f3..99835863 100644 --- a/pages/library/globalVariable/globalData.vue +++ b/pages/library/globalVariable/globalData.vue @@ -17,7 +17,7 @@ 修改globalData为如下值 - + diff --git a/pages/library/globalVariable/prototype.vue b/pages/library/globalVariable/prototype.vue index 27d32486..820cd085 100644 --- a/pages/library/globalVariable/prototype.vue +++ b/pages/library/globalVariable/prototype.vue @@ -17,7 +17,7 @@ 修改vuePrototype为如下值 - + diff --git a/pages/library/globalVariable/vuex.vue b/pages/library/globalVariable/vuex.vue index e5c04e9b..0104862b 100644 --- a/pages/library/globalVariable/vuex.vue +++ b/pages/library/globalVariable/vuex.vue @@ -17,7 +17,7 @@ 修改vuex变量为如下值 - + diff --git a/pages/library/guid/index.vue b/pages/library/guid/index.vue index 5c536ddc..8d99a054 100644 --- a/pages/library/guid/index.vue +++ b/pages/library/guid/index.vue @@ -14,15 +14,15 @@ 长度 - + 首字符为"u" - + 取值基数(进制) - + diff --git a/pages/library/http/index.vue b/pages/library/http/index.vue index fac07081..67ee3ab3 100644 --- a/pages/library/http/index.vue +++ b/pages/library/http/index.vue @@ -17,7 +17,7 @@ 请求方式 - + diff --git a/pages/library/md5/index.vue b/pages/library/md5/index.vue index 07a94013..e9b786a5 100644 --- a/pages/library/md5/index.vue +++ b/pages/library/md5/index.vue @@ -14,7 +14,7 @@ 源字符串 - + diff --git a/pages/library/queryParams/index.vue b/pages/library/queryParams/index.vue index f9acff0e..806d2a24 100644 --- a/pages/library/queryParams/index.vue +++ b/pages/library/queryParams/index.vue @@ -15,7 +15,7 @@ 是否带问号 - + diff --git a/pages/library/random/index.vue b/pages/library/random/index.vue index edd42787..a3fe3d18 100644 --- a/pages/library/random/index.vue +++ b/pages/library/random/index.vue @@ -14,7 +14,7 @@ 操作 - + 执行 diff --git a/pages/library/route/index.vue b/pages/library/route/index.vue index 8cb2d83d..85bdf439 100644 --- a/pages/library/route/index.vue +++ b/pages/library/route/index.vue @@ -12,15 +12,15 @@ 类型 - + 携带参数(针对type=navigateTo) - + 窗口动画(App且type=navigateTo||navigateBack时有效) - + diff --git a/pages/library/test/index.vue b/pages/library/test/index.vue index b0e5f416..e9a13cd5 100644 --- a/pages/library/test/index.vue +++ b/pages/library/test/index.vue @@ -40,19 +40,19 @@ 邮箱 - + 手机号 - + 中文 - + 整数 - + diff --git a/pages/library/timeFormat/index.vue b/pages/library/timeFormat/index.vue index 01609112..78fdc0d4 100644 --- a/pages/library/timeFormat/index.vue +++ b/pages/library/timeFormat/index.vue @@ -15,9 +15,9 @@ 格式 - + - + diff --git a/pages/library/timeFrom/index.vue b/pages/library/timeFrom/index.vue index e804c19c..9453999a 100644 --- a/pages/library/timeFrom/index.vue +++ b/pages/library/timeFrom/index.vue @@ -18,9 +18,9 @@ 时间 - + - + diff --git a/pages/library/trim/index.vue b/pages/library/trim/index.vue index 5096b8c2..cbd4e056 100644 --- a/pages/library/trim/index.vue +++ b/pages/library/trim/index.vue @@ -17,7 +17,7 @@ 模式选择 - + diff --git a/uview-ui/components/u-cell-item/u-cell-item.vue b/uview-ui/components/u-cell-item/u-cell-item.vue index c44fc9ad..055af3a6 100644 --- a/uview-ui/components/u-cell-item/u-cell-item.vue +++ b/uview-ui/components/u-cell-item/u-cell-item.vue @@ -22,17 +22,17 @@ titleStyle ]" > - {{ title }} + {{ title }} - {{ label }} + {{ label }} - {{ value }} + {{ value }} diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue index 30df88bd..9af036f6 100644 --- a/uview-ui/components/u-image/u-image.vue +++ b/uview-ui/components/u-image/u-image.vue @@ -198,10 +198,10 @@ export default { this.$emit('click'); }, // 图片加载失败 - onErrorHandler() { + onErrorHandler(err) { this.loading = false; this.isError = true; - this.$emit('error'); + this.$emit('error', err); }, // 图片加载完成，标记loading结束 onLoadHandler() { diff --git a/uview-ui/components/u-tabbar/u-tabbar.vue b/uview-ui/components/u-tabbar/u-tabbar.vue index 448206c0..8f1cbca7 100644 --- a/uview-ui/components/u-tabbar/u-tabbar.vue +++ b/uview-ui/components/u-tabbar/u-tabbar.vue @@ -295,6 +295,8 @@ bottom: 14rpx; left: 50%; transform: translateX(-50%); + width: 100%; + text-align: center; } } diff --git a/uview-ui/libs/function/timeFormat.js b/uview-ui/libs/function/timeFormat.js index cba5f9ad..0372f2f1 100644 --- a/uview-ui/libs/function/timeFormat.js +++ b/uview-ui/libs/function/timeFormat.js @@ -28,7 +28,7 @@ function timeFormat(dateTime = null, fmt = 'yyyy-mm-dd') { if (!dateTime) dateTime = Number(new Date()); // 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式 if (dateTime.toString().length == 10) dateTime *= 1000; - let date = new Date(Number(dateTime)); + let date = new Date(dateTime); let ret; let opt = { "y+": date.getFullYear().toString(), // 年 diff --git a/uview-ui/libs/mixin/mixin.js b/uview-ui/libs/mixin/mixin.js index 43742f45..e3889867 100644 --- a/uview-ui/libs/mixin/mixin.js +++ b/uview-ui/libs/mixin/mixin.js @@ -46,5 +46,19 @@ module.exports = { }, onReachBottom() { uni.$emit('uOnReachBottom') + }, + beforeDestroy() { + // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况 + // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱 + if(this.parent && uni.$u.test.array(this.parent.children)) { + // 组件销毁时，移除父组件中的children数组中对应的实例 + const childrenList = this.parent.children + childrenList.map((child, index) => { + // 如果相等，则移除 + if(child === this) { + childrenList.splice(index, 1) + } + }) + } } } diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js index ced17447..1f5f4716 100644 --- a/uview-ui/libs/request/index.js +++ b/uview-ui/libs/request/index.js @@ -23,7 +23,7 @@ class Request { options.responseType = options.responseType || this.config.responseType; options.url = options.url || ''; options.params = options.params || {}; - options.header = Object.assign(this.config.header, options.header); + options.header = Object.assign({}, this.config.header, options.header); options.method = options.method || this.config.method; return new Promise((resolve, reject) => { From 8968a8ef01595635f8d36e6ff02b8ff359e59e74 Mon Sep 17 00:00:00 2001 From: yiruiwen <1416956117@qq.com> Date: Sun, 7 Feb 2021 21:21:29 +0800 Subject: [PATCH 03/58] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +- manifest.json | 2 +- uview-ui/components/u-calendar/u-calendar.vue | 4 +- .../u-line-progress/u-line-progress.vue | 147 ++++++++++++++++++ uview-ui/components/u-image/u-image.vue | 1 + uview-ui/components/u-rate/u-rate.vue | 4 +- uview-ui/components/u-tabbar/u-tabbar.vue | 2 +- uview-ui/libs/config/config.js | 4 +- uview-ui/package.json | 2 +- 9 files changed, 159 insertions(+), 12 deletions(-) create mode 100644 uview-ui/components/u-circle-progress/u-line-progress/u-line-progress.vue diff --git a/README.md b/README.md index cd8050cb..9139adc1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ## [官方文档：https://www.uviewui.com](https://www.uviewui.com) -### [点击加群交流反馈：863820668](https://jq.qq.com/?_wv=1027&k=uyZUkSlo) +### [点击加群交流反馈：1129077272](https://qm.qq.com/cgi-bin/qm/qr?k=1FfucLpozYbnb7FWo_KsqAdEi1mE3Qrf&jump_from=webapi) ## 特性 @@ -78,7 +78,6 @@ Vue.use(uView); ```css /* App.vue */ ``` @@ -124,7 +123,7 @@ Vue.use(uView); ## 捐赠uView的研发 -uView文档和源码全部开源免费，如果您认为uView帮到了您的开发工作，您可以捐赠uView的研发工作，捐赠无门槛，哪怕是一杯可乐也好(相信这比打赏主播更有意义)。 +uView文档内容和框架源码全部开源免费，如果您认为uView帮到了您的开发工作，您可以捐赠uView的研发工作，捐赠无门槛，哪怕是一杯可乐也好(相信这比打赏主播更有意义)。 diff --git a/manifest.json b/manifest.json index 2c5db847..802339ba 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "uView", "appid" : "__UNI__60F4B81", "description" : "多平台快速开发的UI框架", - "versionName" : "1.8.2", + "versionName" : "1.8.3", "versionCode" : "100", "transformPx" : false, "app-plus" : { diff --git a/uview-ui/components/u-calendar/u-calendar.vue b/uview-ui/components/u-calendar/u-calendar.vue index 6602bd03..2b301842 100644 --- a/uview-ui/components/u-calendar/u-calendar.vue +++ b/uview-ui/components/u-calendar/u-calendar.vue @@ -68,8 +68,8 @@ * @property {Boolean} change-year 是否显示顶部的切换年份方向的按钮(默认true) * @property {Boolean} change-month 是否显示顶部的切换月份方向的按钮(默认true) * @property {String Number} max-year 可切换的最大年份(默认2050) - * @property {String Number} min-year 最小可选日期(默认1950) - * @property {String Number} min-date 可切换的最小年份(默认1950-01-01) + * @property {String Number} min-year 可切换的最小年份(默认1950) + * @property {String Number} min-date 最小可选日期(默认1950-01-01) * @property {String Number} max-date 最大可选日期(默认当前日期) * @property {String Number} 弹窗顶部左右两边的圆角值，单位rpx(默认20) * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭日历(默认true) diff --git a/uview-ui/components/u-circle-progress/u-line-progress/u-line-progress.vue b/uview-ui/components/u-circle-progress/u-line-progress/u-line-progress.vue new file mode 100644 index 00000000..77e2da20 --- /dev/null +++ b/uview-ui/components/u-circle-progress/u-line-progress/u-line-progress.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue index 9af036f6..c729c3c8 100644 --- a/uview-ui/components/u-image/u-image.vue +++ b/uview-ui/components/u-image/u-image.vue @@ -8,6 +8,7 @@ @load="onLoadHandler" :lazy-load="lazyLoad" class="u-image__image" + :show-menu-by-longpress="showMenuByLongpress" :style="{ borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius) }" diff --git a/uview-ui/components/u-rate/u-rate.vue b/uview-ui/components/u-rate/u-rate.vue index 1e44d56f..17eb3a87 100644 --- a/uview-ui/components/u-rate/u-rate.vue +++ b/uview-ui/components/u-rate/u-rate.vue @@ -178,14 +178,14 @@ export default { // 获取评分组件盒子的布局信息 getElRectById() { // uView封装的获取节点的方法，详见文档 - this.$u.getRect('#' + this.elId).then(res => { + this.$uGetRect('#' + this.elId).then(res => { this.starBoxLeft = res.left }) }, // 获取单个星星的尺寸 getElRectByClass() { // uView封装的获取节点的方法，详见文档 - this.$u.getRect('.' + this.elClass).then(res => { + this.$uGetRect('.' + this.elClass).then(res => { this.starWidth = res.width // 把每个星星右边到组件盒子左边的距离放入数组中 for (let i = 0; i < this.count; i++) { diff --git a/uview-ui/components/u-tabbar/u-tabbar.vue b/uview-ui/components/u-tabbar/u-tabbar.vue index 8f1cbca7..2e1b6a2f 100644 --- a/uview-ui/components/u-tabbar/u-tabbar.vue +++ b/uview-ui/components/u-tabbar/u-tabbar.vue @@ -22,7 +22,7 @@ :custom-prefix="item.customIcon ? 'custom-icon' : 'uicon'" > diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js index 85cad670..ac3c65ef 100644 --- a/uview-ui/libs/config/config.js +++ b/uview-ui/libs/config/config.js @@ -1,5 +1,5 @@ -// 此版本发布于2020-11-19 -let version = '1.8.2'; +// 此版本发布于2020-12-17 +let version = '1.8.3'; export default { v: version, diff --git a/uview-ui/package.json b/uview-ui/package.json index 86dfda07..dc0767ca 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,6 +1,6 @@ { "name": "uview-ui", - "version": "1.8.2", + "version": "1.8.3", "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", "main": "index.js", "keywords": [ From 403876c9ff950349b34edfa4f793e527795e4004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Wed, 17 Feb 2021 15:54:47 +0800 Subject: [PATCH 04/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=BE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9139adc1..1e8fc663 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,12 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ## [官方文档：https://www.uviewui.com](https://www.uviewui.com) -### [点击加群交流反馈：1129077272](https://qm.qq.com/cgi-bin/qm/qr?k=1FfucLpozYbnb7FWo_KsqAdEi1mE3Qrf&jump_from=webapi) +### 官方1群：1042987248（已满） +### 官方2群：249718512（已满） +### 官方3群：1129077272（已满） +### 官方4群：1084514613（已满） +### 官方5群：863820668（已满） +### [点击加6群交流反馈：745721078](https://qm.qq.com/cgi-bin/qm/qr?k=nSvu1k6AFqHVvZhgN9FEavJPXIMyYCxY&jump_from=webapi) ## 特性 From f0860be62673f5a1bcaf6e0493647dc8a22d3fa4 Mon Sep 17 00:00:00 2001 From: yiruiwen <1416956117@qq.com> Date: Wed, 17 Mar 2021 20:45:13 +0800 Subject: [PATCH 05/58] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96tabs=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=BB=91=E5=9D=97=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E7=8A=B6=E6=80=81=202.=20=E4=BC=98=E5=8C=96t?= =?UTF-8?q?est.mobile()=E5=AF=B9=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E5=88=99=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-tabs/u-tabs.vue | 1 + uview-ui/libs/function/test.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue index d25d6167..0c596585 100644 --- a/uview-ui/components/u-tabs/u-tabs.vue +++ b/uview-ui/components/u-tabs/u-tabs.vue @@ -202,6 +202,7 @@ 'transition-duration': `${this.barFirstTimeMove ? 0 : this.duration }s`, 'background-color': this.activeColor, height: this.barHeight + 'rpx', + opacity: this.barFirstTimeMove ? 0 : 1, // 设置一个很大的值，它会自动取能用的最大值，不用高度的一半，是因为高度可能是单数，会有小数出现 'border-radius': `${this.barHeight / 2}px` }; diff --git a/uview-ui/libs/function/test.js b/uview-ui/libs/function/test.js index b8418a6c..fd25e180 100644 --- a/uview-ui/libs/function/test.js +++ b/uview-ui/libs/function/test.js @@ -9,7 +9,7 @@ function email(value) { * 验证手机格式 */ function mobile(value) { - return /^1[23456789]\d{9}$/.test(value) + return /^1[3-9]\d{9}$/.test(value) } /** From bec971bcbcdf66687e46c9e5846a6c97a4408f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E6=9B=B2?= <1416956117@qq.com> Date: Wed, 24 Mar 2021 12:40:32 +0800 Subject: [PATCH 06/58] =?UTF-8?q?=E5=AE=8C=E5=96=84test.emial=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/libs/function/test.js | 2 +- uview-ui/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uview-ui/libs/function/test.js b/uview-ui/libs/function/test.js index fd25e180..76093f4d 100644 --- a/uview-ui/libs/function/test.js +++ b/uview-ui/libs/function/test.js @@ -2,7 +2,7 @@ * 验证电子邮箱格式 */ function email(value) { - return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value); + return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value); } /** diff --git a/uview-ui/package.json b/uview-ui/package.json index dc0767ca..431d5859 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,6 +1,6 @@ { "name": "uview-ui", - "version": "1.8.3", + "version": "1.8.4", "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", "main": "index.js", "keywords": [ From 57ecec51e5b653d98fe1f8668358b7267ed03ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Tue, 13 Apr 2021 13:59:25 +0800 Subject: [PATCH 07/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=BE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e8fc663..5981b831 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,8 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ### 官方3群：1129077272（已满） ### 官方4群：1084514613（已满） ### 官方5群：863820668（已满） -### [点击加6群交流反馈：745721078](https://qm.qq.com/cgi-bin/qm/qr?k=nSvu1k6AFqHVvZhgN9FEavJPXIMyYCxY&jump_from=webapi) +### 官方6群：745721078（已满） +### [点击加7群交流反馈：627867855](点击链接加入群聊【uView UI官方7群】：https://jq.qq.com/?_wv=1027&k=U61Rx49A) ## 特性 From 066485720f0b72684d79fa2dcafcd4a1074c1363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Tue, 13 Apr 2021 15:28:18 +0800 Subject: [PATCH 08/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=BE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5981b831..b0336495 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ### 官方4群：1084514613（已满） ### 官方5群：863820668（已满） ### 官方6群：745721078（已满） -### [点击加7群交流反馈：627867855](点击链接加入群聊【uView UI官方7群】：https://jq.qq.com/?_wv=1027&k=U61Rx49A) +### [点击加7群交流反馈：627867855](https://jq.qq.com/?_wv=1027&k=U61Rx49A) ## 特性 From 8efa27bd737c7366e94b02a69d0ff0c0fb251679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Tue, 13 Apr 2021 15:29:29 +0800 Subject: [PATCH 09/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=BE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5981b831..b0336495 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ### 官方4群：1084514613（已满） ### 官方5群：863820668（已满） ### 官方6群：745721078（已满） -### [点击加7群交流反馈：627867855](点击链接加入群聊【uView UI官方7群】：https://jq.qq.com/?_wv=1027&k=U61Rx49A) +### [点击加7群交流反馈：627867855](https://jq.qq.com/?_wv=1027&k=U61Rx49A) ## 特性 From e50e5e4084183944f67dc08b18abc51c76869821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E6=9B=B2?= <1416956117@qq.com> Date: Tue, 13 Apr 2021 21:26:50 +0800 Subject: [PATCH 10/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e8fc663..ec82ce28 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,9 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ### 官方3群：1129077272（已满） ### 官方4群：1084514613（已满） ### 官方5群：863820668（已满） -### [点击加6群交流反馈：745721078](https://qm.qq.com/cgi-bin/qm/qr?k=nSvu1k6AFqHVvZhgN9FEavJPXIMyYCxY&jump_from=webapi) +### 官方6群：745721078（已满） +### 官方7群：627867855（已满） +### [点击加7群交流反馈：627867855](https://jq.qq.com/?_wv=1027&k=ZHFDsWUV) ## 特性 From 09cb0005a5871f5ae81c20307c255abd569476fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Wed, 9 Jun 2021 18:03:55 +0800 Subject: [PATCH 11/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=BE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec82ce28..134b2168 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ### 官方5群：863820668（已满） ### 官方6群：745721078（已满） ### 官方7群：627867855（已满） -### [点击加7群交流反馈：627867855](https://jq.qq.com/?_wv=1027&k=ZHFDsWUV) +### [点击加8群交流反馈：496409492](https://jq.qq.com/?_wv=1027&k=Jg9jNimp) ## 特性 From 5d15b45086733cf1b9c26266672871bab476ffc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E6=9B=B2?= <1416956117@qq.com> Date: Wed, 9 Jun 2021 20:58:29 +0800 Subject: [PATCH 12/58] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtset.number?= =?UTF-8?q?=E6=95=B0=E5=80=BC=E5=8F=AF=E8=83=BD=E4=B8=8D=E5=87=86=E7=A1=AE?= =?UTF-8?q?=EF=BC=8C=E6=8A=98=E5=8F=A0=E9=9D=A2=E6=9D=BF=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=B7=BB=E5=8A=A0=E5=AD=90=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E7=9A=84=E9=97=AE=E9=A2=98=20docs:=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BE=A4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 11 +++++++++++ .../components/u-collapse-item/u-collapse-item.vue | 3 ++- uview-ui/libs/function/test.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .hbuilderx/launch.json diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 00000000..501e01c8 --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,11 @@ +{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "type": "uniCloud", + "default": { + "launchtype": "remote" + } + } + ] +} diff --git a/uview-ui/components/u-collapse-item/u-collapse-item.vue b/uview-ui/components/u-collapse-item/u-collapse-item.vue index 3b66bfa5..66566576 100644 --- a/uview-ui/components/u-collapse-item/u-collapse-item.vue +++ b/uview-ui/components/u-collapse-item/u-collapse-item.vue @@ -110,7 +110,8 @@ this.parent = this.$u.$parent.call(this, 'u-collapse'); if(this.parent) { this.nameSync = this.name ? this.name : this.parent.childrens.length; - this.parent.childrens.push(this); + // 不存在时才添加本实例 + !this.parent.childrens.includes(this) && this.parent.childrens.push(this); this.headStyle = this.parent.headStyle; this.bodyStyle = this.parent.bodyStyle; this.arrowColor = this.parent.arrowColor; diff --git a/uview-ui/libs/function/test.js b/uview-ui/libs/function/test.js index 76093f4d..1fde4621 100644 --- a/uview-ui/libs/function/test.js +++ b/uview-ui/libs/function/test.js @@ -37,7 +37,7 @@ function dateISO(value) { * 验证十进制数字 */ function number(value) { - return /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value) + return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value) } /** From 186da55ee044399f246b238f1e55f4d8602867a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Fri, 13 Aug 2021 11:40:59 +0800 Subject: [PATCH 13/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=BE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 134b2168..978e64ef 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ### 官方5群：863820668（已满） ### 官方6群：745721078（已满） ### 官方7群：627867855（已满） -### [点击加8群交流反馈：496409492](https://jq.qq.com/?_wv=1027&k=Jg9jNimp) +### 官方8群：496409492（已满） +### [点击加9群交流反馈：828504448](https://jq.qq.com/?_wv=1027&k=Ute1wecV) ## 特性 From e39e6ab63d94f830fcbb1e98c8558d03a8a74927 Mon Sep 17 00:00:00 2001 From: dandan Date: Fri, 24 Sep 2021 16:51:31 +0800 Subject: [PATCH 14/58] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Du-image=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84src=E5=85=88=E4=BC=A0=E5=85=A5=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E5=86=8D=E4=BC=A0=E5=85=A5=E9=9D=9E=E7=A9=BA=E5=80=BC?= =?UTF-8?q?=E5=90=8E,=20=E6=97=A0=E6=B3=95=E8=A7=A6=E5=8F=91loading?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-image/u-image.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue index c729c3c8..1e7cb87d 100644 --- a/uview-ui/components/u-image/u-image.vue +++ b/uview-ui/components/u-image/u-image.vue @@ -172,6 +172,7 @@ export default { this.loading = false; } else { this.isError = false; + this.loading = true; } } } From 1a1cd2474cfa51cc5019ecbc705b2d3801a5703a Mon Sep 17 00:00:00 2001 From: dandan Date: Fri, 24 Sep 2021 16:56:06 +0800 Subject: [PATCH 15/58] =?UTF-8?q?regular:=E7=BB=9F=E4=B8=80=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-image/u-image.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue index 1e7cb87d..8a890be5 100644 --- a/uview-ui/components/u-image/u-image.vue +++ b/uview-ui/components/u-image/u-image.vue @@ -172,7 +172,7 @@ export default { this.loading = false; } else { this.isError = false; - this.loading = true; + this.loading = true; } } } From 211b66e26b827fd5fc556d08879b2b1bbf0dc7be Mon Sep 17 00:00:00 2001 From: nadirvishun Date: Mon, 4 Oct 2021 15:21:35 +0800 Subject: [PATCH 16/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9upload=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=BB=88=E6=AD=A2=E4=B8=8A=E4=BC=A0=E5=A4=B1?= =?UTF-8?q?=E6=95=88=EF=BC=8C=E5=8F=8A=E8=BF=9B=E5=BA=A6=E6=9D=A1100?= =?UTF-8?q?=E5=90=8E=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-upload/u-upload.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue index f4d4b763..2a968287 100644 --- a/uview-ui/components/u-upload/u-upload.vue +++ b/uview-ui/components/u-upload/u-upload.vue @@ -21,7 +21,7 @@ 0) { + if (this.lists[index].progress < 100 && this.lists[index].progress > 0) { typeof this.lists[index].uploadTask != 'undefined' && this.lists[index].uploadTask.abort(); } this.lists.splice(index, 1); From 970c28daca1289e8c5c3df3e51f25362f94c47f4 Mon Sep 17 00:00:00 2001 From: nadirvishun Date: Mon, 4 Oct 2021 15:24:35 +0800 Subject: [PATCH 17/58] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-upload/u-upload.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue index 2a968287..376d856d 100644 --- a/uview-ui/components/u-upload/u-upload.vue +++ b/uview-ui/components/u-upload/u-upload.vue @@ -21,7 +21,7 @@ Date: Mon, 25 Oct 2021 19:41:24 +0800 Subject: [PATCH 18/58] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 978e64ef..35b2d551 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@

uView

多平台快速开发的UI框架

-[![star](https://gitee.com/xuqu/uView/badge/star.svg?theme=gvp)](https://gitee.com/xuqu/uView/stargazers) -[![fork](https://gitee.com/xuqu/uView/badge/fork.svg?theme=gvp)](https://gitee.com/xuqu/uView/members) -[![stars](https://img.shields.io/github/stars/YanxinNet/uView?style=flat-square&logo=GitHub)](https://github.com/YanxinNet/uView) -[![forks](https://img.shields.io/github/forks/YanxinNet/uView?style=flat-square&logo=GitHub)](https://github.com/YanxinNet/uView) -[![issues](https://img.shields.io/github/issues/YanxinNet/uView?style=flat-square&logo=GitHub)](https://github.com/YanxinNet/uView/issues) +[![star](https://gitee.com/umicro/uView/badge/star.svg?theme=gvp)](https://gitee.com/umicro/uView/stargazers) +[![fork](https://gitee.com/umicro/uView/badge/fork.svg?theme=gvp)](https://gitee.com/umicro/uView/members) +[![stars](https://img.shields.io/github/stars/YanxinNet/uView?style=flat-square&logo=GitHub)](https://github.com/umicro/uView) +[![forks](https://img.shields.io/github/forks/YanxinNet/uView?style=flat-square&logo=GitHub)](https://github.com/umicro/uView) +[![issues](https://img.shields.io/github/issues/YanxinNet/uView?style=flat-square&logo=GitHub)](https://github.com/umicro/uView/issues) [![Website](https://img.shields.io/badge/uView-up-blue?style=flat-square)](https://uviewui.com) -[![release](https://img.shields.io/github/v/release/YanxinNet/uView?style=flat-square)](https://gitee.com/xuqu/uView/releases) +[![release](https://img.shields.io/github/v/release/YanxinNet/uView?style=flat-square)](https://gitee.com/umicro/uView/releases) [![license](https://img.shields.io/github/license/YanxinNet/uView?style=flat-square)](https://en.wikipedia.org/wiki/MIT_License) ## 说明 From b0bc9d2ab8377062dbedd5e3e6c15924b8694412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Wed, 27 Oct 2021 16:46:55 +0800 Subject: [PATCH 19/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=BE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=B8=BAuview2.0=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 978e64ef..2d24927c 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ### 官方6群：745721078（已满） ### 官方7群：627867855（已满） ### 官方8群：496409492（已满） -### [点击加9群交流反馈：828504448](https://jq.qq.com/?_wv=1027&k=Ute1wecV) +### 官方9群：828504448（已满） +### [点击加10群交流反馈：232041042](https://jq.qq.com/?_wv=1027&k=KnbeceDU) ## 特性 From c73aebc0de1de7489fcdaf8d164e8b33a69cb6e8 Mon Sep 17 00:00:00 2001 From: Li Kui <90845831+likui628@users.noreply.github.com> Date: Mon, 15 Nov 2021 18:46:48 +0800 Subject: [PATCH 20/58] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=92=8C=E5=AE=9E=E9=99=85=E9=80=89=E6=8B=A9=E7=9A=84=E5=80=BC?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 由于uni-app组件picker-view的bug，:value="defaultSelector"的值为[0]时没有更新显示 --- uview-ui/components/u-select/u-select.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uview-ui/components/u-select/u-select.vue b/uview-ui/components/u-select/u-select.vue index 1285845e..acd38b89 100644 --- a/uview-ui/components/u-select/u-select.vue +++ b/uview-ui/components/u-select/u-select.vue @@ -36,7 +36,7 @@ - + {{ item1[labelName] }} From c9dd8724e183ebefae326e9f6fea0bb8f7feb9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=89=91=E6=9C=AF?= Date: Mon, 15 Nov 2021 22:45:06 +0800 Subject: [PATCH 21/58] Update u-th.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: 修复thStyle设置无效 --- uview-ui/components/u-th/u-th.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uview-ui/components/u-th/u-th.vue b/uview-ui/components/u-th/u-th.vue index 9fe5a164..c736b9b1 100644 --- a/uview-ui/components/u-th/u-th.vue +++ b/uview-ui/components/u-th/u-th.vue @@ -39,7 +39,7 @@ style.padding = this.parent.padding; style.borderBottom = `solid 1px ${this.parent.borderColor}`; style.borderRight = `solid 1px ${this.parent.borderColor}`; - Object.assign(style, this.parent.style); + Object.assign(style, this.parent.thStyle); this.thStyle = style; } } From 5d7f3ef298de3cd163fd86672a9326ecf5dee1f3 Mon Sep 17 00:00:00 2001 From: bianxiaokai Date: Tue, 16 Nov 2021 18:11:55 +0800 Subject: [PATCH 22/58] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3defautl-value?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E5=90=8E,=E7=94=A8=E6=88=B7=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E9=80=89=E9=A1=B9=E5=88=97=E8=A1=A8=E5=90=8E,defalut-?= =?UTF-8?q?value=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-select/u-select.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uview-ui/components/u-select/u-select.vue b/uview-ui/components/u-select/u-select.vue index 1285845e..e6bfd8ec 100644 --- a/uview-ui/components/u-select/u-select.vue +++ b/uview-ui/components/u-select/u-select.vue @@ -340,6 +340,8 @@ export default { if (this.moving) return; // #endif if (event) this.$emit(event, this.selectValue); + // 重置default-value默认值 + this.$set(this, 'defaultSelector', [0]); this.close(); }, selectHandler() { From fe02f0e1a7a909abaee9a47469adea2508b49bef Mon Sep 17 00:00:00 2001 From: bianxiaokai Date: Tue, 16 Nov 2021 18:17:37 +0800 Subject: [PATCH 23/58] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3defautl-value?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E5=90=8E,=E7=94=A8=E6=88=B7=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E9=80=89=E9=A1=B9=E5=88=97=E8=A1=A8=E5=90=8E,defalut-?= =?UTF-8?q?value=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-select/u-select.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uview-ui/components/u-select/u-select.vue b/uview-ui/components/u-select/u-select.vue index e6bfd8ec..257e4e07 100644 --- a/uview-ui/components/u-select/u-select.vue +++ b/uview-ui/components/u-select/u-select.vue @@ -333,6 +333,8 @@ export default { }, close() { this.$emit('input', false); + // 重置default-value默认值 + this.$set(this, 'defaultSelector', [0]); }, // 点击确定或者取消 getResult(event = null) { @@ -340,8 +342,6 @@ export default { if (this.moving) return; // #endif if (event) this.$emit(event, this.selectValue); - // 重置default-value默认值 - this.$set(this, 'defaultSelector', [0]); this.close(); }, selectHandler() { From a965f8ad09615e4af41751b4df9b541280a35f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Tue, 16 Nov 2021 19:59:14 +0800 Subject: [PATCH 24/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9appid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 802339ba..4ca79a5a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,8 +1,8 @@ { "name" : "uView", - "appid" : "__UNI__60F4B81", + "appid" : "__UNI__6655525", "description" : "多平台快速开发的UI框架", - "versionName" : "1.8.3", + "versionName" : "1.8.4", "versionCode" : "100", "transformPx" : false, "app-plus" : { From 6c123b4f353f29d2e75c1fac244098f767c94990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Thu, 18 Nov 2021 19:08:56 +0800 Subject: [PATCH 25/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- manifest.json | 4 ++-- uview-ui/components/uview-v1/uview-v1.vue | 0 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100755 uview-ui/components/uview-v1/uview-v1.vue diff --git a/README.md b/README.md index 5ab14e23..4288b0c8 100644 --- a/README.md +++ b/README.md @@ -61,10 +61,10 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 ## 链接 -- [官方文档](https://uviewui.com/) -- [更新日志](https://uviewui.com/components/changelog.html) -- [升级指南](https://uviewui.com/components/changelog.html) -- [关于我们](https://uviewui.com/cooperation/about.html) +- [官方文档](https://v1.uviewui.com/) +- [更新日志](https://v1.uviewui.com/components/changelog.html) +- [升级指南](https://v1.uviewui.com/components/changelog.html) +- [关于我们](https://v1.uviewui.com/cooperation/about.html) ## 交流反馈 diff --git a/manifest.json b/manifest.json index 4ca79a5a..5ffdcffc 100644 --- a/manifest.json +++ b/manifest.json @@ -93,7 +93,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wxc256e348c4032ebd", + "appid" : "", "setting" : { "urlCheck" : true, "es6" : false, @@ -121,7 +121,7 @@ }, "mp-toutiao" : { "usingComponents" : true, - "appid" : "tt2bc55d78b4ff50bf" + "appid" : "" }, "h5" : { "template" : "template.h5.html", diff --git a/uview-ui/components/uview-v1/uview-v1.vue b/uview-ui/components/uview-v1/uview-v1.vue new file mode 100755 index 00000000..e69de29b From 586e7ec36c2386258edd6b38795616805d58d767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Fri, 19 Nov 2021 10:29:24 +0800 Subject: [PATCH 26/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4288b0c8..0183b8cd 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水 -## [官方文档：https://www.uviewui.com](https://www.uviewui.com) +## [官方文档：https://v1.uviewui.com](https://v1.uviewui.com) ### 官方1群：1042987248（已满） ### 官方2群：249718512（已满） @@ -70,6 +70,11 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全 欢迎加入我们的QQ群交流反馈：[点此跳转](https://www.uviewui.com/components/addQQGroup.html) +## 关于PR + +> 我们非常乐意接受各位的优质PR，但在此之前我希望您了解uView2.0是一个需要兼容多个平台的（小程序、h5、ios app、android app）包括nvue页面、vue页面。 +> 所以希望在您修复bug并提交之前尽可能的去这些平台测试一下兼容性。最好能携带测试截图以方便审核。非常感谢！ + ## 安装 #### **下载地址** —— [https://ext.dcloud.net.cn/plugin?id=1593](https://ext.dcloud.net.cn/plugin?id=1593) From e697c50caf96bb7985a52bac57520270f8e9727c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=A1=A5?= Date: Sun, 28 Nov 2021 17:16:23 +0800 Subject: [PATCH 27/58] =?UTF-8?q?=E6=B7=BB=E5=8A=A0issue=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 3 +++ .github/ISSUE_TEMPLATE/config.yml | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md new file mode 100644 index 00000000..6dd05af9 --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -0,0 +1,3 @@ +你好，请使用下面的链接创建 issue 以帮助我们更快的排查问题，不规范的 issue 会被关闭，感谢配合。 + +https://new-issue.uviewui.com/ diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..623c337f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: 创建一个新issue + url: https://new-issue.uviewui.com/ + about: 请使用接下来的链接创建新issue。 + - name: Create new issue + url: https://new-issue.uviewui.com/?lang=en + about: Please use the following link to create a new issue. From 293ee795666892387130f051d0e6cc9d9adf32b9 Mon Sep 17 00:00:00 2001 From: yang4515 Date: Tue, 30 Nov 2021 19:53:42 +0800 Subject: [PATCH 28/58] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtab=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E5=87=BA=E7=8E=B0=E5=B7=A6=E5=8F=B3=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E6=8C=87=E7=A4=BA=E5=99=A8=E4=BD=8D=E7=BD=AE=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-tabs/u-tabs.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue index 0c596585..3775fcd4 100644 --- a/uview-ui/components/u-tabs/u-tabs.vue +++ b/uview-ui/components/u-tabs/u-tabs.vue @@ -3,9 +3,9 @@ background: bgColor }"> - + - + From 473d8781fa22e809e92e7d39a2ce428fd8f60153 Mon Sep 17 00:00:00 2001 From: "PC-20210717BZNV\\Administrator" Date: Tue, 7 Dec 2021 22:27:43 +0800 Subject: [PATCH 29/58] =?UTF-8?q?fix(select=E7=BB=84=E4=BB=B6)=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84bug=20fix(number-box):=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=AE=BE=E7=BD=AE=E5=8F=AF=E8=BE=93=E5=85=A5=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E6=97=B6=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9C=9F?= =?UTF-8?q?=E6=9C=BA=E6=97=A0=E6=B3=95=E8=BE=93=E5=85=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-number-box/u-number-box.vue | 2 +- uview-ui/components/u-select/u-select.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uview-ui/components/u-number-box/u-number-box.vue b/uview-ui/components/u-number-box/u-number-box.vue index 54a679eb..3fe16df4 100644 --- a/uview-ui/components/u-number-box/u-number-box.vue +++ b/uview-ui/components/u-number-box/u-number-box.vue @@ -10,7 +10,7 @@ - {{$t('common.title')}} + uView {{version}} - {{$t('common.intro')}} + {{$t('common.intro')}} @@ -21,78 +21,83 @@ From 09c9e206b1a7a41fd19f56687036331dfd7535fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E7=9A=93?= Date: Sat, 25 Dec 2021 17:04:20 +0800 Subject: [PATCH 31/58] =?UTF-8?q?update:=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- uview-ui/libs/config/config.js | 6 +++--- uview-ui/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 5ffdcffc..9ade703a 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "uView", "appid" : "__UNI__6655525", "description" : "多平台快速开发的UI框架", - "versionName" : "1.8.4", + "versionName" : "1.8.5", "versionCode" : "100", "transformPx" : false, "app-plus" : { diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js index ac3c65ef..32742cd9 100644 --- a/uview-ui/libs/config/config.js +++ b/uview-ui/libs/config/config.js @@ -1,5 +1,5 @@ -// 此版本发布于2020-12-17 -let version = '1.8.3'; +// 此版本发布于2020-12-15 +let version = '1.8.5'; export default { v: version, @@ -12,4 +12,4 @@ export default { 'error', 'warning' ] -} \ No newline at end of file +} diff --git a/uview-ui/package.json b/uview-ui/package.json index 431d5859..c0e05d29 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,6 +1,6 @@ { "name": "uview-ui", - "version": "1.8.4", + "version": "1.8.5", "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", "main": "index.js", "keywords": [ From 5491842db81875e883fec091da73869f8da10d98 Mon Sep 17 00:00:00 2001 From: yatoku Date: Mon, 21 Mar 2022 15:07:25 +0800 Subject: [PATCH 32/58] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D`u-inpu`t=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD`blur`=E4=BA=8B=E4=BB=B6=E4=BD=BF=E7=94=A8`va?= =?UTF-8?q?lue`=E5=8F=98=E9=87=8F=E6=9C=AA=E5=A3=B0=E6=98=8E=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close #1008 --- uview-ui/components/u-input/u-input.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/uview-ui/components/u-input/u-input.vue b/uview-ui/components/u-input/u-input.vue index f2aea72f..5f595565 100644 --- a/uview-ui/components/u-input/u-input.vue +++ b/uview-ui/components/u-input/u-input.vue @@ -300,11 +300,12 @@ export default { handleBlur(event) { // 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错 // 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时 + let value = event.detail.value; setTimeout(() => { this.focused = false; }, 100) // vue 原生的方法 return 出去 - this.$emit('blur', event.detail.value); + this.$emit('blur', value); setTimeout(() => { // 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理 // #ifdef MP-TOUTIAO @@ -312,7 +313,7 @@ export default { this.lastValue = value; // #endif // 将当前的值发送到 u-form-item 进行校验 - this.dispatch('u-form-item', 'on-form-blur', event.detail.value); + this.dispatch('u-form-item', 'on-form-blur', value); }, 40) }, onFormItemError(status) { From ddb7efe1fabb5edd1ee90a25800ea36e38a572b2 Mon Sep 17 00:00:00 2001 From: yatoku Date: Tue, 15 Mar 2022 16:29:24 +0800 Subject: [PATCH 33/58] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=ADu-upload?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=BC=BA=E5=B0=91=E5=8F=82=E6=95=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close #1210 --- uview-ui/components/u-upload/u-upload.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue index 376d856d..c7a9f059 100644 --- a/uview-ui/components/u-upload/u-upload.vue +++ b/uview-ui/components/u-upload/u-upload.vue @@ -421,6 +421,9 @@ export default { name: this.name, formData: this.formData, header: this.header, + // #ifdef MP-ALIPAY + fileType:'image', + // #endif success: res => { // 判断是否json字符串，将其转为json格式 let data = this.toJson && this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data; From b9f2ad790095de55247e770a7ad9017641da39b3 Mon Sep 17 00:00:00 2001 From: yzwxy Date: Thu, 17 Feb 2022 13:44:26 +0800 Subject: [PATCH 34/58] =?UTF-8?q?fix(u-number-box):=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=87=E6=8D=A2=E7=B1=BB=E5=9E=8B=E5=BC=95?= =?UTF-8?q?=E8=B5=B7=E7=9A=84=E8=BE=93=E5=85=A5=E6=A1=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-number-box/u-number-box.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uview-ui/components/u-number-box/u-number-box.vue b/uview-ui/components/u-number-box/u-number-box.vue index 3fe16df4..3b8e8bfa 100644 --- a/uview-ui/components/u-number-box/u-number-box.vue +++ b/uview-ui/components/u-number-box/u-number-box.vue @@ -10,7 +10,7 @@ Date: Tue, 28 Sep 2021 14:40:09 +0800 Subject: [PATCH 38/58] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=E9=87=8C=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/libs/function/guid.js | 4 ++-- uview-ui/libs/mixin/mixin.js | 2 +- uview-ui/libs/util/async-validator.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/uview-ui/libs/function/guid.js b/uview-ui/libs/function/guid.js index 8497664a..e04190aa 100644 --- a/uview-ui/libs/function/guid.js +++ b/uview-ui/libs/function/guid.js @@ -6,7 +6,7 @@ * v-for的时候,推荐使用后端返回的id而不是循环的index * @param {Number} len uuid的长度 * @param {Boolean} firstU 将返回的首字母置为"u" - * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制 + * @param {Number} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制 */ function guid(len = 32, firstU = true, radix = null) { let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split(''); @@ -29,7 +29,7 @@ function guid(len = 32, firstU = true, radix = null) { } } } - // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class + // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guid不能用作id或者class if (firstU) { uuid.shift(); return 'u' + uuid.join(''); diff --git a/uview-ui/libs/mixin/mixin.js b/uview-ui/libs/mixin/mixin.js index e3889867..cb645451 100644 --- a/uview-ui/libs/mixin/mixin.js +++ b/uview-ui/libs/mixin/mixin.js @@ -48,7 +48,7 @@ module.exports = { uni.$emit('uOnReachBottom') }, beforeDestroy() { - // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况 + // 判断当前页面是否存在parent和children，一般在checkbox和checkbox-group父子联动的场景会有此情况 // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱 if(this.parent && uni.$u.test.array(this.parent.children)) { // 组件销毁时，移除父组件中的children数组中对应的实例 diff --git a/uview-ui/libs/util/async-validator.js b/uview-ui/libs/util/async-validator.js index d7215b9f..6183d0a3 100644 --- a/uview-ui/libs/util/async-validator.js +++ b/uview-ui/libs/util/async-validator.js @@ -437,7 +437,7 @@ function range(rule, value, source, errors, options) { } if (str) { - // 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".lenght !== 3 + // 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".length !== 3 val = value.replace(spRegexp, '_').length; } From 20ed10d68a67601b03ae7cec0c9c39548fe6deb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E7=9A=93?= Date: Tue, 19 Apr 2022 16:13:06 +0800 Subject: [PATCH 39/58] update:1.8.6 --- .gitignore | 1 + manifest.json | 2 +- uview-ui/libs/config/config.js | 4 ++-- uview-ui/package.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 999c4c54..ac247463 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /node_modules/* /.idea/* deploy.sh +.hbuilderx/ diff --git a/manifest.json b/manifest.json index 9ade703a..02b0c4d7 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "uView", "appid" : "__UNI__6655525", "description" : "多平台快速开发的UI框架", - "versionName" : "1.8.5", + "versionName" : "1.8.6", "versionCode" : "100", "transformPx" : false, "app-plus" : { diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js index 32742cd9..d77e9713 100644 --- a/uview-ui/libs/config/config.js +++ b/uview-ui/libs/config/config.js @@ -1,5 +1,5 @@ -// 此版本发布于2020-12-15 -let version = '1.8.5'; +// 此版本发布于2022-04-19 +let version = '1.8.6'; export default { v: version, diff --git a/uview-ui/package.json b/uview-ui/package.json index c0e05d29..e6137050 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,6 +1,6 @@ { "name": "uview-ui", - "version": "1.8.5", + "version": "1.8.6", "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", "main": "index.js", "keywords": [ From 982ee6c5f5582fa74050df6e397a376e03be30ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E7=9A=93?= Date: Thu, 21 Apr 2022 13:48:14 +0800 Subject: [PATCH 40/58] bugfix:u-loding css --- uview-ui/components/u-loading/u-loading.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uview-ui/components/u-loading/u-loading.vue b/uview-ui/components/u-loading/u-loading.vue index c747f643..b601642c 100644 --- a/uview-ui/components/u-loading/u-loading.vue +++ b/uview-ui/components/u-loading/u-loading.vue @@ -73,7 +73,7 @@ height: 20px; display: inline-block; vertical-align: middle; - -webkit-animation: a 1s steps(12) infinite; + -webkit-animation: u-flower 1s steps(12) infinite; animation: u-flower 1s steps(12) infinite; background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat; background-size: 100%; From 774413a36364f005bf4f9b378ab8e7e3c0fd9a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E7=9A=93?= Date: Thu, 21 Apr 2022 15:25:44 +0800 Subject: [PATCH 41/58] bugfix:input textarea adjustPosition --- uview-ui/components/u-input/u-input.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/uview-ui/components/u-input/u-input.vue b/uview-ui/components/u-input/u-input.vue index 301e8002..16b8a5cc 100644 --- a/uview-ui/components/u-input/u-input.vue +++ b/uview-ui/components/u-input/u-input.vue @@ -28,6 +28,7 @@ :selection-start="uSelectionStart" :cursor-spacing="getCursorSpacing" :show-confirm-bar="showConfirmbar" + :adjust-position="adjustPosition" @input="handleInput" @blur="handleBlur" @focus="onFocus" From 8d3bcbdee015d31d07e0f6e2f9f823e95dde0d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E7=9A=93?= Date: Sun, 24 Apr 2022 18:23:29 +0800 Subject: [PATCH 42/58] update:sass --- uview-ui/package.json | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/uview-ui/package.json b/uview-ui/package.json index e6137050..ff80541b 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,39 +1,39 @@ { - "name": "uview-ui", - "version": "1.8.6", - "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", - "main": "index.js", - "keywords": [ - "uview", - "uView", - "uni-app", - "uni-app ui", - "uniapp", - "uviewui", - "uview ui", - "uviewUI", - "uViewui", - "uViewUI", - "uView UI", - "uni ui", - "uni UI", - "uniapp ui", - "ui", - "UI框架", - "uniapp ui框架", - "uniapp UI" - ], - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "" - }, - "devDependencies": { - "node-sass": "^4.14.0", - "sass-loader": "^8.0.2" - }, - "author": "uView", - "license": "MIT" + "name": "uview-ui", + "version": "1.8.6", + "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", + "main": "index.js", + "keywords": [ + "uview", + "uView", + "uni-app", + "uni-app ui", + "uniapp", + "uviewui", + "uview ui", + "uviewUI", + "uViewui", + "uViewUI", + "uView UI", + "uni ui", + "uni UI", + "uniapp ui", + "ui", + "UI框架", + "uniapp ui框架", + "uniapp UI" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "" + }, + "devDependencies": { + "sass": "1.26.2", + "sass-loader": "8.0.2" + }, + "author": "uView", + "license": "MIT" } From 068c3434d6677aba56e302578ddb8fe8b61fd235 Mon Sep 17 00:00:00 2001 From: LIUCHAO Date: Wed, 11 May 2022 19:54:15 +0800 Subject: [PATCH 43/58] fix(tabs): amend ClassName spelling mistake --- uview-ui/components/u-tabs/u-tabs.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue index 3775fcd4..5ffc4334 100644 --- a/uview-ui/components/u-tabs/u-tabs.vue +++ b/uview-ui/components/u-tabs/u-tabs.vue @@ -5,7 +5,7 @@ - + @@ -362,7 +362,7 @@ bottom: 0; } - .u-tabs-scorll-flex { + .u-tabs-scroll-flex { @include vue-flex; justify-content: space-between; } From 39ab6e315a88f1d273391da15dc65479c12233fa Mon Sep 17 00:00:00 2001 From: LIUCHAO <50739490+LIUCHAO-ethereal@users.noreply.github.com> Date: Thu, 12 May 2022 12:05:43 +0800 Subject: [PATCH 44/58] Fix: spelling mistake (#1234) * fix(input): amend annotation spelling mistake * fix(badge): amend annotation spelling mistake * fix(modal): amend annotation spelling mistake * fix(notice-bar): amend annotation spelling mistake * fix(radio): amend annotation spelling mistake * fix(tabs-swiper): amend ClassName spelling mistake * fix(toast): amend annotation spelling mistake * fix(message-input): amend ClassName spelling mistake * fix(card): amend Image invalid mode * fix(message-input): amend ClassName spelling mistake --- uview-ui/components/u-badge/u-badge.vue | 2 +- uview-ui/components/u-card/u-card.vue | 2 +- uview-ui/components/u-input/u-input.vue | 2 +- uview-ui/components/u-message-input/u-message-input.vue | 4 ++-- uview-ui/components/u-modal/u-modal.vue | 2 +- uview-ui/components/u-notice-bar/u-notice-bar.vue | 4 ++-- uview-ui/components/u-radio-group/u-radio-group.vue | 2 +- uview-ui/components/u-radio/u-radio.vue | 2 +- uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue | 6 +++--- uview-ui/components/u-toast/u-toast.vue | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/uview-ui/components/u-badge/u-badge.vue b/uview-ui/components/u-badge/u-badge.vue index e85b133a..1c155071 100644 --- a/uview-ui/components/u-badge/u-badge.vue +++ b/uview-ui/components/u-badge/u-badge.vue @@ -113,7 +113,7 @@ style.right = this.offset[1] + 'rpx'; style.transform = "translateY(0) translateX(0)"; } - // 如果尺寸为mini，后接上scal() + // 如果尺寸为mini，后接上scale() if(this.size == 'mini') { style.transform = style.transform + " scale(0.8)"; } diff --git a/uview-ui/components/u-card/u-card.vue b/uview-ui/components/u-card/u-card.vue index a3cb2aa9..79fb7268 100644 --- a/uview-ui/components/u-card/u-card.vue +++ b/uview-ui/components/u-card/u-card.vue @@ -23,7 +23,7 @@ - {{ charArr[index] ? charArr[index] : ''}} @@ -294,7 +294,7 @@ transform: translate(-50%, -50%); } - .u-buttom-line-active { + .u-bottom-line-active { background: $u-type-primary; } diff --git a/uview-ui/components/u-modal/u-modal.vue b/uview-ui/components/u-modal/u-modal.vue index ce581133..4184c055 100644 --- a/uview-ui/components/u-modal/u-modal.vue +++ b/uview-ui/components/u-modal/u-modal.vue @@ -44,7 +44,7 @@ * @property {Boolean} show-title 是否显示标题（默认true） * @property {Boolean} async-close 是否异步关闭，只对确定按钮有效（默认false） * @property {Boolean} show-confirm-button 是否显示确认按钮（默认true） - * @property {Stringr | Number} negative-top modal往上偏移的值 + * @property {String | Number} negative-top modal往上偏移的值 * @property {Boolean} show-cancel-button 是否显示取消按钮（默认false） * @property {Boolean} mask-close-able 是否允许点击遮罩关闭modal（默认false） * @property {String} confirm-text 确认按钮的文字内容（默认"确认"） diff --git a/uview-ui/components/u-notice-bar/u-notice-bar.vue b/uview-ui/components/u-notice-bar/u-notice-bar.vue index 41a6cc47..4c85b282 100644 --- a/uview-ui/components/u-notice-bar/u-notice-bar.vue +++ b/uview-ui/components/u-notice-bar/u-notice-bar.vue @@ -68,8 +68,8 @@ * @property {String Number} font-size 字体大小，单位rpx（默认28） * @property {Boolean} is-circular mode为horizontal时，指明是否水平衔接滚动（默认true） * @property {String} play-state 播放状态，play - 播放，paused - 暂停（默认play） - * @property {String Nubmer} border-radius 通知栏圆角（默认为0） - * @property {String Nubmer} padding 内边距，字符串，与普通的内边距css写法一直（默认"18rpx 24rpx"） + * @property {String Number} border-radius 通知栏圆角（默认为0） + * @property {String Number} padding 内边距，字符串，与普通的内边距css写法一直（默认"18rpx 24rpx"） * @property {Boolean} no-list-hidden 列表为空时，是否显示组件（默认false） * @property {Boolean} disable-touch 是否禁止通过手动滑动切换通知，只有mode = vertical，或者mode = horizontal且is-circular = false时有效（默认true） * @event {Function} click 点击通告文字触发，只有mode = vertical，或者mode = horizontal且is-circular = false时有效 diff --git a/uview-ui/components/u-radio-group/u-radio-group.vue b/uview-ui/components/u-radio-group/u-radio-group.vue index 2172eb20..b5f1de74 100644 --- a/uview-ui/components/u-radio-group/u-radio-group.vue +++ b/uview-ui/components/u-radio-group/u-radio-group.vue @@ -7,7 +7,7 @@