Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6

# Conflicts:
#	packages/fineui/typescript/core/var.ts

packages/demo/src/center.js

@@ -1,6 +1,6 @@
-import { shortcut, Widget, RouterView, Router } from '@fui/core';
+import { Decorators , Widget, RouterView, Router } from '@fui/core';
 
-@shortcut()
+@Decorators.shortcut()
 export class Center extends Widget {
     static xtype = 'demo.center';
 
@@ -15,7 +15,7 @@ export class Center extends Widget {
     }
 }
 
-@shortcut()
+@Decorators.shortcut()
 export class RouterDemo extends Widget {
     static xtype = 'demo.router';
 

packages/demo/src/demo/base/button/demo.button.js

@@ -1,8 +1,8 @@
 
-import { Button, TextButton, FloatLeftLayout, shortcut, Widget, parseInt, Msg, map } from "@fui/core"
+import { Button, TextButton, FloatLeftLayout, Decorators, Widget, parseInt, Msg, map } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ButtonDemo extends Widget {
     static xtype = "demo.button";
 

packages/demo/src/demo/base/button/demo.icon_button.js

@@ -1,8 +1,8 @@
 
-import { IconButton, FloatLeftLayout, shortcut, Widget } from "@fui/core"
+import { IconButton, FloatLeftLayout, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class IconButtonDemo extends Widget {
     static xtype = "demo.icon_button";
 

packages/demo/src/demo/base/button/demo.image_button.js

@@ -1,8 +1,8 @@
 
-import { ImageButton, FloatLeftLayout, shortcut, Widget } from "@fui/core"
+import { ImageButton, FloatLeftLayout, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ImageButtonDemo extends Widget {
     static xtype = "demo.image_button";
 
@@ -19,7 +19,7 @@ export class ImageButtonDemo extends Widget {
                 },
             }
         ];
-        
+
         return {
             type: FloatLeftLayout.xtype,
             vgap: 200,

packages/demo/src/demo/base/button/demo.text_button.js

@@ -1,8 +1,8 @@
 
-import { TextButton, FloatLeftLayout, shortcut, Widget } from "@fui/core"
+import { TextButton, FloatLeftLayout, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class TextButtonDemo extends Widget {
     static xtype = "demo.text_button";
 

packages/demo/src/demo/base/demo.html.js

@@ -1,6 +1,6 @@
-import { shortcut, Widget, VerticalLayout, Html } from "@fui/core";
+import { Decorators, Widget, VerticalLayout, Html } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class HtmlDemo extends Widget {
     static xtype = "demo.html";
 

packages/demo/src/demo/base/demo.icon_label.js

@@ -1,6 +1,6 @@
-import { DefaultLayout, Label, IconLabel, shortcut, Widget } from "@fui/core";
+import { DefaultLayout, Label, IconLabel, Decorators, Widget } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class IconLabelDemo extends Widget {
     static xtype = "demo.icon_label";
 

packages/demo/src/demo/base/demo.label.js

@@ -1,12 +1,12 @@
 import {
     VerticalLayout,
     FloatLeftLayout,
-    shortcut,
+    Decorators,
     Widget,
     Label
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class LabelDemo extends Widget {
     static xtype = "demo.label";
 

packages/demo/src/demo/base/demo.label.scene.js

@@ -1,12 +1,12 @@
 import {
     Label,
     AbsoluteLayout,
-    shortcut,
+    Decorators,
     Widget,
     VerticalLayout
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class LabelSceneDemo extends Widget {
     static xtype = "demo.label_scene";
 

packages/demo/src/demo/base/demo.message.js

@@ -1,6 +1,6 @@
-import { shortcut, Widget, Msg, CenterAdaptLayout, Button } from "@fui/core";
+import { Decorators,  Widget, Msg, CenterAdaptLayout, Button } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class MessageDemo extends Widget {
     static xtype = "demo.message";
 

packages/demo/src/demo/base/demo.pager.js

@@ -1,6 +1,6 @@
-import { VerticalLayout, Label, shortcut, Widget, Pager } from "@fui/core";
+import { VerticalLayout, Label, Decorators, Widget, Pager } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class FuncDemo extends Widget {
     static xtype = "demo.pager";
 

packages/demo/src/demo/base/editor/demo.editor.js

@@ -1,9 +1,9 @@
 
-import { Editor, AbsoluteLayout, Button, shortcut, Widget, createWidget, Editor as BIEditor } from "@fui/core"
+import { Editor, AbsoluteLayout, Button, Decorators, Widget, createWidget, Editor as BIEditor } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class EditorDemo extends Widget {
     static xtype = "demo.editor";
 

packages/demo/src/demo/base/editor/demo.multifile_editor.js

@@ -1,8 +1,8 @@
 
-import { AbsoluteLayout, AdaptiveLayout, MultifileEditor, shortcut, Widget } from "@fui/core"
+import { AbsoluteLayout, AdaptiveLayout, MultifileEditor, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class CodeEditorDemo extends Widget {
     static xtype = "demo.multifile_editor";
 

packages/demo/src/demo/base/editor/demo.textarea_editor.js

@@ -1,9 +1,9 @@
 
-import { TextAreaEditor, VerticalLayout, Button, shortcut, Widget, createWidget, isNotEmptyString, Msg } from "@fui/core"
+import { TextAreaEditor, VerticalLayout, Button, Decorators, Widget, createWidget, isNotEmptyString, Msg } from "@fui/core"
 
 
- 
-@shortcut()
+
+@Decorators.shortcut()
 export class TextareaEditorDemo extends Widget {
     static xtype = "demo.textarea_editor";
 

packages/demo/src/demo/base/tip/demo.bubble.js

@@ -1,8 +1,8 @@
 
-import { Button, FloatLeftLayout, shortcut, Widget, Bubbles } from "@fui/core"
+import { Button, FloatLeftLayout, Decorators, Widget, Bubbles } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class BubbleDemo extends Widget {
     static xtype = "demo.bubble";
 

packages/demo/src/demo/base/tip/demo.title.js

@@ -1,8 +1,8 @@
 
-import { VerticalLayout, Label, shortcut, Widget } from "@fui/core"
+import { VerticalLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class TitleDemo extends Widget {
     static xtype = "demo.title";
 

packages/demo/src/demo/base/tip/demo.toast.js

@@ -1,9 +1,9 @@
 
-import { Button, FloatLeftLayout, shortcut, Widget, createWidget, Msg } from "@fui/core"
+import { Button, FloatLeftLayout, Decorators, Widget, createWidget, Msg } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ToastDemo extends Widget {
     static xtype = "demo.toast";
 

packages/demo/src/demo/base/tree/demo.part_tree.js

@@ -1,9 +1,9 @@
 
-import { VTapeLayout, Label, PartTree, shortcut, Widget, isNull, TreeView } from "@fui/core"
+import { VTapeLayout, Label, PartTree, Decorators, Widget, isNull, TreeView } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class PartTreeDemo extends Widget {
     static xtype = "demo.part_tree";
 

packages/demo/src/demo/base/tree/demo.sync_tree.js

@@ -1,8 +1,8 @@
 
-import { VTapeLayout, Label, AsyncTree, shortcut, Widget, isNull } from "@fui/core"
+import { VTapeLayout, Label, AsyncTree, Decorators, Widget, isNull } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class SyncTreeDemo extends Widget {
     static xtype = "demo.sync_tree";
 

packages/demo/src/demo/base/tree/demo.tree_view.js

@@ -1,8 +1,8 @@
 
-import { TreeView, GridLayout, VTapeLayout, Label, shortcut, Widget, createWidget } from "@fui/core"
+import { TreeView, GridLayout, VTapeLayout, Label, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class FuncDemo extends Widget {
     static xtype = "demo.tree_view";
 

packages/demo/src/demo/case/combo/demo.bubble_combo.js

@@ -6,13 +6,13 @@ import {
     VerticalLayout,
     TextBubblePopupBarView,
     AbsoluteLayout,
-    shortcut,
+    Decorators,
     Widget,
     createWidget,
     makeArray
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class BubbleComboDemo extends Widget {
     static xtype = "demo.bubble_combo";
 

packages/demo/src/demo/case/combo/demo.editor_icon_check_combo.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAutoLayout, EditorIconCheckCombo, Button, shortcut, Widget } from "@fui/core"
+import { HorizontalAutoLayout, EditorIconCheckCombo, Button, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class EditorIconCheckComboDemo extends Widget {
     static xtype = "demo.editor_icon_check_combo";
 

packages/demo/src/demo/case/combo/demo.icon_combo.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAutoLayout, IconCombo, shortcut, Widget } from "@fui/core"
+import { HorizontalAutoLayout, IconCombo, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class IconComboDemo extends Widget {
     static xtype = "demo.icon_combo";
 

packages/demo/src/demo/case/combo/demo.icon_text_value_combo.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAutoLayout, IconTextValueCombo, shortcut, Widget } from "@fui/core"
+import { HorizontalAutoLayout, IconTextValueCombo, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class IconTextValueComboDemo extends Widget {
     static xtype = "demo.icon_text_value_combo";
 

packages/demo/src/demo/case/combo/demo.search_text_value_combo.js

@@ -4,12 +4,12 @@ import {
     SearchTextValueCombo,
     AllValueMultiTextValueCombo,
     Button,
-    shortcut,
+    Decorators,
     Widget,
     Msg
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class SearchTextValueComboDemo extends Widget {
     static xtype = "demo.search_text_value_combo";
 

packages/demo/src/demo/case/combo/demo.text_value_combo.js

@@ -3,14 +3,14 @@ import {
     TextValueCombo,
     Button,
     Label,
-    shortcut,
+    Decorators,
     Selection,
     Widget
 } from "@fui/core";
 /**
  * Created by Dailer on 2017/7/11.
  */
-@shortcut()
+@Decorators.shortcut()
 export class TextValueComboDemo extends Widget {
     static xtype = "demo.text_value_combo";
 

packages/demo/src/demo/case/combo/demo.text_value_down_list_combo.js

@@ -1,9 +1,9 @@
 
-import { HorizontalAutoLayout, TextValueDownListCombo, Button, shortcut, Widget, Msg } from "@fui/core"
+import { HorizontalAutoLayout, TextValueDownListCombo, Button, Decorators, Widget, Msg } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class TextValueDownListComboDemo extends Widget {
     static xtype = "demo.text_value_down_list_combo";
 

packages/demo/src/demo/case/combo/demo.text_vlaue_check_combo.js

@@ -1,9 +1,9 @@
 
-import { Msg, HorizontalAutoLayout, TextValueCheckCombo, Button, shortcut, Widget } from "@fui/core"
+import { Msg, HorizontalAutoLayout, TextValueCheckCombo, Button, Decorators, Widget } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class TextValueCheckComboDemo extends Widget {
     static xtype = "demo.text_value_check_combo";
 
@@ -11,7 +11,7 @@ export class TextValueCheckComboDemo extends Widget {
 
     render() {
         const self = this;
-        
+
         return {
             type: HorizontalAutoLayout.xtype,
             items: [

packages/demo/src/demo/case/demo.calendar.js

@@ -1,8 +1,8 @@
 
-import { Calendar, shortcut, Widget } from "@fui/core"
+import { Calendar, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class CalendarDemo extends Widget {
     static xtype = "demo.calendar";
 

packages/demo/src/demo/case/demo.click.effect.js

@@ -1,8 +1,8 @@
 
-import { VerticalLayout, IconTextItem, shortcut, Widget, createItems } from "@fui/core"
+import { VerticalLayout, IconTextItem, Decorators, Widget, createItems } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ClickItemEffectDemo extends Widget {
     static xtype = "demo.click_item_effect";
 

packages/demo/src/demo/case/demo.color_chooser.js

@@ -1,8 +1,8 @@
 
-import { AbsoluteLayout, ColorChooser, SimpleColorChooser, shortcut, Widget } from "@fui/core"
+import { AbsoluteLayout, ColorChooser, SimpleColorChooser, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ColorChooserDemo extends Widget {
     static xtype = "demo.color_chooser";
 

packages/demo/src/demo/case/demo.color_chooser_popup.js

@@ -1,8 +1,8 @@
 
-import { AbsoluteLayout, ColorChooserPopup, SimpleColorChooserPopup, shortcut, Widget } from "@fui/core"
+import { AbsoluteLayout, ColorChooserPopup, SimpleColorChooserPopup, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ColorChooserPopupDemo extends Widget {
     static xtype = "demo.color_chooser_popup";
 

packages/demo/src/demo/case/demo.segment.js

@@ -1,8 +1,8 @@
 
-import { HorizontalLayout, Segment, shortcut, Widget, createWidget } from "@fui/core"
+import { HorizontalLayout, Segment, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class SegmentDemo extends Widget {
     static xtype = "demo.segment";
 

packages/demo/src/demo/case/editor/demo.clear_editor.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAutoLayout, ClearEditor, shortcut, Widget } from "@fui/core"
+import { HorizontalAutoLayout, ClearEditor, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ClearEditorDemo extends Widget {
     static xtype = "demo.clear_editor";
 

packages/demo/src/demo/case/editor/demo.shelter_editor.js

@@ -1,8 +1,8 @@
 
-import { ShelterEditor, VerticalLayout, AbsoluteLayout, Button, shortcut, Widget, createWidget } from "@fui/core"
+import { ShelterEditor, VerticalLayout, AbsoluteLayout, Button, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ShelterEditorDemo extends Widget {
     static xtype = "demo.shelter_editor";
 

packages/demo/src/demo/case/editor/demo.sign_editor.js

@@ -1,8 +1,8 @@
 
-import { SignEditor, VerticalLayout, shortcut, Widget, createWidget } from "@fui/core"
+import { SignEditor, VerticalLayout, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class SignEditorDemo extends Widget {
     static xtype = "demo.sign_editor";
 

packages/demo/src/demo/case/editor/demo.simple_state_editor.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAdaptLayout, SimpleStateEditor, shortcut, Widget } from "@fui/core"
+import { HorizontalAdaptLayout, SimpleStateEditor, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class SimpleStateEditorDemo extends Widget {
     static xtype = "demo.simple_state_editor";
 

packages/demo/src/demo/case/editor/demo.state_editor.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAdaptLayout, StateEditor, shortcut, Widget } from "@fui/core"
+import { HorizontalAdaptLayout, StateEditor, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class StateEditorDemo extends Widget {
     static xtype = "demo.state_editor";
 

packages/demo/src/demo/case/item/demo.multi_select_item.js

@@ -1,8 +1,8 @@
 
-import { VerticalLayout, Label, MultiSelectItem, shortcut, Widget } from "@fui/core"
+import { VerticalLayout, Label, MultiSelectItem, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class MultiSelectItemDemo extends Widget {
     static xtype = "demo.multi_select_item";
 

packages/demo/src/demo/case/item/demo.single_select_item.js

@@ -1,8 +1,8 @@
 
-import { VerticalLayout, Label, SingleSelectItem, shortcut, Widget } from "@fui/core"
+import { VerticalLayout, Label, SingleSelectItem, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class SingleSelectItemDemo extends Widget {
     static xtype = "demo.single_select_item";
 

packages/demo/src/demo/case/item/demo.single_select_radio_item.js

@@ -2,11 +2,11 @@ import {
     VerticalLayout,
     Label,
     SingleSelectRadioItem,
-    shortcut,
+    Decorators,
     Widget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class SingleSelectRadioItemDemo extends Widget {
     static xtype = "demo.single_select_radio_item";
 

packages/demo/src/demo/case/list/demo.lazy_loader.js

@@ -3,14 +3,14 @@ import {
     LazyLoader,
     FloatLeftLayout,
     Button,
-    shortcut,
+    Decorators,
     Widget,
     createWidget,
     createItems,
     deepClone
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class LazyLoaderDemo extends Widget {
     static xtype = "demo.lazy_loader";
 

packages/demo/src/demo/case/list/demo.select_list.js

@@ -3,7 +3,7 @@ import {
     SelectList,
     MultiSelectBar,
     MultiSelectItem,
-    shortcut,
+    Decorators,
     Widget,
     createWidget,
     createItems,
@@ -11,7 +11,7 @@ import {
     Selection
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class SelectListDemo extends Widget {
     static xtype = "demo.select_list";
 

packages/demo/src/demo/case/pager/demo.all_count_pager.js

@@ -2,12 +2,12 @@ import {
     VerticalLayout,
     Label,
     AllCountPager,
-    shortcut,
+    Decorators,
     Widget,
     createWidget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class AllCountPagerDemo extends Widget {
     static xtype = "demo.all_count_pager";
 

packages/demo/src/demo/case/pager/demo.direction_pager.js

@@ -1,8 +1,8 @@
 
-import { VerticalLayout, DirectionPager, shortcut, Widget, createWidget } from "@fui/core"
+import { VerticalLayout, DirectionPager, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class DirectionPagerDemo extends Widget {
     static xtype = "demo.direction_pager";
 

packages/demo/src/demo/case/pane/demo.list_pane.js

@@ -4,13 +4,13 @@ import {
     MultiSelectItem,
     ButtonGroup,
     VerticalLayout,
-    shortcut,
+    Decorators,
     Widget,
     createItems,
     deepClone
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class ListPaneDemo extends Widget {
     static xtype = "demo.list_pane";
 

packages/demo/src/demo/case/pane/demo.multi_popup_view.js

@@ -7,13 +7,13 @@ import {
     ButtonGroup,
     VerticalLayout,
     MultiSelectItem,
-    shortcut,
+    Decorators,
     Widget,
     createItems,
     deepClone
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class MultiPopupViewDemo extends Widget {
     static xtype = "demo.multi_popup_view";
 

packages/demo/src/demo/case/pane/demo.panel.js

@@ -5,13 +5,13 @@ import {
     ButtonGroup,
     VerticalLayout,
     MultiSelectItem,
-    shortcut,
+    Decorators,
     Widget,
     createItems,
     deepClone
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class PanelDemo extends Widget {
     static xtype = "demo.panel";
 

packages/demo/src/demo/case/pane/demo.popup_panel.js

@@ -7,13 +7,13 @@ import {
     ButtonGroup,
     VerticalLayout,
     MultiSelectItem,
-    shortcut,
+    Decorators,
     Widget,
     createItems,
     deepClone
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class PopupPanelDemo extends Widget {
     static xtype = "demo.popup_panel";
 

packages/demo/src/demo/case/tree/demo.display_tree.js

@@ -1,8 +1,8 @@
 
-import { DisplayTree, shortcut, Widget, createWidget } from "@fui/core"
+import { DisplayTree, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class DisplayTreeDemo extends Widget {
     static xtype = "demo.display_tree";
 

packages/demo/src/demo/case/tree/demo.level_tree.js

@@ -1,9 +1,9 @@
 
-import { createWidget, Msg, LevelTree, VTapeLayout, Button, shortcut, Widget } from "@fui/core"
+import { createWidget, Msg, LevelTree, VTapeLayout, Button, Decorators, Widget } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class LevelTreeDemo extends Widget {
     static xtype = "demo.level_tree";
 

packages/demo/src/demo/case/tree/demo.simple_tree.js

@@ -2,13 +2,13 @@ import {
     SimpleTreeView,
     VTapeLayout,
     Button,
-    shortcut,
+    Decorators,
     Widget,
     createWidget,
     Msg
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class SimpleTreeDemo extends Widget {
     static xtype = "demo.simple_tree";
 

packages/demo/src/demo/case/triggers/demo.editor_trigger.js

@@ -2,12 +2,12 @@ import {
     VerticalLayout,
     Label,
     EditorTrigger,
-    shortcut,
+    Decorators,
     Widget,
     createWidget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class EditorTriggerDemo extends Widget {
     static xtype = "demo.editor_trigger";
 

packages/demo/src/demo/case/triggers/demo.icon_trigger.js

@@ -2,12 +2,12 @@ import {
     VerticalLayout,
     Label,
     IconTrigger,
-    shortcut,
+    Decorators,
     Widget,
     createWidget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class IconTriggerDemo extends Widget {
     static xtype = "demo.icon_trigger";
 

packages/demo/src/demo/case/triggers/demo.select_text_trigger.js

@@ -2,12 +2,12 @@ import {
     VerticalLayout,
     Label,
     SelectTextTrigger,
-    shortcut,
+    Decorators,
     Widget,
     createWidget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class SelectTextTriggerDemo extends Widget {
     static xtype = "demo.select_text_trigger";
 

packages/demo/src/demo/case/triggers/demo.text_trigger.js

@@ -2,12 +2,12 @@ import {
     VerticalLayout,
     Label,
     TextTrigger,
-    shortcut,
+    Decorators,
     Widget,
     createWidget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class TextTriggerDemo extends Widget {
     static xtype = "demo.text_trigger";
 

packages/demo/src/demo/component/demo.form.js

@@ -1,8 +1,8 @@
 
-import { createWidget, isEmpty, isNotEmptyArray, Form, TextEditor, TextValueCombo, TextAreaEditor, VerticalLayout, Button, shortcut, Widget } from "@fui/core"
+import { createWidget, isEmpty, isNotEmptyArray, Form, TextEditor, TextValueCombo, TextAreaEditor, VerticalLayout, Button, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class FormDemo extends Widget {
     static xtype = "demo.form";
 

packages/demo/src/demo/component/demo.treevaluechoosercombo.js

@@ -1,9 +1,9 @@
 import { CONSTANTS } from "@/config/constant";
 
-import { TreeValueChooserCombo, VerticalLayout, shortcut, Widget, createWidget, deepClone } from "@fui/core"
+import { TreeValueChooserCombo, VerticalLayout, Decorators, Widget, createWidget, deepClone } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class TreeValueChooserDemo extends Widget {
     static xtype = "demo.tree_value_chooser_combo";
 

packages/demo/src/demo/component/demo.treevaluechooserpane.js

@@ -1,7 +1,7 @@
 import { CONSTANTS } from "@/config/constant";
-import { TreeValueChooserPane, shortcut, Widget, deepClone } from "@fui/core";
+import { TreeValueChooserPane, Decorators, Widget, deepClone } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class TreeValueChooserPaneDemo extends Widget {
     static xtype = "demo.tree_value_chooser_pane";
 

packages/demo/src/demo/component/demo.valuechoosercombo.js

@@ -1,9 +1,9 @@
 import { CONSTANTS } from "@/config/constant";
 
-import { ValueChooserCombo, VerticalLayout, shortcut, Widget, createWidget, deepClone } from "@fui/core"
+import { ValueChooserCombo, VerticalLayout, Decorators, Widget, createWidget, deepClone } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class ValueChooserComboDemo extends Widget {
     static xtype = "demo.value_chooser_combo";
 
@@ -16,7 +16,7 @@ export class ValueChooserComboDemo extends Widget {
                 callback(deepClone(CONSTANTS.ITEMS));
             },
         });
-        
+
         return {
             type: VerticalLayout.xtype,
             hgap: 200,

packages/demo/src/demo/component/demo.valuechooserpane.js

@@ -1,7 +1,7 @@
 import { CONSTANTS } from "@/config/constant";
-import { ValueChooserPane, shortcut, Widget, deepClone } from "@fui/core";
+import { ValueChooserPane, Decorators, Widget, deepClone } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class ValueChooserPaneDemo extends Widget {
     static xtype = "demo.value_chooser_pane";
 

packages/demo/src/demo/core/abstract/combination/demo.combo.js

@@ -1,9 +1,38 @@
+import {
+    ComboGroup,
+    IconTextIconItem,
+    SingleSelectItem,
+    Combo,
+    Button,
+    ButtonGroup,
+    Decorators,
+    SingleSelectRadioItem,
+    VerticalLayout,
+    MultiSelectItem,
+    Label,
+    MultiSelectBar,
+    TextButton,
+    Loader,
+    FloatLeftLayout,
+    ButtonTree,
+    AdaptiveLayout,
+    TableLayout,
+    AbsoluteLayout,
+    Navigation,
+    GridLayout,
+    Widget,
+    createWidget,
+    createItems,
+    deepClone,
+    map,
+    delay,
+    random,
+    makeArray,
+    Msg
+} from "@fui/core";
 
-import { ComboGroup, IconTextIconItem, SingleSelectItem, Combo, Button, ButtonGroup, SingleSelectRadioItem, VerticalLayout, MultiSelectItem, Label, MultiSelectBar, TextButton, Loader, FloatLeftLayout, ButtonTree, AdaptiveLayout, TableLayout, AbsoluteLayout, Navigation, GridLayout, shortcut, Widget, createWidget, createItems, deepClone, map, delay, random, makeArray, Msg } from "@fui/core"
 
-
-
-@shortcut()
+@Decorators.shortcut()
 export class ComboDemo extends Widget {
     static xtype = "demo.combo";
 
@@ -92,7 +121,8 @@ export class ComboDemo extends Widget {
                     items: createItems(deepClone(this.years), {
                         type: SingleSelectRadioItem.xtype,
                         height: 25,
-                        handler(v) {},
+                        handler(v) {
+                        },
                     }),
                     layouts: [
                         {
@@ -116,7 +146,8 @@ export class ComboDemo extends Widget {
                     items: createItems(deepClone(this.years), {
                         type: MultiSelectItem.xtype,
                         height: 25,
-                        handler(v) {},
+                        handler(v) {
+                        },
                     }),
                     chooseType: 1,
                     layouts: [
@@ -296,7 +327,8 @@ export class ComboDemo extends Widget {
                         type: SingleSelectItem.xtype,
                         iconWidth: 25,
                         height: 25,
-                        handler(v) {},
+                        handler(v) {
+                        },
                     }),
                     chooseType: 1,
                     layouts: [
@@ -323,7 +355,8 @@ export class ComboDemo extends Widget {
                     items: createItems(deepClone(this.child), {
                         type: SingleSelectItem.xtype,
                         height: 25,
-                        handler(v) {},
+                        handler(v) {
+                        },
                     }),
                     layouts: [
                         {
@@ -348,7 +381,8 @@ export class ComboDemo extends Widget {
                     items: createItems(deepClone(this.months), {
                         type: SingleSelectItem.xtype,
                         cls: "button-combo",
-                        handler(v) {},
+                        handler(v) {
+                        },
                     }),
                     layouts: [
                         {

packages/demo/src/demo/core/abstract/combination/demo.combo2.js

@@ -3,12 +3,12 @@ import {
     Combo,
     Layout,
     GridLayout,
-    shortcut,
     Widget,
-    createWidget
+    createWidget,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class Combo2Demo extends Widget {
     static xtype = "demo.combo2";
 

packages/demo/src/demo/core/abstract/combination/demo.combo3.js

@@ -3,12 +3,12 @@ import {
     Combo,
     Layout,
     GridLayout,
-    shortcut,
     Widget,
-    createWidget
+    createWidget,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class Combo3Demo extends Widget {
     static xtype = "demo.combo3";
 

packages/demo/src/demo/core/abstract/combination/demo.combo_group.js

@@ -8,14 +8,14 @@ import {
     VerticalLayout,
     FloatLeftLayout,
     GridLayout,
-    shortcut,
     Widget,
     createWidget,
     createItems,
-    deepClone
+    deepClone,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class ComboGroupDemo extends Widget {
     static xtype = "demo.combo.group";
 

packages/demo/src/demo/core/abstract/combination/demo.expander.js

@@ -3,12 +3,12 @@ import {
     Expander,
     IconTextNode,
     SingleSelectItem,
-    shortcut,
     Widget,
-    createItems
+    createItems,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class ExpanderDemo extends Widget {
     static xtype = "demo.expander";
 

packages/demo/src/demo/core/abstract/combination/demo.loader.js

@@ -1,7 +1,7 @@
-import { Loader, SingleSelectItem, shortcut, Widget, deepClone, map, extend } from '@fui/core';
+import { Loader,Decorators, SingleSelectItem, Widget, deepClone, map, extend } from '@fui/core';
 import { CONSTANTS } from '@/config/constant';
 
-@shortcut()
+@Decorators.shortcut()
 export class LoaderDemo extends Widget {
     static xtype = 'demo.loader';
 

packages/demo/src/demo/core/abstract/combination/demo.navigation.js

@@ -1,14 +1,14 @@
 import {
     Label,
     Navigation,
-    shortcut,
     Widget,
     createWidget,
     random,
-    bind
+    bind,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class NagvigationDemo extends Widget {
     static xtype = "demo.navigation";
 

packages/demo/src/demo/core/abstract/combination/demo.sercher.js

@@ -4,13 +4,13 @@ import {
     VerticalLayout,
     AbsoluteLayout,
     Searcher,
-    shortcut,
     Widget,
     createItems,
-    createWidget
+    createWidget,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class SearcherDemo extends Widget {
     static xtype = "demo.searcher";
 

packages/demo/src/demo/core/abstract/combination/demo.switcher.js

@@ -5,13 +5,13 @@ import {
     Switcher,
     Button,
     SingleSelectItem,
-    shortcut,
     Widget,
     createWidget,
-    createItems
+    createItems,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class SwitcherDemo extends Widget {
     static xtype = "demo.switcher";
 

packages/demo/src/demo/core/abstract/combination/demo.tab.js

@@ -5,13 +5,13 @@ import {
     HorizontalLayout,
     Tab,
     AbsoluteLayout,
-    shortcut,
     Widget,
     createWidget,
-    bind
+    bind,
+    Decorators
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class TabDemo extends Widget {
     static xtype = "demo.tab";
 

packages/demo/src/demo/core/abstract/demo.button_group.js

@@ -4,11 +4,11 @@ import {
     VTapeLayout,
     Label,
     Button,
-    shortcut,
+    Decorators,
     Widget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class ButtonGroupDemo extends Widget {
     static xtype = "demo.button_group";
 

packages/demo/src/demo/core/abstract/demo.button_tree.js

@@ -4,12 +4,12 @@ import {
     CenterAdaptLayout,
     Label,
     Button,
-    shortcut,
+    Decorators,
     Widget,
     ButtonGroup
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class ButtonTreeDemo extends Widget {
     static xtype = "demo.button_tree";
 

packages/demo/src/demo/core/abstract/demo.collection_view.js

@@ -2,12 +2,12 @@ import {
     Label,
     CollectionView,
     AbsoluteLayout,
-    shortcut,
+    Decorators,
     Widget,
     createWidget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class CollectionViewDemo extends Widget {
     static xtype = "demo.collection_view";
 

packages/demo/src/demo/core/abstract/demo.custom_tree.js

@@ -10,14 +10,14 @@ import {
     CenterLayout,
     TextButton,
     Label,
-    shortcut,
+    Decorators,
     Widget,
     createWidget,
     deepClone,
     Msg
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class CustomTreeDemo extends Widget {
     static xtype = "demo.custom_tree";
 

packages/demo/src/demo/core/abstract/demo.grid_view.js

@@ -3,12 +3,12 @@ import {
     GridView,
     AbsoluteLayout,
     GridLayout,
-    shortcut,
+    Decorators,
     Widget,
     createWidget
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class GridViewDemo extends Widget {
     static xtype = "demo.grid_view";
 

packages/demo/src/demo/core/abstract/demo.list_view.js

@@ -1,7 +1,7 @@
-import { ListView, FloatLeftLayout, Label, shortcut, Widget, map, extend } from '@fui/core';
+import { ListView, FloatLeftLayout, Label, Decorators, Widget, map, extend } from '@fui/core';
 import { CONSTANTS } from '@/config/constant';
 
-@shortcut()
+@Decorators.shortcut()
 export class ListViewDemo extends Widget {
     static xtype = 'demo.list_view';
 

packages/demo/src/demo/core/abstract/demo.virtual_group.js

@@ -4,14 +4,14 @@ import {
     ButtonGroup,
     Button,
     VirtualGroup,
-    shortcut,
+    Decorators,
     Widget,
     map,
     range,
     deepClone
 } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class VirtualGroupDemo extends Widget {
     static xtype = "demo.virtual_group";
 

packages/demo/src/demo/core/abstract/demo.virtual_group_item.js

@@ -1,6 +1,6 @@
-import { Label, shortcut, Widget, UUID } from "@fui/core";
+import { Label, Decorators, Widget, UUID } from "@fui/core";
 
-@shortcut()
+@Decorators.shortcut()
 export class VirtualGroupItemDemo extends Widget {
     static xtype = "demo.virtual_group_item";
 

packages/demo/src/demo/core/abstract/demo.virtual_list.js

@@ -1,7 +1,7 @@
-import { VirtualList, Label, shortcut, Widget, map, extend } from '@fui/core';
+import { VirtualList, Label, Decorators, Widget, map, extend } from '@fui/core';
 import { CONSTANTS } from '@/config/constant';
 
-@shortcut()
+@Decorators.shortcut()
 export class VirtualListDemo extends Widget {
     static xtype = 'demo.virtual_list';
 

packages/demo/src/demo/core/layout/demo.absolute.js

@@ -1,8 +1,8 @@
 
-import { AbsoluteLayout, Label, shortcut, Widget } from "@fui/core"
+import { AbsoluteLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class AbsoluteLayoutDemo extends Widget {
     static xtype = "demo.absolute";
 

packages/demo/src/demo/core/layout/demo.border.js

@@ -1,8 +1,8 @@
 
-import { Label, CenterLayout, BorderLayout, shortcut, Widget, createWidget } from "@fui/core"
+import { Label, CenterLayout, BorderLayout, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class BorderLayoutDemo extends Widget {
     static xtype = "demo.border";
 

packages/demo/src/demo/core/layout/demo.center_adapt.js

@@ -1,8 +1,8 @@
 
-import { CenterAdaptLayout, Label, shortcut, Widget } from "@fui/core"
+import { CenterAdaptLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class CenterAdaptDemo extends Widget {
     static xtype = "demo.center_adapt";
 

packages/demo/src/demo/core/layout/demo.float_center.js

@@ -1,8 +1,8 @@
 
-import { FloatCenterLayout, Label, shortcut, Widget } from "@fui/core"
+import { FloatCenterLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class FloatCenterLayoutDemo extends Widget {
     static xtype = "demo.float_center";
 

packages/demo/src/demo/core/layout/demo.flow.js

@@ -1,8 +1,8 @@
 
-import { CenterAdaptLayout, FloatLeftLayout, Label, FloatRightLayout, shortcut, Widget } from "@fui/core"
+import { CenterAdaptLayout, FloatLeftLayout, Label, FloatRightLayout, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class FlowLayoutDemo extends Widget {
     static xtype = "demo.flow";
 

packages/demo/src/demo/core/layout/demo.grid.js

@@ -1,8 +1,8 @@
 
-import { GridLayout, Label, shortcut, Widget } from "@fui/core"
+import { GridLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class GridLayoutDemo extends Widget {
     static xtype = "demo.grid";
 

packages/demo/src/demo/core/layout/demo.horizontal.js

@@ -1,9 +1,9 @@
 
-import { VerticalLayout, HorizontalLayout, Label, Layout, CenterAdaptLayout, shortcut, Widget, VerticalAlign, HorizontalAlign } from "@fui/core"
+import { VerticalLayout, HorizontalLayout, Label, Layout, CenterAdaptLayout, Decorators, Widget, VerticalAlign, HorizontalAlign } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class HorizontalDemo extends Widget {
     static xtype = "demo.horizontal";
 

packages/demo/src/demo/core/layout/demo.horizontal_adapt.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAdaptLayout, Label, GridLayout, shortcut, Widget, createWidget } from "@fui/core"
+import { HorizontalAdaptLayout, Label, GridLayout, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class HorizontalAdaptDemo extends Widget {
     static xtype = "demo.horizontal_adapt";
 

packages/demo/src/demo/core/layout/demo.horizontal_auto.js

@@ -1,8 +1,8 @@
 
-import { HorizontalAutoLayout, Label, GridLayout, shortcut, Widget, createWidget } from "@fui/core"
+import { HorizontalAutoLayout, Label, GridLayout, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class HorizontalAutoDemo extends Widget {
     static xtype = "demo.horizontal_auto";
 

packages/demo/src/demo/core/layout/demo.horizontal_float.js

@@ -1,8 +1,8 @@
 
-import { FloatHorizontalLayout, Label, shortcut, Widget } from "@fui/core"
+import { FloatHorizontalLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class HorizontalFloatDemo extends Widget {
     static xtype = "demo.horizontal_float";
 

packages/demo/src/demo/core/layout/demo.htape.js

@@ -1,8 +1,8 @@
 
-import { HTapeLayout, Label, shortcut, Widget } from "@fui/core"
+import { HTapeLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class HtapeLayoutDemo extends Widget {
     static xtype = "demo.htape";
 

packages/demo/src/demo/core/layout/demo.left_right_vertical_adapt.js

@@ -1,8 +1,8 @@
 
-import { LeftRightVerticalAdaptLayout, Label, shortcut, Widget } from "@fui/core"
+import { LeftRightVerticalAdaptLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class LeftRightVerticalAdaptLayoutDemo extends Widget {
     static xtype = "demo.left_right_vertical_adapt";
 

packages/demo/src/demo/core/layout/demo.table.js

@@ -1,8 +1,8 @@
 
-import { TableLayout, Layout, GridLayout, shortcut, Widget, createItems } from "@fui/core"
+import { TableLayout, Layout, GridLayout, Decorators, Widget, createItems } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class TableLayoutDemo extends Widget {
     static xtype = "demo.table_layout";
 

packages/demo/src/demo/core/layout/demo.td.js

@@ -1,8 +1,8 @@
 
-import { VerticalLayout, TdLayout, Label, shortcut, Widget, createItems } from "@fui/core"
+import { VerticalLayout, TdLayout, Label, Decorators, Widget, createItems } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class TdLayoutDemo extends Widget {
     static xtype = "demo.td";
 

packages/demo/src/demo/core/layout/demo.vertical.js

@@ -1,8 +1,8 @@
 
-import { VerticalLayout, Label, shortcut, Widget } from "@fui/core"
+import { VerticalLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class VerticalLayoutDemo extends Widget {
     static xtype = "demo.vertical";
 

packages/demo/src/demo/core/layout/demo.vertical_adapt.js

@@ -1,8 +1,8 @@
 
-import { VerticalAdaptLayout, Label, GridLayout, shortcut, Widget, createWidget } from "@fui/core"
+import { VerticalAdaptLayout, Label, GridLayout, Decorators, Widget, createWidget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class VerticalAdaptLayoutDemo extends Widget {
     static xtype = "demo.vertical_adapt";
 

packages/demo/src/demo/core/layout/demo.vtape.js

@@ -1,8 +1,8 @@
 
-import { VTapeLayout, Label, shortcut, Widget } from "@fui/core"
+import { VTapeLayout, Label, Decorators, Widget } from "@fui/core"
 
 
-@shortcut()
+@Decorators.shortcut()
 export class VtapeLayoutDemo extends Widget {
     static xtype = "demo.vtape";
 

packages/demo/src/demo/core/popup/demo.layer.js

@@ -1,9 +1,9 @@
 
-import { VerticalLayout, Button, CenterAdaptLayout, shortcut, Widget, UUID, Layers } from "@fui/core"
+import { VerticalLayout, Button, CenterAdaptLayout, Decorators, Widget, UUID, Layers } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class LayerDemo extends Widget {
     static xtype = "demo.layer";
 

packages/demo/src/demo/core/popup/demo.popover.js

@@ -1,9 +1,9 @@
 
-import { VerticalLayout, TextButton, BarPopover, Label, ButtonGroup, shortcut, Widget, UUID, map, range, Popovers } from "@fui/core"
+import { VerticalLayout, TextButton, BarPopover, Label, ButtonGroup, Decorators, Widget, UUID, map, range, Popovers } from "@fui/core"
 
 
 
-@shortcut()
+@Decorators.shortcut()
 export class PopoverDemo extends Widget {
     static xtype = "demo.popover";
 

packages/demo/src/demo/core/popup/demo.popup_view.js

@@ -1,9 +1,9 @@
 
-import { AbsoluteLayout, Combo, TextButton, PopupView, ButtonGroup, VerticalLayout, MultiSelectItem, shortcut, Widget, createItems, deepClone } from "@fui/core"
+import { AbsoluteLayout, Combo, TextButton, PopupView, ButtonGroup, VerticalLayout, MultiSelectItem, Decorators, Widget, createItems, deepClone } from "@fui/core"
 import { CONSTANTS } from "@/config/constant";
 
 
-@shortcut()
+@Decorators.shortcut()
 export class PopupViewDemo extends Widget {
     static xtype = "demo.popup_view";