render-core 1.3.7 → 1.3.8

package/class/controller/pageController.d.ts

@@ -4,6 +4,7 @@ export declare class PageController {
     private currentTag;
     solt: Map<string, any>;
     raw_data: {};
+    proxyForMethods: {};
     to: ComponentController[];
     link: Map<string, {}>;
     constructor();

package/core/cmd/data/v-html.js

@@ -9,11 +9,16 @@ export function resolver_html(elements, data, controller) {
         if (elements[i].hasAttribute("@html")) {
             var dataName = elements[i].getAttribute("@html");
             elements[i].removeAttribute("@html");
-            if (data[dataName] === undefined) {
-                elements[i].innerHTML = controller.computed[dataName].call();
+            try {
+                if (data[dataName] === undefined) {
+                    elements[i].innerHTML = controller.computed[dataName]();
+                }
+                else {
+                    elements[i].innerHTML = data[dataName];
+                }
             }
-            else {
-                elements[i].innerHTML = data[dataName];
+            catch (error) {
+                console.error("Can not find data:" + dataName + " in the component");
             }
         }
         resolver_html(elements[i].children, data, controller);

package/core/cmd/data/v-txt.js

@@ -10,13 +10,18 @@ export function resolver_txt(elements, data, controller) {
         if (result) {
             var dataName = elements[i].getAttribute("@txt");
             elements[i].removeAttribute("@txt");
-            if (data[dataName] === undefined) {
-                // @ts-ignore
-                elements[i].innerText = controller.computed[dataName].call();
+            try {
+                if (data[dataName] === undefined) {
+                    // @ts-ignore
+                    elements[i].innerText = controller.computed[dataName]();
+                }
+                else {
+                    // @ts-ignore
+                    elements[i].innerText = data[dataName];
+                }
             }
-            else {
-                // @ts-ignore
-                elements[i].innerText = data[dataName];
+            catch (error) {
+                console.error("Can not find data:" + dataName + " in the component");
             }
         }
         resolver_txt(elements[i].children, data, controller);

package/core/cmd/method/v-on.js

@@ -19,7 +19,12 @@ export function resolver_event(elements, methods, data) {
                     var action = result[k].substring(4);
                     var method = elements[i].getAttribute(result[k]);
                     elements[i].removeAttribute(result[k]);
-                    elements[i].addEventListener(action, methods[method].bind(data));
+                    try {
+                        elements[i].addEventListener(action, methods[method].bind(data));
+                    }
+                    catch (error) {
+                        console.error("Can not find method:" + method + " in the component");
+                    }
                 }
             }
         }

package/core/cmd/property/v-bind.js

@@ -19,10 +19,10 @@ export function resolver_bind(nodes, data) {
                         var dataName = nodes[i].getAttribute(result[k]);
                         nodes[i].removeAttribute(result[k]);
                         try {
-                            nodes[i].setAttribute(property, JSON.stringify(data[dataName]));
+                            nodes[i].setAttribute(property, data[dataName]);
                         }
                         catch (e) {
-                            nodes[i].setAttribute(property, data[dataName]);
+                            console.error(e.message);
                         }
                     }
                 }

package/core/lifecycle/controllerCycle.js

@@ -1,6 +1,6 @@
 import { inject, injectComputed, injectMethod, injectWatcher } from "../inject/inject";
 import { getProxyObject } from "../proxy/getProxy";
-import { getCodeSpaceForCommit, getCodeSpaceForProperty, getCodeSpaceForPublish, getCommitMethod, getPublishMethod, getSetterMethod } from "../utility/injectUtility";
+import { getCodeSpaceForCommit, getCodeSpaceForPublish, getCommitMethod, getGetCodeSpaceForProperty, getGetterMethod, getPublishMethod, getSetCodeSpaceForProperty, getSetterMethod } from "../utility/injectUtility";
 import { dataInject } from "../utility/dataUtility";
 /**
  * This function is used to initiate the component controller object.
@@ -36,5 +36,7 @@ function cycleBridge(controller, proto, child, link, tagTemplate) {
     //注入receiver
     getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
     //注入setter
-    getCodeSpaceForProperty(controller.raw_data, getSetterMethod(controller));
+    getSetCodeSpaceForProperty(controller.raw_data, getSetterMethod(controller));
+    //注入getter
+    getGetCodeSpaceForProperty(controller.raw_data, getGetterMethod(controller));
 }

package/core/utility/injectUtility.d.ts

@@ -5,7 +5,9 @@ export declare function getCodeSpaceForQuery(data: {}, $query: Map<string, any>)
 export declare function getCodeSpaceForRef(data: {}, $ref: Map<string, Element>): void;
 export declare function getCommitMethod(controller: ComponentController | PageController): any;
 export declare function getSetterMethod(controller: ComponentController | PageController): any;
+export declare function getGetterMethod(controller: ComponentController | PageController): any;
 export declare function getCodeSpaceForCommit(data: {}, commit: any): void;
 export declare function getPublishMethod(controller: ComponentController | PageController): any;
 export declare function getCodeSpaceForPublish(data: {}, publisher: any): void;
-export declare function getCodeSpaceForProperty(data: {}, setter: any): void;
+export declare function getSetCodeSpaceForProperty(data: {}, setter: any): void;
+export declare function getGetCodeSpaceForProperty(data: {}, getter: any): void;

package/core/utility/injectUtility.js

@@ -22,7 +22,13 @@ export function getSetterMethod(controller) {
     var setter = function (property, value) {
         this[property] = value;
     };
-    return setter.bind(controller.raw_data);
+    return setter.bind(controller.proxyForMethods);
+}
+export function getGetterMethod(controller) {
+    var setter = function (property) {
+        return this[property];
+    };
+    return setter.bind(controller.proxyForMethods);
 }
 //注入对象
 export function getCodeSpaceForCommit(data, commit) {
@@ -44,6 +50,9 @@ export function getPublishMethod(controller) {
 export function getCodeSpaceForPublish(data, publisher) {
     Reflect.set(data, "$publish", publisher);
 }
-export function getCodeSpaceForProperty(data, setter) {
-    Reflect.set(data, "$setter", setter);
+export function getSetCodeSpaceForProperty(data, setter) {
+    Reflect.set(data, "$set", setter);
+}
+export function getGetCodeSpaceForProperty(data, getter) {
+    Reflect.set(data, "$get", getter);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "render-core",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "The core of render-js",
   "main": "index.js",
   "types": "index.d.ts",