From 732054bfd699817c954c7c9190a817b340c6e54d Mon Sep 17 00:00:00 2001 From: windy Date: Tue, 22 Nov 2022 15:54:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?BI-117684=20=E8=A7=86=E8=A7=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/button/button.less | 1 + src/less/lib/theme.less | 1 + 2 files changed, 2 insertions(+) diff --git a/src/less/base/single/button/button.less b/src/less/base/single/button/button.less index b9aad6d1a..d404edd24 100644 --- a/src/less/base/single/button/button.less +++ b/src/less/base/single/button/button.less @@ -502,6 +502,7 @@ body .bi-button, #body .bi-button { &.button-error.disabled, &.button-warning.disabled { &, &.base-disabled { + color: @color-bi-text-disabled-button-theme-dark !important; border-color: @color-bi-border-dark-gray-line-theme-dark !important; background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important; @ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%)); diff --git a/src/less/lib/theme.less b/src/less/lib/theme.less index 1092dd18a..50339345c 100644 --- a/src/less/lib/theme.less +++ b/src/less/lib/theme.less @@ -125,6 +125,7 @@ @color-bi-text-error-clear-button: @color-bi-text-failure; @color-bi-text-error-ghost-button: @color-bi-text-failure; @color-bi-text-disabled-button: @color-bi-text-disabled; +@color-bi-text-disabled-button-theme-dark: @color-bi-text-disabled-theme-dark; @color-bi-background-disabled-button: @color-bi-background-light-disabled; @color-bi-border-disabled-button: @color-bi-border-disabled; @color-bi-text-disabled-ignore-button: @color-bi-text-disabled; From 2b4c5600dff49eed1d4effc6c3515fab77f79928 Mon Sep 17 00:00:00 2001 From: "Xavier.Meng" Date: Tue, 22 Nov 2022 17:09:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A0JIRA=20refactor(each):=20=E5=8A=A0?= =?UTF-8?q?=E4=B8=AA=E9=87=8D=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/core/base.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/typescript/core/base.ts b/typescript/core/base.ts index 6182a0833..4d6550f4f 100644 --- a/typescript/core/base.ts +++ b/typescript/core/base.ts @@ -38,7 +38,9 @@ export interface _base { size: (collection: any) => number; - each: (collection: T[] | object | string, callback?: ((index: number, value: T) => void) | object | string, thisArg?: any) => any; + each(collection: ArrayLike, iteratee?: (index: number, value: T) => void, thisArg?: any): ArrayLike; + each(collection: T, iteratee?: (index: K, value: T[K]) => void, thisArg?: any): T; + each(collection: T, iteratee?: any, thisArg?: any): T; map: (collection: T[] | object | string | null | undefined, callback?: ((index: number, value: T) => U) | object | string, thisArg?: any) => U[]; From 5c2ccee8b818da16de397e2b427e1e12f0d08680 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 22 Nov 2022 17:25:58 +0800 Subject: [PATCH 3/5] auto upgrade version to 2.0.20221122172525 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 99f620e2d..09b179d9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221122144609", + "version": "2.0.20221122172525", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 715c07db5d3fbf96ab3c2bb4fe9d671dbaad7777 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 22 Nov 2022 22:25:18 +0800 Subject: [PATCH 4/5] auto upgrade version to 2.0.20221122222501 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09b179d9e..25a16e4fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221122172525", + "version": "2.0.20221122222501", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From de13f33d440aff07f51082090b6f7cb74c508efd Mon Sep 17 00:00:00 2001 From: data Date: Wed, 23 Nov 2022 10:54:55 +0800 Subject: [PATCH 5/5] auto upgrade version to 2.0.20221123105406 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25a16e4fe..5ee1f98d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221122222501", + "version": "2.0.20221123105406", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",