Commit f4070f28 authored by wlxuqu's avatar wlxuqu

1. 新增自定义主题功能:[自定义主题](https://www.uviewui.com/guide/theme.html)

2. 更新readme.md
3. 优化row组价可能存在边距错误的问题
4. button组件新增data-name参数
5. 优化演示项目的样式表现
6. field组件新增icon-style参数
7. icon组件color参数可以接受primary,sucees,error,info,warning主题色值
parent 5874cf8e
/* #ifndef APP-NVUE */
view,
text {
box-sizing: border-box;
}
/* #endif */
/* start--演示页面使用的统一样式--start */ /* start--演示页面使用的统一样式--start */
.u-demo { .u-demo {
......
...@@ -628,7 +628,6 @@ ...@@ -628,7 +628,6 @@
flex: 0 0 33.33333333%; flex: 0 0 33.33333333%;
justify-content: center; justify-content: center;
overflow: hidden; overflow: hidden;
padding: 0 6rpx;
} }
.u-icon-name { .u-icon-name {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="u-demo-wrap"> <view class="u-demo-wrap">
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-button @click="btnClick" :loading="loading" :plain="plain" :shape="shape" :size="size" :ripple="ripple" :hairLine="hairLine" :type="type">山川异域,风月同天</u-button> <u-button @click="btnClick" data-name="3333" :loading="loading" :plain="plain" :shape="shape" :size="size" :ripple="ripple" :hairLine="hairLine" :type="type">山川异域,风月同天</u-button>
</view> </view>
</view> </view>
<view class="u-config-wrap"> <view class="u-config-wrap">
......
<template>
<view class="">
</view>
</template>
\ No newline at end of file
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
@tap.stop="click($event)" @tap.stop="click($event)"
:hover-class="getHoverClass" :hover-class="getHoverClass"
:loading="loading" :loading="loading"
data-name="dataName"
> >
<slot></slot> <slot></slot>
<view <view
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
flex: labelPosition == 'left' ? `0 0 ${labelWidth}rpx` : '1' flex: labelPosition == 'left' ? `0 0 ${labelWidth}rpx` : '1'
}"> }">
<view class="u-icon-wrap" v-if="icon"> <view class="u-icon-wrap" v-if="icon">
<u-icon size="32" :name="icon" :color="iconColor" class="u-icon"></u-icon> <u-icon size="32" :custom-style="iconStyle" :name="icon" :color="iconColor" class="u-icon"></u-icon>
</view> </view>
<slot name="icon"></slot> <slot name="icon"></slot>
<text class="u-label-text" :class="[this.$slots.icon || icon ? 'u-label-left-gap' : '']">{{ label }}</text> <text class="u-label-text" :class="[this.$slots.icon || icon ? 'u-label-left-gap' : '']">{{ label }}</text>
...@@ -162,6 +162,13 @@ export default { ...@@ -162,6 +162,13 @@ export default {
clearSize: { clearSize: {
type: [Number, String], type: [Number, String],
default: 30 default: 30
},
// lable左边的图标样式,对象形式
iconStyle: {
type: Object,
default() {
return {}
}
} }
}, },
inject: ['uCellGroup'], inject: ['uCellGroup'],
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
* @property {String} label 图标右侧的label文字(默认28) * @property {String} label 图标右侧的label文字(默认28)
* @property {String} label-pos label文字相对于图标的位置,只能right或bottom(默认right) * @property {String} label-pos label文字相对于图标的位置,只能right或bottom(默认right)
* @property {String} label-color label字体颜色(默认#606266) * @property {String} label-color label字体颜色(默认#606266)
* @property {Object} custom-style icon的样式,对象形式
* @property {String | Number} margin-left label在右侧时与图标的距离,单位rpx(默认6) * @property {String | Number} margin-left label在右侧时与图标的距离,单位rpx(默认6)
* @property {String | Number} margin-top label在下方时与图标的距离,单位rpx(默认6) * @property {String | Number} margin-top label在下方时与图标的距离,单位rpx(默认6)
* @property {String} label-pos label相对于图标的位置,只能right或bottom(默认right) * @property {String} label-pos label相对于图标的位置,只能right或bottom(默认right)
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
} }
/* #endif */ /* #endif */
/* 支付宝,百度,头条小程序目前读取大的本地字体文件,导致无法显示图标,故用在线加载的方式-2020-05-12 */ /* 支付宝,百度,头条,QQ小程序,以及H5在部分浏览器目前读取大的本地字体文件,导致无法显示图标,故用在线加载的方式-2020-06-24 */
/* #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || H5 */ /* #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || H5 || MP-QQ */
@font-face { @font-face {
font-family: "uicon-iconfont"; font-family: "uicon-iconfont";
src: url('//at.alicdn.com/t/font_1529455_k9eg3z8m98'); src: url('//at.alicdn.com/t/font_1529455_k9eg3z8m98');
......
// 此版本发布于2020-06-19 // 此版本发布于2020-06-25
let version = '1.3.61'; let version = '1.3.9';
export default { export default {
v: version, v: version,
......
...@@ -6,9 +6,9 @@ image { ...@@ -6,9 +6,9 @@ image {
will-change: transform; will-change: transform;
} }
// 在weex,也即nvue中,所有元素默认为border-box
view, view,
text { text {
box-sizing: border-box; box-sizing: border-box;
flex-direction: row;
} }
/* #endif */ /* #endif */
\ No newline at end of file
{ {
"name": "uview-ui", "name": "uview-ui",
"version": "1.3.8", "version": "1.3.9",
"description": "uView UI,是uni-app生态优秀的UI框架,全面的组件和便捷的工具会让您信手拈来,如鱼得水", "description": "uView UI,是uni-app生态优秀的UI框架,全面的组件和便捷的工具会让您信手拈来,如鱼得水",
"main": "index.js", "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"], "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"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment