@steedos/standard-object-database 2.5.0-beta.1 → 2.5.0-beta.11

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

@@ -381,48 +381,23 @@ fields:
   summary_field:
     type: lookup
     label: Field to Aggregate
+    reference_to: object_fields
+    reference_to_field: name
     inlineHelpText: If the field type is a 'Roll-Up Summary' and the 'Roll-Up Type' is not COUNT, this field must be filled in, Only fields that aggregate number, currency, date, and datetime types are supported.
     depend_on:
       - summary_object
       - summary_type
     defaultIcon: service_contract
-    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
-      function (values) {
-        if(!values.summary_object){
-          return [];
-        }
-        if(values.summary_type && values.summary_type !== "count"){
-          var options = Creator.getObjectLookupFieldOptions(values.summary_object, false, true);
-          var object = Creator.getObject(values.summary_object);
-          var fields = object ? object.fields : null;
-          if(!fields){
-            return [];
-          }
-          if(values.summary_type === "sum" || values.summary_type === "avg"){
-            /*sum/avg类型可以汇总数值、金额、百分比字段*/
-            options = options.filter(function(option){
-              var optionFieldType = fields[option.value] && fields[option.value].type;
-              if(["formula", "summary"].indexOf(optionFieldType) > -1){
-                /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/
-                optionFieldType = fields[option.value].data_type;
-              }
-              return ["number", "currency", "percent"].indexOf(optionFieldType) > -1
-            });
-          }
-          else{
-            /*min、max类型可以汇总数值、金额、百分比、日期、日期时间字段*/
-            options = options.filter(function(option){
-              var optionFieldType = fields[option.value] && fields[option.value].type;
-              if(["formula", "summary"].indexOf(optionFieldType) > -1){
-                /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/
-                optionFieldType = fields[option.value].data_type;
-              }
-              return ["number", "currency", "percent", "date", "datetime"].indexOf(optionFieldType) > -1
-            });
-          }
-          return options;
-        }
-      }
+    amis:
+      "autoComplete": 
+        "method": "get"
+        "url": "${context.rootUrl}/service/api/@${summary_object}/uiSchema?summary_object=${summary_object}&summary_type=${summary_type}&term=${term}"
+        "data": 
+          "summary_type": "${summary_type}"
+        "headers": 
+          "Authorization": "Bearer ${context.tenantId},${context.authToken}" 
+        "sendOn": "!!this.summary_object && !!this.summary_type"
+        "adaptor": "const summary_type = api.body.summary_type;\nconst term = api.query.term;\nlet fields = payload.fields;\nlet options = [];\nif (fields) {\n  if (summary_type && summary_type !== \"count\") {\n    if (summary_type === \"sum\" || summary_type === \"avg\") {\n      /*sum/avg类型可以汇总数值、金额、百分比字段*/\n      _.forEach(fields, (value, key) => {\n        let fieldType = value.type;\n        if ([\"formula\", \"summary\"].indexOf(fieldType) > -1) {\n          /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/\n          fieldType = value.data_type;\n        }\n        if ([\"number\", \"currency\", \"percent\"].indexOf(fieldType) > -1) {\n          options.push({ label: value.label, value: value.name });\n        }\n      })\n    }\n    else {\n      /*min、max类型可以汇总数值、金额、百分比、日期、日期时间字段*/\n      _.forEach(fields, (value, key) => {\n        let fieldType = value.type;\n        if ([\"formula\", \"summary\"].indexOf(fieldType) > -1) {\n          /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/\n          fieldType = value.data_type;\n        }\n        if ([\"number\", \"currency\", \"percent\", \"date\", \"datetime\"].indexOf(fieldType) > -1) {\n          options.push({ label: value.label, value: value.name });\n        }\n      })\n    }\n  }\n  if (term) {\n    options = _.filter(options, (item) => {\n      return item.label.toLowerCase().indexOf(term.toLowerCase()) > -1;\n    })\n  }\n}\npayload = {\n  data: { options: options },\n  msg: \"\",\n  status: 0\n}\nreturn payload;"
     visible_on: "{{formData.type === 'summary' && formData.summary_type !== 'count' ? true: false}}"
     required: "{{formData.type === 'summary' && formData.summary_type !== 'count' ? true: false}}"
     sort_no: 320
@@ -433,7 +408,7 @@ fields:
     is_wide: true
     depend_on:
       - summary_object
-    visible_on: "{{formData.type === 'summary' ? true: false}}"
+    visible_on: "{{formData.type === 'summary' && global.mode !='read' ? true: false}}"
     sort_no: 330
   summary_filters.$:
     label: Filter Criteria
@@ -600,7 +575,7 @@ list_views:
     columns:
       - label
       - name
-      - column_name
+      - group
       - type
       - object
       - sort_no

package/main/default/objects/object_layouts/buttons/standard_edit.button.yml

@@ -12,7 +12,7 @@ amis_schema: |-
                     "actions": [
                         {
                             "actionType": "custom",
-                            "script": "const appId = null;\nconst page = Steedos.Page.getPage('form', appId, null, null, \"object_layouts\");\nif (page && page.schema) {\n  const pageSchema = JSON.parse(page.schema);\n  let formSchema = pageSchema.body[0];\n  // 设置form的canAccessSuperData属性防止弹出窗口从父级取字段默认值\n  formSchema.canAccessSuperData = false;\n  // 设置form的wrapWithPanel属性隐藏其底部保存取消按钮\n  formSchema.wrapWithPanel = false;\n  formSchema.className = \"steedos-amis-form\";\n  const title = \"编辑 页面布局\";\n  doAction({\n    \"actionType\": \"dialog\",\n    \"dialog\": {\n      \"type\": \"dialog\",\n      \"title\": title,\n      \"body\": [{\n        \"type\": \"service\",\n        \"body\": [formSchema],\n        \"data\": {\n          \"objectName\": \"${object_name}\",\n          \"recordId\": \"${record_id}\"\n        }\n      }],\n      \"size\": \"lg\"\n    }\n  });\n}"
+                            "script": "const appId = null;\nconst page = Steedos.Page.getPage('form', appId, null, null, \"object_layouts\");\nif (page && page.schema) {\n  const pageSchema = JSON.parse(page.schema);\n  let formSchema = pageSchema.body[0];\n  // 设置form的canAccessSuperData属性防止弹出窗口从父级取字段默认值\n  formSchema.canAccessSuperData = false;\n  // 设置form的wrapWithPanel属性隐藏其底部保存取消按钮\n  formSchema.wrapWithPanel = false;\n  formSchema.className = \"steedos-amis-form\";\n  const title = \"编辑 页面布局\";\n  doAction({\n    \"actionType\": \"dialog\",\n    \"dialog\": {\n      \"type\": \"dialog\",\n      \"title\": title,\n      \"body\": [formSchema],\n      \"size\": \"lg\"\n    }\n  });\n}"
                         }
                     ],
                     "weight": 0

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

@@ -13,7 +13,6 @@ fields:
     type: text
     searchable: true
     index: true
-    required: true
     inlineHelpText: Can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore character or contain two consecutive underscore characters
   object_name:
     label: Object
@@ -78,18 +77,8 @@ fields:
     required: true
     depend_on:
       - object_name
-    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
-              }
-
-              return Creator.getObjectFieldOptions(values != null ? values.object_name : void 0, true);
-            }
+    reference_to: object_fields
+    reference_to_field: name
   columns.$.width:
     label: Width
     type: text
@@ -104,16 +93,8 @@ fields:
     is_wide: true
     depend_on:
       - object_name
-    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
-              }
-              return Creator.getObjectFieldOptions(values != null ? values.object_name : void 0);
-            }
+    reference_to: object_fields
+    reference_to_field: name
   sort:
     label: Default Sort Order
     type: grid
@@ -127,32 +108,8 @@ fields:
   sort.$.field_name:
     label: Field Name
     type: lookup
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function (values) {
-              var _object, _options, fields, icon;
-              if(values.object_name && !_.isString(values.object_name)){
-                values.object_name = values.object_name.name
-              }
-              _options = [];
-              _object = Creator.getObject(values != null ? values.object_name : void 0);
-              fields = Creator.getFields(values != null ? values.object_name : void 0);
-              icon = _object.icon;
-
-              _.forEach(fields, function (f) {
-                var label;
-
-                if (!_object.fields[f].hidden) {
-                  label = _object.fields[f].label;
-                  return _options.push({
-                    label: label || f,
-                    value: f,
-                    icon: icon
-                  });
-                }
-              });
-
-              return _options;
-            }
+    reference_to: object_fields
+    reference_to_field: name
   sort.$.order:
     label: Sort Order
     type: select
@@ -167,7 +124,7 @@ fields:
     type: code
     is_wide: true
     hidden: false
-    readonly: true
+    readonly: false
     visible_on: "{{global.mode ==='read' ? true : false}}"
     depend_on:
       - object_name
@@ -240,18 +197,8 @@ fields:
     type: lookup
     multiple: false
     is_wide: false
-    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
-              }
-
-              return Creator.getObjectFieldOptions(values != null ? values.object_name : void 0, true);
-            }
+    reference_to: object_fields
+    reference_to_field: name
   searchable_fields:
     label: Searchable Fields
     type: grid
@@ -267,18 +214,8 @@ fields:
     type: lookup
     multiple: false
     is_wide: false
-    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
-              }
-
-              return Creator.getObjectFieldOptions(values != null ? values.object_name : void 0, true);
-            }
+    reference_to: object_fields
+    reference_to_field: name
   sort_no:
     label: Sort no
     type: number

package/main/default/objects/objects/buttons/delete_object.button.yml

@@ -29,7 +29,7 @@ amis_schema: |-
                                   "showCloseButton": true,
                                   "data": {
                                       "&": "$$",
-                                      "record": "${record}"
+                                      "recordId": "${recordId}"
                                   },
                                   "onEvent": {
                                       "confirm": {
@@ -43,9 +43,9 @@ amis_schema: |-
                                                           "method": "post",
                                                           "data": {
                                                                 "&": "$$",
-                                                                "record": "${record}"
+                                                                "recordId": "${recordId}"
                                                             },
-                                                          "requestAdaptor": "console.log(`api`, api);const record = api.body.record; \napi.data = {\n  query: `\n    mutation{\n    objects__delete(id: \"${record._id}\")\n  }\n  `\n}",
+                                                          "requestAdaptor": "const recordId = api.data.recordId; \napi.data = {\n  query: `\n    mutation{\n    objects__delete(id: \"${recordId}\")\n  }\n  `\n}",
                                                           "headers": {
                                                               "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                           }
@@ -55,12 +55,15 @@ amis_schema: |-
                                                   "actionType": "ajax"
                                               },
                                               {
-                                                "componentId": "",
+                                                "actionType": "broadcast",
                                                 "args": {
-                                                    "url": "/app/admin/objects/grid/all"
+                                                    "eventName": "@data.changed.objects"
                                                 },
-                                                "actionType": "link"
+                                                "data": {
+                                                    "objectName": "objects",
+                                                    "__deletedRecord": true
                                                 }
+                                            }
                                           ]
                                       }
                                   }

package/main/default/objects/objects.core.js

@@ -225,22 +225,24 @@ function loadObject(doc, oldDoc) {
         objectql.loadObjectLazyListenners(doc.name);
         objectql.loadObjectLazyButtons(doc.name);
         //获取到继承后的对象
-        const _doc = objectql.getObjectConfig(doc.name);
+        // const _doc = objectql.getObjectConfig(doc.name);
+        // console.log(`loadObject===>`, doc.name)
         objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){            
             if(res){
-                datasource.setObject(doc.name, _doc);
-                try {
-                    if (!datasourceName || datasourceName == defaultDatasourceName) {
-                        Creator.Objects[doc.name] = _doc;
-                        Creator.loadObjects(_doc, _doc.name);
-                    }
-                } catch (error) {
-                    console.log('error', error);
-                }
-                if (!oldDoc || (oldDoc && oldDoc.is_enable === false && doc.is_enable)) {
-                    loadObjectTriggers(doc);
-                    loadObjectPermission(doc);
-                }
+                // datasource.setObject(doc.name, _doc);
+                // try {
+                //     if (!datasourceName || datasourceName == defaultDatasourceName) {
+                //         Creator.Objects[doc.name] = _doc;
+                //         Creator.loadObjects(_doc, _doc.name);
+                //     }
+                // } catch (error) {
+                //     console.log('error', error);
+                // }
+                // if (!oldDoc || (oldDoc && oldDoc.is_enable === false && doc.is_enable)) {
+                //     loadObjectTriggers(doc);
+                //     loadObjectPermission(doc);
+                // }
+                
                 objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
             }
         })
@@ -342,7 +344,7 @@ function reloadObject(changeLog){
             return 
         }
         //获取到最新的对象
-        const object = objectql.getObjectConfig(objectName);
+        const object = objectql.getOriginalObjectConfig(objectName);
 
         let _mf =  _.max(_.values(object.fields), function (field) { return field.sort_no; });
         if(_mf && object.name){
@@ -355,18 +357,18 @@ function reloadObject(changeLog){
         if(deleted.actions.length == 0){
             deleted.actions = null;
         }
-
+        // console.log(`reloadObject===>`, object.name)
         objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, Object.assign({}, object, {isMain:false, __deleted: deleted})).then(function(res){            
             if(res){
-                datasource.setObject(object.name, object);
-                try {
-                    if(!objectDataSourceName || objectDataSourceName == defaultDatasourceName){
-                        Creator.Objects[object.name] = object;
-                        Creator.loadObjects(object, object.name);
-                    }
-                } catch (error) {
-                    console.log('error', error);
-                }
+                // datasource.setObject(object.name, object);
+                // try {
+                //     if(!objectDataSourceName || objectDataSourceName == defaultDatasourceName){
+                //         Creator.Objects[object.name] = object;
+                //         Creator.loadObjects(object, object.name);
+                //     }
+                // } catch (error) {
+                //     console.log('error', error);
+                // }
                 objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
             }
         })

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

@@ -1,34 +1,12 @@
 {
-    "type": "page",
+    "type": "steedos-record-service",
     "body": [
         {
             "type": "steedos-record-detail-header",
+            "id": "u:bc56cf9d43bc",
             "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"
+            "recordId": "${recordId}"
         },
         {
             "type": "tabs",
@@ -41,9 +19,9 @@
                             "label": "对象表单",
                             "mode": "read",
                             "objectApiName": "${objectName}",
-                            "recordId": "${recordId}",
                             "labelAlign": "left",
-                            "id": "u:4eb5fa6f6fad"
+                            "id": "u:4eb5fa6f6fad",
+                            "recordId": "${recordId}"
                         }
                     ],
                     "id": "u:b2fbc13aabb8"
@@ -54,10 +32,11 @@
                         {
                             "type": "steedos-object-related-listview",
                             "objectApiName": "objects",
-                            "recordId": "${recordId}",
                             "relatedObjectApiName": "object_fields",
                             "id": "u:6bef459155bd",
-                            "top": 2000
+                            "top": 2000,
+                            "recordId": "${recordId}",
+                            "relatedKey": "object"
                         }
                     ],
                     "id": "u:f1a52545b642"
@@ -68,10 +47,10 @@
                         {
                             "type": "steedos-object-related-listview",
                             "objectApiName": "objects",
-                            "recordId": "${recordId}",
                             "relatedObjectApiName": "object_listviews",
                             "id": "u:c415f75c5557",
-                            "perPage": 20
+                            "perPage": 20,
+                            "recordId": "${recordId}"
                         }
                     ],
                     "id": "u:df900c5f2119"
@@ -82,24 +61,39 @@
                         {
                             "type": "steedos-object-related-listview",
                             "objectApiName": "objects",
-                            "recordId": "${recordId}",
                             "relatedObjectApiName": "object_actions",
                             "perPage": 20,
-                            "id": "u:e1a8b77a140c"
+                            "id": "u:e1a8b77a140c",
+                            "recordId": "${recordId}"
                         }
                     ],
                     "id": "u:d75b105f6d02"
                 },
+                {
+                    "title": "对象页面",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "relatedObjectApiName": "pages",
+                            "relatedKey": "object_name",
+                            "perPage": 20,
+                            "id": "u:e1a8b77a140c2",
+                            "recordId": "${recordId}"
+                        }
+                    ],
+                    "id": "u:d75b105f6d042"
+                },
                 {
                     "title": "页面布局",
                     "body": [
                         {
                             "type": "steedos-object-related-listview",
                             "objectApiName": "objects",
-                            "recordId": "${recordId}",
                             "relatedObjectApiName": "object_layouts",
                             "id": "u:ed9559f8aa86",
-                            "perPage": 20
+                            "perPage": 20,
+                            "recordId": "${recordId}"
                         }
                     ],
                     "id": "u:ee4ab13a92e6"
@@ -178,11 +172,19 @@
             "contentClassName": "bg-white"
         }
     ],
-    "regions": [
-        "body"
-    ],
+    "objectApiName": "${objectName}",
+    "data": {
+        "objectName": "objects",
+        "recordId": "space_users",
+        "context": {
+            "rootUrl": "http://127.0.0.1:5800",
+            "tenantId": "hKdnwE55WcnWveYxS",
+            "userId": "62ede4f62161e377e35de58c",
+            "authToken": "b6475c5536a26d23d3db84e96536e08e82e1e726380cdd5cb09fc977e1d6e57c08fb23d7a1090006189d3d"
+        }
+    },
     "id": "page_objects_record_detail",
     "name": "page_objects_record_detail",
     "bodyClassName": "",
     "className": "object-detail-page"
-}
+}

package/main/default/routes/amis_button_design.ejs

@@ -127,6 +127,7 @@
           delete schema.data.context.tenantId;
           delete schema.data.context.authToken;
           delete schema.data.context.user;
+          delete schema.data.context.rootUrl;
         }
         return await axios.post(
           `${rootUrl}/graphql`,

package/main/default/routes/amis_listview_design.ejs

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-02 17:45:15
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-14 16:06:17
+ * @LastEditTime: 2023-04-09 12:15:18
  * @Description: 
 -->
 <html>
@@ -37,9 +37,6 @@
         const initialContent = {
           type: "service",
           bodyClassName: 'p-0',
-          regions: [
-            "body"
-          ]
         };
 
         if (id) {
@@ -69,7 +66,10 @@
             let schema = button?.amis_schema ;
             if(!schema){
               schema = Object.assign({}, initialContent, {body: [
-                
+                {
+                  "type": "steedos-object-table",
+                  "objectApiName": "${objectName}"
+              }
               ]});
             }
 
@@ -88,7 +88,7 @@
 
             schema.data.app_id = '';
             schema.data.tab_id = '';
-            schema.data.object_name = '';
+            schema.data.objectName = '<%=object_name%>';
             schema.data.dataComponentId = '';
             schema.data.record_id = '';
             schema.data.record = {};
@@ -122,6 +122,7 @@
           delete schema.data.context.tenantId;
           delete schema.data.context.authToken;
           delete schema.data.context.user;
+          delete schema.data.context.rootUrl;
         }
         return await axios.post(
           `${rootUrl}/graphql`,
@@ -151,6 +152,7 @@
         if (data) {
           if (data.type === 'builder.loadContent') {
             loadPage().then((content)=>{
+              console.log("loadPage====", content)
               comp.messageFrame('builder.contentChanged', { AmisSchema : content } )
             })
           }

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

@@ -10,6 +10,7 @@ const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
+const objectql = require('@steedos/objectql');
 
 router.get('/api/amisListviewDesign', core.requireAuthentication, async function (req, res) {
     try {
@@ -27,7 +28,7 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
         const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/object_listviews/view/${req.query.id}`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
         const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}`;
-
+        const record = await objectql.getObject('object_listviews').findOne(req.query.id);
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));
 
@@ -40,6 +41,7 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
             userId: userSession.userId,
             authToken: userSession.authToken,
             id: req.query.id,
+            object_name: record?.object_name
         }
         const options = {}
         ejs.renderFile(filename, data, options, function(err, str){

package/main/default/routes/listview.router.js

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-05 14:20:24
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-03-27 17:08:55
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-03-29 23:32:35
  * @Description: 
  */
 const express = require('express');
@@ -25,36 +25,4 @@ router.post('/api/listview/filters', core.requireAuthentication, async function
     res.status(200).send(record);
 });
 
-router.post('/api/listview/:id/amis-schema/clear', core.requireAuthentication, async function (req, res) {
-    const { id } = req.params;
-    const record = await objectql.getObject('object_listviews').directUpdate(id, { amis_schema: "" });
-    res.status(200).send(record);
-});
-
-router.post('/api/listview/:id/amis-schema/reset', core.requireAuthentication, async function (req, res) {
-    try {
-        const userSession = req.user;
-        const { id } = req.params;
-        const listviews = await objectql.getObject('object_listviews').directFind({filters: [['_id', '=', id]],fields: ["object_name", "name"]});
-        let listview;
-        if(listviews && listviews.length > 0){
-            listview = listviews[0];
-        }
-        else{
-            res.status(500).send(`The listview for id "${id}" Not found`);
-        }
-        const AmisLib = require('@steedos-widgets/amis-lib');
-        AmisLib.setUISchemaFunction(async function(objectName, force){
-            return await getUISchema(objectName, userSession);
-        });
-        let schema = await AmisLib.getListviewInitSchema(listview.object_name, listview.name);
-        const record = await objectql.getObject('object_listviews').directUpdate(id, { amis_schema: JSON.stringify(schema, null, 4) });
-        res.status(200).send(record);
-
-    } catch (error) {
-        res.status(500).send(error.message);
-        console.error(error);
-    }
-});
-
 exports.default = router;

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

@@ -222,7 +222,7 @@ module.exports = {
             objectName = filters._id.split('.')[0];
         }
         if(objectName){
-            let fields = await InternalData.getObjectFields(objectName, this.userId);
+            let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
             if(fields){
                 _.each(fields, (field)=>{
                     this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
@@ -254,7 +254,7 @@ module.exports = {
             objectName = filters._id.split('.')[0];
         }
         if(objectName){
-            let fields = await InternalData.getObjectFields(objectName, this.userId);
+            let fields = await InternalData.getObjectFields(objectName, this.userId, true);
             if(fields){
                 _.each(fields, (field)=>{
                     this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))

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

@@ -21,12 +21,19 @@ const getInternalListviews = async function(sourceListviews, filters, is_system)
 
 module.exports = {
     beforeInsert: async function () {
+        if (!this.doc.name) {
+            this.doc.name = 'listview_' + this.doc._id.toLowerCase();
+        }
         await util.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true], ['object_name','=', this.doc.object_name]]);
-
     },
     beforeUpdate: async function () {
         const oldDoc = await objectql.getObject(this.object_name).findOne(this.id)
         let name = oldDoc.name,object_name = oldDoc.object_name;
+        
+        if (!this.doc.name) {
+            this.doc.name = 'listview_' + this.id.toLowerCase();
+        }
+
         if(_.has(this.doc, 'name')){
             name = this.doc.name
         }

package/package.json

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

package/main/default/objects/object_listviews/buttons/amis_buttons.button.yml

@@ -1,53 +0,0 @@
-name: amis_buttons
-amis_schema: |-
-  {
-      "type": "service",
-      "body": [
-          {
-              "type": "button",
-              "label": "重置",
-              "id": "u:76144dacd93c",
-              "onEvent": {
-                  "click": {
-                      "actions": [
-                          {
-                              "args": {
-                                  "api": {
-                                      "url": "${context.rootUrl}/api/listview/${record_id}/amis-schema/reset",
-                                      "method": "post",
-                                      "headers": {
-                                          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                      }
-                                  },
-                                  "messages": {
-                                      "success": "Amis Schema重置成功!",
-                                      "failed": "Amis Schema重置失败!"
-                                  }
-                              },
-                              "actionType": "ajax"
-                          }
-                      ]
-                  }
-              },
-              "tooltip": "重置列表视图Amis Schema",
-              "tooltipPlacement": "top",
-              "className": ""
-          }
-      ],
-      "regions": [
-          "body"
-      ],
-      "data": {
-         "context": "${context}"
-      },
-      "id": "u:9a37e91e4b8d",
-      "bodyClassName": "p-0"
-  }
-is_enable: true
-label: AmisSchema
-'on': record_only
-type: amis_button
-visible: !!js/function |
-    function (object_name, record_id, record_permissions, record) {
-        return Creator.baseObject.actions.standard_edit.visible() && !record.is_system && record.enable_amis_schema;
-    }