render-core 1.3.36 → 1.3.38

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

@@ -29,18 +29,6 @@ export function resolver_array_single(element, index, data) {
  */
 export function resolver_array_multi(elements, index, data) {
     var _loop_1 = function (i) {
-        //解析data
-        if (elements[i].hasAttribute("@data")) {
-            elements[i].removeAttribute("@data");
-            // @ts-ignore
-            elements[i].innerText = data;
-        }
-        //解析index
-        if (elements[i].hasAttribute("@index")) {
-            elements[i].removeAttribute("@index");
-            // @ts-ignore
-            elements[i].innerText = index;
-        }
         if (elements[i]) {
             //检查v-for-item,该指令不可以用在根元素上
             if (elements[i].hasAttribute("@list-document")) {
@@ -56,6 +44,7 @@ export function resolver_array_multi(elements, index, data) {
             //检查v-for-array
             if (elements[i].hasAttribute("@list-list")) {
                 elements[i].removeAttribute("@list-list");
+                var kk = [];
                 data.forEach(function (value, index) {
                     extractForArray(elements[i].parentNode, elements[i], index, value);
                     i++;
@@ -65,6 +54,18 @@ export function resolver_array_multi(elements, index, data) {
                 i--;
             }
         }
+        //解析data
+        if (elements[i].hasAttribute("@data")) {
+            elements[i].removeAttribute("@data");
+            // @ts-ignore
+            elements[i].innerText = data;
+        }
+        //解析index
+        if (elements[i].hasAttribute("@index")) {
+            elements[i].removeAttribute("@index");
+            // @ts-ignore
+            elements[i].innerText = index;
+        }
         if (elements[i]) {
             resolver_array_multi(elements[i].children, index, data);
         }

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

@@ -23,13 +23,6 @@ export function resolver_map_single(element, data) {
  */
 export function resolver_map_multi(elements, data) {
     var _loop_1 = function (i) {
-        //检查v-key
-        if (elements[i].hasAttribute("@section")) {
-            var property = elements[i].getAttribute("@section");
-            elements[i].removeAttribute("@section");
-            // @ts-ignore
-            elements[i].innerText = data[property];
-        }
         if (elements[i]) {
             //检查v-for-item
             if (elements[i].hasAttribute("@document-document")) {
@@ -56,6 +49,13 @@ export function resolver_map_multi(elements, data) {
                 i--;
             }
         }
+        //检查v-key
+        if (elements[i].hasAttribute("@section")) {
+            var property = elements[i].getAttribute("@section");
+            elements[i].removeAttribute("@section");
+            // @ts-ignore
+            elements[i].innerText = data[property];
+        }
         //深度展开
         if (elements[i]) {
             resolver_map_multi(elements[i].children, data);

package/core/inject/inject.d.ts

@@ -10,6 +10,11 @@ export declare function inject(controller: ComponentController): void;
  * @param controller
  */
 export declare function injectRefs(controller: ComponentController): void;
+/**
+ *
+ * @param controller
+ */
+export declare function injectRoot(controller: ComponentController): void;
 /**
  *
  * @param controller

package/core/inject/inject.js

@@ -23,6 +23,13 @@ export function injectRefs(controller) {
     resolver_Refs(controller.root.children, refs);
     getCodeSpaceForRef(controller.raw_data, refs);
 }
+/**
+ *
+ * @param controller
+ */
+export function injectRoot(controller) {
+    Reflect.set(controller.raw_data, "$root", controller.root);
+}
 /**
  *
  * @param controller

package/core/lifecycle/mount.d.ts

@@ -10,7 +10,8 @@ import { Component } from "../../class/component/component";
  */
 export declare function mount(controller: ComponentController, proto: Component, parent: ParentNode, child: Element, tagTemplate: Element): void;
 /**
- * insert elements without div elment
+ * insert elements without div element
  * @param root
+ * @param controller
  */
-export declare function unBox(root: ParentNode): void;
+export declare function unBox(root: ParentNode, controller: ComponentController): void;

package/core/lifecycle/mount.js

@@ -20,12 +20,15 @@ export function mount(controller, proto, parent, child, tagTemplate) {
     }
 }
 /**
- * insert elements without div elment
+ * insert elements without div element
  * @param root
+ * @param controller
  */
-export function unBox(root) {
+export function unBox(root, controller) {
     while (root.hasChildNodes()) {
         root.parentNode.insertBefore(root.firstChild, root);
     }
+    controller.root = root.parentNode;
+    Reflect.set(controller.raw_data, "$root", root.parentNode);
     root.parentNode.removeChild(root);
 }

package/core/render/PostRender.js

@@ -2,7 +2,7 @@ import { ComponentController } from "../../class/controller/componentController"
 import { controllerCycleTypeTwo } from "../lifecycle/controllerCycle";
 import { afterCmd, cmdUtility } from "../utility/cmdUtility";
 import { mount, unBox } from "../lifecycle/mount";
-import { injectRefs } from "../inject/inject";
+import { injectRefs, injectRoot } from "../inject/inject";
 import { afterMethodsTypeOne } from "../lifecycle/afterMethods";
 import { findComponent } from "./delivery";
 import { resolver_solt } from "../cmd/solt/v-solt";
@@ -27,7 +27,10 @@ export function post_render(proto, parent, child, link, tagTemplate) {
     cmdUtility(tagTemplate, proto, controller);
     //mount
     mount(controller, proto, parent, child, tagTemplate);
+    //注入引用
     injectRefs(controller);
+    //注入root
+    injectRoot(controller);
     //渲染后处理
     afterCmd(controller.root, controller.proto, controller);
     //后处理
@@ -37,6 +40,6 @@ export function post_render(proto, parent, child, link, tagTemplate) {
     //深度渲染
     findComponent(controller.root.children, controller);
     if (proto.getMode() === "insert") {
-        unBox(controller.root);
+        unBox(controller.root, controller);
     }
 }

package/core/render/initRender.js

@@ -2,7 +2,7 @@ import { ComponentController } from "../../class/controller/componentController"
 import { controllerCycleTypeOne } from "../lifecycle/controllerCycle";
 import { afterCmd, cmdUtility } from "../utility/cmdUtility";
 import { mount, unBox } from "../lifecycle/mount";
-import { injectRefs } from "../inject/inject";
+import { injectRefs, injectRoot } from "../inject/inject";
 import { afterMethodsTypeOne } from "../lifecycle/afterMethods";
 import { findComponent } from "./delivery";
 import { resolver_solt } from "../cmd/solt/v-solt";
@@ -27,6 +27,8 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     mount(controller, proto, parent, child, tagTemplate);
     //获取
     injectRefs(controller);
+    //注入root
+    injectRoot(controller);
     //渲染后数据处理
     afterCmd(controller.root, proto, controller);
     //后处理
@@ -34,6 +36,6 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     //深度渲染
     findComponent(tagTemplate.children, controller);
     if (proto.getMode() === "insert") {
-        unBox(controller.root);
+        unBox(controller.root, controller);
     }
 }

package/core/render/rawRender.js

@@ -2,7 +2,7 @@ import { ComponentController } from "../../class/controller/componentController"
 import { controllerCycleTypeTwo } from "../lifecycle/controllerCycle";
 import { afterCmd, cmdUtility } from "../utility/cmdUtility";
 import { mount, unBox } from "../lifecycle/mount";
-import { injectRefs } from "../inject/inject";
+import { injectRefs, injectRoot } from "../inject/inject";
 import { afterMethodsTypeTwo } from "../lifecycle/afterMethods";
 import { findComponent } from "./delivery";
 import { resolver_solt } from "../cmd/solt/v-solt";
@@ -29,6 +29,8 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     mount(controller, proto, parent, child, tagTemplate);
     //获取注入引用资源
     injectRefs(controller);
+    //注入root
+    injectRoot(controller);
     //渲染后处理
     afterCmd(controller.root, proto, controller);
     //后处理（数据渲染）
@@ -38,6 +40,6 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     //深度渲染
     findComponent(controller.root.children, controller);
     if (proto.getMode() === "insert") {
-        unBox(controller.root);
+        unBox(controller.root, controller);
     }
 }

package/core/render/updateRender.js

@@ -1,5 +1,5 @@
 import { afterCmd, cmdUtility, } from "../utility/cmdUtility";
-import { injectRefs } from "../inject/inject";
+import { injectRefs, injectRoot } from "../inject/inject";
 import { findComponent } from "./delivery";
 import { getTemplate } from "../utility/templateUtility";
 /**
@@ -21,7 +21,10 @@ export function update_Render(controller) {
     while (tagTemplate.hasChildNodes()) {
         controller.root.appendChild(tagTemplate.firstChild);
     }
+    //注入引用
     injectRefs(controller);
+    //注入root
+    injectRoot(controller);
     //渲染后处理
     afterCmd(controller.root, controller.proto, controller);
     //深度渲染

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "render-core",
-  "version": "1.3.36",
+  "version": "1.3.38",
   "description": "The core of render-js",
   "keywords": [
     "render",