render-core 1.3.43 → 1.3.45

package/core/cmd/loop/{v-index.js → v-for-utility.js}

@@ -1,5 +1,4 @@
-import { part_render_map } from "../../render/partRender";
-import { extractForArray } from "../../utility/vForUtility";
+import { extractForMap } from "./v-map";
 /**
  * 遍历根元素
  * @param element
@@ -7,12 +6,12 @@ import { extractForArray } from "../../utility/vForUtility";
  * @param data
  */
 export function resolver_array_single(element, index, data) {
+    //从根元素开始渲染
     //解析data
     if (element.hasAttribute("@data")) {
-        var data_index = element.getAttribute("@data");
         element.removeAttribute("@data");
         // @ts-ignore
-        element.innerText = data[data_index];
+        element.innerText = data;
     }
     //解析index
     if (element.hasAttribute("@index")) {
@@ -20,6 +19,13 @@ export function resolver_array_single(element, index, data) {
         // @ts-ignore
         element.innerText = index;
     }
+    //渲染信息
+    if (element.hasAttribute("list-message")) {
+        var data_index = element.getAttribute("@data");
+        element.removeAttribute("@data");
+        // @ts-ignore
+        element.innerText = data[data_index];
+    }
     resolver_array_multi(element.children, index, data);
 }
 /**
@@ -32,47 +38,45 @@ export function resolver_array_multi(elements, index, data) {
     var _loop_1 = function (i) {
         //解析data
         if (elements[i].hasAttribute("@data")) {
-            var data_index = elements[i].getAttribute("@data");
             elements[i].removeAttribute("@data");
             // @ts-ignore
-            elements[i].innerText = data[data_index];
+            element.innerText = data;
         }
         //解析index
         if (elements[i].hasAttribute("@index")) {
             elements[i].removeAttribute("@index");
             // @ts-ignore
-            elements[i].innerText = index;
+            element.innerText = index;
         }
-        if (elements[i]) {
-            //检查v-for-item,该指令不可以用在根元素上
-            if (elements[i].hasAttribute("@list-document")) {
-                elements[i].removeAttribute("@list-document");
-                part_render_map(elements[i].parentNode, elements[i], data);
-                i++;
-                //删除节点
-                elements[i].parentNode.removeChild(elements[i]);
-                i--;
-            }
-        }
-        if (elements[i]) {
-            //检查v-for-array
-            if (elements[i].hasAttribute("@list-list")) {
-                elements[i].removeAttribute("@list-list");
-                data.forEach(function (value, index) {
-                    extractForArray(elements[i].parentNode, elements[i], index, value);
+        //渲染文档
+        if (elements[i].hasAttribute("list-document")) {
+            if (data instanceof Array) {
+                data.forEach(function (value) {
+                    //从数组中取出一条信息，然后开始渲染
+                    extractForMap(elements[i].parentNode, elements[i], value);
                     i++;
                 });
-                //删除节点
+                //将模板节点删除
                 elements[i].parentNode.removeChild(elements[i]);
+                //重新回到原来的索引值
                 i--;
             }
+            else {
+                console.log("Instruction @list need an array datatype to extract!");
+            }
         }
-        if (elements[i]) {
-            resolver_array_multi(elements[i].children, index, data);
+        //渲染信息
+        if (elements[i].hasAttribute("list-message")) {
+            var data_index = elements[i].getAttribute("@data");
+            elements[i].removeAttribute("@data");
+            // @ts-ignore
+            element.innerText = data[data_index];
         }
+        resolver_array_multi(elements[i].children, index, data);
         out_i_1 = i;
     };
     var out_i_1;
+    //渲染模板子元素
     for (var i = 0; i < elements.length; i++) {
         _loop_1(i);
         i = out_i_1;

package/core/cmd/loop/v-for.d.ts

@@ -5,8 +5,18 @@
  */
 export declare function resolver_for_of(elements: HTMLCollection, data: {}): void;
 /**
- * 展开数据
- * @param elements
+ *
+ * @param baseRoot
+ * @param temp
+ * @param index
+ * @param data
+ */
+export declare function extractForArray(baseRoot: ParentNode, temp: Node, index: number, data: any): void;
+/**
+ * 该函数用于处理数组类型数据的展开
+ * @param baseRoot
+ * @param temp
+ * @param index
  * @param data
  */
-export declare function resolver_for_each(elements: HTMLCollection, data: {}): void;
+export declare function part_render_array(baseRoot: ParentNode, temp: Node, index: number, data: any): void;

package/core/cmd/loop/v-for.js

@@ -1,4 +1,4 @@
-import { extractForArray, extractForMap } from "../../utility/vForUtility";
+import { resolver_array_single } from "./v-for-utility";
 /**
  * 展开数据
  * @param elements
@@ -6,17 +6,19 @@ import { extractForArray, extractForMap } from "../../utility/vForUtility";
  */
 export function resolver_for_of(elements, data) {
     var _loop_1 = function (i) {
-        var result = elements[i].hasAttribute("@list");
+        var result = elements[i].hasAttribute("@for");
         if (result) {
-            var dataName = elements[i].getAttribute("@list");
-            elements[i].removeAttribute("@list");
+            var dataName = elements[i].getAttribute("@for");
+            elements[i].removeAttribute("@for");
             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]);
+                //重新回到原来的索引值
                 i--;
             }
             else {
@@ -35,29 +37,28 @@ export function resolver_for_of(elements, data) {
     }
 }
 /**
- * 展开数据
- * @param elements
+ *
+ * @param baseRoot
+ * @param temp
+ * @param index
  * @param data
  */
-export function resolver_for_each(elements, data) {
-    for (var i = 0; i < elements.length; i++) {
-        var result = elements[i].hasAttribute("@document");
-        if (result) {
-            var dataName = elements[i].getAttribute("@document");
-            elements[i].removeAttribute("@document");
-            if (data[dataName] instanceof Object) {
-                extractForMap(elements[i].parentNode, elements[i], data[dataName]);
-                i++;
-            }
-            else {
-                console.log("Instruction @document need an object datatype to extract!");
-            }
-            //将模板节点删除
-            elements[i].parentNode.removeChild(elements[i]);
-            i--;
-        }
-        if (elements[i]) {
-            resolver_for_each(elements[i].children, data);
-        }
-    }
+export function extractForArray(baseRoot, temp, index, data) {
+    //将渲染出来的数据模板插入到根元素下
+    part_render_array(baseRoot, temp, index, data);
+}
+/**
+ * 该函数用于处理数组类型数据的展开
+ * @param baseRoot
+ * @param temp
+ * @param index
+ * @param data
+ */
+export function part_render_array(baseRoot, temp, index, data) {
+    // @ts-ignore
+    var clone = temp.cloneNode(true);
+    // @ts-ignore
+    resolver_array_single(clone, index, data);
+    //插入模板节点
+    baseRoot.insertBefore(clone, temp);
 }

package/core/cmd/loop/{v-key.js → v-map-utility.js}

@@ -1,5 +1,4 @@
-import { part_render_map } from "../../render/partRender";
-import { extractForArray } from "../../utility/vForUtility";
+import { extractForArray } from "./v-for";
 /**
  * 展开数据
  * @param element
@@ -32,21 +31,17 @@ export function resolver_map_multi(elements, data) {
         }
         if (elements[i]) {
             //检查v-for-item
-            if (elements[i].hasAttribute("@document-document")) {
-                var property = elements[i].getAttribute("@document-document");
-                elements[i].removeAttribute("@document-document");
-                part_render_map(elements[i].parentNode, elements[i], data[property]);
-                i++;
-                //删除节点
-                elements[i].parentNode.removeChild(elements[i]);
-                i--;
+            if (elements[i].hasAttribute("@map-document")) {
+                var property = elements[i].getAttribute("@map-document");
+                elements[i].removeAttribute("@map-document");
+                resolver_map_single(elements[i], data[property]);
             }
         }
         if (elements[i]) {
             //检查v-for-array
-            if (elements[i].hasAttribute("@document-list")) {
-                var property = elements[i].getAttribute("@document-list");
-                elements[i].removeAttribute("@document-list");
+            if (elements[i].hasAttribute("@map-list")) {
+                var property = elements[i].getAttribute("@map-list");
+                elements[i].removeAttribute("@map-list");
                 data[property].forEach(function (value, index) {
                     extractForArray(elements[i].parentNode, elements[i], index, value);
                     i++;

package/core/{render/partRender.d.ts → cmd/loop/v-map.d.ts}

@@ -1,11 +1,16 @@
 /**
- * 该函数用于处理数组类型数据的展开
+ * 展开数据
+ * @param elements
+ * @param data
+ */
+export declare function resolver_for_map(elements: HTMLCollection, data: {}): void;
+/**
+ *
  * @param baseRoot
  * @param temp
- * @param index
  * @param data
  */
-export declare function part_render_array(baseRoot: ParentNode, temp: Node, index: number, data: any): void;
+export declare function extractForMap(baseRoot: ParentNode, temp: Node, data: any): void;
 /**
  * 该函数用于处理字典数据类型的展开
  * @param baseRoot

package/core/cmd/loop/v-map.js

@@ -0,0 +1,50 @@
+import { resolver_map_single } from "./v-map-utility";
+/**
+ * 展开数据
+ * @param elements
+ * @param data
+ */
+export function resolver_for_map(elements, data) {
+    for (var i = 0; i < elements.length; i++) {
+        var result = elements[i].hasAttribute("@map");
+        if (result) {
+            var dataName = elements[i].getAttribute("@map");
+            elements[i].removeAttribute("@map");
+            if (data[dataName] instanceof Object) {
+                extractForMap(elements[i].parentNode, elements[i], data[dataName]);
+                i++;
+            }
+            else {
+                console.log("Instruction @document need an object datatype to extract!");
+            }
+            //将模板节点删除
+            elements[i].parentNode.removeChild(elements[i]);
+            i--;
+        }
+        if (elements[i]) {
+            resolver_for_map(elements[i].children, data);
+        }
+    }
+}
+/**
+ *
+ * @param baseRoot
+ * @param temp
+ * @param data
+ */
+export function extractForMap(baseRoot, temp, data) {
+    part_render_map(baseRoot, temp, data);
+}
+/**
+ * 该函数用于处理字典数据类型的展开
+ * @param baseRoot
+ * @param temp
+ * @param data
+ */
+export function part_render_map(baseRoot, temp, data) {
+    // @ts-ignore
+    var clone = temp.cloneNode(true);
+    resolver_map_single(clone, data);
+    //插入模板节点
+    baseRoot.insertBefore(clone, temp);
+}

package/core/utility/cmdUtility.js

@@ -8,9 +8,10 @@ import { resolver_show } from "../cmd/justify/v-show";
 import { resolver_render } from "../cmd/justify/v-render";
 import { resolver_if } from "../cmd/justify/v-if";
 import { resolver_switch } from "../cmd/justify/v-switch";
-import { resolver_for_each, resolver_for_of } from "../cmd/loop/v-for";
+import { resolver_for_of } from "../cmd/loop/v-for";
 import { extract_solt } from "../cmd/solt/v-solt";
 import { resolver_experssion } from "../cmd/data/v-el";
+import { resolver_for_map } from "../cmd/loop/v-map";
 /**
  * This function is used to resolver those commands which should be executed before mount.
  * @param tagTemplate
@@ -49,7 +50,7 @@ export function afterCmd(templateSpace, proto, controller) {
     //v-switch
     resolver_switch(templateSpace.children, controller.proxyForMethods);
     //v-for-each
-    resolver_for_each(templateSpace.children, controller.proxyForMethods);
+    resolver_for_map(templateSpace.children, controller.proxyForMethods);
     //v-for-of
     resolver_for_of(templateSpace.children, controller.proxyForMethods);
     //v-el

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "render-core",
-  "version": "1.3.43",
+  "version": "1.3.45",
   "description": "The extendable javascript web framework",
   "main": "index.js",
   "types": "index.d.ts",

package/core/render/partRender.js

@@ -1,31 +0,0 @@
-import { resolver_array_single } from "../cmd/loop/v-index";
-import { resolver_map_single } from "../cmd/loop/v-key";
-/**
- * 该函数用于处理数组类型数据的展开
- * @param baseRoot
- * @param temp
- * @param index
- * @param data
- */
-export function part_render_array(baseRoot, temp, index, data) {
-    // @ts-ignore
-    var clone = temp.cloneNode(true);
-    // @ts-ignore
-    resolver_array_single(clone, index, data);
-    //插入模板节点
-    baseRoot.insertBefore(clone, temp);
-}
-/**
- * 该函数用于处理字典数据类型的展开
- * @param baseRoot
- * @param temp
- * @param data
- */
-export function part_render_map(baseRoot, temp, data) {
-    // @ts-ignore
-    var clone = temp.cloneNode(true);
-    // @ts-ignore
-    resolver_map_single(clone, data);
-    //插入模板节点
-    baseRoot.insertBefore(clone, temp);
-}

package/core/utility/vForUtility.d.ts

@@ -1,15 +0,0 @@
-/**
- *
- * @param baseRoot
- * @param temp
- * @param index
- * @param data
- */
-export declare function extractForArray(baseRoot: ParentNode, temp: Node, index: number, data: any): void;
-/**
- *
- * @param baseRoot
- * @param temp
- * @param data
- */
-export declare function extractForMap(baseRoot: ParentNode, temp: Node, data: any): void;

package/core/utility/vForUtility.js

@@ -1,20 +0,0 @@
-import { part_render_array, part_render_map } from "../render/partRender";
-/**
- *
- * @param baseRoot
- * @param temp
- * @param index
- * @param data
- */
-export function extractForArray(baseRoot, temp, index, data) {
-    part_render_array(baseRoot, temp, index, data);
-}
-/**
- *
- * @param baseRoot
- * @param temp
- * @param data
- */
-export function extractForMap(baseRoot, temp, data) {
-    part_render_map(baseRoot, temp, data);
-}