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

package/main/default/client/object_fields.client.js

@@ -1,154 +1,5 @@
 Steedos.ObjectFieldManager = {};
 
-// Steedos.ObjectFieldManager.__lastDoc = null;
-
-// const baseFieldsName = [{ "name": "object", "required": true }, { "name": "label", "required": true }, {name: '_name', required: true}, { "name": "type", "required": true }, { "name": "defaultValue" }, { "name": "group" }, { "name": "sort_no" }, { "name": "is_name" }, { "name": "required" }, { "name": "is_wide" }, { "name": "readonly" }, { "name": "hidden" }, { "name": "omit" }, { "name": "index" }, { "name": "sortable" }, { "name": "searchable" }, { "name": "filterable" }, {"name":"inlineHelpText"},{"name":"description"}];
-
-// function getFieldsByType(doc, type, dataType) {
-//   let fields = [];
-//   if(dataType){
-//     fields = fields.concat(getFieldsByType(doc, dataType))
-//   }
-//   switch (type) {
-//     case 'textarea':{
-//       fields.push({ name: 'rows', required: true });
-//       break;
-//     }
-//     case 'select':{
-//       fields.push({ name: 'options', required: true });
-//       fields.push({ name: 'options.$', required: true });
-//       fields.push({ name: 'options.$.label', required: true });
-//       fields.push({ name: 'options.$.value', required: true });
-//       fields.push({ name: 'options.$.color', required: false });
-//       fields.push({ name: 'options.$.description', required: false });
-//       fields.push({ name: 'multiple'});
-//       break;
-//     }
-//     case 'number':{
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       break;
-//     }
-//     case 'currency':{
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       break;
-//     }
-//     case 'percent':{
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       break;
-//     }
-//     case 'lookup': {
-//       fields.push({ name: 'reference_to'});
-//       fields.push({ name: 'filtersFunction'});
-//       fields.push({ name: 'optionsFunction'});
-//       fields.push({ name: 'multiple'});
-//       break;
-//     }
-//     case 'master_detail': {
-//       fields.push({ name: 'reference_to'});
-//       fields.push({ name: 'filtersFunction'});
-//       fields.push({ name: 'optionsFunction'});
-//       fields.push({ name: 'write_requires_master_read'});
-//       break;
-//     }
-//     case 'autonumber': {
-//       fields.push({ name: 'formula', required: true });
-//       break;
-//     }
-//     case 'formula': {
-//       fields.push({ name: 'formula', required: true });
-//       fields.push({ name: 'data_type', required: true });
-//       fields.push({ name: 'formula_blank_value', required: true });
-//       break;
-//     }
-//     case 'summary': {
-//       fields.push({ name: 'summary_object', required: true });
-//       fields.push({ name: 'summary_type', required: true });
-//       if(doc.summary_type != 'count'){
-//         fields.push({ name: 'summary_field', required: true });
-//       }
-//       // fields.push({ name: 'data_type', required: true });
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       fields.push({ name: 'summary_filters' });
-//       fields.push({ name: 'summary_filters.$' });
-//       fields.push({ name: 'summary_filters.$.field' });
-//       fields.push({ name: 'summary_filters.$.operation' });
-//       fields.push({ name: 'summary_filters.$.value' });
-//       break;
-//     }
-//     case 'image': {
-//       // fields.push({ name: 'multiple'}); image多选时，单个字段编辑窗口样式异常,暂时不支持
-//       break;
-//     }
-//     case 'url': {
-//       fields.push({ name: 'show_as_qr'});
-//       break;
-//     }
-//     default:
-//       break;
-//   }
-//   return fields;
-// }
-// Meteor.startup(function(){
-//   $('body').on('hidden.bs.modal', '#afModal', function(){
-//     Steedos.ObjectFieldManager.__lastDoc = null;
-//   });
-// });
-
-// Steedos.ObjectFieldManager.changeSchema = function (doc, schema, when) {
-//   var __lastDoc = Steedos.ObjectFieldManager.__lastDoc;
-//   var noChange = doc.type && __lastDoc && __lastDoc._id == doc._id && __lastDoc.type == doc.type && __lastDoc.data_type == doc.data_type;
-//   if(noChange && doc.type == "summary" && __lastDoc.summary_type != doc.summary_type){
-//     // 当字段类型为汇总时，汇总类型如果有变更，有可能“要聚合的字段”属性不一定必填，所以这里强制重新计算Schema
-//     noChange = false;
-//   }
-//   if(noChange){
-//     return false;
-//   }else{
-//     Steedos.ObjectFieldManager.__lastDoc = doc;
-//   }
-
-//   var clone = require('clone');
-//   var fields = clone(Creator.getObject("object_fields").fields);
-//   var showFields = baseFieldsName.concat(getFieldsByType(doc, doc.type, doc.data_type));
-//   if(when === 'view'){
-//     showFields.push({ "name": "name" })
-//   }else if(when === 'edit' && false){
-//     showFields.push({name: '_name', required: true})
-//   }
-//   var objectName = doc.object;
-//   if(_.isObject(objectName)){
-//     objectName = objectName.name
-//   }
-//   var _object = Creator.getObject(objectName); 
-//   if(!_object){
-//     var _objects = Steedos.authRequest(`/api/v4/objects`, { type: 'get', async: false, data: { $filter: "name eq '"+objectName+"'" } });
-//     _object = _objects && _objects.value && _objects.value.length > 0 ? _objects.value[0] : null;
-//   }
-//   // 外部数据源对象必须启用后，才可正常显示对象字段属性
-//   if(_object && (_object.database_name || _object.datasource)){
-//     showFields.push({"name":"column_name"})
-//     showFields.push({"name":"primary"})
-//     showFields.push({"name":"generated"})
-//   }
-//   _.map(fields, function(field, fname){
-//     var showField = _.find(showFields, function(item){
-//       return item && item.name === fname;
-//     })
-//     if(showField){
-//       Object.assign(field, showField)
-//     }else{
-//       Object.assign(field, {omit: true, hidden: true})
-//     }
-//   })
-
-//   var objectSchema = Creator.getObjectSchema({fields: fields});
-//   Object.assign(schema, new SimpleSchema(objectSchema)) 
-// }
-
 Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
   var operations, optionals;
   optionals = {
@@ -243,12 +94,25 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
         flex-grow: 0;
       }
       
+      .defaultValue_field .defaultValue_field_formula_hidden > .antd-Form-label {
+        display: none;
+      }
+      .defaultValue_field .defaultValue_field_formula_hidden > .antd-Form-value .antd-FormulaPicker .antd-InputBox {
+        display: none;
+      }
+      
       .defaultValue_field .defaultValue_field_formula_hidden {
         margin-left: 0.5rem;
       }
       
       .defaultValue_field.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden {
-        margin-left: 0px;
+        margin-left: 7rem;
+      }
+
+      @media (max-width: 767px) {
+        .defaultValue_field.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden {
+          margin-left: 0rem;
+        }
       }
       </style>`);
     $("head").append(styleCss);

package/main/default/routes/amis_button_design.router.js

@@ -5,7 +5,7 @@
  */
 const express = require("express");
 const router = express.Router();
-const core = require('@steedos/core');
+const auth = require('@steedos/auth');
 const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
@@ -20,7 +20,7 @@ const getPublicAssetUrls = function(assetUrls){
     })
     return _.join(values, ',')
 }
-router.get('/api/amisButtonDesign', core.requireAuthentication, async function (req, res) {
+router.get('/api/amisButtonDesign', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
@@ -28,7 +28,7 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {
-        //     rootUrl: __meteor_runtime_config__.ROOT_URL,
+        //     rootUrl: process.env.ROOT_URL,
         //     tenantId: userSession.spaceId,
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
@@ -40,7 +40,7 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
         } else if (req.query.locale == "zh-cn") {
             locale = "zh-CN";
         }
-        const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/object_actions/view/${req.query.id}`
+        const retUrl = process.env.ROOT_URL + `/app/admin/object_actions/view/${req.query.id}`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
         const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
 
@@ -51,7 +51,7 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
         const data = {
             builderHost,
             assetUrls,
-            rootUrl: __meteor_runtime_config__.ROOT_URL,
+            rootUrl: process.env.ROOT_URL,
             tenantId: userSession.spaceId,
             userId: userSession.userId,
             authToken: userSession.authToken,

package/main/default/routes/amis_listview_design.router.js

@@ -5,7 +5,7 @@
  */
 const express = require("express");
 const router = express.Router();
-const core = require('@steedos/core');
+const auth = require('@steedos/auth');
 const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
@@ -21,14 +21,14 @@ const getPublicAssetUrls = function(assetUrls){
     })
     return _.join(values, ',')
 }
-router.get('/api/amisListviewDesign', core.requireAuthentication, async function (req, res) {
+router.get('/api/amisListviewDesign', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
         let assetUrls = getPublicAssetUrls(req.query.assetUrls);
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
         // const dataContext = {
-        //     rootUrl: __meteor_runtime_config__.ROOT_URL,
+        //     rootUrl: process.env.ROOT_URL,
         //     tenantId: userSession.spaceId,
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
@@ -39,7 +39,7 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
         } else if (req.query.locale == "zh-cn") {
             locale = "zh-CN";
         }
-        const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/object_listviews/view/${req.query.id}`
+        const retUrl = process.env.ROOT_URL + `/app/admin/object_listviews/view/${req.query.id}`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
         const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
         const record = await objectql.getObject('object_listviews').findOne(req.query.id);
@@ -50,7 +50,7 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
         const data = {
             builderHost,
             assetUrls,
-            rootUrl: __meteor_runtime_config__.ROOT_URL,
+            rootUrl: process.env.ROOT_URL,
             tenantId: userSession.spaceId,
             userId: userSession.userId,
             authToken: userSession.authToken,

package/main/default/routes/listview.router.js

@@ -7,7 +7,7 @@
  */
 const express = require('express');
 const router = express.Router();
-const core = require('@steedos/core');
+const auth = require('@steedos/auth');
 const objectql = require('@steedos/objectql');
 
 const callObjectServiceAction = async function(actionName, userSession, data){
@@ -19,7 +19,7 @@ const getUISchema = async function(objectName, userSession){
     return await callObjectServiceAction(`objectql.getRecordView`, userSession, { objectName });
 }
 
-router.post('/api/listview/filters', core.requireAuthentication, async function (req, res) {
+router.post('/api/listview/filters', auth.requireAuthentication, async function (req, res) {
     const {id, filters} = req.body;
     const record = await objectql.getObject('object_listviews').directUpdate(id, {filters: filters})
     res.status(200).send(record);

package/main/default/routes/object_fields_design.router.js

@@ -5,7 +5,7 @@
  */
 const express = require('express');
 const router = express.Router();
-const core = require('@steedos/core');
+const auth = require('@steedos/auth');
 const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
@@ -23,7 +23,7 @@ const getPublicAssetUrls = function(assetUrls){
     return _.join(values, ',')
 }
 
-router.get('/api/amisObjectFieldsDesign', core.requireAuthentication, async function (req, res) {
+router.get('/api/amisObjectFieldsDesign', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
@@ -31,7 +31,7 @@ router.get('/api/amisObjectFieldsDesign', core.requireAuthentication, async func
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {
-        //     rootUrl: __meteor_runtime_config__.ROOT_URL,
+        //     rootUrl: process.env.ROOT_URL,
         //     tenantId: userSession.spaceId,
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
@@ -42,7 +42,7 @@ router.get('/api/amisObjectFieldsDesign', core.requireAuthentication, async func
         } else if (req.query.locale == "zh-cn") {
             locale = "zh-CN";
         }
-        const retUrl = req.query.retUrl || __meteor_runtime_config__.ROOT_URL + '/app/admin/objects/view/' + req.query.oid
+        const retUrl = req.query.retUrl || process.env.ROOT_URL + '/app/admin/objects/view/' + req.query.oid
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
         const builderHost = `${steedosBuilderUrl}/object?${assetUrl}retUrl=${retUrl}&locale=${locale}&isObjectDesign=1&pType=objectDesign`;
 
@@ -50,7 +50,7 @@ router.get('/api/amisObjectFieldsDesign', core.requireAuthentication, async func
         const data = {
             builderHost,
             assetUrls,
-            rootUrl: __meteor_runtime_config__.ROOT_URL,
+            rootUrl: process.env.ROOT_URL,
             tenantId: userSession.spaceId,
             userId: userSession.userId,
             authToken: userSession.authToken,

package/main/default/services/database-objects.service.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-04-21 16:25:07
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-03-21 11:58:43
+ * @LastEditTime: 2025-03-06 13:43:12
  * @Description: 
  */
 var packageServiceName = '~database-objects'
@@ -100,31 +100,31 @@ module.exports = {
                 this.broker.broadcast('metadata.object_triggers.change', {apiName: `${trigger.listenTo}.${trigger.name}`, listenTo: trigger.listenTo})
             }
         },
-        subTriggers: {
-            async handler(){
-                return Creator.getCollection("object_triggers").find({}, {
-                    fields: {
-                        created: 0,
-                        created_by: 0,
-                        modified: 0,
-                        modified_by: 0
-                    }
-                }).observe({
-                    added: (newDocument)=>{
-                        return this.changeTriggerMetadata(newDocument);
-                    },
-                    changed: (newDocument, oldDocument) => {
-                        if(newDocument.name != oldDocument.name){
-                            this.removeTriggerMetadata(oldDocument);
-                        }
-                        return this.changeTriggerMetadata(newDocument);
-                    },
-                    removed: (oldDocument) => {
-                        return this.removeTriggerMetadata(oldDocument);
-                    }
-                });
-            }
-        }
+        // subTriggers: {
+        //     async handler(){
+        //         return Creator.getCollection("object_triggers").find({}, {
+        //             fields: {
+        //                 created: 0,
+        //                 created_by: 0,
+        //                 modified: 0,
+        //                 modified_by: 0
+        //             }
+        //         }).observe({
+        //             added: (newDocument)=>{
+        //                 return this.changeTriggerMetadata(newDocument);
+        //             },
+        //             changed: (newDocument, oldDocument) => {
+        //                 if(newDocument.name != oldDocument.name){
+        //                     this.removeTriggerMetadata(oldDocument);
+        //                 }
+        //                 return this.changeTriggerMetadata(newDocument);
+        //             },
+        //             removed: (oldDocument) => {
+        //                 return this.removeTriggerMetadata(oldDocument);
+        //             }
+        //         });
+        //     }
+        // }
 	},
 
 	/**
@@ -138,9 +138,9 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-        Meteor.startup(async ()=>{
-            this.subTriggers = await this.subTriggers();
-        })
+        // Meteor.startup(async ()=>{
+        //     this.subTriggers = await this.subTriggers();
+        // })
 	},
 
 	/**

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

@@ -3,7 +3,6 @@
  * @Date: 2022-05-16 11:55:06
  * @Description: 
  */
-const InternalData = require('@steedos/standard-objects').internalData;
 const objectql = require('@steedos/objectql');
 const auth = require('@steedos/auth');
 const _ = require('underscore');
@@ -30,10 +29,10 @@ module.exports = {
     afterFind: async function(){
         const { spaceId } = this;
         let lng = Steedos.locale(this.userId, true);
-        let dataList = [{_id: 'default', name: 'default', label: TAPi18n.__(`objects_field_datasource_defaultValue`, {}, lng), ...BASERECORD}];
+        let dataList = [{_id: 'default', name: 'default', label: t(`objects_field_datasource_defaultValue`, {}, lng), ...BASERECORD}];
         let filters = InternalData.parserFilters(this.query.filters)
         if(filters._id === 'meteor'){
-            dataList.push({_id: 'meteor', name: 'meteor', label: TAPi18n.__(`objects_field_datasource_meteor`, {}, lng), ...BASERECORD})
+            dataList.push({_id: 'meteor', name: 'meteor', label: t(`objects_field_datasource_meteor`, {}, lng), ...BASERECORD})
         }
         if (!_.isEmpty(dataList)) {
             const cloneValues = clone(this.data.values, false);
@@ -63,7 +62,7 @@ module.exports = {
             if(this.id === 'default'){
                 try {
                     let lng = Steedos.locale(this.userId, true)
-                    this.data.values = {_id: 'default', name: 'default', label: TAPi18n.__(`objects_field_datasource_defaultValue`, {}, lng), ...BASERECORD};
+                    this.data.values = {_id: 'default', name: 'default', label: t(`objects_field_datasource_defaultValue`, {}, lng), ...BASERECORD};
                 } catch (error) {
                     
                 }
@@ -71,7 +70,7 @@ module.exports = {
             if(this.id === 'meteor'){
                 try {
                     let lng = Steedos.locale(this.userId, true)
-                    this.data.values = {_id: 'meteor', name: 'meteor', label: TAPi18n.__(`objects_field_datasource_meteor`, {}, lng), ...BASERECORD};
+                    this.data.values = {_id: 'meteor', name: 'meteor', label: t(`objects_field_datasource_meteor`, {}, lng), ...BASERECORD};
                 } catch (error) {
                     
                 }

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

@@ -1,15 +1,4 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2022-05-28 11:07:57
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-10-31 17:36:24
- * @Description: 
- */
-const InternalData = require('@steedos/standard-objects').internalData;
-const objectql = require('@steedos/objectql');
-const auth = require("@steedos/auth");
-const clone = require('clone');
-const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
+const _ =require('lodash');
 module.exports = {
     beforeInsert: async function(){
         const { doc } = this;
@@ -38,78 +27,5 @@ module.exports = {
     },
     beforeFind: async function () {
         delete this.query.fields;
-    },
-
-    afterFind: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        const { spaceId } = this;
-
-        let objectName = filters.object;
-        if(!objectName && filters._id && filters._id.indexOf(".") > -1){
-            objectName = filters._id.split('.')[0];
-        }
-        if(objectName){
-            let dataList = await InternalData.getObjectActions(objectName, this.userId);
-            if (!_.isEmpty(dataList)) {
-                const cloneValues = clone(this.data.values, false);
-                dataList.forEach((doc) => {
-                    if (!_.find(this.data.values, (value) => {
-                        return value.name === doc.name
-                    })) {
-                        cloneValues.push(Object.assign({_id: `${objectName}.${doc.name}`}, doc));
-                    }
-                })
-                const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
-                if (records.length > 0) {
-                    this.data.values = records;
-                } else {
-                    this.data.values.length = 0;
-                }
-            }
-        }
-
-        // _.each(this.data.values, (item)=>{
-        //     if(item.visibleOn){
-        //         item.visible_type = "expression"
-        //     }else if(item.visible === true){
-        //         item.visible_type = "static"
-        //     }
-        // })
-
-        _.each(this.data.values, (item)=>{
-            if(item.visible != false){
-                item.visible = true
-            }
-        })
-
-    },
-    afterCount: async function(){
-        delete this.query.fields;
-        let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
-        this.data.values = result.length;
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-            let objectName = id.substr(0, id.indexOf("."));
-            if(objectName){
-                let action = await InternalData.getObjectAction(objectName, this.userId, id);
-                if(action){
-                    this.data.values = action;
-                }
-            }
-        }
-
-        if(this.data.values){
-            if(this.data.values.visibleOn){
-                this.data.values.visible_type = "expression"
-            }else if(this.data.values.visible === true){
-                this.data.values.visible_type = "static"
-            }
-        }
-
-    },
-    afterDelete: async function(){
-        await sleep(1000 * 2);
     }
 }