@steedos/standard-object-database 2.7.0-beta.3 → 2.7.0-beta.31

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

@@ -1,159 +1,204 @@
 {
     "type": "service",
-    "body": [
-        {
-            "type": "steedos-object-form",
-            "label": "对象字段表单",
-            "objectApiName": "object_fields",
-            "recordId": "${recordId}",
-            "className": "",
-            "enableTabs": true,
-            "mode": "edit",
-            "layout": "horizontal",
-            "onEvent": {
-                "change": {
-                    "actions": [
-                        {
-                            "actionType": "setValue",
-                            "args": {
-                                "value": {
-                                    "defaultValue": ""
-                                }
-                            },
-                            "expression": "${!!event.data.defaultValue_formula}"
+    "body": [{
+        "type": "steedos-object-form",
+        "label": "对象字段表单",
+        "objectApiName": "object_fields",
+        "recordId": "${recordId}",
+        "className": "",
+        "enableTabs": true,
+        "mode": "edit",
+        "layout": "horizontal",
+        "onEvent": {
+            "change": {
+                "actions": [{
+                    "actionType": "setValue",
+                    "args": {
+                        "value": {
+                            "defaultValue": ""
                         }
-                    ]
-                }
+                    },
+                    "expression": "${!!event.data.defaultValue_formula}"
+                }]
             },
-            "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')",
-            "submitSuccActions": [
-                {
-                    "actionType": "custom",
-                    "script": "setTimeout(function(){doAction({'actionType': 'setValue','componentId': 'form_object_fields','args': {'value': {'sort_no': event.data.sort_no + 10}}})}, 300)"
-                },
-                {
-                    "actionType": "toast",
-                    "args": {
-                        "msgType": "success",
-                        "msg": "操作成功, 请刷新浏览器后查看效果",
-                        "position": "top-right"
-                    }
-                }
-            ],
-            "fieldsExtend": {
-                "readonly": {
-                    "amis": {
-                        "onEvent": {
-                            "change": {
-                                "actions": [
-                                    {
-                                        "actionType": "setValue",
-                                        "componentId": "steedos_object_fields_form",
-                                        "args": {
-                                            "value": {
-                                                "static": false
-                                            }
-                                        },
-                                        "expression": "!!readonly"
-                                    }
-                                ]
+            "inited": {
+                "actions": [{
+                        "actionType": "ajax",
+                        "api": {
+                            "method": "get",
+                            "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object}/fields/options",
+                            "cache": 30000,
+                            "adaptor": "const visibleOnVariables = SteedosUI.getFormulaVariables(payload.data.options);\nconst defaultValueVariables = [visibleOnVariables[1]];\npayload = {\n  data: {\n    visibleOnVariables,\n    defaultValueVariables\n  }\n};\nreturn payload;",
+                            "headers": {
+                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                             }
-                        },
-                        "id": "u:a32a4c461450"
-                    }
-                },
-                "static": {
-                    "amis": {
-                        "onEvent": {
-                            "change": {
-                                "actions": [
-                                    {
-                                        "actionType": "setValue",
-                                        "componentId": "steedos_object_fields_form",
-                                        "args": {
-                                            "value": {
-                                                "readonly": false
-                                            }
-                                        },
-                                        "expression": "!!static"
-                                    }
-                                ]
+                        }
+                    },
+                    {
+                        "actionType": "setValue",
+                        "args": {
+                            "value": {
+                                "visibleOnVariables": "${event.data.visibleOnVariables}",
+                                "defaultValueVariables": "${event.data.defaultValueVariables}"
                             }
                         },
-                        "id": "u:7affdbb0ef6d"
+                        "componentId": "steedos_object_fields_service"
                     }
-                },
-                "required": {
-                    "amis": {
-                        "onEvent": {
-                            "change": {
-                                "actions": [
-                                    {
-                                        "actionType": "setValue",
-                                        "args": {
-                                            "value": {
-                                                "hidden": false
-                                            }
-                                        },
-                                        "componentId": "steedos_object_fields_form",
-                                        "expression": "${event.data.value}"
+                ]
+            }
+        },
+        "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.defaultValue_formula === \"\" || _.isNil(formData.defaultValue_formula)) && (formData.defaultValue === \"\" || _.isNil(formData.defaultValue))) { \n  // 清空默认值公式编辑器中内容后，如果没有再给defaultValue设置值，则要把defaultValue值清空\n  formData.defaultValue = null;\n}\ndelete formData.defaultValue_formula;\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",
+                "script": "setTimeout(function(){doAction({'actionType': 'setValue','componentId': 'form_object_fields','args': {'value': {'sort_no': event.data.sort_no + 10}}})}, 300)"
+            },
+            {
+                "actionType": "toast",
+                "args": {
+                    "msgType": "success",
+                    "msg": "操作成功, 请刷新浏览器后查看效果",
+                    "position": "top-right"
+                }
+            }
+        ],
+        "fieldsExtend": {
+            "readonly": {
+                "amis": {
+                    "onEvent": {
+                        "change": {
+                            "actions": [{
+                                "actionType": "setValue",
+                                "componentId": "steedos_object_fields_form",
+                                "args": {
+                                    "value": {
+                                        "static": false
                                     }
-                                ]
-                            }
-                        },
-                        "id": "u:adf4200a2170"
-                    }
-                },
-                "hidden": {
-                    "amis": {
-                        "onEvent": {
-                            "change": {
-                                "actions": [
-                                    {
-                                        "actionType": "setValue",
-                                        "args": {
-                                            "value": {
-                                                "required": false
-                                            }
-                                        },
-                                        "componentId": "steedos_object_fields_form",
-                                        "expression": "${event.data.value}"
+                                },
+                                "expression": "!!readonly"
+                            }]
+                        }
+                    },
+                    "id": "u:a32a4c461450"
+                }
+            },
+            "static": {
+                "amis": {
+                    "onEvent": {
+                        "change": {
+                            "actions": [{
+                                "actionType": "setValue",
+                                "componentId": "steedos_object_fields_form",
+                                "args": {
+                                    "value": {
+                                        "readonly": false
                                     }
-                                ]
-                            }
-                        },
-                        "id": "u:adf4200a2170"
-                    }
-                },
-                "type": {
-                    "amis": {
-                        "onEvent": {
-                            "change": {
-                                "actions": [
-                                    {
-                                        "actionType": "setValue",
-                                        "args": {
-                                            "value": {
-                                                "defaultValue": null
-                                            }
-                                        },
-                                        "componentId": "steedos_object_fields_form"
+                                },
+                                "expression": "!!static"
+                            }]
+                        }
+                    },
+                    "id": "u:7affdbb0ef6d"
+                }
+            },
+            "required": {
+                "amis": {
+                    "onEvent": {
+                        "change": {
+                            "actions": [{
+                                "actionType": "setValue",
+                                "args": {
+                                    "value": {
+                                        "hidden": false
                                     }
-                                ]
-                            }
+                                },
+                                "componentId": "steedos_object_fields_form",
+                                "expression": "${event.data.value}"
+                            }]
                         }
-                    }
+                    },
+                    "id": "u:adf4200a2170"
+                }
+            },
+            "hidden": {
+                "amis": {
+                    "onEvent": {
+                        "change": {
+                            "actions": [{
+                                "actionType": "setValue",
+                                "args": {
+                                    "value": {
+                                        "required": false
+                                    }
+                                },
+                                "componentId": "steedos_object_fields_form",
+                                "expression": "${event.data.value}"
+                            }]
+                        }
+                    },
+                    "id": "u:adf4200a2170"
+                }
+            },
+            "type": {
+                "amis": {
+                    "onEvent": {
+                        "change": {
+                            "actions": [{
+                                "actionType": "setValue",
+                                "args": {
+                                    "value": {
+                                        "defaultValue": null
+                                    }
+                                },
+                                "componentId": "steedos_object_fields_form"
+                            }]
+                        }
+                    },
+                    "disabledOn": "${is_system == true}",
+                    "searchable": true,
+                    "id": "u:5f21d4208685"
                 }
             },
-            "form": {
-                "id": "steedos_object_fields_form"
+            "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
+            },
+            "visible_on": {
+                "amis": {
+                    "type": "input-formula",
+                    "name": "formula",
+                    "evalMode": false,
+                    "variableMode": "tabs",
+                    "variables": "${visibleOnVariables}",
+                    "visibleOn": "${visibleOnVariables}",
+                    "id": "u:618105d5bfad"
+                }
             }
-        }
-    ],
+        },
+        "form": {
+            "id": "steedos_object_fields_form"
+        },
+        "id": "u:e17c57cce896",
+        "tabsMode": "line"
+    }],
     "data": {
         "context": {}
     },
     "name": "object_fields_form",
-    "id": "u:bb11df394baf"
+    "id": "steedos_object_fields_service"
 }

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

@@ -3,7 +3,6 @@
     "body": [
         {
             "type": "steedos-object-form",
-            "debug": false,
             "label": "对象表单",
             "objectApiName": "objects",
             "recordId": "${recordId}",
@@ -21,12 +20,7 @@
                       "position": "top-right"
                     }
                 }
-            ],
-            "fieldsExtend": {
-                "compactLayouts": {
-                    "label": ""
-                }
-            }
+            ]
         }
     ],
     "data": {

package/main/default/profiles/admin.profile.yml

@@ -0,0 +1 @@
+name: admin

package/main/default/profiles/user.profile.yml

@@ -0,0 +1 @@
+name: user

package/main/default/{objects → server}/0.objects_reload.object.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-03-20 13:34:23
+ * @Description: 
+ */
 var objectql = require('@steedos/objectql');
 var objectCore = require('./objects.core.js');
 

package/main/default/{objects → server}/object_fields.object.js

@@ -275,12 +275,13 @@ function onChangeName(oldName, newDoc){
   })
 }
 
-//只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符 TODO 支持表格
+//[Task]: 字段名允许输入大写字母 #6702
+//只能包含字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符 TODO 支持表格
 function checkName(name){
-  var reg = new RegExp('^[a-z]([a-z0-9]|_(?!_))*[a-z0-9]$'); //支持表格类型的验证表达式(待优化.$.限制只能出现一次): new RegExp('^[a-z]([a-z0-9]|_(?!_))*(\\.\\$\\.\\w+)*[a-z0-9]$')
+  var reg = new RegExp('^[a-zA-Z]([A-Za-z0-9]|_(?!_))*[A-Za-z0-9]$'); //支持表格类型的验证表达式(待优化.$.限制只能出现一次): new RegExp('^[a-z]([a-z0-9]|_(?!_))*(\\.\\$\\.\\w+)*[a-z0-9]$')
   //TODO 撤销注释
   if(!reg.test(name)){
-    throw new Error("'字段名'只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
+    throw new Error("字段名只能包含字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
   }
   if(name.length > 50){
     throw new Error("名称长度不能大于50个字符");

package/main/default/{objects → server}/objects.core.js

@@ -284,7 +284,7 @@ function getObjectFromDB(objectName) {
 
 function reloadObject(changeLog){
     var objectName = changeLog.object_name;
-    var data = changeLog.change_date;
+    var data = changeLog.change_data;
     const objectRecord = Creator.getCollection("objects").findOne({
         name: objectName
       })
@@ -298,7 +298,7 @@ function reloadObject(changeLog){
         fields: [],
         actions: []
     }
-    if(!objectRecord && objectDataSourceName){
+    if((!objectRecord || objectRecord.is_system == true) && objectDataSourceName){
 
         switch (data.type) {
             case 'field':
@@ -379,18 +379,18 @@ function reloadObject(changeLog){
 
 }
 
-function triggerReloadObject(objectName, type, value, event){
+function triggerReloadObject(objectName, type, value, event)
+{
+    // console.log(`triggerReloadObject===>`, objectName, type, event)
     const objectRecord = Creator.getCollection("objects").findOne({
         name: objectName
       })
-    if(objectRecord){
-        //TODO 待支持动态加载related_list后， 删除此行代码
-        // console.log(`triggerReloadObject===>`, objectName)
+    if(objectRecord && objectRecord.is_system != true && objectName != "objects" && objectName != "object_fields"){
         Creator.getCollection("objects").update({name: objectName}, {$set: {reload_time: new Date()}})
     }else{
         Creator.getCollection("_object_reload_logs").insert({
             object_name: objectName,
-            change_date: {
+            change_data: {
                 type: type,
                 event: event,
                 value: value

package/main/default/services/database-objects.service.js

@@ -2,10 +2,15 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-04-21 16:25:07
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-18 09:26:18
+ * @LastEditTime: 2024-03-21 11:58:43
  * @Description: 
  */
 var packageServiceName = '~database-objects'
+
+const { getObject } = require('@steedos/objectql');
+
+const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
 function isPatternTrigger(data){
     const {listenTo} = data;
     if(listenTo === '*'){
@@ -36,7 +41,19 @@ module.exports = {
 	 * Actions
 	 */
 	actions: {
-
+        resetObject: {
+            rest: {
+                method: "POST",
+                path: "/reset"
+            },
+            async handler(ctx) {
+                const { objectName } = ctx.params;
+                await getObject('objects').directDelete({filters: ['name','=', objectName]});
+                await getObject('object_fields').directDelete({filters: ['object','=', objectName]});
+                await sleep(2 * 1000)
+                return true;
+            }
+        }
 	},
 
 	/**

package/main/default/services/object_fields.service.js

@@ -125,7 +125,8 @@ module.exports = {
                         "clearValueOnHidden": true,
                         "fieldName": "defaultValue"
                     }
-                    if(_.isString(value) && value.indexOf('{')>-1){
+                    const regDoubleQuote = /\$\{([^}]*)\}/g; // 更改捕获组内容：([^}]*) 匹配非 } 字符
+                    if(_.isString(value) && regDoubleQuote.test(value)){
                         // 只读时值是公式就显示公式
                         steedos_field = {
                             "type": "control",
@@ -135,7 +136,7 @@ module.exports = {
                                 "label": translatedLabel,
                                 "labelClassName": "text-left",
                                 "type": "tpl",
-                                "tpl": value.indexOf('$') > -1 ? "\\"+value : value
+                                "tpl": value.replace(regDoubleQuote, '\\${$1}')
                             }
                         }
                     }else if(['number','currency','percent'].includes(type)){
@@ -230,6 +231,9 @@ module.exports = {
                         "evalMode": false,
                         "type": "input-formula",
                         "placeholder": "公式",
+                        "variableMode": "tabs",
+                        "variables": "${defaultValueVariables}", //公式编辑器内引用的变量，在对象字段表单微页面内定义
+                        "visibleOn": "${defaultValueVariables}",
                         // "disabledOn": "!!this.defaultValue && !!this.defaultValue.toString()",
                         "className": {
                             "defaultValue_field_formula": true,

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-20 16:00:17
  * @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,21 @@ 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];
-        }
+        // _.each(this.data.values, (item)=>{
+        //     if(item.visibleOn){
+        //         item.visible_type = "expression"
+        //     }else if(item.visible === true){
+        //         item.visible_type = "static"
+        //     }
+        // })
 
-        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.visible != false){
+                item.visible = true
             }
-        }
+        })
+
     },
     afterCount: async function(){
         delete this.query.fields;
@@ -95,6 +82,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);