@joker.front/core 1.2.153 → 1.2.157

package/dist/bundle.es.js

@@ -1302,6 +1302,9 @@ var Render;
                     let resolve = () => {
                         removeClassName(node, getTransitionClassName(transitionName, model, "to"));
                         removeClassName(node, getTransitionClassName(transitionName, model, "active"));
+                        //可能存在越级删除，造成动画元素过早移除，
+                        if (!node.output)
+                            return;
                         node.output.removeEventListener(`${type}end`, onEnd);
                         if (id === node.output.__TRANSITION_EVNETID__) {
                             callBack?.();
@@ -1337,6 +1340,8 @@ var Render;
             }
             else if (node instanceof VNode.Html) {
                 let conatiner = document.createElement("joker-html-container");
+                //@ts-ignore
+                conatiner.JOKER_NODE = node;
                 conatiner.root.innerHTML = node.html;
                 node.output = conatiner;
             }
@@ -1354,6 +1359,8 @@ var Render;
                 for (let attrName in node.attributes) {
                     this.setAttribute(element, attrName, node.attributes[attrName]);
                 }
+                //@ts-ignore
+                element.JOKER_NODE = node;
                 node.output = element;
                 //做穿透延迟仅对outside.click
                 if (node.events.some((n) => n[0] === "click" && n[1].modifiers?.includes("outside"))) {
@@ -2818,11 +2825,11 @@ class ParserTemplate {
         this.nodeWatcherEvents = {};
         this.asts.length = 0;
     }
-    reParser(asts, keepalive) {
+    reSetAsts(asts, keepalive) {
         //销毁历史产物
         this.destroy(keepalive);
         this.render = IContainer.get(Render.IRENDERIOCTAGID) ?? new Render.DomRender();
-        this.parserNodes(asts, this.root);
+        this.asts = asts;
     }
     nodeTransition(node, mode, name, callBack, type) {
         if (node && node.parent?.childrens && (node instanceof VNode.Element || node instanceof VNode.Component)) {
@@ -3292,7 +3299,7 @@ class Component {
         }
         //执行一次render，则初始化一次template
         this.template ??= [];
-        this[PARSER_TEMPLATE_TARGET]?.reParser(this.template, keepalive);
+        this[PARSER_TEMPLATE_TARGET]?.reSetAsts(this.template, keepalive);
         this[PARSER_TEMPLATE_TARGET] ??= new ParserTemplate(this.template, this, this.$root);
         this[PARSER_TEMPLATE_TARGET].parser();
         this[PARSER_TEMPLATE_TARGET].mount(this.$root);
@@ -3393,20 +3400,22 @@ class ComponentContainer extends Component {
     propsVaule;
     created() {
         let propsData = {};
-        Object.keys(this.props).forEach((p) => {
-            //过滤
-            if (typeof p !== "string")
-                return;
-            let pName = toLowerCase(p);
-            if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
-                return;
-            propsData[p] = this.props[p];
-            //单项数据同步
-            this.$watch(() => this.props[p], () => {
-                this.propsVaule[p] = this.props[p];
+        if (!this.props.props) {
+            Object.keys(this.props).forEach((p) => {
+                //过滤
+                if (typeof p !== "string")
+                    return;
+                let pName = toLowerCase(p);
+                if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
+                    return;
+                propsData[p] = this.props[p];
+                //单项数据同步
+                this.$watch(() => this.props[p], () => {
+                    this.propsVaule[p] = this.props[p];
+                });
             });
-        });
-        this.propsVaule = observer(propsData);
+            this.propsVaule = observer(propsData);
+        }
     }
     async loadComponent(componentName) {
         if (!componentName) {
@@ -3430,7 +3439,7 @@ class ComponentContainer extends Component {
             if (!(JOKER_COMPONENT_TAG in component)) {
                 component = (await component()).default;
             }
-            cacheComponent = new component(this.propsVaule, this.$sections, this.isKeepAlive);
+            cacheComponent = new component(this.props.props || this.propsVaule, this.$sections, this.isKeepAlive);
             //事件向上穿透广播
             cacheComponent.$on("*", (e) => {
                 this.$trigger(e.eventName, e.data, e);

package/dist/bundle.js

@@ -1303,6 +1303,9 @@ var Render;
                     let resolve = () => {
                         removeClassName(node, getTransitionClassName(transitionName, model, "to"));
                         removeClassName(node, getTransitionClassName(transitionName, model, "active"));
+                        //可能存在越级删除，造成动画元素过早移除，
+                        if (!node.output)
+                            return;
                         node.output.removeEventListener(`${type}end`, onEnd);
                         if (id === node.output.__TRANSITION_EVNETID__) {
                             callBack?.();
@@ -1338,6 +1341,8 @@ var Render;
             }
             else if (node instanceof exports.VNode.Html) {
                 let conatiner = document.createElement("joker-html-container");
+                //@ts-ignore
+                conatiner.JOKER_NODE = node;
                 conatiner.root.innerHTML = node.html;
                 node.output = conatiner;
             }
@@ -1355,6 +1360,8 @@ var Render;
                 for (let attrName in node.attributes) {
                     this.setAttribute(element, attrName, node.attributes[attrName]);
                 }
+                //@ts-ignore
+                element.JOKER_NODE = node;
                 node.output = element;
                 //做穿透延迟仅对outside.click
                 if (node.events.some((n) => n[0] === "click" && n[1].modifiers?.includes("outside"))) {
@@ -2819,11 +2826,11 @@ class ParserTemplate {
         this.nodeWatcherEvents = {};
         this.asts.length = 0;
     }
-    reParser(asts, keepalive) {
+    reSetAsts(asts, keepalive) {
         //销毁历史产物
         this.destroy(keepalive);
         this.render = exports.IContainer.get(Render.IRENDERIOCTAGID) ?? new Render.DomRender();
-        this.parserNodes(asts, this.root);
+        this.asts = asts;
     }
     nodeTransition(node, mode, name, callBack, type) {
         if (node && node.parent?.childrens && (node instanceof exports.VNode.Element || node instanceof exports.VNode.Component)) {
@@ -3293,7 +3300,7 @@ class Component {
         }
         //执行一次render，则初始化一次template
         this.template ??= [];
-        this[PARSER_TEMPLATE_TARGET]?.reParser(this.template, keepalive);
+        this[PARSER_TEMPLATE_TARGET]?.reSetAsts(this.template, keepalive);
         this[PARSER_TEMPLATE_TARGET] ??= new ParserTemplate(this.template, this, this.$root);
         this[PARSER_TEMPLATE_TARGET].parser();
         this[PARSER_TEMPLATE_TARGET].mount(this.$root);
@@ -3394,20 +3401,22 @@ class ComponentContainer extends Component {
     propsVaule;
     created() {
         let propsData = {};
-        Object.keys(this.props).forEach((p) => {
-            //过滤
-            if (typeof p !== "string")
-                return;
-            let pName = toLowerCase(p);
-            if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
-                return;
-            propsData[p] = this.props[p];
-            //单项数据同步
-            this.$watch(() => this.props[p], () => {
-                this.propsVaule[p] = this.props[p];
+        if (!this.props.props) {
+            Object.keys(this.props).forEach((p) => {
+                //过滤
+                if (typeof p !== "string")
+                    return;
+                let pName = toLowerCase(p);
+                if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
+                    return;
+                propsData[p] = this.props[p];
+                //单项数据同步
+                this.$watch(() => this.props[p], () => {
+                    this.propsVaule[p] = this.props[p];
+                });
             });
-        });
-        this.propsVaule = observer(propsData);
+            this.propsVaule = observer(propsData);
+        }
     }
     async loadComponent(componentName) {
         if (!componentName) {
@@ -3431,7 +3440,7 @@ class ComponentContainer extends Component {
             if (!(JOKER_COMPONENT_TAG in component)) {
                 component = (await component()).default;
             }
-            cacheComponent = new component(this.propsVaule, this.$sections, this.isKeepAlive);
+            cacheComponent = new component(this.props.props || this.propsVaule, this.$sections, this.isKeepAlive);
             //事件向上穿透广播
             cacheComponent.$on("*", (e) => {
                 this.$trigger(e.eventName, e.data, e);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@joker.front/core",
-    "version": "1.2.153",
+    "version": "1.2.157",
     "description": "",
     "main": "./dist/bundle.js",
     "module": "./dist/bundle.es.js",

package/types/component.d.ts

@@ -197,6 +197,7 @@ export declare function getGlobalComponent(key: string): ComponentConstructor |
 export declare class ComponentContainer extends Component<{
     [key: string]: any;
     name: string;
+    props: object;
     "transition-name": string;
 }> {
     template: never[];

package/types/parser/index.d.ts

@@ -67,7 +67,7 @@ export declare class ParserTemplate {
      * 销毁
      */
     destroy(keepalive?: boolean): void;
-    reParser(asts: AST.Node[], keepalive?: boolean): void;
+    reSetAsts(asts: AST.Node[], keepalive?: boolean): void;
     nodeTransition(node: VNode.Node | undefined, mode: "enter" | "leave", name?: string, callBack?: Function, type?: "transition" | "animation"): boolean;
 }
 export declare function getFirstElement(node: VNode.Node): VNode.Element | undefined;