Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~kira/fineui

dist/lib/base/layer/layer.popup.d.ts

@@ -0,0 +1,9 @@
+import { Widget } from '../../core/widget';
+export declare class PopupView extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    getView(): Widget;
+    populate(...args: any[]): void;
+    resetWidth(v: number): void;
+    resetHeight(v: number): void;
+}

dist/lib/base/single/input/input.d.ts

@@ -1,4 +1,4 @@
-import { Single, _Single } from "../single";
+import { _Single, Single } from "../single";
 export interface _Input extends _Single {
     onClick(): void;
     onKeyDown(keyCode: number): void;

dist/lib/case/button/switch.d.ts

@@ -0,0 +1,5 @@
+import { BasicButton } from "../../base/single/button/button.basic";
+export declare class Switch extends BasicButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+}

dist/lib/case/checkbox/check.arrownode.d.ts

@@ -0,0 +1,4 @@
+import { IconButton } from "../../base/single/button/buttons/button.icon";
+export declare class ArrowTreeGroupNodeCheckbox extends IconButton {
+    static xtype: string;
+}

dist/lib/case/combo/bubblecombo/popup.bubble.d.ts

@@ -0,0 +1,15 @@
+import { PopupView } from "../../../base/layer/layer.popup";
+import { Widget } from "../../../core/widget";
+export declare class BubblePopupView extends PopupView {
+    static xtype: string;
+    static EVENT_CLICK_TOOLBAR_BUTTON: string;
+}
+export declare class BubblePopupBarView extends BubblePopupView {
+    static xtype: string;
+    static EVENT_CLICK_TOOLBAR_BUTTON: string;
+}
+export declare class TextBubblePopupBarView extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    populate(v: string): void;
+}

dist/lib/case/combo/textvaluecheckcombo/combo.textvaluecheck.d.ts

@@ -0,0 +1,10 @@
+import { Widget } from "../../../core/widget";
+export declare class TextValueCheckCombo extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    setTitle(v: string): void;
+    setValue(v: any): void;
+    setWarningTitle(v: string): void;
+    getValue(): any;
+    populate(items: any[]): string;
+}

dist/lib/case/editor/editor.shelter.d.ts

@@ -0,0 +1,38 @@
+import { Widget } from "../../core/widget";
+export declare class ShelterEditor extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_CLICK: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_CLICK_LABEL: string;
+    static EVENT_START: string;
+    static EVENT_PAUSE: string;
+    static EVENT_STOP: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE_CONFIRM: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_ENTER: string;
+    static EVENT_RESTRICT: string;
+    static EVENT_SPACE: string;
+    static EVENT_EMPTY: string;
+    setTitle(v: string | Function): void;
+    setWarningTitle(v: string | Function): void;
+    setWaterMark(v: string): void;
+    focus(): void;
+    blur(): void;
+    doRedMark(...args: any[]): void;
+    unRedMark(...args: any[]): void;
+    doHighLight(...args: any[]): void;
+    unHighLight(...args: any[]): void;
+    setErrorText(v: string): void;
+    getErrorText(): string;
+    isEditing(): boolean;
+    isValid(): boolean;
+    getLastValidValue(): string;
+    getLastChangedValue(): string;
+    getState(): any;
+    setState(...args: any[]): void;
+}

dist/lib/case/pager/pager.all.count.d.ts

@@ -0,0 +1,14 @@
+import { Widget } from "../../core/widget";
+export declare class AllCountPager extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    setAllPages(v: number): void;
+    setValue(v: number): void;
+    setVPage(v: number): void;
+    setCount(v: number | string): void;
+    getCurrentPage(): number;
+    hasPrev(): boolean;
+    hasNext(): boolean;
+    setPagerVisible(v: boolean): void;
+    populate(): void;
+}

dist/lib/case/trigger/trigger.text.select.d.ts

@@ -0,0 +1,4 @@
+import { Trigger } from "../../base/single/trigger/trigger";
+export declare class SelectTextTrigger extends Trigger {
+    static xtype: string;
+}

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

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

dist/lib/index.d.ts

@@ -115,6 +115,19 @@ import { MultiLayerSingleTreeCombo } from "./widget/multilayersingletree/multila
 import { MultiLayerSelectTreeCombo } from "./widget/multilayerselecttree/multilayerselecttree.combo";
 import { MultiTreeListCombo } from "./widget/multitree/multi.tree.list.combo";
 import { MultiTreeInsertCombo } from "./widget/multitree/multi.tree.insert.combo";
+import { TextValueDownListCombo } from "./widget/textvaluedownlistcombo/combo.textvaluedownlist";
+import { Switch } from "./case/button/switch";
+import { HorizontalLayout } from "./core/wrapper/layout/layout.horizontal";
+import { ShelterEditor } from "./case/editor/editor.shelter";
+import { SelectTextTrigger } from "./case/trigger/trigger.text.select";
+import { DateInterval } from "./widget/timeinterval/dateinterval";
+import { DynamicDatePane } from "./widget/datepane/datepane";
+import { AllCountPager } from "./case/pager/pager.all.count";
+import { PopupView } from "./base/layer/layer.popup";
+import { BubblePopupView, BubblePopupBarView, TextBubblePopupBarView } from "./case/combo/bubblecombo/popup.bubble";
+import { ArrowTreeGroupNodeCheckbox } from "./case/checkbox/check.arrownode";
+import { NumberEditor } from "./widget/numbereditor/numbereditor";
+import { TextValueCheckCombo } from "./case/combo/textvaluecheckcombo/combo.textvaluecheck";
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -240,9 +253,24 @@ export interface BI extends _func, _i18n, _base, _inject {
     CardLayout: typeof CardLayout;
     DynamicYearMonthCombo: typeof DynamicYearMonthCombo;
     TimeCombo: typeof TimeCombo;
+    TextValueDownListCombo: typeof TextValueDownListCombo;
+    Switch: typeof Switch;
+    HorizontalLayout: typeof HorizontalLayout;
+    ShelterEditor: typeof ShelterEditor;
+    SelectTextTrigger: typeof SelectTextTrigger;
+    DateInterval: typeof DateInterval;
+    DynamicDatePane: typeof DynamicDatePane;
+    AllCountPager: typeof AllCountPager;
+    PopupView: typeof PopupView;
+    BubblePopupView: typeof BubblePopupView;
+    BubblePopupBarView: typeof BubblePopupBarView;
+    TextBubblePopupBarView: typeof TextBubblePopupBarView;
+    ArrowTreeGroupNodeCheckbox: typeof ArrowTreeGroupNodeCheckbox;
+    TextValueCheckCombo: typeof TextValueCheckCombo;
+    NumberEditor: typeof NumberEditor;
 }
 declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, 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, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, };
+export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, 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, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, TextValueCheckCombo, NumberEditor, };

dist/lib/widget/datepane/datepane.d.ts

@@ -0,0 +1,7 @@
+import { Widget } from "../../core/widget";
+export declare class DynamicDatePane extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static Static: 1;
+    static Dynamic: 2;
+}

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

@@ -15,4 +15,13 @@ export declare class DynamicDateCombo extends Single {
     setMaxDate(maxDate: string): void;
     getKey(): string;
     hidePopupView(): void;
+    getValue(): DynamicDataComboValue;
+}
+export interface DynamicDataComboValue {
+    type: number;
+    value: {
+        year: number;
+        month: number;
+        day: number;
+    };
 }

dist/lib/widget/numbereditor/numbereditor.d.ts

@@ -0,0 +1,14 @@
+import { Widget } from "../../core/widget";
+export declare class NumberEditor extends Widget {
+    static xtype: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE: string;
+    focus(): void;
+    isEditing(): void;
+    setUpEnable(v: boolean): void;
+    setDownEnable(v: boolean): void;
+    getLastValidValue(): string;
+    getLastChangedValue(): string;
+    getValue(): string;
+    setValue(v: string): void;
+}

dist/lib/widget/textvaluedownlistcombo/combo.textvaluedownlist.d.ts

@@ -0,0 +1,6 @@
+import { Widget } from "../../core/widget";
+export declare class TextValueDownListCombo extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    getValue<T>(): [T];
+}

dist/lib/widget/timeinterval/dateinterval.d.ts

@@ -0,0 +1,12 @@
+import { Single } from "../../base/single/single";
+import { DynamicDataComboValue } from "../dynamicdate/dynamicdate.combo";
+export declare class DateInterval extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    getValue(): {
+        start: DynamicDataComboValue;
+        end: DynamicDataComboValue;
+    };
+}

lodash.md

@@ -1 +1 @@
-lodash core plus="debounce,throttle,get,set,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim,merge,groupBy,uniqBy,before,after"
+lodash core plus="debounce,throttle,get,set,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim,merge,groupBy,uniqBy,before,after,unescape"

package.json

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

src/core/lodash.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `lodash core plus="debounce,throttle,get,set,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim,merge,groupBy,uniqBy,before,after"`
+ * Build: `lodash core plus="debounce,throttle,get,set,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim,merge,groupBy,uniqBy,before,after,unescape"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -117,7 +117,9 @@
       uint32Tag = '[object Uint32Array]';
 
   /** Used to match HTML entities and HTML characters. */
-  var reUnescapedHtml = /[&<>"']/g,
+  var reEscapedHtml = /&(?:amp|lt|gt|quot|#39);/g,
+      reUnescapedHtml = /[&<>"']/g,
+      reHasEscapedHtml = RegExp(reEscapedHtml.source),
       reHasUnescapedHtml = RegExp(reUnescapedHtml.source);
 
   /** Used to match property names within property paths. */
@@ -232,6 +234,15 @@
     "'": '&#39;'
   };
 
+  /** Used to map HTML entities to characters. */
+  var htmlUnescapes = {
+    '&amp;': '&',
+    '&lt;': '<',
+    '&gt;': '>',
+    '&quot;': '"',
+    '&#39;': "'"
+  };
+
   /** Built-in method references without a dependency on `root`. */
   var freeParseFloat = parseFloat,
       freeParseInt = parseInt;
@@ -958,6 +969,15 @@
       : asciiToArray(string);
   }
 
+  /**
+   * Used by `_.unescape` to convert HTML entities to characters.
+   *
+   * @private
+   * @param {string} chr The matched character to unescape.
+   * @returns {string} Returns the unescaped character.
+   */
+  var unescapeHtmlChar = basePropertyOf(htmlUnescapes);
+
   /**
    * Gets the size of a Unicode `string`.
    *
@@ -9444,6 +9464,32 @@
     return castSlice(strSymbols, start, end).join('');
   }
 
+  /**
+   * The inverse of `_.escape`; this method converts the HTML entities
+   * `&amp;`, `&lt;`, `&gt;`, `&quot;`, and `&#39;` in `string` to
+   * their corresponding characters.
+   *
+   * **Note:** No other HTML entities are unescaped. To unescape additional
+   * HTML entities use a third-party library like [_he_](https://mths.be/he).
+   *
+   * @static
+   * @memberOf _
+   * @since 0.6.0
+   * @category String
+   * @param {string} [string=''] The string to unescape.
+   * @returns {string} Returns the unescaped string.
+   * @example
+   *
+   * _.unescape('fred, barney, &amp; pebbles');
+   * // => 'fred, barney, & pebbles'
+   */
+  function unescape(string) {
+    string = toString(string);
+    return (string && reHasEscapedHtml.test(string))
+      ? string.replace(reEscapedHtml, unescapeHtmlChar)
+      : string;
+  }
+
   /*------------------------------------------------------------------------*/
 
   /**
@@ -9969,6 +10015,7 @@
   lodash.size = size;
   lodash.some = some;
   lodash.trim = trim;
+  lodash.unescape = unescape;
   lodash.uniqueId = uniqueId;
 
   // Add aliases.

typescript/case/combo/textvaluecheckcombo/combo.textvaluecheck.ts

@@ -0,0 +1,16 @@
+import { Widget } from "../../../core/widget";
+
+export declare class TextValueCheckCombo extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    setTitle (v: string): void;
+
+    setValue (v: any): void;
+
+    setWarningTitle(v: string): void;
+
+    getValue(): any;
+
+    populate(items: any[]): string;
+}

typescript/index.ts

@@ -132,6 +132,8 @@ import { DynamicYearCombo } from "./widget/year/combo.year";
 import { IntervalSlider } from "./widget/intervalslider/intervalslider";
 import { MultiSelectInsertList } from "./widget/multiselectlist/multiselectlist.insert";
 import { YearMonthInterval } from "./widget/yearmonthinterval/yearmonthinterval";
+import { NumberEditor } from "./widget/numbereditor/numbereditor";
+import { TextValueCheckCombo } from "./case/combo/textvaluecheckcombo/combo.textvaluecheck";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -279,6 +281,8 @@ export interface BI extends _func, _i18n, _base, _inject {
     IntervalSlider: typeof IntervalSlider;
     MultiSelectInsertList: typeof MultiSelectInsertList;
     YearMonthInterval: typeof YearMonthInterval;
+    TextValueCheckCombo: typeof TextValueCheckCombo;
+    NumberEditor: typeof NumberEditor;
 }
 
 export default {
@@ -420,4 +424,6 @@ export {
     IntervalSlider,
     MultiSelectInsertList,
     YearMonthInterval,
+    TextValueCheckCombo,
+    NumberEditor,
 };

typescript/widget/numbereditor/numbereditor.ts

@@ -0,0 +1,23 @@
+import { Widget } from "../../core/widget";
+
+export declare class NumberEditor extends Widget {
+    static xtype: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE: string;
+
+    focus (): void;
+
+    isEditing(): void;
+
+    setUpEnable(v: boolean): void;
+
+    setDownEnable(v: boolean): void;
+
+    getLastValidValue(): string;
+
+    getLastChangedValue(): string;
+
+    getValue(): string;
+
+    setValue(v: string): void;
+}