@steedos/standard-object-database 2.5.16-beta.2 → 2.5.16-beta.4

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}&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

@@ -96,7 +96,7 @@ fields:
   type: 
     type: select
     sort_no: 170
-    hidden: true
+    visible_on: "${false}"
     options:
       - label: Custom JavaScript
         value: script
@@ -129,6 +129,14 @@ fields:
     is_wide: true
     hidden: true
     visible_on: "{{formData.type == 'amis_button' ? true: false}}"
+  is_system:
+    type: boolean
+    label: System
+    # omit: true
+    readonly: true
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+    disabled: true
+    sort_no: 500
 form:
   initialValues: !!js/function |
     function(){
@@ -140,6 +148,9 @@ actions:
   showDesign: 
     label: 设计器
     on: record_only
+  customize:
+    label: 自定义
+    on: record_only
 list_views:
   all:
     columns:
@@ -149,6 +160,7 @@ list_views:
       - 'on'
       - is_enable
       - modified
+      - is_system
     label: All
     filter_scope: space
 permission_set:

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

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-03-05 16:47:05
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-10-16 16:50:45
  * @Description: 
  */
 module.exports = {
@@ -22,8 +22,8 @@ module.exports = {
       FlowRouter.reload();
     }
   },
-  createDefaultRecordViewVisible: function(object_name, record_id, record_permissions){
-    if(!Creator.isSpaceAdmin()){
+  createDefaultRecordViewVisible: function(object_name, record_id, record_permissions, data){
+    if(!Creator.isSpaceAdmin() || data.record.name == 'users'){
         return false
     }
     return true;

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

@@ -51,7 +51,7 @@ module.exports = {
         record = Creator.odata.get("objects", record_id, "is_deleted");
     }
     
-    if(record && !record.is_deleted){
+    if(record && !record.is_deleted && record.name != 'users'){
         return true;
     }
   },

package/main/default/pages/object_fields_form.page.amis.json

@@ -0,0 +1,26 @@
+{
+    "type": "service",
+    "body": [
+        {
+            "type": "steedos-object-form",
+            "label": "对象表单",
+            "objectApiName": "object_fields",
+            "recordId": "${recordId}",
+            "className": "",
+            "enableTabs": true,
+            "mode": "edit",
+            "layout": "normal",
+            "submitSuccActions": [
+                {
+                    "actionType": "custom",
+                    "script": "setTimeout(function(){doAction({'actionType': 'setValue','componentId': 'form_object_fields','args': {'value': {'sort_no': event.data.sort_no + 10}}})}, 300)"
+                }
+            ]
+        }
+    ],
+    "data": {
+        "context": {}
+    },
+    "name": "object_fields_form",
+    "id": "u:bb11df394baf"
+}

package/main/default/pages/object_fields_form.page.yml

@@ -0,0 +1,12 @@
+name: object_fields_form
+is_active: true
+label: 对象字段表单
+object_name: object_fields
+pageAssignments:
+  - type: orgDefault
+    page: object_fields_form
+    desktop: true
+    mobile: true
+render_engine: amis
+type: form
+widgets: []

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

@@ -1,13 +1,14 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-28 11:07:57
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-07-29 11:26:31
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-10-16 13:58:22
  * @Description: 
  */
 const InternalData = require('@steedos/standard-objects').internalData;
 const objectql = require('@steedos/objectql');
 const auth = require("@steedos/auth");
+const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 module.exports = {
     beforeInsert: async function(){
         const { doc } = this;
@@ -94,5 +95,8 @@ module.exports = {
                 }
             }
         }
+    },
+    afterDelete: async function(){
+        await sleep(1000 * 2);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.16-beta.2",
+    "version": "2.5.16-beta.4",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "f8b3f647c00f580f9a10547a4a8afec0398bcbe2"
+    "gitHead": "ccb7b9147e269e1dd678765163340db756655199"
 }