render-core 1.0.22 → 1.0.24

package/class/pageController.d.ts

@@ -1,8 +1,11 @@
 import { Controller } from "./controller";
 export declare class PageController {
     private methods;
+    private currentTag;
     to: Controller[];
     link: Map<string, {}>;
     constructor();
     receiver(method: string, ...args: any[]): void;
+    set crtTag(element: Element);
+    get crtTag(): Element;
 }

package/class/pageController.js

@@ -13,6 +13,16 @@ var PageController = /** @class */ (function () {
             args[_i - 1] = arguments[_i];
         }
     };
+    Object.defineProperty(PageController.prototype, "crtTag", {
+        get: function () {
+            return this.currentTag;
+        },
+        set: function (element) {
+            this.currentTag = element;
+        },
+        enumerable: false,
+        configurable: true
+    });
     return PageController;
 }());
 export { PageController };

package/core/cmd/v-ref.d.ts

@@ -1 +1 @@
-export declare function resolver_Ref(el: HTMLCollection): Map<string, Element>;
+export declare function resolver_Refs(el: HTMLCollection, refs: Map<string, Element>): void;

package/core/cmd/v-ref.js

@@ -1,9 +1,10 @@
-export function resolver_Ref(el) {
-    var refs = new Map();
+export function resolver_Refs(el, refs) {
     for (var i = 0; i < el.length; i++) {
         if (el[i].hasAttribute("ref")) {
             refs.set(el[i].getAttribute("ref"), el[i]);
         }
+        else {
+            resolver_Refs(el[i].children, refs);
+        }
     }
-    return refs;
 }

package/core/render/initRender.js

@@ -6,6 +6,8 @@ import { init_render, post_render, raw_render } from "../../library/render/rende
 export function Render(proto, parent, child, link) {
     //获得模板元素
     var tagTemplate = getTemplate(proto);
+    //注册当前解析元素
+    Reflect.get(window, "app").crtTag = child;
     //解析样式
     styleResolve(proto.getName());
     //两种渲染方式

package/core/resolver/props.js

@@ -8,11 +8,12 @@ export function resolveProps(node, properties) {
 }
 export function getAllPropsByArray(node, array) {
     var props = new Map();
-    array.forEach(function (value, index) {
+    array.forEach(function (value) {
         if (node.getAttribute(value)) {
             props.set(value, node.getAttribute(value));
         }
     });
+    return props;
 }
 export function getAllPropsByObject(node, object) {
     var props = new Map();

package/core/utility/injectUtility.js

@@ -2,7 +2,7 @@ export function getCodeSpaceForProps(data, $props) {
     Reflect.set(data, "$props", $props);
 }
 export function getCodeSpaceForQuery(data, $query) {
-    Reflect.set(data, "$query", $query);
+    Reflect.set(data, "$queries", $query);
 }
 //注入对象
 export function getCodeSpaceForRef(data, $ref) {

package/library/inject/inject.js

@@ -1,12 +1,14 @@
 import { getCodeSpaceForProps, getCodeSpaceForQuery, getCodeSpaceForRef, } from "../../core/utility/injectUtility";
 import { resolveProps } from "../../core/resolver/props";
 import { resolve_Queries } from "../../core/resolver/query";
-import { resolver_Ref } from "../../core/cmd/v-ref";
+import { resolver_Refs } from "../../core/cmd/v-ref";
 export function inject(controller, tagTemplate) {
     //注入props
-    getCodeSpaceForProps(controller.raw_data, resolveProps(tagTemplate, controller.proto.getProps()));
+    getCodeSpaceForProps(controller.raw_data, resolveProps(Reflect.get(window, "app").crtTag, controller.proto.getProps()));
     //注入query
     getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
     //注入ref
-    getCodeSpaceForRef(controller.raw_data, resolver_Ref(tagTemplate.children));
+    var refs = new Map();
+    resolver_Refs(tagTemplate.children, refs);
+    getCodeSpaceForRef(controller.raw_data, refs);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "render-core",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "The router for render-js",
   "main": "index.js",
   "types": "index.d.ts",