From f4070f28409b41fade2be8971d3b955b2c330809 Mon Sep 17 00:00:00 2001 From: wlxuqu <1416956117@qq.com> Date: Wed, 24 Jun 2020 17:30:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=20=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E4=B8=BB=E9=A2=98=E5=8A=9F=E8=83=BD=EF=BC=9A[?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=BB=E9=A2=98](https://www.uvie?= =?UTF-8?q?wui.com/guide/theme.html)=202.=20=E6=9B=B4=E6=96=B0readme.md=20?= =?UTF-8?q?3.=20=E4=BC=98=E5=8C=96row=E7=BB=84=E4=BB=B7=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=BE=B9=E8=B7=9D=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=204.=20button=E7=BB=84=E4=BB=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9Edata-name=E5=8F=82=E6=95=B0=205.=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=A1=A8=E7=8E=B0=206.=20field=E7=BB=84=E4=BB=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9Eicon-style=E5=8F=82=E6=95=B0=207.=20icon=E7=BB=84?= =?UTF-8?q?=E4=BB=B6color=E5=8F=82=E6=95=B0=E5=8F=AF=E4=BB=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=97primary,sucees,error,info,warning=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/demo.scss | 6 ++++++ pages/componentsA/icon/index.vue | 1 - pages/componentsC/button/index.vue | 2 +- pages/componentsC/test/index.vue | 5 +++++ uview-ui/components/u-button/u-button.vue | 1 - uview-ui/components/u-field/u-field.vue | 9 ++++++++- uview-ui/components/u-icon/u-icon.vue | 1 + uview-ui/iconfont.css | 4 ++-- uview-ui/libs/config/config.js | 4 ++-- uview-ui/libs/css/style.components.scss | 2 +- uview-ui/package.json | 2 +- 11 files changed, 27 insertions(+), 10 deletions(-) diff --git a/common/demo.scss b/common/demo.scss index 2058df20..9c91b536 100644 --- a/common/demo.scss +++ b/common/demo.scss @@ -1,3 +1,9 @@ +/* #ifndef APP-NVUE */ +view, +text { + box-sizing: border-box; +} +/* #endif */ /* start--演示页面使用的统一样式--start */ .u-demo { diff --git a/pages/componentsA/icon/index.vue b/pages/componentsA/icon/index.vue index d8df15a1..e3c2c4ca 100644 --- a/pages/componentsA/icon/index.vue +++ b/pages/componentsA/icon/index.vue @@ -628,7 +628,6 @@ flex: 0 0 33.33333333%; justify-content: center; overflow: hidden; - padding: 0 6rpx; } .u-icon-name { diff --git a/pages/componentsC/button/index.vue b/pages/componentsC/button/index.vue index d0fd88cb..52c08015 100644 --- a/pages/componentsC/button/index.vue +++ b/pages/componentsC/button/index.vue @@ -3,7 +3,7 @@ 演示效果 - 山川异域，风月同天 + 山川异域，风月同天 diff --git a/pages/componentsC/test/index.vue b/pages/componentsC/test/index.vue index e69de29b..0ab0f2b2 100644 --- a/pages/componentsC/test/index.vue +++ b/pages/componentsC/test/index.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/uview-ui/components/u-button/u-button.vue b/uview-ui/components/u-button/u-button.vue index 84ba9bbe..8d7d78fb 100644 --- a/uview-ui/components/u-button/u-button.vue +++ b/uview-ui/components/u-button/u-button.vue @@ -33,7 +33,6 @@ @tap.stop="click($event)" :hover-class="getHoverClass" :loading="loading" - data-name="dataName" > - + {{ label }} @@ -162,6 +162,13 @@ export default { clearSize: { type: [Number, String], default: 30 + }, + // lable左边的图标样式，对象形式 + iconStyle: { + type: Object, + default() { + return {} + } } }, inject: ['uCellGroup'], diff --git a/uview-ui/components/u-icon/u-icon.vue b/uview-ui/components/u-icon/u-icon.vue index e68218fe..32d76d8c 100644 --- a/uview-ui/components/u-icon/u-icon.vue +++ b/uview-ui/components/u-icon/u-icon.vue @@ -23,6 +23,7 @@ * @property {String} label 图标右侧的label文字（默认28） * @property {String} label-pos label文字相对于图标的位置，只能right或bottom（默认right） * @property {String} label-color label字体颜色（默认#606266） + * @property {Object} custom-style icon的样式，对象形式 * @property {String | Number} margin-left label在右侧时与图标的距离，单位rpx（默认6） * @property {String | Number} margin-top label在下方时与图标的距离，单位rpx（默认6） * @property {String} label-pos label相对于图标的位置，只能right或bottom（默认right） diff --git a/uview-ui/iconfont.css b/uview-ui/iconfont.css index baad9acc..1ebb6c81 100644 --- a/uview-ui/iconfont.css +++ b/uview-ui/iconfont.css @@ -8,8 +8,8 @@ } /* #endif */ -/* 支付宝，百度，头条小程序目前读取大的本地字体文件，导致无法显示图标，故用在线加载的方式-2020-05-12 */ -/* #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || H5 */ +/* 支付宝，百度，头条，QQ小程序，以及H5在部分浏览器目前读取大的本地字体文件，导致无法显示图标，故用在线加载的方式-2020-06-24 */ +/* #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || H5 || MP-QQ */ @font-face { font-family: "uicon-iconfont"; src: url('//at.alicdn.com/t/font_1529455_k9eg3z8m98'); diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js index 240af040..b14ec751 100644 --- a/uview-ui/libs/config/config.js +++ b/uview-ui/libs/config/config.js @@ -1,5 +1,5 @@ -// 此版本发布于2020-06-19 -let version = '1.3.61'; +// 此版本发布于2020-06-25 +let version = '1.3.9'; export default { v: version, diff --git a/uview-ui/libs/css/style.components.scss b/uview-ui/libs/css/style.components.scss index 8e3c0546..5f3bf23d 100644 --- a/uview-ui/libs/css/style.components.scss +++ b/uview-ui/libs/css/style.components.scss @@ -6,9 +6,9 @@ image { will-change: transform; } +// 在weex，也即nvue中，所有元素默认为border-box view, text { box-sizing: border-box; - flex-direction: row; } /* #endif */ \ No newline at end of file diff --git a/uview-ui/package.json b/uview-ui/package.json index d3849bd5..c1bf3ecf 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,6 +1,6 @@ { "name": "uview-ui", - "version": "1.3.8", + "version": "1.3.9", "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"], From 95496a55ba6e6d1bb2f6c6de475aae2c8c5fb311 Mon Sep 17 00:00:00 2001 From: wlxuqu <1416956117@qq.com> Date: Wed, 24 Jun 2020 22:59:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96cell=E5=92=8Cfiled?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=97=A0=E9=9C=80=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E7=BB=93=E5=90=88ceel-group=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/componentsA/field/index.vue | 40 +++++++++---------- pages/componentsC/cell/index.vue | 2 +- .../components/u-cell-group/u-cell-group.vue | 5 --- .../components/u-cell-item/u-cell-item.vue | 27 +++++-------- uview-ui/components/u-field/u-field.vue | 35 +++++++--------- uview-ui/libs/function/getParent.js | 14 ++++--- uview-ui/theme.scss | 2 +- 7 files changed, 54 insertions(+), 71 deletions(-) diff --git a/pages/componentsA/field/index.vue b/pages/componentsA/field/index.vue index 567d301e..33781e8b 100644 --- a/pages/componentsA/field/index.vue +++ b/pages/componentsA/field/index.vue @@ -3,27 +3,25 @@ 演示效果 - - - - - 发送验证码 - - + + + + 发送验证码 + diff --git a/pages/componentsC/cell/index.vue b/pages/componentsC/cell/index.vue index 25ba55ad..3f6cf213 100644 --- a/pages/componentsC/cell/index.vue +++ b/pages/componentsC/cell/index.vue @@ -12,7 +12,7 @@ - + diff --git a/uview-ui/components/u-cell-group/u-cell-group.vue b/uview-ui/components/u-cell-group/u-cell-group.vue index 9577fee5..f437a61d 100644 --- a/uview-ui/components/u-cell-group/u-cell-group.vue +++ b/uview-ui/components/u-cell-group/u-cell-group.vue @@ -46,11 +46,6 @@ index: 0, } }, - provide() { - return { - uCellGroup: this - } - }, } diff --git a/uview-ui/components/u-cell-item/u-cell-item.vue b/uview-ui/components/u-cell-item/u-cell-item.vue index 1ac0513e..bc7a7523 100644 --- a/uview-ui/components/u-cell-item/u-cell-item.vue +++ b/uview-ui/components/u-cell-item/u-cell-item.vue @@ -2,7 +2,7 @@ + + + + 演示效果 + + + + 加载失败 + + + + + 参数配置 + + 状态 + + + + 加载中状态 + + + + 加载失败状态 + + + + 形状 + + + + + + + + + diff --git a/pages/componentsC/test/index.vue b/pages/componentsC/test/index.vue index 0ab0f2b2..482e4a77 100644 --- a/pages/componentsC/test/index.vue +++ b/pages/componentsC/test/index.vue @@ -1,5 +1,12 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/example/components.config.js b/pages/example/components.config.js index 3085e36d..e05e1efd 100644 --- a/pages/example/components.config.js +++ b/pages/example/components.config.js @@ -8,6 +8,10 @@ export default [{ path: '/pages/componentsA/icon/index', icon: 'icon', title: 'Icon 图标', + },{ + path: '/pages/componentsB/image/index', + icon: 'image', + title: 'Image 图片', }, { path: '/pages/componentsC/button/index', icon: 'button', diff --git a/uview-ui/components/u-cell-item/u-cell-item.vue b/uview-ui/components/u-cell-item/u-cell-item.vue index bc7a7523..e12dbcc1 100644 --- a/uview-ui/components/u-cell-item/u-cell-item.vue +++ b/uview-ui/components/u-cell-item/u-cell-item.vue @@ -2,14 +2,14 @@ - + @@ -49,13 +49,14 @@ * @tutorial https://www.uviewui.com/components/cell.html * @property {String} title 左侧标题 * @property {String} icon 左侧图标名，只支持uView内置图标，见Icon 图标 + * @property {Object} icon-style 左边图标的样式，对象形式 * @property {String} value 右侧内容 * @property {String} label 标题下方的描述信息 * @property {Boolean} border-bottom 是否显示cell的下边框（默认true） * @property {Boolean} border-top 是否显示cell的上边框（默认false） * @property {Boolean} center 是否使内容垂直居中（默认false） * @property {String} hover-class 是否开启点击反馈，none为无效果（默认true） - * @property {Boolean} border-gap border-bottom为true时，Cell列表中间的条目的下边框是否与左边有一个间隔（默认true） + * // @property {Boolean} border-gap border-bottom为true时，Cell列表中间的条目的下边框是否与左边有一个间隔（默认true） * @property {Boolean} arrow 是否显示右侧箭头（默认true） * @property {Boolean} required 箭头方向，可选值（默认right） * @property {Boolean} arrow-direction 是否显示左边表示必填的星号（默认false） @@ -101,10 +102,11 @@ export default { default: false }, // 多个cell中，中间的cell显示下划线时，下划线是否给一个到左边的距离 - borderGap: { - type: Boolean, - default: true - }, + // 1.4.0版本废除此参数，默认边框由border-top和border-bottom提供，此参数会造成干扰 + // borderGap: { + // type: Boolean, + // default: true + // }, // 是否开启点击反馈，即点击时cell背景为灰色，none为无效果 hoverClass: { type: String, @@ -175,7 +177,14 @@ export default { iconSize: { type: [Number, String], default: 34 - } + }, + // 左边图标的样式，对象形式 + iconStyle: { + type: Object, + default() { + return {} + } + }, }, data() { return { @@ -253,10 +262,6 @@ export default { position: relative; } -.u-border-gap:after { - left: 32rpx !important; -} - .u-cell__label { margin-top: 6rpx; font-size: 26rpx; diff --git a/uview-ui/components/u-field/u-field.vue b/uview-ui/components/u-field/u-field.vue index a89f9351..12e5e34b 100644 --- a/uview-ui/components/u-field/u-field.vue +++ b/uview-ui/components/u-field/u-field.vue @@ -55,6 +55,7 @@ * @tutorial https://www.uviewui.com/components/field.html * @property {String} type 输入框的类型（默认text） * @property {String} icon label左边的图标，限uView的图标名称 + * @property {Object} icon-style 左边图标的样式，对象形式 * @property {Boolean} right-icon 输入框右边的图标名称，限uView的图标名称（默认false） * @property {Boolean} required 是否必填，左边您显示红色"*"号（默认false） * @property {String} label 输入框左边的文字提示 diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue new file mode 100644 index 00000000..3221eb8b --- /dev/null +++ b/uview-ui/components/u-image/u-image.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/uview-ui/components/u-input/u-input.vue b/uview-ui/components/u-input/u-input.vue index 0dfddb9a..82ca6722 100644 --- a/uview-ui/components/u-input/u-input.vue +++ b/uview-ui/components/u-input/u-input.vue @@ -318,7 +318,7 @@ export default { &__right-icon { position: absolute; - right: 20rpx; + right: 0; top: 50%; z-index: 3; transform: translateY(-50%); diff --git a/uview-ui/components/u-lazy-load/u-lazy-load.vue b/uview-ui/components/u-lazy-load/u-lazy-load.vue index cc6592ad..bda51253 100644 --- a/uview-ui/components/u-lazy-load/u-lazy-load.vue +++ b/uview-ui/components/u-lazy-load/u-lazy-load.vue @@ -126,7 +126,7 @@ // 如果是不开启过渡效果，直接返回 if (!this.isEffect) return; this.time = 0; - // 原来opacity为1(不透明，是为了显示占位图)，改成0(透明， 意味着该元素显示的是背景颜色，默认的白色)，再改成1，是为了获得过渡效果 + // 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的白色)，再改成1，是为了获得过渡效果 this.opacity = 0; // 延时30ms，否则在浏览器H5，过渡效果无效 setTimeout(() => { diff --git a/uview-ui/components/u-toast/u-toast.vue b/uview-ui/components/u-toast/u-toast.vue index ed73f44e..68c911b8 100644 --- a/uview-ui/components/u-toast/u-toast.vue +++ b/uview-ui/components/u-toast/u-toast.vue @@ -37,10 +37,11 @@ type: '', // 主题类型，primary，success，error，warning，black duration: 2000, // 显示的时间，毫秒 isTab: false, // 是否跳转tab页面 - url: '', // toast消失后是否跳转页面，有则跳转 + url: '', // toast消失后是否跳转页面，有则跳转，优先级高于back参数 icon: true, // 显示的图标 position: 'center', // toast出现的位置 callback: null, // 执行完后的回调函数 + back: false, // 结束toast是否自动返回上一页 } }; }, @@ -117,6 +118,11 @@ url: this.config.url }); } + } else if(this.config.back) { + // 回退到上一页 + this.$u.route({ + type: 'back' + }) } } } diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue index 344894e5..977eda3c 100644 --- a/uview-ui/components/u-upload/u-upload.vue +++ b/uview-ui/components/u-upload/u-upload.vue @@ -245,7 +245,14 @@ export default { immediate: true, handler(val) { val.map(value => { - this.lists.push({ url: value.url, error: false, progress: 100 }); + // 首先检查内部是否已经添加过这张图片，因为外部绑定了一个对象给fileList的话(对象引用)，进行修改外部fileList + // 时，会触发watch，导致重新把原来的图片再次添加到this.lists + // 数组的some方法意思是，只要数组元素有任意一个元素条件符合，就返回true，而另一个数组的every方法的意思是数组所有元素都符合条件才返回true + let tmp = this.lists.some(val => { + return val.url == value.url; + }) + // 如果内部没有这个图片(tmp为false)，则添加到内部 + !tmp && this.lists.push({ url: value.url, error: false, progress: 100 }); }); } } diff --git a/uview-ui/index.js b/uview-ui/index.js index 5a135765..c24a7db8 100644 --- a/uview-ui/index.js +++ b/uview-ui/index.js @@ -1,7 +1,7 @@ // 引入全局mixin import mixin from './libs/mixin/mixin.js' // 引入关于是否mixin集成小程序分享的配置 -import wxshare from './libs/mixin/mpShare.js' +// import wxshare from './libs/mixin/mpShare.js' // 全局挂载引入http相关请求拦截插件 import http from './libs/request' @@ -45,6 +45,8 @@ import randomArray from './libs/function/randomArray.js' import deepClone from './libs/function/deepClone.js' // 对象深度拷贝 import deepMerge from './libs/function/deepMerge.js' +// 添加单位 +import addUnit from './libs/function/addUnit.js' // 规则检验 import test from './libs/function/test.js' @@ -86,6 +88,7 @@ const $u = { deepClone, deepMerge, getParent, + addUnit, trim, type: ['primary', 'success', 'error', 'warning', 'info'], http, diff --git a/uview-ui/libs/function/addUnit.js b/uview-ui/libs/function/addUnit.js new file mode 100644 index 00000000..247fae22 --- /dev/null +++ b/uview-ui/libs/function/addUnit.js @@ -0,0 +1,8 @@ +import validation from './test.js'; + +// 添加单位，如果有rpx，%，px等单位结尾或者值为auto，直接返回，否则加上rpx单位结尾 +export default function addUnit(value = 'auto', unit = 'rpx') { + value = String(value); + // 用uView内置验证规则中的number判断是否为数值 + return validation.number(value) ? `${value}${unit}` : value; +} \ No newline at end of file diff --git a/uview-ui/theme.scss b/uview-ui/theme.scss index c6efb77e..f3bb36db 100644 --- a/uview-ui/theme.scss +++ b/uview-ui/theme.scss @@ -6,7 +6,7 @@ $u-main-color: #303133; $u-content-color: #606266; $u-tips-color: #909399; $u-light-color: #c0c4cc; -$u-border-color: red; +$u-border-color: #e4e7ed; $u-bg-color: #f3f4f6; $u-type-primary: #2979ff; From fad8df8e014d7a48f6058cb9c71807ebb6212889 Mon Sep 17 00:00:00 2001 From: wlxuqu <1416956117@qq.com> Date: Sun, 28 Jun 2020 18:07:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dtag=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=BB=E9=A2=98=E8=89=B2=E5=8F=AF=E8=83=BD=E6=97=A0?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=202.=20=E4=BF=AE=E5=A4=8Dn?= =?UTF-8?q?avbar=E7=9A=84custom-back=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 13 + manifest.json | 2 +- pages/componentsA/tag/index.vue | 96 ++++--- pages/componentsA/test/index.vue | 316 ++++++---------------- pages/componentsC/test/index.vue | 35 ++- uview-ui/components/u-navbar/u-navbar.vue | 2 +- uview-ui/components/u-tag/u-tag.vue | 10 +- uview-ui/libs/config/config.js | 4 +- uview-ui/libs/css/style.mp.scss | 2 +- uview-ui/package.json | 2 +- 10 files changed, 188 insertions(+), 294 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..258a58e9 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +[*] +#缩进风格：空格 +indent_style = space +#缩进大小2 +indent_size = 4 +#换行符lf +end_of_line = lf +#字符集utf-8 +charset = utf-8 +#是否删除行尾的空格 +trim_trailing_whitespace = true + + diff --git a/manifest.json b/manifest.json index e370b68e..d790005e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "uView", "appid" : "__UNI__60F4B81", "description" : "多平台快速开发的UI框架", - "versionName" : "1.3.8", + "versionName" : "1.4.0", "versionCode" : "100", "transformPx" : false, "app-plus" : { diff --git a/pages/componentsA/tag/index.vue b/pages/componentsA/tag/index.vue index 276e501c..d23b90f5 100644 --- a/pages/componentsA/tag/index.vue +++ b/pages/componentsA/tag/index.vue @@ -4,14 +4,11 @@ 演示效果 - + - - 参数配置 - + 参数配置 模式选择 @@ -41,53 +38,54 @@ \ No newline at end of file +.u-demo { +} + diff --git a/pages/componentsA/test/index.vue b/pages/componentsA/test/index.vue index 620766b2..07486790 100644 --- a/pages/componentsA/test/index.vue +++ b/pages/componentsA/test/index.vue @@ -1,236 +1,90 @@ - - diff --git a/pages/componentsC/test/index.vue b/pages/componentsC/test/index.vue index 482e4a77..3889eb73 100644 --- a/pages/componentsC/test/index.vue +++ b/pages/componentsC/test/index.vue @@ -1,12 +1,41 @@ \ No newline at end of file + + + diff --git a/uview-ui/components/u-navbar/u-navbar.vue b/uview-ui/components/u-navbar/u-navbar.vue index b7a4ef65..8c259ea4 100644 --- a/uview-ui/components/u-navbar/u-navbar.vue +++ b/uview-ui/components/u-navbar/u-navbar.vue @@ -210,7 +210,7 @@ export default { // 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑 if(typeof this.customBack === 'function') { this.customBack(); - } { + } else { uni.navigateBack(); } } diff --git a/uview-ui/components/u-tag/u-tag.vue b/uview-ui/components/u-tag/u-tag.vue index cc1fc985..88d28b7f 100644 --- a/uview-ui/components/u-tag/u-tag.vue +++ b/uview-ui/components/u-tag/u-tag.vue @@ -181,31 +181,31 @@ .u-mode-light-primary { background-color: $u-type-primary-light; color: $u-type-primary; - border: 1px solid rgb(215, 234, 254); + border: 1px solid $u-type-primary-disabled; } .u-mode-light-success { background-color: $u-type-success-light; color: $u-type-success; - border: 1px solid #BEF5C8; + border: 1px solid $u-type-success-disabled; } .u-mode-light-error { background-color: $u-type-error-light; color: $u-type-error; - border: 1px solid #fde2e2; + border: 1px solid $u-type-error-disabled; } .u-mode-light-warning { background-color: $u-type-warning-light; color: $u-type-warning; - border: 1px solid #faecd8; + border: 1px solid $u-type-warning-disabled; } .u-mode-light-info { background-color: $u-type-info-light; color: $u-type-info; - border: 1px solid #ebeef5; + border: 1px solid $u-type-info-disabled; } .u-mode-dark-primary { diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js index b14ec751..7dfb9dea 100644 --- a/uview-ui/libs/config/config.js +++ b/uview-ui/libs/config/config.js @@ -1,5 +1,5 @@ -// 此版本发布于2020-06-25 -let version = '1.3.9'; +// 此版本发布于2020-06-28 +let version = '1.4.0'; export default { v: version, diff --git a/uview-ui/libs/css/style.mp.scss b/uview-ui/libs/css/style.mp.scss index e72844ea..54ad0048 100644 --- a/uview-ui/libs/css/style.mp.scss +++ b/uview-ui/libs/css/style.mp.scss @@ -10,7 +10,7 @@ u-td, u-th { } u-icon { - display: flex; + display: inline-flex; align-items: center; } diff --git a/uview-ui/package.json b/uview-ui/package.json index c1bf3ecf..0b1e8283 100644 --- a/uview-ui/package.json +++ b/uview-ui/package.json @@ -1,6 +1,6 @@ { "name": "uview-ui", - "version": "1.3.9", + "version": "1.4.0", "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"],