From b33f2aeab1deba6c7c50d90ddf292fcca551e7a6 Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 12 Mar 2025 14:45:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20jd=20=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.json | 4 ++-- src/packages/lottie/index.taro.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.json b/src/config.json index 00e38083f4..48b1321faa 100644 --- a/src/config.json +++ b/src/config.json @@ -986,9 +986,9 @@ "sort": 10, "show": true, "taro": true, - "v15": 10, + "v15": 1, "author": "oasis", - "dd": false + "dd": true }, { "version": "3.0.0", diff --git a/src/packages/lottie/index.taro.ts b/src/packages/lottie/index.taro.ts index 9f84d55df1..abdf703e3e 100644 --- a/src/packages/lottie/index.taro.ts +++ b/src/packages/lottie/index.taro.ts @@ -9,7 +9,7 @@ let implementation if (process.env.TARO_ENV === 'h5') { // @ts-ignore implementation = LottieWeb -} else if (process.env.TARO_ENV === 'weapp') { +} else if (process.env.TARO_ENV === 'weapp' || process.env.TARO_ENV === 'jd') { // @ts-ignore implementation = LottieMp } else { From 18baaf455aafb342def97cdef1f267c3b0a35d4e Mon Sep 17 00:00:00 2001 From: oasis Date: Wed, 12 Mar 2025 18:55:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20lottie=20?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- packages/nutui-taro-demo/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- scripts/harmony/update-taro-entry.js | 9 +++++---- scripts/taro/generate-taro-route.js | 1 + src/packages/lottie/mp.taro.tsx | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index da56da7cb9..26fd729c43 100644 --- a/package.json +++ b/package.json @@ -109,13 +109,13 @@ "@nutui/icons-react-taro": "^3.0.1", "@nutui/jdesign-icons-react-taro": "1.0.6-beta.2", "@nutui/touch-emulator": "^1.0.0", + "@nutui/lottie-miniprogram": "^1.0.0", "@react-spring/web": "~9.6.1", "@swc/helpers": "^0.5.7", "@use-gesture/react": "10.2.20", "async-validator": "^4.2.5", "classnames": "^2.5.1", "lodash.kebabcase": "^4.1.1", - "lottie-miniprogram": "^1.0.12", "lottie-react": "^2.4.0", "react-fast-compare": "^3.2.2", "react-transition-group": "^4.4.5", diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json index 17c10a3897..b08a5bad46 100644 --- a/packages/nutui-taro-demo/package.json +++ b/packages/nutui-taro-demo/package.json @@ -63,6 +63,7 @@ "@jdtaro/plugin-platform-jdharmony-cpp": "0.1.29-beta.0", "@nutui/replace-icons": "^1.0.0", "@nutui/touch-emulator": "^1.0.0", + "@nutui/lottie-miniprogram": "^1.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", "@tarojs/components": "4.0.8-beta.1", "@tarojs/helper": "4.0.8-beta.1", @@ -84,7 +85,6 @@ "babel-plugin-import": "^1.13.8", "lodash.isequal": "^4.5.0", "lodash.kebabcase": "^4.1.1", - "lottie-miniprogram": "^1.0.12", "lottie-react": "^2.4.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5060142618..efffa97c1c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,6 +29,9 @@ importers: '@nutui/jdesign-icons-react-taro': specifier: 1.0.6-beta.2 version: 1.0.6-beta.2 + '@nutui/lottie-miniprogram': + specifier: ^1.0.0 + version: 1.0.0 '@nutui/touch-emulator': specifier: ^1.0.0 version: 1.0.0 @@ -50,9 +53,6 @@ importers: lodash.kebabcase: specifier: ^4.1.1 version: 4.1.1 - lottie-miniprogram: - specifier: ^1.0.12 - version: 1.0.12 lottie-react: specifier: ^2.4.0 version: 2.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -531,6 +531,9 @@ importers: '@babel/runtime': specifier: ^7.23.9 version: 7.26.0 + '@nutui/lottie-miniprogram': + specifier: ^1.0.0 + version: 1.0.0 '@nutui/replace-icons': specifier: ^1.0.0 version: 1.0.3(@types/node@22.10.5)(@vitest/ui@2.1.8)(happy-dom@17.1.0)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) @@ -600,9 +603,6 @@ importers: lodash.kebabcase: specifier: ^4.1.1 version: 4.1.1 - lottie-miniprogram: - specifier: ^1.0.12 - version: 1.0.12 lottie-react: specifier: ^2.4.0 version: 2.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -2329,6 +2329,9 @@ packages: '@nutui/jdesign-icons-react-taro@1.0.6-beta.2': resolution: {integrity: sha512-2Scz5c9o14gA7Mw5JdiEkc/KEbNlNWMcJMuqVyFVipYeeYN/118N/fvHVpocmJviN0Gc4P+u3ZB3dIQSA2j4Fw==} + '@nutui/lottie-miniprogram@1.0.0': + resolution: {integrity: sha512-aXDxgGZkj3TZh6F7psgjtVmkA1z0rVWHKMSejnKdTjRJf7HWF+vxTZGC4mF0sHxdZ8vfVLr1Fq2inXt8dYoU+g==, tarball: https://registry.npmjs.org/@nutui/lottie-miniprogram/-/lottie-miniprogram-1.0.0.tgz} + '@nutui/nutui-react@2.7.5': resolution: {integrity: sha512-oa7ybM1htEdCzBBokJa78QC/gf4d1qtdSTzn/lWgibRjMBKTKmZk5JMuDWMTPSqwW+y+A6uq9zT3hxngxs0gPA==} peerDependencies: @@ -8124,9 +8127,6 @@ packages: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true - lottie-miniprogram@1.0.12: - resolution: {integrity: sha512-2ITtXAyeDXbftvYYe5w0ayl8jTV8laylWMCdJofpka1q205NkjRNj7kX+iIZZ/YjKh1f8plWxb9gSFHkC7BLUQ==} - lottie-react@2.4.0: resolution: {integrity: sha512-pDJGj+AQlnlyHvOHFK7vLdsDcvbuqvwPZdMlJ360wrzGFurXeKPr8SiRCjLf3LrNYKANQtSsh5dz9UYQHuqx4w==} peerDependencies: @@ -13824,6 +13824,8 @@ snapshots: '@nutui/jdesign-icons-react-taro@1.0.6-beta.2': {} + '@nutui/lottie-miniprogram@1.0.0': {} + '@nutui/nutui-react@2.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.26.0 @@ -21193,8 +21195,6 @@ snapshots: dependencies: js-tokens: 4.0.0 - lottie-miniprogram@1.0.12: {} - lottie-react@2.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: lottie-web: 5.12.2 diff --git a/scripts/harmony/update-taro-entry.js b/scripts/harmony/update-taro-entry.js index 38a9ebe6a4..f46c0b1c74 100644 --- a/scripts/harmony/update-taro-entry.js +++ b/scripts/harmony/update-taro-entry.js @@ -4,10 +4,10 @@ const fse = require('fs-extra') const config = require('../../src/config.json') const param = process.env.C -// G=nav pnpm dev:jdtaro:jdharmonycpp -// base | layout | nav | dentry | dataentry | feedback | exhibition | business +// G=nav pnpm dev:jdtaro:jdharmonycpp +// base | layout | nav | dentry | dataentry | feedback | exhibition | business const paramG = process.env.G - + // C=radio pnpm dev:jdtaro:jdharmonycpp or C=radio,button,cell pnpm dev:jdtaro:jdharmonycpp const specialComponent = (name) => { if (!param) return true @@ -36,7 +36,7 @@ const createConfig = async () => { co.pages.push(`pages/${it.name.toLowerCase()}/index`) } }) - } + } } else { item.packages.map((it) => { if (isShow(it)) { @@ -68,6 +68,7 @@ export default defineAppConfig({ navigationBarTitleText: 'NutUI-React', navigationBarTextStyle: 'black' }, + renderingMode: 'mixed', components: ['pages/index/index', ...(subPackages.map(subPackage => { return subPackage.pages.map(page => \`\${subPackage.root}/\${page}\`) }).flat())] diff --git a/scripts/taro/generate-taro-route.js b/scripts/taro/generate-taro-route.js index 6d45e68bfe..a695e0979f 100644 --- a/scripts/taro/generate-taro-route.js +++ b/scripts/taro/generate-taro-route.js @@ -42,6 +42,7 @@ export default defineAppConfig ({ navigationBarTitleText: 'NutUI-React', navigationBarTextStyle: 'black' }, + renderingMode: 'mixed', components: ['pages/index/index', ...(subPackages.map(subPackage => { return subPackage.pages.map(page => \`\${subPackage.root}/\${page}\`) }).flat())] diff --git a/src/packages/lottie/mp.taro.tsx b/src/packages/lottie/mp.taro.tsx index ac2474fbae..c1644b26a5 100644 --- a/src/packages/lottie/mp.taro.tsx +++ b/src/packages/lottie/mp.taro.tsx @@ -1,6 +1,6 @@ import React, { useImperativeHandle, useRef } from 'react' import { createSelectorQuery, getEnv, useReady, useUnload } from '@tarojs/taro' -import lottie from 'lottie-miniprogram' +import lottie from '@nutui/lottie-miniprogram' import { getWindowInfo } from '@/utils/get-system-info' import useUuid from '@/hooks/use-uuid' import { TaroLottieProps } from '@/types' From 4f44fb1e38879e24fb31ed7038fad8f114708c11 Mon Sep 17 00:00:00 2001 From: oasis Date: Thu, 13 Mar 2025 10:39:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20lottie=20?= =?UTF-8?q?=E5=8C=85=E7=9A=84=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- packages/nutui-taro-demo/package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 3744d9fdf0..9d30432d6d 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "@nutui/icons-react-taro": "^3.0.1", "@nutui/jdesign-icons-react-taro": "1.0.6-beta.2", "@nutui/touch-emulator": "^1.0.0", - "@nutui/lottie-miniprogram": "^1.0.0", + "@nutui/lottie-miniprogram": "^1.0.1", "@react-spring/web": "~9.6.1", "@swc/helpers": "^0.5.7", "@use-gesture/react": "10.2.20", diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json index b08a5bad46..506d0d9418 100644 --- a/packages/nutui-taro-demo/package.json +++ b/packages/nutui-taro-demo/package.json @@ -63,7 +63,7 @@ "@jdtaro/plugin-platform-jdharmony-cpp": "0.1.29-beta.0", "@nutui/replace-icons": "^1.0.0", "@nutui/touch-emulator": "^1.0.0", - "@nutui/lottie-miniprogram": "^1.0.0", + "@nutui/lottie-miniprogram": "^1.0.1", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", "@tarojs/components": "4.0.8-beta.1", "@tarojs/helper": "4.0.8-beta.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index efffa97c1c..a370c59cab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: 1.0.6-beta.2 version: 1.0.6-beta.2 '@nutui/lottie-miniprogram': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 '@nutui/touch-emulator': specifier: ^1.0.0 version: 1.0.0 @@ -532,8 +532,8 @@ importers: specifier: ^7.23.9 version: 7.26.0 '@nutui/lottie-miniprogram': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 '@nutui/replace-icons': specifier: ^1.0.0 version: 1.0.3(@types/node@22.10.5)(@vitest/ui@2.1.8)(happy-dom@17.1.0)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) @@ -2329,8 +2329,8 @@ packages: '@nutui/jdesign-icons-react-taro@1.0.6-beta.2': resolution: {integrity: sha512-2Scz5c9o14gA7Mw5JdiEkc/KEbNlNWMcJMuqVyFVipYeeYN/118N/fvHVpocmJviN0Gc4P+u3ZB3dIQSA2j4Fw==} - '@nutui/lottie-miniprogram@1.0.0': - resolution: {integrity: sha512-aXDxgGZkj3TZh6F7psgjtVmkA1z0rVWHKMSejnKdTjRJf7HWF+vxTZGC4mF0sHxdZ8vfVLr1Fq2inXt8dYoU+g==, tarball: https://registry.npmjs.org/@nutui/lottie-miniprogram/-/lottie-miniprogram-1.0.0.tgz} + '@nutui/lottie-miniprogram@1.0.1': + resolution: {integrity: sha512-SwsFaHnX2FZbaSJoPKf+EjNYkjiozydfvDhWQ/400uRlkJj8h3dtv4bAO+y3nE80idp7KUnMIaqyk4S8Kp/8xA==, tarball: https://registry.npmjs.org/@nutui/lottie-miniprogram/-/lottie-miniprogram-1.0.1.tgz} '@nutui/nutui-react@2.7.5': resolution: {integrity: sha512-oa7ybM1htEdCzBBokJa78QC/gf4d1qtdSTzn/lWgibRjMBKTKmZk5JMuDWMTPSqwW+y+A6uq9zT3hxngxs0gPA==} @@ -13824,7 +13824,7 @@ snapshots: '@nutui/jdesign-icons-react-taro@1.0.6-beta.2': {} - '@nutui/lottie-miniprogram@1.0.0': {} + '@nutui/lottie-miniprogram@1.0.1': {} '@nutui/nutui-react@2.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: From a49392998dc1a4cd326153c83ec9903882919444 Mon Sep 17 00:00:00 2001 From: oasis Date: Thu, 13 Mar 2025 10:44:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.json b/src/config.json index 9b7ff68d03..7b054c0244 100644 --- a/src/config.json +++ b/src/config.json @@ -987,9 +987,9 @@ "sort": 10, "show": true, "taro": true, - "v15": 1, + "v15": 10, "author": "oasis", - "dd": true + "dd": false }, { "version": "3.0.0", From 5044fd96016342f0fdd7df4bb5e50a3df5efc176 Mon Sep 17 00:00:00 2001 From: oasis Date: Tue, 25 Mar 2025 14:00:32 +0800 Subject: [PATCH 5/5] fix: review --- src/packages/lottie/doc.taro.md | 2 ++ src/packages/lottie/index.taro.ts | 4 ++-- src/packages/lottie/index.ts | 2 +- src/packages/lottie/{web.tsx => lottie.tsx} | 0 src/packages/lottie/{mp.taro.tsx => lottiemp.taro.tsx} | 0 src/packages/lottie/{web.taro.tsx => lottieweb.taro.tsx} | 0 6 files changed, 5 insertions(+), 3 deletions(-) rename src/packages/lottie/{web.tsx => lottie.tsx} (100%) rename src/packages/lottie/{mp.taro.tsx => lottiemp.taro.tsx} (100%) rename src/packages/lottie/{web.taro.tsx => lottieweb.taro.tsx} (100%) diff --git a/src/packages/lottie/doc.taro.md b/src/packages/lottie/doc.taro.md index a2cccab504..4ead1b08e4 100644 --- a/src/packages/lottie/doc.taro.md +++ b/src/packages/lottie/doc.taro.md @@ -34,6 +34,8 @@ import { Lottie } from '@nutui/nutui-react-taro' ::: +> 提示：京东小程序开发工作无法展示，可使用真机预览 + ## Lottie ### Props diff --git a/src/packages/lottie/index.taro.ts b/src/packages/lottie/index.taro.ts index abdf703e3e..24086ff33e 100644 --- a/src/packages/lottie/index.taro.ts +++ b/src/packages/lottie/index.taro.ts @@ -1,6 +1,6 @@ import { ComponentType } from 'react' -import { Lottie as LottieWeb } from './web.taro' -import { Lottie as LottieMp } from './mp.taro' +import { Lottie as LottieWeb } from './lottieweb.taro' +import { Lottie as LottieMp } from './lottiemp.taro' import { TaroLottieProps } from '@/types' export type { TaroLottieProps as LottieProps } from '@/types' diff --git a/src/packages/lottie/index.ts b/src/packages/lottie/index.ts index 0411943644..daf979cc7d 100644 --- a/src/packages/lottie/index.ts +++ b/src/packages/lottie/index.ts @@ -1,4 +1,4 @@ -import { Lottie } from './web' +import { Lottie } from './lottie' export type { WebLottieProps as LottieProps } from '@/types' diff --git a/src/packages/lottie/web.tsx b/src/packages/lottie/lottie.tsx similarity index 100% rename from src/packages/lottie/web.tsx rename to src/packages/lottie/lottie.tsx diff --git a/src/packages/lottie/mp.taro.tsx b/src/packages/lottie/lottiemp.taro.tsx similarity index 100% rename from src/packages/lottie/mp.taro.tsx rename to src/packages/lottie/lottiemp.taro.tsx diff --git a/src/packages/lottie/web.taro.tsx b/src/packages/lottie/lottieweb.taro.tsx similarity index 100% rename from src/packages/lottie/web.taro.tsx rename to src/packages/lottie/lottieweb.taro.tsx