owl-cli 6.149.0 → 6.151.0

package/defaultTemplate/api/src/handlers/listEx.jsx

@@ -1,137 +1,143 @@
-//#import Util.js
-//#import base64.js
-//#import HttpUtil.js
-//#import session.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-
-
-var spec = @spec;
-
-function buildSort(sort){
-    if(!sort){
-        return {};
-    }
-    var result = [];
-    if(Array.isArray(sort)){
-        sort.forEach(function(sortField){
-            //sortField = ["pos","asc"]
-            var sortItem = {};
-            sortItem[sortField[0]] = {"order":sortField[1]}
-            result.push(sortItem);
-        });
-    }
-    else{
-        for(var k in sort){
-            var direction = sort[k];
-            if(direction === 'ascend'){
-                var sortItem = {};
-                sortItem[k] = {"order":"asc"}
-                result.push(sortItem);
-            }
-            else if(direction === 'descend'){
-                var sortItem = {};
-                sortItem[k] = {"order":"desc"}
-                result.push(sortItem);
-            }
-        }
-    }
-
-    return result;
-}
-;(function(){
-
-    var env = checklogin();
-    if(!env){
-        return;
-    }
-
-    var shopId = env.shopId;
-    var warehouseId = env.warehouseId;
-    var loginId = env.loginId;
-    var roleId = env.roleId;
-    var orgId = env.orgId;
-    var spec = @spec;
-    var meta = spec['#meta'];
-    var tableId = 'owl_' + spec._t;
-    var permissions = getPermissions(roleId,tableId);
-    var m = shopId;
-    ///////////////////////////////
-
-//判断是subplatform,还是shop,还是platform
-    var params = JSON.parse($body);
-    var searchArgs = params.searchArgs;
-    var keyword = searchArgs.keyword;
-    var pageSize = params.pageSize;
-    var page = params.page;
-    var sort = params.sort;
-    var recycleBin = searchArgs.recycleBin;
-    // $.log("searchArgs=" + JSON.stringify(searchArgs));
-    delete searchArgs.recycleBin;
-    // $.log("recycleBin=" + recycleBin);
-    var defaultSort = meta.defaultSort;
-    var effectiveSort = [];
-    if(sort && sort.length>0){
-        effectiveSort = buildSort(sort);
-    }
-    else if(defaultSort && defaultSort.length>0){
-        effectiveSort = buildSort(defaultSort);
-    }
-
-    if(!page){
-        page = 1;
-    }
-    if(!pageSize){
-        pageSize=15;
-    }
-    pageSize = Number(pageSize);
-    var from = page * pageSize-pageSize;
-
-
-    var isPublic = meta && meta.isPublic;
-
-
-
-    var mfilters = null;
-    if(isPublic || orgId=='0'){
-        delete searchArgs["_orgIds"];
-    }
-    else{
-        searchArgs["_orgIds"] = orgId;
-        mfilters =  getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
-    }
-
-   var dataSource = null;
-
-    var isRecycleBin = false;
-    if(recycleBin){
-        isRecycleBin = true;
-    }
-
-
-   var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource ,isRecycleBin );
-   var count =  @projectCodeService.count(mfilters, searchArgs, keyword ,isRecycleBin);
-
-
-   if(sr.state=='ok'){
-       var ret = {
-           state:'ok',
-           list:sr.list,
-           total:sr.total,
-           count : count
-       }
-       out.print(JSON.stringify(ret));
-   }
-   else{
-       var ret = {
-               state:'err',
-               msg:"查询出现异常"
-           };
-       out.print(JSON.stringify(ret));
-   }
-
-
-
-
-
+//#import Util.js
+//#import base64.js
+//#import HttpUtil.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+
+
+var spec = @spec;
+
+function buildSort(sort){
+    if(!sort){
+        return {};
+    }
+    var result = [];
+    if(Array.isArray(sort)){
+        sort.forEach(function(sortField){
+            //sortField = ["pos","asc"]
+            var sortItem = {};
+            sortItem[sortField[0]] = {"order":sortField[1]}
+            result.push(sortItem);
+        });
+    }
+    else{
+        for(var k in sort){
+            var direction = sort[k];
+            if(direction === 'ascend'){
+                var sortItem = {};
+                sortItem[k] = {"order":"asc"}
+                result.push(sortItem);
+            }
+            else if(direction === 'descend'){
+                var sortItem = {};
+                sortItem[k] = {"order":"desc"}
+                result.push(sortItem);
+            }
+        }
+    }
+
+    return result;
+}
+;(function(){
+
+    var env = checklogin();
+    if(!env){
+        var ret = {
+            state:'err',
+            msg:'没有登录。'
+        }
+        out.print(JSON.stringify(ret));
+        return;
+    }
+    var params = JSON.parse($body);
+
+    var shopId = env.shopId;
+    var warehouseId = env.warehouseId;
+    var loginId = env.loginId;
+    var roleId = params.rroleId || env.roleId;
+    var orgId = params.rorgId || env.orgId;
+    var spec = @spec;
+    var meta = spec['#meta'];
+    var tableId = 'owl_' + spec._t;
+    var permissions = getPermissions(roleId,tableId);
+    var m = shopId;
+    ///////////////////////////////
+
+//判断是subplatform,还是shop,还是platform
+
+    var searchArgs = params.searchArgs;
+    var keyword = searchArgs.keyword;
+    var pageSize = params.pageSize;
+    var page = params.page;
+    var sort = params.sort;
+    var recycleBin = searchArgs.recycleBin;
+    // $.log("searchArgs=" + JSON.stringify(searchArgs));
+    delete searchArgs.recycleBin;
+    // $.log("recycleBin=" + recycleBin);
+    var defaultSort = meta.defaultSort;
+    var effectiveSort = [];
+    if(sort){
+        effectiveSort = buildSort(sort);
+    }
+    else if(defaultSort && defaultSort.length>0){
+        effectiveSort = buildSort(defaultSort);
+    }
+
+    if(!page){
+        page = 1;
+    }
+    if(!pageSize){
+        pageSize=15;
+    }
+    pageSize = Number(pageSize);
+    var from = page * pageSize-pageSize;
+
+
+    var isPublic = meta && meta.isPublic;
+
+
+
+    var mfilters = null;
+    if(isPublic || orgId=='0'){
+        delete searchArgs["_orgIds"];
+    }
+    else{
+        searchArgs["_orgIds"] = orgId;
+        mfilters =  getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
+    }
+
+   var dataSource = null;
+
+    var isRecycleBin = false;
+    if(recycleBin){
+        isRecycleBin = true;
+    }
+
+
+   var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource ,isRecycleBin );
+   var count =  @projectCodeService.count(mfilters, searchArgs, keyword ,isRecycleBin);
+
+
+   if(sr.state=='ok'){
+       var ret = {
+           state:'ok',
+           list:sr.list,
+           total:sr.total,
+           count : count
+       }
+       out.print(JSON.stringify(ret));
+   }
+   else{
+       var ret = {
+               state:'err',
+               msg:"查询出现异常"
+           };
+       out.print(JSON.stringify(ret));
+   }
+
+
+
+
+
 })();

package/defaultTemplate/api/src/handlers/reIndex.jsx

@@ -1,63 +1,63 @@
-//#import Util.js
-//#import session.js
-//#import HttpUtil.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-;(function(){
-
-    var env = checklogin();
-    if(!env){
-        return;
-    }
-    var shopId = env.shopId;
-    var warehouseId = env.warehouseId;
-    var m = shopId;
-    ///////////////////////////////
-
-    var spec = @spec;
-
-    var id = $.params.id;
-    if (id) {
-        var obj = @projectCodeService.get(id);
-    @projectCodeService.index(obj);
-        out.print(id + ":重建索引成功");
-    } else {
-        var start = $.params.start;
-        var limit = $.params.limit;
-        if (start != null && limit != null) {
-            var listName = @projectCodeService.getAllListName();
-            var list = @projectCodeService.getList(listName, start, limit);
-            for (var i = 0; i < list.length; i++) {
-                try {
-                @projectCodeService.index(list[i]);
-                } catch (e) {
-                    try {
-                        out.print(list[i].id + ",重建索引失败，异常信息:" + JSON.stringify(e) + "<br>");
-                    } catch (e1) {
-                        out.print(list[i].id + ",重建索引失败，异常信息:" + e1 + "<br>");
-                    }
-                }
-            }
-            out.print(spec["_t"] + "重建索引成功:"+list.length);
-        }else{
-            try {
-            @projectCodeService.reindexAll();
-            } catch (e) {
-                out.print("重建索引失败，异常信息:" + e + "<br>");
-            }
-            /*var list = @projectCodeService.getList(@projectCodeService.getAllListName(), 0, -1);
-            list.forEach(function (value) {
-                try{
-                    @projectCodeService.index(value);
-                }catch(e){
-                    try {
-                        out.print(value.id + ",重建索引失败，异常信息:" + JSON.stringify(e)+"<br>");
-                    } catch (e1) {
-                        out.print(value.id + ",重建索引失败，异常信息:" + e1+"<br>");
-                    }
-                }
-            });*/
-            out.print(spec["_t"] + "重建索引成功:");
-        }
-    }
-})();
+//#import Util.js
+//#import session.js
+//#import HttpUtil.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+;(function(){
+
+    var env = checklogin();
+    if(!env){
+        return;
+    }
+    var shopId = env.shopId;
+    var warehouseId = env.warehouseId;
+    var m = shopId;
+    ///////////////////////////////
+
+    var spec = @spec;
+
+    var id = $.params.id;
+    if (id) {
+        var obj = @projectCodeService.get(id);
+    @projectCodeService.index(obj);
+        out.print(id + ":重建索引成功");
+    } else {
+        var start = $.params.start;
+        var limit = $.params.limit;
+        if (start != null && limit != null) {
+            var listName = @projectCodeService.getAllListName();
+            var list = @projectCodeService.getList(listName, start, limit);
+            for (var i = 0; i < list.length; i++) {
+                try {
+                @projectCodeService.index(list[i]);
+                } catch (e) {
+                    try {
+                        out.print(list[i].id + ",重建索引失败，异常信息:" + JSON.stringify(e) + "<br>");
+                    } catch (e1) {
+                        out.print(list[i].id + ",重建索引失败，异常信息:" + e1 + "<br>");
+                    }
+                }
+            }
+            out.print(spec["_t"] + "重建索引成功:"+list.length);
+        }else{
+            try {
+            @projectCodeService.reindexAll();
+            } catch (e) {
+                out.print("重建索引失败，异常信息:" + e + "<br>");
+            }
+            /*var list = @projectCodeService.getList(@projectCodeService.getAllListName(), 0, -1);
+            list.forEach(function (value) {
+                try{
+                    @projectCodeService.index(value);
+                }catch(e){
+                    try {
+                        out.print(value.id + ",重建索引失败，异常信息:" + JSON.stringify(e)+"<br>");
+                    } catch (e1) {
+                        out.print(value.id + ",重建索引失败，异常信息:" + e1+"<br>");
+                    }
+                }
+            });*/
+            out.print(spec["_t"] + "重建索引成功:");
+        }
+    }
+})();

package/defaultTemplate/api/src/handlers/recovery.jsx

@@ -1,54 +1,54 @@
-//#import Util.js
-//#import login.js
-//#import user.js
-//#import base64.js
-//#import HttpUtil.js
-//#import session.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-
-function doRecovery(){
-    var env = checklogin();
-    if(!env){
-        return;
-    }
-    var shopId = env.shopId;
-    var warehouseId = env.warehouseId;
-    var m = shopId;
-
-    var params = JSON.parse($body);
-    var id = params.id;
-
-    var obj = @projectCodeService.get(id,true);
-    if(obj){
-        obj.del = 'F';
-        var newdata = @projectCodeService.update( obj,env );
-        var ret = {
-            state: 'ok',
-            object: newdata
-        }
-        out.print(JSON.stringify(ret));
-    }
-    else{
-        var ret = {
-            state: 'err',
-            msg: "wrong id:"+id
-        }
-        out.print(JSON.stringify(ret));
-        return;
-    }
-}
-function main(){
-    try{
-        doRecovery();
-    }
-    catch(e){
-        var ret = {
-            state: 'err',
-            msg: e
-        }
-        out.print(JSON.stringify(ret));
-        return;
-    }
-}
+//#import Util.js
+//#import login.js
+//#import user.js
+//#import base64.js
+//#import HttpUtil.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+
+function doRecovery(){
+    var env = checklogin();
+    if(!env){
+        return;
+    }
+    var shopId = env.shopId;
+    var warehouseId = env.warehouseId;
+    var m = shopId;
+
+    var params = JSON.parse($body);
+    var id = params.id;
+
+    var obj = @projectCodeService.get(id,true);
+    if(obj){
+        obj.del = 'F';
+        var newdata = @projectCodeService.update( obj,env );
+        var ret = {
+            state: 'ok',
+            object: newdata
+        }
+        out.print(JSON.stringify(ret));
+    }
+    else{
+        var ret = {
+            state: 'err',
+            msg: "wrong id:"+id
+        }
+        out.print(JSON.stringify(ret));
+        return;
+    }
+}
+function main(){
+    try{
+        doRecovery();
+    }
+    catch(e){
+        var ret = {
+            state: 'err',
+            msg: e
+        }
+        out.print(JSON.stringify(ret));
+        return;
+    }
+}
 main();