Browse Source

Pull request #3515: KERNEL-15104 chore:代码同步

Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6

* commit '33cfd6aea8c015d74898d5e4f025c62a6afe5340':
  REPORT-94935 fix:isArray没有被引入
  KERNEL-15104 chore:代码同步
es6
treecat-罗群 2 years ago
parent
commit
003b034581
  1. 1
      packages/fineui/src/case/combo/textvaluecombo/combo.textvaluesmall.js
  2. 16
      packages/fineui/src/case/combo/textvaluecombo/popup.textvalue.js
  3. 2
      packages/fineui/src/core/func/alias.js

1
packages/fineui/src/case/combo/textvaluecombo/combo.textvaluesmall.js

@ -33,6 +33,7 @@ export class SmallTextValueCombo extends Widget {
type: SmallSelectTextTrigger.xtype, type: SmallSelectTextTrigger.xtype,
...o.el, ...o.el,
}, },
items: o.items,
text: o.text, text: o.text,
value: o.value, value: o.value,
defaultText: o.defaultText, defaultText: o.defaultText,

16
packages/fineui/src/case/combo/textvaluecombo/popup.textvalue.js

@ -39,17 +39,21 @@ export class TextValueComboPopup extends Pane {
vgap: 5, vgap: 5,
items: [ items: [
{ {
type: ButtonGroup.xtype, type: ListPane.xtype,
ref: _ref => { ref: _ref => {
this.popup = _ref; this.popup = _ref;
}, },
items: this._formatItems(o.items), items: this._formatItems(o.items),
chooseType: o.chooseType, chooseType: o.chooseType,
layouts: [ el: {
{ type: ButtonGroup.xtype,
type: VerticalLayout.xtype, chooseType: o.chooseType,
} layouts: [
], {
type: VerticalLayout.xtype,
}
],
},
value: o.value, value: o.value,
listeners: [ listeners: [
{ {

2
packages/fineui/src/core/func/alias.js

@ -1,4 +1,4 @@
import { each, isFunction, isNull, isObject, isPlainObject, keys, leftPad, parseDateTime, values } from "../2.base"; import { each, isFunction, isNull, isObject, isPlainObject, keys, leftPad, parseDateTime, values, isArray } from "../2.base";
import { replaceAll } from "./string"; import { replaceAll } from "./string";
import { getFullDayName, getMonthName, getTimezone } from "./date"; import { getFullDayName, getMonthName, getTimezone } from "./date";
import { _global } from "../0.foundation"; import { _global } from "../0.foundation";

Loading…
Cancel
Save