Browse Source

Merge pull request #908 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'eac758e7873b5c3895e4e8a8a84483450de16378':
  BI-44506 && BI-44489 fix init 和 checkbox出视觉了调整下
master
windy 6 years ago
parent
commit
330abcff32
  1. 48
      dist/2.0/fineui.css
  2. 11
      dist/2.0/fineui.ie.js
  3. 11
      dist/2.0/fineui.js
  4. 48
      dist/base.css
  5. 48
      dist/bundle.css
  6. 11
      dist/bundle.ie.js
  7. 11
      dist/bundle.js
  8. 5
      dist/case.js
  9. 31
      dist/demo.js
  10. 48
      dist/fineui.css
  11. 11
      dist/fineui.ie.js
  12. 11
      dist/fineui.js
  13. 6
      dist/fineui_without_jquery_polyfill.js
  14. 6
      dist/fix/fix.ie.js
  15. 6
      dist/fix/fix.js
  16. 18
      src/css/base/single/input/checkbox.css
  17. 30
      src/css/base/single/input/radio.css
  18. 15
      src/less/base/single/input/checkbox.less
  19. 31
      src/less/base/single/input/radio.less
  20. 2
      src/less/lib/constant.less

48
dist/2.0/fineui.css vendored

@ -3563,6 +3563,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox .checkbox-content.hover,
.bi-checkbox .checkbox-content:hover {
border-color: #3685f2;
}
.bi-checkbox.active .checkbox-content, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-content { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
@ -3573,28 +3577,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-content { .bi-checkbox.disabled .checkbox-content {
background-color: #d0d4da; background-color: #F2F4F7;
border-color: #d0d4da;
} }
.bi-checkbox.disabled .checkbox-content:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-content { .bi-checkbox.disabled.active .checkbox-content {
border-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-content:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-content { .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,
.bi-theme-dark .bi-checkbox:active .checkbox-content { .bi-theme-dark .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-theme-dark .bi-checkbox.disabled .checkbox-content { .bi-theme-dark .bi-checkbox.disabled .checkbox-content {
background-color: #606479; background-color: #2F3149;
} }
.bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content {
background-color: #606479;
border-color: #606479; border-color: #606479;
} }
.bi-file { .bi-file {
@ -3630,6 +3640,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-radio .radio-content:after { .bi-radio .radio-content:after {
content: ""; content: "";
} }
.bi-radio .radio-content.hover,
.bi-radio .radio-content:hover {
border-color: #3685f2;
}
.bi-radio:active .radio-content, .bi-radio:active .radio-content,
.bi-radio.active .radio-content { .bi-radio.active .radio-content {
border-color: #3685f2; border-color: #3685f2;
@ -3652,18 +3666,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
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 { .bi-radio.disabled .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {
background-color: #ffffff; background-color: #ffffff;
} }
.bi-theme-dark .bi-radio .radio-content { .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 { .bi-label {
overflow: hidden; overflow: hidden;

11
dist/2.0/fineui.ie.js vendored

@ -35377,7 +35377,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
context && defineContext(this, context); context && defineContext(this, context);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
digest(this); digest(this);
@ -35389,6 +35389,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
Model.prototype._init = function _init() {}; Model.prototype._init = function _init() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
this.alive = false; this.alive = false;
allModelInstances[this._modelHashId] = null; allModelInstances[this._modelHashId] = null;
@ -59274,7 +59278,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, {
} }
function getFont(treeId, node) { function getFont(treeId, node) {
return node.font ? node.font : {color: "#999999"}; return node.isLeaf ? {} : {color: "#999999"};
} }
return setting; 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") + ")"; 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; return nodes;
}, },

11
dist/2.0/fineui.js vendored

@ -35788,7 +35788,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
childContext && defineContext(this, childContext); childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); 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() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
for (var _key3 in this._computedWatchers) { for (var _key3 in this._computedWatchers) {
this._computedWatchers[_key3].teardown(); this._computedWatchers[_key3].teardown();
@ -59678,7 +59682,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, {
} }
function getFont(treeId, node) { function getFont(treeId, node) {
return node.font ? node.font : {color: "#999999"}; return node.isLeaf ? {} : {color: "#999999"};
} }
return setting; 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") + ")"; 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; return nodes;
}, },

48
dist/base.css vendored

@ -1407,6 +1407,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox .checkbox-content.hover,
.bi-checkbox .checkbox-content:hover {
border-color: #3685f2;
}
.bi-checkbox.active .checkbox-content, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-content { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
@ -1417,28 +1421,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-content { .bi-checkbox.disabled .checkbox-content {
background-color: #d0d4da; background-color: #F2F4F7;
border-color: #d0d4da;
} }
.bi-checkbox.disabled .checkbox-content:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-content { .bi-checkbox.disabled.active .checkbox-content {
border-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-content:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-content { .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,
.bi-theme-dark .bi-checkbox:active .checkbox-content { .bi-theme-dark .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-theme-dark .bi-checkbox.disabled .checkbox-content { .bi-theme-dark .bi-checkbox.disabled .checkbox-content {
background-color: #606479; background-color: #2F3149;
} }
.bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content {
background-color: #606479;
border-color: #606479; border-color: #606479;
} }
.bi-file { .bi-file {
@ -1474,6 +1484,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-radio .radio-content:after { .bi-radio .radio-content:after {
content: ""; content: "";
} }
.bi-radio .radio-content.hover,
.bi-radio .radio-content:hover {
border-color: #3685f2;
}
.bi-radio:active .radio-content, .bi-radio:active .radio-content,
.bi-radio.active .radio-content { .bi-radio.active .radio-content {
border-color: #3685f2; border-color: #3685f2;
@ -1496,18 +1510,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
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 { .bi-radio.disabled .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {
background-color: #ffffff; background-color: #ffffff;
} }
.bi-theme-dark .bi-radio .radio-content { .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 { .bi-label {
overflow: hidden; overflow: hidden;

48
dist/bundle.css vendored

@ -3563,6 +3563,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox .checkbox-content.hover,
.bi-checkbox .checkbox-content:hover {
border-color: #3685f2;
}
.bi-checkbox.active .checkbox-content, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-content { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
@ -3573,28 +3577,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-content { .bi-checkbox.disabled .checkbox-content {
background-color: #d0d4da; background-color: #F2F4F7;
border-color: #d0d4da;
} }
.bi-checkbox.disabled .checkbox-content:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-content { .bi-checkbox.disabled.active .checkbox-content {
border-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-content:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-content { .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,
.bi-theme-dark .bi-checkbox:active .checkbox-content { .bi-theme-dark .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-theme-dark .bi-checkbox.disabled .checkbox-content { .bi-theme-dark .bi-checkbox.disabled .checkbox-content {
background-color: #606479; background-color: #2F3149;
} }
.bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content {
background-color: #606479;
border-color: #606479; border-color: #606479;
} }
.bi-file { .bi-file {
@ -3630,6 +3640,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-radio .radio-content:after { .bi-radio .radio-content:after {
content: ""; content: "";
} }
.bi-radio .radio-content.hover,
.bi-radio .radio-content:hover {
border-color: #3685f2;
}
.bi-radio:active .radio-content, .bi-radio:active .radio-content,
.bi-radio.active .radio-content { .bi-radio.active .radio-content {
border-color: #3685f2; border-color: #3685f2;
@ -3652,18 +3666,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
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 { .bi-radio.disabled .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {
background-color: #ffffff; background-color: #ffffff;
} }
.bi-theme-dark .bi-radio .radio-content { .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 { .bi-label {
overflow: hidden; overflow: hidden;

11
dist/bundle.ie.js vendored

@ -35377,7 +35377,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
context && defineContext(this, context); context && defineContext(this, context);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
digest(this); digest(this);
@ -35389,6 +35389,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
Model.prototype._init = function _init() {}; Model.prototype._init = function _init() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
this.alive = false; this.alive = false;
allModelInstances[this._modelHashId] = null; allModelInstances[this._modelHashId] = null;
@ -59274,7 +59278,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, {
} }
function getFont(treeId, node) { function getFont(treeId, node) {
return node.font ? node.font : {color: "#999999"}; return node.isLeaf ? {} : {color: "#999999"};
} }
return setting; 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") + ")"; 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; return nodes;
}, },

11
dist/bundle.js vendored

@ -35788,7 +35788,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
childContext && defineContext(this, childContext); childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); 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() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
for (var _key3 in this._computedWatchers) { for (var _key3 in this._computedWatchers) {
this._computedWatchers[_key3].teardown(); this._computedWatchers[_key3].teardown();
@ -59678,7 +59682,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, {
} }
function getFont(treeId, node) { function getFont(treeId, node) {
return node.font ? node.font : {color: "#999999"}; return node.isLeaf ? {} : {color: "#999999"};
} }
return setting; 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") + ")"; 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; return nodes;
}, },

5
dist/case.js vendored

@ -9200,7 +9200,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, {
} }
function getFont(treeId, node) { function getFont(treeId, node) {
return node.font ? node.font : {color: "#999999"}; return node.isLeaf ? {} : {color: "#999999"};
} }
return setting; 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") + ")"; 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; return nodes;
}, },

31
dist/demo.js vendored

@ -2700,41 +2700,18 @@ BI.shortcut("demo.center", Demo.Center);Demo.TreeValueChooser = BI.inherit(BI.Wi
render: function () { render: function () {
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.tree_value_chooser_insert_combo", type: "bi.tree_value_chooser_combo",
width: 300, width: 300,
// items: BI.deepClone(Demo.CONSTANTS.TREEITEMS), // items: BI.deepClone(Demo.CONSTANTS.TREEITEMS),
itemsCreator: function (op, callback) { itemsCreator: function (op, callback) {
callback(BI.deepClone(Demo.CONSTANTS.TREEITEMS)); 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 { return {
type: "bi.vertical", type: "bi.vertical",
items: [{ hgap: 200,
type: "bi.vertical_adapt", vgap: 10,
hgap: 200, items: [widget]
vgap: 10,
items: [widget, widget1]
}]
}; };
} }
}); });

48
dist/fineui.css vendored

@ -3563,6 +3563,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox .checkbox-content.hover,
.bi-checkbox .checkbox-content:hover {
border-color: #3685f2;
}
.bi-checkbox.active .checkbox-content, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-content { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
@ -3573,28 +3577,34 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-content { .bi-checkbox.disabled .checkbox-content {
background-color: #d0d4da; background-color: #F2F4F7;
border-color: #d0d4da;
} }
.bi-checkbox.disabled .checkbox-content:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-content { .bi-checkbox.disabled.active .checkbox-content {
border-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-content:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-content { .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,
.bi-theme-dark .bi-checkbox:active .checkbox-content { .bi-theme-dark .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-theme-dark .bi-checkbox.disabled .checkbox-content { .bi-theme-dark .bi-checkbox.disabled .checkbox-content {
background-color: #606479; background-color: #2F3149;
} }
.bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content {
background-color: #606479;
border-color: #606479; border-color: #606479;
} }
.bi-file { .bi-file {
@ -3630,6 +3640,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-radio .radio-content:after { .bi-radio .radio-content:after {
content: ""; content: "";
} }
.bi-radio .radio-content.hover,
.bi-radio .radio-content:hover {
border-color: #3685f2;
}
.bi-radio:active .radio-content, .bi-radio:active .radio-content,
.bi-radio.active .radio-content { .bi-radio.active .radio-content {
border-color: #3685f2; border-color: #3685f2;
@ -3652,18 +3666,40 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
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 { .bi-radio.disabled .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {
background-color: #ffffff; background-color: #ffffff;
} }
.bi-theme-dark .bi-radio .radio-content { .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 { .bi-label {
overflow: hidden; overflow: hidden;

11
dist/fineui.ie.js vendored

@ -35622,7 +35622,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
context && defineContext(this, context); context && defineContext(this, context);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
digest(this); digest(this);
@ -35634,6 +35634,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
Model.prototype._init = function _init() {}; Model.prototype._init = function _init() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
this.alive = false; this.alive = false;
allModelInstances[this._modelHashId] = null; allModelInstances[this._modelHashId] = null;
@ -59519,7 +59523,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, {
} }
function getFont(treeId, node) { function getFont(treeId, node) {
return node.font ? node.font : {color: "#999999"}; return node.isLeaf ? {} : {color: "#999999"};
} }
return setting; 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") + ")"; 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; return nodes;
}, },

11
dist/fineui.js vendored

@ -36033,7 +36033,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
childContext && defineContext(this, childContext); childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); 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() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
for (var _key3 in this._computedWatchers) { for (var _key3 in this._computedWatchers) {
this._computedWatchers[_key3].teardown(); this._computedWatchers[_key3].teardown();
@ -59923,7 +59927,7 @@ BI.ListDisplayTree = BI.inherit(BI.ListTreeView, {
} }
function getFont(treeId, node) { function getFont(treeId, node) {
return node.font ? node.font : {color: "#999999"}; return node.isLeaf ? {} : {color: "#999999"};
} }
return setting; 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") + ")"; 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; return nodes;
}, },

6
dist/fineui_without_jquery_polyfill.js vendored

@ -24665,7 +24665,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
childContext && defineContext(this, childContext); childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); 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() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
for (var _key3 in this._computedWatchers) { for (var _key3 in this._computedWatchers) {
this._computedWatchers[_key3].teardown(); this._computedWatchers[_key3].teardown();

6
dist/fix/fix.ie.js vendored

@ -946,7 +946,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
context && defineContext(this, context); context && defineContext(this, context);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
digest(this); digest(this);
@ -958,6 +958,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
Model.prototype._init = function _init() {}; Model.prototype._init = function _init() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
this.alive = false; this.alive = false;
allModelInstances[this._modelHashId] = null; allModelInstances[this._modelHashId] = null;

6
dist/fix/fix.js vendored

@ -1357,7 +1357,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
childContext && defineContext(this, childContext); childContext && defineContext(this, childContext);
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
initMixins(this, mixins); initMixins(this, mixins);
this._init(); this.init();
initState(this, state); initState(this, state);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); 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() {};
Model.prototype.init = function init() {
this._init();
};
Model.prototype.destroy = function destroy() { Model.prototype.destroy = function destroy() {
for (var _key3 in this._computedWatchers) { for (var _key3 in this._computedWatchers) {
this._computedWatchers[_key3].teardown(); this._computedWatchers[_key3].teardown();

18
src/css/base/single/input/checkbox.css

@ -21,6 +21,10 @@
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox .checkbox-content.hover,
.bi-checkbox .checkbox-content:hover {
border-color: #3685f2;
}
.bi-checkbox.active .checkbox-content, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-content { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
@ -31,27 +35,33 @@
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-content { .bi-checkbox.disabled .checkbox-content {
background-color: #d0d4da; background-color: #F2F4F7;
border-color: #d0d4da;
} }
.bi-checkbox.disabled .checkbox-content:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-content { .bi-checkbox.disabled.active .checkbox-content {
border-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-content:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-content { .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,
.bi-theme-dark .bi-checkbox:active .checkbox-content { .bi-theme-dark .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-theme-dark .bi-checkbox.disabled .checkbox-content { .bi-theme-dark .bi-checkbox.disabled .checkbox-content {
background-color: #606479; background-color: #2F3149;
} }
.bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content {
background-color: #606479;
border-color: #606479; border-color: #606479;
} }

30
src/css/base/single/input/radio.css

@ -7,6 +7,10 @@
.bi-radio .radio-content:after { .bi-radio .radio-content:after {
content: ""; content: "";
} }
.bi-radio .radio-content.hover,
.bi-radio .radio-content:hover {
border-color: #3685f2;
}
.bi-radio:active .radio-content, .bi-radio:active .radio-content,
.bi-radio.active .radio-content { .bi-radio.active .radio-content {
border-color: #3685f2; border-color: #3685f2;
@ -29,16 +33,38 @@
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
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 { .bi-radio.disabled .radio-content:after {
background-color: transparent; background-color: transparent;
} }
.bi-radio.disabled.active .radio-content { .bi-radio.disabled.active .radio-content {
border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-radio.disabled.active .radio-content:after { .bi-radio.disabled.active .radio-content:after {
background-color: #ffffff; background-color: #ffffff;
} }
.bi-theme-dark .bi-radio .radio-content { .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;
} }

15
src/less/base/single/input/checkbox.less

@ -17,6 +17,9 @@
.transform(rotate(45deg) scale(1) translate(-50%, -50%)); .transform(rotate(45deg) scale(1) translate(-50%, -50%));
content: ''; content: '';
} }
&.hover, &:hover {
border-color: @color-bi-border-highlight;
}
} }
&.active, &:active { &.active, &:active {
& .checkbox-content{ & .checkbox-content{
@ -29,15 +32,15 @@
} }
&.disabled { &.disabled {
& .checkbox-content { & .checkbox-content {
background-color: @color-bi-background-dark-gray; background-color: @color-bi-background-disabled;
border-color: @color-bi-border-disabled;
} }
& .checkbox-content:after { & .checkbox-content:after {
opacity: 0; opacity: 0;
} }
&.active { &.active {
& .checkbox-content { & .checkbox-content {
// 深浅主题下border-color是一样的 background-color: @color-bi-background-dark-gray;
border-color: @color-bi-border-disabled;
&:after { &:after {
opacity: 1; opacity: 1;
} }
@ -50,6 +53,9 @@
.bi-checkbox { .bi-checkbox {
& .checkbox-content { & .checkbox-content {
border-color: @color-bi-border-dark-line-theme-dark; border-color: @color-bi-border-dark-line-theme-dark;
&.hover, &:hover {
border-color: @color-bi-border-highlight;
}
} }
&.active, &:active { &.active, &:active {
& .checkbox-content { & .checkbox-content {
@ -58,10 +64,11 @@
} }
&.disabled { &.disabled {
& .checkbox-content { & .checkbox-content {
background-color: @color-bi-background-dark-gray-theme-dark; background-color: @color-bi-background-disabled-theme-dark;
} }
&.active { &.active {
& .checkbox-content { & .checkbox-content {
background-color: @color-bi-background-dark-gray-theme-dark;
border-color: @color-bi-border-disabled-theme-dark; border-color: @color-bi-border-disabled-theme-dark;
} }
} }

31
src/less/base/single/input/radio.less

@ -7,6 +7,9 @@
&:after { &:after {
content: ""; content: "";
} }
&.hover, &:hover {
border-color: @color-bi-border-highlight;
}
} }
&:active, &.active { &:active, &.active {
& .radio-content { & .radio-content {
@ -25,13 +28,15 @@
} }
} }
&.disabled { &.disabled {
& .radio-content {
background-color: @color-bi-background-disabled;
border-color: @color-bi-border-disabled;
}
& .radio-content:after { & .radio-content:after {
background-color: transparent; background-color: transparent;
} }
&.active { &.active {
& .radio-content { & .radio-content {
// 深浅主题下border-color是一样的
border-color: @color-bi-border-line;
background-color: @color-bi-background-dark-gray; background-color: @color-bi-background-dark-gray;
&:after { &:after {
background-color: @color-bi-background-default; background-color: @color-bi-background-default;
@ -45,6 +50,28 @@
.bi-radio { .bi-radio {
& .radio-content { & .radio-content {
border-color: @color-bi-border-dark-line-theme-dark; 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;
}
}
} }
} }
} }

2
src/less/lib/constant.less

@ -86,7 +86,7 @@
@border-color-light-line: #f2f4f7; @border-color-light-line: #f2f4f7;
@border-color-light-line-theme-dark: #2F3149; @border-color-light-line-theme-dark: #2F3149;
@border-color-dark-line: #9EA6B2; @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-highlight: #3685f2;
@border-color-warning: #fbb03b; @border-color-warning: #fbb03b;

Loading…
Cancel
Save