Browse Source

Merge pull request #269185 in DEC/fineui from master to feature/x

* commit '5596d9424ab9b78deb6ffe496272ab1892bec398':
  Revert "BI-145126 fix: DownListCombo的isDefaultInit默认值设置为false"
  BI-145829 fix: DownListCombo,getValue方法在popupView未创建时,取options.value
research/test
superman 8 months ago
parent
commit
33fa94a1bb
  1. 10
      packages/fineui/src/widget/downlist/combo.downlist.js

10
packages/fineui/src/widget/downlist/combo.downlist.js

@ -1,4 +1,4 @@
import { cloneDeep, createWidget, each, extend, isArray, shortcut, some, Widget } from "@/core"; import { cloneDeep, createWidget, each, extend, isArray, isNull, shortcut, some, Widget } from "@/core";
import { DownListPopup } from "./popup.downlist"; import { DownListPopup } from "./popup.downlist";
import { Combo } from "@/base"; import { Combo } from "@/base";
import { IconTrigger } from "@/case"; import { IconTrigger } from "@/case";
@ -52,7 +52,7 @@ export class DownListCombo extends Widget {
minWidth: 140, minWidth: 140,
maxHeight: 1000, maxHeight: 1000,
destroyWhenHide: false, destroyWhenHide: false,
isDefaultInit: false, isDefaultInit: true,
}); });
} }
@ -134,7 +134,11 @@ export class DownListCombo extends Widget {
} }
getValue() { getValue() {
return this.popupView.getValue(); if (isNull(this.popupView)) {
return this.options.value;
} else {
return this.popupView.getValue();
}
} }
adjustWidth() { adjustWidth() {

Loading…
Cancel
Save