@tarojs/plugin-platform-harmony-ets 4.0.0-beta.33 → 4.0.0-beta.35

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

@@ -1,6 +1,7 @@
 import { eventSource } from '@tarojs/runtime/dist/runtime.esm'
 import { EMPTY_OBJ, toCamelCase } from '@tarojs/shared'
 
+import { document } from '../../bom/document'
 import { ATTRIBUTES_CALLBACK_TRIGGER_MAP, ID } from '../../constant'
 import { findChildNodeWithDFS } from '../../utils'
 import { initComponentNodeInfo, triggerAttributesCallback } from '../../utils/info'
@@ -27,7 +28,10 @@ export class TaroElement<
 > extends TaroNode {
   public _innerHTML = ''
   public _instance: TaroAny
-  public _nodeInfo: TaroAny = {}
+  public _nodeInfo: TaroAny = {
+    layer: 0 // 渲染层级
+  }
+  
   public readonly tagName: string
   public dataset: Record<string, unknown> = EMPTY_OBJ
   public _attrs: T & TaroExtraProps = {} as T & TaroExtraProps
@@ -237,4 +241,24 @@ export class TaroElement<
       this._pseudo_class[name] = null
     }
   }
+
+  // 设置渲染层级，0为正常层级，大于0为固定层级
+  public setLayer (value: number) {
+    this._nodeInfo.layer = value
+
+    if (value > 0) {
+      // 插入到root层
+      document.fixedLayer.childNodes.push(this)
+      document.fixedLayer.notifyDataAdd(document.fixedLayer.childNodes.length - 1)
+    } else {
+      const idx = document.fixedLayer.childNodes.findIndex(n => n._nid === this._nid)
+      document.fixedLayer.childNodes.splice(idx, 1)
+      document.fixedLayer.notifyDataDelete(idx)
+    }
+
+    if (this.parentNode) {
+      this.parentNode.notifyDataChange(this.parentNode.findIndex(this))
+      this.updateComponent()
+    }
+  }
 }

package/dist/runtime-ets/dom/element/normal.ts

@@ -69,7 +69,16 @@ class TaroSwiperItemElement extends TaroElement<SwiperItemProps>{
   }
 }
 
+// Fixed浮层节点树
+@Observed
+class FixedLayer extends TaroElement {
+  constructor() {
+    super('View')
+  }
+}
+
 export {
+  FixedLayer,
   TaroButtonElement,
   TaroIconElement,
   TaroImageElement,
@@ -77,5 +86,5 @@ export {
   TaroRichTextElement,
   TaroSwiperElement,
   TaroSwiperItemElement,
-  TaroViewElement, 
+  TaroViewElement
 }

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

@@ -85,6 +85,11 @@ export class TaroNode extends TaroDataSourceElement {
     }
   }
 
+  // 提供唯一标识，方便与小程序一致，能根据uid获取到对应的节点
+  public get uid (): string {
+    return this._nid
+  }
+
   public get firstChild (): TaroNode | null{
     return this.childNodes[0] || null
   }
@@ -215,6 +220,13 @@ export class TaroNode extends TaroDataSourceElement {
     const idx = this.findIndex(child)
     if (idx < 0) throw new Error('TaroNode:removeChild NotFoundError')
 
+    // 渲染，层级大于0的节点需要让其回到正常层级，然后删掉
+    // @ts-ignore
+    if (child._nodeInfo?.layer > 0) {
+      // @ts-ignore
+      child.setLayer(0) // 删除固定层级上的节点
+    }
+
     this.childNodes.splice(idx, 1)
     child.dispose()
     this.notifyDataDelete(idx)

package/dist/runtime-utils.js

@@ -4350,19 +4350,29 @@ function queryBat(queue, cb) {
         return null;
     arr = [];
     traversalDFSDom(element);
-    queue.forEach(item => {
+    queue.forEach((item) => {
         const { selector, single, fields } = item;
-        const nodeList = querySelector(selector, !single);
-        result.push(nodeList.map(dom => {
+        if (single) {
+            const dom = querySelector(selector, !single)[0];
             // eslint-disable-next-line no-async-promise-executor
-            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+            result.push(new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 yield setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true);
                 resolve(filter(fields, dom));
+            })));
+        }
+        else {
+            const nodeList = querySelector(selector, !single);
+            result.push(nodeList.map(dom => {
+                // eslint-disable-next-line no-async-promise-executor
+                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                    yield setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true);
+                    resolve(filter(fields, dom));
+                }));
             }));
-        }));
+        }
     });
     Promise.all(result.map(item => {
-        return Promise.all(item);
+        return item instanceof Array ? Promise.all(item) : item;
     })).then(data => {
         cb(data);
     });