@steedos/standard-object-database 2.6.1-beta.7 → 2.6.2-beta.2

package/main/default/triggers/object_actions.trigger.js

@@ -1,13 +1,14 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-28 11:07:57
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-07-29 11:26:31
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-10-16 13:58:22
  * @Description: 
  */
 const InternalData = require('@steedos/standard-objects').internalData;
 const objectql = require('@steedos/objectql');
 const auth = require("@steedos/auth");
+const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 module.exports = {
     beforeInsert: async function(){
         const { doc } = this;
@@ -94,5 +95,8 @@ module.exports = {
                 }
             }
         }
+    },
+    afterDelete: async function(){
+        await sleep(1000 * 2);
     }
 }

package/main/default/triggers/object_fields.trigger.js

@@ -222,16 +222,34 @@ module.exports = {
         if(!objectName && filters._id && filters._id.indexOf(".") > -1){
             objectName = filters._id.split('.')[0];
         }
-        if(objectName){
+        if(objectName){ 
             let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
             if(fields){
                 _.each(fields, (field)=>{
-                    this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
+                    if(!_.find(this.data.values, (item)=>{
+                        return item.object == field.object && item.name == field.name
+                    })){
+                        this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
+                    }
                 })
                 // this.data.values = this.data.values.concat(fields)
                 this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, this.spaceId);
             }
         }
+
+        const dbSystemField = _.find(this.data.values, (field)=>{return field.is_system && field._id && field._id.indexOf('.') == -1})
+        if(dbSystemField){
+            const obj = await InternalData.getObject(dbSystemField.object, this.userId)
+            if(obj){
+                this.data.values = _.map(this.data.values, (item)=>{
+                    if(item.is_system){
+                        return Object.assign(item, _.find(obj.fields, (field)=>{return field.name === item.name}))
+                    }else{
+                        return item;
+                    }
+                })
+            }
+        }
     },
     beforeFind: async function(){
         const { query } = this;
@@ -241,6 +259,9 @@ module.exports = {
         if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'name')){
             query.fields.push('name')
         }
+        if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'type')){
+            query.fields.push('type')
+        }
     },
     beforeAggregate: async function(){
         const { query } = this;
@@ -327,7 +348,12 @@ module.exports = {
         }
         if(["parent","children"].indexOf(dbDoc._name) > -1){
             let isImportField = false;
-            if(doc._name !== dbDoc._name || doc.type !== dbDoc.type || doc.object !== dbDoc.object || doc.reference_to !== dbDoc.reference_to || !!doc.multiple !== !!dbDoc.multiple || ("children" === dbDoc._name && doc.omit !== true)){
+            if((doc._name != undefined && doc._name !== dbDoc._name) || 
+                (doc.type != undefined && doc.type !== dbDoc.type) || 
+                (doc.object != undefined && doc.object !== dbDoc.object) || 
+                (doc.reference_to != undefined && doc.reference_to !== dbDoc.reference_to) || 
+                (doc.multiple != undefined && !!doc.multiple !== !!dbDoc.multiple) || 
+                (doc.omit != undefined && ("children" === dbDoc._name && doc.omit !== true))){
                 isImportField = true;
             }
             if(isImportField){
@@ -353,16 +379,16 @@ module.exports = {
         const obj = this.getObject(object_name);
         const latestDoc = await obj.findOne(id);
         // !!!暂不允许修改name
-        if (_.has(doc, '_name')) {
-            const newFieldName = doc._name;
-            if (newFieldName &&  (latestDoc._name != newFieldName)) {
-                throw new Error('禁止修改字段名。');
-            }
-        }
+        // if (_.has(doc, '_name')) {
+        //     const newFieldName = doc._name;
+        //     if (newFieldName &&  (latestDoc._name != newFieldName)) {
+        //         throw new Error('禁止修改字段名。');
+        //     }
+        // }
         // !!!暂不允许修改字段类型
         if (_.has(doc, 'type')) {
             const newFieldType = doc.type;
-            if (newFieldType &&  (latestDoc.type != newFieldType)) {
+            if (latestDoc.type && newFieldType &&  (latestDoc.type != newFieldType)) {
                 throw new Error('禁止修改字段类型。');
             }
         }
@@ -373,5 +399,36 @@ module.exports = {
         if( ["parent","children"].indexOf(field.name) > -1 && enable_tree ){
             throw new Meteor.Error(500, "启用树状结构显示记录的对象不能删除parent、children字段。");
         }
+    },
+
+    afterInsert: async function () {
+        const { doc } = this;
+        const { type, name, object: objectName } = doc;
+        // 如果是地理位置字段，则需立即创建索引，否则mongodb查询地理位置字段时会报错 'unable to find index for $geoNear query' on server'
+        if (type === 'location') {
+            const defaultAdapter = objectql.getDataSource('default').adapter
+            await defaultAdapter.connect();
+            const collection = defaultAdapter.collection(objectName);
+
+            try {
+                const indexInfo = {
+                    key: {
+                        [`${name}.wgs84`]: "2dsphere"
+                    },
+                    name: `c2_${name}_wgs84`,
+                    unique: false,
+                    sparse: false,
+                    background: true
+                }
+                const key = indexInfo.key;
+                try {
+                    await collection.createIndex(key, indexInfo)
+                } catch (error) {
+                    // DO NOTHING
+                }
+            } catch (error) {
+                console.error(error)
+            }
+        }
     }
 }

package/main/default/triggers/object_listviews.trigger.js

@@ -1,6 +1,7 @@
 const InternalData = require('@steedos/standard-objects').internalData;
 const util = require('@steedos/standard-objects').util;
 const objectql = require('@steedos/objectql');
+const auth = require("@steedos/auth");
 
 const getInternalListviews = async function(sourceListviews, filters, is_system){
     let collection = await objectql.getObject("object_listviews");
@@ -21,6 +22,16 @@ const getInternalListviews = async function(sourceListviews, filters, is_system)
 
 module.exports = {
     beforeInsert: async function () {
+        const { userId, spaceId } = this;
+        if(userId && spaceId){
+            const userSession = await auth.getSessionByUserId(userId, spaceId);
+            if(userSession){
+                const { allowCreateListViews } = await objectql.getObject("object_listviews").getUserObjectPermission(userSession, false);
+                if(!allowCreateListViews){
+                    throw new Error('没有权限创建视图')
+                }
+            }
+        }
         if (!this.doc.name) {
             this.doc.name = 'listview_' + this.doc._id.toLowerCase();
         }
@@ -29,10 +40,6 @@ module.exports = {
     beforeUpdate: async function () {
         const oldDoc = await objectql.getObject(this.object_name).findOne(this.id)
         let name = oldDoc.name,object_name = oldDoc.object_name;
-        
-        if (!this.doc.name) {
-            this.doc.name = 'listview_' + this.id.toLowerCase();
-        }
 
         if(_.has(this.doc, 'name')){
             name = this.doc.name

package/main/default/triggers/objects.trigger.js

@@ -36,28 +36,6 @@ module.exports = {
             }
         })
     },
-    afterAggregate: async function(){
-        let userId = this.userId
-        let spaceId = this.spaceId;
-        for (const doc of this.data.values) {
-            doc.fields =  Object.assign({}, doc.fields, await InternalData.getDefaultSysFields(doc.name, userId)) ;
-        }
-        // this.data.values = this.data.values.concat(await InternalData.findObjects(userId, this.query.filters));
-
-        this.data.values = this.data.values.concat(await InternalData.getObjects(userId));
-
-        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-        
-        _.each(this.data.values, function(value){
-            if(value){
-                delete value.actions;
-                delete value.fields;
-                delete value.list_views;
-                delete value.permission_set;
-                delete value.triggers;
-            }
-        })
-    },
     afterCount: async function(){
         let userId = this.userId
         let spaceId = this.spaceId;
@@ -134,9 +112,9 @@ module.exports = {
             const latestDoc = await obj.findOne(id);
             const newObjName = doc.name;
             // !!!暂不允许修改name
-            if (newObjName &&  (latestDoc.name != newObjName)) {
-                throw new Error('禁止修改API 名称。');
-            }
+            // if (newObjName &&  (latestDoc.name != newObjName)) {
+            //     throw new Error('禁止修改API 名称。');
+            // }
             /*
             if (newObjName &&  (latestDoc.name != newObjName) && latestDoc.datasource === 'default') {
                 const datasource = objectql.getDataSource(latestDoc.datasource);
@@ -169,7 +147,7 @@ module.exports = {
         }
         */
 
-        await sleep(1000 * 2)
+        // await sleep(1000 * 2)
     },
     afterDelete: async function(){
         const { previousDoc: object, spaceId } = this;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.6.1-beta.7",
+    "version": "2.6.2-beta.2",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+    "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }

package/package.service.js

@@ -1,21 +1,25 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-12-09 13:41:16
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-30 10:13:13
  * @Description: 
  */
 "use strict";
 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');
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
 module.exports = {
 	name: packageName,
 	namespace: "steedos",
-	mixins: [packageLoader],
+	mixins: [packageLoader, serviceObjectMixin],
 	/**
 	 * Settings
 	 */
@@ -36,7 +40,86 @@ module.exports = {
 	 * Actions
 	 */
 	actions: {
+		...triggers,
+
+		objects__upsert: {
+			graphql: {
+				mutation:
+				"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;
+                return this.objectsUpsert(id, doc, userSession)
+			},
+		},
+		object_fields__upsert: {
+			graphql: {
+				mutation:
+				"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 = '';
+                if (_.isString(doc)) {
+                    data = JSON.parse(doc);
+                } else {
+                    data = JSON.parse(JSON.stringify(doc));
+                }
+                delete data.space;
+
+				
+				
+				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;
+					}else{
+						const newId = await object._makeNewID();
+						const now = new Date();
+						await object.directInsert(Object.assign({}, data, {
+							_id: newId,
+							name: data._name || fieldName,
+							owner: userSession.userId,
+							space: userSession.spaceId,
+							object: objectName,
+							created: now,
+							modified: now,
+							created_by: userSession.userId,
+							modified_by: userSession.userId,
+							company_id: userSession.company_id,
+							company_ids: userSession.company_ids,
+							is_system: true
+						}));					
+						id = newId;
+					}
+				}
+				if(data.is_system){
+					// 'label' 先禁止编辑label , 目前由于i18n的问题导致 label无效.
+					data = _.pick(data, ['defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required', 'unique', 'readonly', 'hidden', 'deleted_lookup_record_behavior']);
+				}
+                return object.update(id, data, userSession)
+			},
+		},
 	},
 
 	/**
@@ -50,7 +133,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)
+			}
+		}
 	},
 
 	/**

package/src/triggers/index.js

@@ -0,0 +1,11 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2023-11-01 10:47:02
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-04 16:05:05
+ * @FilePath: /steedos-platform-2.3/services/standard-object-database/src/triggers/index.js
+ * @Description: 
+ */
+module.exports = {
+    object_fields_trigger_create_index: require('./object_fields_trigger_create_index'),
+} 

package/src/triggers/object_fields_trigger_create_index.js

@@ -0,0 +1,58 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2023-11-01 10:47:47
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-08 16:08:35
+ * @FilePath: /steedos-platform-2.3/services/standard-object-database/src/triggers/object_fields_trigger_create_index.js
+ * @Description: 当管理员新建/编辑字段时勾选了创建索引/创建唯一索引，保存后立即创建索引 https://github.com/steedos/steedos-platform/issues/5650
+ */
+module.exports = {
+    trigger: {
+        listenTo: 'object_fields',
+        when: [
+            'afterInsert',
+            'afterUpdate',
+        ],
+    },
+    async handler(ctx) {
+        const { isInsert, isUpdate, isDelete, isFind, isBefore, isAfter, id, doc, previousDoc, size, userId, spaceId, objectName, query, data } = ctx.params;
+
+        if (isAfter) {
+            if (isInsert) {
+                const { index, unique, object, name } = doc
+                if (object && (index || unique)) {
+                    const obj = this.getObject(object)
+                    setTimeout(async function () {
+                        await obj.createIndex(name)
+                    }, 6000) // 等待对象重新加载
+                }
+            }
+            if (isUpdate) {
+                const fieldObj = this.getObject(objectName)
+                const newDoc = await fieldObj.findOne(id)
+                const { index, unique, object, name } = newDoc
+                const { index: preIndex, unique: preUnique } = previousDoc
+                // 判断是否修改了索引
+                if (object) {
+                    const obj = this.getObject(object)
+                    if ((index || unique) && ((preIndex != index && !unique) || preUnique != unique)) {
+                        setTimeout(async function () {
+                            if ((preIndex || preUnique) && ((preIndex != index && !unique) || preUnique != unique)) { // 之前勾选过，现在调整了
+                                await obj.dropIndex(name)
+                            }
+                            await obj.createIndex(name)
+                        }, 6000)
+                    }
+                    // 取消勾选，删除索引
+                    if ((!index && !unique) && (preIndex || preUnique)) {
+                        setTimeout(async function () {
+                            await obj.dropIndex(name)
+                        }, 6000)
+                    }
+                }
+
+
+            }
+        }
+    }
+}

package/main/default/objects/object_layouts/buttons/standard_edit.button.yml

@@ -1,44 +0,0 @@
-name: standard_edit
-amis_schema: |-
-  {
-    "type": "service",
-    "body": [
-        {
-            "type": "button",
-            "label": "编辑",
-            "id": "u:standard_edit",
-            "onEvent": {
-                "click": {
-                    "actions": [
-                        {
-                            "actionType": "custom",
-                            "script": "const appId = null;\nconst page = Steedos.Page.getPage('form', appId, null, null, \"object_layouts\");\nif (page && page.schema) {\n  const pageSchema = JSON.parse(page.schema);\n  let formSchema = pageSchema.body[0];\n  // 设置form的canAccessSuperData属性防止弹出窗口从父级取字段默认值\n  formSchema.canAccessSuperData = false;\n  // 设置form的wrapWithPanel属性隐藏其底部保存取消按钮\n  formSchema.wrapWithPanel = false;\n  formSchema.className = \"steedos-amis-form\";\n  const title = \"编辑 页面布局\";\n  doAction({\n    \"actionType\": \"dialog\",\n    \"dialog\": {\n      \"type\": \"dialog\",\n      \"title\": title,\n      \"body\": [formSchema],\n      \"size\": \"lg\"\n    }\n  });\n}"
-                        }
-                    ],
-                    "weight": 0
-                }
-            },
-            "className": ""
-        }
-    ],
-    "regions": [
-        "body"
-    ],
-    "data": {
-        "context": {
-            "rootUrl": "http://127.0.0.1:5000"
-        },
-        "app_id": "",
-        "tab_id": "",
-        "object_name": "",
-        "dataComponentId": "",
-        "record_id": "",
-        "record": {},
-        "permissions": {}
-    },
-    "bodyClassName": "p-0"
-  }
-is_enable: true
-label: 编辑
-'on': record_only
-type: amis_button

package/main/default/pages/object_fields.page.amis.json

@@ -1,42 +0,0 @@
-{
-    "type": "page",
-    "body": [
-      {
-        "type": "steedos-object-form",
-        "label": "对象表单",
-        "objectApiName": "object_fields",
-        "recordId": "${recordId}",
-        "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 bg-white p-4",
-        "id": "u:b3d626885b90",
-        "mode": "edit",
-        "layout": "normal",
-        "enableTabs": true,
-        "onEvent": {
-          "change": {
-            "actions": [
-              {
-                "actionType": "setValue",
-                "args": {
-                  "value": {
-                    "defaultValue": ""
-                  }
-                },
-                "expression": "${!!event.data.defaultValue_formula}"
-              }
-            ]
-          }
-        },
-        "initApiAdaptor": "const defaultValue_field_value = payload.data.defaultValue; if(defaultValue_field_value && _.isString(defaultValue_field_value) && defaultValue_field_value.indexOf('{')>-1 ){ payload.data.defaultValue_formula = defaultValue_field_value; delete payload.data.defaultValue; } return payload;",
-        "apiRequestAdaptor": "if(formData.defaultValue_formula){ formData.defaultValue = formData.defaultValue_formula }  __saveData = JSON.stringify(JSON.stringify(formData)); api.data = {query: query.replace('{__saveData}', __saveData)};"
-      }
-    ],
-    "regions": [
-      "body"
-    ],
-    "data": {
-      "objectName": "object_fields"
-    },
-    "name": "page_object_fields_form",
-    "bodyClassName": "",
-    "id": "u:6e9674f278b0"
-}