owl-cli 6.123.0 → 6.125.0

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

@@ -215,7 +215,7 @@ var @projectCodeService = (function (pigeon) {
                 }
 
                 //对于unique的字段，检查有没有重复
-                if (field.unique === 'true') {
+                if (field.unique === 'true' && value) {
                     if (f.isDuplicated(data.id, field.key, value)) {
                         $.log("duplicated,key=" + field.key + ",value=" + value + ",call removeUniqueValue(data.id, field.key, value)");
                         return {'state': 'err', msg: field.fieldLabel + '不能重复。' + value, code: 'duplicated'}
@@ -274,7 +274,7 @@ var @projectCodeService = (function (pigeon) {
 
                     if(value && typeof(value)=='string'){
                         if (f.isDuplicated(data.id, field.key, value)) {
-                            throw {'state': 'err', msg: field.fieldLabel + '不能重复。', code: 'duplicated'}
+                            throw {'state': 'err', msg: field.fieldLabel + '不能重复。value=' + value, code: 'duplicated'}
                         }
 
                         //对于没有重复的数据，保存起来
@@ -543,9 +543,11 @@ var @projectCodeService = (function (pigeon) {
                 throw JSON.stringify(ret);
             }
 
+            if(data.__force !== 'T'){
+                data['owl_createTime'] = new Date().getTime();
+                data['owl_modifyTime'] = new Date().getTime();
+            }
 
-            data['owl_createTime'] = new Date().getTime();
-            data['owl_modifyTime'] = new Date().getTime();
             data['_v'] = 0
             data['_t'] = spec['_t']
             try {
@@ -668,7 +670,11 @@ var @projectCodeService = (function (pigeon) {
                 obj['_v'] = obj['_v'] + 1
                 f.validate(obj, env)
                 data._v = obj._v
-                obj.owl_modifyTime=new Date().getTime();
+                if(obj.__force!=='T'){
+                    //如果__force为T，则不更新时间，这代表了强制更新，可以用于数据迁移的场景，希望更新时间保留为旧系统时间
+                    obj.owl_modifyTime=new Date().getTime();
+                }
+
                 EventBusService.fire(spec['_t'] + '_update_before', {old: oldObj, data: obj, env: env})
                 f.addToList(obj)
                 f.removeUniqueFields(oldObj, env)

package/package.json

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