@steedos/standard-object-database 2.5.19-beta.5 → 2.5.19

package/main/default/objects/object_fields.object.js

@@ -454,6 +454,34 @@ var triggers = {
       if(!allowChangeObject()){
         throw new Meteor.Error(500, "华炎云服务不包含自定义业务对象的功能，请部署私有云版本");
       }
+
+      const staticRequiredFields = ['object','label','_name','type'];
+      // const staticRequiredFieldLabel = ['所属对象','显示名称','字段名','字段类型'];
+      for(let i = 0; i<staticRequiredFields.length; i++){
+        const fieldName = staticRequiredFields[i];
+        const fieldValue = doc[fieldName];
+        if(!fieldValue){
+          throw new Meteor.Error(fieldName, "必填字段");
+        }
+      }
+      //  options子字段、precision、scale、summary_field不参与以下简单动态必填字段组。
+      const dynamicsRequired = [
+        ['language',['code']],['reference_to',['lookup', 'master_detail']],['formula',['autonumber', 'formula']],
+        ['data_type',['formula']],['rows',['textarea']],['options',['select']],
+        ['formula_blank_value',['formula']],['summary_object',['summary']],['summary_type',['summary']],
+        ['deleted_lookup_record_behavior',['lookup']]
+      ];
+
+      for(let i = 0; i<dynamicsRequired.length; i++){
+        if( dynamicsRequired[i][1].indexOf(doc.type) > -1 ){
+          const fieldName = dynamicsRequired[i][0];
+          const fieldValue = doc[fieldName];
+          if(!fieldValue){
+            throw new Meteor.Error(fieldName, "动态必填字段");
+          }
+        }
+      }
+
       checkName(doc._name);
       if(['name','owner','parent','children'].indexOf(doc._name)>-1){
         doc.name = doc._name;

package/main/default/objects/object_fields.object.yml

@@ -236,7 +236,7 @@ fields:
     reference_to: objects
     reference_to_field: name
     visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
-    required: "{{['master_detail'].indexOf(formData.type) > -1 ? true: false}}"
+    required: "{{['lookup','master_detail'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 180
     amis:
       menuTpl: "<div>${label}(${value})</div>"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.19-beta.5",
+    "version": "2.5.19",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "32cd0c5ebc7aaadcf12488585e62f7f3851ce2d4"
+    "gitHead": "f45f110239267697485b421285e61ca020e4779b"
 }