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

package/main/default/objectTranslations/object_listviews.zh-CN/object_listviews.zh-CN.objectTranslation.yml

@@ -52,7 +52,7 @@ fields:
         value: infinite
     description: 
   columns:
-    label: 显示的列
+    label: 电脑端显示的列
     help: 
     description: 
   columns.$:
@@ -146,15 +146,41 @@ fields:
     description: 
   sort_no:
     label: 排序号
+  is_enable:
+    label: 启用
+  crud_mode:
+    label: 显示模式
+    help: 
+    options:
+      - label: 表格
+        value: table
+      - label: 卡片
+        value: cards
+    description: 
   enable_amis_schema: 
     label: 使用 amis自定义列表
   amis_schema: 
     label: Amis Schema
+  requestAdaptor:
+    label: 发送适配器
+    help: "函数签名：(api) => api， 数据在 api.data 中，修改后返回 api 对象。"
+    description: 
+  adaptor:
+    label: 接收适配器
+    help: "函数签名: (payload, response, api) => payload"
+    description: 
 groups:
   advanced: 高级
+  show_columns: 显示列
+  sort: 排序
+  filters: 过滤
+  search_term: 搜索项
+  data_interface: 数据接口
 listviews:
   all:
     label: 全部
+  customize:
+    label: 自定义
 actions:
   customize:
     label: 自定义

package/main/default/objectTranslations/object_triggers.en/object_triggers.en.objectTranslation.yml

@@ -6,7 +6,7 @@ fields:
     label: Name
     help: 
     description: 
-  object:
+  listenTo:
     label: Object
     help: 
     description: 
@@ -14,6 +14,21 @@ fields:
     label: Execution Time Option
     help: 
     description: 
+    options:
+      - label: "Before adding a new record"
+        value: "beforeInsert"
+      - label: "After adding a new record"
+        value: "afterInsert"
+      - label: "Before modifying a record"
+        value: "beforeUpdate"
+      - label: "After modifying a record"
+        value: "afterUpdate"
+      - label: "Before deleting a record"
+        value: "beforeDelete" 
+      - label: "After deleting a record"
+        value: "afterDelete"
+      - label: "Before checking the records"
+        value: "beforeFind"
   is_enable:
     label: Enable
     help: 
@@ -25,6 +40,12 @@ fields:
       Help</a>
     help: 
     description: 
+  is_system:
+    label: System
+    help: 
+    description: 
 listviews:
   all:
     label: All Triggers
+  customize:
+    label: Customize

package/main/default/objectTranslations/object_triggers.zh-CN/object_triggers.zh-CN.objectTranslation.yml

@@ -6,7 +6,7 @@ fields:
     label: 名称
     help: 
     description: 
-  object:
+  listenTo:
     label: 所属对象
     help: 
     description: 
@@ -14,6 +14,21 @@ fields:
     label: 运行时
     help: 
     description: 
+    options:
+      - label: "新增记录之前"
+        value: "beforeInsert"
+      - label: "新增记录之后"
+        value: "afterInsert"
+      - label: "修改记录之前"
+        value: "beforeUpdate"
+      - label: "修改记录之后"
+        value: "afterUpdate"
+      - label: "删除记录之前"
+        value: "beforeDelete" 
+      - label: "删除记录之后"
+        value: "afterDelete"
+      - label: "查询记录之前"
+        value: "beforeFind"
   isEnabled:
     label: 已启用
     help: 
@@ -22,6 +37,12 @@ fields:
     label: 内容
     help: 
     description: 
+  is_system:
+    label: 系统
+    help: 
+    description: 
 listviews:
   all:
     label: 所有
+  customize:
+    label: 自定义

package/main/default/objectTranslations/object_validation_rules.en/object_validation_rules.en.objectTranslation.yml

@@ -35,6 +35,8 @@ fields:
 listviews:
   all:
     label: All Object Validation Rules
+  customize:
+    label: Customize
 CustomLabels:
   object_validation_rules_field_error_display_field: 
   object_validation_rules_field_error_display_field_inlineHelpText: 

package/main/default/objectTranslations/object_validation_rules.zh-CN/object_validation_rules.zh-CN.objectTranslation.yml

@@ -29,6 +29,8 @@ fields:
 listviews:
   all:
     label: 所有
+  customize:
+    label: 自定义
 CustomLabels:
   object_validation_rules_field_error_display_field: 错误位置
   object_validation_rules_field_error_display_field_inlineHelpText: >-

package/main/default/objectTranslations/objects.en/objects.en.objectTranslation.yml

@@ -212,6 +212,8 @@ actions:
     label: Preview
   copy_odata:
     label: Copy OData URL
+  createDefaultRecordView:
+    label: Create Default Page Layout
 CustomLabels:
   objects_field_datasource_defaultValue: Default data source
   objects_field_datasource_meteor: Meteor

package/main/default/objectTranslations/objects.zh-CN/objects.zh-CN.objectTranslation.yml

@@ -209,6 +209,8 @@ actions:
     label: 预览
   copy_odata:
     label: 复制OData网址
+  createDefaultRecordView:
+    label: 创建默认页面布局
 CustomLabels:
   objects_field_datasource_defaultValue: 默认数据源
   objects_field_datasource_meteor: Meteor

package/main/default/objects/1.objects.observe.object.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-23 17:58:55
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-07-05 11:26:24
+ * @LastEditTime: 2023-12-05 10:35:52
  * @Description: 
  */
 var objectql = require('@steedos/objectql');
@@ -53,6 +53,9 @@ Meteor.startup(function () {
                 }
             },
             removed: function (oldDocument) {
+                if(oldDocument.is_system){
+                    objectCore.removeObjectConfig(oldDocument.name)
+                }
                 return _removeServerObjects(oldDocument);
             }
         });

package/main/default/objects/16.permission_tabs.observe.object.js

@@ -0,0 +1,44 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2023-06-28 16:15:36
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-06-28 18:59:40
+ * @FilePath: /project-template/Users/sunhaolin/Documents/GitHub/steedos-platform-2.3/services/standard-object-database/main/default/objects/16.permission_tabs.observe.object.js
+ * @Description: 
+ */
+const objectql = require("@steedos/objectql");
+const objectName = "permission_tabs";
+const SERVICE_NAME = `~database-permission_tabs`;
+Meteor.startup(function () {
+    var _change, _remove, inited = false;
+    _change = function (document) {
+        objectql.registerPermissionTabs.register(broker, SERVICE_NAME, document)
+    };
+    _remove = function (document) {
+        objectql.registerPermissionTabs.remove(broker, SERVICE_NAME, document)
+    };
+    Creator.getCollection(objectName).find({}, {
+        fields: {
+            created: 0,
+            created_by: 0,
+            modified: 0,
+            modified_by: 0
+        }
+    }).observe({
+        added: function (newDocument) {
+            if (inited) {
+                return _change(newDocument);
+            }
+        },
+        changed: function (newDocument, oldDocument) {
+            if (newDocument.name != oldDocument.name) {
+                _remove(oldDocument)
+            }
+            return _change(newDocument);
+        },
+        removed: function (oldDocument) {
+            return _remove(oldDocument);
+        }
+    });
+    inited = true;
+});

package/main/default/objects/7.object_actions.observe.object.js

@@ -2,11 +2,12 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-05 14:17:44
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-06-27 09:32:45
+ * @LastEditTime: 2023-12-05 11:04:22
  * @Description: 
  */
 var objectql = require('@steedos/objectql');
 var objectCore = require('./objects.core.js');
+const register = require('@steedos/metadata-registrar');
 var lodash = require('lodash');
 Meteor.startup(function () {
     var _change, _remove, inited = false;
@@ -48,6 +49,11 @@ Meteor.startup(function () {
             },
             removed: function (oldDocument) {
                 if(inited){
+                    const objConfig = register.getOriginalObjectConfig(oldDocument.object);
+                    if(objConfig && objConfig.actions[oldDocument.name]){
+                        return _change(Object.assign(objConfig.actions[oldDocument.name], {_previousName: oldDocument.name}));
+                    }
+
                     return _remove(oldDocument);
                 }
             }

package/main/default/objects/object_actions.action.js

@@ -2,16 +2,16 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-21 18:19:06
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-01 10:15:14
+ * @LastEditTime: 2023-10-16 13:58:08
  * @Description: 
  */
 module.exports = {
   showDesign: function (object_name, record_id) {
-    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.record.object}&assetUrls=${Builder.settings.assetUrls}`);
+    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.record.object}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
   },
-  showDesignVisible: function (object_name, record_id, record_permissions) {
+  showDesignVisible: function (object_name, record_id, record_permissions, data) {
       var perms;
-      var record = Creator.getObjectRecord(object_name, record_id);
+      var record = (data && data.record) || Creator.getObjectRecord(object_name, record_id);
       if(record.type === 'amis_button'){
         perms = {};
         if (record_permissions) {
@@ -25,5 +25,36 @@ module.exports = {
         return perms["allowEdit"];
       }
       return false;
+  },
+  customize: function (object_name, record_id, fields) {
+    var doc = Creator.odata.get(object_name, record_id);
+    var newDoc = {}
+    _.each(Creator.getObject(object_name).fields, function(v, k){
+        if(_.has(doc, k)){
+            newDoc[k] = doc[k]
+        }
+    })
+    delete newDoc.is_system;
+
+    let docName = doc.name
+    let docObjectName = doc.object
+    
+    Creator.odata.insert(object_name, Object.assign(newDoc, {name: docName, object: docObjectName}), function(result, error){
+        if(result){
+            if(Session.get("object_name") === 'object_actions'){
+                FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
+            }else{
+                href = Creator.getObjectUrl(object_name, result._id);
+                window.open(href,'_blank','width=800, height=600, left=50, top= 50, toolbar=no, status=no, menubar=no, resizable=yes, scrollbars=yes')
+            }
+        }
+    });
+  },
+  customizeVisible: function(object_name, record_id, record_permissions, data){
+      var record = data && data.record;
+      if(!record){
+          record = {}
+      }
+      return Creator.baseObject.actions.standard_new.visible() && record.is_system && record.type == 'amis_button';
   }
 }

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

@@ -76,7 +76,7 @@ function allowChangeObject(){
   }
 }
 
-Creator.Objects.object_actions.triggers = {
+const triggers = {
   // "after.insert.server.object_actions": {
   //   on: "server",
   //   when: "after.insert",
@@ -149,4 +149,6 @@ Creator.Objects.object_actions.triggers = {
       }
     }
   }
-}
+}
+
+Creator.Objects.object_actions.triggers = Object.assign(Creator.Objects.object_actions.triggers || {}, triggers);

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

@@ -46,38 +46,57 @@ fields:
     required: true
     showIcon: false
     sort_no: 160
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              return [{
-                label: "显示在列表右上角",
-                value: "list",
-                icon: "contact_list"
-              }, {
-                label: "显示在记录查看页右上角，以及列表视图中每项的下拉菜单中",
-                value: "record",
-                icon: "contact_list"
-              }, {
-                label: "显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中",
-                value: "record_more",
-                icon: "lead_list"
-              }, {
-                label: "显示在列表视图中每项的下拉菜单中",
-                value: "list_item",
-                icon: "action_list_component"
-              }, {
-                label: "显示在记录查看页右上角",
-                value: "record_only",
-                icon: "contract"
-              }, {
-                label: "显示在记录查看页右上角的“更多”下拉菜单中",
-                value: "record_only_more",
-                icon: "lead_list"
-              }];
-            }
+    options:
+      - label: 显示在列表右上角
+        value: list
+        icon: contact_list
+      - label: 显示在记录查看页右上角，以及列表视图中每项的下拉菜单中
+        value: record
+        icon: contact_list
+      - label: 显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中
+        value: record_more
+        icon: lead_list
+      - label: 显示在列表视图中每项的下拉菜单中
+        value: list_item
+        icon: action_list_component
+      - label: 显示在记录查看页右上角
+        value: record_only
+        icon: contract
+      - label: 显示在记录查看页右上角的“更多”下拉菜单中
+        value: record_only_more
+        icon: lead_list
+    # optionsFunction: !<tag:yaml.org,2002:js/function> |-
+      # function () {
+      #         return [{
+      #           label: "显示在列表右上角",
+      #           value: "list",
+      #           icon: "contact_list"
+      #         }, {
+      #           label: "显示在记录查看页右上角，以及列表视图中每项的下拉菜单中",
+      #           value: "record",
+      #           icon: "contact_list"
+      #         }, {
+      #           label: "显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中",
+      #           value: "record_more",
+      #           icon: "lead_list"
+      #         }, {
+      #           label: "显示在列表视图中每项的下拉菜单中",
+      #           value: "list_item",
+      #           icon: "action_list_component"
+      #         }, {
+      #           label: "显示在记录查看页右上角",
+      #           value: "record_only",
+      #           icon: "contract"
+      #         }, {
+      #           label: "显示在记录查看页右上角的“更多”下拉菜单中",
+      #           value: "record_only_more",
+      #           icon: "lead_list"
+      #         }];
+      #       }
   type: 
     type: select
     sort_no: 170
-    hidden: true
+    visible_on: "${false}"
     options:
       - label: Custom JavaScript
         value: script
@@ -110,6 +129,14 @@ fields:
     is_wide: true
     hidden: true
     visible_on: "{{formData.type == 'amis_button' ? true: false}}"
+  is_system:
+    type: boolean
+    label: 系统
+    # omit: true
+    readonly: true
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+    disabled: true
+    sort_no: 500
 form:
   initialValues: !!js/function |
     function(){
@@ -121,6 +148,9 @@ actions:
   showDesign: 
     label: 设计器
     on: record_only
+  customize:
+    label: 自定义
+    on: record_only
 list_views:
   all:
     columns:
@@ -130,8 +160,22 @@ list_views:
       - 'on'
       - is_enable
       - modified
+      - is_system
     label: All
     filter_scope: space
+  customize:
+    columns:
+      - label
+      - name
+      - object
+      - 'on'
+      - is_enable
+      - modified
+      - is_system
+    label: 自定义
+    filters:
+      - ["is_system","<>",true]
+    filter_scope: space
 permission_set:
   user:
     allowCreate: false

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

@@ -3,6 +3,19 @@ var objectql = require('@steedos/objectql');
 var clone = require('clone');
 var objectCore = require('./objects.core.js');
 
+const objectFieldsFind = function (filter) {
+    return objectql.wrapAsync(async function () {
+        return await objectql.getObject('object_fields').find(this.filter);
+    }, { filter: filter })
+}
+
+
+const getRecords = function (objectName) {
+  return objectql.wrapAsync(async function () {
+      return await objectql.getObject(this.objectName).directFind({fields:["_id"], top: 1});
+  }, { objectName: objectName })
+}
+
 const MAX_MASTER_DETAIL_LEAVE = objectql.MAX_MASTER_DETAIL_LEAVE;
 
 function canRemoveNameFileld(doc){
@@ -105,20 +118,18 @@ function _syncToObject(doc, event) {
 };
 
 function isRepeatedName(doc, name) {
-  var other;
-  other = Creator.getCollection("object_fields").find({
-    object: doc.object,
-    space: doc.space,
-    _id: {
-      $ne: doc._id
-    },
-    name: name || doc.name
-  }, {
-    fields: {
-      _id: 1
-    }
+  var other = objectFieldsFind({
+    filters: [[
+      'object', '=', doc.object
+    ], [
+      'space', '=', doc.space
+    ], [
+      '_id', '!=', doc._id
+    ], [
+      'name', '=', name || doc.name
+    ]]
   });
-  if (other.count() > 0) {
+  if (other.length > 0) {
     return true;
   }
   return false;
@@ -238,7 +249,7 @@ function checkMasterDetailTypeField(doc, oldReferenceTo) {
 
 function onChangeName(oldName, newDoc){
   var newName = newDoc.name
-  Creator.getCollection("object_listviews").direct.find({space: newDoc.space, object_name: newDoc.object}, {fields: {_id:1, columns: 1}}).forEach(function(view){
+  Creator.getCollection("object_listviews").direct.find({space: newDoc.space, object_name: newDoc.object}, {fields: {_id:1, columns: 1, name: 1}}).forEach(function(view){
     if(_.isArray(view.columns)){
       var columns = [];
       _.each(view.columns, function(column){
@@ -258,7 +269,8 @@ function onChangeName(oldName, newDoc){
           columns.push(column)
         }
       });
-      Creator.getCollection("object_listviews").update({_id: view._id}, {$set: {columns: columns}});
+      // 由于 https://github.com/steedos/steedos-platform/issues/4655 改动, 修改列表视图的时候, 必须要传入name, 否则会报错
+      Creator.getCollection("object_listviews").update({_id: view._id}, {$set: {name: view.name, columns: columns}});
     }
   })
 }
@@ -427,11 +439,11 @@ var triggers = {
         }
       });
       if (object) {
-        object_documents = Creator.getCollection(object.name).find();
-        if ((modifier != null ? (ref6 = modifier.$set) != null ? ref6.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.count() > 0) {
+        object_documents = getRecords(object.name);
+        if ((modifier != null ? (ref6 = modifier.$set) != null ? ref6.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.length > 0) {
           throw new Meteor.Error(500, `对象${object.label}中已经有记录，不能修改reference_to字段`);
         }
-        if ((modifier != null ? (ref7 = modifier.$unset) != null ? ref7.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.count() > 0) {
+        if ((modifier != null ? (ref7 = modifier.$unset) != null ? ref7.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.length > 0) {
           throw new Meteor.Error(500, `对象${object.label}中已经有记录，不能修改reference_to字段`);
         }
       }
@@ -453,6 +465,7 @@ var triggers = {
       if(!allowChangeObject()){
         throw new Meteor.Error(500, "华炎云服务不包含自定义业务对象的功能，请部署私有云版本");
       }
+
       checkName(doc._name);
       if(['name','owner','parent','children'].indexOf(doc._name)>-1){
         doc.name = doc._name;
@@ -463,8 +476,9 @@ var triggers = {
       if(doc.name === 'name' || doc.is_name){
         checkNameField({type: doc.type})
       }
-
+      console.log('insert', doc)
       if (isRepeatedName(doc)) {
+        
         throw new Meteor.Error(doc.name, "字段名不能重复");
       }