fix(configprovider): demo 适配 rn & harmony, 调整 cell rtl 样式 (#2347)

xiaoyatong · xiaoyatong · web-flow · commit a56beac42bac · 2024-06-17T21:30:30.000+08:00
* fix: configprovider demo 适配rn &amp; harmony,调整cell样式

* fix: nut-rtl

* fix: harmony json

* fix: harmony json

---------

Co-authored-by: xiaoyatong &lt;hanyuxingint@sina.cn&gt;
diff --git a/packages/nutui-harmony/entry/src/main/resources/base/profile/main_pages.json b/packages/nutui-harmony/entry/src/main/resources/base/profile/main_pages.json
@@ -88,4 +88,4 @@
     "designWidth": 375,
     "autoDesignWidth": false
   }
-}
+}
diff --git a/packages/nutui-taro-demo-rn/scripts/taro/adapted.js b/packages/nutui-taro-demo-rn/scripts/taro/adapted.js
@@ -26,4 +26,5 @@ exports = module.exports = [
   'hoverbutton',
   'safearea',
   'hoverbuttonitem',
+  'configprovider',
 ]
diff --git a/src/config.json b/src/config.json
@@ -93,7 +93,7 @@
           "author": "songsong"
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "ConfigProvider",
           "type": "component",
           "cName": "全局配置",
diff --git a/src/packages/cell/cell.harmony.css b/src/packages/cell/cell.harmony.css
@@ -21,6 +21,7 @@
 .nut-cell-left {
   display: flex;
   flex-direction: column;
+  align-items: flex-start;
   flex: 1;
 }
 .nut-cell-title {
diff --git a/src/packages/cell/cell.scss b/src/packages/cell/cell.scss
@@ -22,6 +22,7 @@
   &-left {
     display: flex;
     flex-direction: column;
+    align-items: flex-start;
     flex: 1;
   }
 
diff --git a/src/packages/configprovider/demos/h5/demo5.tsx b/src/packages/configprovider/demos/h5/demo5.tsx
@@ -7,8 +7,8 @@ const Demo5 = () => {
       <ConfigProvider direction="rtl">
         <Cell
           title={
-            <div style={{ display: 'inline-flex', alignItems: 'center' }}>
-              <span style={{ marginLeft: '5px' }}>我是标题</span>
+            <div>
+              <span>我是标题</span>
             </div>
           }
           description={<span>我是描述</span>}
diff --git a/src/packages/configprovider/demos/taro/demo1.tsx b/src/packages/configprovider/demos/taro/demo1.tsx
@@ -1,17 +1,13 @@
 import React from 'react'
-import {
-  ConfigProvider,
-  Cell,
-  //  Rate,
-  Button,
-} from '@nutui/nutui-react-taro'
+import { ConfigProvider, Cell, Rate, Button } from '@nutui/nutui-react-taro'
+import { harmonyAndRn } from '@/utils/platform-taro'
 // todo rate icon
 const Demo1 = () => {
   return (
     <>
       <ConfigProvider>
         <Cell.Group>
-          <Cell>{/* <Rate defaultValue={3} /> */}</Cell>
+          <Cell>{harmonyAndRn() ? null : <Rate defaultValue={3} />}</Cell>
           <Cell>
             <Button type="primary" block>
               提交
diff --git a/src/packages/configprovider/demos/taro/demo2.tsx b/src/packages/configprovider/demos/taro/demo2.tsx
@@ -1,10 +1,6 @@
 import React from 'react'
-import {
-  ConfigProvider,
-  Cell,
-  //  Rate,
-  Button,
-} from '@nutui/nutui-react-taro'
+import { ConfigProvider, Cell, Rate, Button } from '@nutui/nutui-react-taro'
+import { harmonyAndRn } from '@/utils/platform-taro'
 
 const Demo2 = () => {
   const darkTheme = {
@@ -16,7 +12,7 @@ const Demo2 = () => {
     <>
       <ConfigProvider theme={darkTheme}>
         <Cell.Group>
-          <Cell>{/* <Rate defaultValue={3} /> */}</Cell>
+          <Cell>{harmonyAndRn() ? null : <Rate defaultValue={3} />}</Cell>
           <Cell>
             <Button type="primary" block>
               提交
diff --git a/src/packages/configprovider/demos/taro/demo5.tsx b/src/packages/configprovider/demos/taro/demo5.tsx
@@ -1,18 +1,23 @@
 import React from 'react'
 import { View, Text } from '@tarojs/components'
 import { ConfigProvider, Cell } from '@nutui/nutui-react-taro'
+import pxTransform from '@/utils/px-transform'
 
 const Demo5 = () => {
   return (
     <>
       <ConfigProvider direction="rtl">
         <Cell
           title={
-            <View style={{ display: 'inline-flex', alignItems: 'center' }}>
-              <Text style={{ marginLeft: 5 }}>我是标题</Text>
+            <View>
+              <Text style={{ fontSize: pxTransform(14) }}>我是标题</Text>
             </View>
           }
-          description={<Text>我是描述</Text>}
+          description={
+            <Text style={{ fontSize: pxTransform(12), color: '#ccc' }}>
+              我是描述
+            </Text>
+          }
           extra="描述文字"
         />
       </ConfigProvider>

Original file line number	Diff line number	Diff line change
`@@ -88,4 +88,4 @@`
`88`	`88`	`"designWidth": 375,`
`89`	`89`	`"autoDesignWidth": false`
`90`	`90`	`}`
`91`		`-}`
	`91`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,5 @@ exports = module.exports = [`
`26`	`26`	`'hoverbutton',`
`27`	`27`	`'safearea',`
`28`	`28`	`'hoverbuttonitem',`
	`29`	`+ 'configprovider',`
`29`	`30`	`]`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@`
`93`	`93`	`"author": "songsong"`
`94`	`94`	`},`
`95`	`95`	`{`
`96`		`- "version": "2.0.0",`
	`96`	`+ "version": "3.0.0",`
`97`	`97`	`"name": "ConfigProvider",`
`98`	`98`	`"type": "component",`
`99`	`99`	`"cName": "全局配置",`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`.nut-cell-left {`
`22`	`22`	`display: flex;`
`23`	`23`	`flex-direction: column;`
	`24`	`+ align-items: flex-start;`
`24`	`25`	`flex: 1;`
`25`	`26`	`}`
`26`	`27`	`.nut-cell-title {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`&-left {`
`23`	`23`	`display: flex;`
`24`	`24`	`flex-direction: column;`
	`25`	`+ align-items: flex-start;`
`25`	`26`	`flex: 1;`
`26`	`27`	`}`
`27`	`28`