Skip to content

Commit 04dcf89

Browse files
mehaotianmehaotian
committed
Merge branch 'dev'
# Conflicts: # uni_modules/uni-ui/package.json
2 parents 758ace1 + f72acb2 commit 04dcf89

50 files changed

Lines changed: 3384 additions & 2345 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pages/vue/data-select/data-select.vue‎

Lines changed: 91 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@
33
<uni-card :is-shadow="false" is-full>
44
<text class="uni-h6">通过数据驱动的单选框和复选框，可直接通过连接 uniCloud 获取数据，同时可以配合表单组件 uni-forms 使用</text>
55
</uni-card>
6-
<uni-section title="本地数据" type="line">
7-
<view class="uni-px-5 uni-pb-5">
8-
<uni-data-select v-model="value" :localdata="range" @change="change"></uni-data-select>
9-
</view>
10-
</uni-section>
11-
<uni-section title="禁用状态" type="line">
12-
<view class="uni-px-5 uni-pb-5">
13-
<uni-data-select v-model="value" :disabled="true" :localdata="range"></uni-data-select>
14-
</view>
6+
<uni-section title="本地数据 (多选)" type="line">
7+
<view class="uni-px-5 uni-pb-5">
8+
<uni-data-select v-model="multipleValue" mode="underline" multiple :localdata="range" @change="changeMultiple" @open="open" @close="close" @clear="clear"></uni-data-select>
9+
</view>
10+
</uni-section>
11+
<uni-section title="本地数据 (单选)" type="line">
12+
<view class="uni-px-5 uni-pb-5">
13+
<uni-data-select v-model="value" :localdata="range" @change="change"></uni-data-select>
14+
</view>
15+
</uni-section>
16+
<uni-section title="禁用状态" type="line">
17+
<view class="uni-px-5 uni-pb-5">
18+
<uni-data-select v-model="value" :disabled="true" :localdata="range"></uni-data-select>
19+
</view>
1520
</uni-section>
1621
<!-- <uni-section title="云端数据" subTitle="连接云服务空间, 且存在相关的数据表才能生效(此处演示, 未连接云服务空间, 故不生效, 且有报错)" type="line">
1722
<uni-data-select collection="opendb-app-list" field="appid as value, name as text" v-mode="value" />
@@ -28,41 +33,100 @@
2833
</uni-section>
2934
<uni-section title="设置弹出位置" type="line">
3035
<view class="uni-px-5 uni-pb-5">
31-
<uni-data-select placement="top" v-model="value" :localdata="range" @change="change" label="应用选择"></uni-data-select>
36+
<uni-data-select placement="top" v-model="value" :localdata="range" @change="change"
37+
label="应用选择"></uni-data-select>
38+
</view>
39+
</uni-section>
40+
<uni-section title="设置文字出现位置(center)" type="line">
41+
<view class="uni-px-5 uni-pb-5">
42+
<uni-data-select align="center" v-model="value" :localdata="range" @change="change"
43+
label="应用选择"></uni-data-select>
44+
</view>
45+
</uni-section>
46+
<uni-section title="单选换行显示(wrap)" type="line">
47+
<view class="uni-px-5 uni-pb-5">
48+
<uni-data-select v-model="lineValue" wrap :localdata="range" @change="change"
49+
label="换行显示"></uni-data-select>
50+
</view>
51+
</uni-section>
52+
<uni-section title="多选换行显示(wrap)" type="line">
53+
<view class="uni-px-5 uni-pb-5">
54+
<uni-data-select v-model="multipleValue" mode="underline" multiple wrap :localdata="range" @change="changeMultiple"
55+
label="换行显示"></uni-data-select>
56+
</view>
57+
</uni-section>
58+
<uni-section title="单行显示(chips方式)" type="line">
59+
<view class="uni-px-5 uni-pb-5">
60+
<uni-data-select v-model="lineValue" mode="underline" hideRight align="center" wrap :localdata="range" @change="change" chips></uni-data-select>
61+
</view>
62+
</uni-section>
63+
<uni-section title="多选换行显示(chips方式)" type="line">
64+
<view class="uni-px-5 uni-pb-5">
65+
<uni-data-select v-model="multipleValue" mode="underline" multiple wrap chips :localdata="range" @change="changeMultiple"
66+
label="换行显示"></uni-data-select>
3267
</view>
3368
</uni-section>
3469
</view>
3570
</template>
36-
3771
<script>
3872
export default {
3973
data() {
4074
return {
4175
value: 0,
76+
lineValue: 3,
77+
multipleValue: [1, 3, 4, 5],
4278
range: [{
43-
"value": 0,
44-
"text": "篮球",
45-
"disable": true
46-
},
47-
{
48-
"value": 1,
49-
"text": "足球"
50-
},
51-
{
52-
"value": 2,
53-
"text": "游泳"
79+
"value": 0,
80+
"text": "篮球运动锻炼",
81+
"disable": true
82+
}, {
83+
"value": 1,
84+
"text": "足球",
85+
"chipsCustomStyle":{
86+
"background-color": "red",
87+
"border-radius": '5px'
5488
}
55-
]
89+
}, {
90+
"value": 2,
91+
"text": "游泳健身"
92+
}, {
93+
"value": 3,
94+
"text": "跑步有氧运动",
95+
"chipsCustomStyle":{
96+
"background-color": "green",
97+
"border-radius": '5px'
98+
}
99+
}, {
100+
"value": 4,
101+
"text": "网球"
102+
}, {
103+
"value": 5,
104+
"text": "羽毛球运动"
105+
}, {
106+
"value": 6,
107+
"text": "乒乓球运动"
108+
}]
56109
}
57110
},
58111
methods: {
59112
change(e) {
60-
console.log('e:', e);
61-
}
113+
console.log('单选值:', e);
114+
},
115+
changeMultiple(e) {
116+
console.log('多选值:', e);
117+
},
118+
open(){
119+
console.log("打开选择框")
120+
},
121+
close(){
122+
console.log("关闭选择框")
123+
},
124+
clear(){
125+
console.log("清除选择框")
126+
},
62127
}
63128
}
64129
</script>
65-
66130
<style lang="scss">
67131
.text {
68132
font-size: 12px;
@@ -78,4 +142,4 @@
78142
.uni-pb-5 {
79143
padding-bottom: 10px;
80144
}
81-
</style>
145+
</style>

‎pages/vue/popup/popup.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</uni-section>
5353
<view>
5454
<!-- 普通弹窗 -->
55-
<uni-popup ref="popup" background-color="#fff" @change="change" border-radius="10px 10px 0 0">
55+
<uni-popup ref="popup" background-color="#fff" @change="change">
5656
<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"><text
5757
class="text">popup 内容</text></view>
5858
</uni-popup>

‎uni_modules/uni-badge/package.json‎

Lines changed: 58 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
],
1414
"repository": "https://github.com/dcloudio/uni-ui",
1515
"engines": {
16-
"HBuilderX": ""
16+
"HBuilderX": "",
17+
"uni-app": "^4.05",
18+
"uni-app-x": ""
1719
},
1820
"directories": {
1921
"example": "../../temps/example_temps"
2022
},
21-
"dcloudext": {
23+
"dcloudext": {
2224
"sale": {
2325
"regular": {
2426
"price": "0.00"
@@ -36,48 +38,68 @@
3638
"permissions": "无"
3739
},
3840
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
39-
"type": "component-vue"
41+
"type": "component-vue",
42+
"darkmode": "x",
43+
"i18n": "x",
44+
"widescreen": "x"
4045
},
4146
"uni_modules": {
42-
"dependencies": ["uni-scss"],
47+
"dependencies": [
48+
"uni-scss"
49+
],
4350
"encrypt": [],
4451
"platforms": {
4552
"cloud": {
46-
"tcb": "y",
47-
"aliyun": "y"
53+
"tcb": "x",
54+
"aliyun": "x",
55+
"alipay": "x"
4856
},
4957
"client": {
50-
"App": {
51-
"app-vue": "y",
52-
"app-nvue": "y"
58+
"uni-app": {
59+
"vue": {
60+
"vue2": "√",
61+
"vue3": "√"
62+
},
63+
"web": {
64+
"safari": "√",
65+
"chrome": "√"
66+
},
67+
"app": {
68+
"vue": "√",
69+
"nvue": "√",
70+
"android": "√",
71+
"ios": "√",
72+
"harmony": "√"
73+
},
74+
"mp": {
75+
"weixin": "√",
76+
"alipay": "√",
77+
"toutiao": "√",
78+
"baidu": "√",
79+
"kuaishou": "-",
80+
"jd": "-",
81+
"harmony": "-",
82+
"qq": "√",
83+
"lark": "-"
84+
},
85+
"quickapp": {
86+
"huawei": "√",
87+
"union": "√"
88+
}
5389
},
54-
"H5-mobile": {
55-
"Safari": "y",
56-
"Android Browser": "y",
57-
"微信浏览器(Android)": "y",
58-
"QQ浏览器(Android)": "y"
59-
},
60-
"H5-pc": {
61-
"Chrome": "y",
62-
"IE": "y",
63-
"Edge": "y",
64-
"Firefox": "y",
65-
"Safari": "y"
66-
},
67-
"小程序": {
68-
"微信": "y",
69-
"阿里": "y",
70-
"百度": "y",
71-
"字节跳动": "y",
72-
"QQ": "y"
73-
},
74-
"快应用": {
75-
"华为": "y",
76-
"联盟": "y"
77-
},
78-
"Vue": {
79-
"vue2": "y",
80-
"vue3": "y"
90+
"uni-app-x": {
91+
"web": {
92+
"safari": "-",
93+
"chrome": "-"
94+
},
95+
"app": {
96+
"android": "-",
97+
"ios": "-",
98+
"harmony": "-"
99+
},
100+
"mp": {
101+
"weixin": "-"
102+
}
81103
}
82104
}
83105
}

0 commit comments

Comments
 (0)