Merge branch 'feat_v3.x' into hxy/tabs

jdf2e · Dec 4, 2024 · eb51b9f · eb51b9f
2 parents 31f24a8 + 0e4f0c5
commit eb51b9f
Show file tree

Hide file tree

Showing 45 changed files with 343 additions and 330 deletions.
diff --git a/packages/nutui-taro-demo/src/pages/index/index.tsx b/packages/nutui-taro-demo/src/pages/index/index.tsx
@@ -1,5 +1,16 @@
 import Taro from '@tarojs/taro'
-import { View, Image, Swiper, SwiperItem, Text, ScrollView, Button, Input, Video } from '@tarojs/components'
+import {
+  View,
+  Image,
+  Swiper,
+  SwiperItem,
+  Text,
+  ScrollView,
+  Button,
+  Input,
+  Video,
+  Textarea,
+} from '@tarojs/components'
 import pkg from '@/packages/../config.json'
 import packageJson from '@/packages/../../package.json'
 import './index.scss'
@@ -8,9 +19,8 @@ import './index.scss'
 const navs = pkg.nav
 // console.log(navs)
 
-
 // hack taro load button xml
-console.log(Button, Input, Video,Image, Swiper, SwiperItem,  )
+console.log(Button, Input, Video, Image, Swiper, SwiperItem, Textarea)
 
 // try {
 //     console.log('xxx', Schema)
@@ -39,37 +49,39 @@ const Index = () => {
   }
 
   return (
-    <ScrollView className='index'>
-      <View className='index-header'>
+    <ScrollView className="index">
+      <View className="index-header">
         <Image
-          className='index-header-img'
-          src='https://img14.360buyimg.com/imagetools/jfs/t1/117879/25/28831/6279/6329723bE66715a2f/5f099b8feca9e8cc.png'
+          className="index-header-img"
+          src="https://img14.360buyimg.com/imagetools/jfs/t1/117879/25/28831/6279/6329723bE66715a2f/5f099b8feca9e8cc.png"
         />
-        <View className='index-header-info'>
-          <View className='index-header-info-h1'>NutUI React</View>
-          <View className='index-header-info-p'>
+        <View className="index-header-info">
+          <View className="index-header-info-h1">NutUI React</View>
+          <View className="index-header-info-p">
             京东风格的轻量级小程序组件库 React 版
           </View>
-          <View className='index-header-info-p'>
-            <Text className='index-header-info-text'>v{packageJson?.version}</Text>
+          <View className="index-header-info-p">
+            <Text className="index-header-info-text">
+              v{packageJson?.version}
+            </Text>
           </View>
         </View>
       </View>
-      <View className='index-components'>
+      <View className="index-components">
         {navs.map((nav) => (
-          <View key={nav.enName} className='index-components-item'>
+          <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-item-title">{nav.name}</View>
             )}
-            <View className='index-components-sublist'>
+            <View className="index-components-sublist">
               {nav.packages.map((com) =>
                 com.show && com.taro && com.version === '3.0.0' ? (
                   <View
                     key={com.name}
-                    className='index-components-sublist-item'
+                    className="index-components-sublist-item"
                   >
                     <View
-                      className='index-components-sublist-item-content'
+                      className="index-components-sublist-item-content"
                       key={com.name}
                       onClick={() => gotoNext(com.name, nav.enName)}
                     >

diff --git a/src/config.json b/src/config.json
@@ -781,7 +781,8 @@
           "sort": 16,
           "show": true,
           "taro": true,
-          "author": "liukun"
+          "author": "liukun",
+          "v14": true
         },
         {
           "version": "3.0.0",
@@ -907,6 +908,7 @@
           "sort": 1,
           "show": true,
           "taro": true,
+          "v14": true,
           "author": "VickyYe"
         }
       ]

diff --git a/src/packages/calendarcard/calendarcard.scss b/src/packages/calendarcard/calendarcard.scss
@@ -115,12 +115,12 @@
     &.prev,
     &.next,
     &.disabled {
+      cursor: not-allowed;
       .nut-calendarcard-day-top,
       .nut-calendarcard-day-inner,
       .nut-calendarcard-day-bottom {
         color: $calendar-disable-color;
       }
-      cursor: not-allowed;
     }
   }
 }

diff --git a/src/packages/empty/__test__/empty.spec.tsx b/src/packages/empty/__test__/empty.spec.tsx
@@ -31,9 +31,9 @@ test('should render actions correctly', () => {
       actions={[{ text: '操作1' }, { text: '操作2' }]}
     />
   )
-  expect(container.querySelector('.nut-empty-actions')).toBeTruthy()
+  expect(container.querySelector('.nut-empty-actions-base')).toBeTruthy()
   expect(
-    container.querySelectorAll('.nut-empty-actions .nut-button').length
+    container.querySelectorAll('.nut-empty-actions-base .nut-button').length
   ).toEqual(2)
 })
 test('should render custom image correctly', () => {

diff --git a/src/packages/empty/demos/h5/demo1.tsx b/src/packages/empty/demos/h5/demo1.tsx
@@ -5,16 +5,19 @@ const Demo1 = () => {
   return (
     <>
       <Empty
-        title="标题"
-        description="无数据"
-        actions={[{ text: '操作按钮' }, { text: '操作按钮', type: 'primary' }]}
+        title="全屏缺省标题"
+        description="内容描述内容描述内容描述"
+        actions={[{ text: '次要操作' }, { text: '主要操作', type: 'primary' }]}
       />
       <Empty
-        description="无数据"
+        description="内容描述内容描述内容描述"
         actions={[{ text: '操作按钮' }]}
         style={{ marginTop: '10px' }}
       />
-      <Empty description="无数据" style={{ marginTop: '10px' }} />
+      <Empty
+        description="内容描述内容描述内容描述"
+        style={{ marginTop: '10px' }}
+      />
     </>
   )
 }

diff --git a/src/packages/empty/demos/h5/demo2.tsx b/src/packages/empty/demos/h5/demo2.tsx
@@ -2,6 +2,12 @@ import React from 'react'
 import { Empty } from '@nutui/nutui-react'
 
 const Demo2 = () => {
-  return <Empty description="无数据" size="small" />
+  return (
+    <Empty
+      title="半屏缺省标题"
+      description="内容描述内容描述内容描述"
+      size="small"
+    />
+  )
 }
 export default Demo2
diff --git a/src/packages/empty/demos/h5/demo3.tsx b/src/packages/empty/demos/h5/demo3.tsx
@@ -2,6 +2,6 @@ import React from 'react'
 import { Empty } from '@nutui/nutui-react'
 
 const Demo3 = () => {
-  return <Empty description="无数据" imageSize={80} />
+  return <Empty description="内容描述内容描述" imageSize={80} />
 }
 export default Demo3
diff --git a/src/packages/empty/demos/h5/demo4.tsx b/src/packages/empty/demos/h5/demo4.tsx
@@ -11,14 +11,14 @@ const Demo4 = () => {
         setTabvalue(paneKey)
       }}
     >
-      <TabPane title="无内容" value="0">
-        <Empty status="empty" title="无内容" />
+      <TabPane title="通用空状态" value="0">
+        <Empty status="empty" title="通用空状态" />
       </TabPane>
       <TabPane title="加载失败/错误" value="1">
         <Empty status="error" title="加载失败/错误" />
       </TabPane>
-      <TabPane title="无网络" value="2">
-        <Empty status="network" title="无网络" />
+      <TabPane title="网络异常" value="2">
+        <Empty status="network" title="网络异常" />
       </TabPane>
     </Tabs>
   )

diff --git a/src/packages/empty/demos/h5/demo6.tsx b/src/packages/empty/demos/h5/demo6.tsx
@@ -9,8 +9,8 @@ const Demo6 = () => {
       style={{ marginBottom: '20px' }}
     >
       <div style={{ marginTop: '10px' }}>
-        <Button icon="refresh" type="primary" size="small">
-          重试
+        <Button type="primary" size="small">
+          刷新重试
         </Button>
       </div>
     </Empty>

diff --git a/src/packages/empty/demos/taro/demo1.tsx b/src/packages/empty/demos/taro/demo1.tsx
@@ -6,16 +6,19 @@ const Demo1 = () => {
   return (
     <>
       <Empty
-        title="标题"
-        description="无数据"
-        actions={[{ text: '操作按钮' }, { text: '操作按钮', type: 'primary' }]}
+        title="全屏缺省标题"
+        description="内容描述内容描述内容描述"
+        actions={[{ text: '次要操作' }, { text: '主要操作', type: 'primary' }]}
       />
       <Empty
-        description="无数据"
+        description="内容描述内容描述内容描述"
         actions={[{ text: '操作按钮' }]}
         style={{ marginTop: pxTransform(10) }}
       />
-      <Empty description="无数据" style={{ marginTop: pxTransform(10) }} />
+      <Empty
+        description="内容描述内容描述内容描述"
+        style={{ marginTop: pxTransform(10) }}
+      />
     </>
   )
 }

diff --git a/src/packages/empty/demos/taro/demo2.tsx b/src/packages/empty/demos/taro/demo2.tsx
@@ -2,6 +2,12 @@ import React from 'react'
 import { Empty } from '@nutui/nutui-react-taro'
 
 const Demo2 = () => {
-  return <Empty description="无数据" size="small" />
+  return (
+    <Empty
+      title="半屏缺省标题"
+      description="内容描述内容描述内容描述"
+      size="small"
+    />
+  )
 }
 export default Demo2
diff --git a/src/packages/empty/demos/taro/demo3.tsx b/src/packages/empty/demos/taro/demo3.tsx
@@ -3,6 +3,6 @@ import { Empty } from '@nutui/nutui-react-taro'
 import pxTransform from '@/utils/px-transform'
 
 const Demo3 = () => {
-  return <Empty description="无数据" imageSize={pxTransform(80)} />
+  return <Empty description="内容描述内容描述" imageSize={pxTransform(80)} />
 }
 export default Demo3
diff --git a/src/packages/empty/demos/taro/demo4.tsx b/src/packages/empty/demos/taro/demo4.tsx
@@ -12,20 +12,20 @@ const Demo4 = () => {
     //     setTabvalue(paneKey)
     //   }}
     // >
-    //   <TabPane title="无内容" value="0">
-    //     <Empty status="empty" title="无内容" />
+    //   <TabPane title="通用空状态" value="0">
+    //     <Empty status="empty" title="通用空状态" />
     //   </TabPane>
     //   <TabPane title="加载失败/错误" value="1">
     //     <Empty status="error" title="加载失败/错误" />
     //   </TabPane>
-    //   <TabPane title="无网络" value="2">
-    //     <Empty status="network" title="无网络" />
+    //   <TabPane title="网络异常" value="2">
+    //     <Empty status="network" title="网络异常" />
     //   </TabPane>
     // </Tabs>
     <>
-      <Empty status="empty" title="无内容" />
+      <Empty status="empty" title="通用空状态" />
       <Empty status="error" title="加载失败/错误" />
-      <Empty status="network" title="无网络" />
+      <Empty status="network" title="网络异常" />
     </>
   )
 }

diff --git a/src/packages/empty/demos/taro/demo6.tsx b/src/packages/empty/demos/taro/demo6.tsx
@@ -8,7 +8,7 @@ const Demo6 = () => {
     <Empty status="error" description="加载失败">
       <View style={{ marginTop: pxTransform(10) }}>
         <Button type="primary" size="small">
-          重试
+          刷新重试
         </Button>
       </View>
     </Empty>

diff --git a/src/packages/empty/doc.en-US.md b/src/packages/empty/doc.en-US.md
@@ -84,10 +84,8 @@ The component provides the following CSS variables, which can be used to customi
 | --- | --- | --- |
 | \--nutui-empty-padding | The padding value of the Empty component image | `32px 40px` |
 | \--nutui-empty-image-size | The size of the Empty component image | `160px` |
-| \--nutui-empty-image-small-size | The size of the Empty component image when the size is small | `120px` |
-| \--nutui-empty-title-margin-top | Empty component image title margin-top value | `0px` |
-| \--nutui-empty-title-margin-top | Empty component image title margin-top value | `8px` |
-| \--nutui-empty-title-line-height | Empty component image title row height | `$font-size-base` |
-| \--nutui-empty-description-margin-top | Empty component image description margin-top value | `4px` |
-| \--nutui-empty-description-line-height | Empty component image description row height | `1.2` |
+| \--nutui-empty-image-small-size | When size is small, the size of the Empty component image | `120px` |
+| \--nutui-empty-title-margin-top | The value of margin-top of the Empty component image title | `0px` |
+| \--nutui-empty-title-line-height | Empty component image title line height | `$font-size-l` |
+| \--nutui-empty-description-line-height | Empty component image description line height | `1` |
 | \--nutui-empty-background-color | Empty component background color | `#fff` |
diff --git a/src/packages/empty/doc.md b/src/packages/empty/doc.md
@@ -86,8 +86,6 @@ import { Empty } from '@nutui/nutui-react'
 | \--nutui-empty-image-size | Empty组件图片的尺寸大小 | `160px` |
 | \--nutui-empty-image-small-size | size 为 small 时，Empty组件图片的尺寸大小 | `120px` |
 | \--nutui-empty-title-margin-top | Empty组件图片标题margin-top的值 | `0px` |
-| \--nutui-empty-title-margin-top | Empty组件图片标题margin-top的值 | `8px` |
-| \--nutui-empty-title-line-height | Empty组件图片标题行高 | `$font-size-base` |
-| \--nutui-empty-description-margin-top | Empty组件图片描述margin-top的值 | `4px` |
-| \--nutui-empty-description-line-height | Empty组件图片描述行高 | `1.2` |
+| \--nutui-empty-title-line-height | Empty组件图片标题行高 | `$font-size-l` |
+| \--nutui-empty-description-line-height | Empty组件图片描述行高 | `1` |
 | \--nutui-empty-background-color | Empty组件背景色 | `#fff` |
diff --git a/src/packages/empty/doc.taro.md b/src/packages/empty/doc.taro.md
@@ -86,8 +86,6 @@ import { Empty } from '@nutui/nutui-react-taro'
 | \--nutui-empty-image-size | Empty组件图片的尺寸大小 | `160px` |
 | \--nutui-empty-image-small-size | size 为 small 时，Empty组件图片的尺寸大小 | `120px` |
 | \--nutui-empty-title-margin-top | Empty组件图片标题margin-top的值 | `0px` |
-| \--nutui-empty-title-margin-top | Empty组件图片标题margin-top的值 | `8px` |
-| \--nutui-empty-title-line-height | Empty组件图片标题行高 | `$font-size-base` |
-| \--nutui-empty-description-margin-top | Empty组件图片描述margin-top的值 | `4px` |
-| \--nutui-empty-description-line-height | Empty组件图片描述行高 | `1.2` |
+| \--nutui-empty-title-line-height | Empty组件图片标题行高 | `$font-size-l` |
+| \--nutui-empty-description-line-height | Empty组件图片描述行高 | `1` |
 | \--nutui-empty-background-color | Empty组件背景色 | `#fff` |
diff --git a/src/packages/empty/doc.zh-TW.md b/src/packages/empty/doc.zh-TW.md
@@ -80,13 +80,12 @@ import { Empty } from '@nutui/nutui-react'
 
 組件提供了下列 CSS 變量，可用於自定義樣式，使用方法請參考 [ConfigProvider 組件](#/zh-CN/component/configprovider)。
 
-| 名稱 | 說明 | 默認值 |
+| 名稱 | 説明 | 默認值 |
 | --- | --- | --- |
 | \--nutui-empty-padding | Empty組件圖片的padding值 | `32px 40px` |
 | \--nutui-empty-image-size | Empty組件圖片的尺寸大小 | `160px` |
-| \--nutui-empty-image-small-size | size 為 small 時，Empty組件圖片的尺寸大小 | `120px` |
+| \--nutui-empty-image-small-size | size 爲 small 時，Empty組件圖片的尺寸大小 | `120px` |
 | \--nutui-empty-title-margin-top | Empty組件圖片標題margin-top的值 | `0px` |
-| \--nutui-empty-title-margin-top | Empty組件圖片標題margin-top的值 | `8px` |
-| \--nutui-empty-title-line-height | Empty組件圖片標題行高 | `$font-size-base` |
-| \--nutui-empty-description-margin-top | Empty組件圖片描述margin-top的值 | `4px` |
+| \--nutui-empty-title-line-height | Empty組件圖片標題行高 | `$font-size-l` |
+| \--nutui-empty-description-line-height | Empty組件圖片描述行高 | `1` |
 | \--nutui-empty-background-color | Empty組件背景色 | `#fff` |
diff --git a/src/packages/empty/empty.scss b/src/packages/empty/empty.scss
@@ -32,20 +32,24 @@
 
   &-title {
     margin-top: $empty-title-margin-top;
+    font-weight: $font-weight-bold;
     margin-bottom: $empty-title-margin-bottom;
     color: $color-title;
-    font-size: $font-size-base;
+    font-size: $font-size-l;
     line-height: $empty-title-line-height;
   }
 
   &-description {
-    margin-top: $empty-description-margin-top;
-    color: $color-text-help;
+    color: $color-text;
     font-size: $font-size-s;
     line-height: $empty-description-line-height;
   }
-
-  &-actions {
+  &-actions-base {
+    display: flex;
+    flex-direction: row;
+    margin-top: 24px;
+  }
+  &-actions-small {
     display: flex;
     flex-direction: row;
     margin-top: 16px;

diff --git a/src/packages/empty/empty.taro.tsx b/src/packages/empty/empty.taro.tsx
@@ -124,7 +124,7 @@ export const Empty: FunctionComponent<
         description
       )}
       {actions.length ? (
-        <View className={`${classPrefix}-actions`}>
+        <View className={`${classPrefix}-actions-${size}`}>
           {actions.map((action, index) => {
             const { text, ...rest } = action
             return (

diff --git a/src/packages/empty/empty.tsx b/src/packages/empty/empty.tsx
@@ -118,7 +118,7 @@ export const Empty: FunctionComponent<
         description
       )}
       {actions.length ? (
-        <div className={`${classPrefix}-actions`}>
+        <div className={`${classPrefix}-actions-${size}`}>
           {actions.map((action, index) => {
             const { text, ...rest } = action
             return (