@cloudbase/weda-ui-mp 3.17.2 → 3.17.4
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/components/chart/common/core/eChartBar.js +8 -21
- package/components/chart/common/core/eChartLine.js +8 -21
- package/components/chart/common/core/eChartPie.js +4 -24
- package/components/chart/statisticsCard/index.js +12 -32
- package/components/chart/statisticsCard/index.wxml +1 -1
- package/components/form/location/components/mapChoose/index.js +19 -22
- package/components/form/select/dropdown-select/index.wxml +4 -4
- package/components/form/select/dropdown-select/index.wxss +9 -9
- package/components/form/selectMultiple/dropdown-select/index.wxml +4 -4
- package/components/form/selectMultiple/dropdown-select/index.wxss +9 -9
- package/components/richText/copy/index.wxss +1 -3
- package/components/wd-ad/index.js +5 -4
- package/components/wd-select/select/dropdown-select/index.wxml +4 -4
- package/components/wd-select/select/dropdown-select/index.wxss +13 -13
- package/components/wd-select/select/index.js +5 -9
- package/package.json +1 -1
- package/style/wd-font-icon.wxss +1466 -1472
|
@@ -33,17 +33,14 @@ class EchartBar extends EchartBase {
|
|
|
33
33
|
groupKey,
|
|
34
34
|
groupKeyTimeSpan,
|
|
35
35
|
});
|
|
36
|
-
const arrSourData = await this.getSourceData(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
params
|
|
41
|
-
);
|
|
36
|
+
const arrSourData = await this.getSourceData(name, methodName, type, params);
|
|
37
|
+
this.config.series = [];
|
|
38
|
+
// 没有数据,直接返回
|
|
39
|
+
if (!arrSourData?.length) return;
|
|
42
40
|
// 获取 x 轴数据
|
|
43
41
|
const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
|
|
44
42
|
const arrXaxisData = this.setXaxis(sortedXAxisData, xField.format);
|
|
45
43
|
const arrXisCountEmptyIndex = []; // 记录空值的key
|
|
46
|
-
this.config.series = [];
|
|
47
44
|
|
|
48
45
|
if (!groupKey?.name) {
|
|
49
46
|
// 没有分组
|
|
@@ -63,18 +60,14 @@ class EchartBar extends EchartBase {
|
|
|
63
60
|
data: [],
|
|
64
61
|
};
|
|
65
62
|
sortedXAxisData.forEach((itemSource, index) => {
|
|
66
|
-
this.config.series[j].name =
|
|
67
|
-
itemSource.YLabels[j]?.Cn_Name ?? itemSource.YLabels[j].Name;
|
|
63
|
+
this.config.series[j].name = itemSource.YLabels[j]?.Cn_Name ?? itemSource.YLabels[j].Name;
|
|
68
64
|
if (
|
|
69
|
-
(!itemSource.YLabels[j].Value === undefined ||
|
|
70
|
-
itemSource.YLabels[j].Value === null) &&
|
|
65
|
+
(!itemSource.YLabels[j].Value === undefined || itemSource.YLabels[j].Value === null) &&
|
|
71
66
|
!xIsCountEmpty
|
|
72
67
|
) {
|
|
73
68
|
arrXisCountEmptyIndex.push(index);
|
|
74
69
|
} else {
|
|
75
|
-
const value = itemSource.YLabels[j].Value
|
|
76
|
-
? itemSource.YLabels[j].Value
|
|
77
|
-
: 0;
|
|
70
|
+
const value = itemSource.YLabels[j].Value ? itemSource.YLabels[j].Value : 0;
|
|
78
71
|
this.config.series[j].data.push(value);
|
|
79
72
|
}
|
|
80
73
|
});
|
|
@@ -144,13 +137,7 @@ class EchartBar extends EchartBase {
|
|
|
144
137
|
}
|
|
145
138
|
|
|
146
139
|
// 显示图表上的数据标签 单位,标签,小数位数,后缀
|
|
147
|
-
setIsSeriesShowSymbol({
|
|
148
|
-
isSeriesShowSymbol,
|
|
149
|
-
isUnit,
|
|
150
|
-
unit,
|
|
151
|
-
decimalDigits,
|
|
152
|
-
suffix,
|
|
153
|
-
}) {
|
|
140
|
+
setIsSeriesShowSymbol({ isSeriesShowSymbol, isUnit, unit, decimalDigits, suffix }) {
|
|
154
141
|
decimalDigits = Math.max(0, decimalDigits);
|
|
155
142
|
this.config.series.length > 0 &&
|
|
156
143
|
this.config.series.forEach((itemSeries) => {
|
|
@@ -34,17 +34,14 @@ class EchartLine extends EchartBase {
|
|
|
34
34
|
groupKey,
|
|
35
35
|
groupKeyTimeSpan,
|
|
36
36
|
});
|
|
37
|
-
const arrSourData = await this.getSourceData(
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
params
|
|
42
|
-
);
|
|
37
|
+
const arrSourData = await this.getSourceData(name, methodName, type, params);
|
|
38
|
+
this.config.series = [];
|
|
39
|
+
// 没有数据,直接返回
|
|
40
|
+
if (!arrSourData?.length) return;
|
|
43
41
|
// 获取 x 轴数据
|
|
44
42
|
const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
|
|
45
43
|
const arrXaxisData = this.setXaxis(sortedXAxisData, xField.format);
|
|
46
44
|
const arrXisCountEmptyIndex = []; // 记录空值的key
|
|
47
|
-
this.config.series = [];
|
|
48
45
|
|
|
49
46
|
if (!groupKey?.name) {
|
|
50
47
|
if (sortedXAxisData.length > 0) {
|
|
@@ -63,18 +60,14 @@ class EchartLine extends EchartBase {
|
|
|
63
60
|
data: [],
|
|
64
61
|
};
|
|
65
62
|
sortedXAxisData.forEach((itemSource, index) => {
|
|
66
|
-
this.config.series[j].name =
|
|
67
|
-
itemSource.YLabels[j]?.Cn_Name ?? itemSource.YLabels[j].Name;
|
|
63
|
+
this.config.series[j].name = itemSource.YLabels[j]?.Cn_Name ?? itemSource.YLabels[j].Name;
|
|
68
64
|
if (
|
|
69
|
-
(!itemSource.YLabels[j].Value === undefined ||
|
|
70
|
-
itemSource.YLabels[j].Value === null) &&
|
|
65
|
+
(!itemSource.YLabels[j].Value === undefined || itemSource.YLabels[j].Value === null) &&
|
|
71
66
|
!xIsCountEmpty
|
|
72
67
|
) {
|
|
73
68
|
arrXisCountEmptyIndex.push(index);
|
|
74
69
|
} else {
|
|
75
|
-
const value = itemSource.YLabels[j].Value
|
|
76
|
-
? itemSource.YLabels[j].Value
|
|
77
|
-
: 0;
|
|
70
|
+
const value = itemSource.YLabels[j].Value ? itemSource.YLabels[j].Value : 0;
|
|
78
71
|
this.config.series[j].data.push(value);
|
|
79
72
|
}
|
|
80
73
|
});
|
|
@@ -149,13 +142,7 @@ class EchartLine extends EchartBase {
|
|
|
149
142
|
}
|
|
150
143
|
|
|
151
144
|
// 显示图表上的数据标签 单位,标签,小数位数,后缀
|
|
152
|
-
setIsSeriesShowSymbol({
|
|
153
|
-
isSeriesShowSymbol,
|
|
154
|
-
isUnit,
|
|
155
|
-
unit,
|
|
156
|
-
decimalDigits,
|
|
157
|
-
suffix,
|
|
158
|
-
}) {
|
|
145
|
+
setIsSeriesShowSymbol({ isSeriesShowSymbol, isUnit, unit, decimalDigits, suffix }) {
|
|
159
146
|
decimalDigits = decimalDigits < 0 ? 0 : decimalDigits;
|
|
160
147
|
this.config.series.length > 0 &&
|
|
161
148
|
this.config.series.forEach((itemSeries) => {
|
|
@@ -10,15 +10,7 @@ class EchartPie extends EchartBase {
|
|
|
10
10
|
const config = getConfig();
|
|
11
11
|
this.config = { ...this.config, ...config };
|
|
12
12
|
}
|
|
13
|
-
async setSourceData({
|
|
14
|
-
dataSource,
|
|
15
|
-
filterData,
|
|
16
|
-
setColor,
|
|
17
|
-
xField,
|
|
18
|
-
xStatistics,
|
|
19
|
-
xIsCountEmpty,
|
|
20
|
-
yField,
|
|
21
|
-
}) {
|
|
13
|
+
async setSourceData({ dataSource, filterData, setColor, xField, xStatistics, xIsCountEmpty, yField }) {
|
|
22
14
|
const { name = '', type = '', methodName = '' } = dataSource;
|
|
23
15
|
if (name !== '') {
|
|
24
16
|
const params = this.createWhere({
|
|
@@ -28,12 +20,7 @@ class EchartPie extends EchartBase {
|
|
|
28
20
|
xIsCountEmpty,
|
|
29
21
|
yField,
|
|
30
22
|
});
|
|
31
|
-
const arrSourData = await this.getSourceData(
|
|
32
|
-
name,
|
|
33
|
-
methodName,
|
|
34
|
-
type,
|
|
35
|
-
params
|
|
36
|
-
);
|
|
23
|
+
const arrSourData = await this.getSourceData(name, methodName, type, params);
|
|
37
24
|
// 获取 x 轴数据
|
|
38
25
|
if (arrSourData.length > 0) {
|
|
39
26
|
const numPie = arrSourData[0].YLabels.length;
|
|
@@ -54,7 +41,7 @@ class EchartPie extends EchartBase {
|
|
|
54
41
|
this.config.series[0].data = arrData;
|
|
55
42
|
}
|
|
56
43
|
} else {
|
|
57
|
-
|
|
44
|
+
this.config['series'][0].data = [];
|
|
58
45
|
}
|
|
59
46
|
}
|
|
60
47
|
}
|
|
@@ -70,14 +57,7 @@ class EchartPie extends EchartBase {
|
|
|
70
57
|
}
|
|
71
58
|
|
|
72
59
|
// 显示图表上的数据标签 单位,标签,小数位数,后缀
|
|
73
|
-
setIsSeriesShowSymbol({
|
|
74
|
-
isSeriesShowSymbol,
|
|
75
|
-
isPercent,
|
|
76
|
-
isUnit,
|
|
77
|
-
unit,
|
|
78
|
-
decimalDigits,
|
|
79
|
-
suffix,
|
|
80
|
-
}) {
|
|
60
|
+
setIsSeriesShowSymbol({ isSeriesShowSymbol, isPercent, isUnit, unit, decimalDigits, suffix }) {
|
|
81
61
|
decimalDigits = decimalDigits < 0 ? 0 : decimalDigits;
|
|
82
62
|
let show = false;
|
|
83
63
|
let position = 'inner';
|
|
@@ -57,7 +57,7 @@ Component({
|
|
|
57
57
|
suffix: {
|
|
58
58
|
// 后缀
|
|
59
59
|
type: String,
|
|
60
|
-
value: '
|
|
60
|
+
value: '',
|
|
61
61
|
},
|
|
62
62
|
},
|
|
63
63
|
data: {
|
|
@@ -131,17 +131,9 @@ Component({
|
|
|
131
131
|
return result;
|
|
132
132
|
},
|
|
133
133
|
formatNumber: function (val, digits = 0) {
|
|
134
|
-
return isNaN(val)
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
},
|
|
138
|
-
getSourceData: async function (
|
|
139
|
-
dataSource,
|
|
140
|
-
filterData,
|
|
141
|
-
field,
|
|
142
|
-
operationType,
|
|
143
|
-
isCountEmpty
|
|
144
|
-
) {
|
|
134
|
+
return isNaN(val) ? val : this.addDelimiter(this.customToFixed(val, digits), digits);
|
|
135
|
+
},
|
|
136
|
+
getSourceData: async function (dataSource, filterData, field, operationType, isCountEmpty) {
|
|
145
137
|
const where = filterData?.map
|
|
146
138
|
? filterData.map((val) => {
|
|
147
139
|
let arrLogicData = val.logicData;
|
|
@@ -191,18 +183,15 @@ Component({
|
|
|
191
183
|
},
|
|
192
184
|
_fetchData: async function () {
|
|
193
185
|
if (
|
|
194
|
-
(this.properties.dataSource?.type === 'database' &&
|
|
195
|
-
|
|
196
|
-
this.properties.operationType) ||
|
|
197
|
-
(this.properties.dataSource &&
|
|
198
|
-
this.properties.dataSource?.type !== 'database')
|
|
186
|
+
(this.properties.dataSource?.type === 'database' && this.properties.field && this.properties.operationType) ||
|
|
187
|
+
(this.properties.dataSource && this.properties.dataSource?.type !== 'database')
|
|
199
188
|
) {
|
|
200
189
|
let data = await this.getSourceData(
|
|
201
190
|
this.properties.dataSource,
|
|
202
191
|
this.properties.filterData,
|
|
203
192
|
this.properties.field,
|
|
204
193
|
this.properties.operationType,
|
|
205
|
-
this.properties.isCountEmpty
|
|
194
|
+
this.properties.isCountEmpty,
|
|
206
195
|
);
|
|
207
196
|
// APIs 返回处理
|
|
208
197
|
if (this.properties.dataSource?.type !== 'database' && data?.result) {
|
|
@@ -212,10 +201,7 @@ Component({
|
|
|
212
201
|
const val = isNaN(data[0]?.Value) ? 0 : data[0]?.Value;
|
|
213
202
|
this.setData({
|
|
214
203
|
count: this.properties.isShowUnit
|
|
215
|
-
? this.formatNumber(
|
|
216
|
-
val / this.properties.unit,
|
|
217
|
-
this.properties.decimalDigits
|
|
218
|
-
)
|
|
204
|
+
? this.formatNumber(val / this.properties.unit, this.properties.decimalDigits)
|
|
219
205
|
: val,
|
|
220
206
|
});
|
|
221
207
|
} else {
|
|
@@ -227,12 +213,7 @@ Component({
|
|
|
227
213
|
} else {
|
|
228
214
|
// 没有配置数据使用默认数据
|
|
229
215
|
this.setData({
|
|
230
|
-
count: this.
|
|
231
|
-
count: this.formatNumber(
|
|
232
|
-
DEFAULT_VAL,
|
|
233
|
-
this.properties.decimalDigits
|
|
234
|
-
),
|
|
235
|
-
}),
|
|
216
|
+
count: this.formatNumber(DEFAULT_VAL, this.properties.decimalDigits),
|
|
236
217
|
});
|
|
237
218
|
}
|
|
238
219
|
},
|
|
@@ -247,9 +228,8 @@ Component({
|
|
|
247
228
|
},
|
|
248
229
|
observers: {
|
|
249
230
|
// 当参数变化时
|
|
250
|
-
'datasource,filterData,field,operationType,label,isCountEmpty,isShowUnit,unit,decimalDigits,suffix':
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
},
|
|
231
|
+
'datasource,filterData,field,operationType,label,isCountEmpty,isShowUnit,unit,decimalDigits,suffix': function () {
|
|
232
|
+
this._fetchData();
|
|
233
|
+
},
|
|
254
234
|
},
|
|
255
235
|
});
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<view class="weda-statistics-card__title">{{label}}</view>
|
|
4
4
|
<view class="weda-statistics-card__detail">
|
|
5
5
|
<text class="weda-statistics-card__count">{{count}}</text>
|
|
6
|
-
<text class="weda-statistics-card__unit">{{suffix}}</text>
|
|
6
|
+
<text wx:if="{{isShowUnit}}" class="weda-statistics-card__unit">{{suffix}}</text>
|
|
7
7
|
</view>
|
|
8
8
|
</view>
|
|
9
9
|
</view>
|
|
@@ -88,8 +88,7 @@ Component({
|
|
|
88
88
|
*/
|
|
89
89
|
methods: {
|
|
90
90
|
getInitialization() {
|
|
91
|
-
const { location, circleRadius, apiKey, customRange, currentLocations } =
|
|
92
|
-
this.properties;
|
|
91
|
+
const { location, circleRadius, apiKey, customRange, currentLocations } = this.properties;
|
|
93
92
|
// 实例化API核心类
|
|
94
93
|
if (apiKey) {
|
|
95
94
|
qqmapsdk = new QQMapWX({
|
|
@@ -108,8 +107,7 @@ Component({
|
|
|
108
107
|
width: 70,
|
|
109
108
|
height: 70,
|
|
110
109
|
anchor: { x: 0.5, y: 0.4 },
|
|
111
|
-
iconPath:
|
|
112
|
-
'https://qcloudimg.tencent-cloud.cn/raw/cad6952cb624c02294e5ead860f9c94f.png',
|
|
110
|
+
iconPath: 'https://qcloudimg.tencent-cloud.cn/raw/cad6952cb624c02294e5ead860f9c94f.png',
|
|
113
111
|
};
|
|
114
112
|
let circle = {
|
|
115
113
|
latitude: currentLocations.latitude,
|
|
@@ -239,10 +237,7 @@ Component({
|
|
|
239
237
|
// 计算距离
|
|
240
238
|
if (circles && circles.length > 0) {
|
|
241
239
|
const { radius } = circles[0];
|
|
242
|
-
const distance = this.calculateDistance(
|
|
243
|
-
this.data.markers[1],
|
|
244
|
-
this.data.markers[0]
|
|
245
|
-
);
|
|
240
|
+
const distance = this.calculateDistance(this.data.markers[1], this.data.markers[0]);
|
|
246
241
|
let isOutofrange = radius && radius < distance;
|
|
247
242
|
this.setData({
|
|
248
243
|
isOutofrange,
|
|
@@ -251,7 +246,7 @@ Component({
|
|
|
251
246
|
}
|
|
252
247
|
},
|
|
253
248
|
searchLocation: debounce((value, page_index, location, _this) => {
|
|
254
|
-
const { searchList } = _this.data;
|
|
249
|
+
const { searchList, apiKey } = _this.data;
|
|
255
250
|
_this.setData({
|
|
256
251
|
searchLoadingStatus: true,
|
|
257
252
|
});
|
|
@@ -284,6 +279,9 @@ Component({
|
|
|
284
279
|
id: this.id,
|
|
285
280
|
code: 'WdLocation.SearchError',
|
|
286
281
|
error: error,
|
|
282
|
+
message: error?.message?.includes('每秒请求量已达到上限')
|
|
283
|
+
? `附近搜索失败,请检查APIKEY【${apiKey}】是否正确,调整/ws/place/v1/explore配额`
|
|
284
|
+
: '',
|
|
287
285
|
});
|
|
288
286
|
this.triggerEvent('error', { error: comErrorInfo });
|
|
289
287
|
_this.setData({
|
|
@@ -295,6 +293,7 @@ Component({
|
|
|
295
293
|
}
|
|
296
294
|
}, 200),
|
|
297
295
|
getSuggestion: debounce((value, location, _this) => {
|
|
296
|
+
const { apiKey } = _this.data;
|
|
298
297
|
if (qqmapsdk) {
|
|
299
298
|
qqmapsdk.getSuggestion({
|
|
300
299
|
keyword: value,
|
|
@@ -313,6 +312,9 @@ Component({
|
|
|
313
312
|
id: this.id,
|
|
314
313
|
code: 'WdLocation.GetSuggestionError',
|
|
315
314
|
error: error,
|
|
315
|
+
message: error?.message?.includes('每秒请求量已达到上限')
|
|
316
|
+
? `关键词输入提示失败,请检查APIKEY【${apiKey}】是否正确,调整/ws/place/v1/suggestion配额`
|
|
317
|
+
: '',
|
|
316
318
|
});
|
|
317
319
|
this.triggerEvent('error', { error: comErrorInfo });
|
|
318
320
|
},
|
|
@@ -410,16 +412,10 @@ Component({
|
|
|
410
412
|
if (searchList.length >= 50 || isSearchFucos) {
|
|
411
413
|
return;
|
|
412
414
|
}
|
|
413
|
-
this.searchLocation(
|
|
414
|
-
'路',
|
|
415
|
-
searchListPageSize + 1,
|
|
416
|
-
this.data.markers[1],
|
|
417
|
-
this
|
|
418
|
-
);
|
|
415
|
+
this.searchLocation('路', searchListPageSize + 1, this.data.markers[1], this);
|
|
419
416
|
},
|
|
420
417
|
handleConfirm() {
|
|
421
|
-
const { isOutofrange, searchChoosedLocation, mapChoosedLocation } =
|
|
422
|
-
this.data;
|
|
418
|
+
const { isOutofrange, searchChoosedLocation, mapChoosedLocation } = this.data;
|
|
423
419
|
if (isOutofrange || !searchChoosedLocation.id) {
|
|
424
420
|
return;
|
|
425
421
|
}
|
|
@@ -468,11 +464,8 @@ Component({
|
|
|
468
464
|
2 *
|
|
469
465
|
Math.asin(
|
|
470
466
|
Math.sqrt(
|
|
471
|
-
Math.pow(Math.sin(a / 2), 2) +
|
|
472
|
-
|
|
473
|
-
Math.cos(radLat2) *
|
|
474
|
-
Math.pow(Math.sin(b / 2), 2)
|
|
475
|
-
)
|
|
467
|
+
Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2),
|
|
468
|
+
),
|
|
476
469
|
);
|
|
477
470
|
s = s * 6378.137; // EARTH_RADIUS;
|
|
478
471
|
s = Math.round(s * 10000) / 10000;
|
|
@@ -489,6 +482,7 @@ Component({
|
|
|
489
482
|
},
|
|
490
483
|
// 获取设备最新位置
|
|
491
484
|
getLatestLc: async function () {
|
|
485
|
+
const { apiKey } = this.data;
|
|
492
486
|
let location;
|
|
493
487
|
try {
|
|
494
488
|
const value = await getCurrentLocation();
|
|
@@ -502,6 +496,9 @@ Component({
|
|
|
502
496
|
id: this.id,
|
|
503
497
|
code: 'WdLocation.GetLatestLocationError',
|
|
504
498
|
error: e,
|
|
499
|
+
message: e?.message?.includes('每秒请求量已达到上限')
|
|
500
|
+
? `坐标转换失败,请检查APIKEY【${apiKey}】是否正确,调整/ws/geocoder/v1/?location=*配额`
|
|
501
|
+
: '',
|
|
505
502
|
});
|
|
506
503
|
this.triggerEvent('error', { error: comErrorInfo });
|
|
507
504
|
}
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
<text class="weda-ui-custom-search__btn-cancle" bindtap="shrink">取消</text>
|
|
17
17
|
</view>
|
|
18
18
|
<scroll-view wx:if="{{status !== -1}}" class="weda-ui-custom-picker__body" scroll-y="true" enhanced="true" bindscrolltolower="bindscrolltolower">
|
|
19
|
-
<view class="weda-ui-custom-
|
|
20
|
-
<view class="weda-ui-custom-
|
|
21
|
-
<view wx:for="{{showOption}}" wx:key="i" wx:for-index="i" class="weda-ui-custom-
|
|
22
|
-
<text class="weda-ui-custom-
|
|
19
|
+
<view class="weda-ui-custom-picker__columns">
|
|
20
|
+
<view class="weda-ui-custom-picker__column">
|
|
21
|
+
<view wx:for="{{showOption}}" wx:key="i" wx:for-index="i" class="weda-ui-custom-picker__column-item {{ i === index ? 'is-selected':''}} {{ (i === disabledIndex || item.disabled) ? 'is-disabled':''}}" bindtap="onItemClick" data-value="{{item}}">
|
|
22
|
+
<text class="weda-ui-custom-picker__column-item-text">{{item.label}}</text>
|
|
23
23
|
</view>
|
|
24
24
|
<view wx:if="{{status === 1}}" class="weda-ui-custom-picker__status weda-ui-custom-picker__status--loading"> <i class="weda-ui-custom-picker__loading-icon"></i>加载中... </view>
|
|
25
25
|
<view wx:if="{{status === 2}}" class="weda-ui-custom-picker__status">
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
border: none;
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
.weda-ui-custom-
|
|
68
|
+
.weda-ui-custom-picker__columns {
|
|
69
69
|
display: flex;
|
|
70
70
|
align-items: flex-start;
|
|
71
71
|
position: relative;
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
overflow: hidden;
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
-
.weda-ui-custom-
|
|
77
|
+
.weda-ui-custom-picker__column {
|
|
78
78
|
flex: 1 1 0;
|
|
79
79
|
overflow-y: auto;
|
|
80
80
|
overflow-x: hidden;
|
|
@@ -82,11 +82,11 @@
|
|
|
82
82
|
/* height: 199px; */
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
.weda-ui-custom-
|
|
85
|
+
.weda-ui-custom-picker__column::-webkit-scrollbar {
|
|
86
86
|
display: none;
|
|
87
87
|
}
|
|
88
88
|
|
|
89
|
-
.weda-ui-custom-
|
|
89
|
+
.weda-ui-custom-picker__column-item {
|
|
90
90
|
display: flex;
|
|
91
91
|
align-items: center;
|
|
92
92
|
white-space: pre-wrap;
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
position: relative;
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
.weda-ui-custom-
|
|
99
|
+
.weda-ui-custom-picker__column-item::before {
|
|
100
100
|
content: '';
|
|
101
101
|
position: absolute;
|
|
102
102
|
bottom: 0;
|
|
@@ -107,11 +107,11 @@
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
/* theme */
|
|
110
|
-
.weda-ui-custom-
|
|
110
|
+
.weda-ui-custom-picker__column-item.is-selected {
|
|
111
111
|
color: var(--wd-color-brand, #0052d9);
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
.weda-ui-custom-
|
|
114
|
+
.weda-ui-custom-picker__column-item.is-selected::after {
|
|
115
115
|
content: '';
|
|
116
116
|
display: block;
|
|
117
117
|
width: 8px;
|
|
@@ -124,7 +124,7 @@
|
|
|
124
124
|
right: 10px;
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
-
.weda-ui-custom-
|
|
127
|
+
.weda-ui-custom-picker__column-item.is-disabled {
|
|
128
128
|
color: rgba(0, 0, 0, 0.26);
|
|
129
129
|
}
|
|
130
130
|
|
|
@@ -284,7 +284,7 @@
|
|
|
284
284
|
display: none;
|
|
285
285
|
}
|
|
286
286
|
|
|
287
|
-
.weda-ui-custom-
|
|
287
|
+
.weda-ui-custom-picker__column-item-text {
|
|
288
288
|
overflow: hidden;
|
|
289
289
|
text-overflow: ellipsis;
|
|
290
290
|
white-space: nowrap;
|
|
@@ -18,10 +18,10 @@
|
|
|
18
18
|
<text class="weda-ui-custom-search__btn-cancle" bindtap="shrink">取消</text>
|
|
19
19
|
</view>
|
|
20
20
|
<scroll-view wx:if="{{status !== -1}}" class="weda-ui-custom-picker__body" scroll-y="true" enhanced="true" bindscrolltolower="bindscrolltolower">
|
|
21
|
-
<view class="weda-ui-custom-
|
|
22
|
-
<view class="weda-ui-custom-
|
|
23
|
-
<view wx:for="{{showOption}}" wx:key="i" wx:for-index="i" class="weda-ui-custom-
|
|
24
|
-
<text class="weda-ui-custom-
|
|
21
|
+
<view class="weda-ui-custom-picker__columns">
|
|
22
|
+
<view class="weda-ui-custom-picker__column">
|
|
23
|
+
<view wx:for="{{showOption}}" wx:key="i" wx:for-index="i" class="weda-ui-custom-picker__column-item multiple {{ tools.includes(selectedCache, item) ? 'is-selected':''}} {{ (i === disabledIndex || item.disabled) ? 'is-disabled':''}}" bindtap="onItemClick" data-value="{{item}}">
|
|
24
|
+
<text class="weda-ui-custom-picker__column-item-text multiple">{{item.label}}</text>
|
|
25
25
|
</view>
|
|
26
26
|
<view wx:if="{{status === 1}}" class="weda-ui-custom-picker__status weda-ui-custom-picker__status--loading"> <i class="weda-ui-custom-picker__loading-icon"></i>加载中... </view>
|
|
27
27
|
<view wx:if="{{status === 2}}" class="weda-ui-custom-picker__status">
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
border: none;
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
.weda-ui-custom-
|
|
68
|
+
.weda-ui-custom-picker__columns {
|
|
69
69
|
display: flex;
|
|
70
70
|
align-items: flex-start;
|
|
71
71
|
position: relative;
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
overflow: hidden;
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
-
.weda-ui-custom-
|
|
77
|
+
.weda-ui-custom-picker__column {
|
|
78
78
|
flex: 1 1 0;
|
|
79
79
|
overflow-y: auto;
|
|
80
80
|
overflow-x: hidden;
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
/* height: 199px; */
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
.weda-ui-custom-
|
|
85
|
+
.weda-ui-custom-picker__column-item {
|
|
86
86
|
display: flex;
|
|
87
87
|
align-items: center;
|
|
88
88
|
white-space: pre-wrap;
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
position: relative;
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
-
.weda-ui-custom-
|
|
95
|
+
.weda-ui-custom-picker__column-item::before {
|
|
96
96
|
content: '';
|
|
97
97
|
position: absolute;
|
|
98
98
|
bottom: 0;
|
|
@@ -102,12 +102,12 @@
|
|
|
102
102
|
transform: scaleY(0.5);
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
.weda-ui-custom-
|
|
105
|
+
.weda-ui-custom-picker__column-item.multiple.is-selected {
|
|
106
106
|
color: rgba(0, 0, 0, 0.9);
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
/* theme */
|
|
110
|
-
.weda-ui-custom-
|
|
110
|
+
.weda-ui-custom-picker__column-item.multiple.is-selected::after {
|
|
111
111
|
content: '';
|
|
112
112
|
width: 21px;
|
|
113
113
|
height: 21px;
|
|
@@ -122,7 +122,7 @@
|
|
|
122
122
|
background-position: center;
|
|
123
123
|
}
|
|
124
124
|
|
|
125
|
-
.weda-ui-custom-
|
|
125
|
+
.weda-ui-custom-picker__column-item.multiple::after {
|
|
126
126
|
content: '';
|
|
127
127
|
width: 20px;
|
|
128
128
|
height: 20px;
|
|
@@ -133,7 +133,7 @@
|
|
|
133
133
|
left: 0px;
|
|
134
134
|
}
|
|
135
135
|
|
|
136
|
-
.weda-ui-custom-
|
|
136
|
+
.weda-ui-custom-picker__column-item.is-disabled {
|
|
137
137
|
color: rgba(0, 0, 0, 0.26);
|
|
138
138
|
}
|
|
139
139
|
|
|
@@ -293,7 +293,7 @@
|
|
|
293
293
|
display: none;
|
|
294
294
|
}
|
|
295
295
|
|
|
296
|
-
.weda-ui-custom-
|
|
296
|
+
.weda-ui-custom-picker__column-item-text.multiple {
|
|
297
297
|
overflow: hidden;
|
|
298
298
|
text-overflow: ellipsis;
|
|
299
299
|
white-space: nowrap;
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
@font-face {
|
|
2
2
|
font-family: WdTd;
|
|
3
|
-
src: url('
|
|
4
|
-
url('t.ttf') format('truetype'), url('t.svg') format('svg'),
|
|
5
|
-
url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.eot'),
|
|
3
|
+
src: url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.eot'),
|
|
6
4
|
url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t_iefix.eot')
|
|
7
5
|
format('embedded-opentype'),
|
|
8
6
|
url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.woff') format('woff'),
|
|
@@ -80,7 +80,11 @@ Component({
|
|
|
80
80
|
|
|
81
81
|
if (wx.createRewardedVideoAd && canUseRewardedVideoAd) {
|
|
82
82
|
const { unitId, multiton, disableFallbackSharePage } = this.data;
|
|
83
|
-
const rewardedVideoAd = wx.createRewardedVideoAd({
|
|
83
|
+
const rewardedVideoAd = wx.createRewardedVideoAd({
|
|
84
|
+
adUnitId: unitId,
|
|
85
|
+
multiton,
|
|
86
|
+
disableFallbackSharePage,
|
|
87
|
+
});
|
|
84
88
|
rewardedVideoAd.onLoad(() => {
|
|
85
89
|
this.triggerEvent('load');
|
|
86
90
|
});
|
|
@@ -145,9 +149,6 @@ Component({
|
|
|
145
149
|
rewardedVideoAd: function () {
|
|
146
150
|
this.updateWidgetAPI();
|
|
147
151
|
},
|
|
148
|
-
'adType,unitId,multiton,disableFallbackSharePage': function () {
|
|
149
|
-
this.createRewardedVideoAd();
|
|
150
|
-
},
|
|
151
152
|
},
|
|
152
153
|
lifetimes: {
|
|
153
154
|
attached() {
|
|
@@ -18,10 +18,10 @@
|
|
|
18
18
|
<text class="weda-ui-custom-search__btn-cancle" bindtap="shrink">取消</text>
|
|
19
19
|
</view>
|
|
20
20
|
<scroll-view wx:if="{{status !== -1}}" class="weda-ui-custom-picker__body" scroll-y="true" enhanced="true" bindscrolltolower="bindscrolltolower">
|
|
21
|
-
<view class="weda-ui-custom-
|
|
22
|
-
<view class="weda-ui-custom-
|
|
23
|
-
<view wx:for="{{showOption}}" wx:key="i" wx:for-index="i" class="weda-ui-custom-
|
|
24
|
-
<text class="weda-ui-custom-
|
|
21
|
+
<view class="weda-ui-custom-picker__columns">
|
|
22
|
+
<view class="weda-ui-custom-picker__column">
|
|
23
|
+
<view wx:for="{{showOption}}" wx:key="i" wx:for-index="i" class="weda-ui-custom-picker__column-item {{multiple?'multiple':''}} {{ tools.includes(selectedCache, item) ? 'is-selected':''}} {{ (item.disabled) ? 'is-disabled':''}}" bindtap="onItemClick" data-value="{{item}}">
|
|
24
|
+
<text class="weda-ui-custom-picker__column-item-text {{multiple?'multiple':''}}">{{item.label}}</text>
|
|
25
25
|
</view>
|
|
26
26
|
<view wx:if="{{status === 1}}" class="weda-ui-custom-picker__status weda-ui-custom-picker__status--loading"> <i class="weda-ui-custom-picker__loading-icon"></i>加载中... </view>
|
|
27
27
|
<view wx:if="{{status === 2}}" class="weda-ui-custom-picker__status">
|