diff --git a/demo/js/base/button/demo.button.js b/demo/js/base/button/demo.button.js index 45860ff70..6098389e7 100644 --- a/demo/js/base/button/demo.button.js +++ b/demo/js/base/button/demo.button.js @@ -193,6 +193,41 @@ Demo.Button = BI.inherit(BI.Widget, { ghost: true, height: 30 } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + height: 30 + } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + level: "warning", + height: 30 + } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + level: "error", + height: 30 + } + }, { + el: { + type: "bi.button", + iconCls: "plus-font", + text: "幽灵按钮(common)", + ghost: true, + level: "success", + height: 30 + } }, { el: { type: "bi.button", @@ -246,7 +281,7 @@ Demo.Button = BI.inherit(BI.Widget, { el: { type: "bi.button", text: "浅色的一般按钮", - iconCls: "close-font", + iconCls: "plus-font", light: true } }, { @@ -254,7 +289,7 @@ Demo.Button = BI.inherit(BI.Widget, { type: "bi.button", text: "浅色的成功按钮", level: "success", - iconCls: "close-font", + iconCls: "plus-font", light: true } }, { @@ -262,15 +297,16 @@ Demo.Button = BI.inherit(BI.Widget, { type: "bi.button", text: "浅色的警告按钮", level: "warning", - iconCls: "close-font", + iconCls: "plus-font", light: true } }, { el: { type: "bi.button", - iconCls: "close-font", + iconCls: "plus-font", text: "浅色的失败按钮", level: "error", + cls: "hover-mask", light: true } }]; diff --git a/package.json b/package.json index 2818e8c76..fcf21c82e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220605160539", + "version": "2.0.20220606111559", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", diff --git a/src/base/list/virtualgrouplist.js b/src/base/list/virtualgrouplist.js index 9039552c2..0eae74875 100644 --- a/src/base/list/virtualgrouplist.js +++ b/src/base/list/virtualgrouplist.js @@ -14,6 +14,7 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, { scrollTop: 0, rowHeight: "auto", items: [], + el: {}, itemFormatter: function (item, index) { return item; } @@ -39,10 +40,10 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, { ref: function () { self.container = this; }, - layouts: [{ + layouts: [BI.extend({ type: "bi.vertical", scrolly: false - }] + }, o.el)] }, { type: "bi.layout", ref: function () { diff --git a/src/less/base/single/button/button.less b/src/less/base/single/button/button.less index 6faa28452..f6f24bfa6 100644 --- a/src/less/base/single/button/button.less +++ b/src/less/base/single/button/button.less @@ -64,7 +64,7 @@ body .bi-button, #body .bi-button { &, & .b-font:before { color: @color-bi-text-common-ghost-button; } - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-hover-common-ghost-button; } @@ -136,7 +136,7 @@ body .bi-button, #body .bi-button { color: @color-bi-text-success-ghost-button; } background-color: transparent; - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-success-button; } @@ -181,7 +181,7 @@ body .bi-button, #body .bi-button { color: @color-bi-text-warning-ghost-button; } background-color: transparent; - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-warning-button; } @@ -226,7 +226,7 @@ body .bi-button, #body .bi-button { color: @color-bi-text-error-ghost-button; } background-color: transparent; - &:hover, &:focus { + &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before { color: @color-bi-text; background-color: @color-bi-background-error-button; } diff --git a/typescript/base/single/label/abstract.label.ts b/typescript/base/single/label/abstract.label.ts index 966651b84..431d79ab6 100644 --- a/typescript/base/single/label/abstract.label.ts +++ b/typescript/base/single/label/abstract.label.ts @@ -4,7 +4,7 @@ export declare class AbstractLabel extends Single { static xtype: string; props: { - textAlign?: "left" | "center" | "right"; + textAlign?: "left" | "center" | "right" | "justify"; whiteSpace?: "nowrap" | "normal"; textWidth?: number | null; textHeight?: number | null;