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

3 years ago · c1d3af14bb
41 changed files with 171 additions and 76 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: 2021-5-18 10:10:23 AM */
+/*! time: 2021-5-18 1:50:16 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -31294,9 +31294,17 @@ BI.Toast = BI.inherit(BI.Tip, {
            e.stopEvent();
            return false;
        };
-        this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
+        this.element.bind({
+            click: fn,
+            mousedown: fn,
+            mouseup: fn,
+            mouseover: fn,
+            mouseenter: fn,
+            mouseleave: fn,
+            mousemove: fn
+        });
        var cls = "close-font";
-        switch(o.level) {
+        switch (o.level) {
            case "success":
                cls = "toast-success-font";
                break;
@ -31329,7 +31337,7 @@ BI.Toast = BI.inherit(BI.Tip, {

        var columnSize = [36, ""];

-        if(o.autoClose === false) {
+        if (o.autoClose === false) {
            items.push({
                type: "bi.icon_button",
                cls: "close-font toast-icon",
@ -31342,7 +31350,8 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        this.text = BI.createWidget({
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal",
+            horizontalAlign: BI.HorizontalAlign.Stretch,
            element: this,
            items: items,
            vgap: 7,
--- 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: 2021-5-18 10:10:23 AM */
+/*! time: 2021-5-18 1:50:16 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -31294,9 +31294,17 @@ BI.Toast = BI.inherit(BI.Tip, {
            e.stopEvent();
            return false;
        };
-        this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
+        this.element.bind({
+            click: fn,
+            mousedown: fn,
+            mouseup: fn,
+            mouseover: fn,
+            mouseenter: fn,
+            mouseleave: fn,
+            mousemove: fn
+        });
        var cls = "close-font";
-        switch(o.level) {
+        switch (o.level) {
            case "success":
                cls = "toast-success-font";
                break;
@ -31329,7 +31337,7 @@ BI.Toast = BI.inherit(BI.Tip, {

        var columnSize = [36, ""];

-        if(o.autoClose === false) {
+        if (o.autoClose === false) {
            items.push({
                type: "bi.icon_button",
                cls: "close-font toast-icon",
@ -31342,7 +31350,8 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        this.text = BI.createWidget({
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal",
+            horizontalAlign: BI.HorizontalAlign.Stretch,
            element: this,
            items: items,
            vgap: 7,
--- 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: 2021-5-18 10:10:23 AM */
+/*! time: 2021-5-18 1:50:16 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -31294,9 +31294,17 @@ BI.Toast = BI.inherit(BI.Tip, {
            e.stopEvent();
            return false;
        };
-        this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
+        this.element.bind({
+            click: fn,
+            mousedown: fn,
+            mouseup: fn,
+            mouseover: fn,
+            mouseenter: fn,
+            mouseleave: fn,
+            mousemove: fn
+        });
        var cls = "close-font";
-        switch(o.level) {
+        switch (o.level) {
            case "success":
                cls = "toast-success-font";
                break;
@ -31329,7 +31337,7 @@ BI.Toast = BI.inherit(BI.Tip, {

        var columnSize = [36, ""];

-        if(o.autoClose === false) {
+        if (o.autoClose === false) {
            items.push({
                type: "bi.icon_button",
                cls: "close-font toast-icon",
@ -31342,7 +31350,8 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        this.text = BI.createWidget({
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal",
+            horizontalAlign: BI.HorizontalAlign.Stretch,
            element: this,
            items: items,
            vgap: 7,
--- 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: 2021-5-18 10:10:23 AM */
+/*! time: 2021-5-18 1:50:16 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -31294,9 +31294,17 @@ BI.Toast = BI.inherit(BI.Tip, {
            e.stopEvent();
            return false;
        };
-        this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
+        this.element.bind({
+            click: fn,
+            mousedown: fn,
+            mouseup: fn,
+            mouseover: fn,
+            mouseenter: fn,
+            mouseleave: fn,
+            mousemove: fn
+        });
        var cls = "close-font";
-        switch(o.level) {
+        switch (o.level) {
            case "success":
                cls = "toast-success-font";
                break;
@ -31329,7 +31337,7 @@ BI.Toast = BI.inherit(BI.Tip, {

        var columnSize = [36, ""];

-        if(o.autoClose === false) {
+        if (o.autoClose === false) {
            items.push({
                type: "bi.icon_button",
                cls: "close-font toast-icon",
@ -31342,7 +31350,8 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        this.text = BI.createWidget({
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal",
+            horizontalAlign: BI.HorizontalAlign.Stretch,
            element: this,
            items: items,
            vgap: 7,
--- 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.proxy.css
+++ b/dist/fineui.proxy.css
--- a/dist/fineui.proxy.js
+++ b/dist/fineui.proxy.js
@ -1,4 +1,4 @@
-/*! time: 2021-5-18 10:10:23 AM */
+/*! time: 2021-5-18 1:50:16 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -28755,9 +28755,17 @@ BI.Toast = BI.inherit(BI.Tip, {
            e.stopEvent();
            return false;
        };
-        this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
+        this.element.bind({
+            click: fn,
+            mousedown: fn,
+            mouseup: fn,
+            mouseover: fn,
+            mouseenter: fn,
+            mouseleave: fn,
+            mousemove: fn
+        });
        var cls = "close-font";
-        switch(o.level) {
+        switch (o.level) {
            case "success":
                cls = "toast-success-font";
                break;
@ -28790,7 +28798,7 @@ BI.Toast = BI.inherit(BI.Tip, {

        var columnSize = [36, ""];

-        if(o.autoClose === false) {
+        if (o.autoClose === false) {
            items.push({
                type: "bi.icon_button",
                cls: "close-font toast-icon",
@ -28803,7 +28811,8 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        this.text = BI.createWidget({
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal",
+            horizontalAlign: BI.HorizontalAlign.Stretch,
            element: this,
            items: items,
            vgap: 7,
--- a/dist/fineui.proxy.js.map
+++ b/dist/fineui.proxy.js.map
--- a/dist/fineui.proxy.min.css
+++ b/dist/fineui.proxy.min.css
--- a/dist/fineui.proxy.min.js
+++ b/dist/fineui.proxy.min.js
--- a/dist/fineui.proxy.min.js.map
+++ b/dist/fineui.proxy.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2021-5-18 10:10:23 AM */
+/*! time: 2021-5-18 1:50:16 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -28365,9 +28365,17 @@ BI.Toast = BI.inherit(BI.Tip, {
            e.stopEvent();
            return false;
        };
-        this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
+        this.element.bind({
+            click: fn,
+            mousedown: fn,
+            mouseup: fn,
+            mouseover: fn,
+            mouseenter: fn,
+            mouseleave: fn,
+            mousemove: fn
+        });
        var cls = "close-font";
-        switch(o.level) {
+        switch (o.level) {
            case "success":
                cls = "toast-success-font";
                break;
@ -28400,7 +28408,7 @@ BI.Toast = BI.inherit(BI.Tip, {

        var columnSize = [36, ""];

-        if(o.autoClose === false) {
+        if (o.autoClose === false) {
            items.push({
                type: "bi.icon_button",
                cls: "close-font toast-icon",
@ -28413,7 +28421,8 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        this.text = BI.createWidget({
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal",
+            horizontalAlign: BI.HorizontalAlign.Stretch,
            element: this,
            items: items,
            vgap: 7,
--- 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/button.basic.d.ts
+++ b/dist/lib/base/single/button/button.basic.d.ts
@ -2,6 +2,35 @@ import { Single } from "../single";
 export declare class BasicButton extends Single {
    static EVENT_CHANGE: string;
    static xtype: string;
+    props: {
+        stopEvent?: boolean;
+        stopPropagation?: boolean;
+        selected?: boolean;
+        /**
+         * 点击一次选中有效,再点无效
+         */
+        once?: boolean;
+        /**
+         * 点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发
+         */
+        forceSelected?: boolean;
+        /**
+         * 无论怎么点击都不会被选中
+         */
+        forceNotSelected?: boolean;
+        /**
+         * 使能选中
+         */
+        disableSelected?: boolean;
+        shadow?: boolean;
+        /**
+         * 选中状态下是否显示阴影
+         */
+        isShadowShowingOnSelected?: boolean;
+        trigger?: string | null;
+        handler?: Function;
+        bubble?: Function | null;
+    } & Single['props'];
    _createShadow(): void;
    bindEvent(): void;
    _trigger(e: Event): void;
--- a/dist/lib/base/single/button/button.node.d.ts
+++ b/dist/lib/base/single/button/button.node.d.ts
@ -1,5 +1,8 @@
 import { BasicButton } from "./button.basic";
 export declare class NodeButton extends BasicButton {
+    props: {
+        open?: boolean;
+    } & BasicButton['props'];
    isOpened(): boolean;
    setOpened(b: boolean): void;
    triggerCollapse(): void;
--- a/dist/lib/base/single/single.d.ts
+++ b/dist/lib/base/single/single.d.ts
@ -5,16 +5,16 @@ interface SingleOpt {
 }
 export declare class Single extends Widget {
    props: {
-        readonly: boolean;
-        title: string | (() => string) | null;
-        warningTitle: string | (() => string) | null;
-        tipType: "success" | "warning";
-        value: string | null;
+        readonly?: boolean;
+        title?: string | (() => string) | null;
+        warningTitle?: string | (() => string) | null;
+        tipType?: "success" | "warning";
+        value?: any;
        /**
         * title是否跟随鼠标
         * @default false
         */
-        belowMouse: boolean;
+        belowMouse?: boolean;
    };
    _showToolTip(e: Event, opt?: SingleOpt): void;
    _hideTooltip(): void;
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2021-5-18 10:10:23 AM */
+/*! time: 2021-5-18 1:50:16 PM */
 /******/ (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.20210518101126",
+  "version": "2.0.20210518135118",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/base/single/tip/tip.toast.js
+++ b/src/base/single/tip/tip.toast.js
@ -30,9 +30,17 @@ BI.Toast = BI.inherit(BI.Tip, {
            e.stopEvent();
            return false;
        };
-        this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
+        this.element.bind({
+            click: fn,
+            mousedown: fn,
+            mouseup: fn,
+            mouseover: fn,
+            mouseenter: fn,
+            mouseleave: fn,
+            mousemove: fn
+        });
        var cls = "close-font";
-        switch(o.level) {
+        switch (o.level) {
            case "success":
                cls = "toast-success-font";
                break;
@ -65,7 +73,7 @@ BI.Toast = BI.inherit(BI.Tip, {

        var columnSize = [36, ""];

-        if(o.autoClose === false) {
+        if (o.autoClose === false) {
            items.push({
                type: "bi.icon_button",
                cls: "close-font toast-icon",
@ -78,7 +86,8 @@ BI.Toast = BI.inherit(BI.Tip, {
        }

        this.text = BI.createWidget({
-            type: "bi.horizontal_adapt",
+            type: "bi.horizontal",
+            horizontalAlign: BI.HorizontalAlign.Stretch,
            element: this,
            items: items,
            vgap: 7,