Browse Source

Pull request #288929: BI-154149 fix: 无法点击清空

Merge in DEC/fineui from ~JIMMY.CHAI/dec-fineui:feature/x to feature/x

* commit 'b88df2cebec3c3e9b8fb4eafc7047479b9233dae':
  BI-154149 fix: 无法点击清空
master
Jimmy.Chai-柴嘉明 3 months ago
parent
commit
90c334eb6b
  1. 4
      packages/fineui/src/widget/multiselect/multiselect.insert.combo.js
  2. 2
      packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
  3. 4
      packages/fineui/src/widget/multitree/multi.tree.combo.js
  4. 1
      packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts
  5. 1
      packages/fineui/typescript/widget/multitree/multi.tree.combo.ts

4
packages/fineui/src/widget/multiselect/multiselect.insert.combo.js

@ -56,6 +56,7 @@ export class MultiSelectInsertCombo extends Single {
static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW"; static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW";
static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW = "EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW";
_defaultConfig() { _defaultConfig() {
return extend(super._defaultConfig(...arguments), { return extend(super._defaultConfig(...arguments), {
@ -313,6 +314,9 @@ export class MultiSelectInsertCombo extends Single {
this.updateSelectedValue(self.storeValue); this.updateSelectedValue(self.storeValue);
self.fireEvent(MultiSelectInsertCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW); self.fireEvent(MultiSelectInsertCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW);
}); });
this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW, function() {
self.fireEvent(MultiSelectInsertCombo.EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW);
});
this.numberCounter.on(Events.VIEW, b => { this.numberCounter.on(Events.VIEW, b => {
nextTick(() => { nextTick(() => {

2
packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js

@ -9,6 +9,7 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
static EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE"; static EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";
static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
static EVENT_AFTER_POPUPVIEW = "EVENT_AFTER_POPUPVIEW";
static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
_defaultConfig() { _defaultConfig() {
@ -72,6 +73,7 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
const me = this; const me = this;
nextTick(() => { nextTick(() => {
me._populate(); me._populate();
self.fireEvent(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW);
}); });
}); });
} }

4
packages/fineui/src/widget/multitree/multi.tree.combo.js

@ -35,6 +35,7 @@ export class MultiTreeCombo extends Single {
static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW"; static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW";
static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW = "EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW";
_defaultConfig() { _defaultConfig() {
return extend(super._defaultConfig(...arguments), { return extend(super._defaultConfig(...arguments), {
@ -335,6 +336,9 @@ export class MultiTreeCombo extends Single {
this.fireEvent(MultiTreeCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW); this.fireEvent(MultiTreeCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW);
} }
); );
this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW, function() {
self.fireEvent(MultiTreeCombo.EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW);
});
this.numberCounter.on(Events.VIEW, b => { this.numberCounter.on(Events.VIEW, b => {
nextTick(() => { nextTick(() => {

1
packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts

@ -16,6 +16,7 @@ export declare class MultiSelectInsertCombo extends Single {
static EVENT_AFTER_HIDEVIEW: string; static EVENT_AFTER_HIDEVIEW: string;
static EVENT_BEFORE_POPUPVIEW: string; static EVENT_BEFORE_POPUPVIEW: string;
static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string; static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string;
static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW: string;
props: { props: {
itemsCreator?: Function; itemsCreator?: Function;

1
packages/fineui/typescript/widget/multitree/multi.tree.combo.ts

@ -13,6 +13,7 @@ export declare class MultiTreeCombo extends Single {
static EVENT_CONFIRM: string; static EVENT_CONFIRM: string;
static EVENT_BEFORE_POPUPVIEW: string; static EVENT_BEFORE_POPUPVIEW: string;
static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string; static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string;
static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW: string;
props: { props: {
popup?: any; popup?: any;

Loading…
Cancel
Save