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

4 years ago · d175457dc8
33 changed files with 39 additions and 32 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.ie.min.js.map
+++ b/dist/2.0/fineui.ie.min.js.map
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2020-12-14 14:40:28 */
+/*! time: 2020-12-14 15:10:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/2.0/fineui.js.map
+++ b/dist/2.0/fineui.js.map
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/2.0/fineui.min.js.map
+++ b/dist/2.0/fineui.min.js.map
--- a/dist/2.0/fineui_without_normalize.css
+++ b/dist/2.0/fineui_without_normalize.css
--- a/dist/2.0/fineui_without_normalize.min.css
+++ b/dist/2.0/fineui_without_normalize.min.css
--- a/dist/core.css
+++ b/dist/core.css
--- a/dist/core.js
+++ b/dist/core.js
@ -1,4 +1,4 @@
-/*! time: 2020-12-14 14:40:28 */
+/*! time: 2020-12-14 15:10:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/core.js.map
+++ b/dist/core.js.map
--- a/dist/demo.css
+++ b/dist/demo.css
--- a/dist/demo.js
+++ b/dist/demo.js
@ -1,4 +1,4 @@
-/*! time: 2020-12-14 14:40:28 */
+/*! time: 2020-12-14 15:10:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/dist/fineui.css
+++ b/dist/fineui.css
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.ie.min.js.map
+++ b/dist/fineui.ie.min.js.map
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2020-12-14 14:40:28 */
+/*! time: 2020-12-14 15:10:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/fineui.js.map
+++ b/dist/fineui.js.map
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui.min.js.map
+++ b/dist/fineui.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2020-12-14 14:40:28 */
+/*! time: 2020-12-14 15:10:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/fineui_without_jquery_polyfill.js.map
+++ b/dist/fineui_without_jquery_polyfill.js.map
--- a/dist/font.css
+++ b/dist/font.css
--- a/dist/lib/base/single/button/buttons/button.d.ts
+++ b/dist/lib/base/single/button/buttons/button.d.ts
@ -1,3 +1,4 @@
+import { IconLabel, Label } from "../../../..";
 import { BasicButton, _BasicButton } from "../button.basic";
 export interface _Button extends _BasicButton {
    doRedMark(...args: any[]): void;
@ -11,6 +12,8 @@ export interface _ButtonStatic {
 export declare class Button extends BasicButton {
    static xtype: string;
    static EVENT_CHANGE: string;
+    text: Label;
+    icon?: IconLabel;
    doRedMark(...args: any[]): void;
    unRedMark(...args: any[]): void;
    doHighLight(...args: any[]): void;
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2020-12-14 14:40:28 */
+/*! time: 2020-12-14 15:10:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20201214144203",
+  "version": "2.0.20201214151205",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/typescript/base/single/button/buttons/button.ts
+++ b/typescript/base/single/button/buttons/button.ts
@ -1,3 +1,4 @@
+import { IconLabel, Label } from "../../../..";
 import { BasicButton, _BasicButton } from "../button.basic";

 export interface _Button extends _BasicButton {
@ -18,6 +19,9 @@ export declare class Button extends BasicButton {
    static xtype: string;
    
    static EVENT_CHANGE: string;
+
+    text: Label;
+    icon?: IconLabel;
    
    doRedMark(...args: any[]): void;

@ -26,4 +30,4 @@ export declare class Button extends BasicButton {
    doHighLight(...args: any[]): void;

    unHighLight(...args: any[]): void;
-}
+}