@steedos/standard-object-database 2.5.0-beta.24 → 2.5.0-beta.26

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

@@ -268,7 +268,7 @@ function checkName(name){
   var reg = new RegExp('^[a-z]([a-z0-9]|_(?!_))*[a-z0-9]$'); //支持表格类型的验证表达式(待优化.$.限制只能出现一次): new RegExp('^[a-z]([a-z0-9]|_(?!_))*(\\.\\$\\.\\w+)*[a-z0-9]$')
   //TODO 撤销注释
   if(!reg.test(name)){
-    throw new Error("名称只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
+    throw new Error("'字段名'只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
   }
   if(name.length > 50){
     throw new Error("名称长度不能大于50个字符");

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

@@ -110,6 +110,8 @@ fields:
     visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
     required: "{{['master_detail'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 180
+    amis:
+      menuTpl: "<div>${label}(${value})</div>"
   depend_on:
     type: lookup
     group: Advanced

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

@@ -12,9 +12,7 @@ fields:
     required: true
   name: 
     data_type: text
-    formula: listenTo.name+"_"+_name
-    formula_blank_value: blanks
-    type: formula
+    type: text
     visible_on: "{{false}}"
   listenTo:
     label: Object

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

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2021-06-03 15:11:52
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-27 17:41:52
+ * @LastEditTime: 2023-05-15 09:26:19
  * @Description: 
  */
 const Cache = require('@steedos/cachers');
@@ -78,7 +78,8 @@ module.exports = {
         const count = await objectql.getObject('object_triggers').count({filters: [['_name', '=', doc._name], ['listenTo','=', doc.listenTo]]}) 
         if(count > 0){
             throw new Error('触发器名称不能重复')
-        }       
+        }
+        doc.name = `${doc.listenTo}_${doc._name}` 
     },
     beforeUpdate: async function () {
         const doc = this.doc;
@@ -88,6 +89,7 @@ module.exports = {
         const count = await objectql.getObject('object_triggers').count({filters: [['_name', '=', doc._name], ['listenTo','=', doc.listenTo], ['_id', '!=', this.id]]}) 
         if(count > 0){
             throw new Error('触发器名称不能重复')
-        }  
+        }
+        doc.name = `${doc.listenTo}_${doc._name}`  
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.0-beta.24",
+    "version": "2.5.0-beta.26",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "a12153914810e9e5967827ab0ec01b58a2b3b0cb"
+    "gitHead": "8f62fb81db976cfd84586ee18ef6f1e7fbd6a599"
 }