@steedos/standard-object-database 2.7.0-beta.4 → 2.7.0-beta.6

package/main/default/objectTranslations/object_fields.en/object_fields.en.objectTranslation.yml

@@ -110,8 +110,12 @@ fields:
     label: Reference to field
     help: The value of the associated object saved to the current object field; For example, after object A is associated with object B, when A1 record is associated with B1 record, B1 record will be stored by default_ Save the ID in the A1 record. If the foreign key field is modified, the 'foreign key field' will be replaced_ Store the ID in the A1 record.
     description: The default is the primary key, and the default value is _id.
+  filters:
+    label: Lookup Relationship Filters Condition
+    help: When the field type is Lookup Relationship or Master Detail Relationship, filtering conditions can be configured for the field, filtering option list; The field values can be configured as formulas, and the fields referenced in the formulas need to be configured in Dependent Fields at the same time
+    description: 
   filtersFunction:
-    label: filters Function
+    label: Lookup Relationship Filters Function
     help: 
     description: 
   optionsFunction:

package/main/default/objectTranslations/object_fields.zh-CN/object_fields.zh-CN.objectTranslation.yml

@@ -107,8 +107,12 @@ fields:
     label: 外键字段
     help: 关联的对象保存到当前对象字段的值；例如：A对象关联B对象后，当A1记录关联了B1记录，默认会存B1记录的_id存到A1记录中。如果修改了外键字段后，会将“外键字段”替换_id存储到A1记录中。
     description: '默认为主键，默认值是_id'
+  filters:
+    label: 相关表过滤条件
+    help: 当字段类型为相关表关系或主/子表关系时，可以为该字段配置过滤条件，过滤选项列表；其中字段值可以配置为公式，公式中引用的字段需要同时配置在依赖的字段中
+    description: 
   filtersFunction:
-    label: 过滤器函数
+    label: 相关表过滤器函数
     help: 
     description: 
   optionsFunction:

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

@@ -38,7 +38,58 @@ fields:
     # omit: true
     # hidden: true
     label: Visible
-    sort_no: 150
+    is_wide: true
+    sort_no: 200
+    defaultValue: true
+    amis:
+      type: fieldSet
+      title: 状态
+      body: 
+        - name: visible
+          label: 显示
+          type: switch
+          staticOn: ${global.mode==='edit'?false:true}
+        - name: visible_type
+          label: 条件
+          type: select
+          value: static
+          visibleOn: "${visible === true}"
+          clearable: false
+          staticOn: ${global.mode==='edit'?false:true}
+          options: 
+            - label: 静态值
+              value: static
+            - label: 表达式
+              value: expression
+  visible_type:
+    name: visible_type
+    type: select
+    readonly: true
+    visible_on: "{{false}}"
+  visibleOn:
+    type: text
+    label: 表达式
+    is_wide: true
+    sort_no: 210
+    amis:
+      type: wrapper
+      body:
+        - type: input-text
+          name: visibleOn
+          static: true
+          label: 表达式
+          visibleOn: "${global.mode != 'edit'}"
+        - type: input-formula
+          name: visibleOn
+          mixedMode: true
+          label: 表达式
+          visibleOn: "${global.mode==='edit' && visible_type == 'expression'}"
+          variables: 
+            - label: 当前记录
+              value: record
+              children: 
+                - label: 名称
+                  value: name
   'on':
     type: lookup
     label: 'On'

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

@@ -364,8 +364,20 @@ fields:
     sort_no: 220
     amis:
       disabledOn: "${is_system == true}"
+  filters:
+    label: Lookup Relationship Filters Condition
+    type: code
+    is_wide: true
+    hidden: false
+    readonly: false
+    sort_no: 447
+    group: Advanced
+    visible_on: "{{(['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false) && !!formData.reference_to}}"
+    inlineHelpText: vWhen the field type is Lookup Relationship or Master Detail Relationship, filtering conditions can be configured for the field, filtering option list; The field values can be configured as formulas, and the fields referenced in the formulas need to be configured in Dependent Fields at the same time
+    amis:
+      disabledOn: "${is_system == true}"
   filtersFunction:
-    label: filters Function
+    label: Lookup Relationship Filters Function
     type: code
     language: javascript
     is_wide: true
@@ -525,7 +537,6 @@ fields:
     sort_no: 280
     amis:
       enableDialog: false
-      disabledOn: "${is_system == true}"
   auto_fill_mapping.$:
     label: Auto Fill Mapping
     blackbox: true
@@ -571,7 +582,7 @@ fields:
         };
         var currentFilter = [];
         var referenceObject = BuilderAmisObject && BuilderAmisObject.AmisLib && BuilderAmisObject.AmisLib.getUISchemaSync(values.reference_to);
-        var fromField = referenceObject && referenceObject.fields[values.auto_fill_mapping__from];
+        var fromField = referenceObject && referenceObject.fields[values.from || values.auto_fill_mapping__from];
 
         if (fromField && fromField.data_type) {
             currentFilter.push(['type', 'in', fieldFilters[fromField.data_type] || fromField.data_type.split()]);

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

@@ -25,8 +25,8 @@
                     ]
                 }
             },
-            "initApiAdaptor": "const defaultValue_field_value = payload.data.defaultValue; if(defaultValue_field_value && _.isString(defaultValue_field_value) && defaultValue_field_value.indexOf('{')>-1 ){ payload.data.defaultValue_formula = defaultValue_field_value; delete payload.data.defaultValue; } return payload;",
-            "apiRequestAdaptor": "if(formData.defaultValue_formula){ formData.defaultValue = formData.defaultValue_formula }  __saveData = JSON.stringify(JSON.stringify(formData)); api.data = {query: query.replace('{__saveData}', __saveData)}; api.data.query = api.data.query.replace('object_fields__update', 'object_fields__upsert')",
+            "initApiAdaptor": "const defaultValue_field_value = payload.data.defaultValue;\nif (defaultValue_field_value && _.isString(defaultValue_field_value) && defaultValue_field_value.indexOf('{') > -1) {\n  payload.data.defaultValue_formula = defaultValue_field_value;\n  delete payload.data.defaultValue;\n}\n\nif (recordId) {\n  var data = payload.data;\n  if (data) {\n    data.filters = window.amisConvert.filtersToConditions(data.filters || []);\n  }\n  payload.data = data;\n}\nreturn payload;",
+            "apiRequestAdaptor": "if (formData.defaultValue_formula) {\n  formData.defaultValue = formData.defaultValue_formula\n}\nif (formData.filters) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData.filters);\n}\n__saveData = JSON.stringify(JSON.stringify(formData));\napi.data = { query: query.replace('{__saveData}', __saveData) };\napi.data.query = api.data.query.replace('object_fields__update', 'object_fields__upsert');",
             "submitSuccActions": [
                 {
                     "actionType": "custom",
@@ -142,8 +142,29 @@
                                     }
                                 ]
                             }
-                        }
+                        },
+                        "disabledOn": "${is_system == true}",
+                        "searchable": true
+                    }
+                },
+                "filters": {
+                    "amis": {
+                        "type": "condition-builder",
+                        "description": "",
+                        "id": "u:a9f2232e30d7",
+                        "source": {
+                            "method": "get",
+                            "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${reference_to}",
+                            "dataType": "json",
+                            "headers": {
+                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                            }
+                        },
+                        "className": "col-span-2 m-0"
                     }
+                },
+                "filtersFunction": {
+                    "hidden": true
                 }
             },
             "form": {

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

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-28 11:07:57
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-10-16 13:58:22
+ * @LastEditTime: 2024-03-14 10:29:44
  * @Description: 
  */
 const InternalData = require('@steedos/standard-objects').internalData;
@@ -12,20 +12,18 @@ const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 module.exports = {
     beforeInsert: async function(){
         const { doc } = this;
+        delete doc.visible_type
         doc.visible;
     },
     beforeUpdate: async function(){
         const { doc } = this;
+        delete doc.visible_type
         doc.visible;
     },
     beforeFind: async function () {
         delete this.query.fields;
     },
 
-    beforeAggregate: async function () {
-        delete this.query.fields;
-    },
-
     afterFind: async function(){
         let filters = InternalData.parserFilters(this.query.filters)
         const { spaceId } = this;
@@ -52,32 +50,15 @@ module.exports = {
                 }
             }
         }
-    },
-    afterAggregate: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        const { spaceId } = this;
-
-        let objectName = filters.object;
-        if(!objectName && filters._id && filters._id.indexOf(".") > -1){
-            objectName = filters._id.split('.')[0];
-        }
 
-        let dataList = await InternalData.getObjectActions(objectName, this.userId);
-        if (!_.isEmpty(dataList)) {
-            dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    this.data.values.push(Object.assign({_id: `${objectName}.${doc.name}`}, doc));
-                }
-            })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-            if (records.length > 0) {
-                this.data.values = records;
-            } else {
-                this.data.values.length = 0;
+        _.each(this.data.values, (item)=>{
+            if(item.visibleOn){
+                item.visible_type = "expression"
+            }else if(item.visible === true){
+                item.visible_type = "static"
             }
-        }
+        })
+
     },
     afterCount: async function(){
         delete this.query.fields;
@@ -95,6 +76,15 @@ module.exports = {
                 }
             }
         }
+
+        if(this.data.values){
+            if(this.data.values.visibleOn){
+                this.data.values.visible_type = "expression"
+            }else if(this.data.values.visible === true){
+                this.data.values.visible_type = "static"
+            }
+        }
+
     },
     afterDelete: async function(){
         await sleep(1000 * 2);

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

@@ -18,7 +18,7 @@ module.exports = {
     },
     afterFind: async function(){
         const { spaceId } = this;
-        let dataList = register.getAllObjectValidationRules();
+        let dataList = await register.getAllObjectValidationRules();
         if (!_.isEmpty(dataList)) {
             dataList.forEach((doc) => {
                 if (!_.find(this.data.values, (value) => {
@@ -36,25 +36,6 @@ module.exports = {
         }
 
     },
-    afterAggregate: async function(){
-        const { spaceId } = this;
-        let dataList = register.getAllObjectValidationRules();
-        if (!_.isEmpty(dataList)) {
-            dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    this.data.values.push(doc);
-                }
-            })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-            if (records.length > 0) {
-                this.data.values = records;
-            } else {
-                this.data.values.length = 0;
-            }
-        }
-    },
     afterCount: async function(){
         delete this.query.fields;
         let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
@@ -62,7 +43,7 @@ module.exports = {
     },
     afterFindOne: async function(){
         if (_.isEmpty(this.data.values)) {
-            const all = register.getAllObjectValidationRules();
+            const all = await register.getAllObjectValidationRules();
             const id = this.id;
             this.data.values = _.find(all, function (item) {
                 return item._id === id

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.0-beta.4",
+    "version": "2.7.0-beta.6",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,10 +12,10 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.0-beta.4",
-        "@steedos/standard-objects": "2.7.0-beta.4"
+        "@steedos/metadata-core": "2.7.0-beta.6",
+        "@steedos/standard-objects": "2.7.0-beta.6"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "01af290340359e2ea4d2d9a0ae5e56196020c952"
+    "gitHead": "375ec701f921e76a94071d0c4004727d8dc6a8a4"
 }

package/package.service.js

@@ -116,7 +116,7 @@ module.exports = {
 				}
 				if(data.is_system){
 					// 'label' 先禁止编辑label , 目前由于i18n的问题导致 label无效.
-					data = _.pick(data, ['defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required', 'unique', 'readonly', 'hidden', 'deleted_lookup_record_behavior', 'enable_thousands', 'autonumber_enable_modify']);
+					data = _.pick(data, ['defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required', 'unique', 'readonly', 'hidden', 'deleted_lookup_record_behavior', 'enable_thousands', 'autonumber_enable_modify', 'auto_fill_mapping']);
 				}
                 return object.update(id, data, userSession)
 			},