@steedos/standard-object-database 2.5.0-beta.15 → 2.5.0-beta.17

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

@@ -6,7 +6,7 @@ hidden: true
 fields:
   _name:
     type: text
-    label: Name
+    label: Api Name
     searchable: true
     index: true
     required: true

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-26 11:45:44
+ * @LastEditTime: 2023-04-27 17:41:52
  * @Description: 
  */
 const Cache = require('@steedos/cachers');
@@ -20,15 +20,35 @@ const PERMISSIONS = {
   };
 
 const getSourceTriggers = async()=>{
-    return _.map(Cache.getCacher('triggers').get('triggers'), (item)=>{
+    const data = _.map(_.filter(Cache.getCacher('triggers').get('triggers'), (item)=>{
+        return !item.metadata._id || item.metadata._id == item.metadata.name
+    }), (item)=>{
         return {
             ...item.metadata,
             _id: item.metadata.name,
             ...BASERECORD
         };
-    }) 
+    });
+    return data;
 }
 
+function checkVariableName(variableName){
+    if(variableName.length > 50){
+        throw new Error("名称长度不能大于50个字符");
+    }
+    var reg = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+    if(reg.test(variableName)){
+      var keywords = ['break', 'case', 'catch', 'continue', 'debugger', 'default', 'delete', 'do', 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof', 'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void', 'while', 'with', 'true', 'false', 'null', 'undefined', 'NaN', 'Infinity'];
+      if(keywords.indexOf(variableName) === -1){
+        return true;
+      } else {
+        throw new Error("名称不能包含关键字");
+      }
+    } else {
+        throw new Error("名称只能包含字母、数字，必须以字母开头");
+    }
+  }
+
 module.exports = {
     beforeFind: async function () {
         delete this.query.fields;
@@ -54,6 +74,7 @@ module.exports = {
     },
     beforeInsert: async function(){
         const doc = this.doc;
+        checkVariableName(doc._name)
         const count = await objectql.getObject('object_triggers').count({filters: [['_name', '=', doc._name], ['listenTo','=', doc.listenTo]]}) 
         if(count > 0){
             throw new Error('触发器名称不能重复')
@@ -61,6 +82,9 @@ module.exports = {
     },
     beforeUpdate: async function () {
         const doc = this.doc;
+        if(doc._name){
+            checkVariableName(doc._name)
+        }
         const count = await objectql.getObject('object_triggers').count({filters: [['_name', '=', doc._name], ['listenTo','=', doc.listenTo], ['_id', '!=', this.id]]}) 
         if(count > 0){
             throw new Error('触发器名称不能重复')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.0-beta.15",
+    "version": "2.5.0-beta.17",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "0b66b1a87086836a5c2bc45875207c29e057cff6"
+    "gitHead": "e91f79af27e59f8c53e5a947e3dfe5ef2e53dcda"
 }