render-core 1.0.28 → 1.0.30

package/class/component.js

@@ -13,7 +13,7 @@ var Component = /** @class */ (function () {
         }
         //添加数据
         if (typeof config.data == "undefined") {
-            this.data = function () { return {}; };
+            this.data = {};
         }
         else {
             this.data = config.data;
@@ -87,7 +87,7 @@ var Component = /** @class */ (function () {
         return this.props;
     };
     Component.prototype.getData = function () {
-        return this.data();
+        return this.data;
     };
     Component.prototype.getMethods = function () {
         return this.methods;

package/library/inject/inject.d.ts

@@ -1,2 +1,6 @@
 import { Controller } from "../../class/controller";
+import { Component } from "../../class/component";
 export declare function inject(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

@@ -12,3 +12,21 @@ export function inject(controller, tagTemplate) {
     resolver_Refs(tagTemplate.children, refs);
     getCodeSpaceForRef(controller.raw_data, refs);
 }
+export function injectMethod(controller, proto) {
+    var methods = Object.getOwnPropertyNames(proto.getMethods());
+    methods.forEach(function (value) {
+        Reflect.set(controller.raw_data, value, proto.getMethods()[value].bind(controller.proxyForMethods));
+    });
+}
+export function injectWatcher(controller, proto) {
+    var methods = Object.getOwnPropertyNames(proto.getWatcher());
+    methods.forEach(function (value) {
+        Reflect.set(controller.raw_data, value, proto.getMethods()[value].bind(controller.proxyForMethods));
+    });
+}
+export function injectComputed(controller, proto) {
+    var methods = Object.getOwnPropertyNames(proto.getComputed());
+    methods.forEach(function (value) {
+        Reflect.set(controller.raw_data, value, proto.getMethods()[value].bind(controller.proxyForMethods));
+    });
+}

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 } from "../inject/inject";
+import { inject, injectComputed, injectMethod, injectWatcher } from "../inject/inject";
 import { cmd } from "../cmd/cmd";
 export function init_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
@@ -15,6 +15,9 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     inject(controller, tagTemplate);
     //数据渲染代理对象
     controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
+    injectComputed(controller, proto);
+    injectWatcher(controller, proto);
+    injectMethod(controller, proto);
     //注入commit
     getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
     //注入receiver
@@ -38,7 +41,10 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     afterRender();
     //指定渲染空间
     controller.root = renderSpace;
+    //将本控制对象保存到父控制对象的发布数组中
     link.to.push(controller);
+    //将执行空间保存到父控制对象
+    link.link.set(child.getAttribute("name"), controller.raw_data);
     //深度渲染
     findComponent(tagTemplate.children, controller);
 }
@@ -53,6 +59,9 @@ export function post_render(proto, parent, child, link, tagTemplate) {
     inject(controller, tagTemplate);
     //保持数据代理对象
     controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
+    injectComputed(controller, proto);
+    injectWatcher(controller, proto);
+    injectMethod(controller, proto);
     //注入commit
     getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
     //注入receiver
@@ -90,6 +99,9 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     controller.raw_data = proto.getData();
     //数据渲染对象
     controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
+    injectComputed(controller, proto);
+    injectWatcher(controller, proto);
+    injectMethod(controller, proto);
     //注入commit
     getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
     //注入receiver

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "render-core",
-  "version": "1.0.28",
-  "description": "The router for render-js",
+  "version": "1.0.30",
+  "description": "The core for render-js",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {