Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x

Author: irisSong

CHANGELOG.md

@@ -1,3 +1,14 @@
+# v3.0.11
+
+`2025-05-09`
+
+- :bug: fix(address): 构建单一样式文件 (#3220)
+- 📖 docs: 升级文档补充 (#3204)
+- :sparkles: feat(address): v15 适配 (#3171)
+- :bug: fix: 修复编译单个组件在小程序下路径异常的问题 (#3215)
+- :bug: fix(picker): 解决透传popup的round属性不生效问题 (#3205)
+- zap: perf: optimize the performance issues caused by style injection (#3203)
+
 # v3.0.10
 
 `2025-04-25`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react",
-  "version": "3.0.10",
+  "version": "3.0.11-patch.0",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",

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

@@ -82,7 +82,7 @@ const Index = () => {
             )}
             <View className="index-components-sublist">
               {nav.packages.map((com) =>
-                com.show && com.taro && (harmony() ? com.dd : true) && (!search || new RegExp(search, 'ig').test(com.name.toLowerCase())) ? (
+                com.show && com.taro && (!search || new RegExp(search, 'ig').test(com.name.toLowerCase())) ? (
                   <View
                     key={com.name}
                     className="index-components-sublist-item"

scripts/build-taro.mjs

@@ -428,7 +428,6 @@ async function buildCSS(themeName = '') {
       join(`${dist}/cjs`, cssPath, `${themeDir}/css.js`),
       cssContent.join('\n'),
     )
-
     // copy harmonycss
     if (file.indexOf('countup') === -1) {
       const harmonyCss = join(__dirname, '../', file.replace('scss', 'harmony.css'))

scripts/harmony/update-taro-entry.js

@@ -21,16 +21,16 @@ const isShow = (item) => {
 
 // 更新 app.config.ts 文件
 const createConfig = async () => {
-  const configRef = []
+  let configRef = []
 
   return new Promise((res, rej) => {
     config.nav.map((item) => {
       let co = {
         root: item.enName,
         pages: [],
       }
-      if(paramG) {
-        if(paramG === item.enName){
+      if (paramG) {
+        if (paramG === item.enName) {
           item.packages.map((it) => {
             if (isShow(it)) {
               co.pages.push(`pages/${it.name.toLowerCase()}/index`)
@@ -49,6 +49,10 @@ const createConfig = async () => {
       co = { ...co, pages: co.pages.sort() }
       configRef.push(co)
     })
+
+    // 如果 pages 数据为空，则删除该项
+    configRef = configRef.filter((item) => item.pages.length !== 0)
+
     res(configRef)
   })
 }

scripts/replace-css-var.js

@@ -42,17 +42,36 @@ components.forEach((component) => {
     `../src/packages/${componentName}/${componentName}.harmony.css`,
   )
   const matched = content.match(/@import.*?[;][\n\r]?/gi)
+  const componentSplitScss = []
   if (matched) {
     matched.forEach((m) => {
       if (m.indexOf('styles') > -1) {
         content = content.replace(m, mixin)
       } else {
-        content = content.replace(m, '')
+        // 相对路径是 ../ 是组件，所以剔除
+        if (m.indexOf("'./") === - 1) {
+          content = content.replace(m, '')
+        } else {
+          // 组件内的样式拆分
+          content = content.replace(m, '')
+          const splitScssName = m.match(/\'\.\/([a-z]+)\.scss/)
+          if (splitScssName && splitScssName.length == 2) {
+            componentSplitScss.push(fs
+              .readFileSync(
+                path.join(
+                  __dirname,
+                  `../src/packages/${componentName}/${splitScssName[1]}.scss`,
+                ),
+              )
+              .toString())
+          }
+
+        }
       }
     })
   }
 
-  const res = sass.compileString(theme + variables + content)
+  const res = sass.compileString(theme + variables + componentSplitScss.join('\n') + content)
   postcss([
     cssvariables(/*options*/),
   ])

src/config.json

@@ -455,16 +455,16 @@
       "enName": "dentry",
       "packages": [
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "Address",
           "type": "component",
           "cName": "地址",
           "desc": "地址组件",
           "sort": 3,
           "show": true,
           "taro": true,
-          "v15": 2,
-          "author": "yangxiaolu",
+          "v15": 1,
+          "author": "hanyuxinting",
           "dd": false
         },
         {

src/locales/base.ts

@@ -65,6 +65,8 @@ export interface BaseLang {
     selectRegion: string
     deliveryTo: string
     chooseAnotherAddress: string
+    hotCity: string
+    selectProvince: string
   }
   signature: {
     reSign: string

src/locales/en-US.ts

@@ -65,6 +65,8 @@ const enUS: BaseLang = {
     selectRegion: 'Choose Address',
     deliveryTo: 'Delivery To',
     chooseAnotherAddress: 'Choose Another Address',
+    hotCity: 'Hot City',
+    selectProvince: 'Choose Province or City',
   },
   signature: {
     reSign: 'Re Sign',

src/locales/id-ID.ts

@@ -66,6 +66,8 @@ const idID: BaseLang = {
     selectRegion: 'Pilih Daerah',
     deliveryTo: 'Kirim Ke',
     chooseAnotherAddress: 'Pilih alamat lain',
+    hotCity: 'Kota-kota populer',
+    selectProvince: 'Pilih provinsi/wilayah',
   },
   signature: {
     reSign: 'Masuk Kembali',