render-core 1.0.31 → 1.0.33

package/class/component.d.ts

@@ -17,7 +17,7 @@ export declare class Component implements RenderBase {
     private readonly name;
     private readonly template;
     private readonly props?;
-    private readonly data;
+    private readonly data?;
     private readonly methods?;
     private readonly computed?;
     private readonly watcher?;
@@ -31,11 +31,10 @@ export declare class Component implements RenderBase {
         name: string;
         template: string;
         props?: {} | string[];
-        data?: () => {};
+        data?: {};
         computed?: {};
         methods?: {};
         watcher?: {};
-        executor?: {};
         beforeRender?: () => void;
         afterRender?: () => void;
         beforeUpdate?: () => void;

package/class/component.js

@@ -5,72 +5,72 @@ var Component = /** @class */ (function () {
         //标签模板样式
         this.template = config.template;
         //添加数据
-        if (typeof config.props == "undefined") {
+        if (typeof config.props === "undefined") {
             this.props = [];
         }
         else {
             this.props = config.props;
         }
         //添加数据
-        if (typeof config.data == "undefined") {
+        if (typeof config.data === "undefined") {
             this.data = {};
         }
         else {
             this.data = config.data;
         }
         //添加计算属性
-        if (config.computed == "undefined") {
+        if (config.computed === "undefined") {
             this.computed = {};
         }
         else {
             this.computed = config.computed;
         }
         //添加方法属性
-        if (typeof config.methods == "undefined") {
+        if (typeof config.methods === "undefined") {
             this.methods = {};
         }
         else {
             this.methods = config.methods;
         }
         //添加监控属性
-        if (typeof config.watcher == "undefined") {
+        if (typeof config.watcher === "undefined") {
             this.watcher = {};
         }
         else {
             this.watcher = config.watcher;
         }
         //生命周期函数
-        if (typeof config.beforeRender == "undefined") {
+        if (typeof config.beforeRender === "undefined") {
             this.beforeRender = function () { };
         }
         else {
             this.beforeRender = config.beforeRender;
         }
-        if (typeof config.afterRender == "undefined") {
+        if (typeof config.afterRender === "undefined") {
             this.afterRender = function () { };
         }
         else {
             this.afterRender = config.afterRender;
         }
-        if (typeof config.beforeUpdate == "undefined") {
+        if (typeof config.beforeUpdate === "undefined") {
             this.beforeUpdate = function () { };
         }
         else {
             this.beforeUpdate = config.beforeUpdate;
         }
-        if (typeof config.afterUpdate == "undefined") {
+        if (typeof config.afterUpdate === "undefined") {
             this.afterUpdate = function () { };
         }
         else {
             this.afterUpdate = config.afterUpdate;
         }
-        if (typeof config.beforeMount == "undefined") {
+        if (typeof config.beforeMount === "undefined") {
             this.beforeMount = function () { };
         }
         else {
             this.beforeMount = config.beforeMount;
         }
-        if (typeof config.beforeUnmount == "undefined") {
+        if (typeof config.beforeUnmount === "undefined") {
             this.beforeUnmount = function () { };
         }
         else {

package/class/pageController.js

@@ -15,9 +15,11 @@ var PageController = /** @class */ (function () {
         }
     };
     Object.defineProperty(PageController.prototype, "crtTag", {
+        //返回当前页面的渲染元素
         get: function () {
             return this.currentTag;
         },
+        //设置当前页面的渲染元素
         set: function (element) {
             this.currentTag = element;
         },

package/core/render/updateRender.js

@@ -2,6 +2,7 @@ import { bindModelForUpdater } from "../utility/miscUtility";
 import { findComponent } from "./initRender";
 import { getTemplate } from "../../library/template/template";
 import { cmdForUpdate } from "../../library/cmd/cmd";
+import { injectProps } from "../../library/inject/inject";
 export function updateRender(controller) {
     //生成DOM
     var tagTemplate = getTemplate(controller.proto);
@@ -29,6 +30,7 @@ export function updateRender(controller) {
     //afterRender
     var afterRender = controller.proto.getAfterRender().bind(controller.raw_data);
     afterRender();
+    injectProps(controller, tagTemplate);
     //获取定位
     bindModelForUpdater(controller.root.children, controller.proxyForMethods);
     //深度渲染

package/library/inject/inject.d.ts

@@ -1,6 +1,7 @@
 import { Controller } from "../../class/controller";
 import { Component } from "../../class/component";
 export declare function inject(controller: Controller, tagTemplate: Element): void;
+export declare function injectProps(controller: Controller, tagTemplate: Element): void;
 export declare function injectMethod(controller: Controller, proto: Component): void;
 export declare function injectWatcher(controller: Controller, proto: Component): void;
 export declare function injectComputed(controller: Controller, proto: Component): void;

package/library/inject/inject.js

@@ -7,9 +7,10 @@ export function inject(controller, tagTemplate) {
     getCodeSpaceForProps(controller.raw_data, resolveProps(Reflect.get(window, "context").crtTag, controller.proto.getProps()));
     //注入query
     getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
-    //注入ref
+}
+export function injectProps(controller, tagTemplate) {
     var refs = new Map();
-    resolver_Refs(tagTemplate.children, refs);
+    resolver_Refs(controller.root.children, refs);
     getCodeSpaceForRef(controller.raw_data, refs);
 }
 export function injectMethod(controller, proto) {

package/library/render/render.js

@@ -2,7 +2,7 @@ import { Controller } from "../../class/controller";
 import { getCodeSpaceForCommit, getCodeSpaceForPublish, getCommitMethod, getPublishMethod } from "../../core/utility/injectUtility";
 import { getProxyObject } from "../../core/proxy/getProxy";
 import { findComponent } from "../../core/render/initRender";
-import { inject, injectComputed, injectMethod, injectWatcher } from "../inject/inject";
+import { inject, injectComputed, injectMethod, injectProps, injectWatcher } from "../inject/inject";
 import { cmd } from "../cmd/cmd";
 export function init_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
@@ -32,6 +32,9 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     beforeMount();
     //mount
     var renderSpace = document.createElement("div");
+    //指定渲染空间
+    controller.root = renderSpace;
+    //开始渲染
     parent.replaceChild(renderSpace, child);
     while (tagTemplate.hasChildNodes()) {
         renderSpace.append(tagTemplate.firstChild);
@@ -39,8 +42,7 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     //afterRender
     var afterRender = proto.getAfterRender().bind(controller.raw_data);
     afterRender();
-    //指定渲染空间
-    controller.root = renderSpace;
+    injectProps(controller, tagTemplate);
     //将本控制对象保存到父控制对象的发布数组中
     link.to.push(controller);
     //将执行空间保存到父控制对象
@@ -76,7 +78,9 @@ export function post_render(proto, parent, child, link, tagTemplate) {
     beforeMount();
     //mount
     var renderSpace = document.createElement("div");
+    //指定渲染空间
     controller.root = renderSpace;
+    //开始渲染
     parent.replaceChild(renderSpace, child);
     while (tagTemplate.hasChildNodes()) {
         renderSpace.append(tagTemplate.firstChild);
@@ -84,7 +88,10 @@ export function post_render(proto, parent, child, link, tagTemplate) {
     //afterRender
     var afterRender = proto.getAfterRender().bind(controller.raw_data);
     afterRender();
+    injectProps(controller, tagTemplate);
     link.to.push(controller);
+    //将执行空间保存到父控制对象
+    link.link.set(child.getAttribute("name"), controller.raw_data);
     //深度渲染
     findComponent(controller.root.children, controller);
 }
@@ -116,7 +123,9 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     beforeMount();
     //mount
     var renderSpace = document.createElement("div");
+    //指定渲染空间
     controller.root = renderSpace;
+    //开始渲染
     parent.replaceChild(renderSpace, child);
     while (tagTemplate.hasChildNodes()) {
         renderSpace.append(tagTemplate.firstChild);
@@ -124,6 +133,7 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     //afterRender
     var afterRender = proto.getAfterRender().bind(controller.raw_data);
     afterRender();
+    injectProps(controller, tagTemplate);
     link.to.push(controller);
     //深度渲染
     findComponent(controller.root.children, controller);

package/package.json

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