render-core 1.0.58 → 1.0.60

package/core/cmd/v-for.js

@@ -5,16 +5,25 @@ export function resolver_for_of(elements, data) {
         if (result) {
             var dataName = elements[i].getAttribute("v-for-of");
             elements[i].removeAttribute("v-for-of");
-            data[dataName].forEach(function (value, index) {
-                extractForArray(elements[i].parentNode, elements[i], index, value);
-            });
-            //将模板节点删除
-            elements[i].parentNode.removeChild(elements[i]);
+            if (data[dataName] instanceof Array) {
+                data[dataName].forEach(function (value, index) {
+                    extractForArray(elements[i].parentNode, elements[i], index, value);
+                    i++;
+                });
+                //将模板节点删除
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            else {
+                console.log("Instruction v-for-of need an array datatype to extract!");
+            }
         }
         resolver_for_of(elements[i].children, data);
+        out_i_1 = i;
     };
+    var out_i_1;
     for (var i = 0; i < elements.length; i++) {
         _loop_1(i);
+        i = out_i_1;
     }
 }
 export function resolver_for_each(elements, data) {
@@ -23,8 +32,14 @@ export function resolver_for_each(elements, data) {
         if (result) {
             var dataName = elements[i].getAttribute("v-for-each");
             elements[i].removeAttribute("v-for-each");
-            for (var key in data[dataName]) {
-                extractForMap(elements[i].parentNode, elements[i], key, data[dataName][key]);
+            if (data[dataName] instanceof Object) {
+                for (var key in data[dataName]) {
+                    extractForMap(elements[i].parentNode, elements[i], key, data[dataName][key]);
+                    i++;
+                }
+            }
+            else {
+                console.log("Instruction v-for-of need an object datatype to extract!");
             }
             //将模板节点删除
             elements[i].parentNode.removeChild(elements[i]);

package/core/cmd/v-index.js

@@ -1,3 +1,4 @@
+import { part_render_map } from "../render/partRender";
 export function resolver_array_single(element, index, data) {
     //解析data
     var result = element.hasAttribute("v-data");
@@ -13,23 +14,47 @@ export function resolver_array_single(element, index, data) {
         // @ts-ignore
         element.innerText = data;
     }
+    //检查v-for-item
+    result = element.hasAttribute("v-for-item");
+    if (result) {
+        element.removeAttribute("v-for-item");
+        for (var keyItem in data[index]) {
+            part_render_map(element.parentNode, element, keyItem, data[keyItem]);
+        }
+        //删除节点
+        element.parentNode.removeChild(element);
+    }
+    //深度展开
     var subElements = element.children;
     resolver_array_multi(subElements, index, data);
 }
 export function resolver_array_multi(elements, index, data) {
     for (var i = 0; i < elements.length; i++) {
+        //解析data
         var result = elements[i].hasAttribute("v-data");
         if (result) {
             elements[i].removeAttribute("v-data");
             // @ts-ignore
-            elements[i].innerText = JSON.stringify(data);
+            elements[i].innerText = data;
         }
+        //解析index
         result = elements[i].hasAttribute("v-index");
         if (result) {
             elements[i].removeAttribute("v-index");
             // @ts-ignore
             elements[i].innerText = index;
         }
+        //检查v-for-item
+        result = elements[i].hasAttribute("v-for-item");
+        if (result) {
+            elements[i].removeAttribute("v-for-item");
+            for (var keyItem in data[index]) {
+                part_render_map(elements[i].parentNode, elements[i], keyItem, data[keyItem]);
+            }
+            //删除节点
+            elements[i].parentNode.removeChild(elements[i]);
+        }
+        //深度展开
         var subElements = elements[i].children;
         resolver_array_multi(subElements, index, data);
     }

package/core/cmd/v-key.js

@@ -1,11 +1,12 @@
 import { part_render_map } from "../render/partRender";
+import { extractForArray } from "../utility/vForUtility";
 export function resolver_map_single(element, key, data) {
     //检查v-data
     var result = element.hasAttribute("v-data");
     if (result) {
         element.removeAttribute("v-data");
         // @ts-ignore
-        element.innerText = JSON.stringify(data);
+        element.innerText = data;
     }
     //检查v-key
     result = element.hasAttribute("v-key");
@@ -18,14 +19,27 @@ export function resolver_map_single(element, key, data) {
     result = element.hasAttribute("v-for-item");
     if (result) {
         element.removeAttribute("v-for-item");
-        part_render_map(element.parentNode, element, key, data);
+        for (var keyItem in data[key]) {
+            part_render_map(element.parentNode, element, keyItem, data[keyItem]);
+        }
+        element.parentNode.removeChild(element);
+    }
+    //检查v-for-array
+    result = element.hasAttribute("v-for-index");
+    if (result) {
+        element.removeAttribute("v-for-index");
+        data[key].forEach(function (value, index) {
+            extractForArray(element.parentNode, element, index, value);
+        });
+        //删除节点
+        element.parentNode.removeChild(element);
     }
     //深度展开
     var subElements = element.children;
     resolver_map_multi(subElements, key, data);
 }
 export function resolver_map_multi(elements, key, data) {
-    for (var i = 0; i < elements.length; i++) {
+    var _loop_1 = function (i) {
         //检查v-data
         var result = elements[i].hasAttribute("v-data");
         if (result) {
@@ -44,9 +58,27 @@ export function resolver_map_multi(elements, key, data) {
         result = elements[i].hasAttribute("v-for-item");
         if (result) {
             elements[i].removeAttribute("v-for-item");
-            part_render_map(elements[i].parentNode, elements[i], key, data);
+            for (var keyItem in data[key]) {
+                part_render_map(elements[i].parentNode, elements[i], keyItem, data[keyItem]);
+            }
+            //删除节点
+            elements[i].parentNode.removeChild(elements[i]);
+        }
+        //检查v-for-array
+        result = elements[i].hasAttribute("v-for-index");
+        if (result) {
+            elements[i].removeAttribute("v-for-index");
+            data[key].forEach(function (value, index) {
+                extractForArray(elements[i].parentNode, elements[i], index, value);
+            });
+            //删除节点
+            elements[i].parentNode.removeChild(elements[i]);
         }
+        //深度展开
         var subElements = elements[i].children;
         resolver_map_multi(subElements, key, data);
+    };
+    for (var i = 0; i < elements.length; i++) {
+        _loop_1(i);
     }
 }

package/package.json

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