diff --git a/env.js b/env.js index d7553e4b031ce918e67a304b6b15a63e67ac8c8f..cfd2db5fd072f74ac6100d089b2885d6931426c9 100644 --- a/env.js +++ b/env.js @@ -1,3 +1,4 @@ +// 自动化测试 module.exports = { "is-custom-runtime": false, "compile": true, @@ -35,4 +36,4 @@ module.exports = { } } } -} \ No newline at end of file +} diff --git a/jest-setup.js b/jest-setup.js index c5b8872c3bf029e27902f4acef9ea85934f18d1a..624cfa0d392a3f0fe7e19e5b5c254c1b9ee2d484 100644 --- a/jest-setup.js +++ b/jest-setup.js @@ -1,3 +1,4 @@ +// 自动化测试 const path = require('path'); const { configureToMatchImageSnapshot diff --git a/jest.config.js b/jest.config.js index 0e0eb1635458396e9f4b70098d17718000de1c2f..67d401b80c0eb83e05eaaafdb88ea0ff3d3ffb48 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,3 +1,4 @@ +// 自动化测试 module.exports = { testTimeout: 30000, reporters: ['default'], diff --git a/uni_modules/uni-loading/changelog.md b/uni_modules/uni-loading/changelog.md index 07008070fea5ae9b85b00636c332316c0147219b..4064b1bb4b25547f8245a8943e09baef6e7a6411 100644 --- a/uni_modules/uni-loading/changelog.md +++ b/uni_modules/uni-loading/changelog.md @@ -1,3 +1,5 @@ +## 1.0.5(2024-01-12) +- 优化 删除组件内无用日志输出 ## 1.0.4(2024-01-10) - 优化 兼容 uvue h5 项目 ## 1.0.3(2023-12-22) diff --git a/uni_modules/uni-loading/components/uni-loading/circle.uvue b/uni_modules/uni-loading/components/uni-loading/circle.uvue index ced8f80d33b75398aa0f4de90683b67b15873c46..e5f673a98aa3500adee8f2e9716ff017aa1c2469 100644 --- a/uni_modules/uni-loading/components/uni-loading/circle.uvue +++ b/uni_modules/uni-loading/components/uni-loading/circle.uvue @@ -1,187 +1,186 @@ - - - - diff --git a/uni_modules/uni-loading/components/uni-loading/icon.uvue b/uni_modules/uni-loading/components/uni-loading/icon.uvue index 2c4435f0989475f01edc2c00e87374887888d348..6d678675b137d4b10e08fc792d85120114b417af 100644 --- a/uni_modules/uni-loading/components/uni-loading/icon.uvue +++ b/uni_modules/uni-loading/components/uni-loading/icon.uvue @@ -1,70 +1,70 @@ - - - - - diff --git a/uni_modules/uni-loading/components/uni-loading/uni-loading.uvue b/uni_modules/uni-loading/components/uni-loading/uni-loading.uvue index a39634914b70361d13294e6e8bfdeed6204b0975..4830eda762b65d573a9ecb84005ae09cbf679987 100644 --- a/uni_modules/uni-loading/components/uni-loading/uni-loading.uvue +++ b/uni_modules/uni-loading/components/uni-loading/uni-loading.uvue @@ -1,164 +1,164 @@ - - - - diff --git a/uni_modules/uni-loading/components/uni-loading/util.uts b/uni_modules/uni-loading/components/uni-loading/util.uts index b80fb7dbc86d3a67f16a5e1e01324afc0559839e..70d0e3c093d99cd8eebb9bf77feef6051c75bd6e 100644 --- a/uni_modules/uni-loading/components/uni-loading/util.uts +++ b/uni_modules/uni-loading/components/uni-loading/util.uts @@ -1,42 +1,42 @@ - -/** - * hex颜色转rgba - */ -export const hexToRgba = (hex : string, alpha : number) : string => { - // 去除 # 符号(如果有的话) - hex = hex.replace('#', ''); - let hexArray = hex.split(''); - // 检查颜色值长度,如果不符合预期则返回默认值或者抛出错误 - if (hexArray.length != 3 && hexArray.length != 6) { - // 返回默认值或者抛出错误,这里使用默认值为黑色 - return 'rgba(0,0,0,1)'; - // 或者抛出错误 - // throw new Error('Invalid hex color value'); - } - - let extendedHex : string[] = []; - - if (hex.length == 3) { - for (let i = 0; i < hexArray.length; i++) { - extendedHex.push(hexArray[i]); - extendedHex.push(hexArray[i]); - } - hexArray = extendedHex; - } - hex = '' - for (let h = 0; h < hexArray.length; h++) { - hex += hexArray[h] - } - - // // 拆分颜色值为 R、G、B - const r = parseInt(hex.substring(0, 2), 16); - const g = parseInt(hex.substring(2, 4), 16); - const b = parseInt(hex.substring(4, 6), 16); - - // // 返回 rgba 值 - return `rgba(${r},${g},${b},${alpha})`; -} - -export const easeInOutCubic = (t : number) : number => { - return t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1; + +/** + * hex颜色转rgba + */ +export const hexToRgba = (hex : string, alpha : number) : string => { + // 去除 # 符号(如果有的话) + hex = hex.replace('#', ''); + let hexArray = hex.split(''); + // 检查颜色值长度,如果不符合预期则返回默认值或者抛出错误 + if (hexArray.length != 3 && hexArray.length != 6) { + // 返回默认值或者抛出错误,这里使用默认值为黑色 + return 'rgba(0,0,0,1)'; + // 或者抛出错误 + // throw new Error('Invalid hex color value'); + } + + let extendedHex : string[] = []; + + if (hex.length == 3) { + for (let i = 0; i < hexArray.length; i++) { + extendedHex.push(hexArray[i]); + extendedHex.push(hexArray[i]); + } + hexArray = extendedHex; + } + hex = '' + for (let h = 0; h < hexArray.length; h++) { + hex += hexArray[h] + } + + // // 拆分颜色值为 R、G、B + const r = parseInt(hex.substring(0, 2), 16); + const g = parseInt(hex.substring(2, 4), 16); + const b = parseInt(hex.substring(4, 6), 16); + + // // 返回 rgba 值 + return `rgba(${r},${g},${b},${alpha})`; +} + +export const easeInOutCubic = (t : number) : number => { + return t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1; } diff --git a/uni_modules/uni-loading/package.json b/uni_modules/uni-loading/package.json index 9606333056831a2248646bcbfb908b7f4597e68d..1dedcab223ea31a1419af3ad3a4d426239b7e80f 100644 --- a/uni_modules/uni-loading/package.json +++ b/uni_modules/uni-loading/package.json @@ -1,88 +1,88 @@ -{ - "id": "uni-loading", - "displayName": "uni-loading", - "version": "1.0.4", - "description": "加载动画组件多用在页面内数据加载时,提供一个loading动画,列表的上拉加载,下拉刷新等都需要加载动画", - "keywords": [ - "loading", - "加载动画", - "上拉刷新", - "下拉加载" - ], - "repository": "", - "engines": { - "HBuilderX": "^3.97" - }, - "dcloudext": { - "type": "component-vue", - "sale": { - "regular": { - "price": "0.00" - }, - "sourcecode": { - "price": "0.00" - } - }, - "contact": { - "qq": "" - }, - "declaration": { - "ads": "无", - "data": "无", - "permissions": "无" - }, - "npmurl": "" - }, - "uni_modules": { - "dependencies": [ - "uni-icons" - ], - "encrypt": [], - "platforms": { - "cloud": { - "tcb": "y", - "aliyun": "y", - "alipay": "y" - }, - "client": { - "Vue": { - "vue2": "n", - "vue3": "y" - }, - "App": { - "app-vue": "n", - "app-nvue": "n", - "app-uvue": "y" - }, - "H5-mobile": { - "Safari": "n", - "Android Browser": "n", - "微信浏览器(Android)": "n", - "QQ浏览器(Android)": "n" - }, - "H5-pc": { - "Chrome": "n", - "IE": "n", - "Edge": "n", - "Firefox": "n", - "Safari": "n" - }, - "小程序": { - "微信": "n", - "阿里": "n", - "百度": "n", - "字节跳动": "n", - "QQ": "n", - "钉钉": "n", - "快手": "n", - "飞书": "n", - "京东": "n" - }, - "快应用": { - "华为": "n", - "联盟": "n" - } - } - } - } +{ + "id": "uni-loading", + "displayName": "uni-loading", + "version": "1.0.5", + "description": "加载动画组件多用在页面内数据加载时,提供一个loading动画,列表的上拉加载,下拉刷新等都需要加载动画", + "keywords": [ + "loading", + "加载动画", + "上拉刷新", + "下拉加载" + ], + "repository": "", + "engines": { + "HBuilderX": "^3.97" + }, + "dcloudext": { + "type": "component-vue", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [ + "uni-icons" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "y" + }, + "client": { + "Vue": { + "vue2": "n", + "vue3": "y" + }, + "App": { + "app-vue": "n", + "app-nvue": "n", + "app-uvue": "y" + }, + "H5-mobile": { + "Safari": "n", + "Android Browser": "n", + "微信浏览器(Android)": "n", + "QQ浏览器(Android)": "n" + }, + "H5-pc": { + "Chrome": "n", + "IE": "n", + "Edge": "n", + "Firefox": "n", + "Safari": "n" + }, + "小程序": { + "微信": "n", + "阿里": "n", + "百度": "n", + "字节跳动": "n", + "QQ": "n", + "钉钉": "n", + "快手": "n", + "飞书": "n", + "京东": "n" + }, + "快应用": { + "华为": "n", + "联盟": "n" + } + } + } + } } \ No newline at end of file diff --git a/uni_modules/uni-loading/readme.md b/uni_modules/uni-loading/readme.md index 9de0d37d54ec8868a18e29c2814918708df4cfcf..e98488141ab42e245e1606dd5734c580f2ddfaaf 100644 --- a/uni_modules/uni-loading/readme.md +++ b/uni_modules/uni-loading/readme.md @@ -19,7 +19,7 @@ - + ```