chore: 合并主分支

Author: irisSong

package.json

@@ -110,13 +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/config/prod.js

@@ -1,11 +1,25 @@
+const { execSync } = require('child_process')
+
+const UI = process.env.UI
+console.log('UI Review', UI)
+
+let hash = ''
+try {
+  hash = execSync('git rev-parse HEAD').toString().trim().substring(0, 7)
+  console.log(`当前 Git hash: ${hash}`)
+} catch (error) {
+  /* empty */
+}
+
 module.exports = {
   env: {
     NODE_ENV: '"production"',
   },
+  outputRoot: `dist/${process.env.TARO_ENV === 'h5' ? `demo${hash && UI ? `-${hash}` : ''}` : process.env.TARO_ENV}`,
   defineConstants: {},
   mini: {},
   h5: {
-    publicPath: '/taro/react/3x/demo',
+    publicPath: `/taro/react/3x/demo-${hash}`,
     /**
      * WebpackChain 插件配置
      * @docs https://github.com/neutrinojs/webpack-chain

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

@@ -989,7 +989,7 @@
           "taro": true,
           "v15": 10,
           "author": "oasis",
-          "dd": false
+          "dd": true
         },
         {
           "version": "3.0.0",

src/config.json

@@ -53,6 +53,10 @@
     z-index: 1;
   }
 
+  &-disabled {
+    background: $badge-background-disabled-color;
+  }
+
   &-number {
     font-family: 'JD';
   }

src/packages/badge/badge.scss

@@ -22,6 +22,7 @@ const defaultProps = {
   right: 0,
   fill: 'solid',
   size: 'large',
+  disabled: false,
 } as TaroBadgeProps
 export const Badge: FunctionComponent<Partial<TaroBadgeProps>> = (props) => {
   const rtl = useRtl()
@@ -36,6 +37,7 @@ export const Badge: FunctionComponent<Partial<TaroBadgeProps>> = (props) => {
     right,
     fill,
     size,
+    disabled,
   } = { ...defaultProps, ...props }
 
   const classPrefix = 'nut-badge'
@@ -73,6 +75,7 @@ export const Badge: FunctionComponent<Partial<TaroBadgeProps>> = (props) => {
     [`${classPrefix}-dot-${size}`]: dot,
     [`${classPrefix}-${fill}`]: fill === 'outline',
     [`${classPrefix}-content`]: children,
+    [`${classPrefix}-disabled`]: disabled,
   })
 
   useEffect(() => {