owl-cli 6.205.0 → 6.207.0

package/defaultTemplate/api/src/handlers/include/checklogin.jsx

@@ -17,6 +17,18 @@ function getParentOrgIds(orgId) {
     return [orgId];
 }
 
+function getUserByToken(token){
+    if(!owl_server_tokenService){
+       return null;
+    }
+    var server_token = owl_server_tokenService.getUniqueObj("token",token);
+    if(!server_token){
+        return null;
+    }
+    var user_id = server_token.userId;
+    var user = owl_mall_uService.get(user_id);
+    return user;
+}
 function checklogin() {
     var magic = $.getSystemProperty("magic");
     var magicParams = $.params.ma;
@@ -46,6 +58,34 @@ function checklogin() {
 
     } else {
         var params = JSON.parse($body);
+        var token = params._req_token
+        if(token){
+            var token_user = getUserByToken(token);
+            if(token_user){
+                var env = {
+                    now: new Date().getTime(),
+                    loginUserId: token_user.id,
+                    loginId: token_user.id,
+                    // loginUser:loginUser,
+                    shopId: m,
+                    warehouseId: "",
+                    roleId:  params.rroleId,
+                    orgId: params.rorgId,
+                    orgIds: null,
+                    m: m
+                }
+                return env;
+            }
+            else{
+                var ret = {
+                    state: 'err',
+                    code: 'not valid token',
+                    msg: "not valid token"
+                }
+                out.print(JSON.stringify(ret));
+                return null;
+            }
+        }
         var isid = SessionService.getSessionId(request);
         var now = new Date().getTime();
         var sessionId = 'owl_backend_session_' + isid;
@@ -56,7 +96,7 @@ function checklogin() {
             var orgId = params.rorgId || session.orgId;
             var orgIds = [orgId].concat(getParentOrgIds(orgId));
             if (loginUserId) {
-                var loginUser = owl_mall_uService.get(loginUserId);
+                // var loginUser = owl_mall_uService.get(loginUserId);
                 var env = {
                     now: new Date().getTime(),
                     loginUserId: loginUserId,

package/defaultTemplate/api/src/services/modelService.jsx

@@ -547,6 +547,7 @@ var @projectCodeService = (function (pigeon) {
 
         },
         add: function (data, env) {
+            f.checkData(data);
             env = env || {}
             var ret = f.validate(data, env)
             if(ret.state!='ok'){
@@ -657,7 +658,22 @@ var @projectCodeService = (function (pigeon) {
             return pigeon.getObjects(ids)
         },
 
+        checkData: function (data, env) {
+            var meta = spec['#meta'];
+            // 检查数据是否合法
+            var checkData = meta.checkData;
+            if(checkData){
+                if(checkData.maxSize){
+                    var s = JSON.stringify(data);
+                    if(s.length>checkData.maxSize){
+                        throw {code: 'dataTooLarge', msg: '数据太大，超过了' + checkData.maxSize + '字节'}
+                    }
+                }
+            }
+        },
+
         update: function (data, env) {
+            f.checkData(data);
             env = env || {}
             var id = data.id
 

package/defaultTemplate/api/src/tasks/export.jsx

@@ -64,7 +64,10 @@ function main(modelService,spec){
                 var value = modelService.getValue(title.field,row);
                 if(title.type==="date"){
                     if(value){
-                        var ts = new Date(Number(value));
+                        if(!isNaN(value)){
+                            value = Number(value);
+                        }
+                        var ts = new Date(value);
                         value = formatDateWithTimeZone(ts, 8);
                         // value = ts /86400000+25569; //这是excel的特殊的格式，用小数点表示
                     }
@@ -199,9 +202,16 @@ function getRows(modelService, spec) {
 
         var sr = modelService.search(mfilters, searchArgs, keyword, from, pageSize, sort);
         if(sr.state==='ok'){
+            var rows = [];
+            sr.list.forEach(function(r){
+                var row = modelService.get(r.id);
+                if(row){
+                    rows.push(row);
+                }
+            });
             return {
-                rows: sr.list,
-                total: sr.list.length
+                rows: rows,
+                total: rows.length
             }
         }
         else{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "6.205.0",
+  "version": "6.207.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {