diff --git a/apps/web-ele/src/views/demos/element/index.vue b/apps/web-ele/src/views/demos/element/index.vue index 413eea9613b..2625cebdfc9 100644 --- a/apps/web-ele/src/views/demos/element/index.vue +++ b/apps/web-ele/src/views/demos/element/index.vue @@ -57,6 +57,7 @@ const tableData = [ + Text Default Primary Info diff --git a/apps/web-naive/src/adapter/component/index.ts b/apps/web-naive/src/adapter/component/index.ts index 66b3744bc89..c5dffddb8dc 100644 --- a/apps/web-naive/src/adapter/component/index.ts +++ b/apps/web-naive/src/adapter/component/index.ts @@ -68,7 +68,7 @@ async function initComponentAdapter() { DatePicker: NDatePicker, // 自定义默认按钮 DefaultButton: (props, { attrs, slots }) => { - return h(NButton, { ...props, attrs, type: 'info' }, slots); + return h(NButton, { ...props, attrs, type: 'default' }, slots); }, // 自定义主要按钮 PrimaryButton: (props, { attrs, slots }) => { diff --git a/docs/src/components/common-ui/vben-form.md b/docs/src/components/common-ui/vben-form.md index ef0e99eecb1..e099c6481d9 100644 --- a/docs/src/components/common-ui/vben-form.md +++ b/docs/src/components/common-ui/vben-form.md @@ -333,6 +333,8 @@ export interface ActionButtonOptions { show?: boolean; /** 按钮文本 */ text?: string; + /** 任意属性 */ + [key: string]: any; } ``` diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts index 6e228c34ba1..2070192734f 100644 --- a/internal/vite-config/src/config/application.ts +++ b/internal/vite-config/src/config/application.ts @@ -60,8 +60,8 @@ function defineApplicationConfig(userConfigPromise?: DefineApplicationOptions) { rollupOptions: { output: { assetFileNames: '[ext]/[name]-[hash].[ext]', - chunkFileNames: 'js/[name]-[hash].mjs', - entryFileNames: 'jse/index-[name]-[hash].mjs', + chunkFileNames: 'js/[name]-[hash].js', + entryFileNames: 'jse/index-[name]-[hash].js', }, }, target: 'es2015', diff --git a/packages/@core/base/design/src/design-tokens/dark.css b/packages/@core/base/design/src/design-tokens/dark.css index 07776f5bc7c..6d236253e0b 100644 --- a/packages/@core/base/design/src/design-tokens/dark.css +++ b/packages/@core/base/design/src/design-tokens/dark.css @@ -58,7 +58,7 @@ /* Used for accents such as hover effects on , ...etc */ --accent: 216 5% 19%; - --accent-lighter: 216 5% 11%; + --accent-lighter: 216 5% 12%; --accent-hover: 216 5% 24%; --accent-foreground: 0 0% 98%; diff --git a/packages/@core/base/icons/src/index.ts b/packages/@core/base/icons/src/index.ts index 89ebd9af5a7..1e0fe56446f 100644 --- a/packages/@core/base/icons/src/index.ts +++ b/packages/@core/base/icons/src/index.ts @@ -2,4 +2,6 @@ export { default as EmptyIcon } from './components/empty.vue'; export * from './create-icon'; export * from './lucide'; -export * from '@iconify/vue'; + +export type { IconifyIcon as IconifyIconStructure } from '@iconify/vue'; +export { addCollection, addIcon, Icon as IconifyIcon } from '@iconify/vue'; diff --git a/packages/@core/base/shared/src/color/color.ts b/packages/@core/base/shared/src/color/color.ts new file mode 100644 index 00000000000..e3cefdb2cba --- /dev/null +++ b/packages/@core/base/shared/src/color/color.ts @@ -0,0 +1,9 @@ +import { TinyColor } from '@ctrl/tinycolor'; + +export function isDarkColor(color: string) { + return new TinyColor(color).isDark(); +} + +export function isLightColor(color: string) { + return new TinyColor(color).isLight(); +} diff --git a/packages/@core/base/shared/src/color/index.ts b/packages/@core/base/shared/src/color/index.ts index e1b74aa5e5e..9fade3d2129 100644 --- a/packages/@core/base/shared/src/color/index.ts +++ b/packages/@core/base/shared/src/color/index.ts @@ -1,2 +1,3 @@ +export * from './color'; export * from './convert'; export * from './generator'; diff --git a/packages/@core/ui-kit/form-ui/src/types.ts b/packages/@core/ui-kit/form-ui/src/types.ts index dc725bf1d34..5f21befd160 100644 --- a/packages/@core/ui-kit/form-ui/src/types.ts +++ b/packages/@core/ui-kit/form-ui/src/types.ts @@ -289,6 +289,7 @@ export interface FormRenderProps< } export interface ActionButtonOptions extends VbenButtonProps { + [key: string]: any; content?: string; show?: boolean; } diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue b/packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue index afaad24e9be..bb3d3a5bf78 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue @@ -1,7 +1,7 @@