@steedos/standard-object-database 2.6.1-beta.6 → 2.6.2-beta.10

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

@@ -3,6 +3,7 @@ label: List View
 icon: forecasts
 version: 2
 enable_dataloader: false
+hidden: true
 fields:
   label:
     label: Label
@@ -15,6 +16,8 @@ fields:
     searchable: true
     index: 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
+    amis:
+      requiredOn: "${!!recordId}" #编辑记录时必填，新建记录时不必填走触发器给默认值
   object_name:
     label: Object
     type: master_detail
@@ -61,11 +64,37 @@ fields:
         value: infinite
     defaultValue: '"standard"'
     hidden: true
+  sort_no:
+    label: Sort no
+    type: number
+    scale: 0
+    defaultValue: 100
+  is_enable:
+    type: toggle
+    label: Enable
+    defaultValue: true
+  crud_mode:
+    label: 显示模式
+    type: select
+    options:
+      - label: 表格
+        value: table
+      - label: 卡片
+        value: cards
+    defaultValue: table
   columns:
     label: Columns
-    type: grid
+    type: table
     is_wide: true
     required: true
+    group: show_columns
+    amis:
+      columns:
+        - field
+        - name: width
+          width: 100
+        - name: wrap
+          width: 100
   columns.$:
     label: Column
     blackbox: true
@@ -80,18 +109,23 @@ fields:
       - object_name
     reference_to: object_fields
     reference_to_field: name
+    enable_enhanced_lookup: false
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function(filters, values){
+        return ['object', '=', values.object_name]
+      }
   columns.$.width:
     label: Width
     type: text
-  # ag-grid配置rowModelType为infinite的话，列的warp属性功能异常，即不会换行显示且显示效果异常 #258
-  # columns.$.wrap:
-  #   label: Wrap
-  #   type: boolean
+  columns.$.wrap:
+    label: Wrap
+    type: boolean
   filter_fields:
     label: Default Filter Fields
     type: lookup
     multiple: true
     is_wide: true
+    hidden: true
     depend_on:
       - object_name
     reference_to: object_fields
@@ -102,6 +136,7 @@ fields:
     is_wide: true
     depend_on:
       - object_name
+    group: sort
   sort.$:
     label: Order
     blackbox: true
@@ -126,9 +161,9 @@ fields:
     is_wide: true
     hidden: false
     readonly: false
-    visible_on: "{{global.mode ==='read' ? true : false}}"
     depend_on:
       - object_name
+    group: filters
   # filters.$:
   #   label: Filter
   #   blackbox: true
@@ -189,6 +224,7 @@ fields:
     is_wide: true
     depend_on:
       - object_name
+    group: show_columns
   mobile_columns.$:
     label: Column
     blackbox: true
@@ -206,6 +242,7 @@ fields:
     is_wide: true
     depend_on:
       - object_name
+    group: search_term
   searchable_fields.$:
     label: Column
     blackbox: true
@@ -217,11 +254,6 @@ fields:
     is_wide: false
     reference_to: object_fields
     reference_to_field: name
-  sort_no:
-    label: Sort no
-    type: number
-    scale: 0
-    defaultValue: 100
   is_system:
     type: boolean
     label: System
@@ -242,20 +274,26 @@ fields:
     required: false
     is_wide: true
     # visible_on: "{{formData.enable_amis_schema}}"
+    visible_on: "{{false}}"
   requestAdaptor:
-    label: 发送适配器
+    label: Request Adaptor
     type: code
     language: "javascript"
     is_wide: true
     inlineHelpText: "函数签名：(api) => api， 数据在 api.data 中，修改后返回 api 对象。"
-    group: 数据接口
+    group: data_interface
+    # amis: 
+    #   description: "函数签名：(api) => api， 数据在 api.data 中，修改后返回 api 对象。"
   adaptor:
-    label: 接收适配器
+    label: Adaptor
     type: code
     language: "javascript"
     is_wide: true
     inlineHelpText: "函数签名: (payload, response, api) => payload"
-    group: 数据接口
+    group: data_interface
+    # amis: 
+    #   description: "函数签名: (payload, response, api) => payload"
+    
 paging:
   enabled: false
 list_views:
@@ -266,9 +304,22 @@ list_views:
       - shared
       - owner
       - modified
+      - is_enable
       - is_system
     label: All List Views
     filter_scope: space
+  customize:
+    columns:
+      - label
+      - name
+      - shared
+      - owner
+      - modified
+      - is_system
+    label: 自定义
+    filters:
+      - ["is_system","<>",true]
+    filter_scope: space
 actions:
   customize:
     label: Customize
@@ -293,4 +344,4 @@ permission_set:
     allowEdit: true
     allowRead: false
     modifyAllRecords: true
-    viewAllRecords: true
+    viewAllRecords: true

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

@@ -46,7 +46,7 @@ fields:
                 label: "删除记录之后",
                 value: "afterDelete"
               }, {
-                label: "查下记录之前",
+                label: "查询记录之前",
                 value: "beforeFind"
               }]
   isEnabled:
@@ -60,9 +60,7 @@ fields:
     is_wide: true
     required: true
     defaultValue: |-
-      // _ : lodash
-      // moment: moment
-      // validator: validator
+      // global: {_:lodash, moment, validator, filters}
       // ctx
       // objects
       // services
@@ -96,6 +94,17 @@ list_views:
       - is_system
     label: All
     filter_scope: space
+  customize:
+    columns:
+      - name
+      - listenTo
+      - when
+      - isEnabled
+      - is_system
+    label: 自定义
+    filters:
+      - ["is_system","<>",true]
+    filter_scope: space
 permission_set:
   user:
     allowCreate: false

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

@@ -76,6 +76,16 @@ list_views:
       - object_name
     label: All
     filter_scope: space
+  customize:
+    columns:
+      - name
+      - active
+      - description
+      - object_name
+    label: 自定义
+    filters:
+      - ["is_system","<>",true]
+    filter_scope: space
 permission_set:
   user:
     allowCreate: false

package/main/default/objects/objects/buttons/custom.button.js

@@ -0,0 +1,48 @@
+/*
+ * @Author: baozhoutaon@hotoa.com
+ * @Date: 2022-03-29 20:33:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-11-19 17:06:18
+ * @Description: 
+ */
+module.exports = {
+    custom: function (object_name, record_id) {
+        $(document.body).addClass('loading');
+        let url = `/graphql`;
+        const obj = Creator.odata.get("objects", record_id);
+        delete obj.record_permissions;
+        delete obj["@odata.context"]
+        delete obj["@odata.editLink"]
+        delete obj["@odata.etag"]
+        delete obj["@odata.id"]
+        delete obj.idFieldName;
+        let options = {
+            type: 'post',
+            async: true,
+            data: JSON.stringify({
+                query: `mutation{objects__upsert(id: "${obj.name}", doc: ${JSON.stringify(JSON.stringify(obj))}){_id,name}}`
+            }),
+            success: function (data) {
+                console.log(`data====>`, data)
+                SteedosUI.notification.success({
+                    message: '对象已自定义。'
+                });
+                // SteedosUI.router.go({}, "/app/" + Session.get("app_id") + "/" + object_name + "/view/" + data.data.objects__upsert._id);
+                FlowRouter.reload()
+                $(document.body).removeClass('loading');
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                SteedosUI.notification.error({
+                    message: '操作失败',
+                    description: t(XMLHttpRequest.responseJSON.error),
+                });
+                $(document.body).removeClass('loading');
+            }
+        };
+        Steedos.authRequest(url, options);
+    },
+    customVisible: function (object_name, record_id, permission, data) {
+        var record = data && data.record;
+        return record && record.is_system && !record.created;
+    }
+}

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

@@ -0,0 +1,6 @@
+name: custom
+is_enable: true
+label: 自定义
+'on': record_only
+visible: true
+sort: 200

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

@@ -1,4 +1,28 @@
 module.exports = {
+    design_field_layout: function (object_name, record_id, item_element) {
+        var record = this.record || Creator.getObjectById(record_id);
+        if (record && record.record) {
+            record = record.record;
+        }
+        if (!record) {
+            return toastr.error("未找到记录");
+        }
+
+        window.open(Creator.getRelativeUrl("/api/page/view/design_field_layout?designObjectName=" + record.name));
+    },
+    design_field_layoutVisible: function (object_name, record_id, record_permissions, data) {
+        var record = data && data.record;
+        if (!Creator.isSpaceAdmin()) {
+            return false
+        }
+        if (!record) {
+            record = Creator.odata.get("objects", record_id, "is_deleted");
+        }
+
+        if (record && !record.is_deleted && record.name != 'users') {
+            return true;
+        }
+    },
   show_object: function (object_name, record_id, item_element) {
     var record = this.record || Creator.getObjectById(record_id);
     if(record && record.record){
@@ -21,8 +45,7 @@ module.exports = {
             return toastr.warning("请先启动数据源");
         }
     }
-
-    window.open(Creator.getRelativeUrl("/app/admin/" + record.name));
+    window.open(Creator.getRelativeUrl("/app/admin/" + (record.name || this.record.name)));
     // SteedosUI.Object.getUISchema(record.name).then((res)=>{
     //     if(res.idFieldName){
     //         window.open(Creator.getRelativeUrl("/app/-/" + record.name));
@@ -51,7 +74,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/objects/objects.core.js

@@ -21,6 +21,12 @@ function canLoadObject(name, datasource) {
     return true;
 }
 
+function removeObjectConfig(objectName){
+    broker.call('objects.removeConfig', {
+        objectName: objectName
+    });
+}
+
 function getDataSource(doc) {
     if (doc.datasource && !_.include(defaultDatasourcesName, doc.datasource)) {
         let datasource = Creator.getCollection("datasources").findOne({ _id: doc.datasource })
@@ -216,6 +222,16 @@ function loadObject(doc, oldDoc) {
 
         originalObject.isMain = true;
 
+        const objConfig = register.getOriginalObjectConfig(doc.name);
+
+        if(objConfig){
+            _.each(objConfig.fields, (config, name)=>{
+                if(!config._id && !doc.fields[name]){
+                    doc.fields[name] = config;
+                }
+            })
+        }
+
         register.addObjectConfig(doc, datasourceName);
         register.loadObjectLazyListViews(doc.name);
         register.loadObjectLazyActions(doc.name);
@@ -380,5 +396,5 @@ function triggerReloadObject(objectName, type, value, event){
 }
 
 module.exports = {
-    loadObject, removeObject, getDataSourceName, canLoadObject, getObjectFromDB, getDataSource, reloadObject, triggerReloadObject, loadDBObject
+    loadObject, removeObject, getDataSourceName, canLoadObject, getObjectFromDB, getDataSource, reloadObject, triggerReloadObject, loadDBObject, removeObjectConfig
 }

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

@@ -233,7 +233,7 @@ function onChangeObjectName(oldName, newDoc){
         multi: true
     });
     //修改trigger
-    Creator.getCollection("object_triggers").direct.update({space: newDoc.space, object: oldName}, {$set: {object: newDoc.name}}, {
+    Creator.getCollection("object_triggers").direct.update({space: newDoc.space, listenTo: oldName}, {$set: {listenTo: newDoc.name}}, {
         multi: true
     });
     //字段表中的reference_to
@@ -313,7 +313,8 @@ let objectTriggers = {
                 type: "text",
                 required: true,
                 index: true,
-                searchable: true
+                searchable: true,
+                filterable: true
             });
             // Creator.getCollection("object_fields").insert({
             //     object: doc.name,

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

@@ -23,6 +23,8 @@ fields:
     #     return options;
     #   }
     defaultValue: 'default'
+    amis:
+      disabledOn: "${is_system == true}"
   label:
     type: text
     label: Label
@@ -38,6 +40,8 @@ fields:
     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
+    amis:
+      disabledOn: "${is_system == true}"
   icon:
     type: lookup
     label: Icon
@@ -60,6 +64,8 @@ fields:
     label: Enable
     type: boolean
     defaultValue: true
+    amis:
+      disabledOn: "${is_system == true}"
   in_development:
     type: select
     label: Development State
@@ -71,6 +77,8 @@ fields:
         value: "0" 
     defaultValue: "1"
     required: true
+    amis:
+      disabledOn: "${is_system == true}"
   enable_search:
     type: boolean
     label: Enable Search
@@ -118,7 +126,7 @@ fields:
     group: Switch
     hidden: true
   enable_inline_edit:
-    hidden: true
+    # hidden: true
     type: boolean
     defaultValue: true
     label: Enable Single Field Edit
@@ -133,7 +141,7 @@ fields:
     label: Enable Enhanced Lookup
     inlineHelpText: When enabled, the lookup field associated with this object displays its options as a pop-up window.
     group: Switch
-    defaultValue: false
+    defaultValue: true
   enable_dataloader:
     type: boolean
     label: Enable Dataloader
@@ -171,6 +179,8 @@ fields:
     searchable: true
     inlineHelpText: The default data source does not support this property
     group: External data source
+    amis:
+      disabledOn: "${is_system == true}"
   version:
     readonly: true
     label: Version
@@ -372,6 +382,19 @@ fields:
     rows: 3
     is_wide: true
     hidden: true
+  field_groups:
+    type: grid
+    blackbox: true
+    is_wide: true
+    hidden: false
+    visible_on: "${false}"
+  field_groups.$.group_name:
+    type: text
+  field_groups.$.visible_on:
+    type: text
+  extend:
+    type: text
+    hidden: true
 paging:
   enabled: false
 relatedList:
@@ -493,6 +516,9 @@ actions:
   delete_object:
     on: record_more
     label: 删除
+  design_field_layout:
+    on: record_only
+    label: 设计字段布局
   # export:
   #   label: Export
   #   visible: true

package/main/default/objects/objects.tree.js

@@ -1,8 +1,8 @@
 /*
  * @Author: yinlianghui@steedos.com
  * @Date: 2022-04-13 10:31:03
- * @LastEditors: yinlianghui@steedos.com
- * @LastEditTime: 2022-05-24 14:03:39
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-11-17 15:48:30
  * @Description: 
  */
 var objectql = require('@steedos/objectql');
@@ -11,6 +11,7 @@ async function insertParentAndChildrenFieldForTreeObject(doc, needToCheckExists)
     const baseProps = {
         object: doc.name,
         reference_to: doc.name,
+        deleted_lookup_record_behavior: "clear",
         type: 'lookup',
         owner: doc.owner,
         space: doc.space,