Merge branch 'feat_v3.x' into fix3/popover-0327

Author: xiaoyatong

package.json

@@ -110,14 +110,14 @@
     "@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",
     "async-validator": "^4.2.5",
     "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",

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",

packages/nutui-taro-demo/src/app.scss

@@ -33,6 +33,9 @@ body {
 
   &.drag-full {
     padding: 57px 0 0 0;
+  }
+
+  &-bg-full {
     min-height: 100vh;
     .jd-scroll-view {
       min-height: calc(100vh - 57px);

pnpm-lock.yaml

@@ -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())]

scripts/harmony/update-taro-entry.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())]

scripts/taro/generate-taro-route.js

@@ -363,15 +363,14 @@ export type NutCSSVariables =
   | 'nutuiPopupTitleHeight'
   | 'nutuiPopupTitleBorderBottom'
   | 'nutuiPopupAnimationDuration'
-  | 'nutuiNotifyTextColor'
+  | 'nutuiNotifyHeight'
   | 'nutuiNotifyPadding'
+  | 'nutuiNotifyBorderRadius'
+  | 'nutuiNotifyBoxShadow'
+  | 'nutuiNotifyZIndex'
+  | 'nutuiNotifyTextColor'
   | 'nutuiNotifyFontSize'
-  | 'nutuiNotifyHeight'
-  | 'nutuiNotifyBaseBackgroundColor'
-  | 'nutuiNotifyPrimaryBackgroundColor'
-  | 'nutuiNotifySuccessBackgroundColor'
-  | 'nutuiNotifyDangerBackgroundColor'
-  | 'nutuiNotifyWarningBackgroundColor'
+  | 'nutuiNotifyBackgroundColor'
   | 'nutuiRateItemMargin'
   | 'nutuiRateIconColor'
   | 'nutuiRateIconInactiveColor'

src/packages/configprovider/types.ts

@@ -36,7 +36,9 @@ const DragDemo = () => {
   return (
     <>
       <Header />
-      <ScrollView className={`demo ${isTaroWeb ? 'web' : 'drag-full'}`}>
+      <ScrollView
+        className={`demo ${isTaroWeb ? 'web' : 'drag-full demo-bg-full'}`}
+      >
         <View className="h2">{translated.basic}</View>
         <Demo1 />
         <View className="h2" style={{ paddingTop: '30px' }}>

src/packages/drag/demo.taro.tsx

@@ -34,6 +34,8 @@ import { Lottie } from '@nutui/nutui-react-taro'
 
 :::
 
+> 提示：京东小程序开发工作无法展示，可使用真机预览
+
 ## Lottie
 
 ### Props

src/packages/lottie/doc.taro.md

@@ -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 {