diff --git a/package.json b/package.json index 99f620e2d..5ee1f98d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221122144609", + "version": "2.0.20221123105406", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", 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; 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[];