render-core 1.0.73 → 1.0.76

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

@@ -1 +1 @@
-export declare function express_langulage(): void;
+export declare function express_langulage(elements: HTMLCollection, data: {}): void;

package/core/cmd/v-el.js

@@ -1,2 +1,20 @@
-export function express_langulage() {
+export function express_langulage(elements, data) {
+    for (var i = 0; i < elements.length; i++) {
+        if (elements[i].hasChildNodes()) {
+            if (!(elements[i].children.length > 0)) {
+                for (var j = 0; j < elements[i].childNodes.length; j++) {
+                    if (elements[i].childNodes[j].nodeType === 3) {
+                        var result = elements[i].childNodes[j].nodeValue.match(/^\{\{([a-zA-Z]+)}}$/g);
+                        var property = result[0].replace("{", "").replace("}", "");
+                        try {
+                            elements[i].childNodes[j].nodeValue = data[property]();
+                        }
+                        catch (e) {
+                            elements[i].childNodes[j].nodeValue = data[property];
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

package/core/cmd/v-html.js

@@ -5,7 +5,12 @@ export function resolver_html(elements, data) {
             var dataName = elements[i].getAttribute("v-html");
             elements[i].removeAttribute("v-html");
             // @ts-ignore
-            elements[i].innerHTML = data[dataName];
+            try {
+                elements[i].innerHTML = data[dataName]();
+            }
+            catch (e) {
+                elements[i].innerHTML = data[dataName];
+            }
         }
         var subElements = elements[i].children;
         resolver_html(subElements, data);

package/core/cmd/v-solt.js

@@ -5,7 +5,7 @@
  */
 export function resolver_solt(tagTemplate, controller) {
     if (tagTemplate.hasChildNodes()) {
-        if (tagTemplate.children) {
+        if (tagTemplate.children.length > 0) {
             for (var i = 0; i < tagTemplate.children.length; i++) {
                 if (tagTemplate.children[i].nodeName.toUpperCase() === "SOLT") {
                     if (tagTemplate.children[i].hasAttribute("name")) {

package/core/cmd/v-txt.js

@@ -5,9 +5,13 @@ export function resolver_txt(elements, data) {
             var dataName = elements[i].getAttribute("v-txt");
             elements[i].removeAttribute("v-txt");
             // @ts-ignore
-            elements[i].innerText = data[dataName];
+            try {
+                elements[i].innerHTML = data[dataName]();
+            }
+            catch (e) {
+                elements[i].innerHTML = data[dataName];
+            }
         }
-        var subElements = elements[i].children;
-        resolver_txt(subElements, data);
+        resolver_txt(elements[i].children, data);
     }
 }

package/core/inject/inject.js

@@ -22,7 +22,7 @@ export function injectMethod(controller, proto) {
 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));
+        Reflect.set(controller.raw_data, value, proto.getMethods()[value].bind(controller.raw_data));
     });
 }
 export function injectComputed(controller, proto) {

package/core/proxy/getProxy.js

@@ -21,6 +21,13 @@ export function getSetter(data, updater) {
     var setter = function (obj, prop, value) {
         //更新值
         obj[prop] = value;
+        //检查是否有watcher
+        try {
+            obj[prop]();
+        }
+        catch (e) {
+            console.log(e.message);
+        }
         //更新前操作
         this.proto.getBeforeUpdate();
         //执行更新

package/core/render/PostRender.js

@@ -18,7 +18,7 @@ export function post_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new Controller();
     //解析solt
-    resolver_solt(tagTemplate, controller);
+    resolver_solt(child, controller);
     //控制对象预处理
     controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
     //beforeRender

package/core/render/initRender.js

@@ -18,7 +18,7 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new Controller();
     //解析solt
-    resolver_solt(tagTemplate, controller);
+    resolver_solt(child, controller);
     //控制对象预处理
     controllerCycleTypeOne(controller, proto, child, link, tagTemplate);
     //beforeRender

package/core/render/rawRender.js

@@ -18,7 +18,7 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new Controller();
     //解析solt
-    resolver_solt(tagTemplate, controller);
+    resolver_solt(child, controller);
     //控制对象预处理
     controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
     //beforeRender

package/library/cmd/cmd.js

@@ -10,6 +10,7 @@ import { resolver_if } from "../../core/cmd/v-if";
 import { resolver_switch } from "../../core/cmd/v-switch";
 import { resolver_for_each, resolver_for_of } from "../../core/cmd/v-for";
 import { extract_solt } from "../../core/cmd/v-solt";
+import { express_langulage } from "../../core/cmd/v-el";
 export function cmd(tagTemplate, proto, controller) {
     //给所有元素添加上npm=tag标志
     addLabel(tagTemplate.children, proto.getName());
@@ -25,6 +26,8 @@ export function cmd(tagTemplate, proto, controller) {
     resolver_bind(tagTemplate.children, controller.proxyForMethods);
     //solt
     extract_solt(tagTemplate.children, controller);
+    //v-el
+    express_langulage(tagTemplate.children, controller.proxyForMethods);
 }
 export function afterCmd(templateSpace, proto, controller) {
     //v-show

package/package.json

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