@tarojs/plugin-platform-harmony-ets 4.0.0-beta.98 → 4.0.0-beta.99

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  import { isString } from '@tarojs/shared'
2
2
  import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, NodeType } from '@tarojs/runtime'
3
3
 
4
- import { textModify, setNormalTextAttributeIntoInstance } from './style'
4
+ import commonStyleModify, { textModify, setNormalTextAttributeIntoInstance } from './style'
5
5
  import { getButtonColor } from './button'
6
6
  import { getImageMode } from './image'
7
7
  import { BUTTON_THEME_COLOR } from './utils/constant/style'
@@ -74,42 +74,23 @@ export default struct TaroText {
74
74
  }
75
75
  }
76
76
 
77
+ function getImageSpanAlignment (align: TaroAny): TaroAny {
78
+ if (align === Alignment.Top) {
79
+ return ImageSpanAlignment.TOP
80
+ } else if (align === Alignment.Bottom) {
81
+ return ImageSpanAlignment.BOTTOM
82
+ } else if (align === Alignment.Center) {
83
+ return ImageSpanAlignment.CENTER
84
+ }
85
+ }
86
+
77
87
  @Builder
78
88
  function createTextChildNode (item: TaroElement) {
79
89
  if (item.tagName === 'IMAGE') {
80
90
  ImageSpan(item.getAttribute('src'))
81
- // .attributeModifier(commonStyleModify.setNode(item))
91
+ .attributeModifier(commonStyleModify.setNode(item))
82
92
  .objectFit(getImageMode(item.getAttribute('mode')))
83
- // .verticalAlign(align)
84
- .width(item._st.hmStyle.width)
85
- .height(item._st.hmStyle.height)
86
- .margin({
87
- top: item._st.hmStyle.marginTop,
88
- left: item._st.hmStyle.marginLeft,
89
- right: item._st.hmStyle.marginRight,
90
- bottom: item._st.hmStyle.marginBottom,
91
- })
92
- .padding({
93
- top: item._st.hmStyle.paddingTop,
94
- left: item._st.hmStyle.paddingLeft,
95
- right: item._st.hmStyle.paddingRight,
96
- bottom: item._st.hmStyle.paddingBottom,
97
- })
98
- .textBackgroundStyle({
99
- color: item._st.hmStyle.backgroundColor,
100
- radius: {
101
- topLeft: item._st.hmStyle.borderTopLeftRadius,
102
- topRight: item._st.hmStyle.borderTopRightRadius,
103
- bottomLeft: item._st.hmStyle.borderBottomLeftRadius,
104
- bottomRight: item._st.hmStyle.borderBottomRightRadius,
105
- }
106
- })
107
- .borderRadius({
108
- topLeft: item._st.hmStyle.borderTopLeftRadius,
109
- topRight: item._st.hmStyle.borderTopRightRadius,
110
- bottomLeft: item._st.hmStyle.borderBottomLeftRadius,
111
- bottomRight: item._st.hmStyle.borderBottomRightRadius
112
- })
93
+ .verticalAlign(getImageSpanAlignment(item?.hmStyle?.verticalAlign))
113
94
  .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', item) }, item, ['click']))
114
95
  } else if (item.nodeType === NodeType.TEXT_NODE) {
115
96
  Span(item.textContent)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/plugin-platform-harmony-ets",
3
- "version": "4.0.0-beta.98",
3
+ "version": "4.0.0-beta.99",
4
4
  "description": "OpenHarmony & 鸿蒙系统插件",
5
5
  "author": "O2Team",
6
6
  "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -27,13 +27,13 @@
27
27
  "webpack-sources": "^3.2.3",
28
28
  "@babel/preset-react": "^7.24.1",
29
29
  "webpack": "5.91.0",
30
- "@tarojs/components": "4.0.0-beta.98",
31
- "@tarojs/helper": "4.0.0-beta.98",
32
- "@tarojs/runner-utils": "4.0.0-beta.98",
33
- "@tarojs/service": "4.0.0-beta.98",
34
- "@tarojs/shared": "4.0.0-beta.98",
35
- "@tarojs/runtime": "4.0.0-beta.98",
36
- "@tarojs/taro": "4.0.0-beta.98"
30
+ "@tarojs/components": "4.0.0-beta.99",
31
+ "@tarojs/helper": "4.0.0-beta.99",
32
+ "@tarojs/runner-utils": "4.0.0-beta.99",
33
+ "@tarojs/runtime": "4.0.0-beta.99",
34
+ "@tarojs/service": "4.0.0-beta.99",
35
+ "@tarojs/shared": "4.0.0-beta.99",
36
+ "@tarojs/taro": "4.0.0-beta.99"
37
37
  },
38
38
  "devDependencies": {
39
39
  "fast-glob": "^3.3.1",
@@ -42,7 +42,7 @@
42
42
  "rollup-plugin-ts": "^3.0.2",
43
43
  "solid-js": "^1.8.16",
44
44
  "tslib": "^2.4.0",
45
- "rollup-plugin-copy": "4.0.0-beta.98"
45
+ "rollup-plugin-copy": "4.0.0-beta.99"
46
46
  },
47
47
  "scripts": {
48
48
  "prod": "pnpm run build",