diff --git a/App.vue b/App.vue index 71ce47c1705edf79418a82635df409aa663c50c6..534f3c14945b827eaa90a5009552c3f6fdc32ec8 100644 --- a/App.vue +++ b/App.vue @@ -1,13 +1,13 @@ - + \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4075549d51ae7c117725d52884ebe9922666c629..9236c4a4a3b2d916d6112d4bcb45e5e5d88c7c65 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "nvueStyleCompiler": "uni-app", "compilerVersion": 3, "splashscreen": { - "alwaysShowBeforeRender": true, + "alwaysShowBeforeRender": false, "waiting": true, "autoclose": true, "delay": 0 diff --git a/package.json b/package.json index 28e45f9ba89c51b754004b3001620bdc881a638e..40fe0832f16ec06907a417261a53e085e3a94f84 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.0.43", + "version": "1.0.44", "description": "云端一体应用快速开发基本项目模版", "keywords": [ "login", diff --git a/pages.json b/pages.json index 727c18bb992089d27f58036df5793632608ee48a..fb76cbf51f1ea119a16320b00d29646e2d5c9715 100644 --- a/pages.json +++ b/pages.json @@ -1,11 +1,12 @@ { - "pages": [{ + "pages": [ + { "path": "pages/list/list", "style": { "navigationStyle": "custom", "enablePullDownRefresh": true - } - }, + } + }, { "path": "pages/grid/grid", "style": { @@ -42,7 +43,6 @@ }, "h5": { "titleNView": { - "buttons": [], "type": "transparent" } }, @@ -174,6 +174,8 @@ }, "condition": { "list": [{ + "path": "pages/list/detail" + },{ "path": "pages/list/list" }, { @@ -185,7 +187,7 @@ "path": "pages/ucenter/settings/settings" } ], - "current": 0 + "current": 1 }, "tabBar": { "color": "#7A7E83", diff --git a/pages/list/detail.vue b/pages/list/detail.vue index eb079a8e07277390a691d7a092993e67ccd41b4d..76f3372d70f0f4e9f4572461e61c01af7f6cea5a 100644 --- a/pages/list/detail.vue +++ b/pages/list/detail.vue @@ -81,7 +81,9 @@ return getApp().globalData.config } }, - onLoad(event) { + onLoad(event) { + console.log(event); + event = {"id":"60783c5cb781700001375672","title":"阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务","excerpt":"阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务","avatar":"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-aliyun-gacrhzeynhss7c6d04/249516a0-3941-11eb-899d-733ae62bed2f.jpg"} //获取真实新闻id，通常 id 来自上一个页面 if (event.id) { this.id = event.id @@ -94,7 +96,7 @@ }) } }, - onNavigationBarButtonTap(event) { + onNavigationBarButtonTap(event) { if (event.type == 'share') { this.shareClick(); } @@ -183,7 +185,13 @@ title, excerpt, avatar - } = this.$refs.detail.dataList + } = this.$refs.detail.dataList + console.log( JSON.stringify({ + _id, + title, + excerpt, + avatar + }) ); uniShare({ content: { //公共的分享类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图） type: 0, @@ -251,7 +259,7 @@ ], cancelText: "取消分享", }, e => { //callback - console.log(e); + // console.log(e); }) }, } diff --git a/pages/list/list.nvue b/pages/list/list.vue similarity index 94% rename from pages/list/list.nvue rename to pages/list/list.vue index e51fe8d14da4956934a286a08bc7027ee862a0f3..07a35f3f466deb6e16bf33459faf1a57d68e1290 100644 --- a/pages/list/list.nvue +++ b/pages/list/list.vue @@ -1,7 +1,7 @@ diff --git a/uni_modules/uni-nav-bar/package.json b/uni_modules/uni-nav-bar/package.json index 87a793f888948c590fe87f8763d3d341cb24bf2a..caf0ed4b12e8d0a9b3ecd984f347d9a05a40700a 100644 --- a/uni_modules/uni-nav-bar/package.json +++ b/uni_modules/uni-nav-bar/package.json @@ -1,12 +1,12 @@ { "id": "uni-nav-bar", "displayName": "uni-nav-bar 自定义导航栏", - "version": "1.0.11", + "version": "1.1.0", "description": "自定义导航栏组件，主要用于头部导航。", "keywords": [ "uni-ui", - "uniui", - "title", + "导航", + "导航栏", "自定义导航栏" ], "repository": "https://github.com/dcloudio/uni-ui", diff --git a/uni_modules/uni-notice-bar/changelog.md b/uni_modules/uni-notice-bar/changelog.md index 4bca31aeac2bfc105cf84fef976c8cc3dec70687..37d7319e1f7a1392f2b1fdbdabede28e3dca51b4 100644 --- a/uni_modules/uni-notice-bar/changelog.md +++ b/uni_modules/uni-notice-bar/changelog.md @@ -1,5 +1,7 @@ -## 1.0.9（2021-05-12） -- 新增 组件示例地址 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.9（2021-05-12） +- 新增 组件示例地址 ## 1.0.8（2021-04-21） - 优化 添加依赖 uni-icons, 导入后自动下载依赖 ## 1.0.7（2021-02-05） diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue index b05049805e97369fbae7fb301efcef7b42708cd0..914ebe2c6d0d6fe02cd121938badb3c842cc195e 100644 --- a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue +++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue @@ -55,6 +55,7 @@ export default { name: 'UniNoticeBar', + emits:['click','getmore','close'], props: { text: { type: String, diff --git a/uni_modules/uni-notice-bar/package.json b/uni_modules/uni-notice-bar/package.json index 04caa6ea4dc3a4b5509c4603bac5e71ca5540ee4..e11a41793fd9944fc36873d338dfafc9c352ed3f 100644 --- a/uni_modules/uni-notice-bar/package.json +++ b/uni_modules/uni-notice-bar/package.json @@ -1,7 +1,7 @@ { "id": "uni-notice-bar", "displayName": "uni-notice-bar 通告栏", - "version": "1.0.9", + "version": "1.1.0", "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告", "keywords": [ "uni-ui", diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md index 9cdb1c03465c2d9b8cad0a3c303e33396b4e21b4..1b73c791692966abf8bba034bb7b6b7cdc93e633 100644 --- a/uni_modules/uni-number-box/changelog.md +++ b/uni_modules/uni-number-box/changelog.md @@ -1,5 +1,7 @@ -## 1.1.0（2021-07-13） -- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.1.1（2021-07-30） +- 优化 vue3下事件警告的问题 +## 1.1.0（2021-07-13） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) ## 1.0.7（2021-05-12） - 新增 组件示例地址 ## 1.0.6（2021-04-20） diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue index b372cdb3d1d79b1bb5c8c544fddcdb9572c44438..aee1742d8b532d6f5242deeb3a99b551113761b6 100644 --- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue +++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue @@ -24,6 +24,7 @@ export default { name: "UniNumberBox", + emits:['change','input','update:modelValue','blur','focus'], props: { value: { type: [Number, String], diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json index 43d9a09e3ab579a6d433586e9c3d857fd29dee94..940a29574b7a0dbe195036d64bb950e9c97f0360 100644 --- a/uni_modules/uni-number-box/package.json +++ b/uni_modules/uni-number-box/package.json @@ -1,7 +1,7 @@ { "id": "uni-number-box", "displayName": "uni-number-box 数字输入框", - "version": "1.1.0", + "version": "1.1.1", "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。", "keywords": [ "uni-ui", diff --git a/uni_modules/uni-pagination/changelog.md b/uni_modules/uni-pagination/changelog.md index 5422ea61608f01effd2a0265da5c1f211d091e85..9c4fde2f2bef380063ee30ede424af8e34317175 100644 --- a/uni_modules/uni-pagination/changelog.md +++ b/uni_modules/uni-pagination/changelog.md @@ -1,5 +1,7 @@ -## 1.0.7（2021-05-12） -- 新增 组件示例地址 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.7（2021-05-12） +- 新增 组件示例地址 ## 1.0.6（2021-04-12） - 新增 PC 和 移动端适配不同的 ui ## 1.0.5（2021-02-05） diff --git a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue index 000dbceaa5ebde883b4671d3a23f42d3bbd30c6e..4f07c0eb359076805620022a05061c7452ee19a9 100644 --- a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue +++ b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue @@ -70,11 +70,16 @@ export default { name: 'UniPagination', + emits:['update:modelValue','input','change'], props: { value: { type: [Number, String], default: 1 }, + modelValue: { + type: [Number, String], + default: 1 + }, prevText: { type: String, default: '上一页' @@ -185,6 +190,13 @@ export default { } else { this.currentIndex = val } + }, + modelValue(val) { + if (val < 1) { + this.currentIndex = 1 + } else { + this.currentIndex = val + } } }, created() { @@ -235,6 +247,7 @@ export default { }, change(e) { this.$emit('input', this.currentIndex) + this.$emit('update:modelValue', this.currentIndex) this.$emit('change', { type: e, current: this.currentIndex diff --git a/uni_modules/uni-pagination/package.json b/uni_modules/uni-pagination/package.json index bae5496ac0e42d725fc3bd597208e537db16b878..b0e9501aa473e26a51e3e9c50d9f271338da5a2e 100644 --- a/uni_modules/uni-pagination/package.json +++ b/uni_modules/uni-pagination/package.json @@ -1,7 +1,7 @@ { "id": "uni-pagination", "displayName": "uni-pagination 分页器", - "version": "1.0.7", + "version": "1.1.0", "description": "Pagination 分页器组件，用于展示页码、请求数据等。", "keywords": [ "uni-ui", diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md index f7ff7fb0f86b1afc8ba3c0c7d5090ba5a8bf915f..be48b60aa3842c84ce0b3e7d6032a2217607c878 100644 --- a/uni_modules/uni-popup/changelog.md +++ b/uni_modules/uni-popup/changelog.md @@ -1,5 +1,7 @@ -## 1.6.0（2021-07-13） -- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.6.1（2021-07-30） +- 优化 vue3下事件警告的问题 +## 1.6.0（2021-07-13） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) ## 1.5.0（2021-06-23） - 新增 mask-click 遮罩层点击事件 ## 1.4.5（2021-06-22） diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue index bdda6e8624d854c7905f953b65379abc4d8f493f..e691675344c76e6a392f555b13517ca6e83abd2e 100644 --- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue +++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue @@ -50,6 +50,7 @@ export default { name: "uniPopupDialog", mixins: [popup], + emits:['confirm','close'], props: { value: { type: [String, Number], diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue index 80e082f189c1c0a5c3caf7b8bce04d0493dfd65c..355cac93aaada22d144ad16b8c2454d03242cdff 100644 --- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue +++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue @@ -21,6 +21,7 @@ export default { name: 'UniPopupShare', mixins:[popup], + emits:['select'], props: { title: { type: String, diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue index efef682adbf50ad7dd1ccb91585189fdb9dbfc67..31744451e24cad19116d22b8661e2e87fb93596a 100644 --- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue +++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue @@ -44,6 +44,7 @@ export default { keypress // #endif }, + emits:['change','maskClick'], props: { // 开启动画 animation: { diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json index 02a2819e1884d0941dfde0b405606234b9b0d9f5..51fa273db091a52a5bcf5657d145e0f4e30659a0 100644 --- a/uni_modules/uni-popup/package.json +++ b/uni_modules/uni-popup/package.json @@ -1,83 +1,85 @@ { - "id": "uni-popup", - "displayName": "uni-popup 弹出层", - "version": "1.6.0", - "description": " Popup 组件，提供常用的弹层", - "keywords": [ - "uni-ui", - "uniui", - "弹出层" -], - "repository": "https://github.com/dcloudio/uni-ui", - "engines": { - "HBuilderX": "" - }, - "directories": { - "example": "../../temps/example_temps" - }, - "dcloudext": { - "category": [ - "前端组件", - "通用组件" + "id": "uni-popup", + "displayName": "uni-popup 弹出层", + "version": "1.6.1", + "description": " Popup 组件，提供常用的弹层", + "keywords": [ + "uni-ui", + "弹出层", + "弹窗", + "popup", + "弹框" ], - "sale": { - "regular": { - "price": "0.00" - }, - "sourcecode": { - "price": "0.00" - } - }, - "contact": { - "qq": "" - }, - "declaration": { - "ads": "无", - "data": "无", - "permissions": "无" - }, - "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" - }, - "uni_modules": { - "dependencies": [ - "uni-transition" - ], - "encrypt": [], - "platforms": { - "cloud": { - "tcb": "y", - "aliyun": "y" - }, - "client": { - "App": { - "app-vue": "y", - "app-nvue": "y" - }, - "H5-mobile": { - "Safari": "y", - "Android Browser": "y", - "微信浏览器(Android)": "y", - "QQ浏览器(Android)": "y" - }, - "H5-pc": { - "Chrome": "y", - "IE": "y", - "Edge": "y", - "Firefox": "y", - "Safari": "y" - }, - "小程序": { - "微信": "y", - "阿里": "y", - "百度": "y", - "字节跳动": "y", - "QQ": "y" - }, - "快应用": { - "华为": "u", - "联盟": "u" - } - } - } - } -} \ No newline at end of file + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [ + "uni-transition" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} diff --git a/uni_modules/uni-rate/changelog.md b/uni_modules/uni-rate/changelog.md index 0fcd7bba82c76aae5276cf2bef37b6f8abba3ab1..9fe0e841fb2ccf3533a5621bb5f54144ee3ad96c 100644 --- a/uni_modules/uni-rate/changelog.md +++ b/uni_modules/uni-rate/changelog.md @@ -1,5 +1,7 @@ -## 1.2.0（2021-07-13） -- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.2.1（2021-07-30） +- 优化 vue3下事件警告的问题 +## 1.2.0（2021-07-13） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) ## 1.1.2（2021-05-12） - 新增 组件示例地址 ## 1.1.1（2021-04-21） diff --git a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue index 63ba1a0ea35b65bd85447595bf38ccd2be1b6b9a..082f6767c793e141754f4b7a2876322a3392bb21 100644 --- a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue +++ b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue @@ -107,6 +107,11 @@ type: [Number, String], default: 1 }, + modelValue: { + // 当前评分 + type: [Number, String], + default: 1 + }, max: { // 最大评分 type: [Number, String], @@ -150,6 +155,9 @@ value(newVal) { this.valueSync = Number(newVal); }, + modelValue(newVal) { + this.valueSync = Number(newVal); + }, }, computed: { stars() { @@ -180,7 +188,7 @@ } }, created() { - this.valueSync = Number(this.value); + this.valueSync = Number(this.value||this.modelValue); this._rateBoxLeft = 0 this._oldValue = null }, @@ -313,6 +321,7 @@ _onChange() { this.$emit("input", this.valueSync); + this.$emit("update:modelValue", this.valueSync); this.$emit("change", { value: this.valueSync }); diff --git a/uni_modules/uni-rate/package.json b/uni_modules/uni-rate/package.json index 6b7f2381b62df57baab2fe4f9034967a8b55bb4e..1cb4669a93548e7bccbe99845b457703ba27c8fb 100644 --- a/uni_modules/uni-rate/package.json +++ b/uni_modules/uni-rate/package.json @@ -1,7 +1,7 @@ { "id": "uni-rate", "displayName": "uni-rate 评分", - "version": "1.2.0", + "version": "1.2.1", "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。", "keywords": [ "uni-ui", diff --git a/uni_modules/uni-search-bar/changelog.md b/uni_modules/uni-search-bar/changelog.md index e7e1f4602daea16a36f7bbb7d41425c8484eab54..de96b8a6bb0d01fbeefc23a701c10062fc85c18d 100644 --- a/uni_modules/uni-search-bar/changelog.md +++ b/uni_modules/uni-search-bar/changelog.md @@ -1,5 +1,7 @@ -## 1.0.9（2021-05-12） -- 新增 项目示例地址 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.9（2021-05-12） +- 新增 项目示例地址 ## 1.0.8（2021-04-21） - 优化 添加依赖 uni-icons, 导入后自动下载依赖 ## 1.0.7（2021-04-15） diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue index f3da0267e7cc62b5ff313c494d32da2fb7b184b2..bdecaf8b9b483c1941272cea1fe1314d17b8a941 100644 --- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue +++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue @@ -49,6 +49,7 @@ export default { name: "UniSearchBar", + emits:['input','update:modelValue','clear','cancel','confirm','blur','focus'], props: { placeholder: { type: String, diff --git a/uni_modules/uni-search-bar/package.json b/uni_modules/uni-search-bar/package.json index fab6ee95d7ee837e87f6bb4bf7345e38dbe4581a..c5f1238eca0653714f97a0bf60bf7cfcb76e0535 100644 --- a/uni_modules/uni-search-bar/package.json +++ b/uni_modules/uni-search-bar/package.json @@ -1,7 +1,7 @@ { "id": "uni-search-bar", "displayName": "uni-search-bar 搜索栏", - "version": "1.0.9", + "version": "1.1.0", "description": "搜索栏组件，通常用于搜索商品、文章等", "keywords": [ "uni-ui", diff --git a/uni_modules/uni-segmented-control/changelog.md b/uni_modules/uni-segmented-control/changelog.md index f8605a5d00ad9ba7deee8e25e3694861db70c83a..b3eacdcac1b446e4b432e8ff04561433b7f96e1a 100644 --- a/uni_modules/uni-segmented-control/changelog.md +++ b/uni_modules/uni-segmented-control/changelog.md @@ -1,4 +1,6 @@ -## 1.0.5（2021-05-12） -- 新增 项目示例地址 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.5（2021-05-12） +- 新增 项目示例地址 ## 1.0.4（2021-02-05） - 调整为uni_modules目录规范 diff --git a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue index ad97dff80d11aa92dea67cc77fa201310e5ae3ce..e3f6e5ecc917e0de387ac95018fb74f52cdc5bd3 100644 --- a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue +++ b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue @@ -35,6 +35,7 @@ export default { name: 'UniSegmentedControl', + emits:['clickItem'], props: { current: { type: Number, diff --git a/uni_modules/uni-segmented-control/package.json b/uni_modules/uni-segmented-control/package.json index bcc37302fe81251a831ba2af08e44a2dd796b1a4..5680713184d68c4ae221984ec82e5037f0c651b7 100644 --- a/uni_modules/uni-segmented-control/package.json +++ b/uni_modules/uni-segmented-control/package.json @@ -1,7 +1,7 @@ { "id": "uni-segmented-control", "displayName": "uni-segmented-control 分段器", - "version": "1.0.5", + "version": "1.1.0", "description": "分段器由至少 2 个分段控件组成，用作不同视图的显示", "keywords": [ "uni-ui", diff --git a/uni_modules/uni-share/changelog.md b/uni_modules/uni-share/changelog.md index 00875ac1720deb492c271a9b403ca22459366409..a655c2e7314320746132534506cc268ce2bbabce 100644 --- a/uni_modules/uni-share/changelog.md +++ b/uni_modules/uni-share/changelog.md @@ -1,3 +1,5 @@ +## 1.0.5（2021-08-05） +优化代码实现，修改原来用`eval()`函数实现的逻辑 ## 1.0.4（2021-06-07） 为符合苹果应用市场的审核，只显示存在对应的分享客户端的选项。如：配置包含微信分享，但是用户手机上并没有安装微信，就不显示微信分享。 ## 1.0.2（2021-05-06） diff --git a/uni_modules/uni-share/js_sdk/uni-image-menu.js b/uni_modules/uni-share/js_sdk/uni-image-menu.js index 26c0c1f549f2cb1cbbf4da26e7a2c9b2c786e622..b482b833dc47ce9406b701ca467fafbb6cc7c415 100644 --- a/uni_modules/uni-share/js_sdk/uni-image-menu.js +++ b/uni_modules/uni-share/js_sdk/uni-image-menu.js @@ -1,18 +1,13 @@ var nvMask,nvImageMenu; export default { show({list,cancelText},callback){ + console.log(789789879); if(!list){ list = [{ - "img":"https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-dc-site/9a952c80-6080-11eb-a16f-5b3e54966275.png", + "img":"/static/sharemenu/wechatfriend.png", "text":"图标文字" }] } - if(list.length>8){ - return uni.showToast({ - title: '目前版本最多支持8个图标', - icon: 'none' - }); - } //以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心 var screenWidth = plus.screen.resolutionWidth //以360px宽度屏幕为例，上下左右边距及2排按钮边距留25像素，图标宽度55像素，同行图标间的间距在360宽的屏幕是30px，但需要动态计算，以此原则计算4列图标分别的left位置 @@ -36,6 +31,9 @@ export default { var left4 = left1 + (iconWidth + iconSpace) * 3 var top1 = left1 var top2 = top1 + iconWidth + icontextSpace + textHeight + left1 + + const TOP = {top1,top2}, LEFT = {left1,left2,left3,left4}; + nvMask = new plus.nativeObj.View("nvMask", { //先创建遮罩层 top: '0px', left: '0px', @@ -61,8 +59,8 @@ export default { tag: 'img', src: item.img, position: { - top: eval('top'+( parseInt(i/4) +1)), - left: eval('left'+(1+i%4)), + top: TOP['top'+( parseInt(i/4) +1)], + left: LEFT['left'+(1+i%4)], width: iconWidth, height: iconWidth } @@ -74,8 +72,8 @@ export default { size: textHeight }, position: { - top: eval('top'+(parseInt(i/4)+1)) + iconWidth + icontextSpace, - left: eval('left'+(1+i%4)), + top: TOP['top'+(parseInt(i/4)+1)] + iconWidth + icontextSpace, + left: LEFT['left'+(1+i%4)], width: iconWidth, height: textHeight } diff --git a/uni_modules/uni-share/js_sdk/uni-share.js b/uni_modules/uni-share/js_sdk/uni-share.js index 2b2b3494981db10b6f32e423b30718a557627853..99d118de9157a2036dc213de223ead55744bcfa0 100644 --- a/uni_modules/uni-share/js_sdk/uni-share.js +++ b/uni_modules/uni-share/js_sdk/uni-share.js @@ -10,16 +10,25 @@ export default async (param,callback) => { menus.push(item) } }) - console.log(menus); + // console.log(menus); uniImageMenu.show({list:menus,cancelText:param.cancelText}, e => { - console.log(e); if (typeof(menus[e]['share']) == 'string') { - eval(menus[e]['share']+'()') + switch (menus[e]['share']){ + case "copyurl": + copyurl() + break; + case "shareSystem": + shareSystem() + break; + default: + console.error('未知事件名称:'+menus[e]['share']); + break; + } } else { - // console.log(123456,{ - // ...param.content, - // ...menus[e].share, - // }); + console.log(123456,{ + ...param.content, + ...menus[e].share, + }); uni.share({ ...param.content, ...menus[e].share, diff --git a/uni_modules/uni-share/package.json b/uni_modules/uni-share/package.json index d9f36bc61474886e35fcacaff3716d9f94758fb8..7c6ef1947961e8bb6596855b21846f226cdbe033 100644 --- a/uni_modules/uni-share/package.json +++ b/uni_modules/uni-share/package.json @@ -1,7 +1,7 @@ { "id": "uni-share", "displayName": "uni-share", - "version": "1.0.4", + "version": "1.0.5", "description": "底部弹出宫格图标式的分享菜单，可覆盖原生组件。", "keywords": [ "分享菜单" @@ -69,6 +69,10 @@ "快应用": { "华为": "n", "联盟": "n" + }, + "Vue": { + "vue2": "y", + "vue3": "u" } } } diff --git a/uni_modules/uni-swipe-action/changelog.md b/uni_modules/uni-swipe-action/changelog.md index 82f98c6784c747d2fc9b2cef6a15acec63008cff..080c25102b9a4ee22a80cdfb83a765f439383d0a 100644 --- a/uni_modules/uni-swipe-action/changelog.md +++ b/uni_modules/uni-swipe-action/changelog.md @@ -1,3 +1,6 @@ +## 1.2.1（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +- 修复 跨页面修改组件数据 ，导致不能滑动的问题 ## 1.1.10（2021-06-17） - 修复 按钮点击执行两次的bug ## 1.1.9（2021-05-12） diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js index 0b7b25f2676efbc075c902e54c32bd61f688807d..29d4e9a2ad07c695606c312ebccebcc666a041fb 100644 --- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js +++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js @@ -27,6 +27,7 @@ export default { } }, created() { + this.swipeaction = this.getSwipeAction() if (this.swipeaction.children !== undefined) { this.swipeaction.children.push(this) } @@ -38,13 +39,13 @@ export default { this.rightButton = this.getEl(this.$refs['selector-right-button--hock']); this.init() }, - beforeDestroy() { - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) - }, + // beforeDestroy() { + // this.swipeaction.children.forEach((item, index) => { + // if (item === this) { + // this.swipeaction.children.splice(index, 1) + // } + // }) + // }, methods: { init() { this.$nextTick(() => { diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js index 5958a1010c8b167e72815866d978fc5ccbf7b63f..07c58a258f9a3658fe7c0845067b6b509815c7dc 100644 --- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js +++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js @@ -20,18 +20,19 @@ export default { } }, created() { + this.swipeaction = this.getSwipeAction() if (this.swipeaction.children !== undefined) { this.swipeaction.children.push(this) } }, - beforeDestroy() { - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) - }, + // beforeDestroy() { + // this.swipeaction.children.forEach((item, index) => { + // if (item === this) { + // this.swipeaction.children.splice(index, 1) + // } + // }) + // }, mounted() { this.isopen = false setTimeout(() => { diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js index 8c29186b821dd300ae7ac7fd2cbec4865e2fbf9c..36306ce4621f20b23c1306ece0fb8fc466fa8e00 100644 --- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js +++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js @@ -29,19 +29,20 @@ export default { } }, mounted() { + this.swipeaction = this.getSwipeAction() // this.position = {} if (this.swipeaction.children !== undefined) { this.swipeaction.children.push(this) } this.init() }, - beforeDestoy() { - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) - }, + // beforeDestoy() { + // this.swipeaction.children.forEach((item, index) => { + // if (item === this) { + // this.swipeaction.children.splice(index, 1) + // } + // }) + // }, methods: { init(){ clearTimeout(this.timer) diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js index 8215e2509ec5b1e7bfedac8e0997bc10b5e4e7b7..8a12e94698e4ddc7e871e1d63e97da8be80bff65 100644 --- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js +++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js @@ -7,14 +7,6 @@ export default { btn: "[]" } }, - // computed: { - // pos() { - // return JSON.stringify(this.position) - // }, - // btn() { - // return JSON.stringify(this.button) - // } - // }, watch: { button: { handler(newVal) { @@ -38,6 +30,7 @@ export default { } }, created() { + this.swipeaction = this.getSwipeAction() if (this.swipeaction.children !== undefined) { this.swipeaction.children.push(this) } @@ -45,12 +38,9 @@ export default { mounted() { this.init() }, - beforeDestroy() { - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) + // fixme by mehaotian 在页面激活的时候需要重新获取元素信息 + activated(){ + this.init() }, methods: { init() { diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue index eb1032dcb17b36dc366ec7ffc5a62bc42088ab37..b8cb8651ab7a8777939a97276415fc373fa1212d 100644 --- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue +++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue @@ -2,62 +2,36 @@ - + - {{ item.text }} + }" class="uni-swipe_button button-hock" @touchstart="appTouchStart" + @touchend="appTouchEnd($event,index,item,'left')" @click.stop="onClickForPC(index,item,'left')"> + {{ item.text }} + - - + + - {{ item.text }} + }" class="uni-swipe_button button-hock" @touchstart="appTouchStart" + @touchend="appTouchEnd($event,index,item,'right')" + @click.stop="onClickForPC(index,item,'right')">{{ item.text }} + @@ -65,58 +39,30 @@ - - + + - {{ item.text }} + }" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')">{{ item.text }} + - + - {{ item.text }} + }" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')">{{ item.text }} + - + @@ -124,51 +70,29 @@ - + - {{ item.text }} + }" class="uni-swipe_button button-hock" @touchstart="appTouchStart" + @touchend="appTouchEnd($event,index,item,'left')">{{ item.text }} + - {{ item.text }} + }" @touchstart="appTouchStart" @touchend="appTouchEnd($event,index,item,'right')" + class="uni-swipe_button button-hock">{{ item.text }} + @@ -176,11 +100,7 @@ - + - + diff --git a/uni_modules/uni-table/components/uni-th/uni-th.vue b/uni_modules/uni-table/components/uni-th/uni-th.vue index 8d73f66da4868d0afe62808cd8661f3aeb5d890e..d87f1e821ae34e945ec7e2064959cfae3f60613a 100644 --- a/uni_modules/uni-table/components/uni-th/uni-th.vue +++ b/uni_modules/uni-table/components/uni-th/uni-th.vue @@ -44,6 +44,7 @@ export default { components: { dropdown }, + emits:['sort-change','filter-change'], props: { width: { type: [String, Number], diff --git a/uni_modules/uni-table/components/uni-tr/table-checkbox.vue b/uni_modules/uni-table/components/uni-tr/table-checkbox.vue index 87e58a941c851618775266294cd2bf86b29499c0..7c315603f8c5d267fe4eda4cfcda5494bb0828a4 100644 --- a/uni_modules/uni-table/components/uni-tr/table-checkbox.vue +++ b/uni_modules/uni-table/components/uni-tr/table-checkbox.vue @@ -12,6 +12,7 @@ - + + + diff --git a/uni_modules/uni-ui/package.json b/uni_modules/uni-ui/package.json index efa8521ed0378df165a4b76391929410365e2f86..68b2a294aa129b3153c507f404b9d999d363ae00 100644 --- a/uni_modules/uni-ui/package.json +++ b/uni_modules/uni-ui/package.json @@ -1,12 +1,11 @@ { "id": "uni-ui", "displayName": "uni-ui", - "version": "1.3.7", - "description": "基于 uni-app 的 UI 组件库", + "version": "1.3.9", + "description": "uni-ui 是一个基于uni-app全端兼容的高性能UI框架", "keywords": [ "uni-ui", "uniui", - "", "UI组件库", "ui框架", "ui库" @@ -118,6 +117,10 @@ "快应用": { "华为": "u", "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "u" } } } diff --git a/uni_modules_tools/copy/manifest.json b/uni_modules_tools/copy/manifest.json index db05c056af5ab9a7052e6605177b0388648dcc6f..ca1202959cfbef3691b3baeaa8666cc520c9d83b 100644 --- a/uni_modules_tools/copy/manifest.json +++ b/uni_modules_tools/copy/manifest.json @@ -22,7 +22,7 @@ "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, "splashscreen" : { - "alwaysShowBeforeRender" : true, + "alwaysShowBeforeRender" : false, "waiting" : true, "autoclose" : true, "delay" : 0