Browse Source

Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6

es6
Treecat 2 years ago
parent
commit
9d6968c15a
  1. 3
      .gitignore
  2. 6
      packages/fineui/src/base/combination/group.button.js

3
.gitignore vendored

@ -2,4 +2,5 @@ node_modules
packages/demo/dist packages/demo/dist
packages/fineui/dist/* packages/fineui/dist/*
!packages/fineui/dist/font !packages/fineui/dist/font
!packages/fineui/dist/images !packages/fineui/dist/images
.idea/

6
packages/fineui/src/base/combination/group.button.js

@ -42,7 +42,7 @@ export class ButtonGroup extends Widget {
static xtype = "bi.button_group"; static xtype = "bi.button_group";
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";
static CHOOSE_TYPE_SINGLE = Selection.Single; static CHOOSE_TYPE_SINGLE = Selection.Single;
static CHOOSE_TYPE_MULTI = Selection.Multi; static CHOOSE_TYPE_MULTI = Selection.Multi;
static CHOOSE_TYPE_ALL = Selection.All; static CHOOSE_TYPE_ALL = Selection.All;
@ -86,8 +86,8 @@ export class ButtonGroup extends Widget {
this.setValue(newValue); this.setValue(newValue);
}) })
: value; : value;
if (isKey(value) || isNotEmptyArray(value)) { if (isKey(this.options.value) || isNotEmptyArray(this.options.value)) {
this.setValue(value); this.setValue(this.options.value);
} }
} }

Loading…
Cancel
Save