render-core 1.0.19 → 1.0.20

package/class/component.d.ts

@@ -30,7 +30,7 @@ export declare class Component implements RenderBase {
     constructor(config: {
         name: string;
         template: string;
-        props?: {};
+        props?: {} | string[];
         data?: {};
         computed?: {};
         methods?: {};

package/class/component.js

@@ -6,7 +6,7 @@ var Component = /** @class */ (function () {
         this.template = config.template;
         //添加数据
         if (typeof config.props == "undefined") {
-            this.props = {};
+            this.props = [];
         }
         else {
             this.props = config.props;

package/core/cmd/v-bind.js

@@ -1,25 +1,29 @@
+import { isUnKnown } from "../utility/checkUtility";
 export function resolver_bind(nodes, data) {
     for (var i = 0; i < nodes.length; i++) {
-        var attributes = nodes[i].getAttributeNames();
-        for (var j = 0; j < attributes.length; j++) {
-            var result = attributes[j].match(/^v-bind:([a-z]+)$/g);
-            if (result === null) {
-            }
-            else {
-                for (var k = 0; k < result.length; k++) {
-                    var property = result[k].substring(7);
-                    var dataName = nodes[i].getAttribute(result[k]);
-                    nodes[i].removeAttribute(result[k]);
-                    try {
-                        nodes[i].setAttribute(property, JSON.stringify(data[dataName]));
-                    }
-                    catch (e) {
-                        nodes[i].setAttribute(property, data[dataName]);
+        //对系统元素进行属性绑定
+        if (isUnKnown(nodes[i].nodeName)) {
+            var attributes = nodes[i].getAttributeNames();
+            for (var j = 0; j < attributes.length; j++) {
+                var result = attributes[j].match(/^v-bind:([a-z]+)$/g);
+                if (result === null) {
+                }
+                else {
+                    for (var k = 0; k < result.length; k++) {
+                        var property = result[k].substring(7);
+                        var dataName = nodes[i].getAttribute(result[k]);
+                        nodes[i].removeAttribute(result[k]);
+                        try {
+                            nodes[i].setAttribute(property, JSON.stringify(data[dataName]));
+                        }
+                        catch (e) {
+                            nodes[i].setAttribute(property, data[dataName]);
+                        }
                     }
                 }
             }
+            var subElements = nodes[i].children;
+            resolver_bind(subElements, data);
         }
-        var subElements = nodes[i].children;
-        resolver_bind(subElements, data);
     }
 }

package/core/cmd/v-ref.js

@@ -1,10 +1,10 @@
 import { getProxyForInject } from "../proxy/getProxy";
 export function resolver_Ref(el) {
-    var ref = new Map();
+    var refs = new Map();
     for (var i = 0; i < el.length; i++) {
         if (el[i].hasAttribute("ref")) {
-            ref.set(el[i].getAttribute("ref"), el[i]);
+            refs.set(el[i].getAttribute("ref"), el[i]);
         }
     }
-    return getProxyForInject(ref);
+    return getProxyForInject(refs);
 }

package/core/proxy/getProxy.d.ts

@@ -1,5 +1,3 @@
 import { Controller } from "../../class/controller";
-import { ApiController } from "../../class/apiController";
 export declare function getProxyObject(obj: {}, updater: Controller): any;
-export declare function getProxyObjectForApi(obj: {}, updater: ApiController): any;
 export declare function getProxyForInject(obj: {}): any;

package/core/proxy/getProxy.js

@@ -1,4 +1,4 @@
-import { getSetter, getSetterForApi, getSetterForInject } from "../../library/setter/setter";
+import { getSetter, getSetterForInject } from "../../library/setter/setter";
 export function getProxyObject(obj, updater) {
     //定义代理方法对象
     var handel = {};
@@ -7,11 +7,6 @@ export function getProxyObject(obj, updater) {
     //返回代理对象
     return new Proxy(obj, handel);
 }
-export function getProxyObjectForApi(obj, updater) {
-    var handel = {};
-    handel["set"] = getSetterForApi(obj, updater);
-    return new Proxy(obj, handel);
-}
 export function getProxyForInject(obj) {
     var handel = {};
     handel["set"] = getSetterForInject(obj);

package/core/resolver/props.d.ts

@@ -1 +1,3 @@
 export declare function resolveProps(node: Element, properties: {} | []): any;
+export declare function getAllPropsByArray(node: Element, array: Array<string>): any;
+export declare function getAllPropsByObject(node: Element, object: {}): any;

package/core/resolver/props.js

@@ -1,14 +1,42 @@
 import { getProxyForInject } from "../proxy/getProxy";
 export function resolveProps(node, properties) {
     if (properties instanceof Array) {
+        return getProxyForInject(getAllPropsByArray(node, properties));
     }
     if (properties instanceof Object) {
+        return getProxyForInject(getAllPropsByObject(node, properties));
     }
-    var attrs = node.attributes;
+}
+export function getAllPropsByArray(node, array) {
+    var props = new Map();
+    array.forEach(function (value, index) {
+        if (node.getAttribute(value)) {
+            props.set(value, node.getAttribute(value));
+        }
+    });
+}
+export function getAllPropsByObject(node, object) {
     var props = new Map();
-    // for (let key  in Object.getOwnPropertyNames(properties)) {
-    //
-    //     props[key] = attrs.getNamedItem(key).value;
-    // }
-    return getProxyForInject(props);
+    for (var objectKey in object) {
+        if (node.getAttribute(objectKey)) {
+            switch (node.getAttribute(objectKey)) {
+                case "int":
+                    props.set(objectKey, parseInt(node.getAttribute(objectKey)));
+                    break;
+                case "float":
+                    props.set(objectKey, parseFloat(node.getAttribute(objectKey)));
+                    break;
+                case "object":
+                    props.set(objectKey, JSON.parse(node.getAttribute(objectKey)));
+                    break;
+                case "array":
+                    props.set(objectKey, JSON.parse(node.getAttribute(objectKey)));
+                    break;
+                default:
+                    props.set(objectKey, node.getAttribute(objectKey));
+                    break;
+            }
+        }
+    }
+    return props;
 }

package/package.json

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