@steedos/standard-object-database 2.5.19-beta.4 → 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>"
@@ -705,7 +705,7 @@ fields:
     visible_on: "{{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false: true}}"
     sort_no: 272
     amis:
-      disabledOn: "${is_system == true}"
+      # disabledOn: "${is_system == true}"
       onEvent:
         change:
           weight: 0
@@ -818,7 +818,7 @@ fields:
   enable_enhanced_lookup:
     type: boolean
     label: Enable Enhanced Lookup
-    visible_on: "{{false}}"
+    hidden: true # 这里不可以用 visible_on: "{{false}}"，否则在界面上新建字段时会被默认设置为false
 paging:
   enabled: false
 list_views:

package/package.json

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

package/package.service.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-11-04 16:05:25
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-11-10 16:53:59
  * @Description: 
  */
 "use strict";
@@ -10,7 +10,7 @@ const project = require('./package.json');
 const packageName = project.name;
 const packageLoader = require('@steedos/service-meteor-package-loader');
 const serviceObjectMixin = require('@steedos/service-object-mixin');
-
+const validator = require('validator');
 const triggers = require('./src/triggers');
 
 /**
@@ -48,48 +48,12 @@ module.exports = {
 				"objects__upsert(id: String, doc: JSON): objects"
 			},
 			async handler(ctx) {
+				if(validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true) == true){
+					throw new Error('No permission')
+				}
 				const userSession = ctx.meta.user;
                 let { id, doc } = ctx.params;
-                let data = '';
-                if (_.isString(doc)) {
-                    data = JSON.parse(doc);
-                } else {
-                    data = JSON.parse(JSON.stringify(doc));
-                }
-
-				if(data.form && _.isString(data.form)){
-					data.form = JSON.parse(data.form)
-				}
-
-                delete data.space;
-
-				if(data.is_system){
-					data = _.pick(data, ['label', 'icon', 'enable_files', 'enable_tasks', 'enable_notes', 'enable_events', 'enable_workflow', 'enable_instances', 'enable_inline_edit', 'enable_tree', 'enable_enhanced_lookup', 'description', 'is_deleted'])
-				}
-				
-				const object = await this.getObject('objects');
-				const dbRecord = await object.directFind({filters: ['_id','=',id]});
-				if(dbRecord.length === 0){
-					// const newId = await object._makeNewID();
-					const now = new Date();
-					await object.directInsert(Object.assign({}, data, {
-						// _id: newId,
-						_id: id, // saas模式不支持修改对象
-						owner: userSession.userId,
-						space: userSession.spaceId,
-						created: now,
-						modified: now,
-						created_by: userSession.userId,
-						modified_by: userSession.userId,
-						company_id: userSession.company_id,
-						company_ids: userSession.company_ids,
-						extend: data.name,
-						custom: false,
-						is_system: true
-					}));					
-					// id = newId;
-				}
-                return object.update(id, data, userSession)
+                return this.objectsUpsert(id, doc, userSession)
 			},
 		},
 		object_fields__upsert: {
@@ -98,6 +62,9 @@ module.exports = {
 				"object_fields__upsert(id: String, doc: JSON): object_fields"
 			},
 			async handler(ctx) {
+				if(validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true) == true){
+					throw new Error('No permission')
+				}
 				const userSession = ctx.meta.user;
                 let { id, doc } = ctx.params;
                 let data = '';
@@ -108,13 +75,21 @@ module.exports = {
                 }
                 delete data.space;
 
-				if(data.is_system){
-					data = _.pick(data, ['label', 'defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis'])
-				}
+				
 				
 				const object = await this.getObject('object_fields');
 				if(id.indexOf('.') > 0){
 					const [objectName, fieldName] = id.split('.');
+
+					const dbObj = await this.getObject('objects').directFind({filters: ['name','=', objectName]});
+
+					if(dbObj.length === 0){
+						const records = await this.getObject('objects').find({filters: ['name','=', objectName]});
+						if(records.length > 0){
+							this.objectsUpsert(objectName, records[0], userSession)
+						}
+					}
+
 					const dbRecord = await object.directFind({filters: [['object','=',objectName], ['name','=',fieldName]]});
 					if(dbRecord.length > 0){
 						id = dbRecord[0]._id;
@@ -138,6 +113,9 @@ module.exports = {
 						id = newId;
 					}
 				}
+				if(data.is_system){
+					data = _.pick(data, ['label', 'defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required'])
+				}
                 return object.update(id, data, userSession)
 			},
 		},
@@ -154,7 +132,53 @@ module.exports = {
 	 * Methods
 	 */
 	methods: {
+		objectsUpsert: {
+			async handler(id, doc, userSession){
+				let data = '';
+                if (_.isString(doc)) {
+                    data = JSON.parse(doc);
+                } else {
+                    data = JSON.parse(JSON.stringify(doc));
+                }
 
+				if(data.form && _.isString(data.form)){
+					data.form = JSON.parse(data.form)
+				}
+
+                delete data.space;
+				const name = data.name;
+				
+				const object = await this.getObject('objects');
+				const dbRecord = await object.directFind({filters: ['_id','=',id]});
+				if(dbRecord.length === 0){
+					// const newId = await object._makeNewID();
+					const now = new Date();
+					await object.directInsert(Object.assign({}, data, {
+						// _id: newId,
+						_id: id, // saas模式不支持修改对象
+						name: name,
+						owner: userSession.userId,
+						space: userSession.spaceId,
+						created: now,
+						modified: now,
+						created_by: userSession.userId,
+						modified_by: userSession.userId,
+						company_id: userSession.company_id,
+						company_ids: userSession.company_ids,
+						extend: name,
+						custom: false,
+						is_system: true
+					}));					
+					// id = newId;
+				}
+
+				if(data.is_system){
+					data = _.pick(data, ['label', 'icon', 'enable_files', 'enable_tasks', 'enable_notes', 'enable_events', 'enable_workflow', 'enable_instances', 'enable_inline_edit', 'enable_tree', 'enable_enhanced_lookup', 'description', 'is_deleted'])
+				}
+
+                return object.update(id, data, userSession)
+			}
+		}
 	},
 
 	/**