@tarojs/plugin-platform-harmony-ets 4.0.0-beta.56 → 4.0.0-beta.58

package/dist/apis/wxml/selectorQuery.ts

@@ -112,7 +112,7 @@ function filter (fields, dom) {
     return res
   }
   if (context) {
-    // TODO: 暂未实现获取 context
+    // TODO: 暂未实现获取  context
     // const typeName = dom.type
     // if (/^video/i.test(typeName)) {
     //   return { context: dom }
@@ -179,9 +179,13 @@ function filter (fields, dom) {
 
 function querySelector (selector, selectAll) {
   if (typeof selector === 'string') {
-    return parseHandler(selector, selectAll)
+    return selector.split(',').reduce((prev, current) => {
+      const item = current.trim()
+
+      return prev.concat(parseHandler(item, selectAll))
+    }, [])
   }
-  return null
+  return []
 }
 
 function queryBat (queue, cb) {

package/dist/components-harmony-ets/image.ets

@@ -39,5 +39,12 @@ export default struct TaroImage {
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .onComplete(e => eventHandler(e, 'complete', this.node))
       .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      // TODO: 临时改为申明式，后续等鸿蒙修复modify设置失败的bug后删除该申明
+      .borderRadius({
+        topLeft: this.node._st.hmStyle.borderTopLeftRadius,
+        topRight: this.node._st.hmStyle.borderTopRightRadius,
+        bottomLeft: this.node._st.hmStyle.borderBottomLeftRadius,
+        bottomRight: this.node._st.hmStyle.borderBottomRightRadius
+      })
   }
 }

package/dist/components-harmony-ets/style.ets

@@ -170,15 +170,15 @@ export function setTransformAttributeIntoInstance(instance: CommonAttribute, sty
     x: style.transform?.Scale?.x,
     y: style.transform?.Scale?.y,
     z: style.transform?.Scale?.z,
-    centerX: style.transformOrigin?.x || 0,
-    centerY: style.transformOrigin?.y || 0,
+    centerX: style.transformOrigin?.x,
+    centerY: style.transformOrigin?.y,
   })
   instance.rotate({
     x: style.transform?.Rotate?.x,
     y: style.transform?.Rotate?.y,
     z: style.transform?.Rotate?.z,
-    centerX: style.transformOrigin?.x || 0,
-    centerY: style.transformOrigin?.y || 0,
+    centerX: style.transformOrigin?.x,
+    centerY: style.transformOrigin?.y,
     angle: style.transform?.Rotate?.angle || 0,
   })
 }

package/dist/runtime-ets/dom/cssNesting.ts

@@ -163,6 +163,10 @@ function depthTraversal(root: ReactElement) {
 function combineStyle(nestingStyle: NestingStyle, class_mapping: TMapping, alias: Record<string, string[]>) {
 
   const findElement = (selector_string, combinator_type, selector_mapping, remainder_selector, declaration) => {
+    // 防止修改原数组
+    if (selector_string instanceof Array) {
+      selector_string = selector_string.slice()
+    }
     let selector_list = [selector_string]
     const selector_nodes: TSelectorNode[] = []
     let shouldUseCombinations = false
@@ -182,31 +186,36 @@ function combineStyle(nestingStyle: NestingStyle, class_mapping: TMapping, alias
     for (let i = 0; i < selector_list.length; i++) {
       const selector = selector_list[i]
       if (selector instanceof Array) {
-        let obj
+        let hitElements: any
         // 如果是数组，说明他是一个多类选择器：.a.b，我们需要搜索这两个类名都指向同一个node
         if (shouldUseCombinations) {
-          obj = generateCombinations(selector, (combination) => {
+          hitElements = generateCombinations(selector, (combination) => {
             // combination 是组合后的选择器['parent', 'child']
             const _obj = findSendNode(combination, selector_mapping)
             if (_obj) return _obj
           })
         } else {
-          obj = findSendNode(selector, selector_mapping)
+          hitElements = findSendNode(selector, selector_mapping)
         }
         // 找出最后搜寻出来的node
-        if (obj) {
-          if (typeof obj.node.type === 'function') {
-            // 自定义组件，往下传递需要搜寻的内容向里面搜寻
-            const nestingData = {
-              selectors: [selector_string, combinator_type, ...remainder_selector.slice()],
-              declaration: declaration
+        if (hitElements) {
+          let objs = [hitElements]
+          objs = flattenArray(objs)
+          objs.forEach(obj => {
+            if (typeof obj.node.type === 'function') {
+              // 自定义组件，往下传递需要搜寻的内容向里面搜寻
+              const nestingData = {
+                selectors: [selector_string, combinator_type, ...remainder_selector.slice()],
+                declaration: declaration
+              }
+              obj.node.props.__nesting = obj.node.props.__nesting ?
+                [...obj.node.props.__nesting, nestingData] : [nestingData]
             }
-            obj.node.props.__nesting = obj.node.props.__nesting ?
-              [...obj.node.props.__nesting, nestingData] : [nestingData]
-          }
-          selector_nodes.push({
-            mapping: (obj.ref || obj)[combinator_type === ' > ' ? 'children' : 'descendants'],
-            node: obj.node
+            selector_nodes.push({
+              // @ts-ignore
+              mapping: (obj.ref || obj)[combinator_type === ' > ' ? 'children' : 'descendants'],
+              node: obj.node
+            })
           })
         }
       } else {
@@ -286,17 +295,19 @@ function generateCombinations (arrays: (string[] | string)[], cbFn, currentCombi
   const currentArray = arrays[0]
   if (currentArray instanceof Array) {
     // 遍历当前数组的每个元素
+    const eles: TMappingNode[] = []
     for (let i = 0; i < currentArray.length; i++) {
       // 将当前元素添加到当前组合中
       currentCombination.push(currentArray[i])
       // 递归处理剩余的数组
       const shouldStop = generateCombinations(arrays.slice(1), cbFn, currentCombination)
       if (shouldStop) {
-        return shouldStop
+        eles.push(shouldStop)
       }
       // 回溯，移除最后一个元素，尝试其他组合
       currentCombination.pop()
     }
+    return eles
   } else {
     // 如果不是数组，直接将当前元素添加到当前组合中
     currentCombination.push(currentArray)
@@ -391,3 +402,10 @@ export function __combine_nesting_style__(react_tree: ReactElement, styles: Nest
   }
   return react_tree
 }
+
+// 拍平数组
+function flattenArray(arr) {
+  return arr.reduce((acc, val) => {
+    return acc.concat(Array.isArray(val) ? flattenArray(val) : val)
+  }, [])
+}

package/dist/runtime-ets/dom/cssStyleDeclaration.ts

@@ -23,10 +23,10 @@ class CSSStyleDeclaration {
   }
 
   public set cssText (value: string) {
+    // 复制，防止被篡改到attr上的原始内容
+    this._st.hmStyle = Object.assign({}, this.el._attrs?.__hmStyle) || {}
     if (value === '' || value === undefined || value === null) {
-      // TODO: 清空 stylesheet 里面的 hmstyle
-      // this.el._st = {}
-      this._st.hmStyle = {}
+      // 清空style，只保留class的样式
       return
     }
 

package/dist/runtime-utils.js

@@ -4340,9 +4340,12 @@ function filter(fields, dom) {
 }
 function querySelector(selector, selectAll) {
     if (typeof selector === 'string') {
-        return parseHandler(selector, selectAll);
+        return selector.split(',').reduce((prev, current) => {
+            const item = current.trim();
+            return prev.concat(parseHandler(item, selectAll));
+        }, []);
     }
-    return null;
+    return [];
 }
 function queryBat(queue, cb) {
     const result = [];