render-core 1.0.70 → 1.0.72

package/class/controller/apiController.d.ts

@@ -3,6 +3,7 @@ import { Controller } from "./controller";
 export declare class ApiController {
     root: ParentNode;
     proto: ApiComponent;
+    solt: Map<string, any>;
     preRender: boolean;
     link: Map<string, {}>;
     to: Controller[];

package/class/controller/apiController.js

@@ -2,6 +2,7 @@ var ApiController = /** @class */ (function () {
     function ApiController() {
         this.link = new Map();
         this.preRender = false;
+        this.solt = new Map();
     }
     //接收器
     ApiController.prototype.receiver = function (method) {

package/class/controller/controller.d.ts

@@ -2,6 +2,7 @@ import { Component } from "../component/component";
 export declare class Controller {
     root: ParentNode;
     proto: Component;
+    solt: Map<string, any>;
     link: Map<string, {}>;
     to: Controller[];
     raw_data: {};

package/class/controller/controller.js

@@ -4,6 +4,7 @@ var Controller = /** @class */ (function () {
         this.link = new Map();
         this.to = Array();
         this.raw_data = {};
+        this.solt = new Map();
     }
     //接收器
     Controller.prototype.receiver = function (method) {

package/class/controller/pageController.d.ts

@@ -2,6 +2,7 @@ import { Controller } from "./controller";
 export declare class PageController {
     private methods;
     private currentTag;
+    solt: Map<string, any>;
     raw_data: {};
     to: Controller[];
     link: Map<string, {}>;

package/class/controller/pageController.js

@@ -6,6 +6,7 @@ var PageController = /** @class */ (function () {
         this.link = new Map();
         this.to = Array();
         this.crtTag = null;
+        this.solt = new Map();
     }
     //接收器
     PageController.prototype.receiver = function (method) {

package/core/cmd/v-for.js

@@ -36,6 +36,7 @@ export function resolver_for_each(elements, data) {
             elements[i].removeAttribute("v-for-each");
             if (data[dataName] instanceof Object) {
                 extractForMap(elements[i].parentNode, elements[i], data[dataName]);
+                i++;
             }
             else {
                 console.log("Instruction v-for-of need an object datatype to extract!");
@@ -43,6 +44,8 @@ export function resolver_for_each(elements, data) {
             //将模板节点删除
             elements[i].parentNode.removeChild(elements[i]);
         }
-        resolver_for_each(elements[i].children, data);
+        if (elements[i]) {
+            resolver_for_each(elements[i].children, data);
+        }
     }
 }

package/core/cmd/v-index.js

@@ -7,26 +7,21 @@ import { part_render_map } from "../render/partRender";
  */
 export function resolver_array_single(element, index, data) {
     //解析data
-    var result = element.hasAttribute("v-data");
-    if (result) {
+    if (element.hasAttribute("v-data")) {
         element.removeAttribute("v-data");
         // @ts-ignore
         element.innerText = data;
     }
     //解析index
-    result = element.hasAttribute("v-index");
-    if (result) {
+    if (element.hasAttribute("v-index")) {
         element.removeAttribute("v-index");
         // @ts-ignore
         element.innerText = data;
     }
     //检查v-for-item
-    result = element.hasAttribute("v-for-item");
-    if (result) {
+    if (element.hasAttribute("v-for-item")) {
         element.removeAttribute("v-for-item");
-        for (var keyItem in data) {
-            part_render_map(element.parentNode, element, data[keyItem]);
-        }
+        part_render_map(element.parentNode, element, data);
         //删除节点
         element.parentNode.removeChild(element);
     }
@@ -37,27 +32,27 @@ export function resolver_array_single(element, 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) {
+        if (elements[i].hasAttribute("v-data")) {
             elements[i].removeAttribute("v-data");
             // @ts-ignore
             elements[i].innerText = data;
         }
         //解析index
-        result = elements[i].hasAttribute("v-index");
-        if (result) {
+        if (elements[i].hasAttribute("v-index")) {
             elements[i].removeAttribute("v-index");
             // @ts-ignore
             elements[i].innerText = index;
         }
         //检查v-for-item
-        result = elements[i].hasAttribute("v-for-item");
-        if (result) {
+        if (elements[i].hasAttribute("v-for-item")) {
             elements[i].removeAttribute("v-for-item");
             part_render_map(elements[i].parentNode, elements[i], data);
+            i++;
             //删除节点
             elements[i].parentNode.removeChild(elements[i]);
         }
-        resolver_array_multi(elements[i].children, index, data);
+        if (elements[i]) {
+            resolver_array_multi(elements[i].children, index, data);
+        }
     }
 }

package/core/cmd/v-key.js

@@ -33,25 +33,23 @@ export function resolver_map_single(element, data) {
 export function resolver_map_multi(elements, data) {
     var _loop_1 = function (i) {
         //检查v-key
-        var result = elements[i].hasAttribute("v-key");
-        if (result) {
+        if (elements[i].hasAttribute("v-key")) {
             var property = elements[i].getAttribute("v-key");
             elements[i].removeAttribute("v-key");
             // @ts-ignore
             elements[i].innerText = data[property];
         }
         //检查v-for-item
-        result = elements[i].hasAttribute("v-for-item");
-        if (result) {
+        if (elements[i].hasAttribute("v-for-item")) {
             var property = elements[i].getAttribute("v-for-item");
             elements[i].removeAttribute("v-for-item");
             part_render_map(elements[i].parentNode, elements[i], data[property]);
+            i++;
             //删除节点
             elements[i].parentNode.removeChild(elements[i]);
         }
         //检查v-for-array
-        result = elements[i].hasAttribute("v-for-index");
-        if (result) {
+        if (elements[i].hasAttribute("v-for-index")) {
             elements[i].removeAttribute("v-for-index");
             data.forEach(function (value, index) {
                 extractForArray(elements[i].parentNode, elements[i], index, value);

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

@@ -0,0 +1,15 @@
+import { Controller } from "../../class/controller/controller";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
+/**
+ * 此函数用于解析自定义元素solt
+ * @param tagTemplate
+ * @param controller
+ */
+export declare function resolver_solt(tagTemplate: Element, controller: Controller | ApiController | PageController): void;
+/**
+ * 此函数用于展开solt
+ * @param elements
+ * @param controller
+ */
+export declare function extract_solt(elements: HTMLCollection, controller: Controller | ApiController | PageController): void;

package/core/cmd/v-solt.js

@@ -0,0 +1,47 @@
+/**
+ * 此函数用于解析自定义元素solt
+ * @param tagTemplate
+ * @param controller
+ */
+export function resolver_solt(tagTemplate, controller) {
+    if (tagTemplate.hasChildNodes()) {
+        if (tagTemplate.children) {
+            for (var i = 0; i < tagTemplate.children.length; i++) {
+                if (tagTemplate.children[i].nodeName === "SOLT") {
+                    if (tagTemplate.children[i].hasAttribute("solt")) {
+                        controller.solt.set(tagTemplate.children[i].getAttribute("solt"), tagTemplate.children[i].innerHTML);
+                    }
+                    else {
+                        controller.solt.set("default", tagTemplate.children[i].innerHTML);
+                    }
+                }
+            }
+        }
+        else {
+            controller.solt.set("default", tagTemplate.innerHTML);
+        }
+    }
+}
+/**
+ * 此函数用于展开solt
+ * @param elements
+ * @param controller
+ */
+export function extract_solt(elements, controller) {
+    for (var i = 0; i < elements.length; i++) {
+        var result = elements[i].hasAttribute("v-solt");
+        if (result) {
+            var dataName = elements[i].getAttribute("v-solt");
+            elements[i].removeAttribute("v-solt");
+            if (!dataName) {
+                elements[i].innerHTML = controller.solt.get("default");
+            }
+            else {
+                // @ts-ignore
+                elements[i].innerHTML = controller.solt.get(dataName);
+            }
+        }
+        var subElements = elements[i].children;
+        extract_solt(subElements, controller);
+    }
+}

package/core/render/PostRender.js

@@ -5,6 +5,7 @@ import { mount } from "../../library/lifecycle/mount";
 import { injectRefs } from "../inject/inject";
 import { afterMethodsTypeOne } from "../../library/lifecycle/afterMethods";
 import { findComponent } from "./delivery";
+import { resolver_solt } from "../cmd/v-solt";
 /**
  * 该函数用于初次渲染需要记录状态的组件
  * @param proto
@@ -16,6 +17,8 @@ import { findComponent } from "./delivery";
 export function post_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new Controller();
+    //解析solt
+    resolver_solt(tagTemplate, controller);
     //控制对象预处理
     controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
     //beforeRender

package/core/render/initRender.js

@@ -5,6 +5,7 @@ import { mount } from "../../library/lifecycle/mount";
 import { injectRefs } from "../inject/inject";
 import { afterMethodsTypeOne } from "../../library/lifecycle/afterMethods";
 import { findComponent } from "./delivery";
+import { resolver_solt } from "../cmd/v-solt";
 /**
  * 该函数用于处理需要更更新时候，需要从父组件提取数据状态的渲染操作
  * @param proto
@@ -16,6 +17,8 @@ import { findComponent } from "./delivery";
 export function init_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new Controller();
+    //解析solt
+    resolver_solt(tagTemplate, controller);
     //控制对象预处理
     controllerCycleTypeOne(controller, proto, child, link, tagTemplate);
     //beforeRender

package/core/render/rawRender.js

@@ -5,6 +5,7 @@ import { mount } from "../../library/lifecycle/mount";
 import { injectRefs } from "../inject/inject";
 import { afterMethodsTypeTwo } from "../../library/lifecycle/afterMethods";
 import { findComponent } from "./delivery";
+import { resolver_solt } from "../cmd/v-solt";
 /**
  * 该函数用于渲染不需要记录状态的组件
  * @param proto
@@ -16,6 +17,8 @@ import { findComponent } from "./delivery";
 export function raw_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new Controller();
+    //解析solt
+    resolver_solt(tagTemplate, controller);
     //控制对象预处理
     controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
     //beforeRender

package/library/cmd/cmd.js

@@ -9,6 +9,7 @@ import { resolver_render } from "../../core/cmd/v-render";
 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";
 export function cmd(tagTemplate, proto, controller) {
     //给所有元素添加上npm=tag标志
     addLabel(tagTemplate.children, proto.getName());
@@ -22,6 +23,8 @@ export function cmd(tagTemplate, proto, controller) {
     resolver_model(tagTemplate.children, controller.proxyForMethods);
     //渲染属性
     resolver_bind(tagTemplate.children, controller.proxyForMethods);
+    //solt
+    extract_solt(tagTemplate.children, controller);
 }
 export function afterCmd(templateSpace, proto, controller) {
     //v-show

package/package.json

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