From 56fc982dd7d8258fdd3a9514f401cf8cc2996b32 Mon Sep 17 00:00:00 2001 From: XiaoDaiGua-Ray <443547225@qq.com> Date: Wed, 2 Aug 2023 18:00:03 +0800 Subject: [PATCH 01/10] eslint bug fixed --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4376e173..1acbd7d1 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,11 @@ "type": "module", "scripts": { "dev": "vite", - "build": "eslint src && eslint --fix . && vue-tsc --noEmit && vite build --mode production", + "build": "vue-tsc --noEmit && vite build --mode production", "preview": "vite preview", - "test": "eslint src && eslint --fix . && vue-tsc --noEmit && vite build --mode test", - "dev-build": "eslint src && eslint --fix . && vue-tsc --noEmit && vite build --mode development", - "report": "eslint src && eslint --fix . && vue-tsc --noEmit && vite build --mode report", + "test": "vue-tsc --noEmit && vite build --mode test", + "dev-build": "vue-tsc --noEmit && vite build --mode development", + "report": "vue-tsc --noEmit && vite build --mode report", "prepare": "husky install" }, "lint-staged": { From ef60abb3af5b5b1c0708271e8cf0ba887cbb5e0f Mon Sep 17 00:00:00 2001 From: yun Date: Thu, 3 Aug 2023 09:53:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=B0=86pnpm=E5=8D=87=E7=BA=A7=E5=88=B08?= =?UTF-8?q?,=E7=89=88=E6=9C=AC7=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-build.yaml b/.github/workflows/push-build.yaml index e7ad651d..f5f7ac6b 100644 --- a/.github/workflows/push-build.yaml +++ b/.github/workflows/push-build.yaml @@ -22,7 +22,7 @@ jobs: - uses: pnpm/action-setup@v2 name: Install pnpm with: - version: 7 + version: 8 run_install: false - name: Get pnpm store directory From fd71ac7773ac914a4fa427e2add332821522e55e Mon Sep 17 00:00:00 2001 From: yun Date: Thu, 3 Aug 2023 09:54:08 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E6=8D=A2=E8=A1=8C=E7=AC=A6=E4=B8=BAlf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6e573c3f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# 将换行符设置为lf +* text eol=lf From 502672eef97d458e76bd42f7339237e286ade3c8 Mon Sep 17 00:00:00 2001 From: yun Date: Thu, 3 Aug 2023 09:56:30 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0fail-fast=E5=92=8Cexper?= =?UTF-8?q?imental,=E4=BD=BF=E5=8D=95=E4=B8=AAjob=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=BD=B1=E5=93=8D=E5=85=B6=E4=BB=96job?= =?UTF-8?q?=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/push-build.yaml b/.github/workflows/push-build.yaml index f5f7ac6b..fc17bef3 100644 --- a/.github/workflows/push-build.yaml +++ b/.github/workflows/push-build.yaml @@ -6,9 +6,11 @@ jobs: cache-and-install: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: node-version: [ 16.x, 18.x ] os: [ ubuntu-latest, windows-latest, macos-latest ] + experimental: [ true ] steps: - name: Checkout From c51767df556049ff2ba3e3f7caff2b51f28a3865 Mon Sep 17 00:00:00 2001 From: yun Date: Thu, 3 Aug 2023 09:53:19 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B0=86pnpm=E5=8D=87=E7=BA=A7=E5=88=B08?= =?UTF-8?q?,=E7=89=88=E6=9C=AC7=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-build.yaml b/.github/workflows/push-build.yaml index e7ad651d..f5f7ac6b 100644 --- a/.github/workflows/push-build.yaml +++ b/.github/workflows/push-build.yaml @@ -22,7 +22,7 @@ jobs: - uses: pnpm/action-setup@v2 name: Install pnpm with: - version: 7 + version: 8 run_install: false - name: Get pnpm store directory From 8693a4098a3c0ba12109620b5e43ba7a383a7095 Mon Sep 17 00:00:00 2001 From: yun Date: Thu, 3 Aug 2023 09:54:08 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E6=8D=A2=E8=A1=8C=E7=AC=A6=E4=B8=BAlf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6e573c3f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# 将换行符设置为lf +* text eol=lf From 6cd5a1cf3e9aa479cc62adae0b6ba3b8cb398419 Mon Sep 17 00:00:00 2001 From: yun Date: Thu, 3 Aug 2023 09:56:30 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0fail-fast=E5=92=8Cexper?= =?UTF-8?q?imental,=E4=BD=BF=E5=8D=95=E4=B8=AAjob=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=BD=B1=E5=93=8D=E5=85=B6=E4=BB=96job?= =?UTF-8?q?=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/push-build.yaml b/.github/workflows/push-build.yaml index f5f7ac6b..fc17bef3 100644 --- a/.github/workflows/push-build.yaml +++ b/.github/workflows/push-build.yaml @@ -6,9 +6,11 @@ jobs: cache-and-install: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: node-version: [ 16.x, 18.x ] os: [ ubuntu-latest, windows-latest, macos-latest ] + experimental: [ true ] steps: - name: Checkout From 1b5edfb4798e3377f023c46bb79601dd5a4a7adc Mon Sep 17 00:00:00 2001 From: XiaoDaiGua-Ray <443547225@qq.com> Date: Thu, 3 Aug 2023 11:11:21 +0800 Subject: [PATCH 08/10] add eslint check --- package.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1acbd7d1..1c1a09f2 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,17 @@ "private": false, "version": "4.1.4", "type": "module", + "engines": { + "node": ">=16.0.0", + "pnpm": ">=8.0.0" + }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build --mode production", + "build": "eslint src && vue-tsc --noEmit && vite build --mode production", "preview": "vite preview", - "test": "vue-tsc --noEmit && vite build --mode test", - "dev-build": "vue-tsc --noEmit && vite build --mode development", - "report": "vue-tsc --noEmit && vite build --mode report", + "test": "eslint src && vue-tsc --noEmit && vite build --mode test", + "dev-build": "eslint src && vue-tsc --noEmit && vite build --mode development", + "report": "eslint src && vue-tsc --noEmit && vite build --mode report", "prepare": "husky install" }, "lint-staged": { From 6b8921ee7b4217e65f62044e241d192ca378af85 Mon Sep 17 00:00:00 2001 From: XiaoDaiGua-Ray <443547225@qq.com> Date: Thu, 3 Aug 2023 16:54:13 +0800 Subject: [PATCH 09/10] v4.1.5 --- CHANGELOG.md | 9 +++++ src/components/RayCollapseGrid/src/index.tsx | 2 +- src/components/RayCollapseGrid/src/props.ts | 2 +- src/utils/precision.ts | 39 +++++++++++++++++--- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d762633..982fbacd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # CHANGE LOG +## 4.1.5 + +### Fixes + +- 修复 windows 平台下构建失败问题 +- 修复换行符导致构建失败问题 +- 修复特定 node pnpm 版本构建栈溢出问题 +- 修复 `RayCollapseGrid` 组件 open 属性歧义问题 + ## 4.1.4 该版本后，不会做破坏性更新了。版本功能趋于稳定，后续更新不会那么频繁了。。。。。 diff --git a/src/components/RayCollapseGrid/src/index.tsx b/src/components/RayCollapseGrid/src/index.tsx index a6763cee..fe626b4e 100644 --- a/src/components/RayCollapseGrid/src/index.tsx +++ b/src/components/RayCollapseGrid/src/index.tsx @@ -22,7 +22,7 @@ const RayCollapseGrid = defineComponent({ name: 'RayCollapseGrid', props: collapseGridProps, setup(props) { - const modelCollapsed = ref(props.open) + const modelCollapsed = ref(!props.open) const handleCollapse = () => { modelCollapsed.value = !modelCollapsed.value diff --git a/src/components/RayCollapseGrid/src/props.ts b/src/components/RayCollapseGrid/src/props.ts index d4cfbf23..ba3dfc37 100644 --- a/src/components/RayCollapseGrid/src/props.ts +++ b/src/components/RayCollapseGrid/src/props.ts @@ -15,7 +15,7 @@ export const collapseGridProps = { * `true` 收起, `false` 展开 */ type: Boolean, - default: true, + default: false, }, collapseToggleText: { /** diff --git a/src/utils/precision.ts b/src/utils/precision.ts index f1aa922f..0178d24a 100644 --- a/src/utils/precision.ts +++ b/src/utils/precision.ts @@ -85,14 +85,28 @@ export const format = ( : currency(value, options).toString() } -/** 加法 */ +/** + * + * 加法 + * + * @example + * format(add(0.1, 0.2)) => 0.3 + * format(add(0.2, 0.33)) => 0.53 + */ export const add = (...args: CurrencyArguments[]) => { return basic(args, 0, (pre, curr) => { return currency(pre).add(curr) }) } -/** 减法 */ +/** + * + * 减法 + * + * @example + * format(subtract(0.1, 0.12312)) => -0.02 + * format(subtract(0.2, 0.33)) => -0.13 + */ export const subtract = (...args: CurrencyArguments[]) => { if (args.length === 2) { const [one, two] = args @@ -112,14 +126,28 @@ export const subtract = (...args: CurrencyArguments[]) => { }) } -/** 乘法 */ +/** + * + * 乘法 + * + * @example + * format(multiply(1, 0.2)) => 0.2 + * format(multiply(0.2, 0.33)) => 0.07 + */ export const multiply = (...args: CurrencyArguments[]) => { return basic(args, 1, (pre, curr) => { return currency(pre).multiply(curr) }) } -/** 除法 */ +/** + * + * 除法 + * + * @example + * format(divide(1, 0.2)) => 5 + * format(divide(0.2, 0.33)) => 0.61 + */ export const divide = (...args: CurrencyArguments[]) => { if (args.length === 2) { const [one, two] = args @@ -144,10 +172,9 @@ export const divide = (...args: CurrencyArguments[]) => { * 平分(将一个数值平均分配到一个数组中) * 如果值为 undefind null 会自动转换为 0 * - * ``` + * @example * distribute(0, 1) => [0] * distribute(0, 3) => [0, 0, 0] - * ``` */ export const distribute = ( value: CurrencyArguments, From f1134ed5b6262dc8f7724dd5c666019bf9d0b6dd Mon Sep 17 00:00:00 2001 From: XiaoDaiGua-Ray <443547225@qq.com> Date: Thu, 3 Aug 2023 16:59:11 +0800 Subject: [PATCH 10/10] 4.1.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c1a09f2..59ec8bc1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ray-template", "private": false, - "version": "4.1.4", + "version": "4.1.5", "type": "module", "engines": { "node": ">=16.0.0",