From 891fd803f7a4c2a28eb4ff11aad15b86f04f39a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:00:18 +0800 Subject: [PATCH 1/3] chore(deps-dev): bump vite-plugin-dts from 4.0.0-beta.2 to 4.0.0 (#4061) Bumps [vite-plugin-dts](https://github.com/qmhc/vite-plugin-dts) from 4.0.0-beta.2 to 4.0.0. - [Release notes](https://github.com/qmhc/vite-plugin-dts/releases) - [Changelog](https://github.com/qmhc/vite-plugin-dts/blob/main/CHANGELOG.md) - [Commits](https://github.com/qmhc/vite-plugin-dts/compare/v4.0.0-beta.2...v4.0.0) --- updated-dependencies: - dependency-name: vite-plugin-dts dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- internal/vite-config/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 4e4571c2..27b8d5e7 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -50,7 +50,7 @@ "sass": "^1.77.8", "vite": "^5.3.5", "vite-plugin-compression": "^0.5.1", - "vite-plugin-dts": "4.0.0-beta.2", + "vite-plugin-dts": "4.0.0", "vite-plugin-html": "^3.2.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9ea2f8a3..1be47301 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -633,8 +633,8 @@ importers: specifier: ^0.5.1 version: 0.5.1(vite@5.3.5(@types/node@22.1.0)(sass@1.77.8)(terser@5.31.3)) vite-plugin-dts: - specifier: 4.0.0-beta.2 - version: 4.0.0-beta.2(@types/node@22.1.0)(rollup@4.20.0)(typescript@5.5.4)(vite@5.3.5(@types/node@22.1.0)(sass@1.77.8)(terser@5.31.3)) + specifier: 4.0.0 + version: 4.0.0(@types/node@22.1.0)(rollup@4.20.0)(typescript@5.5.4)(vite@5.3.5(@types/node@22.1.0)(sass@1.77.8)(terser@5.31.3)) vite-plugin-html: specifier: ^3.2.2 version: 3.2.2(vite@5.3.5(@types/node@22.1.0)(sass@1.77.8)(terser@5.31.3)) @@ -9168,8 +9168,8 @@ packages: peerDependencies: vite: '>=2.0.0' - vite-plugin-dts@4.0.0-beta.2: - resolution: {integrity: sha512-7PYDxeKvFjRpeqvWTRT8YqX2J1uOrxgvHtXkRYAMfjonIHMSz/ZXjxPiRefBbXOTydqWk7jSZK3vwEt4Gvzbfw==} + vite-plugin-dts@4.0.0: + resolution: {integrity: sha512-MOGyecSNqXGxExPfDYtsH3cFted5UA04BP3JdI05i2BQRJmgjKeeUn6ymAWnEpZ6UY88Xd1n1NDmkO9q7YB5vA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -18501,7 +18501,7 @@ snapshots: transitivePeerDependencies: - supports-color - vite-plugin-dts@4.0.0-beta.2(@types/node@22.1.0)(rollup@4.20.0)(typescript@5.5.4)(vite@5.3.5(@types/node@22.1.0)(sass@1.77.8)(terser@5.31.3)): + vite-plugin-dts@4.0.0(@types/node@22.1.0)(rollup@4.20.0)(typescript@5.5.4)(vite@5.3.5(@types/node@22.1.0)(sass@1.77.8)(terser@5.31.3)): dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@22.1.0) '@rollup/pluginutils': 5.1.0(rollup@4.20.0) From 279a3a4c218b3689047a2248ab30c5be00e784ab Mon Sep 17 00:00:00 2001 From: vince Date: Wed, 7 Aug 2024 12:01:53 +0800 Subject: [PATCH 2/3] fix: ci build failed (#4066) --- .github/workflows/build.yml | 3 --- package.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73c1c065..154922b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,9 +21,6 @@ jobs: post-update: # if: ${{ github.actor == 'dependabot[bot]' }} runs-on: ubuntu-latest - env: - TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} - TURBO_TEAM: ${{ secrets.TURBO_TEAM }} steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/package.json b/package.json index 2cce7e19..c88a1116 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "node": ">=20", "pnpm": ">=9" }, - "packageManager": "pnpm@9.6.0", + "packageManager": "pnpm@9.7.0", "pnpm": { "peerDependencyRules": { "allowedVersions": { From d9ba9917ffce0463ecc05f2ffc5fe7ca15d02788 Mon Sep 17 00:00:00 2001 From: jinmao88 <50581550+jinmao88@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:13:54 +0800 Subject: [PATCH 3/3] fix: an error was reported in the adaptation of the naive component library theme (#4041) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- apps/web-naive/src/locales/langs/en-US.json | 3 +- apps/web-naive/src/locales/langs/zh-CN.json | 3 +- .../src/router/routes/modules/demos.ts | 9 ++++++ .../web-naive/src/views/demos/table/index.vue | 31 +++++++++++++++++++ .../@core/base/shared/src/colorful/convert.ts | 31 ++++++++++++++++++- .../effects/hooks/src/use-design-tokens.ts | 5 ++- 6 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 apps/web-naive/src/views/demos/table/index.vue diff --git a/apps/web-naive/src/locales/langs/en-US.json b/apps/web-naive/src/locales/langs/en-US.json index 5f48dc4c..c22d75df 100644 --- a/apps/web-naive/src/locales/langs/en-US.json +++ b/apps/web-naive/src/locales/langs/en-US.json @@ -2,7 +2,8 @@ "page": { "demos": { "title": "Demos", - "naive": "Naive UI" + "naive": "Naive UI", + "table": "Table" } } } diff --git a/apps/web-naive/src/locales/langs/zh-CN.json b/apps/web-naive/src/locales/langs/zh-CN.json index 69b85185..50535ba3 100644 --- a/apps/web-naive/src/locales/langs/zh-CN.json +++ b/apps/web-naive/src/locales/langs/zh-CN.json @@ -2,7 +2,8 @@ "page": { "demos": { "title": "演示", - "naive": "Naive UI" + "naive": "Naive UI", + "table": "Table" } } } diff --git a/apps/web-naive/src/router/routes/modules/demos.ts b/apps/web-naive/src/router/routes/modules/demos.ts index 54ee5baa..8ddf81eb 100644 --- a/apps/web-naive/src/router/routes/modules/demos.ts +++ b/apps/web-naive/src/router/routes/modules/demos.ts @@ -24,6 +24,15 @@ const routes: RouteRecordRaw[] = [ path: '/demos/naive', component: () => import('#/views/demos/naive/index.vue'), }, + { + meta: { + icon: 'mdi:shield-key-outline', + title: $t('page.demos.table'), + }, + name: 'Table', + path: '/demos/table', + component: () => import('#/views/demos/table/index.vue'), + }, ], }, ]; diff --git a/apps/web-naive/src/views/demos/table/index.vue b/apps/web-naive/src/views/demos/table/index.vue new file mode 100644 index 00000000..02acf580 --- /dev/null +++ b/apps/web-naive/src/views/demos/table/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/packages/@core/base/shared/src/colorful/convert.ts b/packages/@core/base/shared/src/colorful/convert.ts index d8d29813..f4fcc819 100644 --- a/packages/@core/base/shared/src/colorful/convert.ts +++ b/packages/@core/base/shared/src/colorful/convert.ts @@ -40,5 +40,34 @@ function isValidColor(color?: string) { } return new TinyColor(color).isValid; } +/** + * 将HLS字符串转换为RGB颜色字符串 + * + * 本函数接收一个表示HLS值的字符串，移除其中的度量单位， + * 并将其转换为TinyColor对象，以便进行颜色处理。 + * 如果转换后的颜色无效，则直接返回原始字符串； + * 否则，返回转换后的RGB颜色字符串 + * + * @param str 表示HLS颜色值的字符串，可能包含度量单位如'deg'、'grad'、'rad'或'turn' + * @returns 如果颜色值有效，则返回对应的RGB颜色字符串；如果无效，则返回原始字符串 + */ +function hlsStringToRGBString(str: string): string { + // 移除HLS字符串中的度量单位，以便正确解析 + const color = new TinyColor( + `hsl(${str.replaceAll(/deg|grad|rad|turn/g, '')})`, + ); + // 检查颜色是否有效，如果无效则直接返回原始字符串 + if (!color.isValid) { + return str; + } + // 返回转换后的RGB颜色字符串 + return color.toRgbString(); +} -export { convertToHsl, convertToHslCssVar, isValidColor, TinyColor }; +export { + convertToHsl, + convertToHslCssVar, + hlsStringToRGBString, + isValidColor, + TinyColor, +}; diff --git a/packages/effects/hooks/src/use-design-tokens.ts b/packages/effects/hooks/src/use-design-tokens.ts index 9839aa34..b4719cd9 100644 --- a/packages/effects/hooks/src/use-design-tokens.ts +++ b/packages/effects/hooks/src/use-design-tokens.ts @@ -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, };