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

dist/lib/case/combo/combo.textvaluesmall.d.ts

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

dist/lib/case/layer/layer.multipopup.d.ts

@@ -0,0 +1,6 @@
+import { PopupView } from "../../base/layer/layer.popup";
+export declare class MultiPopupView extends PopupView {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_CLICK_TOOLBAR_BUTTON: string;
+}

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

@@ -0,0 +1,7 @@
+import { Trigger } from "../../base/single/trigger/trigger";
+export declare class TextTrigger extends Trigger {
+    static xtype: string;
+    setTextCls(cls: string): void;
+    setText(text: string): void;
+    setTipType(v: string): void;
+}

dist/lib/core/widget.d.ts

@@ -389,6 +389,10 @@ export declare class Widget extends OB {
      * 初始化前
      */
     beforeInit?(cb: Function): void;
+    /**
+     * 渲染前
+     */
+    beforeRender?(cb: Function): void;
     /**
      * 创建前
      */

dist/lib/index.d.ts

@@ -20,6 +20,7 @@ import { IconChangeButton } from "./case/button/icon/icon.change";
 import { MultiSelectItem } from "./case/button/item.multiselect";
 import { BubbleCombo } from "./case/combo/bubblecombo/combo.bubble";
 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 { LoadingPane } from "./case/loading/loading_pane";
@@ -82,6 +83,7 @@ import { Html } from "./base/single/html/html";
 import { Switcher } from "./base/combination/switcher";
 import { Loader } from "./base/combination/loader";
 import { ListPane } from "./case/layer/pane.list";
+import { MultiPopupView } from './case/layer/layer.multipopup';
 import { MultiSelectBar } from "./case/toolbar/toolbar.multiselect";
 import { SelectList } from "./case/list/list.select";
 import { AbstractAllValueChooser } from "./component/allvaluechooser/abstract.allvaluechooser";
@@ -120,6 +122,7 @@ import { TextValueDownListCombo } from "./widget/textvaluedownlistcombo/combo.te
 import { Switch } from "./case/button/switch";
 import { HorizontalLayout } from "./core/wrapper/layout/layout.horizontal";
 import { ShelterEditor } from "./case/editor/editor.shelter";
+import { TextTrigger } from './case/trigger/trigger.text';
 import { SelectTextTrigger } from "./case/trigger/trigger.text.select";
 import { DateInterval } from "./widget/timeinterval/dateinterval";
 import { DynamicDatePane } from "./widget/datepane/datepane";
@@ -185,6 +188,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     ButtonGroup: typeof ButtonGroup;
     Combo: typeof Combo;
     TextValueCombo: typeof TextValueCombo;
+    SmallTextValueCombo: typeof SmallTextValueCombo;
     BubbleCombo: typeof BubbleCombo;
     AllValueMultiTextValueCombo: typeof AllValueMultiTextValueCombo;
     IconTextItem: typeof IconTextItem;
@@ -244,6 +248,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Switcher: typeof Switcher;
     Loader: typeof Loader;
     ListPane: typeof ListPane;
+    MultiPopupView: typeof MultiPopupView;
     MultiSelectBar: typeof MultiSelectBar;
     SelectList: typeof SelectList;
     IconLabel: typeof IconLabel;
@@ -284,6 +289,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Switch: typeof Switch;
     HorizontalLayout: typeof HorizontalLayout;
     ShelterEditor: typeof ShelterEditor;
+    TextTrigger: typeof TextTrigger;
     SelectTextTrigger: typeof SelectTextTrigger;
     DateInterval: typeof DateInterval;
     DynamicDatePane: typeof DynamicDatePane;
@@ -325,4 +331,4 @@ 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, 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, 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, };
+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, 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, 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, };

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-4-25 11:20:28 AM */
+/*! time: 2021-5-6 9:40:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1249);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1252);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2879,7 +2879,44 @@ _.extend(BI, {
 
 /***/ }),
 
-/***/ 1107:
+/***/ 111:
+/***/ (function(module, exports) {
+
+/**
+ * 共享池
+ * @type {{Shared: {}}}
+ */
+
+(function () {
+    var _Shared = {};
+    BI.SharingPool = {
+        _Shared: _Shared,
+        put: function (name, shared) {
+            _Shared[name] = shared;
+        },
+
+        cat: function () {
+            var args = Array.prototype.slice.call(arguments, 0),
+                copy = _Shared;
+            for (var i = 0; i < args.length; i++) {
+                copy = copy && copy[args[i]];
+            }
+            return copy;
+        },
+
+        get: function () {
+            return BI.deepClone(this.cat.apply(this, arguments));
+        },
+
+        remove: function (key) {
+            delete _Shared[key];
+        }
+    };
+})();
+
+/***/ }),
+
+/***/ 1110:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -3083,43 +3120,6 @@ BI.i18n = {
 
 /***/ }),
 
-/***/ 111:
-/***/ (function(module, exports) {
-
-/**
- * 共享池
- * @type {{Shared: {}}}
- */
-
-(function () {
-    var _Shared = {};
-    BI.SharingPool = {
-        _Shared: _Shared,
-        put: function (name, shared) {
-            _Shared[name] = shared;
-        },
-
-        cat: function () {
-            var args = Array.prototype.slice.call(arguments, 0),
-                copy = _Shared;
-            for (var i = 0; i < args.length; i++) {
-                copy = copy && copy[args[i]];
-            }
-            return copy;
-        },
-
-        get: function () {
-            return BI.deepClone(this.cat.apply(this, arguments));
-        },
-
-        remove: function (key) {
-            delete _Shared[key];
-        }
-    };
-})();
-
-/***/ }),
-
 /***/ 112:
 /***/ (function(module, exports) {
 
@@ -3130,7 +3130,7 @@ BI.Req = {
 
 /***/ }),
 
-/***/ 1249:
+/***/ 1252:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(91);
@@ -3149,8 +3149,8 @@ __webpack_require__(97);
 __webpack_require__(98);
 __webpack_require__(108);
 __webpack_require__(109);
-__webpack_require__(1107);
-__webpack_require__(1250);
+__webpack_require__(1110);
+__webpack_require__(1253);
 __webpack_require__(110);
 __webpack_require__(111);
 module.exports = __webpack_require__(112);
@@ -3158,7 +3158,7 @@ module.exports = __webpack_require__(112);
 
 /***/ }),
 
-/***/ 1250:
+/***/ 1253:
 /***/ (function(module, exports) {
 
 /**
@@ -3261,7 +3261,7 @@ module.exports = g;
 
 /***/ }),
 
-/***/ 57:
+/***/ 59:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -4931,7 +4931,7 @@ if (!_global.BI) {
     });
 })();
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(14), __webpack_require__(57).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(14), __webpack_require__(59).setImmediate))
 
 /***/ }),
 

package.json

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

src/base/single/button/buttons/button.js

@@ -42,16 +42,6 @@ BI.Button = BI.inherit(BI.BasicButton, {
     _init: function () {
         BI.Button.superclass._init.apply(this, arguments);
         var o = this.options, self = this;
-        if (BI.isNumber(o.height) && !o.clear && !o.block) {
-            this.element.css({
-                height: o.height / BI.pixRatio + BI.pixUnit,
-                lineHeight: (o.height - 2) / BI.pixRatio + BI.pixUnit
-            });
-        } else if (o.clear || o.block) {
-            this.element.css({lineHeight: o.height / BI.pixRatio + BI.pixUnit});
-        } else {
-            this.element.css({lineHeight: (o.height - 2) / BI.pixRatio + BI.pixUnit});
-        }
         if (BI.isKey(o.iconCls)) {
             this.icon = BI.createWidget({
                 type: "bi.icon_label",
@@ -83,6 +73,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
         } else {
             this.text = BI.createWidget({
                 type: "bi.label",
+                height: o.height,
                 textAlign: o.textAlign,
                 whiteSpace: o.whiteSpace,
                 textWidth: o.textWidth,
@@ -98,6 +89,16 @@ BI.Button = BI.inherit(BI.BasicButton, {
                 value: o.value
             });
         }
+        if (BI.isNumber(o.height) && !o.clear && !o.block) {
+            this.element.css({
+                height: o.height / BI.pixRatio + BI.pixUnit,
+                lineHeight: (o.height - 2) / BI.pixRatio + BI.pixUnit
+            });
+        } else if (o.clear || o.block) {
+            this.element.css({lineHeight: o.height / BI.pixRatio + BI.pixUnit});
+        } else {
+            this.element.css({lineHeight: (o.height - 2) / BI.pixRatio + BI.pixUnit});
+        }
         if (o.block === true) {
             this.element.addClass("block");
         }

src/widget/downlist/combo.downlist.js

@@ -12,7 +12,9 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             trigger: "click",
             container: null,
             stopPropagation: false,
-            el: {}
+            el: {},
+            minWidth: 140,
+            maxHeight: 1000
         });
     },
 
@@ -56,8 +58,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             popup: {
                 el: this.popupview,
                 stopPropagation: o.stopPropagation,
-                maxHeight: 1000,
-                minWidth: 140
+                maxHeight: o.maxHeight,
+                minWidth: o.minWidth
             }
         });
 

typescript/case/combo/combo.textvaluesmall.ts

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

typescript/case/layer/layer.multipopup.ts

@@ -0,0 +1,10 @@
+import { PopupView } from "../../base/layer/layer.popup";
+
+
+export declare class MultiPopupView extends PopupView {
+    static xtype: string;
+
+    static EVENT_CHANGE: string;
+
+    static EVENT_CLICK_TOOLBAR_BUTTON: string;
+}

typescript/case/trigger/trigger.text.ts

@@ -0,0 +1,11 @@
+import { Trigger } from "../../base/single/trigger/trigger";
+
+export declare class TextTrigger extends Trigger {
+    static xtype: string;
+
+    setTextCls(cls: string): void;
+
+    setText(text: string): void;
+
+    setTipType(v: string): void;
+}

typescript/index.ts

@@ -20,6 +20,7 @@ import { IconChangeButton } from "./case/button/icon/icon.change";
 import { MultiSelectItem } from "./case/button/item.multiselect";
 import { BubbleCombo } from "./case/combo/bubblecombo/combo.bubble";
 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 { LoadingPane } from "./case/loading/loading_pane";
@@ -82,6 +83,7 @@ import { Html } from "./base/single/html/html";
 import { Switcher } from "./base/combination/switcher";
 import { Loader } from "./base/combination/loader";
 import { ListPane } from "./case/layer/pane.list";
+import { MultiPopupView } from './case/layer/layer.multipopup';
 import { MultiSelectBar } from "./case/toolbar/toolbar.multiselect";
 import { SelectList } from "./case/list/list.select";
 import { AbstractAllValueChooser } from "./component/allvaluechooser/abstract.allvaluechooser";
@@ -120,6 +122,7 @@ import { TextValueDownListCombo } from "./widget/textvaluedownlistcombo/combo.te
 import { Switch } from "./case/button/switch";
 import { HorizontalLayout } from "./core/wrapper/layout/layout.horizontal";
 import { ShelterEditor } from "./case/editor/editor.shelter";
+import { TextTrigger } from './case/trigger/trigger.text';
 import { SelectTextTrigger } from "./case/trigger/trigger.text.select";
 import { DateInterval } from "./widget/timeinterval/dateinterval";
 import { DynamicDatePane } from "./widget/datepane/datepane";
@@ -187,6 +190,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     ButtonGroup: typeof ButtonGroup;
     Combo: typeof Combo;
     TextValueCombo: typeof TextValueCombo;
+    SmallTextValueCombo: typeof SmallTextValueCombo;
     BubbleCombo: typeof BubbleCombo;
     AllValueMultiTextValueCombo: typeof AllValueMultiTextValueCombo;
     IconTextItem: typeof IconTextItem;
@@ -246,6 +250,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Switcher: typeof Switcher;
     Loader: typeof Loader;
     ListPane: typeof ListPane;
+    MultiPopupView: typeof MultiPopupView;
     MultiSelectBar: typeof MultiSelectBar;
     SelectList: typeof SelectList;
     IconLabel: typeof IconLabel;
@@ -286,6 +291,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Switch: typeof Switch;
     HorizontalLayout: typeof HorizontalLayout;
     ShelterEditor: typeof ShelterEditor;
+    TextTrigger: typeof TextTrigger;
     SelectTextTrigger: typeof SelectTextTrigger;
     DateInterval: typeof DateInterval;
     DynamicDatePane: typeof DynamicDatePane;
@@ -384,9 +390,11 @@ export {
     BubbleCombo,
     Loader,
     ListPane,
+    MultiPopupView,
     MultiSelectBar,
     SelectList,
     TextValueCombo,
+    SmallTextValueCombo,
     Editor,
     IconLabel,
     Popover,
@@ -451,6 +459,7 @@ export {
     Switch,
     HorizontalLayout,
     ShelterEditor,
+    TextTrigger,
     SelectTextTrigger,
     DateInterval,
     DynamicDatePane,