mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-08-26 16:46:19 +08:00
fix: an error was reported in the adaptation of the naive component library theme (#4041)
* fix: naive组件库 主题适配报错,需将hsl转换为rgb格式 * feat: 增加NDataTable示例 * chore: hsl转换函数移动到@vben/utils内 * fix: 优化正则表达式 * fix: 优化正则表达式2 * fix: 正则表达式优化,优化hlsStringToRGB函数 * fix: 使用tinyColor进行转换 * Update packages/@core/base/shared/src/colorful/convert.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix: lint error --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: vince <vince292007@gmail.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { reactive, watch } from 'vue';
|
||||
|
||||
import { preferences } from '@vben/preferences';
|
||||
import { updateCSSVariables } from '@vben/utils';
|
||||
import { hlsStringToRGBString, updateCSSVariables } from '@vben/utils';
|
||||
|
||||
/**
|
||||
* 用于适配各个框架的设计系统
|
||||
@@ -102,7 +102,7 @@ export function useNaiveDesignTokens() {
|
||||
|
||||
const getCssVariableValue = (variable: string, isColor: boolean = true) => {
|
||||
const value = rootStyles.getPropertyValue(variable);
|
||||
return isColor ? `hsl(${value})` : value;
|
||||
return isColor ? hlsStringToRGBString(value) : value;
|
||||
};
|
||||
|
||||
watch(
|
||||
@@ -150,7 +150,6 @@ export function useNaiveDesignTokens() {
|
||||
},
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
return {
|
||||
commonTokens,
|
||||
};
|
||||
|
Reference in New Issue
Block a user