diff --git a/package.json b/package.json index 3d119d96c4..e68c2cba19 100644 --- a/package.json +++ b/package.json @@ -110,6 +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.1", "@react-spring/web": "~9.6.1", "@swc/helpers": "^0.5.7", "@use-gesture/react": "10.2.20", @@ -117,7 +118,6 @@ "classnames": "^2.5.1", "codesandbox": "^2.2.3", "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..506d0d9418 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.1", "@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 0bd689172e..40e1b5f5f5 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.1 + version: 1.0.1 '@nutui/touch-emulator': specifier: ^1.0.0 version: 1.0.0 @@ -53,9 +56,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) @@ -534,6 +534,9 @@ importers: '@babel/runtime': specifier: ^7.23.9 version: 7.26.0 + '@nutui/lottie-miniprogram': + 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(vitest@3.0.7))(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) @@ -603,9 +606,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) @@ -2332,6 +2332,9 @@ packages: '@nutui/jdesign-icons-react-taro@1.0.6-beta.2': resolution: {integrity: sha512-2Scz5c9o14gA7Mw5JdiEkc/KEbNlNWMcJMuqVyFVipYeeYN/118N/fvHVpocmJviN0Gc4P+u3ZB3dIQSA2j4Fw==, tarball: https://registry.npmjs.org/@nutui/jdesign-icons-react-taro/-/jdesign-icons-react-taro-1.0.6-beta.2.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==, tarball: https://registry.npmjs.org/@nutui/nutui-react/-/nutui-react-2.7.5.tgz} peerDependencies: @@ -8477,9 +8480,6 @@ packages: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==, tarball: https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz} hasBin: true - lottie-miniprogram@1.0.12: - resolution: {integrity: sha512-2ITtXAyeDXbftvYYe5w0ayl8jTV8laylWMCdJofpka1q205NkjRNj7kX+iIZZ/YjKh1f8plWxb9gSFHkC7BLUQ==, tarball: https://registry.npmjs.org/lottie-miniprogram/-/lottie-miniprogram-1.0.12.tgz} - lottie-react@2.4.0: resolution: {integrity: sha512-pDJGj+AQlnlyHvOHFK7vLdsDcvbuqvwPZdMlJ360wrzGFurXeKPr8SiRCjLf3LrNYKANQtSsh5dz9UYQHuqx4w==, tarball: https://registry.npmjs.org/lottie-react/-/lottie-react-2.4.0.tgz} peerDependencies: @@ -14450,6 +14450,8 @@ snapshots: '@nutui/jdesign-icons-react-taro@1.0.6-beta.2': {} + '@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: '@babel/runtime': 7.26.0 @@ -22215,8 +22217,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/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 9f84d55df1..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' @@ -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 { 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 98% rename from src/packages/lottie/mp.taro.tsx rename to src/packages/lottie/lottiemp.taro.tsx index ac2474fbae..c1644b26a5 100644 --- a/src/packages/lottie/mp.taro.tsx +++ b/src/packages/lottie/lottiemp.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' 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