From 85e387108e80e15f05426cd8df2487aea767924b Mon Sep 17 00:00:00 2001
From: songchenglin3 <353833373@qq.com>
Date: Mon, 17 Feb 2025 19:07:54 +0800
Subject: [PATCH 1/4] fix: jdharmonycpp version and dd attribute are updated
---
packages/nutui-taro-demo/config/index.js | 6 ---
packages/nutui-taro-demo/package.json | 2 +-
src/config.json | 55 ++++++++++++------------
3 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/packages/nutui-taro-demo/config/index.js b/packages/nutui-taro-demo/config/index.js
index 27dca226ee..f6aa1bc416 100644
--- a/packages/nutui-taro-demo/config/index.js
+++ b/packages/nutui-taro-demo/config/index.js
@@ -140,12 +140,6 @@ const config = {
framework: 'react',
// harmony 相关配置
harmony: {
- ohPackage: {
- dependencies: {
- '@jd-oh/taro_library': '2.0.70',
- '@jd-oh/taro_cpp_library': '0.1.2-alpha.0',
- },
- },
// 将编译方式设置为使用 Vite 编译
compiler: { type: 'vite' },
// 【必填】鸿蒙主应用的绝对路径，例如：
diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json
index 6799f62743..a1af57179f 100644
--- a/packages/nutui-taro-demo/package.json
+++ b/packages/nutui-taro-demo/package.json
@@ -60,7 +60,7 @@
"@dongdesign/inject-jd-platform-styles": "1.0.4",
"@jdtaro/plugin-platform-jdhybrid": "0.2.1",
"@jdtaro/taro-platform-jdharmony": "2.0.70",
- "@jdtaro/plugin-platform-jdharmony-cpp": "0.1.4-alpha.3",
+ "@jdtaro/plugin-platform-jdharmony-cpp": "0.1.22",
"@nutui/replace-icons": "^1.0.0",
"@nutui/touch-emulator": "^1.0.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
diff --git a/src/config.json b/src/config.json
index fbd278151d..029016ebfb 100644
--- a/src/config.json
+++ b/src/config.json
@@ -170,18 +170,7 @@
"name": "布局组件",
"enName": "layout",
"packages": [
- {
- "version": "3.0.0",
- "name": "Col",
- "type": "component",
- "cName": "列",
- "desc": "布局组件中的列",
- "sort": 3,
- "show": false,
- "exportEmpty": true,
- "author": "yushuang24",
- "dd": true
- },
+
{
"version": "3.0.0",
"name": "Divider",
@@ -234,6 +223,18 @@
"author": "yushuang24",
"dd": true
},
+ {
+ "version": "3.0.0",
+ "name": "Col",
+ "type": "component",
+ "cName": "列",
+ "desc": "布局组件中的列",
+ "sort": 3,
+ "show": false,
+ "exportEmpty": true,
+ "author": "yushuang24",
+ "dd": true
+ },
{
"version": "3.0.0",
"name": "Row",
@@ -299,7 +300,7 @@
"taro": true,
"v15": true,
"author": "vickyYe",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -311,7 +312,7 @@
"show": true,
"taro": true,
"author": "songsong",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -323,7 +324,7 @@
"show": true,
"taro": true,
"author": "Ymm0008",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -508,7 +509,7 @@
"show": true,
"taro": true,
"author": "szg2008",
- "dd": true
+ "dd": false
},
{
"version": "2.0.0",
@@ -700,7 +701,7 @@
"show": true,
"taro": true,
"v15": false,
- "dd": true,
+ "dd": false,
"author": "songsong"
},
{
@@ -739,7 +740,7 @@
"show": true,
"taro": true,
"author": "vickyYe",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -826,7 +827,7 @@
"show": true,
"taro": true,
"author": "swag~jun",
- "dd": true
+ "dd": false
}
]
},
@@ -922,7 +923,7 @@
"taro": true,
"v15": true,
"author": "swag~jun",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -972,7 +973,7 @@
"taro": true,
"v15": true,
"author": "lzz",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -999,7 +1000,7 @@
"taro": true,
"v15": true,
"author": "oasis",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -1011,7 +1012,7 @@
"show": true,
"taro": true,
"author": "swag~jun",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -1023,7 +1024,7 @@
"show": true,
"taro": true,
"author": "Ymm0008",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -1201,7 +1202,7 @@
"taro": true,
"v15": true,
"author": "swag~jun",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
@@ -1264,7 +1265,7 @@
"exportEmpty": true,
"desc": "步骤条子组件",
"author": "swag~jun",
- "dd": false
+ "dd": true
},
{
"version": "2.0.0",
@@ -1276,7 +1277,7 @@
"show": true,
"taro": true,
"author": "swag~jun",
- "dd": false
+ "dd": true
},
{
"version": "3.0.0",
From 860df42e7c0f5ef1ef40da34faf441679e9fd118 Mon Sep 17 00:00:00 2001
From: songchenglin3 <353833373@qq.com>
Date: Tue, 18 Feb 2025 15:56:49 +0800
Subject: [PATCH 2/4] fix: modify component adaptation problems
---
src/packages/cell/demos/taro/demo3.tsx | 3 ++-
src/packages/navbar/demos/taro/demo3.tsx | 16 ++++++++++++++--
src/packages/resultpage/resultpage.scss | 3 +++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/packages/cell/demos/taro/demo3.tsx b/src/packages/cell/demos/taro/demo3.tsx
index 65509a112b..555929e10a 100644
--- a/src/packages/cell/demos/taro/demo3.tsx
+++ b/src/packages/cell/demos/taro/demo3.tsx
@@ -13,7 +13,7 @@ const Demo3 = () => {
display: 'flex',
alignItems: 'center',
flexDirection: 'row',
- lineHeight: pxTransform(20),
+ height: pxTransform(20),
}}
>
@@ -28,6 +28,7 @@ const Demo3 = () => {
alignItems: 'center',
fontSize: pxTransform(12),
color: '#505259',
+ height: pxTransform(20),
}}
>
我是描述
diff --git a/src/packages/navbar/demos/taro/demo3.tsx b/src/packages/navbar/demos/taro/demo3.tsx
index 9cc3f34e0c..4440a9ec99 100644
--- a/src/packages/navbar/demos/taro/demo3.tsx
+++ b/src/packages/navbar/demos/taro/demo3.tsx
@@ -3,17 +3,24 @@ import Taro from '@tarojs/taro'
import { View } from '@tarojs/components'
import { NavBar, TabPane, Tabs } from '@nutui/nutui-react-taro'
import { ArrowLeft, More } from '@nutui/icons-react-taro'
+import { harmony } from '@/utils/platform-taro'
const Demo3 = () => {
const [tab1value, setTab1value] = useState('0')
const [tab2value, setTab2value] = useState('0')
+ const marginStyle = harmony() ? { marginRight: 16 } : {}
return (
<>
}
right={
<>
- Taro.showToast({ title: '编辑' })}>编辑
+ Taro.showToast({ title: '编辑' })}
+ style={marginStyle}
+ >
+ 编辑
+
Taro.showToast({ title: 'icon' })} />
}
@@ -39,7 +46,12 @@ const Demo3 = () => {
back={}
right={
<>
- Taro.showToast({ title: '编辑' })}>编辑
+ Taro.showToast({ title: '编辑' })}
+ style={marginStyle}
+ >
+ 编辑
+
Taro.showToast({ title: 'icon' })} />
}
diff --git a/src/packages/resultpage/resultpage.scss b/src/packages/resultpage/resultpage.scss
index e5d2dbbf67..4886d59592 100644
--- a/src/packages/resultpage/resultpage.scss
+++ b/src/packages/resultpage/resultpage.scss
@@ -35,6 +35,9 @@
display: flex;
flex-direction: row;
margin-top: $resultpage-actions-margin-top;
+ .nut-button-children {
+ white-space: nowrap;
+ }
}
&-action {
margin-left: 6px;
From db8f5ed59a9699a7b16340e991d6b4073a48be9d Mon Sep 17 00:00:00 2001
From: songchenglin3 <353833373@qq.com>
Date: Tue, 18 Feb 2025 16:14:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20steps=20=E6=9C=AA=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/config.json b/src/config.json
index 029016ebfb..05e6d9d277 100644
--- a/src/config.json
+++ b/src/config.json
@@ -1265,7 +1265,7 @@
"exportEmpty": true,
"desc": "步骤条子组件",
"author": "swag~jun",
- "dd": true
+ "dd": false
},
{
"version": "2.0.0",
@@ -1277,7 +1277,7 @@
"show": true,
"taro": true,
"author": "swag~jun",
- "dd": true
+ "dd": false
},
{
"version": "3.0.0",
From c378f90a1149235ec5d209246e59aa775036579f Mon Sep 17 00:00:00 2001
From: songchenglin3 <353833373@qq.com>
Date: Wed, 19 Feb 2025 12:03:41 +0800
Subject: [PATCH 4/4] fix: badge harmony
---
src/packages/badge/demos/taro/demo1.tsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/packages/badge/demos/taro/demo1.tsx b/src/packages/badge/demos/taro/demo1.tsx
index cdb42f65e3..85c9d44da5 100644
--- a/src/packages/badge/demos/taro/demo1.tsx
+++ b/src/packages/badge/demos/taro/demo1.tsx
@@ -9,7 +9,8 @@ const Demo1 = () => {
return (
文字内容