render-core 1.0.90 → 1.0.91

package/class/component/component.d.ts

@@ -1,19 +1,7 @@
-interface RenderBase {
-    getName(): string;
-    getTemplate(): string;
-    getBoxStyle(): string;
-    getProps(): {};
-    getData(): {};
-    getComputed(): {};
-    getMethods(): {};
-    getWatcher(): {};
-    getBeforeRender(): () => void;
-    getAfterRender(): () => void;
-    getBeforeUpdate(): () => void;
-    getAfterUpdate(): () => void;
-    getBeforeMount(): () => void;
-    getBeforeUnmount(): () => void;
-}
+import { RenderBase } from "../tips/componentTip";
+/**
+ *
+ */
 export declare class Component implements RenderBase {
     private readonly name;
     private readonly template;
@@ -60,4 +48,3 @@ export declare class Component implements RenderBase {
     getBeforeMount(): () => void;
     getBeforeUnmount(): () => void;
 }
-export {};

package/class/component/component.js

@@ -1,3 +1,6 @@
+/**
+ *
+ */
 var Component = /** @class */ (function () {
     function Component(config) {
         //标签名称

package/class/controller/appController.d.ts

@@ -0,0 +1,6 @@
+import { AppTip } from "../tips/appTip";
+export declare class AppController implements AppTip {
+    constructor();
+    setTheme(theme: string): void;
+    getInstance(): AppController;
+}

package/class/controller/appController.js

@@ -0,0 +1,22 @@
+// @ts-ignore
+import { status_write } from "render-status";
+import { reloadStyle } from "../../core/utility/styleUtility";
+var AppController = /** @class */ (function () {
+    function AppController() {
+    }
+    //更改会话样式
+    AppController.prototype.setTheme = function (theme) {
+        status_write({
+            type: "session",
+            fields: {
+                theme: theme
+            }
+        });
+        reloadStyle(theme);
+    };
+    AppController.prototype.getInstance = function () {
+        return this;
+    };
+    return AppController;
+}());
+export { AppController };

package/class/controller/{controller.d.ts → componentController.d.ts}

@@ -1,12 +1,14 @@
 import { Component } from "../component/component";
-export declare class Controller {
+export declare class ComponentController {
     root: ParentNode;
     proto: Component;
     solt: Map<string, any>;
     link: Map<string, {}>;
-    to: Controller[];
+    to: ComponentController[];
     raw_data: {};
     proxyForMethods: {};
+    computed: {};
+    watcher: {};
     constructor();
     receiver(method: string, ...args: any[]): any;
 }

package/class/controller/{controller.js → componentController.js}

@@ -1,19 +1,21 @@
-var Controller = /** @class */ (function () {
+var ComponentController = /** @class */ (function () {
     //构造函数
-    function Controller() {
+    function ComponentController() {
         this.link = new Map();
         this.to = Array();
         this.raw_data = {};
         this.solt = new Map();
+        this.computed = {};
+        this.watcher = {};
     }
     //接收器
-    Controller.prototype.receiver = function (method) {
+    ComponentController.prototype.receiver = function (method) {
         var args = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             args[_i - 1] = arguments[_i];
         }
         return this.proto.getMethods()[method].apply(this.proxyForMethods, args);
     };
-    return Controller;
+    return ComponentController;
 }());
-export { Controller };
+export { ComponentController };

package/class/controller/pageController.d.ts

@@ -1,10 +1,10 @@
-import { Controller } from "./controller";
+import { ComponentController } from "./componentController";
 export declare class PageController {
     private methods;
     private currentTag;
     solt: Map<string, any>;
     raw_data: {};
-    to: Controller[];
+    to: ComponentController[];
     link: Map<string, {}>;
     constructor();
     receiver(method: string, ...args: any[]): void;

package/class/tips/appTip.d.ts

@@ -0,0 +1,3 @@
+export interface AppTip {
+    getInstance(): any;
+}

package/class/tips/appTip.js

@@ -0,0 +1 @@
+export {};

package/class/tips/componentTip.d.ts

@@ -0,0 +1,16 @@
+export interface RenderBase {
+    getName(): string;
+    getTemplate(): string;
+    getBoxStyle(): string;
+    getProps(): {};
+    getData(): {};
+    getComputed(): {};
+    getMethods(): {};
+    getWatcher(): {};
+    getBeforeRender(): () => void;
+    getAfterRender(): () => void;
+    getBeforeUpdate(): () => void;
+    getAfterUpdate(): () => void;
+    getBeforeMount(): () => void;
+    getBeforeUnmount(): () => void;
+}

package/class/tips/componentTip.js

@@ -0,0 +1 @@
+export {};

package/core/cmd/data/v-el.d.ts

@@ -0,0 +1,8 @@
+import { ComponentController } from "../../../class/controller/componentController";
+/**
+ *
+ * @param node
+ * @param data
+ * @param controller
+ */
+export declare function resolver_experssion(node: ParentNode, data: {}, controller: ComponentController): void;

package/core/cmd/{v-el.js → data/v-el.js}

@@ -1,4 +1,10 @@
-export function express_langulage(node, data) {
+/**
+ *
+ * @param node
+ * @param data
+ * @param controller
+ */
+export function resolver_experssion(node, data, controller) {
     if (node.hasChildNodes()) {
         for (var j = 0; j < node.childNodes.length; j++) {
             if (node.childNodes[j].nodeType === 3) {
@@ -6,16 +12,16 @@ export function express_langulage(node, data) {
                 if (result) {
                     var property = result[0].replace(/\{/g, "").replace(/}/g, "");
                     try {
-                        node.childNodes[j].nodeValue = data[property]();
+                        node.childNodes[j].nodeValue = data[property];
                     }
                     catch (e) {
-                        node.childNodes[j].nodeValue = data[property];
+                        node.childNodes[j].nodeValue = controller.computed[property]();
                     }
                 }
             }
             else if (node.childNodes[j].nodeType === 1) {
                 // @ts-ignore
-                express_langulage(node.childNodes[j], data);
+                resolver_experssion(node.childNodes[j], data, controller);
             }
         }
     }

package/core/cmd/data/v-html.d.ts

@@ -0,0 +1,8 @@
+import { ComponentController } from "../../../class/controller/componentController";
+/**
+ *
+ * @param elements
+ * @param data
+ * @param controller
+ */
+export declare function resolver_html(elements: HTMLCollection, data: {}, controller: ComponentController): void;

package/core/cmd/data/v-html.js

@@ -0,0 +1,22 @@
+/**
+ *
+ * @param elements
+ * @param data
+ * @param controller
+ */
+export function resolver_html(elements, data, controller) {
+    for (var i = 0; i < elements.length; i++) {
+        if (elements[i].hasAttribute("v-html")) {
+            var dataName = elements[i].getAttribute("v-html");
+            elements[i].removeAttribute("v-html");
+            // @ts-ignore
+            try {
+                elements[i].innerHTML = data[dataName];
+            }
+            catch (error) {
+                elements[i].innerHTML = controller.computed[dataName]();
+            }
+        }
+        resolver_html(elements[i].children, data, controller);
+    }
+}

package/core/cmd/data/v-txt.d.ts

@@ -0,0 +1,8 @@
+import { ComponentController } from "../../../class/controller/componentController";
+/**
+ *
+ * @param elements
+ * @param data
+ * @param controller
+ */
+export declare function resolver_txt(elements: HTMLCollection, data: {}, controller: ComponentController): void;

package/core/cmd/{v-txt.js → data/v-txt.js}

@@ -1,4 +1,10 @@
-export function resolver_txt(elements, data) {
+/**
+ *
+ * @param elements
+ * @param data
+ * @param controller
+ */
+export function resolver_txt(elements, data, controller) {
     for (var i = 0; i < elements.length; i++) {
         var result = elements[i].hasAttribute("v-txt");
         if (result) {
@@ -6,12 +12,12 @@ export function resolver_txt(elements, data) {
             elements[i].removeAttribute("v-txt");
             // @ts-ignore
             try {
-                elements[i].innerHTML = data[dataName]();
+                elements[i].innerHTML = data[dataName];
             }
             catch (e) {
-                elements[i].innerHTML = data[dataName];
+                elements[i].innerHTML = controller.computed[dataName]();
             }
         }
-        resolver_txt(elements[i].children, data);
+        resolver_txt(elements[i].children, data, controller);
     }
 }

package/core/cmd/{v-if.d.ts → justify/v-if.d.ts}

@@ -1 +1,6 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export declare function resolver_if(elements: HTMLCollection, data: {}): void;

package/core/cmd/{v-if.js → justify/v-if.js}

@@ -1,3 +1,8 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export function resolver_if(elements, data) {
     var tag = false;
     //在当前级别下寻找到v-if

package/core/cmd/{v-render.d.ts → justify/v-render.d.ts}

@@ -1 +1,6 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export declare function resolver_render(elements: HTMLCollection, data: {}): void;

package/core/cmd/{v-render.js → justify/v-render.js}

@@ -1,3 +1,8 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export function resolver_render(elements, data) {
     for (var i = 0; i < elements.length; i++) {
         var result = elements[i].hasAttribute("v-render");
@@ -16,7 +21,6 @@ export function resolver_render(elements, data) {
                 console.log("v-render instruct should be used with boolean!");
             }
         }
-        var subElements = elements[i].children;
-        resolver_render(subElements, data);
+        resolver_render(elements[i].children, data);
     }
 }

package/core/cmd/{v-show.d.ts → justify/v-show.d.ts}

@@ -1 +1,6 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export declare function resolver_show(elements: HTMLCollection, data: {}): void;

package/core/cmd/{v-show.js → justify/v-show.js}

@@ -1,3 +1,8 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export function resolver_show(elements, data) {
     for (var i = 0; i < elements.length; i++) {
         var result = elements[i].hasAttribute("v-show");
@@ -16,7 +21,6 @@ export function resolver_show(elements, data) {
                 console.log("v-show instruct should be used with boolean!");
             }
         }
-        var subElements = elements[i].children;
-        resolver_show(subElements, data);
+        resolver_show(elements[i].children, data);
     }
 }

package/core/cmd/{v-switch.d.ts → justify/v-switch.d.ts}

@@ -1 +1,6 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export declare function resolver_switch(elements: HTMLCollection, data: {}): void;

package/core/cmd/{v-switch.js → justify/v-switch.js}

@@ -1,3 +1,8 @@
+/**
+ *
+ * @param elements
+ * @param data
+ */
 export function resolver_switch(elements, data) {
     //在当前级别下寻找到v-if
     for (var i = 0; i < elements.length; i++) {

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

@@ -1,4 +1,4 @@
-import { extractForArray, extractForMap } from "../utility/vForUtility";
+import { extractForArray, extractForMap } from "../../utility/vForUtility";
 /**
  * 展开数据
  * @param elements

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

@@ -1,5 +1,5 @@
-import { part_render_map } from "../render/partRender";
-import { extractForArray } from "../utility/vForUtility";
+import { part_render_map } from "../../render/partRender";
+import { extractForArray } from "../../utility/vForUtility";
 /**
  * 遍历根元素
  * @param element
@@ -19,9 +19,7 @@ export function resolver_array_single(element, index, data) {
         // @ts-ignore
         element.innerText = index;
     }
-    //深度展开
-    var subElements = element.children;
-    resolver_array_multi(subElements, index, data);
+    resolver_array_multi(element.children, index, data);
 }
 /**
  * 遍历根元素的子元素

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

@@ -1,5 +1,5 @@
-import { part_render_map } from "../render/partRender";
-import { extractForArray } from "../utility/vForUtility";
+import { part_render_map } from "../../render/partRender";
+import { extractForArray } from "../../utility/vForUtility";
 /**
  * 展开数据
  * @param element

package/core/cmd/{v-on.d.ts → method/v-on.d.ts}

@@ -1 +1,7 @@
+/**
+ *
+ * @param elements
+ * @param methods
+ * @param data
+ */
 export declare function resolver_event(elements: HTMLCollection, methods: {}, data: {}): void;

package/core/cmd/{v-on.js → method/v-on.js}

@@ -1,3 +1,9 @@
+/**
+ *
+ * @param elements
+ * @param methods
+ * @param data
+ */
 export function resolver_event(elements, methods, data) {
     //遍历所有的元素节点
     for (var i = 0; i < elements.length; i++) {
@@ -17,9 +23,7 @@ export function resolver_event(elements, methods, data) {
                 }
             }
         }
-        //获取该组件的
-        var subElements = elements[i].children;
         //深度解析属性
-        resolver_event(subElements, methods, data);
+        resolver_event(elements[i].children, methods, data);
     }
 }

package/core/cmd/{v-bind.d.ts → property/v-bind.d.ts}

@@ -1 +1,6 @@
+/**
+ *
+ * @param nodes
+ * @param data
+ */
 export declare function resolver_bind(nodes: HTMLCollection, data: {}): void;

package/core/cmd/{v-bind.js → property/v-bind.js}

@@ -1,4 +1,9 @@
-import { isUnKnown } from "../utility/checkUtility";
+import { isUnKnown } from "../../utility/checkUtility";
+/**
+ *
+ * @param nodes
+ * @param data
+ */
 export function resolver_bind(nodes, data) {
     for (var i = 0; i < nodes.length; i++) {
         //对系统元素进行属性绑定
@@ -22,8 +27,7 @@ export function resolver_bind(nodes, data) {
                     }
                 }
             }
-            var subElements = nodes[i].children;
-            resolver_bind(subElements, data);
+            resolver_bind(nodes[i].children, data);
         }
     }
 }

package/core/cmd/{v-model.js → react/v-model.js}

@@ -13,8 +13,16 @@ export function resolver_model(nodes, data) {
             if (tagName === "INPUT" || tagName === "SELECT" || tagName === "TEXTAREA") {
                 var listener = function (evt) {
                     if (!evt.target.hasAttribute("flag")) {
+                        //Get the event element
                         var element = evt.target;
+                        //Get the name attribute
                         var dataName_1 = element.name;
+                        Reflect.set(this, "origin", {
+                            cpn: element.getAttribute("cpn"),
+                            tag: element.nodeName,
+                            name: element.getAttribute("name")
+                        });
+                        //Update the value
                         this[dataName_1] = element.value;
                     }
                 };
@@ -32,7 +40,6 @@ export function resolver_model(nodes, data) {
                 nodes[i].addEventListener("compositionend", compositionend.bind(data));
             }
         }
-        var kk = nodes[i].children;
-        resolver_model(kk, data);
+        resolver_model(nodes[i].children, data);
     }
 }

package/core/cmd/{v-ref.d.ts → ref/v-ref.d.ts}

@@ -1 +1,6 @@
+/**
+ *
+ * @param el
+ * @param refs
+ */
 export declare function resolver_Refs(el: HTMLCollection, refs: Map<string, Element>): void;

package/core/cmd/{v-ref.js → ref/v-ref.js}

@@ -1,3 +1,8 @@
+/**
+ *
+ * @param el
+ * @param refs
+ */
 export function resolver_Refs(el, refs) {
     for (var i = 0; i < el.length; i++) {
         if (el[i].hasAttribute("ref")) {

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

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

package/core/inject/inject.d.ts

@@ -1,32 +1,32 @@
-import { Controller } from "../../class/controller/controller";
+import { ComponentController } from "../../class/controller/componentController";
 import { Component } from "../../class/component/component";
 /**
  * 向raw_data中注入props和Query
  * @param controller
  * @param tagTemplate
  */
-export declare function inject(controller: Controller, tagTemplate: Element): void;
+export declare function inject(controller: ComponentController, tagTemplate: Element): void;
 /**
  *
  * @param controller
  * @param tagTemplate
  */
-export declare function injectRefs(controller: Controller, tagTemplate: Element): void;
+export declare function injectRefs(controller: ComponentController, tagTemplate: Element): void;
 /**
  *
  * @param controller
  * @param proto
  */
-export declare function injectMethod(controller: Controller, proto: Component): void;
+export declare function injectMethod(controller: ComponentController, proto: Component): void;
 /**
  *
  * @param controller
  * @param proto
  */
-export declare function injectWatcher(controller: Controller, proto: Component): void;
+export declare function injectWatcher(controller: ComponentController, proto: Component): void;
 /**
  *
  * @param controller
  * @param proto
  */
-export declare function injectComputed(controller: Controller, proto: Component): void;
+export declare function injectComputed(controller: ComponentController, proto: Component): void;

package/core/inject/inject.js

@@ -1,7 +1,7 @@
 import { getCodeSpaceForProps, getCodeSpaceForQuery, getCodeSpaceForRef, } from "../utility/injectUtility";
 import { resolveProps } from "../resolver/props";
 import { resolve_Queries } from "../resolver/query";
-import { resolver_Refs } from "../cmd/v-ref";
+import { resolver_Refs } from "../cmd/ref/v-ref";
 /**
  * 向raw_data中注入props和Query
  * @param controller
@@ -42,7 +42,7 @@ export function injectMethod(controller, proto) {
 export function injectWatcher(controller, proto) {
     var methods = Object.getOwnPropertyNames(proto.getWatcher());
     methods.forEach(function (value) {
-        Reflect.set(controller.raw_data, "w_".concat(value), proto.getWatcher()[value].bind(controller.raw_data));
+        Reflect.set(controller.watcher, value, proto.getWatcher()[value].bind(controller.raw_data));
     });
 }
 /**
@@ -53,6 +53,6 @@ export function injectWatcher(controller, proto) {
 export function injectComputed(controller, proto) {
     var methods = Object.getOwnPropertyNames(proto.getComputed());
     methods.forEach(function (value) {
-        Reflect.set(controller.raw_data, value, proto.getComputed()[value].bind(controller.proxyForMethods));
+        Reflect.set(controller.computed, value, proto.getComputed()[value].bind(controller.proxyForMethods));
     });
 }

package/core/proxy/getProxy.d.ts

@@ -1,13 +1,13 @@
-import { Controller } from "../../class/controller/controller";
+import { ComponentController } from "../../class/controller/componentController";
 /**
  * 获取data对象的代理对象
  * @param obj
  * @param updater
  */
-export declare function getProxyObject(obj: {}, updater: Controller): any;
+export declare function getProxyObject(obj: {}, updater: ComponentController): any;
 /**
  * 获取setter代理函数
  * @param data
  * @param updater
  */
-export declare function getSetter(data: {}, updater: Controller): any;
+export declare function getSetter(data: {}, updater: ComponentController): any;

package/core/proxy/getProxy.js

@@ -21,10 +21,10 @@ export function getSetter(data, updater) {
     var setter = function (obj, prop, value) {
         //检查是否有watcher
         try {
-            obj["w_".concat(prop)](obj[prop], value);
+            this.watcher[prop](obj[prop], value);
         }
-        catch (e) {
-            console.log(e.message);
+        catch (error) {
+            console.log(error.message);
         }
         //更新值
         obj[prop] = value;

package/core/render/PostRender.d.ts

@@ -1,6 +1,5 @@
 import { Component } from "../../class/component/component";
-import { Controller } from "../../class/controller/controller";
-import { ApiController } from "../../class/controller/apiController";
+import { ComponentController } from "../../class/controller/componentController";
 import { PageController } from "../../class/controller/pageController";
 /**
  * 该函数用于初次渲染需要记录状态的组件
@@ -10,4 +9,4 @@ import { PageController } from "../../class/controller/pageController";
  * @param link
  * @param tagTemplate
  */
-export declare function post_render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;
+export declare function post_render(proto: Component, parent: ParentNode, child: Element, link: ComponentController | PageController, tagTemplate: Element): void;

package/core/render/PostRender.js

@@ -1,11 +1,11 @@
-import { Controller } from "../../class/controller/controller";
+import { ComponentController } from "../../class/controller/componentController";
 import { controllerCycleTypeTwo } from "../../library/lifecycle/controllerCycle";
 import { afterCmd, cmd } from "../../library/cmd/cmd";
 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";
+import { resolver_solt } from "../cmd/solt/v-solt";
 /**
  * 该函数用于初次渲染需要记录状态的组件
  * @param proto
@@ -16,7 +16,7 @@ import { resolver_solt } from "../cmd/v-solt";
  */
 export function post_render(proto, parent, child, link, tagTemplate) {
     //获取控制对象
-    var controller = new Controller();
+    var controller = new ComponentController();
     //解析solt
     resolver_solt(child, controller);
     //控制对象预处理