uview-plus 3.4.32 → 3.4.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +7 -0
- package/components/u-album/u-album.vue +18 -3
- package/components/u-cate-tab/u-cate-tab.vue +3 -3
- package/components/u-datetime-picker/u-datetime-picker.vue +6 -3
- package/libs/util/gcanvas/bridge/bridge-weex.js +0 -0
- package/libs/util/gcanvas/context-2d/FillStyleLinearGradient.js +0 -0
- package/libs/util/gcanvas/context-2d/FillStylePattern.js +0 -0
- package/libs/util/gcanvas/context-2d/FillStyleRadialGradient.js +0 -0
- package/libs/util/gcanvas/context-2d/RenderingContext.js +0 -0
- package/libs/util/gcanvas/context-webgl/ActiveInfo.js +0 -0
- package/libs/util/gcanvas/context-webgl/Buffer.js +0 -0
- package/libs/util/gcanvas/context-webgl/Framebuffer.js +0 -0
- package/libs/util/gcanvas/context-webgl/GLenum.js +0 -0
- package/libs/util/gcanvas/context-webgl/GLmethod.js +0 -0
- package/libs/util/gcanvas/context-webgl/GLtype.js +0 -0
- package/libs/util/gcanvas/context-webgl/Program.js +0 -0
- package/libs/util/gcanvas/context-webgl/Renderbuffer.js +0 -0
- package/libs/util/gcanvas/context-webgl/RenderingContext.js +0 -0
- package/libs/util/gcanvas/context-webgl/Shader.js +0 -0
- package/libs/util/gcanvas/context-webgl/ShaderPrecisionFormat.js +0 -0
- package/libs/util/gcanvas/context-webgl/Texture.js +0 -0
- package/libs/util/gcanvas/context-webgl/UniformLocation.js +0 -0
- package/libs/util/gcanvas/context-webgl/classUtils.js +0 -0
- package/libs/util/gcanvas/env/canvas.js +0 -0
- package/libs/util/gcanvas/env/image.js +0 -0
- package/libs/util/gcanvas/env/tool.js +0 -0
- package/libs/util/gcanvas/index.js +0 -0
- package/package.json +1 -1
package/changelog.md
CHANGED
|
@@ -213,14 +213,29 @@ export default {
|
|
|
213
213
|
uni.getImageInfo({
|
|
214
214
|
src,
|
|
215
215
|
success: (res) => {
|
|
216
|
+
let singleSize = this.singleSize;
|
|
217
|
+
// 单位
|
|
218
|
+
let unit = '';
|
|
219
|
+
if (Number.isNaN(Number(this.singleSize))) {
|
|
220
|
+
// 大小中有字符 则记录字符
|
|
221
|
+
unit = this.singleSize.replace(/\d+/g, ''); // 单位
|
|
222
|
+
singleSize = Number(this.singleSize.replace(/\D+/g, ''), 10); // 具体值
|
|
223
|
+
}
|
|
224
|
+
|
|
216
225
|
// 判断图片横向还是竖向展示方式
|
|
217
226
|
const isHorizotal = res.width >= res.height
|
|
218
227
|
this.singleWidth = isHorizotal
|
|
219
|
-
?
|
|
220
|
-
: (res.width / res.height) *
|
|
228
|
+
? singleSize
|
|
229
|
+
: (res.width / res.height) * singleSize
|
|
221
230
|
this.singleHeight = !isHorizotal
|
|
222
|
-
?
|
|
231
|
+
? singleSize
|
|
223
232
|
: (res.height / res.width) * this.singleWidth
|
|
233
|
+
|
|
234
|
+
// 如果有单位统一设置单位
|
|
235
|
+
if(unit != null && unit !== ''){
|
|
236
|
+
this.singleWidth = this.singleWidth + unit
|
|
237
|
+
this.singleHeight = this.singleHeight + unit
|
|
238
|
+
}
|
|
224
239
|
},
|
|
225
240
|
fail: () => {
|
|
226
241
|
this.getComponentWidth()
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
<slot name="rightTop" :tabList="tabList">
|
|
18
18
|
</slot>
|
|
19
19
|
<view class="u-cate-tab__page-view">
|
|
20
|
-
<view class="u-cate-tab__page-item" :id="'item' + index"
|
|
20
|
+
<view class="u-cate-tab__page-item" :id="'item' + index"
|
|
21
21
|
v-for="(item , index) in tabList" :key="index">
|
|
22
22
|
<slot name="itemList" :item="item">
|
|
23
23
|
</slot>
|
|
@@ -167,7 +167,7 @@
|
|
|
167
167
|
},
|
|
168
168
|
// 获取右边菜单每个item到顶部的距离
|
|
169
169
|
getMenuItemTop() {
|
|
170
|
-
new Promise(resolve => {
|
|
170
|
+
return new Promise(resolve => {
|
|
171
171
|
let selectorQuery = uni.createSelectorQuery().in(this);
|
|
172
172
|
selectorQuery.selectAll('.u-cate-tab__page-item').boundingClientRect((rects) => {
|
|
173
173
|
// 如果节点尚未生成,rects值为[](因为用selectAll,所以返回的是数组),循环调用执行
|
|
@@ -181,8 +181,8 @@
|
|
|
181
181
|
rects.forEach((rect) => {
|
|
182
182
|
// 这里减去rects[0].top,是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
|
|
183
183
|
this.arr.push(rect.top - rects[0].top);
|
|
184
|
-
resolve();
|
|
185
184
|
})
|
|
185
|
+
resolve();
|
|
186
186
|
}).exec()
|
|
187
187
|
})
|
|
188
188
|
},
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<view class="u-datetime-picker">
|
|
3
3
|
<view v-if="hasInput" class="u-datetime-picker__has-input"
|
|
4
|
-
@click="onShowByClickInput"
|
|
4
|
+
@click="onShowByClickInput"
|
|
5
5
|
>
|
|
6
6
|
<slot name="trigger" :value="inputValue">
|
|
7
7
|
<up-input
|
|
@@ -436,7 +436,10 @@
|
|
|
436
436
|
},
|
|
437
437
|
// 根据minDate、maxDate、minHour、maxHour等边界值,判断各列的开始和结束边界值
|
|
438
438
|
getBoundary(type, innerValue) {
|
|
439
|
-
|
|
439
|
+
let value = new Date(innerValue)
|
|
440
|
+
if(isNaN(value.getTime())){
|
|
441
|
+
value = new Date()
|
|
442
|
+
}
|
|
440
443
|
const boundary = new Date(this[`${type}Date`])
|
|
441
444
|
const year = dayjs(boundary).year()
|
|
442
445
|
let month = 1
|
|
@@ -475,7 +478,7 @@
|
|
|
475
478
|
if(!this.disabled){
|
|
476
479
|
this.showByClickInput = !this.showByClickInput
|
|
477
480
|
}
|
|
478
|
-
|
|
481
|
+
|
|
479
482
|
}
|
|
480
483
|
}
|
|
481
484
|
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
package/package.json
CHANGED