fix: resolve conflicts

Author: Miles-hxy

CHANGELOG.md

@@ -1,4 +1,78 @@
-# v3.0.3
+# v3.0.8
+
+`2025-04-11`
+
+- :sparkles: feat(v15): swipe 增加 v15 的 demo (#3160)
+- :sparkles: feat(dialog): 添加变量处理 (#3172)
+- :bug: fix(sidebar): scroll animation not working with sidebarDuration prop (#3169)
+- :bug: fix(switch): 异步操作中抛错可中断 loading 态 (#3143)
+- :bug: fix: jmapp demo build (#3146)
+- :bug: fix(image): 组件内部的style处理覆盖传入的className (#3165)
+- :bug: fix(cascader): 选中后 tab 应展示 text 字段的值 (#3167)
+- :bug: fix: codesandbox displays abnormal (#3159)
+- :bug: fix(docs): 修复 markdown 无法正确编译注释 (#3158)
+- :bug: fix(skeleton): 废弃inline 导致的警告问题修复 (#3154)
+- 🏡 chore: 增加 useHtmlComponents 模式 (#3156)
+- 📖 docs: 补充快速上手和主题中的配置项的解释 (#3163)
+
+# v3.0.7
+
+`2025-04-03`
+
+- :sparkles: feat(jdesign): 修订变量名 (#3127)
+- :sparkles: feat(collapse): 适配鸿蒙 (#3139)
+- :bug: fix(tabs): 兼容16的处理 (#3150)
+- :bug: fix(dialog)：修复函数式调用时 hidecancel 不生效问题 (#3145)
+- :bug: fix(button): 样式变量无法生效问题修复 (#3142)
+- :bug: fix(Popup): 调整最小高度设定为 26% (#3144)
+- :bug: fix: popover 无法关闭的问题,删除无用代码和无用的样式变量 (#3129)
+- :bug: fix: contribution img failed to display (#3141)
+- :bug: fix(switch): 简化props使用 (#3132)
+- :bug: fix: tabbar config json (#3134)
+- 🪵 refactor(dialog): 抽离types到标准spec下，去掉web h5 wrap层 (#3147)
+- 🏡 chore: 修复正式环境的 publicPath (#3137)
+
+# v3.0.6
+
+`2025-03-28`
+
+- :sparkles: feat(skeleton): v15 (#3086)
+- :sparkles: feat(Tabbar): v15 样式适配；增加 icon/value/title 的function类型，支持根据active状态渲染不同数据；增加 onDoubleClick 事件 (#3110)
+- :sparkles: feat(indicator): 增加 UI 变体的类型 (#3114)
+- :sparkles: feat(switch): 异步切换支持受控loading态 (#3122)
+- :sparkles: feat(notify): v15 (#3082)
+- :sparkles: feat(lottie): 支持京东小程序 (#3080)
+- :sparkles: feat(demoblock): code block scrolling behavior， CodesandBox function and copyCode styles (#3106)
+- :bug: fix(searchbar): 支付宝小程序设置 enableInPageRenderInput 后无法触发 onChange (#3130)
+- :bug: fix: doc css (#3126)
+- :bug: fix(overlay): 扩大点击范围 (#3117)
+- :bug: fix(pickerview): 解决小程序获取高度计算错误 (#3120)
+- :bug: fix(badge): 修正css变量定义 (#3123)
+- :bug: fix: update pkgjson title (#3119)
+- 🪵 refactor(badge): 支持禁用模式 (#3118)
+- 🏡 chore: support ui review (#3121)
+
+# v3.0.5
+
+`2025-03-21`
+
+- feat(pickerview): 小程序支持自定义列表行高 (#3102)
+- feat: 优化了一下文档样式,更紧凑清晰 (#3105)
+- fix(ImagePreview): 优化代码，fix 因为popup最大宽度导致的问题 (#2939)
+- fix(badge): 解决中文偏上问题 (#3111)
+- fix(swipe): 调整 demo 中字体为 12 (#3093)
+- fix: correct import paths (#3089)
+- fix: 开发环境中导出 types 下的类型 (#3090)
+- fix(inputnumber): value 大于 max 图标应处于禁用态 (#3107)
+- fix(resultpage): 引入button样式 (#3103)
+- fix(SearchBar): demo 样式变量修订 (#3101)
+- fix: adjust site style (#3096)
+- refactor(fixednav): support harmony (#3095)
+- docs: 补充web 设置 px 转 rem时的文档 (#3098)
+- feat(pickerview): 选中值增加class类名用于自定义样式 (#3097)
+- test(uploader): optimize async test cases stability (#3104)
+
+# v3.0.4
 
 `2025-03-07`
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react-taro",
-  "version": "3.0.4",
+  "version": "3.0.9-beta.1",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",
@@ -54,12 +54,14 @@
     "changelog": "node ./scripts/generate-changelog.js",
     "clone:jdharmony": "node ./scripts/harmony/clone-jdharmony.js",
     "dev": "vite --open --force",
+    "dev:jmapp": "VITE_APP_PROJECT_ID=jmapp vite --open --force",
     "dev:rtl": "VITE_RTL=rtl vite --open --force",
     "dev:jrkf": "VITE_APP_PROJECT_ID=jrkf vite --open --force",
     "dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn",
     "predev:taro": "pnpm run update:taro:entry",
     "dev:taro": "pnpm --dir ./packages/nutui-taro-demo dev",
     "dev:taro:h5": "pnpm dev:taro h5",
+    "dev:taro:h5:html": "USE_HTML=1 pnpm dev:taro h5",
     "predev:jdtaro": "pnpm run update:taro:entry",
     "dev:jdtaro": "JD=1 pnpm --dir ./packages/nutui-taro-demo dev",
     "dev:jdtaro:jdharmonycpp": "pnpm run clone:jdharmony cpp && pnpm run update:taro:entry && JD=1 pnpm --dir ./packages/nutui-taro-demo dev:jdharmonycpp",
@@ -69,14 +71,14 @@
     "build:taro": "node ./scripts/replace-css-var.js && npm run checked:taro && node scripts/build-taro.mjs",
     "build:taro:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp node scripts/build-taro.mjs",
     "build:demo": "npm run checked && vite build --config vite.config.demo.ts",
-    "build:demo:jmapp": "npm run checked && VITE_APP_PROJECT_ID=jmapp vite build",
+    "build:demo:jmapp": "npm run checked && VITE_APP_PROJECT_ID=jmapp vite build --config vite.config.demo.ts",
     "prebuild:taro:demo": "SKIPDD=1 pnpm run update:taro:entry",
     "build:taro:demo": "npm run checked:taro && npm run generate:file:taro:pages && pnpm --dir ./packages/nutui-taro-demo build:h5",
     "build:site": "vite build --config vite.config.site.mts",
     "build:taro:site": "vite build --config vite.config.site.taro.mts && node ./scripts/rename.js",
     "build:jdtaro:demo": "npm run checked:taro && npm run generate:file:taro:pages && JD=1 pnpm --dir ./packages/nutui-taro-demo build:h5",
-    "build:taro:demo:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp npm run generate:file:taro:pages && pnpm --dir ./packages/nutui-taro-demo build:h5",
-    "build:jdtaro:demo:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp npm run generate:file:taro:pages && JD=1 pnpm --dir ./packages/nutui-taro-demo build:h5",
+    "build:taro:demo:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp npm run generate:file:taro:pages && pnpm --dir ./packages/nutui-taro-demo build:jmapp h5",
+    "build:jdtaro:demo:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp npm run generate:file:taro:pages && JD=1 pnpm --dir ./packages/nutui-taro-demo build:jmapp h5",
     "generate:file": "node scripts/generate-nutui.js",
     "generate:themes": "node scripts/generate-themes.js",
     "generate:themes-dev": "node scripts/generate-themes-dev.js",
@@ -110,13 +112,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.2",
     "@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/index.js

@@ -5,6 +5,9 @@ let themeStr = `src/styles/theme-default.scss`
 const projectID = process.env.VITE_APP_PROJECT_ID
 const JD = process.env.JD
 console.log('JDJDJDJDJDJD', JD)
+const useHtml = process.env.USE_HTML
+console.log('useHtml', useHtml)
+
 if (projectID) {
   fileStr = `src/styles/variables-${projectID}.scss`
   themeStr = `src/styles/theme-${projectID}.scss`
@@ -210,6 +213,7 @@ const config = {
     },
     publicPath: '/',
     staticDirectory: 'static',
+    useHtmlComponents: useHtml === '1',
     postcss: {
       pxtransform: {
         enable: true,

packages/nutui-taro-demo/config/prod.js

@@ -1,11 +1,27 @@
+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 */
+}
+
+console.log(hash && UI ? `-${hash}` : '')
+
 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/${process.env.VITE_APP_PROJECT_ID === 'jmapp' ? 'jdesign-3x' : '3x'}/demo${hash && UI ? `-${hash}` : ''}`,
     /**
      * WebpackChain 插件配置
      * @docs https://github.com/neutrinojs/webpack-chain

packages/nutui-taro-demo/package.json

@@ -12,8 +12,7 @@
     "dev": "taro build --watch --type",
     "dev:jmapp": "VITE_APP_PROJECT_ID=jmapp taro build --watch --type",
     "build": "taro build --type",
-    "build:jmapp": "taro build --type",
-
+    "build:jmapp": "VITE_APP_PROJECT_ID=jmapp taro build --type",
     "build:weapp": "taro build --type weapp",
     "build:swan": "taro build --type swan",
     "build:alipay": "taro build --type alipay",
@@ -63,6 +62,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 +84,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);

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

@@ -1,10 +1,10 @@
 import { Component } from 'react'
-import './app.scss'
-
 import('@/sites/assets/styles/reset.scss')
 import('@/packages/nutui.react.scss.taro')
 import('@nutui/touch-emulator')
 
+import './app.scss'
+
 // console.log(NutUI)
 class App extends Component {
   render() {

packages/nutui-taro-demo/src/pages/index/index.tsx

@@ -16,7 +16,7 @@ import { SearchBar } from '@/packages/searchbar/searchbar.taro'
 import pkg from '@/packages/../config.json'
 import packageJson from '@/packages/../../package.json'
 import './index.scss'
-import { harmony } from '../../../../../src/utils/platform-taro'
+import { harmony } from '../../../../../src/utils/taro/platform'
 
 const navs = pkg.nav