owl-cli 6.63.0 → 6.65.0

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

@@ -59,11 +59,10 @@ function diffArray(a1, a2,parentKeys){
 
     for(var i=0; i<a2.length; i++){
         var r2 = a2[i];
-        if(!r2){
-            a2[i] = {};
-            r2 = a2[i];
+        if(isScalar(r2)){
+           delete r2._matched;
         }
-        delete r2._matched;
+
     }
 
     for(var i=0; i<a1.length; i++){

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

@@ -61,7 +61,26 @@
       var newdata = @projectCodeService.add( modelObject,env );
     }
     else {
+
       modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
+      //修复_orgIds
+      var _orgIds = [];
+      if(modelObject._orgIds){
+        modelObject._orgIds.forEach(function(orgId){
+          if(typeof orgId === 'string'){
+            _orgIds.push(orgId);
+            if(_orgIds.indexOf(orgId)===-1){
+              _orgIds.push(orgId);
+            }
+          }
+          else{
+            if(_orgIds.indexOf('0')===-1) {
+              _orgIds.push('0');
+            }
+          }
+        });
+      }
+      modelObject._orgIds = _orgIds;
       diffResult = diff(oldObj,modelObject,"");
       if(roleId!=='internal') {
         checkUpdatePermission(modelObject, diffResult, permissions, orgId);

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

@@ -345,7 +345,13 @@ var @projectCodeService = (function (pigeon) {
                         return value
                     }
                 case 'date':
-                    return moment(value)
+                    try{
+                        return moment(value);
+                    }
+                    catch(e){
+                        return null;
+                    }
+
                 case 'choice':
                     return value
                 default:

package/package.json

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