@joker.front/core 1.2.139 → 1.2.142

package/dist/bundle.es.js

@@ -1048,10 +1048,15 @@ var VNode;
      * 组件节点
      */
     class Component extends Node {
+        /** 组件名（template标签名） */
         name;
+        /** 组件实例 */
         component;
+        /** 事件 */
         events = [];
+        /** 参数 */
         propValues = {};
+        /** 是否保持存活 */
         keepalive;
         /**
          * 当前组件第一个element vnode
@@ -1205,8 +1210,7 @@ var Render;
                 }
             }
             else if (node instanceof VNode.Html) {
-                this.removeNode(node);
-                this.appendNode(node);
+                node.output.root.innerHTML = node.html;
             }
             else {
                 logger.error(LOGTAG$4, `该节点不支持${propertyKey}的更新`, node);
@@ -1333,7 +1337,9 @@ var Render;
                 }
             }
             else if (node instanceof VNode.Html) {
-                node.output = this.parserHtml(node.html);
+                let conatiner = document.createElement("joker-html-container");
+                conatiner.root.innerHTML = node.html;
+                node.output = conatiner;
             }
             else if (node instanceof VNode.Element) {
                 let element;
@@ -1726,6 +1732,16 @@ function toMs(s) {
         return 0;
     return Number(s.slice(0, -1).replace(",", ".")) * 1000;
 }
+// 创建一个自定义元素
+class HtmlContainerWebComponent extends HTMLElement {
+    root;
+    constructor() {
+        super();
+        this.root = this.attachShadow({ mode: "open" });
+    }
+}
+// 注册自定义元素
+customElements.define("joker-html-container", HtmlContainerWebComponent);
 
 //全局方法
 const __GLONAL_FUNTIONS__ = {};
@@ -2226,19 +2242,19 @@ class ParserCode extends IParser {
             logger.error("模板指令", "解析AST转换VNode时发生错误，未找到指令名称", this.ast);
             throw new Error("解析AST转换VNode时发生错误，未找到指令名称");
         }
-        let exporess = undefined;
+        let express = undefined;
         //全局过滤器
         if (this.ast.cmdName === "Html" || this.ast.cmdName === "Text") {
-            exporess = this.ast.param;
+            express = this.ast.param;
         }
         else if (this.ast.cmdName.startsWith(GLOBAL_TAG + ".")) {
-            exporess = `${this.ast.cmdName}(${this.ast.param})`;
+            express = `${this.ast.cmdName}(${this.ast.param})`;
         }
         else if (this.ast.cmdName in this.ob && typeof this.ob[this.ast.cmdName] === "function") {
-            exporess = `${createFuntionBody(this.ast.cmdName)}(${this.ast.param})`;
+            express = `${createFuntionBody(this.ast.cmdName)}(${this.ast.param})`;
         }
-        if (exporess) {
-            let data = this.runExpressWithWatcher(exporess, this.ob, (newVal) => {
+        if (express) {
+            let data = this.runExpressWithWatcher(express, this.ob, (newVal) => {
                 if (this.node instanceof VNode.Html) {
                     this.node.html = transformText(newVal);
                 }
@@ -2250,6 +2266,7 @@ class ParserCode extends IParser {
             });
             data = transformText(data);
             if (this.ast.cmdName === "Html") {
+                data ||= [];
                 this.node = new VNode.Html(data, this.parent);
             }
             else {

package/dist/bundle.js

@@ -1049,10 +1049,15 @@ exports.VNode = void 0;
      * 组件节点
      */
     class Component extends Node {
+        /** 组件名（template标签名） */
         name;
+        /** 组件实例 */
         component;
+        /** 事件 */
         events = [];
+        /** 参数 */
         propValues = {};
+        /** 是否保持存活 */
         keepalive;
         /**
          * 当前组件第一个element vnode
@@ -1206,8 +1211,7 @@ var Render;
                 }
             }
             else if (node instanceof exports.VNode.Html) {
-                this.removeNode(node);
-                this.appendNode(node);
+                node.output.root.innerHTML = node.html;
             }
             else {
                 logger.error(LOGTAG$4, `该节点不支持${propertyKey}的更新`, node);
@@ -1334,7 +1338,9 @@ var Render;
                 }
             }
             else if (node instanceof exports.VNode.Html) {
-                node.output = this.parserHtml(node.html);
+                let conatiner = document.createElement("joker-html-container");
+                conatiner.root.innerHTML = node.html;
+                node.output = conatiner;
             }
             else if (node instanceof exports.VNode.Element) {
                 let element;
@@ -1727,6 +1733,16 @@ function toMs(s) {
         return 0;
     return Number(s.slice(0, -1).replace(",", ".")) * 1000;
 }
+// 创建一个自定义元素
+class HtmlContainerWebComponent extends HTMLElement {
+    root;
+    constructor() {
+        super();
+        this.root = this.attachShadow({ mode: "open" });
+    }
+}
+// 注册自定义元素
+customElements.define("joker-html-container", HtmlContainerWebComponent);
 
 //全局方法
 const __GLONAL_FUNTIONS__ = {};
@@ -2227,19 +2243,19 @@ class ParserCode extends IParser {
             logger.error("模板指令", "解析AST转换VNode时发生错误，未找到指令名称", this.ast);
             throw new Error("解析AST转换VNode时发生错误，未找到指令名称");
         }
-        let exporess = undefined;
+        let express = undefined;
         //全局过滤器
         if (this.ast.cmdName === "Html" || this.ast.cmdName === "Text") {
-            exporess = this.ast.param;
+            express = this.ast.param;
         }
         else if (this.ast.cmdName.startsWith(GLOBAL_TAG + ".")) {
-            exporess = `${this.ast.cmdName}(${this.ast.param})`;
+            express = `${this.ast.cmdName}(${this.ast.param})`;
         }
         else if (this.ast.cmdName in this.ob && typeof this.ob[this.ast.cmdName] === "function") {
-            exporess = `${ast.createFuntionBody(this.ast.cmdName)}(${this.ast.param})`;
+            express = `${ast.createFuntionBody(this.ast.cmdName)}(${this.ast.param})`;
         }
-        if (exporess) {
-            let data = this.runExpressWithWatcher(exporess, this.ob, (newVal) => {
+        if (express) {
+            let data = this.runExpressWithWatcher(express, this.ob, (newVal) => {
                 if (this.node instanceof exports.VNode.Html) {
                     this.node.html = transformText(newVal);
                 }
@@ -2251,6 +2267,7 @@ class ParserCode extends IParser {
             });
             data = transformText(data);
             if (this.ast.cmdName === "Html") {
+                data ||= [];
                 this.node = new exports.VNode.Html(data, this.parent);
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@joker.front/core",
-    "version": "1.2.139",
+    "version": "1.2.142",
     "description": "",
     "main": "./dist/bundle.js",
     "module": "./dist/bundle.es.js",
@@ -20,7 +20,7 @@
     ],
     "scripts": {
         "test": "jest",
-        "test:temp": "jest test/parser/cmd.spec.ts",
+        "test:temp": "jest test/parser/html.spec.ts",
         "build": "joker_build_library --sourcemap=false",
         "release": "npm run test && npm run build && joker_release_library",
         "release:prod": "npm run test && npm run build && npm publish --access public --registry https://registry.npmjs.org/"

package/types/component.d.ts

@@ -94,11 +94,11 @@ export declare class Component<T extends DefaultKeyVal = {}> implements ICompone
     /**
      * 根据ref获取单个VNode
      */
-    $getRef<T extends VNode.Node>(ref: string): T | undefined;
+    $getRef<T extends VNode.Node = VNode.Element & VNode.Component>(ref: string): T | undefined;
     /**
      * 获取相同ref的VNode集合
      */
-    $getRefs<T extends VNode.Node>(ref: string): Array<T> | undefined;
+    $getRefs<T extends VNode.Node = VNode.Element & VNode.Component>(ref: string): Array<T> | undefined;
     /**
      * 单向同步prop值，并监听变更后重新同步
      * @param propKey 需要观察同步的props key

package/types/parser/vnode.d.ts

@@ -128,13 +128,18 @@ export declare namespace VNode {
      * 组件节点
      */
     class Component<T extends IComponent = IComponent & Record<string, any>> extends Node {
+        /** 组件名（template标签名） */
         name?: string;
+        /** 组件实例 */
         component: T;
+        /** 事件 */
         events: Array<[string, {
             modifiers?: string[];
             callBack: EventCallBack;
         }]>;
+        /** 参数 */
         propValues: Record<string, any>;
+        /** 是否保持存活 */
         keepalive?: boolean;
         /**
          * 当前组件第一个element vnode