@steedos/standard-object-database 2.6.8-beta.13 → 2.6.8-beta.14

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

@@ -100,7 +100,7 @@ fields:
     help: 联动字段；例如：A是B依赖的字段，当A字段值发生改变，B字段选项值会随之改变。
     description: 
   create:
-    label: 是否显示新建按钮
+    label: 弹出选择时允许新建
     help: 
     description: 
   reference_to_field:

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

@@ -219,7 +219,7 @@ fields:
         data:
           object: ${object}
           name: ${name}
-          options: ${options}
+          options: ${options|filter:label:isTrue|filter:value:isTrue}
           type: ${type}
           reference_to: ${reference_to}
           multiple: ${multiple}
@@ -228,7 +228,7 @@ fields:
           mode: ${global.mode}
           scale: ${scale}
           _id: ${_id}
-        trackExpression: "${object},${options},${type},${reference_to},${reference_to_field},${multiple},${filtersFunction},${_id},${scale}"
+        trackExpression: "${object},${options|filter:label:isTrue|filter:value:isTrue|pick:label,value|json},${type},${reference_to},${reference_to_field},${multiple},${filtersFunction},${_id},${scale}"
         headers:
           Authorization: "Bearer ${context.tenantId},${context.authToken}"
         # sendOn: "!!this.type"
@@ -289,7 +289,7 @@ fields:
       disabledOn: "${is_system == true}"
   create:
     type: boolean
-    label: 是否显示新建按钮
+    label: 弹出选择时允许新建
     defaultValue: true
     visible_on: "{{['lookup'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 185
@@ -556,11 +556,42 @@ fields:
       - object
     filtersFunction: !<tag:yaml.org,2002:js/function> |-
       function (filters, values) {
-        if(values && values.object){
-          return ['object', '=', values.object]
-        }else{
-          return ['_id', '=', 'no']
+        //按照from字段类型给予不同的过滤限制,具体规则参考https://github.com/steedos/steedos-platform/issues/6496
+        var fieldFilters = {
+            "text": ["text", "textarea"],
+            "textarea": ["text", "textarea"],
+            "boolean": ["boolean", "toggle"],
+            "toggle": ["boolean", "toggle"],
+            "number": ["number", "currency"],
+            "currency": ["number", "currency"],
+            "lookup": ["lookup", "master_detail"],
+            "master_detail": ["lookup", "master_detail"],
+            "autonumber": ["autonumber", "text", "textarea"],
+            "email": ["email", "text", "textarea"]
+        };
+        var currentFilter = [];
+        var referenceObject = BuilderAmisObject && BuilderAmisObject.AmisLib && BuilderAmisObject.AmisLib.getUISchemaSync(values.reference_to);
+        var fromField = referenceObject && referenceObject.fields[values.auto_fill_mapping__from];
+
+        if (fromField && fromField.data_type) {
+            currentFilter.push(['type', 'in', fieldFilters[fromField.data_type] || fromField.data_type.split()]);
+        }else if (fromField) {
+            currentFilter.push(['type', 'in', fieldFilters[fromField.type] || fromField.type.split()]);
+            if (fromField.type == "lookup" || fromField.type == "master_detail") {
+              if (fromField.reference_to) {
+                currentFilter.push(['reference_to', '=', fromField.reference_to]);
+              }
+              if (fromField.reference_to_field) {
+                currentFilter.push(['reference_to_field', '=', fromField.reference_to_field]);
+              }
+            }
+        }
+        if (values && values.object) {
+            currentFilter.push(['object', '=', values.object]);
+        } else {
+            currentFilter.push(['_id', '=', 'no']);
         }
+        return currentFilter;
       }
   formula_blank_value:
     type: select

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.6.8-beta.13",
+    "version": "2.6.8-beta.14",
     "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.6.8-beta.13",
-        "@steedos/standard-objects": "2.6.8-beta.13"
+        "@steedos/metadata-core": "2.6.8-beta.14",
+        "@steedos/standard-objects": "2.6.8-beta.14"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "bab85130c5ca3bb1f6c520cb2a321694c211f3b3"
+    "gitHead": "52def4618d4b0bb424553af49f379bee09d27e3e"
 }