owl-cli 6.110.0 → 6.112.0

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

@@ -0,0 +1,110 @@
+//#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 = [];
+    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 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 effectiveSort = buildSort(sort);
+    if(!page){
+        page = 1;
+    }
+    if(!pageSize){
+        pageSize=15;
+    }
+    pageSize = Number(pageSize);
+    var from = page * pageSize-pageSize;
+
+    var meta = spec['#meta'];
+    var isPublic = meta && meta.isPublic;
+
+    if(isPublic || orgId=='0'){
+        delete searchArgs["_orgIds"];
+    }
+    else{
+        searchArgs["_orgIds"] = orgId;
+    }
+
+
+   var dataSource = null;
+   var mfilters =  getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
+
+
+   var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource );
+   var count =  @projectCodeService.count(mfilters, searchArgs, keyword);
+
+
+   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/services/modelService.jsx

@@ -382,6 +382,10 @@ var @projectCodeService = (function (pigeon) {
 
 
         getNormalizedDoc: function (data) {
+            var meta = spec['#meta'];
+            var indexFields = meta.indexFields;
+
+
             var obj = JSON.parse(JSON.stringify(data))
 
             var fields = formSpecs.fields;
@@ -397,6 +401,11 @@ var @projectCodeService = (function (pigeon) {
                    if(field.index==='no'){
                        delete obj[field.key]
                    }
+                   if(indexFields && indexFields.length>0){
+                       if(indexFields.indexOf(field.key)==-1){
+                           delete obj[field.key]
+                       }
+                   }
                 }
             }
             f.tranverseFields(formSpecs, function (field, ctx) {
@@ -416,7 +425,12 @@ var @projectCodeService = (function (pigeon) {
                     }
                 }
                 else {
-                    if(field.index==='no'){
+                    if(indexFields && indexFields.length>0){
+                        if(indexFields.indexOf(field.key)==-1){
+                            f.deleteValue(field.key,obj);
+                        }
+                    }
+                    else if(field.index==='no'){
                         f.deleteValue(field.key,obj);
                     }
                     else{

package/package.json

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