Merge remote-tracking branch 'origin/master' into bugfix

# Conflicts:
#	typescript/index.ts

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-11 16:20:32 */
+/*! time: 2020-12-11 17:50:28 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1272);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1273);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -169,7 +169,7 @@ module.exports = g;
 "use strict";
 
 
-var _widget = __webpack_require__(51);
+var _single = __webpack_require__(51);
 
 /***/ }),
 /* 51 */
@@ -178,12 +178,21 @@ var _widget = __webpack_require__(51);
 "use strict";
 
 
+var _widget = __webpack_require__(52);
+
+/***/ }),
+/* 52 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
 var _ob = __webpack_require__(694);
 
 /***/ }),
-/* 52 */,
 /* 53 */,
-/* 54 */
+/* 54 */,
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -250,7 +259,6 @@ exports.clearImmediate = typeof self !== "undefined" && self.clearImmediate || t
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13)))
 
 /***/ }),
-/* 55 */,
 /* 56 */,
 /* 57 */,
 /* 58 */,
@@ -263,7 +271,8 @@ exports.clearImmediate = typeof self !== "undefined" && self.clearImmediate || t
 /* 65 */,
 /* 66 */,
 /* 67 */,
-/* 68 */
+/* 68 */,
+/* 69 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -479,17 +488,8 @@ process.umask = function () {
 };
 
 /***/ }),
-/* 69 */,
 /* 70 */,
-/* 71 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _single = __webpack_require__(50);
-
-/***/ }),
+/* 71 */,
 /* 72 */,
 /* 73 */,
 /* 74 */,
@@ -1904,7 +1904,7 @@ if (!_global.BI) {
     });
 })();
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(54).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(55).setImmediate))
 
 /***/ }),
 /* 109 */
@@ -2114,7 +2114,7 @@ if (!_global.BI) {
   attachTo.setImmediate = setImmediate;
   attachTo.clearImmediate = clearImmediate;
 })(typeof self === "undefined" ? typeof global === "undefined" ? void 0 : global : self);
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(68)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(69)))
 
 /***/ }),
 /* 110 */
@@ -66793,10 +66793,10 @@ Object.defineProperty(exports, "Icon", {
     return _icon.Icon;
   }
 });
-Object.defineProperty(exports, "LeftRightVerticalAdapt", {
+Object.defineProperty(exports, "LeftRightVerticalAdaptLayout", {
   enumerable: true,
   get: function get() {
-    return _adapt.LeftRightVerticalAdapt;
+    return _adapt.LeftRightVerticalAdaptLayout;
   }
 });
 Object.defineProperty(exports, "IconTextIconItem", {
@@ -66805,15 +66805,21 @@ Object.defineProperty(exports, "IconTextIconItem", {
     return _icontexticonitem.IconTextIconItem;
   }
 });
+Object.defineProperty(exports, "IconButton", {
+  enumerable: true,
+  get: function get() {
+    return _button2.IconButton;
+  }
+});
 exports["default"] = void 0;
 
-var _button = __webpack_require__(71);
+var _button = __webpack_require__(50);
 
-var _single = __webpack_require__(50);
+var _single = __webpack_require__(51);
 
 var decorator = _interopRequireWildcard(__webpack_require__(695));
 
-var _widget = __webpack_require__(51);
+var _widget = __webpack_require__(52);
 
 var _icon = __webpack_require__(696);
 
@@ -66821,6 +66827,8 @@ var _adapt = __webpack_require__(697);
 
 var _icontexticonitem = __webpack_require__(699);
 
+var _button2 = __webpack_require__(700);
+
 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; }
@@ -67055,7 +67063,7 @@ exports.Model = Model;
 "use strict";
 
 
-var _single = __webpack_require__(50);
+var _single = __webpack_require__(51);
 
 /***/ }),
 /* 697 */
@@ -67073,7 +67081,7 @@ var _layout = __webpack_require__(698);
 "use strict";
 
 
-var _widget = __webpack_require__(51);
+var _widget = __webpack_require__(52);
 
 /***/ }),
 /* 699 */
@@ -67082,10 +67090,18 @@ var _widget = __webpack_require__(51);
 "use strict";
 
 
-var _button = __webpack_require__(71);
+var _button = __webpack_require__(50);
+
+/***/ }),
+/* 700 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _button = __webpack_require__(50);
 
 /***/ }),
-/* 700 */,
 /* 701 */,
 /* 702 */,
 /* 703 */,
@@ -67135,7 +67151,8 @@ var _button = __webpack_require__(71);
 /* 747 */,
 /* 748 */,
 /* 749 */,
-/* 750 */
+/* 750 */,
+/* 751 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -67298,17 +67315,17 @@ var _button = __webpack_require__(71);
 
 
 /***/ }),
-/* 751 */,
 /* 752 */,
 /* 753 */,
-/* 754 */
+/* 754 */,
+/* 755 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(755);
+/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(756);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13)))
 
 /***/ }),
-/* 755 */
+/* 756 */
 /***/ (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"); } }
@@ -68785,11 +68802,11 @@ var _button = __webpack_require__(71);
 
     exports.__esModule = true;
 });
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(54).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(55).setImmediate))
 
 /***/ }),
-/* 756 */,
-/* 757 */
+/* 757 */,
+/* 758 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -69085,7 +69102,6 @@ var _button = __webpack_require__(71);
 
 
 /***/ }),
-/* 758 */,
 /* 759 */,
 /* 760 */,
 /* 761 */,
@@ -69302,13 +69318,13 @@ var _button = __webpack_require__(71);
 /* 972 */,
 /* 973 */,
 /* 974 */,
-/* 975 */
+/* 975 */,
+/* 976 */
 /***/ (function(module, exports) {
 
 
 
 /***/ }),
-/* 976 */,
 /* 977 */,
 /* 978 */,
 /* 979 */,
@@ -69604,7 +69620,8 @@ var _button = __webpack_require__(71);
 /* 1269 */,
 /* 1270 */,
 /* 1271 */,
-/* 1272 */
+/* 1272 */,
+/* 1273 */
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(104);
@@ -69708,7 +69725,7 @@ __webpack_require__(374);
 __webpack_require__(134);
 __webpack_require__(135);
 __webpack_require__(136);
-__webpack_require__(754);
+__webpack_require__(755);
 __webpack_require__(375);
 __webpack_require__(376);
 __webpack_require__(377);
@@ -70084,9 +70101,9 @@ __webpack_require__(688);
 __webpack_require__(689);
 __webpack_require__(690);
 __webpack_require__(691);
-__webpack_require__(757);
-__webpack_require__(750);
-__webpack_require__(975);
+__webpack_require__(758);
+__webpack_require__(751);
+__webpack_require__(976);
 module.exports = __webpack_require__(692);
 
 

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

@@ -0,0 +1,4 @@
+import { BasicButton } from "../button.basic";
+export declare class IconButton extends BasicButton {
+    static xtype: string;
+}

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

@@ -1,4 +1,4 @@
-import { _Single } from "../single";
+import { _Single, Single } from "../single";
 export interface _AbstractLabel extends _Single {
     doRedMark(...args: any[]): void;
     unRedMark(...args: any[]): void;
@@ -8,3 +8,12 @@ export interface _AbstractLabel extends _Single {
     getText(): string;
     setStyle(css: any): void;
 }
+export declare class AbstractLabel extends Single {
+    doRedMark(...args: any[]): void;
+    unRedMark(...args: any[]): void;
+    doHighLight(...args: any[]): void;
+    unHighLight(...args: any[]): void;
+    setText(v: string): void;
+    getText(): string;
+    setStyle(css: any): void;
+}

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

@@ -1,5 +1,7 @@
-import { _AbstractLabel } from "./abstract.label";
+import { _AbstractLabel, AbstractLabel } from "./abstract.label";
 export interface _Label extends _AbstractLabel {
     doRedMark(...args: any[]): void;
     unRedMark(...args: any[]): void;
 }
+export declare class Label extends AbstractLabel {
+}

dist/lib/core/wrapper/layout/adapt/adapt.leftrightvertical.d.ts

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

dist/lib/index.d.ts

@@ -47,8 +47,9 @@ import { _DefaultLayout } from "./core/wrapper/layout/layout.default";
 import { _DownListCombo, _DownListComboStatic } from "./widget/downlist/combo.downlist";
 import { Icon } from "./base/single/icon/icon";
 import { _LeftVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftvertical";
-import { LeftRightVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftrightvertical";
+import { LeftRightVerticalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.leftrightvertical";
 import { IconTextIconItem } from "./base/single/button/listitem/icontexticonitem";
+import { IconButton } from "./base/single/button/buttons/button.icon";
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -104,11 +105,12 @@ export interface BI extends _func, _i18n, _base, _inject {
     SearchTextValueCombo: ClassConstructor<_SearchTextValueCombo> & _SearchTextValueComboStatic;
     Icon: typeof Icon;
     LeftVerticalAdaptLayout: ClassConstructor<_LeftVerticalAdapt>;
-    LeftRightVerticalAdapt: typeof LeftRightVerticalAdapt;
+    LeftRightVerticalAdaptLayout: typeof LeftRightVerticalAdaptLayout;
     IconTextIconItem: typeof IconTextIconItem;
+    IconButton: typeof IconButton;
 }
 declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { Widget, Single, BasicButton, Icon, IconTextIconItem, LeftRightVerticalAdapt, };
+export { Widget, Single, BasicButton, Icon, LeftRightVerticalAdaptLayout, IconTextIconItem, IconButton, };

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-11 16:20:32 */
+/*! time: 2020-12-11 17:50:28 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1097);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1098);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1473,7 +1473,7 @@ if (!_global.BI) {
     });
 })();
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(54).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(55).setImmediate))
 
 /***/ }),
 
@@ -1684,11 +1684,11 @@ if (!_global.BI) {
   attachTo.setImmediate = setImmediate;
   attachTo.clearImmediate = clearImmediate;
 })(typeof self === "undefined" ? typeof global === "undefined" ? void 0 : global : self);
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(68)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(13), __webpack_require__(69)))
 
 /***/ }),
 
-/***/ 1097:
+/***/ 1098:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(104);
@@ -1718,8 +1718,8 @@ __webpack_require__(121);
 __webpack_require__(122);
 __webpack_require__(123);
 __webpack_require__(124);
-__webpack_require__(958);
-__webpack_require__(1098);
+__webpack_require__(959);
+__webpack_require__(1099);
 __webpack_require__(134);
 __webpack_require__(135);
 module.exports = __webpack_require__(136);
@@ -1727,7 +1727,7 @@ module.exports = __webpack_require__(136);
 
 /***/ }),
 
-/***/ 1098:
+/***/ 1099:
 /***/ (function(module, exports) {
 
 /**
@@ -8887,7 +8887,7 @@ BI.Req = {
 
 /***/ }),
 
-/***/ 54:
+/***/ 55:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -8955,7 +8955,7 @@ exports.clearImmediate = typeof self !== "undefined" && self.clearImmediate || t
 
 /***/ }),
 
-/***/ 68:
+/***/ 69:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -9172,7 +9172,7 @@ process.umask = function () {
 
 /***/ }),
 
-/***/ 958:
+/***/ 959:
 /***/ (function(module, exports) {
 
 BI.i18n = {

package.json

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

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

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

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

@@ -1,4 +1,4 @@
-import { _Single } from "../single";
+import { _Single, Single } from "../single";
 
 export interface _AbstractLabel extends _Single {
     doRedMark(...args: any[]): void;
@@ -15,3 +15,19 @@ export interface _AbstractLabel extends _Single {
 
     setStyle(css: any): void;
 }
+
+export declare class AbstractLabel extends Single {
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+
+    doHighLight(...args: any[]): void;
+
+    unHighLight(...args: any[]): void;
+
+    setText(v: string): void;
+
+    getText(): string;
+
+    setStyle(css: any): void;
+}

typescript/base/single/label/label.ts

@@ -1,7 +1,9 @@
-import { _AbstractLabel } from "./abstract.label";
+import { _AbstractLabel, AbstractLabel } from "./abstract.label";
 
 export interface _Label extends _AbstractLabel {
     doRedMark(...args: any[]): void;
 
     unRedMark(...args: any[]): void
 }
+
+export declare class Label extends AbstractLabel {}

typescript/index.ts

@@ -52,6 +52,7 @@ import { IconTextIconItem } from "./base/single/button/listitem/icontexticonitem
 import { HorizontalAutoLayout } from "./core/wrapper/layout/adapt/auto.horizontal";
 import { InlineVerticalAdaptLayout } from "./core/wrapper/layout/adapt/inline.vertical";
 import { TableAdaptLayout } from "./core/wrapper/layout/adapt/adapt.table";
+import { IconButton } from "./base/single/button/buttons/button.icon";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -116,6 +117,7 @@ export interface BI extends _func, _i18n, _base, _inject {
     InlineVerticalAdaptLayout: typeof InlineVerticalAdaptLayout;
     RightVerticalAdaptLayout: typeof RightVerticalAdaptLayout;
     TableAdaptLayout: typeof TableAdaptLayout;
+    IconButton: typeof IconButton;
 }
 
 export default {
@@ -132,4 +134,5 @@ export {
     InlineVerticalAdaptLayout,
     RightVerticalAdaptLayout,
     TableAdaptLayout,
+    IconButton,
 };