render-core 1.0.117 → 1.0.119

package/class/component/component.d.ts

@@ -1,6 +1,6 @@
 import { RenderBase } from "../tips/componentTip";
 /**
- *
+ * This is the component class.
  */
 export declare class Component implements RenderBase {
     private readonly name;
@@ -16,7 +16,7 @@ export declare class Component implements RenderBase {
     private readonly beforeUpdate?;
     private readonly afterUpdate?;
     private readonly beforeMount?;
-    private readonly beforeUnmount?;
+    private readonly afterMount?;
     constructor(config: {
         name: string;
         template: string;
@@ -31,7 +31,7 @@ export declare class Component implements RenderBase {
         beforeUpdate?: () => void;
         afterUpdate?: () => void;
         beforeMount?: () => void;
-        beforeUnmount?: () => void;
+        afterMount?: () => void;
     });
     getName(): string;
     getTemplate(): string;
@@ -46,5 +46,5 @@ export declare class Component implements RenderBase {
     getBeforeUpdate(): () => void;
     getAfterUpdate(): () => void;
     getBeforeMount(): () => void;
-    getBeforeUnmount(): () => void;
+    getAfterMount(): () => void;
 }

package/class/component/component.js

@@ -1,5 +1,5 @@
 /**
- *
+ * This is the component class.
  */
 var Component = /** @class */ (function () {
     function Component(config) {
@@ -80,11 +80,11 @@ var Component = /** @class */ (function () {
         else {
             this.beforeMount = config.beforeMount;
         }
-        if (typeof config.beforeUnmount === "undefined") {
-            this.beforeUnmount = function () { };
+        if (typeof config.afterMount === "undefined") {
+            this.afterMount = function () { };
         }
         else {
-            this.beforeUnmount = config.beforeUnmount;
+            this.afterMount = config.afterMount;
         }
     }
     Component.prototype.getName = function () {
@@ -126,8 +126,8 @@ var Component = /** @class */ (function () {
     Component.prototype.getBeforeMount = function () {
         return this.beforeMount;
     };
-    Component.prototype.getBeforeUnmount = function () {
-        return this.beforeUnmount;
+    Component.prototype.getAfterMount = function () {
+        return this.afterMount;
     };
     return Component;
 }());

package/class/tips/componentTip.d.ts

@@ -12,5 +12,5 @@ export interface RenderBase {
     getBeforeUpdate(): () => void;
     getAfterUpdate(): () => void;
     getBeforeMount(): () => void;
-    getBeforeUnmount(): () => void;
+    getAfterMount(): () => void;
 }

package/core/inject/inject.d.ts

@@ -9,9 +9,8 @@ export declare function inject(controller: ComponentController, tagTemplate: Ele
 /**
  *
  * @param controller
- * @param tagTemplate
  */
-export declare function injectRefs(controller: ComponentController, tagTemplate: Element): void;
+export declare function injectRefs(controller: ComponentController): void;
 /**
  *
  * @param controller

package/core/inject/inject.js

@@ -16,9 +16,8 @@ export function inject(controller, tagTemplate) {
 /**
  *
  * @param controller
- * @param tagTemplate
  */
-export function injectRefs(controller, tagTemplate) {
+export function injectRefs(controller) {
     var refs = new Map();
     resolver_Refs(controller.root.children, refs);
     getCodeSpaceForRef(controller.raw_data, refs);
@@ -53,6 +52,6 @@ export function injectWatcher(controller, proto) {
 export function injectComputed(controller, proto) {
     var methods = Object.getOwnPropertyNames(proto.getComputed());
     methods.forEach(function (value) {
-        Reflect.set(controller.computed, value, proto.getComputed()[value].bind(controller.proxyForMethods));
+        Reflect.set(controller.computed, value, proto.getComputed()[value].bind(controller.raw_data));
     });
 }

package/core/proxy/getProxy.js

@@ -28,11 +28,11 @@ export function getSetter(data, updater) {
         //更新值
         obj[prop] = value;
         //更新前操作
-        this.proto.getBeforeUpdate();
+        this.proto.getBeforeUpdate.call(this.raw_data);
         //执行更新
         update_Render(this);
         //更新后操作
-        this.proto.getAfterUpdate();
+        this.proto.getAfterUpdate.call(this.raw_data);
         return true;
     };
     return setter.bind(updater);

package/core/render/PostRender.js

@@ -26,17 +26,20 @@ export function post_render(proto, parent, child, link, tagTemplate) {
     beforeRender();
     //解析指令
     cmdUtility(tagTemplate, proto, controller);
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.raw_data);
+    afterRender();
     //beforeMount
     var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
     beforeMount();
     //mount
     mount(controller, proto, parent, child, tagTemplate);
-    injectRefs(controller, tagTemplate);
+    //beforeMount
+    var afterMount = proto.getAfterMount().bind(controller.proxyForMethods);
+    afterMount();
+    injectRefs(controller);
     //渲染后处理
     afterCmd(controller.root, controller.proto, controller);
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(controller.raw_data);
-    afterRender();
     //后处理
     afterMethodsTypeOne(controller, child, link);
     //深度渲染

package/core/render/initRender.js

@@ -21,9 +21,6 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     resolver_solt(child, controller);
     //控制对象预处理
     controllerCycleTypeOne(controller, proto, child, link, tagTemplate);
-    //beforeRender
-    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-    beforeRender();
     //内存中数据渲染
     cmdUtility(tagTemplate, proto, controller);
     //beforeMount
@@ -31,13 +28,13 @@ export function init_render(proto, parent, child, link, tagTemplate) {
     beforeMount();
     //mount
     mount(controller, proto, parent, child, tagTemplate);
+    //afterMount
+    var afterMount = proto.getAfterMount().bind(controller.proxyForMethods);
+    afterMount();
     //获取
-    injectRefs(controller, tagTemplate);
+    injectRefs(controller);
     //渲染后处理
     afterCmd(controller.root, proto, controller);
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(controller.proxyForMethods);
-    afterRender();
     //后处理
     afterMethodsTypeOne(controller, child, link);
     //深度渲染

package/core/render/rawRender.js

@@ -26,17 +26,20 @@ export function raw_render(proto, parent, child, link, tagTemplate) {
     beforeRender();
     //解析指令
     cmdUtility(tagTemplate, proto, controller);
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.raw_data);
+    afterRender();
     //beforeMount
     var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
     beforeMount();
     //mount
     mount(controller, proto, parent, child, tagTemplate);
-    injectRefs(controller, tagTemplate);
+    //afterMount
+    var afterMount = proto.getAfterMount().bind(controller.proxyForMethods);
+    afterMount();
+    injectRefs(controller);
     //渲染后处理
     afterCmd(controller.root, proto, controller);
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(controller.raw_data);
-    afterRender();
     //后处理
     afterMethodsTypeTwo(controller, child, link);
     //深度渲染

package/core/render/updateRender.js

@@ -18,9 +18,6 @@ export function update_Render(controller) {
     beforeRender();
     //解析指令
     cmdUtility(tagTemplate, controller.proto, controller);
-    //beforeUnmount
-    var beforeUnmount = controller.proto.getBeforeUnmount().bind(controller.raw_data);
-    beforeUnmount();
     //unmount
     while (controller.root.hasChildNodes()) {
         controller.root.removeChild(controller.root.firstChild);
@@ -32,7 +29,7 @@ export function update_Render(controller) {
     while (tagTemplate.hasChildNodes()) {
         controller.root.appendChild(tagTemplate.firstChild);
     }
-    injectRefs(controller, tagTemplate);
+    injectRefs(controller);
     //渲染后处理
     afterCmd(controller.root, controller.proto, controller);
     //afterRender

package/index.d.ts

@@ -1,5 +1,4 @@
 import { Component } from "./class/component/component";
-import { routerController } from "render-security/class/Router";
 import { PageController } from "./class/controller/pageController";
 import { RenderTip } from "./class/tips/renderTip";
 /**
@@ -9,7 +8,7 @@ export declare class RenderJS implements RenderTip {
     readonly config: {};
     readonly tagLib: Map<string, Component>;
     readonly styleLib: Map<string, Map<string, string>>;
-    router: routerController;
+    router: Object | Function;
     private application;
     private context;
     page: PageController;
@@ -44,7 +43,7 @@ export declare class RenderJS implements RenderTip {
      * use our extra router moudle to define the router.
      * @param router
      */
-    addRouter(router: routerController): void;
+    addRouter(router: Object | Function): void;
     /**
      * You can use the method to register your single component or an array of components.
      * @param component

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "render-core",
-  "version": "1.0.117",
+  "version": "1.0.119",
   "description": "The core of render-js",
   "main": "index.js",
   "types": "index.d.ts",
@@ -14,7 +14,6 @@
   },
   "license": "MIT",
   "dependencies": {
-    "render-security": "^1.0.4",
     "render-status": "^1.0.0"
   }
 }

package/runtime/tools.d.ts

@@ -13,6 +13,6 @@ export declare function registerTagLib(application: RenderJS, component: Compone
  */
 export declare function render(renderjs: RenderJS): void;
 /**
- *
+ * The executor function
  */
 export declare function executor(renderjs: RenderJS): void;

package/runtime/tools.js

@@ -1,7 +1,6 @@
 import { Component } from "../class/component/component";
 import { themeStyle } from "../core/utility/styleUtility";
 import { renderHtml } from "./runtime";
-import { redirect } from "render-security/utility/redirect";
 /**
  * This function is used to save the protype component class in the window object.
  * So, you can hava a tip that we customed a property named 'tagLib' in the window object.
@@ -43,28 +42,19 @@ export function render(renderjs) {
     renderHtml(document.body.children, renderjs.page);
 }
 /**
- *
+ * The executor function
  */
 export function executor(renderjs) {
     // @ts-ignore
     if (window.router) {
-        // @ts-ignore
-        window.router.data.beforeRouter();
-        // @ts-ignore
-        if (typeof window.router.getRule(location.href) === "boolean") {
-            render(renderjs);
-        }
-        else {
+        try {
             // @ts-ignore
-            if (window.router.getRule(location.href).beforeRouter()) {
-                render(renderjs);
-            }
-            else {
-                redirect("/http/400.html");
-            }
+            window.router.security();
         }
-        // @ts-ignore
-        window.router.data.afterRouter();
+        catch (e) {
+            console.log(e.message);
+        }
+        render(renderjs);
     }
     else {
         render(renderjs);