Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
U
uview-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李晖
uview-ui
Commits
582557e5
Commit
582557e5
authored
Jul 30, 2020
by
wlxuqu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 新增man,woman,level三个图标,修复某些图标缺失的问题
2. 修复section组件showLine参数无法隐藏左边竖条的问题
parent
bb453ec0
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
353 additions
and
354 deletions
+353
-354
manifest.json
manifest.json
+2
-2
index.vue
pages/componentsA/icon/index.vue
+9
-0
index.vue
pages/componentsC/section/index.vue
+1
-1
u-icon.vue
uview-ui/components/u-icon/u-icon.vue
+1
-1
u-input.vue
uview-ui/components/u-input/u-input.vue
+26
-26
MpHtmlParser.js
uview-ui/components/u-parse/libs/MpHtmlParser.js
+13
-12
config.js
uview-ui/components/u-parse/libs/config.js
+22
-35
trees.vue
uview-ui/components/u-parse/libs/trees.vue
+22
-21
u-parse.vue
uview-ui/components/u-parse/u-parse.vue
+1
-1
u-radio-group.vue
uview-ui/components/u-radio-group/u-radio-group.vue
+1
-1
u-radio.vue
uview-ui/components/u-radio/u-radio.vue
+1
-1
u-section.vue
uview-ui/components/u-section/u-section.vue
+2
-2
u-switch.vue
uview-ui/components/u-switch/u-switch.vue
+4
-3
u-tabbar.vue
uview-ui/components/u-tabbar/u-tabbar.vue
+1
-1
iconfont.css
uview-ui/iconfont.css
+244
-244
config.js
uview-ui/libs/config/config.js
+2
-2
package.json
uview-ui/package.json
+1
-1
No files found.
manifest.json
View file @
582557e5
...
...
@@ -2,7 +2,7 @@
"name"
:
"uView"
,
"appid"
:
"__UNI__60F4B81"
,
"description"
:
"多平台快速开发的UI框架"
,
"versionName"
:
"1.5.
6
"
,
"versionName"
:
"1.5.
7
"
,
"versionCode"
:
"100"
,
"transformPx"
:
false
,
"app-plus"
:
{
...
...
@@ -107,7 +107,7 @@
},
"mp-alipay"
:
{
"usingComponents"
:
true
,
"component2"
:
true
"component2"
:
true
},
"mp-baidu"
:
{
"usingComponents"
:
true
,
...
...
pages/componentsA/icon/index.vue
View file @
582557e5
...
...
@@ -14,6 +14,15 @@
data
()
{
return
{
iconList
:
[
{
name
:
'
level
'
},
{
name
:
'
woman
'
},
{
name
:
'
man
'
},
{
name
:
'
arrow-left-double
'
},
...
...
pages/componentsC/section/index.vue
View file @
582557e5
...
...
@@ -3,7 +3,7 @@
<view
class=
"u-demo-wrap"
>
<view
class=
"u-demo-title"
>
演示效果
</view>
<view
class=
"u-demo-area"
>
<u-section
:title=
"title"
:right=
"right"
:bold=
"bold"
:color=
"color"
></u-section>
<u-section
:title=
"title"
:right=
"right"
:bold=
"bold"
:color=
"color"
:show-line=
"false"
></u-section>
</view>
</view>
<view
class=
"u-config-wrap"
>
...
...
uview-ui/components/u-icon/u-icon.vue
View file @
582557e5
...
...
@@ -168,7 +168,7 @@ export default {
fontSize
:
this
.
size
==
'
inherit
'
?
'
inherit
'
:
this
.
$u
.
addUnit
(
this
.
size
),
fontWeight
:
this
.
bold
?
'
bold
'
:
'
normal
'
,
// 安卓和iOS各需要设置一个到顶部的距离,才能更好的垂直居中
top
:
this
.
top
===
''
?
(
this
.
$u
.
os
==
'
ios
'
?
'
2rpx
'
:
'
4rpx
'
)
:
0
top
:
this
.
top
===
''
?
(
this
.
$u
.
os
==
'
ios
'
?
'
2rpx
'
:
'
4rpx
'
)
:
this
.
$u
.
addUnit
(
this
.
top
)
};
// 非主题色值时,才当作颜色值
if
(
this
.
color
&&
!
this
.
$u
.
config
.
type
.
includes
(
this
.
color
))
style
.
color
=
this
.
color
;
...
...
uview-ui/components/u-input/u-input.vue
View file @
582557e5
...
...
@@ -71,7 +71,7 @@
<
script
>
import
Emitter
from
'
../../libs/util/emitter.js
'
;
/**
/**
* input 输入框
* @description 此组件为一个输入框,默认没有边框和样式,是专门为配合表单组件u-form而设计的,利用它可以快速实现表单验证,输入内容,下拉选择等功能。
* @tutorial http://uviewui.com/components/input.html
...
...
uview-ui/components/u-parse/libs/MpHtmlParser.js
View file @
582557e5
/**
* html 解析器
* @tutorial https://github.com/jin-yufeng/Parser
* @version 202007
19
* @version 202007
28
* @author JinYufeng
* @listens MIT
*/
...
...
@@ -102,9 +102,16 @@ MpHtmlParser.prototype.setText = function() {
}
if
(
!
this
.
pre
)
{
// 合并空白符
var
tmp
=
[];
var
flag
,
tmp
=
[];
for
(
let
i
=
text
.
length
,
c
;
c
=
text
[
--
i
];)
if
(
!
blankChar
[
c
]
||
(
!
blankChar
[
tmp
[
0
]]
&&
(
c
=
'
'
)))
tmp
.
unshift
(
c
);
if
(
!
blankChar
[
c
])
{
tmp
.
unshift
(
c
);
if
(
!
flag
)
flag
=
1
;
}
else
{
if
(
tmp
[
0
]
!=
'
'
)
tmp
.
unshift
(
'
'
);
if
(
c
==
'
\n
'
&&
flag
==
void
0
)
flag
=
0
;
}
if
(
flag
==
0
)
return
;
text
=
tmp
.
join
(
''
);
}
this
.
siblings
().
push
({
...
...
@@ -119,6 +126,7 @@ MpHtmlParser.prototype.setNode = function() {
attrs
:
this
.
attrs
},
close
=
cfg
.
selfClosingTags
[
node
.
name
];
if
(
this
.
options
.
nodes
.
length
)
node
.
type
=
'
node
'
;
this
.
attrs
=
{};
if
(
!
cfg
.
ignoreTags
[
node
.
name
])
{
// 处理属性
...
...
@@ -189,6 +197,7 @@ MpHtmlParser.prototype.setNode = function() {
attrs
.
height
=
void
0
;
}
}
if
(
!
attrs
.
controls
&&
!
attrs
.
autoplay
)
attrs
.
controls
=
'
T
'
;
attrs
.
source
=
[];
if
(
attrs
.
src
)
{
attrs
.
source
.
push
(
attrs
.
src
);
...
...
@@ -217,8 +226,7 @@ MpHtmlParser.prototype.setNode = function() {
if
(
info
.
length
<
2
)
continue
;
let
key
=
info
[
0
].
trim
().
toLowerCase
(),
value
=
info
.
slice
(
1
).
join
(
'
:
'
).
trim
();
if
(
value
.
includes
(
'
-webkit
'
)
||
value
.
includes
(
'
-moz
'
)
||
value
.
includes
(
'
-ms
'
)
||
value
.
includes
(
'
-o
'
)
||
value
.
includes
(
'
safe
'
))
if
(
value
[
0
]
==
'
-
'
||
value
.
includes
(
'
safe
'
))
style
+=
`;
${
key
}
:
${
value
}
`
;
else
if
(
!
styleObj
[
key
]
||
value
.
includes
(
'
import
'
)
||
!
styleObj
[
key
].
includes
(
'
import
'
))
styleObj
[
key
]
=
value
;
...
...
@@ -359,13 +367,6 @@ MpHtmlParser.prototype.popNode = function(node) {
// 替换一些标签名
if
(
cfg
.
blockTags
[
node
.
name
])
node
.
name
=
'
div
'
;
else
if
(
!
cfg
.
trustTags
[
node
.
name
])
node
.
name
=
'
span
'
;
// 去除块标签前后空串
if
(
node
.
name
==
'
div
'
||
node
.
name
==
'
p
'
||
node
.
name
[
0
]
==
'
t
'
)
{
if
(
len
>
1
&&
siblings
[
len
-
2
].
text
==
'
'
)
siblings
.
splice
(
--
len
-
1
,
1
);
if
(
childs
.
length
&&
childs
[
childs
.
length
-
1
].
text
==
'
'
)
childs
.
pop
();
}
// 处理列表
if
(
node
.
c
&&
(
node
.
name
==
'
ul
'
||
node
.
name
==
'
ol
'
))
{
if
((
node
.
attrs
.
style
||
''
).
includes
(
'
list-style:none
'
))
{
...
...
uview-ui/components/u-parse/libs/config.js
View file @
582557e5
/* 配置文件 */
// #ifdef MP-WEIXIN
const
canIUse
=
wx
.
canIUse
(
'
editor
'
);
// 高基础库标识,用于兼容
// #endif
module
.
exports
=
{
var
cfg
=
{
// 出错占位图
errorImg
:
null
,
// 过滤器函数
...
...
@@ -32,41 +29,15 @@ module.exports = {
blankChar
:
makeMap
(
'
,
\
xA0,
\t
,
\r
,
\n
,
\
f
'
),
boolAttrs
:
makeMap
(
'
allowfullscreen,autoplay,autostart,controls,ignore,loop,muted
'
),
// 块级标签,将被转为 div
blockTags
:
makeMap
(
'
address,article,aside,body,caption,center,cite,footer,header,html,nav,section
'
+
(
// #ifdef MP-WEIXIN
canIUse
?
''
:
// #endif
'
,pre
'
)),
blockTags
:
makeMap
(
'
address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section
'
),
// 将被移除的标签
ignoreTags
:
makeMap
(
'
area,base,canvas,frame,input,link,map,meta,param,script,source,style,svg,textarea,title,track,wbr
'
// #ifdef MP-WEIXIN
+
(
canIUse
?
'
,rp
'
:
''
)
// #endif
// #ifndef APP-PLUS
+
'
,iframe
'
// #endif
),
ignoreTags
:
makeMap
(
'
area,base,canvas,frame,iframe,input,link,map,meta,param,script,source,style,svg,textarea,title,track,wbr
'
),
// 只能被 rich-text 显示的标签
richOnlyTags
:
makeMap
(
'
a,colgroup,fieldset,legend,table
'
// #ifdef MP-WEIXIN
+
(
canIUse
?
'
,bdi,bdo,caption,rt,ruby
'
:
''
)
// #endif
),
richOnlyTags
:
makeMap
(
'
a,colgroup,fieldset,legend,table
'
),
// 自闭合的标签
selfClosingTags
:
makeMap
(
'
area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr
'
),
selfClosingTags
:
makeMap
(
'
area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr
'
),
// 信任的标签
trustTags
:
makeMap
(
'
a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video
'
// #ifdef MP-WEIXIN
+
(
canIUse
?
'
,bdi,bdo,caption,pre,rt,ruby
'
:
''
)
// #endif
// #ifdef APP-PLUS
+
'
,embed,iframe
'
// #endif
),
trustTags
:
makeMap
(
'
a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video
'
),
// 默认的标签样式
userAgentStyles
:
{
address
:
'
font-style:italic
'
,
...
...
@@ -91,3 +62,19 @@ function makeMap(str) {
map
[
list
[
i
]]
=
true
;
return
map
;
}
// #ifdef MP-WEIXIN
if
(
wx
.
canIUse
(
'
editor
'
))
{
cfg
.
blockTags
.
pre
=
void
0
;
cfg
.
ignoreTags
.
rp
=
true
;
Object
.
assign
(
cfg
.
richOnlyTags
,
makeMap
(
'
bdi,bdo,caption,rt,ruby
'
));
Object
.
assign
(
cfg
.
trustTags
,
makeMap
(
'
bdi,bdo,caption,pre,rt,ruby
'
));
}
// #endif
// #ifdef APP-PLUS
cfg
.
ignoreTags
.
iframe
=
void
0
;
Object
.
assign
(
cfg
.
trustTags
,
makeMap
(
'
embed,iframe
'
));
// #endif
module
.
exports
=
cfg
;
uview-ui/components/u-parse/libs/trees.vue
View file @
582557e5
...
...
@@ -3,8 +3,8 @@
<block
v-for=
"(n, i) in nodes"
v-bind:key=
"i"
>
<!--图片-->
<view
v-if=
"n.name=='img'"
:class=
"'_img '+n.attrs.class"
:style=
"n.attrs.style"
:data-attrs=
"n.attrs"
@
tap=
"imgtap"
>
<rich-text
v-if=
"c
ontrols[i]!=0"
:nodes=
"[
{attrs:{src:loading
&&
(controls[i]||0)
<2
?
loading:
(
lazyLoad
&&!
controls
[
i
]?
placeholder:(controls
[i]=
=3?errorImg:n.attrs.src||'')),alt:n.attrs.alt||'',width:n.attrs.width||'',style:'-webkit-touch-callout:none;max-width:100%;display:block'+(n.attrs.height?';height:'+n.attrs.height:'')},name:'img'}]"
/>
<image
class=
"_image"
:src=
"lazyLoad&&!c
ontrols
[i]?placeholder:n.attrs.src"
:lazy-load=
"lazyLoad"
<rich-text
v-if=
"c
trl[i]!=0"
:nodes=
"[
{attrs:{src:loading
&&
(ctrl[i]||0)
<2
?
loading:
(
lazyLoad
&&!
ctrl
[
i
]?
placeholder:(ctrl
[i]=
=3?errorImg:n.attrs.src||'')),alt:n.attrs.alt||'',width:n.attrs.width||'',style:'-webkit-touch-callout:none;max-width:100%;display:block'+(n.attrs.height?';height:'+n.attrs.height:'')},name:'img'}]"
/>
<image
class=
"_image"
:src=
"lazyLoad&&!c
trl
[i]?placeholder:n.attrs.src"
:lazy-load=
"lazyLoad"
:show-menu-by-longpress=
"!n.attrs.ignore"
:data-i=
"i"
:data-index=
"n.attrs.i"
data-source=
"img"
@
load=
"loadImg"
@
error=
"error"
/>
</view>
...
...
@@ -14,15 +14,15 @@
<text
v-else-if=
"n.name=='br'"
>
\n
</text>
<!--#endif-->
<!--视频-->
<view
v-else-if=
"((n.lazyLoad&&!n.attrs.autoplay)||(n.name=='video'&&!loadVideo))&&c
ontrols
[i]==undefined"
:id=
"n.attrs.id"
:class=
"'_video '+(n.attrs.class||'')"
<view
v-else-if=
"((n.lazyLoad&&!n.attrs.autoplay)||(n.name=='video'&&!loadVideo))&&c
trl
[i]==undefined"
:id=
"n.attrs.id"
:class=
"'_video '+(n.attrs.class||'')"
:style=
"n.attrs.style"
:data-i=
"i"
@
tap=
"_loadVideo"
/>
<video
v-else-if=
"n.name=='video'"
:id=
"n.attrs.id"
:class=
"n.attrs.class"
:style=
"n.attrs.style"
:autoplay=
"n.attrs.autoplay||c
ontrols
[i]==0"
:controls=
"
!n.attrs.autoplay||n.attrs.controls"
:loop=
"n.attrs.loop"
:muted=
"n.attrs.muted"
:poster=
"n.attrs.poster"
:src=
"n.attrs.source[controls
[i]||0]"
<video
v-else-if=
"n.name=='video'"
:id=
"n.attrs.id"
:class=
"n.attrs.class"
:style=
"n.attrs.style"
:autoplay=
"n.attrs.autoplay||c
trl
[i]==0"
:controls=
"
n.attrs.controls"
:loop=
"n.attrs.loop"
:muted=
"n.attrs.muted"
:poster=
"n.attrs.poster"
:src=
"n.attrs.source[ctrl
[i]||0]"
:unit-id=
"n.attrs['unit-id']"
:data-id=
"n.attrs.id"
:data-i=
"i"
data-source=
"video"
@
error=
"error"
@
play=
"play"
/>
<!--音频-->
<audio
v-else-if=
"n.name=='audio'"
:ref=
"n.attrs.id"
:class=
"n.attrs.class"
:style=
"n.attrs.style"
:author=
"n.attrs.author"
:autoplay=
"n.attrs.autoplay"
:controls=
"
!n.attrs.autoplay||
n.attrs.controls"
:loop=
"n.attrs.loop"
:name=
"n.attrs.name"
:poster=
"n.attrs.poster"
:src=
"n.attrs.source[c
ontrols
[i]||0]"
:data-i=
"i"
:data-id=
"n.attrs.id"
data-source=
"audio"
:autoplay=
"n.attrs.autoplay"
:controls=
"n.attrs.controls"
:loop=
"n.attrs.loop"
:name=
"n.attrs.name"
:poster=
"n.attrs.poster"
:src=
"n.attrs.source[c
trl
[i]||0]"
:data-i=
"i"
:data-id=
"n.attrs.id"
data-source=
"audio"
@
error.native=
"error"
@
play.native=
"play"
/>
<!--链接-->
<view
v-else-if=
"n.name=='a'"
:id=
"n.attrs.id"
:class=
"'_a '+(n.attrs.class||'')"
hover-class=
"_hover"
:style=
"n.attrs.style"
...
...
@@ -32,7 +32,7 @@
<!--广告-->
<!--
<ad
v-else-if=
"n.name=='ad'"
:class=
"n.attrs.class"
:style=
"n.attrs.style"
:unit-id=
"n.attrs['unit-id']"
:appid=
"n.attrs.appid"
:apid=
"n.attrs.apid"
:type=
"n.attrs.type"
:adpid=
"n.attrs.adpid"
data-source=
"ad"
@
error=
"error"
/>
-->
<!--列表-->
<view
v-else-if=
"n.name=='li'"
:id=
"n.attrs.id"
:class=
"n.attrs.class"
:style=
"(n.attrs.style||'')+';display:flex'"
>
<view
v-else-if=
"n.name=='li'"
:id=
"n.attrs.id"
:class=
"n.attrs.class"
:style=
"(n.attrs.style||'')+';display:flex
;flex-direction:row
'"
>
<view
v-if=
"n.type=='ol'"
class=
"_ol-bef"
>
{{
n
.
num
}}
</view>
<view
v-else
class=
"_ul-bef"
>
<view
v-if=
"n.floor%3==0"
class=
"_ul-p1"
>
█
</view>
...
...
@@ -80,7 +80,7 @@
name
:
'
trees
'
,
data
()
{
return
{
c
ontrols
:
[],
c
trl
:
[],
placeholder
:
'
data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="300" height="225"/>
'
,
errorImg
,
loadVideo
:
typeof
plus
==
'
undefined
'
,
...
...
@@ -124,7 +124,7 @@
if
(
res
.
intersectionRatio
)
{
for
(
var
j
=
this
.
nodes
.
length
;
j
--
;)
if
(
this
.
nodes
[
j
].
name
==
'
img
'
)
this
.
$set
(
this
.
c
ontrols
,
j
,
1
);
this
.
$set
(
this
.
c
trl
,
j
,
1
);
this
.
observer
.
disconnect
();
}
})
...
...
@@ -184,23 +184,23 @@
},
loadImg
(
e
)
{
var
i
=
e
.
currentTarget
.
dataset
.
i
;
if
(
this
.
lazyLoad
&&
!
this
.
c
ontrols
[
i
])
{
if
(
this
.
lazyLoad
&&
!
this
.
c
trl
[
i
])
{
// #ifdef QUICKAPP-WEBVIEW
this
.
$set
(
this
.
c
ontrols
,
i
,
0
);
this
.
$set
(
this
.
c
trl
,
i
,
0
);
this
.
$nextTick
(
function
()
{
// #endif
// #ifndef APP-PLUS
this
.
$set
(
this
.
c
ontrols
,
i
,
1
);
this
.
$set
(
this
.
c
trl
,
i
,
1
);
// #endif
// #ifdef QUICKAPP-WEBVIEW
})
// #endif
}
else
if
(
this
.
loading
&&
this
.
c
ontrols
[
i
]
!=
2
)
{
}
else
if
(
this
.
loading
&&
this
.
c
trl
[
i
]
!=
2
)
{
// #ifdef QUICKAPP-WEBVIEW
this
.
$set
(
this
.
c
ontrols
,
i
,
0
);
this
.
$set
(
this
.
c
trl
,
i
,
0
);
this
.
$nextTick
(
function
()
{
// #endif
this
.
$set
(
this
.
c
ontrols
,
i
,
2
);
this
.
$set
(
this
.
c
trl
,
i
,
2
);
// #ifdef QUICKAPP-WEBVIEW
})
// #endif
...
...
@@ -258,14 +258,14 @@
i
=
target
.
dataset
.
i
;
if
(
source
==
'
video
'
||
source
==
'
audio
'
)
{
// 加载其他 source
var
index
=
this
.
c
ontrols
[
i
]
?
this
.
controls
[
i
].
i
+
1
:
1
;
var
index
=
this
.
c
trl
[
i
]
?
this
.
ctrl
[
i
].
i
+
1
:
1
;
if
(
index
<
this
.
nodes
[
i
].
attrs
.
source
.
length
)
this
.
$set
(
this
.
c
ontrols
,
i
,
index
);
this
.
$set
(
this
.
c
trl
,
i
,
index
);
if
(
e
.
detail
.
__args__
)
e
.
detail
=
e
.
detail
.
__args__
[
0
];
}
else
if
(
errorImg
&&
source
==
'
img
'
)
{
this
.
top
.
imgList
.
setItem
(
target
.
dataset
.
index
,
errorImg
);
this
.
$set
(
this
.
c
ontrols
,
i
,
3
);
this
.
$set
(
this
.
c
trl
,
i
,
3
);
}
this
.
top
&&
this
.
top
.
$emit
(
'
error
'
,
{
source
,
...
...
@@ -274,7 +274,7 @@
});
},
_loadVideo
(
e
)
{
this
.
$set
(
this
.
c
ontrols
,
e
.
target
.
dataset
.
i
,
0
);
this
.
$set
(
this
.
c
trl
,
e
.
target
.
dataset
.
i
,
0
);
}
}
}
...
...
@@ -407,12 +407,13 @@
}
._ul-bef
{
display
:
block
;
margin
:
0
12px
0
23px
;
line-height
:
normal
;
}
._ol-bef
,
._ul
_
bef
{
._ul
-
bef
{
flex
:
none
;
user-select
:
none
;
}
...
...
uview-ui/components/u-parse/u-parse.vue
View file @
582557e5
...
...
@@ -63,7 +63,7 @@
* @event {Function} imgtap 图片点击事件
* @event {Function} linkpress 链接点击事件
* @author JinYufeng
* @version 202007
19
* @version 202007
28
* @listens MIT
*/
export
default
{
...
...
uview-ui/components/u-radio-group/u-radio-group.vue
View file @
582557e5
...
...
@@ -53,7 +53,7 @@
// 形状,square为方形,circle为原型
shape
:
{
type
:
String
,
default
:
'
squar
e
'
default
:
'
circl
e
'
},
// 图标的大小,单位rpx
iconSize
:
{
...
...
uview-ui/components/u-radio/u-radio.vue
View file @
582557e5
...
...
@@ -119,7 +119,7 @@
},
iconClass
()
{
let
classes
=
[];
classes
.
push
(
'
u-radio__icon-wrap--
'
+
this
.
s
hape
);
classes
.
push
(
'
u-radio__icon-wrap--
'
+
this
.
elS
hape
);
if
(
this
.
name
==
this
.
parent
.
value
)
classes
.
push
(
'
u-radio__icon-wrap--checked
'
);
if
(
this
.
elDisabled
)
classes
.
push
(
'
u-radio__icon-wrap--disabled
'
);
if
(
this
.
name
==
this
.
parent
.
value
&&
this
.
elDisabled
)
classes
.
push
(
...
...
uview-ui/components/u-section/u-section.vue
View file @
582557e5
...
...
@@ -8,7 +8,7 @@
}" :class="{
'u-section--line': showLine
}">
<view
class=
"u-section__title__icon-wrap u-flex"
:style=
"[lineStyle]"
>
<view
class=
"u-section__title__icon-wrap u-flex"
:style=
"[lineStyle]"
v-if=
"showLine"
>
<u-icon
top=
"0"
name=
"column-line"
:size=
"fontSize * 1.25"
bold
:color=
"lineColor ? lineColor : color"
></u-icon>
</view>
<text
class=
"u-flex u-section__title__text"
>
{{
title
}}
</text>
...
...
@@ -59,7 +59,7 @@
},
fontSize
:
{
type
:
[
Number
,
String
],
default
:
32
default
:
28
},
// 主标题是否加粗
bold
:
{
...
...
uview-ui/components/u-switch/u-switch.vue
View file @
582557e5
<
template
>
<view
class=
"u-switch"
:class=
"[value == true ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']"
@
tap=
"onClick"
:style=
"[switchStyle]"
>
<view
class=
"u-switch__node node-class"
>
<view
class=
"u-switch__node node-class"
:style=
"
{
width: $u.addUnit(this.size),
height: $u.addUnit(this.size)
}">
<u-loading
:show=
"loading"
class=
"u-switch__loading"
:size=
"size * 0.6"
:color=
"loadingColor"
/>
</view>
</view>
...
...
@@ -128,8 +131,6 @@
left
:
0
;
border-radius
:
100%
;
z-index
:
1
;
width
:
1em
;
height
:
1em
;
background-color
:
#fff
;
background-color
:
#fff
;
box-shadow
:
0
3px
1px
0
rgba
(
0
,
0
,
0
,
0
.05
)
,
0
2px
2px
0
rgba
(
0
,
0
,
0
,
0
.1
)
,
0
3px
3px
0
rgba
(
0
,
0
,
0
,
0
.05
);
...
...
uview-ui/components/u-tabbar/u-tabbar.vue
View file @
582557e5
...
...
@@ -127,7 +127,7 @@
},
created
()
{
// 是否隐藏原生tabbar
if
(
this
.
borderTop
)
uni
.
hideTabBar
();
if
(
this
.
hideTabBar
)
uni
.
hideTabBar
();
// 获取引入了u-tabbar页面的路由地址,该地址没有路径前面的"/"
let
pages
=
getCurrentPages
();
// 页面栈中的最后一个即为项为当前页面,route属性为页面路径
...
...
uview-ui/iconfont.css
View file @
582557e5
/* #if
ndef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO
*/
/* #if
def APP-PLUS
*/
@font-face
{
font-family
:
"uicon-iconfont"
;
font-weight
:
normal
;
...
...
@@ -10,7 +10,7 @@
/* #endif */
/* 支付宝,百度,头条小程序目前读取大的本地字体文件,导致无法显示图标,故用在线加载的方式-2020-05-12 */
/* #if
def MP-ALIPAY || MP-BAIDU || MP-TOUTIAO
*/
/* #if
ndef APP-PLUS
*/
@font-face
{
font-family
:
"uicon-iconfont"
;
src
:
url('//at.alicdn.com/t/font_1529455_a1l807px8qd')
;
...
...
@@ -38,10 +38,6 @@
align-items
:
center
;
}
.uicon-column-line
:before
{
content
:
"\e68e"
;
}
.uicon-level
:before
{
content
:
"\e693"
;
}
...
...
@@ -54,100 +50,104 @@
content
:
"\e697"
;
}
.uicon-
arrow-left-doubl
e
:before
{
content
:
"\e68c
"
;
.uicon-
column-lin
e
:before
{
content
:
"\e68e
"
;
}
.uicon-
arrow-right-doubl
e
:before
{
content
:
"\e68d
"
;
.uicon-
empty-pag
e
:before
{
content
:
"\e627
"
;
}
.uicon-
youjiantou
:before
{
content
:
"\e602
"
;
.uicon-
empty-data
:before
{
content
:
"\e62f
"
;
}
.uicon-
red-packet
:before
{
content
:
"\e691
"
;
.uicon-
empty-car
:before
{
content
:
"\e602
"
;
}
.uicon-
red-packet-fill
:before
{
content
:
"\e690
"
;
.uicon-
empty-order
:before
{
content
:
"\e639
"
;
}
.uicon-
order
:before
{
content
:
"\e68f
"
;
.uicon-
empty-address
:before
{
content
:
"\e646
"
;
}
.uicon-
checkbox-mark
:before
{
content
:
"\e6a8
"
;
.uicon-
empty-message
:before
{
content
:
"\e6a9
"
;
}
.uicon-
arrow-up-fill
:before
{
content
:
"\e6b0
"
;
.uicon-
empty-search
:before
{
content
:
"\e664
"
;
}
.uicon-
arrow-down-fill
:before
{
content
:
"\e600
"
;
.uicon-
empty-favor
:before
{
content
:
"\e67c
"
;
}
.uicon-
zanwushouhuodizhisvg_huaba
n
:before
{
content
:
"\e6d5
"
;
.uicon-
empty-coupo
n
:before
{
content
:
"\e682
"
;
}
.uicon-empty-
wifi
:before
{
content
:
"\e639
"
;
.uicon-empty-
history
:before
{
content
:
"\e684
"
;
}
.uicon-empty-
history
:before
{
content
:
"\e68b
"
;
.uicon-empty-
permission
:before
{
content
:
"\e686
"
;
}
.uicon-empty-
message
:before
{
.uicon-empty-
news
:before
{
content
:
"\e687"
;
}
.uicon-empty-
permission
:before
{
content
:
"\e686
"
;
.uicon-empty-
wifi
:before
{
content
:
"\e688
"
;
}
.uicon-empty-
search
:before
{
content
:
"\e627
"
;
.uicon-empty-
list
:before
{
content
:
"\e68b
"
;
}
.uicon-
empty-pag
e
:before
{
content
:
"\e62f
"
;
.uicon-
arrow-left-doubl
e
:before
{
content
:
"\e68c
"
;
}
.uicon-
empty-address
:before
{
content
:
"\e646
"
;
.uicon-
arrow-right-double
:before
{
content
:
"\e68d
"
;
}
.uicon-
empty-favor
:before
{
content
:
"\e664
"
;
.uicon-
red-packet
:before
{
content
:
"\e691
"
;
}
.uicon-
empty-coupon
:before
{
content
:
"\e6af
"
;
.uicon-
red-packet-fill
:before
{
content
:
"\e690
"
;
}
.uicon-
empty-data
:before
{
content
:
"\e67c
"
;
.uicon-
order
:before
{
content
:
"\e68f
"
;
}
.uicon-
mepty-order
:before
{
content
:
"\e7c8
"
;
.uicon-
nav-back-arrow
:before
{
content
:
"\e67f
"
;
}
.uicon-
empty-car
:before
{
content
:
"\e682
"
;
.uicon-
nav-back
:before
{
content
:
"\e683
"
;
}
.uicon-
empty-list
:before
{
content
:
"\e684
"
;
.uicon-
checkbox-mark
:before
{
content
:
"\e6a8
"
;
}
.uicon-empty-news
:before
{
content
:
"\e6e8"
;
.uicon-arrow-up-fill
:before
{
content
:
"\e6b0"
;
}
.uicon-arrow-down-fill
:before
{
content
:
"\e600"
;
}
.uicon-backspace
:before
{
...
...
uview-ui/libs/config/config.js
View file @
582557e5
// 此版本发布于2020-07-2
8
let
version
=
'
1.5.
6
'
;
// 此版本发布于2020-07-2
9
let
version
=
'
1.5.
7
'
;
export
default
{
v
:
version
,
...
...
uview-ui/package.json
View file @
582557e5
{
"name"
:
"uview-ui"
,
"version"
:
"1.5.
6
"
,
"version"
:
"1.5.
7
"
,
"description"
:
"uView UI,是uni-app生态优秀的UI框架,全面的组件和便捷的工具会让您信手拈来,如鱼得水"
,
"main"
:
"index.js"
,
"keywords"
:
[
"uview"
,
"uView"
,
"uni-app"
,
"uni-app ui"
,
"uniapp"
,
"uviewui"
,
"uview ui"
,
"uviewUI"
,
"uViewui"
,
"uViewUI"
,
"uView UI"
,
"uni ui"
,
"uni UI"
,
"uniapp ui"
,
"ui"
,
"UI框架"
,
"uniapp ui框架"
,
"uniapp UI"
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment