From eac758e7873b5c3895e4e8a8a84483450de16378 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Sun, 5 May 2019 17:07:06 +0800 Subject: [PATCH] =?UTF-8?q?BI-44506=20&&=20BI-44489=20fix=20init=20?= =?UTF-8?q?=E5=92=8C=20checkbox=E5=87=BA=E8=A7=86=E8=A7=89=E4=BA=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.css | 48 +++++++++++++++++++++--- dist/2.0/fineui.ie.js | 11 +++--- dist/2.0/fineui.js | 11 +++--- dist/base.css | 48 +++++++++++++++++++++--- dist/bundle.css | 48 +++++++++++++++++++++--- dist/bundle.ie.js | 11 +++--- dist/bundle.js | 11 +++--- dist/case.js | 5 +-- dist/demo.js | 31 ++------------- dist/fineui.css | 48 +++++++++++++++++++++--- dist/fineui.ie.js | 11 +++--- dist/fineui.js | 11 +++--- dist/fineui_without_jquery_polyfill.js | 6 ++- dist/fix/fix.ie.js | 6 ++- dist/fix/fix.js | 6 ++- src/css/base/single/input/checkbox.css | 18 +++++++-- src/css/base/single/input/radio.css | 30 ++++++++++++++- src/less/base/single/input/checkbox.less | 15 ++++++-- src/less/base/single/input/radio.less | 31 ++++++++++++++- src/less/lib/constant.less | 2 +- 20 files changed, 307 insertions(+), 101 deletions(-) diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css index 40180856d1..a79c4483e5 100644 --- a/dist/2.0/fineui.css +++ b/dist/2.0/fineui.css @@ -3563,6 +3563,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, transform: rotate(45deg) scale(1) translate(-50%, -50%); content: ''; } +.bi-checkbox .checkbox-content.hover, +.bi-checkbox .checkbox-content:hover { + border-color: #3685f2; +} .bi-checkbox.active .checkbox-content, .bi-checkbox:active .checkbox-content { border-color: #3685f2; @@ -3573,28 +3577,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, opacity: 1; } .bi-checkbox.disabled .checkbox-content { - background-color: #d0d4da; + background-color: #F2F4F7; + border-color: #d0d4da; } .bi-checkbox.disabled .checkbox-content:after { opacity: 0; } .bi-checkbox.disabled.active .checkbox-content { - border-color: #d0d4da; + background-color: #d0d4da; } .bi-checkbox.disabled.active .checkbox-content:after { opacity: 1; } .bi-theme-dark .bi-checkbox .checkbox-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-checkbox .checkbox-content.hover, +.bi-theme-dark .bi-checkbox .checkbox-content:hover { + border-color: #3685f2; } .bi-theme-dark .bi-checkbox.active .checkbox-content, .bi-theme-dark .bi-checkbox:active .checkbox-content { border-color: #3685f2; } .bi-theme-dark .bi-checkbox.disabled .checkbox-content { - background-color: #606479; + background-color: #2F3149; } .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { + background-color: #606479; border-color: #606479; } .bi-file { @@ -3630,6 +3640,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, .bi-radio .radio-content:after { content: ""; } +.bi-radio .radio-content.hover, +.bi-radio .radio-content:hover { + border-color: #3685f2; +} .bi-radio:active .radio-content, .bi-radio.active .radio-content { border-color: #3685f2; @@ -3652,18 +3666,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); } +.bi-radio.disabled .radio-content { + background-color: #F2F4F7; + border-color: #d0d4da; +} .bi-radio.disabled .radio-content:after { background-color: transparent; } .bi-radio.disabled.active .radio-content { - border-color: #e8eaed; background-color: #d0d4da; } .bi-radio.disabled.active .radio-content:after { background-color: #ffffff; } .bi-theme-dark .bi-radio .radio-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-radio .radio-content.hover, +.bi-theme-dark .bi-radio .radio-content:hover { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.active .radio-content, +.bi-theme-dark .bi-radio:active .radio-content { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.disabled .radio-content { + background-color: #2F3149; +} +.bi-theme-dark .bi-radio.disabled .radio-content.hover, +.bi-theme-dark .bi-radio.disabled .radio-content:hover { + border-color: #878D9F; +} +.bi-theme-dark .bi-radio.disabled.active .radio-content { + background-color: #606479; + border-color: #606479; } .bi-label { overflow: hidden; diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 9abb3dee02..47f22c23aa 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -35377,7 +35377,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons context && defineContext(this, context); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); digest(this); @@ -35389,6 +35389,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { this.alive = false; allModelInstances[this._modelHashId] = null; @@ -59274,7 +59278,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { } function getFont(treeId, node) { - return node.font ? node.font : {color: "#999999"}; + return node.isLeaf ? {} : {color: "#999999"}; } return setting; @@ -59290,9 +59294,6 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")"; } } - if(node.isLeaf === true) { - node.font = {color: "#3d4d66"}; - } }); return nodes; }, diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 7a4e470b19..447cd2584a 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -35788,7 +35788,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons childContext && defineContext(this, childContext); this.$$model && (this.model.__ob__ = this.$$model.__ob__); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); initWatch(this, watch$$1); @@ -35801,6 +35801,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { for (var _key3 in this._computedWatchers) { this._computedWatchers[_key3].teardown(); @@ -59678,7 +59682,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { } function getFont(treeId, node) { - return node.font ? node.font : {color: "#999999"}; + return node.isLeaf ? {} : {color: "#999999"}; } return setting; @@ -59694,9 +59698,6 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")"; } } - if(node.isLeaf === true) { - node.font = {color: "#3d4d66"}; - } }); return nodes; }, diff --git a/dist/base.css b/dist/base.css index 885f7082f3..9d6cac2428 100644 --- a/dist/base.css +++ b/dist/base.css @@ -1407,6 +1407,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, transform: rotate(45deg) scale(1) translate(-50%, -50%); content: ''; } +.bi-checkbox .checkbox-content.hover, +.bi-checkbox .checkbox-content:hover { + border-color: #3685f2; +} .bi-checkbox.active .checkbox-content, .bi-checkbox:active .checkbox-content { border-color: #3685f2; @@ -1417,28 +1421,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, opacity: 1; } .bi-checkbox.disabled .checkbox-content { - background-color: #d0d4da; + background-color: #F2F4F7; + border-color: #d0d4da; } .bi-checkbox.disabled .checkbox-content:after { opacity: 0; } .bi-checkbox.disabled.active .checkbox-content { - border-color: #d0d4da; + background-color: #d0d4da; } .bi-checkbox.disabled.active .checkbox-content:after { opacity: 1; } .bi-theme-dark .bi-checkbox .checkbox-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-checkbox .checkbox-content.hover, +.bi-theme-dark .bi-checkbox .checkbox-content:hover { + border-color: #3685f2; } .bi-theme-dark .bi-checkbox.active .checkbox-content, .bi-theme-dark .bi-checkbox:active .checkbox-content { border-color: #3685f2; } .bi-theme-dark .bi-checkbox.disabled .checkbox-content { - background-color: #606479; + background-color: #2F3149; } .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { + background-color: #606479; border-color: #606479; } .bi-file { @@ -1474,6 +1484,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, .bi-radio .radio-content:after { content: ""; } +.bi-radio .radio-content.hover, +.bi-radio .radio-content:hover { + border-color: #3685f2; +} .bi-radio:active .radio-content, .bi-radio.active .radio-content { border-color: #3685f2; @@ -1496,18 +1510,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); } +.bi-radio.disabled .radio-content { + background-color: #F2F4F7; + border-color: #d0d4da; +} .bi-radio.disabled .radio-content:after { background-color: transparent; } .bi-radio.disabled.active .radio-content { - border-color: #e8eaed; background-color: #d0d4da; } .bi-radio.disabled.active .radio-content:after { background-color: #ffffff; } .bi-theme-dark .bi-radio .radio-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-radio .radio-content.hover, +.bi-theme-dark .bi-radio .radio-content:hover { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.active .radio-content, +.bi-theme-dark .bi-radio:active .radio-content { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.disabled .radio-content { + background-color: #2F3149; +} +.bi-theme-dark .bi-radio.disabled .radio-content.hover, +.bi-theme-dark .bi-radio.disabled .radio-content:hover { + border-color: #878D9F; +} +.bi-theme-dark .bi-radio.disabled.active .radio-content { + background-color: #606479; + border-color: #606479; } .bi-label { overflow: hidden; diff --git a/dist/bundle.css b/dist/bundle.css index 40180856d1..a79c4483e5 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -3563,6 +3563,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, transform: rotate(45deg) scale(1) translate(-50%, -50%); content: ''; } +.bi-checkbox .checkbox-content.hover, +.bi-checkbox .checkbox-content:hover { + border-color: #3685f2; +} .bi-checkbox.active .checkbox-content, .bi-checkbox:active .checkbox-content { border-color: #3685f2; @@ -3573,28 +3577,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, opacity: 1; } .bi-checkbox.disabled .checkbox-content { - background-color: #d0d4da; + background-color: #F2F4F7; + border-color: #d0d4da; } .bi-checkbox.disabled .checkbox-content:after { opacity: 0; } .bi-checkbox.disabled.active .checkbox-content { - border-color: #d0d4da; + background-color: #d0d4da; } .bi-checkbox.disabled.active .checkbox-content:after { opacity: 1; } .bi-theme-dark .bi-checkbox .checkbox-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-checkbox .checkbox-content.hover, +.bi-theme-dark .bi-checkbox .checkbox-content:hover { + border-color: #3685f2; } .bi-theme-dark .bi-checkbox.active .checkbox-content, .bi-theme-dark .bi-checkbox:active .checkbox-content { border-color: #3685f2; } .bi-theme-dark .bi-checkbox.disabled .checkbox-content { - background-color: #606479; + background-color: #2F3149; } .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { + background-color: #606479; border-color: #606479; } .bi-file { @@ -3630,6 +3640,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, .bi-radio .radio-content:after { content: ""; } +.bi-radio .radio-content.hover, +.bi-radio .radio-content:hover { + border-color: #3685f2; +} .bi-radio:active .radio-content, .bi-radio.active .radio-content { border-color: #3685f2; @@ -3652,18 +3666,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); } +.bi-radio.disabled .radio-content { + background-color: #F2F4F7; + border-color: #d0d4da; +} .bi-radio.disabled .radio-content:after { background-color: transparent; } .bi-radio.disabled.active .radio-content { - border-color: #e8eaed; background-color: #d0d4da; } .bi-radio.disabled.active .radio-content:after { background-color: #ffffff; } .bi-theme-dark .bi-radio .radio-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-radio .radio-content.hover, +.bi-theme-dark .bi-radio .radio-content:hover { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.active .radio-content, +.bi-theme-dark .bi-radio:active .radio-content { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.disabled .radio-content { + background-color: #2F3149; +} +.bi-theme-dark .bi-radio.disabled .radio-content.hover, +.bi-theme-dark .bi-radio.disabled .radio-content:hover { + border-color: #878D9F; +} +.bi-theme-dark .bi-radio.disabled.active .radio-content { + background-color: #606479; + border-color: #606479; } .bi-label { overflow: hidden; diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 9abb3dee02..47f22c23aa 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -35377,7 +35377,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons context && defineContext(this, context); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); digest(this); @@ -35389,6 +35389,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { this.alive = false; allModelInstances[this._modelHashId] = null; @@ -59274,7 +59278,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { } function getFont(treeId, node) { - return node.font ? node.font : {color: "#999999"}; + return node.isLeaf ? {} : {color: "#999999"}; } return setting; @@ -59290,9 +59294,6 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")"; } } - if(node.isLeaf === true) { - node.font = {color: "#3d4d66"}; - } }); return nodes; }, diff --git a/dist/bundle.js b/dist/bundle.js index 7a4e470b19..447cd2584a 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -35788,7 +35788,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons childContext && defineContext(this, childContext); this.$$model && (this.model.__ob__ = this.$$model.__ob__); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); initWatch(this, watch$$1); @@ -35801,6 +35801,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { for (var _key3 in this._computedWatchers) { this._computedWatchers[_key3].teardown(); @@ -59678,7 +59682,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { } function getFont(treeId, node) { - return node.font ? node.font : {color: "#999999"}; + return node.isLeaf ? {} : {color: "#999999"}; } return setting; @@ -59694,9 +59698,6 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")"; } } - if(node.isLeaf === true) { - node.font = {color: "#3d4d66"}; - } }); return nodes; }, diff --git a/dist/case.js b/dist/case.js index 73989d8e56..22f93fdb74 100644 --- a/dist/case.js +++ b/dist/case.js @@ -9200,7 +9200,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { } function getFont(treeId, node) { - return node.font ? node.font : {color: "#999999"}; + return node.isLeaf ? {} : {color: "#999999"}; } return setting; @@ -9216,9 +9216,6 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")"; } } - if(node.isLeaf === true) { - node.font = {color: "#3d4d66"}; - } }); return nodes; }, diff --git a/dist/demo.js b/dist/demo.js index 9c93f09ebf..3e07f8eac9 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -2700,41 +2700,18 @@ BI.shortcut("demo.center", Demo.Center);Demo.TreeValueChooser = BI.inherit(BI.Wi render: function () { var widget = BI.createWidget({ - type: "bi.tree_value_chooser_insert_combo", + type: "bi.tree_value_chooser_combo", width: 300, // items: BI.deepClone(Demo.CONSTANTS.TREEITEMS), itemsCreator: function (op, callback) { callback(BI.deepClone(Demo.CONSTANTS.TREEITEMS)); } }); - var widget1 = BI.createWidget({ - type: "bi.list_tree_value_chooser_insert_combo", - itemsCreator: function (op, callback) { - callback(BI.deepClone(Demo.CONSTANTS.TREEITEMS)); - } - }); - widget.setValue({ - "中国": { - "安徽省": { - "安庆市": {} - } - }, - "newValue": {} - }); - widget1.setValue([ - ["中国", "安徽省"], - ["中国", "安徽省", "安庆市"], - ["newValue"] - ]); return { type: "bi.vertical", - items: [{ - type: "bi.vertical_adapt", - hgap: 200, - vgap: 10, - items: [widget, widget1] - }] - + hgap: 200, + vgap: 10, + items: [widget] }; } }); diff --git a/dist/fineui.css b/dist/fineui.css index 68d3fd3222..b69607745d 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -3563,6 +3563,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, transform: rotate(45deg) scale(1) translate(-50%, -50%); content: ''; } +.bi-checkbox .checkbox-content.hover, +.bi-checkbox .checkbox-content:hover { + border-color: #3685f2; +} .bi-checkbox.active .checkbox-content, .bi-checkbox:active .checkbox-content { border-color: #3685f2; @@ -3573,28 +3577,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, opacity: 1; } .bi-checkbox.disabled .checkbox-content { - background-color: #d0d4da; + background-color: #F2F4F7; + border-color: #d0d4da; } .bi-checkbox.disabled .checkbox-content:after { opacity: 0; } .bi-checkbox.disabled.active .checkbox-content { - border-color: #d0d4da; + background-color: #d0d4da; } .bi-checkbox.disabled.active .checkbox-content:after { opacity: 1; } .bi-theme-dark .bi-checkbox .checkbox-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-checkbox .checkbox-content.hover, +.bi-theme-dark .bi-checkbox .checkbox-content:hover { + border-color: #3685f2; } .bi-theme-dark .bi-checkbox.active .checkbox-content, .bi-theme-dark .bi-checkbox:active .checkbox-content { border-color: #3685f2; } .bi-theme-dark .bi-checkbox.disabled .checkbox-content { - background-color: #606479; + background-color: #2F3149; } .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { + background-color: #606479; border-color: #606479; } .bi-file { @@ -3630,6 +3640,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, .bi-radio .radio-content:after { content: ""; } +.bi-radio .radio-content.hover, +.bi-radio .radio-content:hover { + border-color: #3685f2; +} .bi-radio:active .radio-content, .bi-radio.active .radio-content { border-color: #3685f2; @@ -3652,18 +3666,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); } +.bi-radio.disabled .radio-content { + background-color: #F2F4F7; + border-color: #d0d4da; +} .bi-radio.disabled .radio-content:after { background-color: transparent; } .bi-radio.disabled.active .radio-content { - border-color: #e8eaed; background-color: #d0d4da; } .bi-radio.disabled.active .radio-content:after { background-color: #ffffff; } .bi-theme-dark .bi-radio .radio-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-radio .radio-content.hover, +.bi-theme-dark .bi-radio .radio-content:hover { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.active .radio-content, +.bi-theme-dark .bi-radio:active .radio-content { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.disabled .radio-content { + background-color: #2F3149; +} +.bi-theme-dark .bi-radio.disabled .radio-content.hover, +.bi-theme-dark .bi-radio.disabled .radio-content:hover { + border-color: #878D9F; +} +.bi-theme-dark .bi-radio.disabled.active .radio-content { + background-color: #606479; + border-color: #606479; } .bi-label { overflow: hidden; diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 0321f02b81..858de4ce08 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -35622,7 +35622,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons context && defineContext(this, context); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); digest(this); @@ -35634,6 +35634,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { this.alive = false; allModelInstances[this._modelHashId] = null; @@ -59519,7 +59523,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { } function getFont(treeId, node) { - return node.font ? node.font : {color: "#999999"}; + return node.isLeaf ? {} : {color: "#999999"}; } return setting; @@ -59535,9 +59539,6 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")"; } } - if(node.isLeaf === true) { - node.font = {color: "#3d4d66"}; - } }); return nodes; }, diff --git a/dist/fineui.js b/dist/fineui.js index aa8d4eb603..fc320ae738 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -36033,7 +36033,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons childContext && defineContext(this, childContext); this.$$model && (this.model.__ob__ = this.$$model.__ob__); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); initWatch(this, watch$$1); @@ -36046,6 +36046,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { for (var _key3 in this._computedWatchers) { this._computedWatchers[_key3].teardown(); @@ -59923,7 +59927,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { } function getFont(treeId, node) { - return node.font ? node.font : {color: "#999999"}; + return node.isLeaf ? {} : {color: "#999999"}; } return setting; @@ -59939,9 +59943,6 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, { node.text = node.value + "(" + BI.i18nText("BI-Basic_Altogether") + node.count + BI.i18nText("BI-Basic_Count") + ")"; } } - if(node.isLeaf === true) { - node.font = {color: "#3d4d66"}; - } }); return nodes; }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 5a94288994..1859128d11 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -24665,7 +24665,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons childContext && defineContext(this, childContext); this.$$model && (this.model.__ob__ = this.$$model.__ob__); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); initWatch(this, watch$$1); @@ -24678,6 +24678,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { for (var _key3 in this._computedWatchers) { this._computedWatchers[_key3].teardown(); diff --git a/dist/fix/fix.ie.js b/dist/fix/fix.ie.js index 087025623a..ef15a4338e 100644 --- a/dist/fix/fix.ie.js +++ b/dist/fix/fix.ie.js @@ -946,7 +946,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons context && defineContext(this, context); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); digest(this); @@ -958,6 +958,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { this.alive = false; allModelInstances[this._modelHashId] = null; diff --git a/dist/fix/fix.js b/dist/fix/fix.js index ceffe75002..a03ca648c1 100644 --- a/dist/fix/fix.js +++ b/dist/fix/fix.js @@ -1357,7 +1357,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons childContext && defineContext(this, childContext); this.$$model && (this.model.__ob__ = this.$$model.__ob__); initMixins(this, mixins); - this._init(); + this.init(); initState(this, state); initComputed(this, computed); initWatch(this, watch$$1); @@ -1370,6 +1370,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons Model.prototype._init = function _init() {}; + Model.prototype.init = function init() { + this._init(); + }; + Model.prototype.destroy = function destroy() { for (var _key3 in this._computedWatchers) { this._computedWatchers[_key3].teardown(); diff --git a/src/css/base/single/input/checkbox.css b/src/css/base/single/input/checkbox.css index 2a86e0f7ce..52cea77b5a 100644 --- a/src/css/base/single/input/checkbox.css +++ b/src/css/base/single/input/checkbox.css @@ -21,6 +21,10 @@ transform: rotate(45deg) scale(1) translate(-50%, -50%); content: ''; } +.bi-checkbox .checkbox-content.hover, +.bi-checkbox .checkbox-content:hover { + border-color: #3685f2; +} .bi-checkbox.active .checkbox-content, .bi-checkbox:active .checkbox-content { border-color: #3685f2; @@ -31,27 +35,33 @@ opacity: 1; } .bi-checkbox.disabled .checkbox-content { - background-color: #d0d4da; + background-color: #F2F4F7; + border-color: #d0d4da; } .bi-checkbox.disabled .checkbox-content:after { opacity: 0; } .bi-checkbox.disabled.active .checkbox-content { - border-color: #d0d4da; + background-color: #d0d4da; } .bi-checkbox.disabled.active .checkbox-content:after { opacity: 1; } .bi-theme-dark .bi-checkbox .checkbox-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-checkbox .checkbox-content.hover, +.bi-theme-dark .bi-checkbox .checkbox-content:hover { + border-color: #3685f2; } .bi-theme-dark .bi-checkbox.active .checkbox-content, .bi-theme-dark .bi-checkbox:active .checkbox-content { border-color: #3685f2; } .bi-theme-dark .bi-checkbox.disabled .checkbox-content { - background-color: #606479; + background-color: #2F3149; } .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { + background-color: #606479; border-color: #606479; } diff --git a/src/css/base/single/input/radio.css b/src/css/base/single/input/radio.css index 0ff5e347df..e664f56341 100644 --- a/src/css/base/single/input/radio.css +++ b/src/css/base/single/input/radio.css @@ -7,6 +7,10 @@ .bi-radio .radio-content:after { content: ""; } +.bi-radio .radio-content.hover, +.bi-radio .radio-content:hover { + border-color: #3685f2; +} .bi-radio:active .radio-content, .bi-radio.active .radio-content { border-color: #3685f2; @@ -29,16 +33,38 @@ -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); } +.bi-radio.disabled .radio-content { + background-color: #F2F4F7; + border-color: #d0d4da; +} .bi-radio.disabled .radio-content:after { background-color: transparent; } .bi-radio.disabled.active .radio-content { - border-color: #e8eaed; background-color: #d0d4da; } .bi-radio.disabled.active .radio-content:after { background-color: #ffffff; } .bi-theme-dark .bi-radio .radio-content { - border-color: #9EA6B2; + border-color: #878D9F; +} +.bi-theme-dark .bi-radio .radio-content.hover, +.bi-theme-dark .bi-radio .radio-content:hover { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.active .radio-content, +.bi-theme-dark .bi-radio:active .radio-content { + border-color: #3685f2; +} +.bi-theme-dark .bi-radio.disabled .radio-content { + background-color: #2F3149; +} +.bi-theme-dark .bi-radio.disabled .radio-content.hover, +.bi-theme-dark .bi-radio.disabled .radio-content:hover { + border-color: #878D9F; +} +.bi-theme-dark .bi-radio.disabled.active .radio-content { + background-color: #606479; + border-color: #606479; } diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less index b032e36635..42fa02d8b4 100644 --- a/src/less/base/single/input/checkbox.less +++ b/src/less/base/single/input/checkbox.less @@ -17,6 +17,9 @@ .transform(rotate(45deg) scale(1) translate(-50%, -50%)); content: ''; } + &.hover, &:hover { + border-color: @color-bi-border-highlight; + } } &.active, &:active { & .checkbox-content{ @@ -29,15 +32,15 @@ } &.disabled { & .checkbox-content { - background-color: @color-bi-background-dark-gray; + background-color: @color-bi-background-disabled; + border-color: @color-bi-border-disabled; } & .checkbox-content:after { opacity: 0; } &.active { & .checkbox-content { - // 深浅主题下border-color是一样的 - border-color: @color-bi-border-disabled; + background-color: @color-bi-background-dark-gray; &:after { opacity: 1; } @@ -50,6 +53,9 @@ .bi-checkbox { & .checkbox-content { border-color: @color-bi-border-dark-line-theme-dark; + &.hover, &:hover { + border-color: @color-bi-border-highlight; + } } &.active, &:active { & .checkbox-content { @@ -58,10 +64,11 @@ } &.disabled { & .checkbox-content { - background-color: @color-bi-background-dark-gray-theme-dark; + background-color: @color-bi-background-disabled-theme-dark; } &.active { & .checkbox-content { + background-color: @color-bi-background-dark-gray-theme-dark; border-color: @color-bi-border-disabled-theme-dark; } } diff --git a/src/less/base/single/input/radio.less b/src/less/base/single/input/radio.less index bc7b443870..cf93efe641 100644 --- a/src/less/base/single/input/radio.less +++ b/src/less/base/single/input/radio.less @@ -7,6 +7,9 @@ &:after { content: ""; } + &.hover, &:hover { + border-color: @color-bi-border-highlight; + } } &:active, &.active { & .radio-content { @@ -25,13 +28,15 @@ } } &.disabled { + & .radio-content { + background-color: @color-bi-background-disabled; + border-color: @color-bi-border-disabled; + } & .radio-content:after { background-color: transparent; } &.active { & .radio-content { - // 深浅主题下border-color是一样的 - border-color: @color-bi-border-line; background-color: @color-bi-background-dark-gray; &:after { background-color: @color-bi-background-default; @@ -45,6 +50,28 @@ .bi-radio { & .radio-content { border-color: @color-bi-border-dark-line-theme-dark; + &.hover, &:hover { + border-color: @color-bi-border-highlight; + } + } + &.active, &:active { + & .radio-content { + border-color: @color-bi-border-highlight; + } + } + &.disabled { + & .radio-content { + background-color: @color-bi-background-disabled-theme-dark; + &.hover, &:hover { + border-color: @color-bi-border-dark-line-theme-dark; + } + } + &.active { + & .radio-content { + background-color: @color-bi-background-dark-gray-theme-dark; + border-color: @color-bi-border-disabled-theme-dark; + } + } } } } \ No newline at end of file diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 05e75bd0a2..671ec05399 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -86,7 +86,7 @@ @border-color-light-line: #f2f4f7; @border-color-light-line-theme-dark: #2F3149; @border-color-dark-line: #9EA6B2; -@border-color-dark-line-theme-dark: #9EA6B2; +@border-color-dark-line-theme-dark: #878D9F; @border-color-highlight: #3685f2; @border-color-warning: #fbb03b;