owl-cli 6.125.0 → 6.127.0

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

@@ -81,9 +81,14 @@ function buildSort(sort){
    var dataSource = null;
    var mfilters =  getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
 
+    var isRecycleBin = false;
+    if(recycleBin){
+        isRecycleBin = true;
+    }
+
 
-   var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource );
-   var count =  @projectCodeService.count(mfilters, searchArgs, keyword);
+   var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource ,isRecycleBin );
+   var count =  @projectCodeService.count(mfilters, searchArgs, keyword ,isRecycleBin);
 
 
    if(sr.state=='ok'){

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

@@ -7,7 +7,6 @@
 //#import HttpUtil.js
 //#import jobs.js
 //#import DigestUtil.js
-//#import moment.min.js
 //#import kafkautil.js
 //#import @services/dblayer.jsx
 //#import @handlers/include/diff.jsx
@@ -367,7 +366,11 @@ var @projectCodeService = (function (pigeon) {
                     }
                 case 'date':
                     try{
-                        return moment(value);
+                        if(isNaN(value)){
+                            return value;
+                        }
+
+                        return new Date(Number(value)).toISOString();
                     }
                     catch(e){
                         return null;
@@ -1006,7 +1009,7 @@ var @projectCodeService = (function (pigeon) {
             return filters;
         },
 
-        buildQuery:function(mfilters,searchArgs,keyword){
+        buildQuery:function(mfilters,searchArgs,keyword,isRecycleBin){
             delete searchArgs.keyword;
             var filters = [];
             var must_not = [{
@@ -1014,6 +1017,15 @@ var @projectCodeService = (function (pigeon) {
                     "del.keyword":'T'
                 }
             }];
+
+            if(isRecycleBin){
+                must_not = [];
+                filters.push({
+                    term:{
+                        "del.keyword":'T'
+                    }
+                });
+            }
             for(var k in searchArgs){
 
                 var v = searchArgs[k];
@@ -1125,8 +1137,8 @@ var @projectCodeService = (function (pigeon) {
             return query;
         },
 
-        count:function(mfilters,searchArgs,keyword,dataSource){
-            var query = f.buildQuery(mfilters,searchArgs,keyword);
+        count:function(mfilters,searchArgs,keyword,dataSource,isRecycleBin){
+            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin);
             var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 
             var headers = { "Content-Type": "application/json;charset=utf-8" };
@@ -1150,8 +1162,8 @@ var @projectCodeService = (function (pigeon) {
             }
             return 0;
         },
-        search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource){
-            var query = f.buildQuery(mfilters,searchArgs,keyword);
+        search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource,isRecycleBin){
+            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin);
             // var effectiveSort = [{owl_createTime:{order:"desc"}}];
             var effectiveSort = [];
             if(sort){

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

@@ -1,5 +1,4 @@
 //#import $@projectCode:services/modelService.jsx
-//#import moment.min.js
 //#import excel.js
 
 
@@ -47,7 +46,19 @@ function normalizeValue(value,spec){
     case 'number':
       return 'n' + value;
     case 'date':
-      return 'd'+ moment(value).toDate().getTime();
+      try{
+        var d = null;
+        if(isNaN(value)){
+          d = new Date(value).getTime();
+        }
+        else{
+          d = new Date(Number(value)).getTime();
+        }
+        return 'd'+ d;
+      }
+      catch(e){
+        return null;
+      }
     case 'choice':
       for(var i=0; i<spec.options.length; i++){
         var option = spec.options[i];

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

@@ -1,5 +1,4 @@
 //#import $@projectCode:services/modelService.jsx
-//#import moment.min.js
 //#import excel.js
 
 var formSpecs = @formSpecs;
@@ -30,7 +29,20 @@ function normalizeValue(value,spec){
     case 'number':
       return 'n' + value;
     case 'date':
-      return 'd'+ moment(value).toDate().getTime();
+      try{
+        var d = null;
+        if(isNaN(value)){
+          d = new Date(value).getTime();
+        }
+        else{
+          d = new Date(Number(value)).getTime();
+        }
+        return 'd'+ d;
+      }
+      catch(e){
+        return null;
+      }
+
     case 'choice':
       for(var i=0; i<spec.options.length; i++){
         var option = spec.options[i];

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

@@ -67,10 +67,17 @@ function normalizeValue(value,spec){
             return 'n' + value;
         case 'date':
             try{
-                return 'd'+ moment(value).toDate().getTime();
+                var d = null;
+                if(isNaN(value)){
+                    d = new Date(value).getTime();
+                }
+                else{
+                    d = new Date(Number(value)).getTime();
+                }
+                return 'd'+ d;
             }
             catch(e){
-                return "";
+                return null;
             }
 
         case 'choice':

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

@@ -1,5 +1,4 @@
 //#import $@projectCode:services/modelService.jsx
-//#import moment.min.js
 //#import excel.js
 //#import $owl_excel_templates:services/modelService.jsx
 //#import $owl_task_info:services/modelService.jsx
@@ -33,7 +32,19 @@ function normalizeValue(value,spec){
         case 'number':
             return 'n' + value;
         case 'date':
-            return 'd'+ moment(value).toDate().getTime();
+            try{
+                var d = null;
+                if(isNaN(value)){
+                    d = new Date(value).getTime();
+                }
+                else{
+                    d = new Date(Number(value)).getTime();
+                }
+                return 'd'+ d;
+            }
+            catch(e){
+                return null;
+            }
         case 'choice':
             for(var i=0; i<spec.options.length; i++){
                 var option = spec.options[i];

package/package.json

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