@steedos/standard-object-database 3.0.0-beta.2 → 3.0.0-beta.8

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

@@ -1,8 +1,6 @@
-const InternalData = require('@steedos/standard-objects').internalData;
 const _ = require('underscore');
 const objectql = require('@steedos/objectql');
 const objectTree = require('../server/objects.tree.js');
-const clone = require('clone');
 const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
 module.exports = {
@@ -13,57 +11,7 @@ module.exports = {
     beforeAggregate: async function () {
         delete this.query.fields;
     },
-
-    afterFind: async function(){
-        let userId = this.userId
-        let spaceId = this.spaceId;
-
-        let filters = InternalData.parserFilters(this.query.filters);
-
-        _.each(this.data.values, (item)=>{
-            item.is_customize = true
-        })
-
-        let cloneValues = clone(this.data.values, false);
-
-        if(filters.is_customize){
-            const dbObjects = await objectql.getObject('objects').directFind({space: spaceId});
-            _.each(dbObjects, (item)=>{
-                item.is_customize = true
-            })
-            cloneValues = cloneValues.concat(dbObjects);
-        }
-
-        cloneValues = cloneValues.concat(await InternalData.getObjects(userId));
-
-        this.data.values = objectql.getSteedosSchema().metadataDriver.find(cloneValues, 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;
-        let filters = InternalData.parserFilters(this.query.filters);
-        if(filters.is_customize){
-            const dbObjects = await objectql.getObject('objects').directFind({space: spaceId});
-            return this.data.values = dbObjects.length;
-        }
-        this.data.values = this.data.values + objectql.getSteedosSchema().metadataDriver.count(await InternalData.getObjects(userId), this.query, spaceId);
-    },
     afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            this.data.values = await InternalData.getObject(this.id, this.userId);
-        }else{
-            this.data.values.is_customize = true
-        }
         if(this.data.values){
             delete this.data.values.actions;
             delete this.data.values.fields;
@@ -130,26 +78,6 @@ module.exports = {
     beforeUpdate: async function () {
         const { doc, id, object_name } = this;
         delete doc.is_customize
-        // 如果用户修改了apiname，则校验 数据源必须一致为default数据源；且数据库中不能有新的apiname对应的表
-        if (_.has(doc, 'name')) {
-            const obj = this.getObject(object_name);
-            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) && latestDoc.datasource === 'default') {
-                const datasource = objectql.getDataSource(latestDoc.datasource);
-                const isExitsRecords = await datasource.isCollectionExitsRecords(newObjName);
-                // 如果新表中存在记录则抛错，提示用户
-                if (isExitsRecords) {
-                    throw new Error(`${newObjName} 在库中已存在记录，不予进行。`);
-                }
-            }
-            */
-        }
     },
     afterUpdate: async function () {
         const { doc, previousDoc } = this;
@@ -158,20 +86,6 @@ module.exports = {
             // doc中缺少owner,space等字段值，需要从previousDoc中取到一起带过去
             await objectTree.insertParentAndChildrenFieldForTreeObject(Object.assign({}, previousDoc, doc), true)
         }
-        /*
-        const { doc, previousDoc, id, object_name } = this;
-        const obj = this.getObject(object_name);
-        const latestDoc = await obj.findOne(id);
-        // 对象的apiname修改后调整库中的表名
-        if (latestDoc.name && (latestDoc.name != previousDoc.name) && previousDoc.datasource === latestDoc.datasource && latestDoc.datasource === 'default'){
-            const newObjName = latestDoc.name;
-            const oldObjName = previousDoc.name;
-            const datasource = objectql.getDataSource(latestDoc.datasource);
-            await datasource.renameCollection(newObjName, oldObjName)
-        }
-        */
-
-        // 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": "3.0.0-beta.2",
+    "version": "3.0.0-beta.8",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -11,15 +11,13 @@
     ],
     "description": "steedos package",
     "dependencies": {
-        "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "3.0.0-beta.2",
-        "@steedos/service-object-mixin": "3.0.0-beta.2",
-        "@steedos/standard-objects": "3.0.0-beta.2",
+        "@steedos/metadata-core": "3.0.0-beta.8",
+        "@steedos/service-object-mixin": "3.0.0-beta.8",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74"
+    "gitHead": "723d92765db5342a374c7aacb5b835e69f77ca4b"
 }

package/package.service.js

@@ -2,21 +2,18 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-10-10 15:58:37
+ * @LastEditTime: 2025-03-06 10:44:43
  * @Description: 
  */
 "use strict";
 const project = require('./package.json');
 const packageName = project.name;
-const packageLoader = require('@steedos/service-meteor-package-loader');
+const packageLoader = require('@steedos/service-package-loader');
 const serviceObjectMixin = require('@steedos/service-object-mixin');
 const validator = require('validator');
 const triggers = require('./src/triggers');
-const { checkAPIName } = require('@steedos/standard-objects').util
-
-const { customAlphabet } = require('nanoid');
-const { group } = require('console');
-const nanoid = customAlphabet('1234567890abcdef', 10)
+const { checkAPIName } = require('@steedos/objectql')
+const _ = require('lodash');
 
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
@@ -136,476 +133,7 @@ module.exports = {
 				const { objectName, fieldName, fieldValue, recordId, filters } = ctx.params;
 				await checkAPIName(objectName, fieldName, fieldValue, recordId, filters)
 			}
-		},
-		create_object: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/objects/create_by_design"
-			},
-			async handler(ctx) {
-				const { appId, groupId, name, label, icon } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return;
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return ;
-				}
-
-				// 1 创建对象
-				const obj = await this.getObject('objects').insert({
-					name: name || `o_${nanoid(5)}`,
-					label: label || '未命名对象',
-					datasource: 'default',
-					icon: icon || 'account'
-				}, userSession);
-				
-				
-				const tab_items = app.tab_items || {};
-				tab_items[`object_${obj.name.replace(/__c$/, "")}`] = {
-					group: groupId
-				}
-
-				await this.getObject('apps').update(app._id, {
-					tab_items
-				}, userSession);
-				
-				return obj;
-			}
-		},
-		create_app_group: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/create_app_group_by_design"
-			},
-			async handler(ctx) {
-				const { appId, name, defaultOpen, oldName } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return {};
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return {};
-				}
-
-				await this.getObject('apps').update(app._id, {
-					$push: {
-						tab_groups: {
-							group_name: name,
-							default_open: defaultOpen
-						}
-					}
-				}, userSession);
-				
-				return {};
-			}
-		},
-		update_app_group: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/update_app_group_by_design"
-			},
-			async handler(ctx) {
-				const { appId, name, defaultOpen, oldName } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!oldName){
-					return {}
-				}
-
-				if(!appId){
-					return {};
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return {};
-				};
-
-				const tab_groups = app.tab_groups;
-
-				const tab_items = app.tab_items;
-
-				_.each(tab_groups, (tGroup)=>{
-					if(tGroup.group_name == oldName){
-						tGroup.group_name = name;
-						tGroup.default_open = defaultOpen
-					}
-				});
-
-
-				_.each(tab_items, (tItem, key)=>{
-					if(tItem.group === oldName){
-						tab_items[key] = {
-							group: name
-						}
-					}
-				})
-
-				await this.getObject('apps').update(app._id, {
-					tab_groups, tab_items
-				}, userSession);
-				
-				return {};
-			}
-		},
-		create_by_design: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/create_by_design"
-			},
-			async handler(ctx) {
-				const { code, name, icon } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!code || !name){
-					return {};
-				}
-
-				return await this.getObject('apps').insert({
-					name: name,
-					code: code,
-					sort : 9100,
-					is_creator : true,
-					mobile : true,
-					visible : true,
-					showSidebar : true,
-					icon_slds : icon || "account",
-				}, userSession);
-			}
-		},
-		update_app_by_design: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/update_app_by_design"
-			},
-			async handler(ctx) {
-				const { appId, tab_groups, tab_items } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return {};
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return {};
-				}
-
-				await this.getObject('apps').update(app._id, {
-					tab_groups: tab_groups,
-					tab_items: tab_items
-				}, userSession);
-				
-			}
-		},
-		update_app_tabs_by_design: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/update_app_tabs_by_design"
-			},
-			async handler(ctx) {
-				const { appId, addTabNames, groupId } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return {};
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return {};
-				}
-
-				const tab_items = app.tab_items || {};
-
-				_.each(addTabNames, (tabName)=>{
-					if(tabName){
-						tab_items[tabName] = {
-							group: groupId
-						}
-					}
-				})
-
-				await this.getObject('apps').update(app._id, {
-					tab_items
-				}, userSession);
-				
-			}
-		},
-		create_link_tab_by_design: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/tabs/create_link_tab_by_design"
-			},
-			async handler(ctx) {
-				const { appId, groupId, name, label, icon, url } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return;
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return ;
-				}
-
-				const tab = await this.getObject('tabs').insert({
-					name: name || `t_${nanoid(5)}`,
-					label: label || '未命名选项卡',
-					icon: icon || 'account',
-					mobile : true,
-					desktop : true,
-					is_new_window : false,
-					is_use_iframe : true,
-					type : "url",
-					url : url,
-				}, userSession);
-				
-				
-				const tab_items = app.tab_items || {};
-				tab_items[tab.name] = {
-					group: groupId
-				}
-				await this.getObject('apps').update(app._id, {
-					tab_items
-				}, userSession);
-				
-				return tab;
-			}
-		},
-		update_link_tab_by_design: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/tabs/update_link_tab_by_design"
-			},
-			async handler(ctx) {
-				const { appId, groupId, name, label, icon, url } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return;
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return ;
-				}
-
-				const dbTab = await this.getObject('tabs').find({
-					filters: ['name', '=', name]
-				}, userSession);
-
-				if(dbTab.length > 0){
-					const tab = await this.getObject('tabs').update(dbTab[0]._id, {
-						name: name,
-						label: label,
-						icon: icon,
-						url : url,
-					}, userSession);
-					return tab;
-				}
-				return dbTab;
-			}
-		},
-		create_page_by_design: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/pages/create_page_by_design"
-			},
-			async handler(ctx) {
-				const { appId, groupId, name, label, icon } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return;
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return ;
-				}
-
-				const page = await this.getObject('pages').insert({
-					name: name || `t_${nanoid(5)}`,
-					label : label,
-					is_active : true,
-					render_engine : "amis",
-					type : "app"
-				}, userSession);
-				
-				const tab = await this.getObject('tabs').insert({
-					name: `page_${page.name}`,
-					mobile : true,
-					desktop : true,
-					is_new_window : false,
-					is_use_iframe : false,
-					icon : icon,
-					type : "page",
-					label : label,
-					page : page.name,
-				}, userSession);
-				
-				
-				const tab_items = app.tab_items || {};
-				tab_items[tab.name] = {
-					group: groupId
-				}
-				await this.getObject('apps').update(app._id, {
-					tab_items
-				}, userSession);
-				
-				return page;
-			}
-		},
-		delete_app_tab: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/delete_app_tab"
-			},
-			async handler(ctx) {
-				const { appId, tabName } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return;
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return ;
-				}
-				
-				
-				const tab_items = app.tab_items || {};
-
-				delete tab_items[tabName]
-
-				await this.getObject('apps').update(app._id, {
-					tab_items
-				}, userSession);
-				
-				return app;
-			}
-		},
-		delete_app_group: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/delete_app_group"
-			},
-			async handler(ctx) {
-				const { appId, groupName } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return;
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return ;
-				}
-				
-				const tab_groups = app.tab_groups || [];
-				const newTabGroups = [];
-				
-				_.each(tab_groups, (tGroup)=>{
-					if(tGroup.group_name != groupName){
-						newTabGroups.push(tGroup);
-					}
-				});
-				await this.getObject('apps').update(app._id, {
-					tab_groups: newTabGroups
-				}, userSession);
-				
-				return app;
-			}
-		},
-		move_app_tab: {
-			rest: {
-				method: "POST",
-                fullPath: "/service/api/apps/move_app_tab"
-			},
-			async handler(ctx) {
-				const { appId, tabName, groupName, oldGroupName } = ctx.params;
-				const userSession = ctx.meta.user;
-
-				if(!appId){
-					return;
-				}
-
-				const records = await this.getObject('apps').find({
-					filters: ['code', '=', appId]
-				});
-				const app = records.length > 0 ? records[0] : null;
-
-				if(!app){
-					return ;
-				}
-				
-				
-				const tab_items = app.tab_items || {};
-
-				_.each(tab_items, (item, k)=>{
-					if(k === tabName){
-						tab_items[k].group = groupName == 0 ? '' : groupName
-					}
-				})
-
-				await this.getObject('apps').update(app._id, {
-					tab_items
-				}, userSession);
-				
-				return app;
-			}
-		},
+		}
 	},
 
 	/**

package/src/triggers/object_fields_trigger_create_index.js

@@ -23,7 +23,11 @@ module.exports = {
                 if (object && (index || unique)) {
                     const obj = this.getObject(object)
                     setTimeout(async function () {
-                        await obj.createIndex(name)
+                        try {
+                            await obj.createIndex(name)
+                        } catch (error) {
+                            console.error(error)
+                        }
                     }, 6000) // 等待对象重新加载
                 }
             }

package/main/default/client/datasources.client.js

@@ -1,7 +0,0 @@
-Meteor.startup(function() {
-    return Tracker.autorun(function(c) {
-      if (Session.get("spaceId")) {
-        return Meteor.subscribe("datasources", Session.get("spaceId"));
-      }
-    });
-  });