npm - @steedos/standard-object-database - Versions diffs - 2.4.0-beta.9 → 2.4.1 - Mend

@steedos/standard-object-database 2.4.0-beta.9 → 2.4.1

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 (22) hide show

package/main/default/objects/14.object_fields.observe.object.js CHANGED Viewed

@@ -1,24 +1,35 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-02-22 10:23:14
+ * @Description:
+ */
 const objectql = require("@steedos/objectql");
 const objectName = "object_fields";
 Meteor.startup(function () {
     var _change, _remove, inited = false;
     _change = function (document) {
-        try {
-            objectql.getSteedosSchema().broker.call(`permission_fields.resetAllPermissionSetFieldPermissions`, {
-                objectName: document.object
-            }, {
-                meta: {
-                    user: {
-                        userId: document.owner,
-                        spaceId: document.space,
-                        company_id: document.company_id,
-                        company_ids: document.company_ids,
+        // 重置字段权限延迟10秒,防止对象服务未上线
+        setTimeout(()=>{
+            try {
+                console.log("====resetAllPermissionSetFieldPermissions====")
+                objectql.getSteedosSchema().broker.call(`permission_fields.resetAllPermissionSetFieldPermissions`, {
+                    objectName: document.object
+                }, {
+                    meta: {
+                        user: {
+                            userId: document.owner,
+                            spaceId: document.space,
+                            company_id: document.company_id,
+                            company_ids: document.company_ids,
+                        }
                     }
-                }
-            });
-        } catch (error) {
-            console.error(`resetAllPermissionSetFieldPermissions`, error)
-        }
+                });
+            } catch (error) {
+                console.error(`resetAllPermissionSetFieldPermissions`, error)
+            }
+        }, 1000 * 10)
     };
     Creator.getCollection(objectName).find({}, {
         fields: {

package/main/default/objects/15.permission_objects.observe.object.js CHANGED Viewed

@@ -1,24 +1,33 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-02-22 10:32:01
+ * @Description:
+ */
 const objectql = require("@steedos/objectql");
 const objectName = "permission_objects";
 Meteor.startup(function () {
     var _change, _remove, inited = false;
     _change = function (document) {
-        try {
-            objectql.getSteedosSchema().broker.call(`permission_fields.resetFieldPermissions`, {
-                permissionObjectId: document._id
-            }, {
-                meta: {
-                    user: {
-                        userId: document.owner,
-                        spaceId: document.space,
-                        company_id: document.company_id,
-                        company_ids: document.company_ids,
+        setTimeout(()=>{
+            try {
+                objectql.getSteedosSchema().broker.call(`permission_fields.resetFieldPermissions`, {
+                    permissionObjectId: document._id
+                }, {
+                    meta: {
+                        user: {
+                            userId: document.owner,
+                            spaceId: document.space,
+                            company_id: document.company_id,
+                            company_ids: document.company_ids,
+                        }
                     }
-                }
-            });
-        } catch (error) {
-            console.error(`resetFieldPermissions`, error)
-        }
+                });
+            } catch (error) {
+                console.error(`resetFieldPermissions`, error)
+            }
+        }, 1000 * 10)
     };
     Creator.getCollection(objectName).find({}, {
         fields: {

package/main/default/objects/object_actions.action.js CHANGED Viewed

@@ -2,12 +2,12 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-21 18:19:06
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-09-22 15:01:31
+ * @LastEditTime: 2023-03-01 10:15:14
  * @Description:
  */
 module.exports = {
   showDesign: function (object_name, record_id) {
-    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.object}`);
+    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.record.object}&assetUrls=${Builder.settings.assetUrls}`);
   },
   showDesignVisible: function (object_name, record_id, record_permissions) {
       var perms;

package/main/default/objects/object_actions.object.yml CHANGED Viewed

@@ -13,22 +13,6 @@ fields:
     label: Object
     create: false
     sort_no: 110
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              var _options;
-              _options = [];
-              _.forEach(Creator.objectsByName, function (o, k) {
-                return _options.push({
-                  label: o.label,
-                  value: k,
-                  icon: o.icon
-                });
-              });
-              return _options;
-            }
   label:
     type: text
     label: Label
@@ -47,6 +31,7 @@ fields:
     type: boolean
     label: Enable
     sort_no: 140
+    defaultValue: true
   visible:
     type: boolean
     omit: true
@@ -73,7 +58,7 @@ fields:
               }, {
                 label: "显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中",
                 value: "record_more",
-                icon: "action.more"
+                icon: "lead_list"
               }, {
                 label: "显示在列表视图中每项的下拉菜单中",
                 value: "list_item",
@@ -85,7 +70,7 @@ fields:
               }, {
                 label: "显示在记录查看页右上角的“更多”下拉菜单中",
                 value: "record_only_more",
-                icon: "action.more"
+                icon: "lead_list"
               }];
             }
   type:
@@ -98,7 +83,7 @@ fields:
         value: amis_button
       # - label: 打印模板(word)
       #   value: word-print
-    defaultValue: script
+    defaultValue: amis_button
   # word_template:
   #   type: lookup
   #   reference_to: word_templates
@@ -121,6 +106,7 @@ fields:
     language: json
     required: false
     is_wide: true
+    hidden: true
     visible_on: "{{formData.type == 'amis_button' ? true: false}}"
 paging:
   enabled: false

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

@@ -14,24 +14,7 @@ fields:
     reference_to_field: name
     required: true
     write_requires_master_read: true
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              var _options;
-              _options = [];
-              _.forEach(Creator.objectsByName, function (o, k) {
-                if(!['base','core','space_users_invite','_object_reload_logs'].includes(k)){
-                  return _options.push({
-                    label: o.label,
-                    value: k,
-                    icon: o.icon
-                  });
-                }
-              });
-              return _options;
-            }
+    filters: ['name', 'notcontains', ['base','core','space_users_invite','_object_reload_logs']]
     sort_no: 110
   label:
     type: text
@@ -108,7 +91,7 @@ fields:
         value: file
       - label: Formula
         value: formula
-      - label: Roll-Up Summary
+      - label: 累计汇总
         value: summary
     sort_no: 150
   defaultValue:
@@ -124,10 +107,6 @@ fields:
     label: Reference to
     reference_to: objects
     reference_to_field: name
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-        return Steedos.getObjectsOptions();
-      }
     visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
     required: "{{['master_detail'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 180
@@ -169,7 +148,7 @@ fields:
     required: "{{['autonumber', 'formula'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 210
   data_type:
-    type: select
+    type: lookup
     label: Data Type
     inlineHelpText: This field must be filled when the field type is 'Formula'
     depend_on:
@@ -326,35 +305,54 @@ fields:
     type: lookup
     label: Object to Summarize
     inlineHelpText: This field must be filled in when the field type is 'Roll-Up Summary'.
+    reference_to: objects
+    reference_to_field: name
     depend_on:
       - object
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function (values) {
-        if(!values.object){
-          return [];
-        }
-        /*在lookup控件编辑的时候values.object为字符串，在记录详细界面为对象*/
-        var objectName = typeof values.object === "string" ? values.object : values.object.name;
-        var object = Creator.getObject(objectName);
-        if(!object){
-          return [];
-        }
-        var relatedObjects = object.related_objects;
-        var _options = [];
-        _.forEach(relatedObjects, function (item, index) {
-          var relatedObject = Creator.Objects[item.object_name];
-          var relatedField = relatedObject && relatedObject.fields[item.foreign_key];
-          /*只需要支持master_detail类型的相关对象，也不支持multiple（本身就不允许配置master_detail为multiple）*/
-          if(relatedField && relatedField.type === "master_detail" && !relatedField.multiple){
-            _options.push({
-              label: relatedObject.label,
-              value: relatedObject.name,
-              icon: relatedObject.icon
-            });
-          }
-        });
-        return _options;
-      }
+    amis:
+      "source":
+        "method": "get"
+        "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object}/detailLists/options?depend_on_object=${object}"
+        "headers":
+          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+        "adaptor": ""
+        "sendOn": "this.object"
+        "requestAdaptor": ""
+      "autoComplete":
+        "method": "get"
+        "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object}/detailLists/options?depend_on_object=${object}"
+        "headers":
+          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+        "adaptor": ""
+        "sendOn": "this.object"
+        "requestAdaptor": ""
+    # optionsFunction: !<tag:yaml.org,2002:js/function> |-
+    #   function (values) {
+    #     if(!values.object){
+    #       return [];
+    #     }
+    #     /*在lookup控件编辑的时候values.object为字符串，在记录详细界面为对象*/
+    #     var objectName = typeof values.object === "string" ? values.object : values.object.name;
+    #     var object = Creator.getObject(objectName);
+    #     if(!object){
+    #       return [];
+    #     }
+    #     var relatedObjects = object.related_objects;
+    #     var _options = [];
+    #     _.forEach(relatedObjects, function (item, index) {
+    #       var relatedObject = Creator.Objects[item.object_name];
+    #       var relatedField = relatedObject && relatedObject.fields[item.foreign_key];
+    #       /*只需要支持master_detail类型的相关对象，也不支持multiple（本身就不允许配置master_detail为multiple）*/
+    #       if(relatedField && relatedField.type === "master_detail" && !relatedField.multiple){
+    #         _options.push({
+    #           label: relatedObject.label,
+    #           value: relatedObject.name,
+    #           icon: relatedObject.icon
+    #         });
+    #       }
+    #     });
+    #     return _options;
+    #   }
     visible_on: "{{formData.type === 'summary' ? true: false}}"
     required: "{{formData.type === 'summary' ? true: false}}"
     sort_no: 300
@@ -584,6 +582,13 @@ fields:
     is_wide: true
     group: Advanced
     sort_no: 470
+  amis:
+    label: Amis 属性
+    type: code
+    language: json
+    is_wide: true
+    group: Advanced
+    sort_no: 455
 paging:
   enabled: false
 list_views:

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

@@ -1,16 +1,16 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-06-08 11:12:24
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-03-05 16:47:05
  * @Description:
  */
 module.exports = {
   listenTo: 'objects',
   createDefaultRecordView: function (object_name, record_id, item_element) {
-    if(object_name === 'objects' && this.record){
-      const objectApiName = this.record.name;
+    if(object_name === 'objects' && this.record && this.record.record){
+      const objectApiName = this.record.record.name;
       $("body").addClass("loading");
       const res = Steedos.authRequest(`/service/api/@${objectApiName}/defUiSchema`, { type: 'post', async: false});
       $("body").removeClass("loading");

package/main/default/objects/object_layouts.layouts.action.js CHANGED Viewed

@@ -13,9 +13,11 @@ module.exports = {
         }
     });
   },
-  customizeVisible: function(object_name, record_id, record_permissions, record){
-      return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+  customizeVisible: function(object_name, record_id, record_permissions, data){
+    var record = data && data.record;
+    return Creator.baseObject.actions.standard_new.visible() && record.is_system;
   },
+  /*
   standard_new: function (object_name, record_id, fields){
 		var object = Creator.getObject(object_name);
     var gridName = this.action.gridName;
@@ -48,6 +50,7 @@ module.exports = {
       });
     }
   },
+  */
   /*
   standard_edit: function (object_name, record_id, fields){
 		var object = Creator.getObject(object_name);

package/main/default/objects/object_layouts.object.yml CHANGED Viewed

@@ -22,18 +22,6 @@ fields:
     reference_to: objects
     reference_to_field: name
     write_requires_master_read: true
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              var _options = [];
-              _.forEach(Creator.objectsByName, function (o, k) {
-                return _options.push({
-                  label: o.label,
-                  value: k,
-                  icon: o.icon
-                });
-              });
-              return _options;
-            }
   type:
     type: select
     options:
@@ -51,6 +39,8 @@ fields:
     multiple: true
     required: true
     create: false
+    reference_to: permission_set
+    reference_to_field: name
     optionsFunction: !<tag:yaml.org,2002:js/function> |-
       function () {
         var profiles = Creator.odata.query('permission_set', {$filter: "(type eq 'profile')"}, true);
@@ -71,23 +61,10 @@ fields:
       - object_name
   buttons.$.button_name:
     type: lookup
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function (values) {
-        if (!(values != null ? values.object_name : void 0)) {
-          values.object_name = Session.get("object_name");
-        }
-        if(values.object_name && !_.isString(values.object_name)){
-          values.object_name = values.object_name.name
-        }
-        const options = [];
-        if(values){
-          var actions = Creator.getObject(values.object_name).actions;
-          _.each(actions, function(action){
-            options.push({label: action.label, value: action.name})
-          })
-        }
-        return options;
-      }
+    reference_to: object_actions
+    reference_to_field: name
+    depend_on:
+      - object_name
   buttons.$.visible_on:
     label: Visible on
     type: textarea
@@ -119,24 +96,6 @@ fields:
     reference_to_field: name
     depend_on:
       - object_name
-    filtersFunction: !<tag:yaml.org,2002:js/function> |-
-      function (filters, values) {
-        if(values && values.object_name){
-          if(values._grid_row_id){
-            var selected = _.find(values.fields, function(item){return item._id==values._grid_row_id});
-            var selectedAll = _.pluck(values.fields, 'field_name');
-            if(selected){
-              selectedAll = _.difference(selectedAll, [selected.field_name]);
-            }
-            if(selectedAll && selectedAll.length > 0){
-              return [['object', '=', values.object_name], ['name', '!=', selectedAll]]
-            }
-          }
-          return ['object', '=', values.object_name]
-        }else{
-          return ['_id', '=', 'no']
-        }
-      }
   fields.$.is_readonly:
     label: Readonly
     type: boolean

package/main/default/objects/object_listviews.action.js CHANGED Viewed

@@ -31,8 +31,9 @@ module.exports = {
       });
   },
-  customizeVisible: function(object_name, record_id, record_permissions, record){
-      return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+  customizeVisible: function(object_name, record_id, record_permissions, data){
+    var record = data && data.record;
+    return Creator.baseObject.actions.standard_new.visible() && record.is_system;
   },
   copy: function(object_name, record_id){
     let newRecord = null; // _.clone(Creator.getListView(Session.get("object_name"), record_id));
@@ -87,11 +88,11 @@ module.exports = {
     }
     Steedos.Page.Form.StandardNew.render(Session.get("app_id"), 'object_listviews', t("creator_list_copy_list_view"), data, {});
   },
-  copyVisible: function(object_name, record_id, record_permissions, record){
+  copyVisible: function(object_name, record_id, record_permissions, data){
     return true;
   },
   showDesign: function (object_name, record_id) {
-    document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}`);
+    document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}`);
   },
   showDesignVisible: function (object_name, record_id, record_permissions) {
       var perms= {};

package/main/default/objects/object_listviews.object.yml CHANGED Viewed

@@ -22,22 +22,6 @@ fields:
     required: true
     reference_to: objects
     reference_to_field: name
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              var _options;
-              _options = [];
-              _.forEach(Creator.objectsByName, function (o, k) {
-                return _options.push({
-                  label: o.label,
-                  value: k,
-                  icon: o.icon
-                });
-              });
-              return _options;
-            }
   filter_scope:
     label: Filter Scope
     type: select
@@ -320,6 +304,20 @@ fields:
     required: false
     is_wide: true
     # visible_on: "{{formData.enable_amis_schema}}"
+  requestAdaptor:
+    label: 发送适配器
+    type: code
+    language: "javascript"
+    is_wide: true
+    inlineHelpText: "函数签名：(api) => api， 数据在 api.data 中，修改后返回 api 对象。"
+    group: 数据接口
+  adaptor:
+    label: 接收适配器
+    type: code
+    language: "javascript"
+    is_wide: true
+    inlineHelpText: "函数签名: (payload, response, api) => payload"
+    group: 数据接口
 paging:
   enabled: false
 list_views:

package/main/default/objects/object_related_list.object.yml CHANGED Viewed

@@ -9,22 +9,6 @@ fields:
     required: true
     reference_to: objects
     reference_to_field: name
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              var _options;
-              _options = [];
-              _.forEach(Creator.objectsByName, function (o, k) {
-                return _options.push({
-                  label: o.label,
-                  value: k,
-                  icon: o.icon
-                });
-              });
-              return _options;
-            }
   objectName:
     label: Related Object
     type: lookup
@@ -42,7 +26,7 @@ fields:
               _options = [];
               _.forEach(Creator.objectsByName, function (o, k) {
-                if(_.include(['cms_files', 'instances', 'tasks', 'notes', 'events', 'approvals', 'audit_records'], k)){
+                if(_.includes(['cms_files', 'instances', 'tasks', 'notes', 'events', 'approvals', 'audit_records'], k)){
                   return _options.push({
                     label: o.label,
                     value: k,

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

@@ -18,22 +18,6 @@ fields:
     reference_to: objects
     reference_to_field: name
     required: true
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              var _options;
-              _options = [];
-              _.forEach(Creator.objectsByName, function (o, k) {
-                return _options.push({
-                  label: o.label,
-                  value: k,
-                  icon: o.icon
-                });
-              });
-              return _options;
-            }
   # on:
   #   label: 运行于
   #   type: lookup

package/main/default/objects/object_validation_rules.action.js CHANGED Viewed

@@ -24,7 +24,8 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function(object_name, record_id, record_permissions, record){
+    customizeVisible: function(object_name, record_id, record_permissions, data){
+        var record = data && data.record;
         if(!record){
             record = {}
         }

package/main/default/objects/object_validation_rules.object.yml CHANGED Viewed

@@ -16,10 +16,6 @@ fields:
     write_requires_master_read: true
     reference_to_field: name
     required: true
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-        return Steedos.getObjectsOptions();
-      }
   active:
     type: boolean

package/main/default/objects/objects/pages/object_detail.page.amis.json ADDED Viewed

@@ -0,0 +1,185 @@
+{
+    "type": "page",
+    "body": [
+        {
+            "type": "steedos-record-detail-header",
+            "label": "标题面板",
+            "objectApiName": "${objectName}",
+            "recordId": "${recordId}",
+            "onEvent": {
+                "recordLoaded": {
+                    "actions": [
+                        {
+                            "actionType": "setValue",
+                            "args": {
+                                "value": {
+                                    "recordLoaded": true
+                                }
+                            }
+                        },
+                        {
+                            "actionType": "reload",
+                            "data": {
+                                "name": "${record.label}",
+                                "record": "${record}",
+                                "recordLoaded": true
+                            }
+                        }
+                    ]
+                }
+            },
+            "id": "u:bc56cf9d43bc"
+        },
+        {
+            "type": "tabs",
+            "tabs": [
+                {
+                    "title": "详情",
+                    "body": [
+                        {
+                            "type": "steedos-object-form",
+                            "label": "对象表单",
+                            "mode": "read",
+                            "objectApiName": "${objectName}",
+                            "recordId": "${recordId}",
+                            "labelAlign": "left",
+                            "id": "u:4eb5fa6f6fad"
+                        }
+                    ],
+                    "id": "u:b2fbc13aabb8"
+                },
+                {
+                    "title": "对象字段",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "object_fields",
+                            "id": "u:6bef459155bd",
+                            "top": 2000
+                        }
+                    ],
+                    "id": "u:f1a52545b642"
+                },
+                {
+                    "title": "列表视图",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "object_listviews",
+                            "id": "u:c415f75c5557",
+                            "perPage": 20
+                        }
+                    ],
+                    "id": "u:df900c5f2119"
+                },
+                {
+                    "title": "操作按钮",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "object_actions",
+                            "perPage": 20,
+                            "id": "u:e1a8b77a140c"
+                        }
+                    ],
+                    "id": "u:d75b105f6d02"
+                },
+                {
+                    "title": "页面布局",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "object_layouts",
+                            "id": "u:ed9559f8aa86",
+                            "perPage": 20
+                        }
+                    ],
+                    "id": "u:ee4ab13a92e6"
+                },
+                {
+                    "title": "对象权限",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "permission_objects",
+                            "perPage": 20
+                        }
+                    ]
+                },
+                {
+                    "title": "流程映射",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "object_workflows",
+                            "perPage": 20,
+                            "id": "u:e14df76cfa51"
+                        }
+                    ],
+                    "id": "u:cbc13e1a7033"
+                },
+                {
+                    "title": "验证规则",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "object_validation_rules",
+                            "perPage": 20
+                        }
+                    ]
+                },
+                {
+                    "title": "限制规则",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "restriction_rules",
+                            "perPage": 20
+                        }
+                    ]
+                },
+                {
+                    "title": "共享规则",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "share_rules",
+                            "perPage": 20
+                        }
+                    ]
+                }
+            ],
+            "id": "u:6a3b45d7adcf",
+            "tabsMode": "vertical",
+            "className": "object-detail-tabs mt-3 bg-white border-b sm:shadow sm:rounded sm:border border-slate-300",
+            "toolbarClassName": "",
+            "linksClassName": "",
+            "contentClassName": "bg-white"
+        }
+    ],
+    "regions": [
+        "body"
+    ],
+    "id": "page_objects_record_detail",
+    "name": "page_objects_record_detail",
+    "bodyClassName": "",
+    "className": "object-detail-page"
+}

package/main/default/objects/objects/pages/object_detail.page.yml ADDED Viewed

@@ -0,0 +1,12 @@
+name: object_detail
+is_active: true
+label: 对象详细页面
+object_name: objects
+pageAssignments:
+  - type: orgDefault
+    page: object_detail
+    desktop: true
+    mobile: true
+render_engine: amis
+type: record
+widgets: []

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

@@ -42,7 +42,8 @@ module.exports = {
     //     Steedos.openWindow(Creator.getRelativeUrl("/app/-/" + record.name + "/grid/all"))
     // }
   },
-  show_objectVisible: function(object_name, record_id, record_permissions, record){
+  show_objectVisible: function(object_name, record_id, record_permissions, data){
+    var record = data && data.record;
     if(!Creator.isSpaceAdmin()){
         return false
     }
@@ -80,7 +81,8 @@ module.exports = {
         return toastr.error('复制失败: 未启用API');
     }
   },
-  copy_odataVisible: function(object_name, record_id, record_permissions, record){
+  copy_odataVisible: function(object_name, record_id, record_permissions, data){
+    var record = data && data.record;
     if(!Creator.isSpaceAdmin()){
         return false
     }
@@ -144,7 +146,8 @@ module.exports = {
 //       }
 //   }, null, { iconPath: '/assets/icons' })
 //   },
-  delete_objectVisible: function(object_name, record_id, record_permissions, record){
+  delete_objectVisible: function(object_name, record_id, record_permissions, data){
+    var record = data && data.record;
     if(!Creator.isSpaceAdmin()){
         return false
     }

package/main/default/objects/objects.object.yml CHANGED Viewed

@@ -27,6 +27,7 @@ fields:
     label: Label
     required: true
     is_name: true
+    searchable: true
   name:
     type: text
     label: API Name
@@ -242,6 +243,7 @@ fields:
     omit: true
     disabled: false
     readonly: false
+    visible_on: "{{global.mode ==='read' ? true : false}}"
   reload_time:
     type: datetime
     hidden: true
@@ -254,6 +256,7 @@ fields:
     group: script
     blackbox: true
     is_wide: true
+    visible_on: "{{false}}"
   form.onRendered:
     type: code
     language: javascript

package/main/default/routes/amis_button_design.router.js CHANGED Viewed

@@ -15,19 +15,8 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrl = "";
-        let assetUrls = null;
-        if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
-            assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
-            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
-        }else{
-            var fullPath = path.resolve(path.dirname(require.resolve('@steedos-ui/builder-widgets' + '/package.json')));
-            var packageFile = path.join(fullPath,'package.json');
-            var pkg = require(packageFile);
-            moduleVersion = pkg.version;
-            assetUrls = [`https://unpkg.com/@steedos-ui/builder-widgets@${moduleVersion}/dist/assets.json`];
-            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
-        }
+        let assetUrls = req.query.assetUrls;
+        const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
         // const dataContext = {
         //     rootUrl: __meteor_runtime_config__.ROOT_URL,
@@ -38,7 +27,7 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
         const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/objects/${req.query.object}/object_actions/grid?related_field_name=object`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}&retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}`;
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

package/main/default/routes/amis_listview_design.router.js CHANGED Viewed

@@ -15,20 +15,8 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrl = "";
-        let assetUrls = null;
-        if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
-            assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
-            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
-        }else{
-            var fullPath = path.resolve(path.dirname(require.resolve('@steedos-ui/builder-widgets' + '/package.json')));
-            var packageFile = path.join(fullPath,'package.json');
-            var pkg = require(packageFile);
-            moduleVersion = pkg.version;
-            assetUrls = [`https://unpkg.com/@steedos-ui/builder-widgets@${moduleVersion}/dist/assets.json`];
-            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
-        }
+        let assetUrls = req.query.assetUrls;
+        const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
         // const dataContext = {
         //     rootUrl: __meteor_runtime_config__.ROOT_URL,
         //     tenantId: userSession.spaceId,
@@ -38,7 +26,7 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
         const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/objects/${req.query.object}/object_listviews/grid?related_field_name=object`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}&retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}`;
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

package/main/default/triggers/object_fields.code.trigger.js ADDED Viewed

@@ -0,0 +1,21 @@
+const objectql = require('@steedos/objectql');
+const _ = require('lodash');
+module.exports = {
+    listenTo: 'object_fields',
+    beforeInsert: async function(){
+        const { doc } = this;
+        if(doc && _.has(doc, 'amis') && _.isString(doc.amis)){
+            doc.amis = JSON.parse(doc.amis);
+        }
+    },
+    beforeUpdate: async function(){
+        const { doc } = this;
+        if(doc && _.has(doc, 'amis') && _.isString(doc.amis)){
+            doc.amis = JSON.parse(doc.amis);
+        }
+    },
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.4.0-beta.9",
+    "version": "2.4.1",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -11,9 +11,9 @@
     ],
     "description": "steedos package",
     "dependencies": {
-        "@steedos-widgets/amis-lib": "^1.0.10"
+        "@steedos-widgets/amis-lib": "^1.0.22"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "7f75a50d8d5ac875eb577d586981ba654a5180ff"
+    "gitHead": "ae77c1ed63399245141bf7237cd3966bfc4dc6b1"
 }