Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui

dist/lib/base/single/button/buttons/button.d.ts

@@ -1,4 +1,4 @@
-import { IconLabel, Label } from "../../../..";
+import { AbstractLabel, IconLabel, Label } from "../../../..";
 import { BasicButton } from "../button.basic";
 export declare class Button extends BasicButton {
     static xtype: string;
@@ -11,11 +11,7 @@ export declare class Button extends BasicButton {
         block?: boolean;
         clear?: boolean;
         ghost?: boolean;
-        textAlign?: 'center' | 'left' | 'right';
-        whiteSpace?: 'nowrap' | 'normal';
-        textWidth?: number | null;
-        textHeight?: number | null;
-    } & BasicButton['props'];
+    } & AbstractLabel['props'] & IconLabel['props'] & BasicButton['props'];
     text: Label;
     icon?: IconLabel;
     doRedMark(...args: any[]): void;

dist/lib/base/single/button/buttons/button.icon.d.ts

@@ -2,4 +2,8 @@ import { BasicButton } from "../button.basic";
 export declare class IconButton extends BasicButton {
     static xtype: string;
     static EVENT_CHANGE: string;
+    props: {
+        iconWidth: number;
+        iconHeight: number;
+    } & BasicButton['props'];
 }

dist/lib/base/single/label/abstract.label.d.ts

@@ -8,6 +8,7 @@ export declare class AbstractLabel extends Single {
         textHeight: number | null;
         highLight: boolean;
         handler: Function | null;
+        text: string;
     } & Single['props'];
     doRedMark(...args: any[]): void;
     unRedMark(...args: any[]): void;

dist/lib/base/single/label/html.label.d.ts

@@ -0,0 +1,7 @@
+import { AbstractLabel } from "./abstract.label";
+export declare class HtmlLabel extends AbstractLabel {
+    props: {
+        lineHeight: number;
+    } & AbstractLabel['props'];
+    static xtype: string;
+}

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

@@ -3,7 +3,6 @@ export declare class Label extends AbstractLabel {
     props: {
         py: string;
         keyword: string;
-        text: string;
     } & AbstractLabel['props'];
     static xtype: string;
 }

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

@@ -1,6 +1,14 @@
 import { Single } from "./single";
 export declare class Text extends Single {
     static xtype: string;
+    props: {
+        text?: string;
+        textAlign?: "left" | "center" | "right";
+        whiteSpace?: "nowrap" | "normal";
+        lineHeight?: null | number;
+        py?: string;
+        highLight?: boolean;
+    } & Single['props'];
     doRedMark(keyword: string): void;
     unRedMark(): void;
     doHighLight(): void;

dist/lib/case/button/icon/icon.change.d.ts

@@ -1,7 +1,11 @@
+import { IconButton } from "../../../base/single/button/buttons/button.icon";
 import { Single } from "../../../base/single/single";
 export declare class IconChangeButton extends Single {
     static xtype: string;
     static EVENT_CHANGE: string;
+    props: {
+        iconCls: string;
+    } & IconButton['props'];
     isSelected(): boolean;
     setSelected(v: boolean): void;
     setIcon(cls: string): void;

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

@@ -0,0 +1,34 @@
+import { Widget } from "../../core/widget";
+export declare class StateEditor 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;
+    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;
+    getLastChangedValue(): string;
+    getState(): any;
+    setState(...args: any[]): void;
+}

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

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

dist/lib/index.d.ts

@@ -23,6 +23,7 @@ import { TextValueCombo } from "./case/combo/combo.textvalue";
 import { SmallTextValueCombo } from './case/combo/combo.textvaluesmall';
 import { SearchTextValueCombo } from "./case/combo/searchtextvaluecombo/combo.searchtextvalue";
 import { SignEditor } from "./case/editor/editor.sign";
+import { StateEditor } from './case/editor/editor.state';
 import { LoadingPane } from "./case/loading/loading_pane";
 import { AllValueMultiTextValueCombo } from "./component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo";
 import { AbstractTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser";
@@ -168,6 +169,7 @@ import { TimeInterval } from './widget/timeinterval/timeinterval';
 import { DynamicDateTimePane } from './widget/datetimepane/datetimepane';
 import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.insert';
 import { MultiSelectTree } from './widget/multiselecttree/multiselecttree';
+import { HtmlLabel } from "./base/single/label/html.label";
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     OB: typeof OB;
     Plugin: _Plugin;
@@ -208,6 +210,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Text: typeof Text;
     Editor: typeof Editor;
     SignEditor: typeof SignEditor;
+    StateEditor: typeof StateEditor;
     Layout: typeof Layout;
     HTapeLayout: typeof HTapeLayout;
     VTapeLayout: typeof VTapeLayout;
@@ -341,9 +344,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     DynamicDateTimePane: typeof DynamicDateTimePane;
     SingleSelectInsertList: typeof SingleSelectInsertList;
     MultiSelectTree: typeof MultiSelectTree;
+    HtmlLabel: typeof HtmlLabel;
 }
 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, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, BroadcastController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiPopupView, MultiSelectBar, SelectList, TextValueCombo, SmallTextValueCombo, 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, TextTrigger, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, Pager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, FloatHorizontalLayout, AdaptiveLayout, HexColorChooserPopup, BlankIconTextItem, TimeInterval, DynamicDateTimePane, SingleSelectInsertList, MultiSelectTree, };
+export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, BroadcastController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiPopupView, MultiSelectBar, SelectList, TextValueCombo, SmallTextValueCombo, 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, StateEditor, 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, TextTrigger, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, Pager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, FloatHorizontalLayout, AdaptiveLayout, HexColorChooserPopup, BlankIconTextItem, TimeInterval, DynamicDateTimePane, SingleSelectInsertList, MultiSelectTree, HtmlLabel, };

dist/lib/shims-tsx.d.ts

@@ -13,6 +13,10 @@ interface UIProps {
     vgap: number;
     hgap: number;
 }
+interface AdditionalProps {
+    column: number;
+    row: number;
+}
 interface ElementClassProps<T> extends UIProps {
     cls: string;
     extraCls: string;
@@ -43,7 +47,7 @@ interface ElementClassProps<T> extends UIProps {
 }
 declare namespace JSX {
     interface IntrinsicElements {
-        [elemName: string]: Partial<UIProps>;
+        [elemName: string]: Partial<UIProps & AdditionalProps>;
     }
     interface ElementAttributesProperty {
         /**

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-6-1 6:50:23 PM */
+/*! time: 2021-6-3 4:30:25 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1260);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1262);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2917,7 +2917,17 @@ _.extend(BI, {
 
 /***/ }),
 
-/***/ 1118:
+/***/ 112:
+/***/ (function(module, exports) {
+
+BI.Req = {
+
+};
+
+
+/***/ }),
+
+/***/ 1120:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -3122,17 +3132,7 @@ BI.i18n = {
 
 /***/ }),
 
-/***/ 112:
-/***/ (function(module, exports) {
-
-BI.Req = {
-
-};
-
-
-/***/ }),
-
-/***/ 1260:
+/***/ 1262:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(91);
@@ -3151,8 +3151,8 @@ __webpack_require__(97);
 __webpack_require__(98);
 __webpack_require__(108);
 __webpack_require__(109);
-__webpack_require__(1118);
-__webpack_require__(1261);
+__webpack_require__(1120);
+__webpack_require__(1263);
 __webpack_require__(110);
 __webpack_require__(111);
 module.exports = __webpack_require__(112);
@@ -3160,7 +3160,7 @@ module.exports = __webpack_require__(112);
 
 /***/ }),
 
-/***/ 1261:
+/***/ 1263:
 /***/ (function(module, exports) {
 
 /**
@@ -3263,7 +3263,7 @@ module.exports = g;
 
 /***/ }),
 
-/***/ 60:
+/***/ 61:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -4933,7 +4933,7 @@ if (!_global.BI) {
     });
 })();
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(14), __webpack_require__(60).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(14), __webpack_require__(61).setImmediate))
 
 /***/ }),
 

package.json

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

src/base/layer/layer.popover.js

@@ -102,7 +102,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                 },
                 css: {
                     "max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap),
-                    "min-height": this._getSuitableBodyHeight(size.height),
+                    "min-height": this._getSuitableBodyHeight(size.height - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap),
                 },
                 items: [{
                     el: o.body,

src/base/single/editor/editor.textarea.js

@@ -80,7 +80,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
         });
         this.content.element.keydown(function () {
            // 水印快速消失
-            self.watermark && self.watermark.setVisible(false);
+            self._checkWaterMark();
         });
         this.content.element.keyup(function (e) {
             self.fireEvent(BI.TextAreaEditor.EVENT_KEY_DOWN, e.keyCode);

typescript/base/single/button/buttons/button.icon.ts

@@ -3,4 +3,9 @@ import { BasicButton } from "../button.basic";
 export declare class IconButton extends BasicButton {
     static xtype: string;
     static EVENT_CHANGE: string;
+
+    props: {
+        iconWidth: number;
+        iconHeight: number;
+    } & BasicButton['props']
 }

typescript/base/single/button/buttons/button.ts

@@ -1,4 +1,4 @@
-import { IconLabel, Label } from "../../../..";
+import { AbstractLabel, IconLabel, Label } from "../../../..";
 import { BasicButton } from "../button.basic";
 
 export declare class Button extends BasicButton {
@@ -14,11 +14,7 @@ export declare class Button extends BasicButton {
         block?: boolean; // 是否块状显示，即不显示边框，没有最小宽度的限制
         clear?: boolean; // 是否去掉边框和背景
         ghost?: boolean; // 是否幽灵显示, 即正常状态无背景
-        textAlign?: 'center' | 'left' | 'right';
-        whiteSpace?: 'nowrap' | 'normal',
-        textWidth?: number | null,
-        textHeight?: number | null,
-    } & BasicButton['props'];
+    } & AbstractLabel['props'] & IconLabel['props'] & BasicButton['props'];
 
     text: Label;
     icon?: IconLabel;

typescript/base/single/label/abstract.label.ts

@@ -4,12 +4,13 @@ export declare class AbstractLabel extends Single {
     static xtype: string;
 
     props: {
-        textAlign: "left" | "center" | "right",
-        whiteSpace: "nowrap" | "normal",
-        textWidth: number | null,
-        textHeight: number | null,
-        highLight: boolean,
-        handler: Function | null,
+        textAlign: "left" | "center" | "right";
+        whiteSpace: "nowrap" | "normal";
+        textWidth: number | null;
+        textHeight: number | null;
+        highLight: boolean;
+        handler: Function | null;
+        text: string;
     } & Single['props']
 
     doRedMark(...args: any[]): void;

typescript/base/single/label/html.label.ts

@@ -0,0 +1,9 @@
+import { AbstractLabel } from "./abstract.label";
+
+export declare class HtmlLabel extends AbstractLabel {
+    props: {
+        lineHeight: number;
+    } & AbstractLabel['props'];
+
+    static xtype: string;
+}

typescript/base/single/label/label.ts

@@ -4,7 +4,6 @@ export declare class Label extends AbstractLabel {
     props: {
         py: string;
         keyword: string;
-        text: string;
     } & AbstractLabel['props'];
 
     static xtype: string;

typescript/base/single/text.ts

@@ -3,6 +3,15 @@ import { Single } from "./single";
 export declare class Text extends Single {
     static xtype: string;
 
+    props: {
+        text?: string;
+        textAlign?: "left" | "center" | "right",
+        whiteSpace?: "nowrap" | "normal",
+        lineHeight?: null | number;
+        py?: string;
+        highLight?: boolean;
+    } & Single['props'];
+
     doRedMark(keyword: string): void;
 
     unRedMark(): void;

typescript/case/button/icon/icon.change.ts

@@ -1,9 +1,14 @@
+import { IconButton } from "../../../base/single/button/buttons/button.icon";
 import { Single } from "../../../base/single/single";
 
 export declare class IconChangeButton extends Single {
     static xtype: string;
     static EVENT_CHANGE: string;
 
+    props: {
+        iconCls: string;
+    } & IconButton['props']
+
     isSelected(): boolean;
 
     setSelected(v: boolean): void;

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

@@ -2,4 +2,9 @@ import { Layout } from '../layout';
 
 export declare class GridLayout extends Layout {
     static xtype: string;
+
+    props: {
+        columns: number;
+        rows: number;
+    }
 }

typescript/index.ts

@@ -169,6 +169,7 @@ import { TimeInterval } from './widget/timeinterval/timeinterval';
 import { DynamicDateTimePane } from './widget/datetimepane/datetimepane';
 import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.insert';
 import { MultiSelectTree } from './widget/multiselecttree/multiselecttree';
+import { HtmlLabel } from "./base/single/label/html.label";
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -345,6 +346,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     DynamicDateTimePane: typeof DynamicDateTimePane;
     SingleSelectInsertList: typeof SingleSelectInsertList;
     MultiSelectTree: typeof MultiSelectTree;
+    HtmlLabel: typeof HtmlLabel;
 }
 
 export default {
@@ -521,4 +523,5 @@ export {
     DynamicDateTimePane,
     SingleSelectInsertList,
     MultiSelectTree,
+    HtmlLabel,
 };

typescript/shims-tsx.ts

@@ -15,6 +15,12 @@ interface UIProps {
     hgap: number;
 }
 
+// 一些布局的附加属性
+interface AdditionalProps {
+    column: number;
+    row: number;
+}
+
 interface ElementClassProps<T> extends UIProps {
     cls: string;
     extraCls: string;
@@ -48,7 +54,7 @@ interface ElementClassProps<T> extends UIProps {
 declare namespace JSX {
     // for undefined
     interface IntrinsicElements {
-        [elemName: string]: Partial<UIProps>;
+        [elemName: string]: Partial<UIProps & AdditionalProps>;
     }
 
     interface ElementAttributesProperty {