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

Author: irisSong

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@nutui/nutui-react",
-  "version": "3.0.0-beta.5",
+  "name": "@nutui/nutui-react-taro",
+  "version": "3.0.0-beta.6",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",
@@ -102,7 +102,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.9",
-    "@nutui/icons-react": "^1.0.5",
+    "@nutui/icons-react": "^2.0.1",
     "@nutui/icons-react-taro": "^2.0.1",
     "@nutui/jdesign-icons-react-taro": "1.0.6-beta.2",
     "@nutui/touch-emulator": "^1.0.0",

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

@@ -71,7 +71,12 @@ const config = {
   sourceRoot: 'src',
   outputRoot: `dist/${process.env.TARO_ENV === 'h5' ? 'demo' : process.env.TARO_ENV}`,
   plugins: [...plugins],
-  compiler: 'webpack5',
+  compiler: {
+    type: 'webpack5',
+    prebundle: {
+      exclude: ['@nutui/icons-react-taro']
+    },
+  },
   alias:
     process.env.TARO_ENV === 'rn' || process.env.TARO_ENV === 'jdrn'
       ? {

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

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/taro'
+import { useState } from 'react'
 import {
   View,
   Image,
@@ -11,21 +12,19 @@ import {
   Video,
   Textarea,
 } from '@tarojs/components'
+import { SearchBar } from '@/packages/searchbar/searchbar.taro'
 import pkg from '@/packages/../config.json'
 import packageJson from '@/packages/../../package.json'
 import './index.scss'
-// import Schema from 'async-validator'
 
 const navs = pkg.nav
-// console.log(navs)
 
 // hack taro load button xml
 console.log(Button, Input, Video, Image, Swiper, SwiperItem, Textarea)
 
-// try {
-//     console.log('xxx', Schema)
-// } catch (e) {}
+
 const Index = () => {
+  const [search, setSearch] = useState()
   const gotoNext = (name: string, enName: string) => {
     // 跳转到目的页面，打开新页面
     Taro.navigateTo({
@@ -67,15 +66,22 @@ const Index = () => {
           </View>
         </View>
       </View>
-      <View className="index-components">
+
+      <View className='index-components'>
+        {process.env.NODE_ENV === 'development' ? <>
+          <SearchBar style={{ background: '#fff' }} placeholder='' value={search} onChange={(e) => {
+            setSearch(e)
+          }} />
+          <View style={{ height: 25 }}></View>
+          </> : null}
         {navs.map((nav) => (
           <View key={nav.enName} className="index-components-item">
             {nav.enName === 'dataentry' ? null : (
               <View className="index-components-item-title">{nav.name}</View>
             )}
             <View className="index-components-sublist">
               {nav.packages.map((com) =>
-                com.show && com.taro && com.version === '3.0.0' ? (
+                com.show && com.taro && com.version === '3.0.0' && (!search || new RegExp(search, 'ig').test(com.name.toLowerCase())) ? (
                   <View
                     key={com.name}
                     className="index-components-sublist-item"