Merge remote-tracking branch 'origin/master' into bugfix

# Conflicts:
#	typescript/index.ts

dist/lib/base/combination/group.virtual.d.ts

@@ -0,0 +1,10 @@
+import { Widget } from '../../core/widget';
+export declare class VirtualGroup extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    addItems<T>(items: T[]): void;
+    prependItems<T>(items: T[]): void;
+    getNotSelectedValue<T>(): T[];
+    getValue<T>(): T[];
+    populate(items?: any, ...args: any[]): void;
+}

dist/lib/base/single/editor/editor.textarea.d.ts

@@ -0,0 +1,12 @@
+import { Single } from "../single";
+export declare class TextAreaEditor extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    focus(): void;
+    blur(): void;
+    setStyle(style: any): void;
+    getStyle(): any;
+    setWatermark(v: string): void;
+}

dist/lib/case/button/item.singleselect.d.ts

@@ -0,0 +1,7 @@
+import { BasicButton } from "../../base/single/button/button.basic";
+export declare class SingleSelectItem extends BasicButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    doRedMark(): void;
+    unRedMark(): void;
+}

dist/lib/component/allvaluechooser/abstract.allvaluechooser.d.ts

@@ -0,0 +1,13 @@
+import { Widget } from "../../core/widget";
+export declare class AbstractAllValueChooser extends Widget {
+    static xtype: string;
+    _valueFormatter(v: string | number): string;
+    _itemsCreator(options: any, callback: Function): void;
+    _assertValue(v: {
+        type: string;
+        value: any[];
+    }): {
+        type: string;
+        value: any[];
+    };
+}

dist/lib/component/allvaluechooser/combo.allvaluechooser.d.ts

@@ -0,0 +1,6 @@
+import { AbstractAllValueChooser } from "./abstract.allvaluechooser";
+export declare class AllValueChooserCombo extends AbstractAllValueChooser {
+    static xtype: string;
+    getAllValue(): any;
+    populate(...args: any[]): void;
+}

dist/lib/core/wrapper/layout/layout.grid.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from '../layout';
+export declare class GridLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/middle/middle.center.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from '../../layout';
+export declare class CenterLayout extends Layout {
+    static xtype: string;
+}

dist/lib/index.d.ts

@@ -76,6 +76,15 @@ import { MultiSelectCombo } from "./widget/multiselect/multiselect.combo";
 import { SearchEditor } from "./widget/editor/editor.search";
 import { MultiLayerSingleLevelTree } from "./widget/multilayersingletree/multilayersingletree.leveltree";
 import { SimpleColorChooser } from "./case/colorchooser/colorchooser.simple";
+import { AbstractAllValueChooser } from "./component/allvaluechooser/abstract.allvaluechooser";
+import { AllValueChooserCombo } from "./component/allvaluechooser/combo.allvaluechooser";
+import { TextAreaEditor } from "./base/single/editor/editor.textarea";
+import { SingleSelectItem } from "./case/button/item.singleselect";
+import { DynamicDateTimeCombo } from "./widget/dynamicdatetime/dynamicdatetime.combo";
+import { MultiTreeCombo } from "./widget/multitree/multi.tree.combo";
+import { CenterLayout } from "./core/wrapper/layout/middle/middle.center";
+import { VirtualGroup } from "./base/combination/group.virtual";
+import { GridLayout } from "./core/wrapper/layout/layout.grid";
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -162,9 +171,18 @@ export interface BI extends _func, _i18n, _base, _inject {
     SearchEditor: typeof SearchEditor;
     MultiLayerSingleLevelTree: typeof MultiLayerSingleLevelTree;
     SimpleColorChooser: typeof SimpleColorChooser;
+    AbstractAllValueChooser: typeof AbstractAllValueChooser;
+    AllValueChooserCombo: typeof AllValueChooserCombo;
+    TextAreaEditor: typeof TextAreaEditor;
+    SingleSelectItem: typeof SingleSelectItem;
+    DynamicDateTimeCombo: typeof DynamicDateTimeCombo;
+    MultiTreeCombo: typeof MultiTreeCombo;
+    CenterLayout: typeof CenterLayout;
+    VirtualGroup: typeof VirtualGroup;
+    GridLayout: typeof GridLayout;
 }
 declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { Widget, Single, BasicButton, Icon, LeftRightVerticalAdaptLayout, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, IconCombo, DynamicDateCombo, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, };
+export { Widget, Single, BasicButton, Icon, LeftRightVerticalAdaptLayout, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, IconCombo, DynamicDateCombo, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, };

dist/lib/widget/dynamicdatetime/dynamicdatetime.combo.d.ts

@@ -0,0 +1,18 @@
+import { Single } from "../../base/single/single";
+export declare class DynamicDateTimeCombo extends Single {
+    static xtype: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_CHANGE: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    static Static: 1;
+    static Dynamic: 2;
+    setMinDate(minDate: string): void;
+    setMaxDate(minDate: string): void;
+    getKey(): string;
+    hidePopupView(): void;
+}

dist/lib/widget/multitree/multi.tree.combo.d.ts

@@ -0,0 +1,13 @@
+import { Single } from "../../base/single/single";
+export declare class MultiTreeCombo extends Single {
+    static xytpe: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_STOP: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_CLICK_ITEM: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    showView(): void;
+    hideView(): void;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20201215135158",
+  "version": "2.0.20201215224144",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

src/less/base/combo/combo.bubble.less

@@ -3,10 +3,6 @@
 .bi-bubble-combo {
   & .button-combo-triangle-wrapper {
     position: fixed !important;
-    // -ms-device-fixed >= IE11
-    // 与fixed表现形式一致，区别在于浏览器缩放的时候，-ms-device-fixed的元素不受其影响，而fixed的元素受其影响
-    // 最重要的是-ms-device-fixed解决了IE11下的残影问题
-    position: -ms-device-fixed !important;
     // 消除祖先节点设置的line-height:normal对空白节点的行高影响
     line-height: 0;
     .z-index-layer(@zIndex-popup);

src/less/base/single/tip/tip.less

@@ -3,8 +3,4 @@
 
 .bi-tip{
   position: fixed !important;
-  // -ms-device-fixed >= IE11
-  // 与fixed表现形式一致，区别在于浏览器缩放的时候，-ms-device-fixed的元素不受其影响，而fixed的元素受其影响
-  // 最重要的是-ms-device-fixed解决了IE11下的残影问题
-  position: -ms-device-fixed !important;
 }

src/less/base/view/popupview.less

@@ -3,10 +3,6 @@
 /**********BI.BIListView*************/
 .bi-popup-view {
   position: fixed !important;
-  // -ms-device-fixed >= IE11
-  // 与fixed表现形式一致，区别在于浏览器缩放的时候，-ms-device-fixed的元素不受其影响，而fixed的元素受其影响
-  // 最重要的是-ms-device-fixed解决了IE11下的残影问题
-  position: -ms-device-fixed !important;
   overflow-y: visible !important;
   overflow-x: visible !important;
   overflow: visible !important;

typescript/base/combination/group.virtual.ts

@@ -0,0 +1,16 @@
+import { Widget } from '../../core/widget';
+
+export declare class VirtualGroup extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    
+    addItems<T>(items: T[]): void;
+
+    prependItems<T>(items: T[]): void;
+
+    getNotSelectedValue<T>(): T[];
+
+    getValue<T>(): T[];
+
+    populate(items?: any, ...args: any[]): void
+}

typescript/base/single/editor/editor.textarea.ts

@@ -0,0 +1,18 @@
+import { Single } from "../single";
+
+export declare class TextAreaEditor extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+
+    focus(): void;
+
+    blur(): void;
+
+    setStyle(style: any): void;
+
+    getStyle(): any;
+
+    setWatermark(v: string): void;
+}

typescript/case/button/item.singleselect.ts

@@ -0,0 +1,10 @@
+import { BasicButton } from "../../base/single/button/button.basic";
+
+export declare class SingleSelectItem extends BasicButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    doRedMark(): void;
+
+    unRedMark(): void;
+}

typescript/component/allvaluechooser/abstract.allvaluechooser.ts

@@ -0,0 +1,17 @@
+import { Widget } from "../../core/widget";
+
+export declare class AbstractAllValueChooser extends Widget {
+    static xtype: string;
+
+    _valueFormatter(v: string | number): string;
+    
+    _itemsCreator(options: any, callback: Function): void;
+
+    _assertValue(v: {
+        type: string;
+        value: any[];
+    }): {
+        type: string;
+        value: any[];
+    }
+}

typescript/component/allvaluechooser/combo.allvaluechooser.ts

@@ -0,0 +1,9 @@
+import { AbstractAllValueChooser } from "./abstract.allvaluechooser";
+
+export declare class AllValueChooserCombo extends AbstractAllValueChooser {
+    static xtype: string;
+
+    getAllValue(): any;
+
+    populate(...args: any[]): void;
+}

typescript/core/wrapper/layout/layout.grid.ts

@@ -0,0 +1,5 @@
+import { Layout } from '../layout';
+
+export declare class GridLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/middle/middle.center.ts

@@ -0,0 +1,5 @@
+import { Layout } from '../../layout';
+
+export declare class CenterLayout extends Layout {
+    static xtype: string;
+}

typescript/index.ts

@@ -83,6 +83,15 @@ import { Loader } from "./base/combination/loader";
 import { ListPane } from "./case/layer/pane.list";
 import { MultiSelectBar } from "./case/toolbar/toolbar.multiselect";
 import { SelectList } from "./case/list/list.select";
+import { AbstractAllValueChooser } from "./component/allvaluechooser/abstract.allvaluechooser";
+import { AllValueChooserCombo } from "./component/allvaluechooser/combo.allvaluechooser";
+import { TextAreaEditor } from "./base/single/editor/editor.textarea";
+import { SingleSelectItem } from "./case/button/item.singleselect";
+import { DynamicDateTimeCombo } from "./widget/dynamicdatetime/dynamicdatetime.combo";
+import { MultiTreeCombo } from "./widget/multitree/multi.tree.combo";
+import { CenterLayout } from "./core/wrapper/layout/middle/middle.center";
+import { VirtualGroup } from "./base/combination/group.virtual";
+import { GridLayout } from "./core/wrapper/layout/layout.grid";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -179,6 +188,15 @@ export interface BI extends _func, _i18n, _base, _inject {
     SearchEditor: typeof SearchEditor;
     MultiLayerSingleLevelTree: typeof MultiLayerSingleLevelTree;
     SimpleColorChooser: typeof SimpleColorChooser;
+    AbstractAllValueChooser: typeof AbstractAllValueChooser;
+    AllValueChooserCombo: typeof AllValueChooserCombo;
+    TextAreaEditor: typeof TextAreaEditor;
+    SingleSelectItem: typeof SingleSelectItem;
+    DynamicDateTimeCombo: typeof DynamicDateTimeCombo;
+    MultiTreeCombo: typeof MultiTreeCombo;
+    CenterLayout: typeof CenterLayout;
+    VirtualGroup: typeof VirtualGroup;
+    GridLayout: typeof GridLayout;
 }
 
 export default {
@@ -249,4 +267,13 @@ export {
     Pane,
     MultiLayerSingleLevelTree,
     SimpleColorChooser,
+    AbstractAllValueChooser,
+    AllValueChooserCombo,
+    TextAreaEditor,
+    SingleSelectItem,
+    DynamicDateTimeCombo,
+    MultiTreeCombo,
+    CenterLayout,
+    VirtualGroup,
+    GridLayout,
 };

typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts

@@ -0,0 +1,24 @@
+import { Single } from "../../base/single/single";
+
+export declare class DynamicDateTimeCombo extends Single {
+    static xtype: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_CHANGE: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    static Static: 1;
+    static Dynamic: 2;
+
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(minDate: string): void;
+
+    getKey(): string;
+
+    hidePopupView(): void;
+}

typescript/widget/multitree/multi.tree.combo.ts

@@ -0,0 +1,15 @@
+import { Single } from "../../base/single/single";
+
+export declare class MultiTreeCombo extends Single {
+    static xytpe: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_STOP: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_CLICK_ITEM: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+
+    showView(): void;
+    hideView(): void;
+}