From 22550f13bd439cc7ce00f03d827327e80a57afe4 Mon Sep 17 00:00:00 2001 From: treecat Date: Thu, 2 Jun 2022 15:22:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?DESIGN-4069=20fix:=20=E5=B9=BD=E7=81=B5?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87=E6=82=AC=E6=B5=AE=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/base/button/demo.button.js | 44 ++++++++++++++++++++++--- src/less/base/single/button/button.less | 8 ++--- 2 files changed, 44 insertions(+), 8 deletions(-) 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/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; } From 0d5e068e1ff1bc509525c89fdfded60850d56a8e Mon Sep 17 00:00:00 2001 From: imp Date: Sun, 5 Jun 2022 17:06:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=97=E5=B8=83=E5=B1=80=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/list/virtualgrouplist.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 () { From 23323356c1059bb70ca7c64267ec5774272ef8b3 Mon Sep 17 00:00:00 2001 From: data Date: Sun, 5 Jun 2022 17:34:27 +0800 Subject: [PATCH 3/7] auto upgrade version to 2.0.20220605173417 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2818e8c76..7941362ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220605160539", + "version": "2.0.20220605173417", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From b7b605ae054f8060592184a1d566c4bab1369be2 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 6 Jun 2022 10:14:06 +0800 Subject: [PATCH 4/7] auto upgrade version to 2.0.20220606101359 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7941362ee..d12e4a3f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220605173417", + "version": "2.0.20220606101359", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 1c657e4e2196a4299e24d458986ee40fd4dce82a Mon Sep 17 00:00:00 2001 From: Kira Date: Mon, 6 Jun 2022 10:46:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?chore:=20=E7=B1=BB=E5=9E=8B=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/single/label/abstract.label.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 77c1d83f180267bd569309041deaeebac33b3cf8 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 6 Jun 2022 11:05:40 +0800 Subject: [PATCH 6/7] auto upgrade version to 2.0.20220606110526 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d12e4a3f8..1272ae0e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220606101359", + "version": "2.0.20220606110526", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From ac923fe0bce31cfe35d03c6b052ddce258363db1 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 6 Jun 2022 11:16:12 +0800 Subject: [PATCH 7/7] auto upgrade version to 2.0.20220606111559 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1272ae0e9..fcf21c82e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220606110526", + "version": "2.0.20220606111559", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",