efront 4.14.3 → 4.15.2

package/coms/zimoli/user.js

@@ -15,11 +15,12 @@ var proto = {
     loginPath: null,
     session_time: 300000,
     session: "",
+    clean: null,
     loadSession: function () {
         var object = userInstance;
         if (object.session && !(new Date() > object.session_time)) {
-            proto.session_time = object.session_time;
-            proto.session = object.session;
+            this.session_time = object.session_time;
+            this.session = object.session;
             this.Login(object);
         }
         return object.session || "";
@@ -27,58 +28,57 @@ var proto = {
     saveSession: function (session = this.session) {
         this.session = session;
         data.setInstance(USERINFO, {
-            roles: proto.roles,
-            name: proto.name,
-            _id: proto._id,
+            roles: this.roles,
+            name: this.name,
+            _id: this._id,
             session: session,
             _passport: this._passport,
             isLogin: !!session,
-            session_time: +new Date() + proto.session_time
+            session_time: +new Date() + this.session_time
         });
     },
+    setLoginPath(pathname) {
+        this.loginPath = pathname;
+    },
+    setUserDataLoader(method) {
+        loadUserData = method;
+    },
+    setSessionTime(session_time) {
+        this.session_time = session_time;
+    },
+    refresh() {
+        loadUserData instanceof Function && loadUserData();
+    },
+    getPassport() {
+        if (!passport) {
+            passport = encode62.timeencode(encode62.decode62(user._passport, user.session));
+        }
+        return passport = encode62.timeupdate(passport);
+    },
     Login(userinfo) {
         this.login(userinfo);
     },
+    login(userinfo) {
+        this.roles = userinfo.roles || [];
+        this.isLogin = true;
+        this.name = userinfo.name;
+        this._id = "org.couchdb.user:" + userinfo.name;
+        this.clean?.(this.loginPath);
+        this.refresh();
+    },
     Logout() {
         this.logout();
-    }
+    },
+    logout() {
+        delete user.isLogin;
+        delete user.roles;
+        delete user._passport;
+        this._passport = "";
+        this.roles = null;
+        this.isLogin = false;
+        passport = '';
+        this.saveSession("");
+    },
 };
 extend(proto, emptyProto, userInstance);
 var user = enrich(proto);
-user.setLoginPath = function (pathname) {
-    proto.loginPath = pathname;
-};
-user.setUserDataLoader = function (method) {
-    loadUserData = method;
-};
-user.setSessionTime = function (session_time) {
-    proto.session_time = session_time;
-};
-user.refresh = function () {
-    loadUserData instanceof Function && loadUserData();
-};
-
-user.getPassport = function () {
-    if (!passport) {
-        passport = encode62.timeencode(encode62.decode62(user._passport, user.session));
-    }
-    return passport = encode62.timeupdate(passport);
-};
-user.login = function (userinfo) {
-    proto.roles = userinfo.roles || [];
-    proto.isLogin = true;
-    proto.name = userinfo.name;
-    proto._id = "org.couchdb.user:" + userinfo.name;
-    user.clean && user.clean(proto.loginPath);
-    this.refresh();
-};
-user.logout = function () {
-    delete user.isLogin;
-    delete user.roles;
-    delete user._passport;
-    proto._passport = "";
-    proto.roles = null;
-    proto.isLogin = false;
-    passport = '';
-    this.saveSession("");
-};

package/coms/zimoli/zimoli.js

@@ -296,11 +296,7 @@ function prepare(pgpath, ok) {
         }
         return url;
     };
-    state.init = function () {
-        var [a] = arguments;
-        a = state.path(a);
-        return init.apply(this, [a].concat([].slice.call(arguments, 1)));
-    };
+
     state.go = function (url, args, _history_name) {
         // if (arguments.length === 1 && isFinite(url)) return window_history.go(url | 0);
         var to = function (_url, args, _history_name) {
@@ -382,7 +378,7 @@ function prepare(pgpath, ok) {
         extendIfNeeded(pg, state);
         if (roles) return prepare(user.loginPath, () => emit(pg));
         emit(pg);
-    }, state);
+    }, state, true);
 }
 function create(pagepath, args, from, needroles) {
     if (typeof pagepath === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.14.3",
+    "version": "4.15.2",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {