render-core 1.3.71 → 1.4.0

package/core/lifecycle/mount.js

@@ -12,20 +12,40 @@ export function mount(controller, proto, parent, child, tagTemplate) {
     //给box添加样式
     renderSpace.setAttribute("style", proto.getBoxStyle());
     //指定渲染空间
-    controller.root = renderSpace;
+    controller.componentAttachedRootElement = renderSpace;
     //开始渲染
     parent.replaceChild(renderSpace, child);
     while (tagTemplate.hasChildNodes()) {
         renderSpace.append(tagTemplate.firstChild);
     }
 }
+export function mountForUpdate(tagTemplate) {
+    //mount
+    var renderSpace = document.createElement("div");
+    renderSpace.setAttribute("anchor", "end");
+    while (tagTemplate.hasChildNodes()) {
+        renderSpace.append(tagTemplate.firstChild);
+    }
+    return renderSpace;
+}
 /**
- * insert elements without div elment
+ * Insert elements without div element
  * @param root
  */
 export function unBox(root) {
-    while (root.hasChildNodes()) {
-        root.parentNode.insertBefore(root.firstChild, root);
+    var begin = document.createElement("div");
+    begin.setAttribute("anchor", "begin");
+    begin.setAttribute("style", "display:none");
+    root.componentAttachedRootElement.parentNode.insertBefore(begin, root.componentAttachedRootElement);
+    root.begin = begin;
+    while (root.componentAttachedRootElement.hasChildNodes()) {
+        //插入元素到根之前
+        root.componentAttachedRootElement.parentNode.insertBefore(root.componentAttachedRootElement.firstChild, root.componentAttachedRootElement);
     }
-    root.parentNode.removeChild(root);
+    var parent = root.componentAttachedRootElement.parentNode;
+    // @ts-ignore
+    root.anchor = root.componentAttachedRootElement;
+    root.anchor.setAttribute("anchor", "end");
+    root.anchor.setAttribute("style", "display:none");
+    root.componentAttachedRootElement = parent;
 }

package/core/proxy/getProxy.d.ts

@@ -1,13 +1,11 @@
-import { ComponentController } from "../../proto/controller/ComponentController";
+import { ComponentController } from "../../controller/ComponentController";
+import { Component } from "../../../render-refer/dist";
 /**
  * 获取data对象的代理对象
- * @param obj
- * @param updater
- */
-export declare function getProxyObject(obj: {}, updater: ComponentController): any;
-/**
- * 获取setter代理函数
  * @param data
  * @param updater
+ * @param tagLib
+ * @param styleLib
  */
-export declare function getSetter(data: {}, updater: ComponentController): any;
+export declare function getSetterProxy(data: {}, updater: ComponentController, tagLib: Map<string, Component>, styleLib: Map<string, Map<string, string>>): any;
+export declare function getGetterProxy(data: {}, updater: ComponentController): any;

package/core/proxy/getProxy.js

@@ -1,42 +1,26 @@
-import { update_Render } from "../render/updateRender";
-import { locateInputAddress } from "../utility/sectionUtility";
+import { getSetter } from "./proxy";
 /**
  * 获取data对象的代理对象
- * @param obj
+ * @param data
  * @param updater
+ * @param tagLib
+ * @param styleLib
  */
-export function getProxyObject(obj, updater) {
+export function getSetterProxy(data, updater, tagLib, styleLib) {
     //定义代理方法对象
     var handel = {};
     //获取set代理方法
-    handel["set"] = getSetter(obj, updater);
+    handel["set"] = getSetter(updater, tagLib, styleLib);
     //返回代理对象
-    return new Proxy(obj, handel);
+    return new Proxy(data, handel);
 }
-/**
- * 获取setter代理函数
- * @param data
- * @param updater
- */
-export function getSetter(data, updater) {
-    var setter = function (obj, prop, value) {
-        if (this.mode !== "box") {
-            console.log("Not box element can not to update data!");
-            return false;
-        }
-        //检查是否有watcher
-        try {
-            this.watcher[prop](obj[prop], value);
-        }
-        catch (error) {
-        }
-        //更新值
-        obj[prop] = value;
-        //执行更新
-        update_Render(this);
-        locateInputAddress(this);
-        Reflect.deleteProperty(this, "origin");
-        return true;
+export function getGetterProxy(data, updater) {
+    var handel = {};
+    handel["set"] = function (data, props) {
+        console.log("Watcher can only read props from data object");
+    };
+    handel["deleteProperty"] = function (data, props) {
+        console.log("Watcher can only read props from data object");
     };
-    return setter.bind(updater);
+    return new Proxy(data, handel);
 }

package/core/proxy/proxy.d.ts

@@ -0,0 +1,9 @@
+import { ComponentController } from "../../controller/ComponentController";
+import { Component } from "../../../render-refer/dist";
+/**
+ * 获取setter代理函数
+ * @param updater
+ * @param styleLib
+ * @param tagLib
+ */
+export declare function getSetter(updater: ComponentController, tagLib: Map<string, Component>, styleLib: Map<string, Map<string, string>>): any;

package/core/proxy/proxy.js

@@ -0,0 +1,26 @@
+import { locateInputAddress } from "../utility/sectionUtility";
+import { update_Render } from "../../runtime/update/UpdateRender";
+/**
+ * 获取setter代理函数
+ * @param updater
+ * @param styleLib
+ * @param tagLib
+ */
+export function getSetter(updater, tagLib, styleLib) {
+    var setter = function (obj, prop, value) {
+        //检查是否有watcher
+        try {
+            this.watcher[prop](obj[prop], value);
+        }
+        catch (error) {
+        }
+        //更新值
+        obj[prop] = value;
+        //执行更新
+        update_Render(this, tagLib, styleLib);
+        locateInputAddress(this);
+        Reflect.deleteProperty(this, "origin");
+        return true;
+    };
+    return setter.bind(updater);
+}

package/core/render/PostRender.js

@@ -17,26 +17,26 @@ import { resolver_solt } from "../cmd/solt/v-solt";
 export function post_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new ComponentController();
-    //解析solt
+    //解析salt
     resolver_solt(child, controller);
     //控制对象预处理
     controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
     //beforeRender
-    proto.getBeforeRender().call(controller.raw_data);
+    proto.getBeforeRender().call(controller.originalData);
     //解析指令
     cmdUtility(tagTemplate, proto, controller);
     //mount
     mount(controller, proto, parent, child, tagTemplate);
     injectRefs(controller);
     //渲染后处理
-    afterCmd(controller.root, controller.proto, controller);
+    afterCmd(controller.componentAttachedRootElement, controller.prototypeOfComponent, controller);
     //后处理
     afterMethodsTypeOne(controller, child, link);
     //afterRender
-    proto.getAfterRender().call(controller.proxyForMethods);
+    proto.getAfterRender().call(controller.dataForMethod);
     //深度渲染
-    findComponent(controller.root.children, controller);
-    if (proto.getMode() === "insert") {
-        unBox(controller.root);
+    findComponent(controller.componentAttachedRootElement.children, controller);
+    if (proto.getConfig()["mode"] === false) {
+        unBox(controller.componentAttachedRootElement);
     }
 }

package/core/render/delivery.js

@@ -15,7 +15,7 @@ export function delivery(proto, parent, child, link) {
     //两种渲染方式
     if (child.hasAttribute("name")) {
         //需要保持状态的渲染
-        if (link.link.has(child.getAttribute("name"))) {
+        if (link.lazyComponent.has(child.getAttribute("name"))) {
             //该name元素存在旧数据，是更新渲染
             init_render(proto, parent, child, link, tagTemplate);
         }

package/core/render/initRender.js

@@ -28,12 +28,12 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     //获取
     injectRefs(controller);
     //渲染后数据处理
-    afterCmd(controller.root, proto, controller);
+    afterCmd(controller.componentAttachedRootElement, proto, controller);
     //后处理
     afterMethodsTypeOne(controller, child, link);
     //深度渲染
     findComponent(tagTemplate.children, controller);
-    if (proto.getMode() === "insert") {
-        unBox(controller.root);
+    if (proto.getConfig()["mode"] === false) {
+        unBox(controller.componentAttachedRootElement);
     }
 }

package/core/render/rawRender.js

@@ -17,12 +17,12 @@ import { resolver_solt } from "../cmd/solt/v-solt";
 export function raw_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
     var controller = new ComponentController();
-    //解析solt
+    //解析salt
     resolver_solt(child, controller);
     //控制对象预处理
     controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
     //beforeRender,可以获取数据而不触发更新
-    proto.getBeforeRender().call(controller.raw_data);
+    proto.getBeforeRender().call(controller.originalData);
     //解析指令（模板处理）
     cmdUtility(tagTemplate, proto, controller);
     //mount
@@ -30,14 +30,14 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     //获取注入引用资源
     injectRefs(controller);
     //渲染后处理
-    afterCmd(controller.root, proto, controller);
+    afterCmd(controller.componentAttachedRootElement, proto, controller);
     //后处理（数据渲染）
     afterMethodsTypeTwo(controller, child, link);
     //afterRender，可以操作渲染后的dom
-    proto.getAfterRender().call(controller.proxyForMethods);
+    proto.getAfterRender().call(controller.dataForMethod);
     //深度渲染
-    findComponent(controller.root.children, controller);
-    if (proto.getMode() === "insert") {
-        unBox(controller.root);
+    findComponent(controller.componentAttachedRootElement.children, controller);
+    if (proto.getConfig()["mode"] === false) {
+        unBox(controller.componentAttachedRootElement);
     }
 }

package/core/render/updateRender.js

@@ -8,22 +8,22 @@ import { getTemplate } from "../utility/templateUtility";
  */
 export function update_Render(controller) {
     //生成DOM
-    var tagTemplate = getTemplate(controller.proto);
+    var tagTemplate = getTemplate(controller.prototypeOfComponent);
     //清除保存的发布对象
-    controller.to = [];
+    controller.slaveComponent = [];
     //解析指令
-    cmdUtility(tagTemplate, controller.proto, controller);
+    cmdUtility(tagTemplate, controller.prototypeOfComponent, controller);
     //unmount
-    while (controller.root.hasChildNodes()) {
-        controller.root.removeChild(controller.root.firstChild);
+    while (controller.componentAttachedRootElement.hasChildNodes()) {
+        controller.componentAttachedRootElement.removeChild(controller.componentAttachedRootElement.firstChild);
     }
     //mount
     while (tagTemplate.hasChildNodes()) {
-        controller.root.appendChild(tagTemplate.firstChild);
+        controller.componentAttachedRootElement.appendChild(tagTemplate.firstChild);
     }
     injectRefs(controller);
     //渲染后处理
-    afterCmd(controller.root, controller.proto, controller);
+    afterCmd(controller.componentAttachedRootElement, controller.prototypeOfComponent, controller);
     //深度渲染
-    findComponent(controller.root.children, controller);
+    findComponent(controller.componentAttachedRootElement.children, controller);
 }

package/core/resolver/props.js

@@ -1,3 +1,4 @@
+import { Property } from "../../index";
 /**
  * This function is used to resolve tag customed properties.
  * @param node
@@ -36,19 +37,19 @@ export function getAllPropsByObject(node, object) {
     for (var objectKey in object) {
         if (node.getAttribute(objectKey)) {
             switch (object[objectKey]) {
-                case "int":
+                case Property.INT:
                     props.set(objectKey, parseInt(node.getAttribute(objectKey)));
                     break;
-                case "float":
+                case Property.FLOAT:
                     props.set(objectKey, parseFloat(node.getAttribute(objectKey)));
                     break;
-                case "boole":
+                case Property.BOOLEAN:
                     props.set(objectKey, parseFloat(node.getAttribute(objectKey)));
                     break;
-                case "string":
+                case Property.STRING:
                     props.set(objectKey, node.getAttribute(objectKey));
                     break;
-                case "json":
+                case Property.JSON:
                     props.set(objectKey, JSON.parse(node.getAttribute(objectKey)));
                     break;
                 default:

package/core/utility/checkUtility.js

@@ -1,4 +1,4 @@
-import metaTagLib from "../../library/taglib/metaTagLib";
+import metaTagLib from "../../library/taglib/MetaTagLib";
 export function isUnKnown(element) {
     return !metaTagLib.some(function (ele) { return ele == element; });
 }

package/core/utility/cmdUtility.d.ts

@@ -1,16 +1,17 @@
-import { ComponentController } from "../../proto/controller/ComponentController";
+import { ComponentController } from "../../controller/ComponentController";
 import { Component } from "render-refer";
+import { ContextController } from "../../controller/ContextController";
 /**
  * This function is used to resolver those commands which should be executed before mount.
  * @param tagTemplate
  * @param proto
  * @param controller
  */
-export declare function cmdUtility(tagTemplate: Element, proto: Component, controller: ComponentController): void;
+export declare function cmdUtility(tagTemplate: Element, proto: Component, controller: ComponentController | ContextController): void;
 /**
  * This function is used to resolver those commands which should be executed after mount.
  * @param templateSpace
  * @param proto
  * @param controller
  */
-export declare function afterCmd(templateSpace: ParentNode, proto: Component, controller: ComponentController): void;
+export declare function afterCmd(templateSpace: ParentNode, proto: Component, controller: ComponentController | ContextController): void;

package/core/utility/cmdUtility.js

@@ -9,7 +9,7 @@ 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_of } from "../cmd/loop/v-for";
-import { extract_solt } from "../cmd/solt/v-solt";
+import { extract_salt } from "../cmd/solt/v-solt";
 import { resolver_expression } from "../cmd/data/v-el";
 import { resolver_for_map } from "../cmd/loop/v-map";
 /**
@@ -22,17 +22,17 @@ export function cmdUtility(tagTemplate, proto, controller) {
     //给所有元素添加上npm=tag标志
     addLabel(tagTemplate.children, proto.getName());
     //将元素事件绑定到元素上
-    resolver_event(tagTemplate.children, proto.getMethods(), controller.proxyForMethods, controller.raw_data);
+    resolver_event(tagTemplate.children, proto.getMethods(), controller.dataForMethod, controller.originalData);
     //渲染html
-    resolver_html(tagTemplate.children, controller.proxyForMethods, controller);
+    resolver_html(tagTemplate.children, controller.dataForMethod, controller);
     //渲染text
-    resolver_txt(tagTemplate.children, controller.proxyForMethods, controller);
+    resolver_txt(tagTemplate.children, controller.dataForMethod, controller);
     //绑定数据
-    resolver_model(tagTemplate.children, controller.proxyForMethods);
+    resolver_model(tagTemplate.children, controller.dataForMethod);
     //渲染属性
-    resolver_bind(tagTemplate.children, controller.proxyForMethods);
-    //solt
-    extract_solt(tagTemplate.children, controller);
+    resolver_bind(tagTemplate.children, controller.dataForMethod);
+    //salt
+    extract_salt(tagTemplate.children, controller);
 }
 /**
  * This function is used to resolver those commands which should be executed after mount.
@@ -42,17 +42,17 @@ export function cmdUtility(tagTemplate, proto, controller) {
  */
 export function afterCmd(templateSpace, proto, controller) {
     //v-show
-    resolver_show(templateSpace.children, controller.proxyForMethods);
+    resolver_show(templateSpace.children, controller.dataForMethod);
     //v-render
-    resolver_render(templateSpace.children, controller.proxyForMethods);
+    resolver_render(templateSpace.children, controller.dataForMethod);
     //v-if
-    resolver_if(templateSpace.children, controller.proxyForMethods);
+    resolver_if(templateSpace.children, controller.dataForMethod);
     //v-switch
-    resolver_switch(templateSpace.children, controller.proxyForMethods);
+    resolver_switch(templateSpace.children, controller.dataForMethod);
     //v-for-each
-    resolver_for_map(templateSpace.children, controller.proxyForMethods);
+    resolver_for_map(templateSpace.children, controller.dataForMethod);
     //v-for-of
-    resolver_for_of(templateSpace.children, controller.proxyForMethods);
+    resolver_for_of(templateSpace.children, controller.dataForMethod);
     //v-el
-    resolver_expression(controller.root, controller.proxyForMethods, controller);
+    resolver_expression(controller.componentAttachedRootElement, controller.dataForMethod, controller);
 }

package/core/utility/injectUtility.d.ts

@@ -1,13 +1,7 @@
-import { ComponentController } from "../../proto/controller/ComponentController";
-import { PageController } from "../../proto/controller/PageController";
 export declare function getCodeSpaceForProps(data: {}, $props: Map<string, object>): void;
 export declare function getCodeSpaceForQuery(data: {}, $query: Map<string, any>): void;
 export declare function getCodeSpaceForRef(data: {}, $ref: Map<string, Element>): void;
-export declare function getCommitMethod(controller: ComponentController | PageController): any;
-export declare function getSetterMethod(controller: ComponentController | PageController): any;
-export declare function getGetterMethod(controller: ComponentController | PageController): any;
 export declare function getCodeSpaceForCommit(data: {}, commit: any): void;
-export declare function getPublishMethod(controller: ComponentController | PageController): any;
 export declare function getCodeSpaceForPublish(data: {}, publisher: any): void;
 export declare function getSetCodeSpaceForProperty(data: {}, setter: any): void;
 export declare function getGetCodeSpaceForProperty(data: {}, getter: any): void;

package/core/utility/injectUtility.js

@@ -2,50 +2,16 @@ export function getCodeSpaceForProps(data, $props) {
     Reflect.set(data, "$props", $props);
 }
 export function getCodeSpaceForQuery(data, $query) {
-    Reflect.set(data, "$queries", $query);
+    Reflect.set(data, "$params", $query);
 }
 //注入对象
 export function getCodeSpaceForRef(data, $ref) {
     Reflect.set(data, "$refs", $ref);
 }
-export function getCommitMethod(controller) {
-    var commit = function (method) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
-        return this.receiver(method, args);
-    };
-    return commit.bind(controller);
-}
-export function getSetterMethod(controller) {
-    var setter = function (property, value) {
-        this[property] = value;
-    };
-    return setter.bind(controller.proxyForMethods);
-}
-export function getGetterMethod(controller) {
-    var setter = function (property) {
-        return this[property];
-    };
-    return setter.bind(controller.proxyForMethods);
-}
 //注入对象
 export function getCodeSpaceForCommit(data, commit) {
     Reflect.set(data, "$commit", commit);
 }
-export function getPublishMethod(controller) {
-    var publisher = function (method) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
-        for (var i = 0; i < this.to.length; i++) {
-            this.to[i].receiver(method, args);
-        }
-    };
-    return publisher.bind(controller);
-}
 //注入对象
 export function getCodeSpaceForPublish(data, publisher) {
     Reflect.set(data, "$publish", publisher);

package/core/utility/inputType.d.ts

@@ -1,5 +1,5 @@
-import { ComponentController } from "../../proto/controller/ComponentController";
+import { ComponentController } from "../../controller/ComponentController";
 export declare function textType(target: any, doc: any, controller: ComponentController): void;
-export declare function assignType(target: any, doc: any, controller: ComponentController): void;
-export declare function fileType(target: any, doc: any, controller: ComponentController): void;
+export declare function assignType(target: any, controller: ComponentController): void;
+export declare function fileType(target: any, controller: ComponentController): void;
 export declare function checkType(target: any): void;

package/core/utility/inputType.js

@@ -1,18 +1,18 @@
 export function textType(target, doc, controller) {
     // @ts-ignore
-    target.value = controller.proxyForMethods[target.getAttribute("name")];
+    target.value = controller.dataForMethod[target.getAttribute("name")];
     // @ts-ignore
     target.focus();
     // @ts-ignore
     target.setSelectionRange(doc.start, doc.start);
 }
-export function assignType(target, doc, controller) {
+export function assignType(target, controller) {
     // @ts-ignore
-    target.value = controller.proxyForMethods[target.getAttribute("name")];
+    target.value = controller.dataForMethod[target.getAttribute("name")];
 }
-export function fileType(target, doc, controller) {
+export function fileType(target, controller) {
     // @ts-ignore
-    target.files = controller.proxyForMethods[target.getAttribute("name")];
+    target.files = controller.dataForMethod[target.getAttribute("name")];
 }
 export function checkType(target) {
     // @ts-ignore

package/core/utility/inputUtility.d.ts

@@ -2,3 +2,4 @@ export declare function inputUtility(element: Element, space: Object): void;
 export declare function filesType(element: Element, space: Object): void;
 export declare function selectUtility(element: Element, space: Object): void;
 export declare function textareaUtility(element: Element, space: Object): void;
+export declare function changeUtility(element: Element, space: Object): void;

package/core/utility/inputUtility.js

@@ -98,3 +98,11 @@ export function textareaUtility(element, space) {
         start: element.selectionStart
     });
 }
+export function changeUtility(element, space) {
+    Reflect.set(space, "origin", {
+        tag: element.tagName,
+        id: element.getAttribute("id"),
+        // @ts-ignore
+        start: element.selectionStart
+    });
+}

package/core/utility/sectionUtility.d.ts

@@ -1,4 +1,4 @@
-import { ComponentController } from "../../proto/controller/ComponentController";
+import { ComponentController } from "../../controller/ComponentController";
 /**
  *
  * @param controller

package/core/utility/sectionUtility.js

@@ -5,8 +5,8 @@ import { assignType, checkType, fileType, textType } from "./inputType";
  */
 export function locateInputAddress(controller) {
     //判断是否是输入导致的数据更新
-    if (controller.proxyForMethods.hasOwnProperty("origin")) {
-        var doc = Reflect.get(controller.proxyForMethods, "origin");
+    if (controller.dataForMethod.hasOwnProperty("origin")) {
+        var doc = Reflect.get(controller.dataForMethod, "origin");
         var target = document.getElementById(doc.id);
         switch (doc.tag) {
             case "INPUT":
@@ -18,6 +18,9 @@ export function locateInputAddress(controller) {
             case "TEXTAREA":
                 locateTextArea(target, doc, controller);
                 break;
+            default:
+                console.log("Can't locate input address");
+                break;
         }
     }
 }
@@ -27,13 +30,13 @@ function locateInput(target, doc, controller) {
             textType(target, doc, controller);
             break;
         case "color":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "date":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "time":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "email":
             textType(target, doc, controller);
@@ -42,7 +45,7 @@ function locateInput(target, doc, controller) {
             textType(target, doc, controller);
             break;
         case "week":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "tel":
             textType(target, doc, controller);
@@ -51,7 +54,7 @@ function locateInput(target, doc, controller) {
             textType(target, doc, controller);
             break;
         case "range":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "radio":
             checkType(target);
@@ -63,31 +66,31 @@ function locateInput(target, doc, controller) {
             textType(target, doc, controller);
             break;
         case "month":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "hidden":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "file":
-            fileType(target, doc, controller);
+            fileType(target, controller);
             break;
         case "datetime-local":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "datetime":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         case "checkbox":
-            assignType(target, doc, controller);
+            assignType(target, controller);
             break;
         default:
-            console.log("This type input can`t be dealed!");
+            console.log("This type input can`t be tackled!");
             break;
     }
 }
 function locateTextArea(target, doc, controller) {
     // @ts-ignore
-    target.value = controller.proxyForMethods[target.getAttribute("name")];
+    target.value = controller.dataForMethod[target.getAttribute("name")];
     // @ts-ignore
     target.focus();
     // @ts-ignore