npm - @steedos/standard-object-database - Versions diffs - 2.7.10-beta.1 → 2.7.10-beta.10 - Mend

@steedos/standard-object-database 2.7.10-beta.1 → 2.7.10-beta.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/main/default/objects/objects/buttons/design_field_layout.button.yml CHANGED Viewed

@@ -1,4 +1,5 @@
 name: design_field_layout
 is_enable: true
 label: 设计字段布局
-'on': record_only
+'on': record_more
+sort: 80

package/main/default/objects/objects/buttons/design_fields_layout.button.yml CHANGED Viewed

@@ -1,5 +1,4 @@
 name: design_fields_layout
 is_enable: true
-label: 设计对象（Beta)
-'on': record_more
-sort: 80
+label: 设计对象
+'on': record_only

package/main/default/routes/object_fields_design.ejs CHANGED Viewed

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-02 17:45:15
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-09-11 11:49:37
+ * @LastEditTime: 2024-10-10 10:20:19
  * @Description:
 -->
 <html>
@@ -11,6 +11,15 @@
     <script src="/unpkg.com/axios@0.26.1/dist/axios.min.js"></script>
     <script src="https://unpkg.steedos.cn/flowbite@2.3.0/dist/flowbite.min.js"></script>
     <script src="https://cdn.tailwindcss.com"></script>
+    <link href="/toast/toastr.min.css" rel="stylesheet" />
+    <script src="/jquery.min.js" ></script>
+    <script src="/toast/toastr.min.js"></script>
+    <style>
+      #toast-container.toast-bottom-center>div, #toast-container.toast-top-center>div {
+        width: 450px;
+        opacity: 1;
+      }
+    </style>
   </head>
   <body>
@@ -185,7 +194,7 @@
         }
-        return await axios.post(
+        const result =  await axios.post(
             `${rootUrl}/service/api/object_fields/amis/design/schema?oid=${oid}`,
             {
               withCredentials: true,
@@ -199,6 +208,43 @@
             // handle error
             console.log(error);
           });
+        const actionNames = ['insert', 'update', 'delete'];
+        toastr.options = {
+          "closeButton": true,
+          "debug": false,
+          "newestOnTop": false,
+          "progressBar": false,
+          "positionClass": "toast-top-center",
+          "preventDuplicates": false,
+          "onclick": null,
+          "showDuration": "300",
+          "hideDuration": "1000",
+          "timeOut": "5000",
+          "extendedTimeOut": "1000",
+          "showEasing": "swing",
+          "hideEasing": "linear",
+          "showMethod": "fadeIn",
+          "hideMethod": "fadeOut"
+        }
+        actionNames.forEach(function(actionName){
+          const actionData = result.data.data[actionName];
+          let actionLabel = '';
+          if(actionName === 'insert'){
+            actionLabel = '新增';
+          }else if(actionName === 'update'){
+            actionLabel = '更新';
+          }else if(actionName === 'delete'){
+            actionLabel = '删除';
+          }
+          if(actionData.error && actionData.error.length > 0){
+          actionData.error.forEach((error)=>{
+            toastr.warning(error.message, `${actionLabel}字段「${error.fieldLabel}(${error.fieldName})」失败:`);
+            })
+          }
+        })
+        return result;
       };
       window.addEventListener('message', function (event) {
         const { data } = event;
@@ -208,6 +254,34 @@
                 onDndAccept: function(event){
                   return true;
                 },
+                beforeDelete: function(event){
+                    const toastConfig = {
+                        "closeButton": true,
+                        "debug": false,
+                        "newestOnTop": false,
+                        "progressBar": false,
+                        "positionClass": "toast-top-center",
+                        "preventDuplicates": false,
+                        "onclick": null,
+                        "showDuration": "300",
+                        "hideDuration": "1000",
+                        "timeOut": "5000",
+                        "extendedTimeOut": "1000",
+                        "showEasing": "swing",
+                        "hideEasing": "linear",
+                        "showMethod": "fadeIn",
+                        "hideMethod": "fadeOut"
+                      }
+                    if(event.context.schema.type.startsWith('sfield') && event.context.schema.config.is_system){
+                      parent.toastr.warning('禁止删除系统字段', '', toastConfig)
+                      return event.preventDefault();
+                    };
+                    if(event.context.schema.type.startsWith('sfield') && event.context.schema.config.name === 'name'){
+                      parent.toastr.warning('禁止删除名称字段', '', toastConfig)
+                      return event.preventDefault();
+                    }
+                },
                 onInit: function(){
                   // 创建一个新的 style 元素
                   var style = document.createElement('style');

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -315,7 +315,15 @@ module.exports = {
                     _.map(objectFields, (objectField)=>{
                         if(!objectField.group){
                             objectField.group = '通用'
-                        }
+                        };
+                        delete objectField.owner;
+                        delete objectField.space;
+                        delete objectField.created;
+                        delete objectField.modified;
+                        delete objectField.created_by;
+                        delete objectField.modified_by;
+                        delete objectField.company_id;
+                        delete objectField.company_ids;
                     })
                     return {
@@ -326,12 +334,13 @@ module.exports = {
                         data: {
                             objectName
                         },
-                        className: "steedos-amis-form steedos-field-layout-page m-4",
+                        className: "steedos-amis-form steedos-field-layout-page",
                         body: _.map(_.groupBy(_.orderBy(objectFields, function(o) { return o.sort_no || 100 }), 'group'), (items, groupName)=>{
                             const group = getGroup(groupName)
                             return {
                                 type: 'steedos-field-group',
                                 title: group.group_name,
+                                collapsable: true,
                                 collapsed: group.collapsed,
                                 visible_on: group.visible_on,
                                 body: _.map(items, (field)=>{
@@ -376,22 +385,32 @@ module.exports = {
                     return {}
                 }
                 let sort_no = 50;
-                _.each(schema.body, (group)=>{
-                    if(group.type === 'steedos-field-group'){
-                        const groupName = group.title;
-                        _.each(group.body, (field)=>{
+                _.each(schema.body, (bodyItem)=>{
+                    if(bodyItem.type === 'steedos-field-group'){
+                        const groupName = bodyItem.title;
+                        _.each(bodyItem.body, (field)=>{
                             if(_.startsWith(field.type, 'sfield-')){
-                                fields.push(Object.assign({}, field.config, {group: groupName, sort_no, _name: field.name}));
+                                if(field.config && field.config.amis){
+                                    delete field.config.amis.name
+                                    delete field.config.amis.mode
+                                }
+                                fields.push(Object.assign({}, field.config, {group: groupName, sort_no, _name: field.config.name}));
                                 sort_no += 50;
                             }
                         })
                         groups.push({
-                            group_name: group.title,
-                            collapsed: group.collapsed,
-                            visible_on: group.visible_on
+                            group_name: bodyItem.title,
+                            collapsed: bodyItem.collapsed,
+                            visible_on: bodyItem.visible_on
                         })
-                    }else if(_.startsWith(field.type, 'sfield-')){
-                        fields.push(Object.assign({}, field.config, {sort_no, _name: field.name}));
+                    }else if(_.startsWith(bodyItem.type, 'sfield-')){
+                        if(bodyItem.config && bodyItem.config.amis){
+                            delete bodyItem.config.amis.name
+                            delete bodyItem.config.amis.mode
+                        }
+                        fields.push(Object.assign({}, bodyItem.config, {sort_no, _name: bodyItem.config.name}));
                         sort_no += 50;
                     }
                 })
@@ -423,10 +442,11 @@ module.exports = {
                 // 循环需要增加的字段
                 for (const fieldName of insertFields) {
+                    const newId = await object_fields._makeNewID();
+                    const now = new Date();
+                    const field = _.find(fields, { name: fieldName });
                     try {
-                        const newId = await object_fields._makeNewID();
-                        const now = new Date();
-                        const field = _.find(fields, { name: fieldName });
                         const doc = Object.assign({}, field, {
                             _id: newId,
                             owner: userSession.userId,
@@ -445,7 +465,11 @@ module.exports = {
                         await object_fields.directInsert(doc);
                         log.insert.success.push(fieldName);
                     } catch (e) {
-                        log.insert.error.push(fieldName);
+                        log.insert.error.push({
+                            fieldName: fieldName,
+                            fieldLabel: field.label,
+                            message: steedosI18n.t(e.message, null, 'zh-CN')
+                        });
                         console.error(`新增字段 ${fieldName} 时出错：`, e);
                     }
                 }
@@ -453,32 +477,45 @@ module.exports = {
                 // 循环需要修改的字段
                 const now = new Date();
                 for (const fieldName of updateFields) {
+                    const field = _.find(fields, { name: fieldName });
                     try {
-                        const field = _.find(fields, { name: fieldName });
                         const id = _.find(dbFields, { name: fieldName })._id;
                         const submitField = _.omit(field, ['name', '_name']);
                         if(submitField.type === "summary"){
                             await initSummaryDoc(submitField);
                         }
+                        if(submitField){
+                            delete submitField._id;
+                        }
                         await object_fields.directUpdate(id, Object.assign({}, submitField, {
                             modified: now,
                             modified_by: userSession.userId
                         }));
                         log.update.success.push(fieldName);
                     } catch (e) {
-                        log.update.error.push(fieldName);
+                        log.update.error.push({
+                            fieldName: fieldName,
+                            fieldLabel: field.label,
+                            message: steedosI18n.t(e.message, null, 'zh-CN')
+                        });
                         console.log(`dbFields`, fieldName, dbFields)
                         console.error(`更新字段 ${fieldName} 时出错：`, e);
                     }
                 }
                 // 循环需要删除的字段
                 for (const fieldName of deleteFields) {
+                    const field = _.find(dbFields, { name: fieldName })._id;
                     try {
-                        const id = _.find(dbFields, { name: fieldName })._id;
+                        const id = field._id;
                         await object_fields.directDelete(id);
                         log.delete.success.push(fieldName);
                     } catch (e) {
+                        log.delete.error.push({
+                            fieldName: fieldName,
+                            fieldLabel: field.label,
+                            message: steedosI18n.t(e.message, null, 'zh-CN')
+                        });
                         log.delete.error.push(fieldName);
                         console.error(`删除字段 ${fieldName} 时出错：`, e);
                     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.10-beta.1",
+    "version": "2.7.10-beta.10",
     "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.1",
-        "@steedos/service-object-mixin": "2.7.10-beta.1",
-        "@steedos/standard-objects": "2.7.10-beta.1",
+        "@steedos/metadata-core": "2.7.10-beta.10",
+        "@steedos/service-object-mixin": "2.7.10-beta.10",
+        "@steedos/standard-objects": "2.7.10-beta.10",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "abc4dfba3bd5f3df2244bd2f1fdf61e38d59723f"
+    "gitHead": "cffd1ba851c6e18adcdd8b92f2c20d4d9d76247e"
 }

package/package.service.js CHANGED Viewed

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-09-24 15:00:31
+ * @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);
 			}
 		},