@steedos/standard-object-database 2.7.10-beta.6 → 2.7.10-beta.8

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

@@ -2,6 +2,7 @@ var _ = require("underscore");
 var objectql = require('@steedos/objectql');
 var clone = require('clone');
 var objectCore = require('./objects.core.js');
+var lodash = require('lodash');
 
 const objectFieldsFind = function (filter) {
     return objectql.wrapAsync(async function () {
@@ -31,7 +32,7 @@ function getFieldName(objectName, fieldName, spaceId, oldFieldName){
   if(object && object.datasource && object.datasource != 'default'){
     return fieldName;
   }else{
-    if(fieldName != 'name' && fieldName != 'owner'){
+    if(!lodash.includes(['name', 'owner', 'created', 'created_by', 'modified', 'modified_by'], fieldName)  ){
       return objectql._makeNewFieldName(fieldName, spaceId, oldFieldName);
     }else{
       return fieldName
@@ -470,7 +471,7 @@ var triggers = {
       }
 
       checkName(doc._name);
-      if(['name','owner','parent','children'].indexOf(doc._name)>-1){
+      if(['name','owner','parent','children'].indexOf(doc._name)>-1 || doc._name && doc.is_system){
         doc.name = doc._name;
       }else{
         doc.name = getFieldName(doc.object,doc._name,doc.space);

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

@@ -322,6 +322,7 @@ let objectTriggers = {
                 object: doc.name,
                 owner: userId,
                 _name: "created",
+                name: "created",
                 label: "创建时间",
                 space: doc.space,
                 type: "datetime",
@@ -335,6 +336,7 @@ let objectTriggers = {
                 object: doc.name,
                 owner: userId,
                 _name: "created_by",
+                name: "created_by",
                 label: "创建人",
                 space: doc.space,
                 type: "lookup",
@@ -348,6 +350,7 @@ let objectTriggers = {
                 object: doc.name,
                 owner: userId,
                 _name: "modified",
+                name: "modified",
                 label: "修改时间",
                 space: doc.space,
                 type: "datetime",
@@ -361,9 +364,9 @@ let objectTriggers = {
                 object: doc.name,
                 owner: userId,
                 _name: "modified_by",
+                name: "modified_by",
                 label: "修改人",
                 space: doc.space,
-                space: doc.space,
                 type: "lookup",
                 reference_to: 'users',
                 group: '',

package/main/default/services/object_fields.service.js

@@ -396,7 +396,7 @@ module.exports = {
                                     delete field.config.amis.mode
                                 }
 
-                                fields.push(Object.assign({}, field.config, {group: groupName, sort_no, _name: field.name}));
+                                fields.push(Object.assign({}, field.config, {group: groupName, sort_no, _name: field.config.name}));
                                 sort_no += 50;
                             }
                         })
@@ -410,7 +410,7 @@ module.exports = {
                             delete bodyItem.config.amis.name
                             delete bodyItem.config.amis.mode
                         }
-                        fields.push(Object.assign({}, bodyItem.config, {sort_no, _name: bodyItem.name}));
+                        fields.push(Object.assign({}, bodyItem.config, {sort_no, _name: bodyItem.config.name}));
                         sort_no += 50;
                     }
                 })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.10-beta.6",
+    "version": "2.7.10-beta.8",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,14 +12,14 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.10-beta.6",
-        "@steedos/service-object-mixin": "2.7.10-beta.6",
-        "@steedos/standard-objects": "2.7.10-beta.6",
+        "@steedos/metadata-core": "2.7.10-beta.8",
+        "@steedos/service-object-mixin": "2.7.10-beta.8",
+        "@steedos/standard-objects": "2.7.10-beta.8",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "1f01f0093a985e6e4f3d20ca8989e178c5f71133"
+    "gitHead": "24923482078f878e7ffd0fda727dca0ab68f1adb"
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-10-09 15:24:35
+ * @LastEditTime: 2024-10-10 15:58:37
  * @Description: 
  */
 "use strict";
@@ -169,7 +169,7 @@ module.exports = {
 				
 				
 				const tab_items = app.tab_items || {};
-				tab_items[`object_${obj.name}`] = {
+				tab_items[`object_${obj.name.replace(/__c$/, "")}`] = {
 					group: groupId
 				}
 
@@ -273,7 +273,7 @@ module.exports = {
                 fullPath: "/service/api/apps/create_by_design"
 			},
 			async handler(ctx) {
-				const { code, name } = ctx.params;
+				const { code, name, icon } = ctx.params;
 				const userSession = ctx.meta.user;
 
 				if(!code || !name){
@@ -288,7 +288,7 @@ module.exports = {
 					mobile : true,
 					visible : true,
 					showSidebar : true,
-					icon_slds : "account",
+					icon_slds : icon || "account",
 				}, userSession);
 			}
 		},