From 09ca257e54998cf48ce0be076bf5ea26d02790c0 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 12 Jul 2019 10:24:21 +0800 Subject: [PATCH] =?UTF-8?q?BI-47873=20refactor:=20=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E4=BD=93=20&&=20=E6=9B=B4=E6=96=B0changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 4 ++++ public/css/app.css | 2 +- src/css/core/utils/common.css | 15 +++++++++------ src/css/resource/app.css | 2 +- src/less/core/utils/common.less | 16 ++++++++++------ src/less/resource/app.less | 2 +- ui/css/app.css | 2 +- 7 files changed, 27 insertions(+), 16 deletions(-) diff --git a/changelog.md b/changelog.md index c2e01cce3..37f2cf76d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,8 @@ # 更新日志 +2.0(2019-06) +- 单选下拉树支持搜索与异步加载节点 +- 提供了AES加密方法 + 2.0(2019-05) - editor类控件新增EVENT_CHANGE_CONFIRM事件 - 复选下拉控件和树下拉控件支持trigger是否可编辑 diff --git a/public/css/app.css b/public/css/app.css index 5f2aefb36..b1409b65a 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -18,7 +18,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; + font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 07a26e4b1..0fdc9c887 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -220,22 +220,25 @@ textarea { border-left: 1px solid #292f45; } .bi-font-helvetica-neue { - font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; + font-family: "Helvetica Neue", Arial, Verdana, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} +.bi-font-verdana { + font-family: Verdana, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; } .bi-font-arial { - font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; + font-family: Arial, "Helvetica Neue", Verdana, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; } .bi-font-PingFang { - font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; + font-family: "PingFang SC", "Helvetica Neue", Verdana, Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; } .bi-font-hiragino-sans { - font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; + font-family: "Hiragino Sans GB", "Helvetica Neue", Verdana, Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; } .bi-font-microsoft-yaHei { - font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; + font-family: "Microsoft YaHei", "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; } .bi-font-heiti { - font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; + font-family: Heiti, "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; } .bi-border-radius { -webkit-border-radius: 2px; diff --git a/src/css/resource/app.css b/src/css/resource/app.css index 5f2aefb36..b1409b65a 100644 --- a/src/css/resource/app.css +++ b/src/css/resource/app.css @@ -18,7 +18,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; + font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 40ed96b0f..df275a312 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -280,27 +280,31 @@ textarea { // 字体 .bi-font-helvetica-neue { - font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; + font-family: "Helvetica Neue", Arial, Verdana, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; +} + +.bi-font-verdana { + font-family: Verdana, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; } .bi-font-arial { - font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; + font-family: Arial, "Helvetica Neue", Verdana, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; } .bi-font-PingFang { - font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; + font-family: "PingFang SC", "Helvetica Neue", Verdana, Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; } .bi-font-hiragino-sans { - font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; + font-family: "Hiragino Sans GB", "Helvetica Neue", Verdana, Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif; } .bi-font-microsoft-yaHei { - font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; + font-family: "Microsoft YaHei", "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif; } .bi-font-heiti { - font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; + font-family: Heiti, "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif; } .bi-border-radius { diff --git a/src/less/resource/app.less b/src/less/resource/app.less index c0d43653b..3bcf31c6e 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -16,7 +16,7 @@ body { background-repeat: repeat; .user-select-disable(); color: @color-bi-text-normal; - font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; + font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none; diff --git a/ui/css/app.css b/ui/css/app.css index 5f2aefb36..b1409b65a 100644 --- a/ui/css/app.css +++ b/ui/css/app.css @@ -18,7 +18,7 @@ body { -o-user-select: none; user-select: none; color: #3d4d66; - font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; + font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none;