@steedos/standard-object-database 2.5.19 → 2.5.20-beta.10

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

@@ -356,6 +356,7 @@ fields:
 groups:
   external_data_source: External data source
   advanced: Advanced
+  ui: UI
 listviews:
   all:
     label: All

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

@@ -332,6 +332,7 @@ fields:
 groups:
   external_data_source: 外部数据源
   advanced: 高级
+  ui: 界面布局
 listviews:
   all:
     label: 所有

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

@@ -3,6 +3,12 @@ var objectql = require('@steedos/objectql');
 var clone = require('clone');
 var objectCore = require('./objects.core.js');
 
+const objectFieldsFind = function (filter) {
+    return objectql.wrapAsync(async function () {
+        return await objectql.getObject('object_fields').find(this.filter);
+    }, { filter: filter })
+}
+
 const MAX_MASTER_DETAIL_LEAVE = objectql.MAX_MASTER_DETAIL_LEAVE;
 
 function canRemoveNameFileld(doc){
@@ -105,20 +111,18 @@ function _syncToObject(doc, event) {
 };
 
 function isRepeatedName(doc, name) {
-  var other;
-  other = Creator.getCollection("object_fields").find({
-    object: doc.object,
-    space: doc.space,
-    _id: {
-      $ne: doc._id
-    },
-    name: name || doc.name
-  }, {
-    fields: {
-      _id: 1
-    }
+  var other = objectFieldsFind({
+    filters: [[
+      'object', '=', doc.object
+    ], [
+      'space', '=', doc.space
+    ], [
+      '_id', '!=', doc._id
+    ], [
+      'name', '=', name || doc.name
+    ]]
   });
-  if (other.count() > 0) {
+  if (other.length > 0) {
     return true;
   }
   return false;
@@ -455,33 +459,6 @@ var triggers = {
         throw new Meteor.Error(500, "华炎云服务不包含自定义业务对象的功能，请部署私有云版本");
       }
 
-      const staticRequiredFields = ['object','label','_name','type'];
-      // const staticRequiredFieldLabel = ['所属对象','显示名称','字段名','字段类型'];
-      for(let i = 0; i<staticRequiredFields.length; i++){
-        const fieldName = staticRequiredFields[i];
-        const fieldValue = doc[fieldName];
-        if(!fieldValue){
-          throw new Meteor.Error(fieldName, "必填字段");
-        }
-      }
-      //  options子字段、precision、scale、summary_field不参与以下简单动态必填字段组。
-      const dynamicsRequired = [
-        ['language',['code']],['reference_to',['lookup', 'master_detail']],['formula',['autonumber', 'formula']],
-        ['data_type',['formula']],['rows',['textarea']],['options',['select']],
-        ['formula_blank_value',['formula']],['summary_object',['summary']],['summary_type',['summary']],
-        ['deleted_lookup_record_behavior',['lookup']]
-      ];
-
-      for(let i = 0; i<dynamicsRequired.length; i++){
-        if( dynamicsRequired[i][1].indexOf(doc.type) > -1 ){
-          const fieldName = dynamicsRequired[i][0];
-          const fieldValue = doc[fieldName];
-          if(!fieldValue){
-            throw new Meteor.Error(fieldName, "动态必填字段");
-          }
-        }
-      }
-
       checkName(doc._name);
       if(['name','owner','parent','children'].indexOf(doc._name)>-1){
         doc.name = doc._name;
@@ -492,8 +469,9 @@ var triggers = {
       if(doc.name === 'name' || doc.is_name){
         checkNameField({type: doc.type})
       }
-
+      console.log('insert', doc)
       if (isRepeatedName(doc)) {
+        
         throw new Meteor.Error(doc.name, "字段名不能重复");
       }
 

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

@@ -689,12 +689,12 @@ fields:
     defaultValue: 100
     scale: 0
     sortable: true
-    group: Advanced
+    group: ui
     sort_no: 370
   is_name:
     type: boolean
     label: Is Name
-    group: Advanced
+    group: External data source
     sort_no: 380
     amis:
       disabledOn: "${is_system == true}"
@@ -731,24 +731,25 @@ fields:
     defaultValue: clear
     amis:
       "id": "u:6a556d8a8514"
-      "disabledOn": "${required==true || is_system == true}"
+      "disabledOn": "${required==true}"
   is_wide:
     type: boolean
     label: Is Wide
     # group: Advanced
-  # readonly:
-  #   type: boolean
-  #   label: Readonly
-  #   group: Advanced
-  # hidden:
-  #   type: boolean
-  #   label: Hidden
-  #   group: Advanced
+    sort_no: 274
+    group: ui
+  readonly:
+    type: boolean
+    label: Readonly
+    group: ui
+  hidden:
+    type: boolean
+    label: Hidden
+    group: ui
   # omit:
   #   type: boolean
   #   label: Omit
   #   group: Advanced
-    sort_no: 274
   index:
     type: boolean
     label: Is Index Field
@@ -764,17 +765,17 @@ fields:
   sortable:
     type: boolean
     label: Sortable
-    group: Advanced
+    group: ui
     sort_no: 420
   searchable:
     type: boolean
     label: Searchable
-    group: Advanced
+    group: ui
     sort_no: 428
   filterable:
     type: boolean
     label: Filterable
-    group: Advanced
+    group: ui
     sort_no: 430
   show_as_qr:
     type: boolean
@@ -788,7 +789,7 @@ fields:
     type: textarea
     label: Visible On
     is_wide: true
-    group: Advanced
+    group: ui
     sort_no: 450
     inlineHelpText: <a href='https://docs.steedos.com/zh-CN/no-code/customize/fields/field-attributes#%E5%AD%97%E6%AE%B5%E6%98%BE%E7%A4%BA%E5%85%AC%E5%BC%8F' target='_blank'>查看帮助</a>
   inlineHelpText:
@@ -831,6 +832,8 @@ list_views:
       - object
       - sort_no
       - modified
+      - hidden
+      - readonly
       - is_system
     sort:
       - field_name: sort_no
@@ -846,6 +849,8 @@ list_views:
       - object
       - sort_no
       - modified
+      - hidden
+      - readonly
       - is_system
     label: 自定义
     filters:

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

@@ -216,6 +216,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);

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,

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

@@ -255,6 +255,9 @@ module.exports = {
         if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'name')){
             query.fields.push('name')
         }
+        if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'type')){
+            query.fields.push('type')
+        }
     },
     beforeAggregate: async function(){
         const { query } = this;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.19",
+    "version": "2.5.20-beta.10",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "f45f110239267697485b421285e61ca020e4779b"
+    "gitHead": "42a5b30eb9031f18283b2b10f1983ede714d7f49"
 }