Browse Source

Pull request #1885: KERNEL-7499 refactor:类型补充 & BI-81668 fix:补充提交

Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master

* commit '89398f7120480d03ddfaee6cb539aa9b1d501a71':
  BI-81668 fix:补充提交,多选与单选内部高度不一致
  KERNEL-7499 refactor:类型补充
es6
Claire.Tang 4 years ago
parent
commit
fae75583c3
  1. 2
      src/widget/singleselect/singleselect.insert.combo.js
  2. 20
      typescript/base/single/button/listitem/blankicontextitem.ts
  3. 13
      typescript/case/colorchooser/colorchooser.popup.hex.ts
  4. 6
      typescript/index.ts

2
src/widget/singleselect/singleselect.insert.combo.js

@ -29,7 +29,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({
type: "bi.single_select_trigger",
height: o.height,
height: o.height - 2,
allowNoSelect: o.allowNoSelect,
allowEdit: o.allowEdit,
// adapter: this.popup,

20
typescript/base/single/button/listitem/blankicontextitem.ts

@ -0,0 +1,20 @@
import { BasicButton } from "../button.basic";
export declare class BlankIconTextItem extends BasicButton {
static xtype: string;
static EVENT_CHANGE: string;
doClick(): void;
setValue(): void;
getValue(): string;
doRedMark(...args: any[]): void;
unRedMark(...args: any[]): void;
doHighLight(...args: any[]): void;
unHighLight(...args: any[]): void;
}

13
typescript/case/colorchooser/colorchooser.popup.hex.ts

@ -0,0 +1,13 @@
import { Widget } from '../../core/widget';
export declare class HexColorChooserPopup extends Widget {
static xtype: string;
static EVENT_CHANGE: string;
static EVENT_VALUE_CHANGE: string;
setStoreColors(v: string): void;
setValue(v: string): void;
getValue(): string;
}

6
typescript/index.ts

@ -156,6 +156,8 @@ import { History, Router } from "./router/router";
import { DateTimeCombo } from './widget/datetime/datetime.combo';
import { FloatHorizontalLayout } from "./core/wrapper/layout/adapt/float.horizontal";
import { AdaptiveLayout } from "./core/wrapper/layout/layout.adaptive";
import { HexColorChooserPopup } from './case/colorchooser/colorchooser.popup.hex';
import { BlankIconTextItem } from './base/single/button/listitem/blankicontextitem';
export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@ -318,6 +320,8 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
DateTimeCombo: typeof DateTimeCombo;
FloatHorizontalLayout: typeof FloatHorizontalLayout;
AdaptiveLayout: typeof AdaptiveLayout;
HexColorChooserPopup: typeof HexColorChooserPopup;
BlankIconTextItem: typeof BlankIconTextItem;
}
export default {
@ -482,4 +486,6 @@ export {
DateTimeCombo,
FloatHorizontalLayout,
AdaptiveLayout,
HexColorChooserPopup,
BlankIconTextItem,
};

Loading…
Cancel
Save