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

pull

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2021-4-1 12:00:29 */
+/*! time: 2021-4-2 11:10:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1419);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1420);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -14710,7 +14710,7 @@ BI.shortcut("bi.horizontal_auto", BI.HorizontalAutoLayout);
 /**
  * 浮动的水平居中布局
  */
-BI.FloatHorizontalLayout = BI.Layout;
+BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);
 
 
@@ -16910,7 +16910,7 @@ BI.shortcut("bi.grid", BI.GridLayout);
  * @class BI.HorizontalLayout
  * @extends BI.Layout
  */
-BI.HorizontalLayout = BI.Layout;
+BI.HorizontalLayout = BI.inherit(BI.Layout);
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);
 
 
@@ -72059,6 +72059,12 @@ Object.defineProperty(exports, "DateTimeCombo", {
     return _datetime.DateTimeCombo;
   }
 });
+Object.defineProperty(exports, "FloatHorizontalLayout", {
+  enumerable: true,
+  get: function get() {
+    return _float.FloatHorizontalLayout;
+  }
+});
 exports["default"] = void 0;
 
 var _combo = __webpack_require__(739);
@@ -72355,6 +72361,8 @@ var _router = __webpack_require__(862);
 
 var _datetime = __webpack_require__(863);
 
+var _float = __webpack_require__(864);
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -73690,7 +73698,15 @@ var _button = __webpack_require__(8);
 var _single = __webpack_require__(2);
 
 /***/ }),
-/* 864 */,
+/* 864 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _layout = __webpack_require__(3);
+
+/***/ }),
 /* 865 */,
 /* 866 */,
 /* 867 */,
@@ -73723,7 +73739,8 @@ var _single = __webpack_require__(2);
 /* 894 */,
 /* 895 */,
 /* 896 */,
-/* 897 */
+/* 897 */,
+/* 898 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -73886,17 +73903,17 @@ var _single = __webpack_require__(2);
 
 
 /***/ }),
-/* 898 */,
 /* 899 */,
 /* 900 */,
-/* 901 */
+/* 901 */,
+/* 902 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(902);
+/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(903);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
 
 /***/ }),
-/* 902 */
+/* 903 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(setImmediate) {function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -75429,8 +75446,8 @@ var _single = __webpack_require__(2);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(63).setImmediate))
 
 /***/ }),
-/* 903 */,
-/* 904 */
+/* 904 */,
+/* 905 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -75777,7 +75794,6 @@ var _single = __webpack_require__(2);
 
 
 /***/ }),
-/* 905 */,
 /* 906 */,
 /* 907 */,
 /* 908 */,
@@ -75993,13 +76009,13 @@ var _single = __webpack_require__(2);
 /* 1118 */,
 /* 1119 */,
 /* 1120 */,
-/* 1121 */
+/* 1121 */,
+/* 1122 */
 /***/ (function(module, exports) {
 
 
 
 /***/ }),
-/* 1122 */,
 /* 1123 */,
 /* 1124 */,
 /* 1125 */,
@@ -76296,7 +76312,8 @@ var _single = __webpack_require__(2);
 /* 1416 */,
 /* 1417 */,
 /* 1418 */,
-/* 1419 */
+/* 1419 */,
+/* 1420 */
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(124);
@@ -76402,7 +76419,7 @@ __webpack_require__(401);
 __webpack_require__(142);
 __webpack_require__(143);
 __webpack_require__(144);
-__webpack_require__(901);
+__webpack_require__(902);
 __webpack_require__(402);
 __webpack_require__(403);
 __webpack_require__(404);
@@ -76798,9 +76815,9 @@ __webpack_require__(733);
 __webpack_require__(734);
 __webpack_require__(735);
 __webpack_require__(736);
-__webpack_require__(904);
-__webpack_require__(897);
-__webpack_require__(1121);
+__webpack_require__(905);
+__webpack_require__(898);
+__webpack_require__(1122);
 module.exports = __webpack_require__(737);
 
 

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

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

dist/lib/index.d.ts

@@ -154,6 +154,7 @@ import { TextValueCheckComboPopup } from "./case/combo/textvaluecheckcombo/popup
 import { ImageButton } from './base/single/button/buttons/button.image';
 import { History, Router } from "./router/router";
 import { DateTimeCombo } from './widget/datetime/datetime.combo';
+import { FloatHorizontalLayout } from "./core/wrapper/layout/adapt/float.horizontal";
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     OB: typeof OB;
     Plugin: _Plugin;
@@ -312,9 +313,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Router: typeof Router;
     history: History;
     DateTimeCombo: typeof DateTimeCombo;
+    FloatHorizontalLayout: typeof FloatHorizontalLayout;
 }
 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, };
+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, };

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-4-1 12:00:29 */
+/*! time: 2021-4-2 11:10:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,12 +82,12 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1242);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1243);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 1103:
+/***/ 1104:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -327,7 +327,7 @@ __webpack_require__(125)(__webpack_require__(126))
 
 /***/ }),
 
-/***/ 1242:
+/***/ 1243:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(123);
@@ -346,8 +346,8 @@ __webpack_require__(129);
 __webpack_require__(130);
 __webpack_require__(140);
 __webpack_require__(141);
-__webpack_require__(1103);
-__webpack_require__(1243);
+__webpack_require__(1104);
+__webpack_require__(1244);
 __webpack_require__(142);
 __webpack_require__(143);
 module.exports = __webpack_require__(144);
@@ -355,7 +355,7 @@ module.exports = __webpack_require__(144);
 
 /***/ }),
 
-/***/ 1243:
+/***/ 1244:
 /***/ (function(module, exports) {
 
 /**

package.json

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

src/core/wrapper/layout/adapt/float.horizontal.js

@@ -1,5 +1,5 @@
 /**
  * 浮动的水平居中布局
  */
-BI.FloatHorizontalLayout = BI.Layout;
+BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);

src/core/wrapper/layout/layout.horizontal.js

@@ -3,5 +3,5 @@
  * @class BI.HorizontalLayout
  * @extends BI.Layout
  */
-BI.HorizontalLayout = BI.Layout;
+BI.HorizontalLayout = BI.inherit(BI.Layout);
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);