Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

es6
zsmj 3 years ago
parent
commit
d95f8c6b4c
  1. 2
      package.json
  2. 12
      src/core/4.widget.js
  3. 3
      src/less/base/tree/tree.expander.less

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20220309184345", "version": "2.0.20220310140337",
"description": "fineui", "description": "fineui",
"main": "dist/fineui.min.js", "main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

12
src/core/4.widget.js

@ -570,12 +570,12 @@
throw new Error("组件:组件名已存在,不能进行添加"); throw new Error("组件:组件名已存在,不能进行添加");
} }
widget._setParent && widget._setParent(this); widget._setParent && widget._setParent(this);
// if(!this.isEnabled()){ if (this.options.disabled) {
// widget._setEnable(false); widget.options && (widget.options.disabled = true);
// } }
// if(!this.isValid()){ if (this.options.invalid) {
// widget._setValid(false); widget.options && (widget.options.invalid = true);
// } }
widget.on(BI.Events.DESTROY, function () { widget.on(BI.Events.DESTROY, function () {
BI.remove(self._children, this); BI.remove(self._children, this);
}); });

3
src/less/base/tree/tree.expander.less

@ -13,6 +13,9 @@
} }
.bi-theme-dark { .bi-theme-dark {
.bi-tree-expander-popup.line:before {
border-left: 1px dashed @color-bi-border-tree-expander-popup-line-theme-dark;
}
.bi-tree-expander-popup.line.solid:before { .bi-tree-expander-popup.line.solid:before {
border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark; border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark;
} }

Loading…
Cancel
Save