Browse Source

Merge pull request #242430 in DEC/fineui from release/11.0 to bugfix/11.0

* commit 'e1971e9654d3440848951de5aa49da65e0a5ed91':
  无jira 扩展运算符补正
  REPORT-101145 fix:新前端-视图树控件-设置不可用后还是能选中选项
research/test
superman 1 year ago
parent
commit
1f87677d99
  1. 4
      packages/fineui/src/base/combination/expander.js
  2. 4
      packages/fineui/src/base/combination/group.button.js
  3. 2
      packages/fineui/src/base/combination/loader.js
  4. 2
      packages/fineui/src/base/combination/navigation.js
  5. 2
      packages/fineui/src/base/combination/switcher.js
  6. 2
      packages/fineui/src/base/combination/tab.js
  7. 2
      packages/fineui/src/base/single/0.single.js
  8. 2
      packages/fineui/src/base/single/button/button.basic.js
  9. 2
      packages/fineui/src/base/single/editor/editor.textarea.js
  10. 2
      packages/fineui/src/base/single/input/checkbox/checkbox.js
  11. 2
      packages/fineui/src/base/single/input/file.js
  12. 2
      packages/fineui/src/base/single/input/input.js
  13. 2
      packages/fineui/src/base/single/input/radio/radio.image.js
  14. 2
      packages/fineui/src/base/single/input/radio/radio.js
  15. 2
      packages/fineui/src/core/controller/controller.masker.js
  16. 2
      packages/fineui/src/core/loader/loader.style.js

4
packages/fineui/src/base/combination/expander.js

@ -276,7 +276,7 @@ export class Expander extends Widget {
} }
_setEnable(arg) { _setEnable(arg) {
super._setEnable(arguments); super._setEnable(...arguments);
!arg && this.element.removeClass(this.options.hoverClass); !arg && this.element.removeClass(this.options.hoverClass);
!arg && this.isViewVisible() && this._hideView(); !arg && this.isViewVisible() && this._hideView();
} }
@ -341,6 +341,6 @@ export class Expander extends Widget {
} }
destroy() { destroy() {
super.destroy(arguments); super.destroy(...arguments);
} }
} }

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

@ -418,12 +418,12 @@ export class ButtonGroup extends Widget {
} }
empty() { empty() {
super.empty(arguments); super.empty(...arguments);
this.options.items = []; this.options.items = [];
} }
destroy() { destroy() {
super.destroy(arguments); super.destroy(...arguments);
this.options.items = []; this.options.items = [];
} }
} }

2
packages/fineui/src/base/combination/loader.js

@ -342,6 +342,6 @@ export class Loader extends Widget {
} }
destroy() { destroy() {
super.destroy(arguments); super.destroy(...arguments);
} }
} }

2
packages/fineui/src/base/combination/navigation.js

@ -191,6 +191,6 @@ export class Navigation extends Widget {
} }
destroy() { destroy() {
super.destroy(arguments); super.destroy(...arguments);
} }
} }

2
packages/fineui/src/base/combination/switcher.js

@ -263,7 +263,7 @@ export class Switcher extends Widget {
} }
_setEnable(arg) { _setEnable(arg) {
super._setEnable(arguments); super._setEnable(...arguments);
!arg && this.isViewVisible() && this._hideView(); !arg && this.isViewVisible() && this._hideView();
} }

2
packages/fineui/src/base/combination/tab.js

@ -200,6 +200,6 @@ export class Tab extends Widget {
destroy() { destroy() {
this.cardMap = {}; this.cardMap = {};
super.destroy(arguments); super.destroy(...arguments);
} }
} }

2
packages/fineui/src/base/single/0.single.js

@ -72,7 +72,7 @@ export class Single extends Widget {
this.setValue(newValue); this.setValue(newValue);
}) })
: value; : value;
super._init(arguments); super._init(...arguments);
} }
_mounted() { _mounted() {

2
packages/fineui/src/base/single/button/button.basic.js

@ -69,7 +69,7 @@ export class BasicButton extends Single {
this.setSelected(newValue); this.setSelected(newValue);
}) })
: opts.selected; : opts.selected;
super._init(arguments); super._init(...arguments);
if (opts.shadow) { if (opts.shadow) {
this._createShadow(); this._createShadow();

2
packages/fineui/src/base/single/editor/editor.textarea.js

@ -279,7 +279,7 @@ export class TextAreaEditor extends Single {
} }
_setValid(b) { _setValid(b) {
super._setValid(arguments); super._setValid(...arguments);
// this.content.setValid(b); // this.content.setValid(b);
// this.watermark && this.watermark.setValid(b); // this.watermark && this.watermark.setValid(b);
} }

2
packages/fineui/src/base/single/input/checkbox/checkbox.js

@ -52,7 +52,7 @@ export class Checkbox extends BasicButton {
} }
doClick() { doClick() {
super.doClick(arguments); super.doClick(...arguments);
if (this.isValid()) { if (this.isValid()) {
this.fireEvent(Checkbox.EVENT_CHANGE); this.fireEvent(Checkbox.EVENT_CHANGE);
} }

2
packages/fineui/src/base/single/input/file.js

@ -759,7 +759,7 @@ export class File extends Widget {
} }
_setEnable(enable) { _setEnable(enable) {
super._setEnable(arguments); super._setEnable(...arguments);
if (enable === true) { if (enable === true) {
this.element.removeAttr("disabled"); this.element.removeAttr("disabled");
} else { } else {

2
packages/fineui/src/base/single/input/input.js

@ -344,7 +344,7 @@ export class Input extends Single {
} }
_setValid() { _setValid() {
super._setValid(arguments); super._setValid(...arguments);
if (this.isValid()) { if (this.isValid()) {
this._lastChangedValue = this.getValue(); this._lastChangedValue = this.getValue();
this.element.removeClass("bi-input-error"); this.element.removeClass("bi-input-error");

2
packages/fineui/src/base/single/input/radio/radio.image.js

@ -28,7 +28,7 @@ export class ImageRadio extends IconButton {
} }
doClick() { doClick() {
super.doClick(arguments); super.doClick(...arguments);
if (this.isValid()) { if (this.isValid()) {
this.fireEvent(ImageRadio.EVENT_CHANGE); this.fireEvent(ImageRadio.EVENT_CHANGE);
} }

2
packages/fineui/src/base/single/input/radio/radio.js

@ -51,7 +51,7 @@ export class Radio extends BasicButton {
} }
doClick() { doClick() {
super.doClick(arguments); super.doClick(...arguments);
if (this.isValid()) { if (this.isValid()) {
this.fireEvent(Radio.EVENT_CHANGE); this.fireEvent(Radio.EVENT_CHANGE);
} }

2
packages/fineui/src/core/controller/controller.masker.js

@ -12,7 +12,7 @@ export class MaskersController extends LayerController {
} }
init() { init() {
super.init(arguments); super.init(...arguments);
this.zindex = zIndex_masker; this.zindex = zIndex_masker;
} }
} }

2
packages/fineui/src/core/loader/loader.style.js

@ -13,7 +13,7 @@ export class StyleLoaderManager extends OB {
} }
_init() { _init() {
super._init(arguments); super._init(...arguments);
this.stylesManager = {}; this.stylesManager = {};
} }

Loading…
Cancel
Save