@steedos/standard-object-database 2.7.18-beta.29 → 2.7.18-beta.30

package/main/default/objects/object_fields/fields/auto_fill_mapping.$.to.field.yml

@@ -21,7 +21,8 @@ filtersFunction: !<tag:yaml.org,2002:js/function> |-
         "email": ["email", "text", "textarea"]
     };
     var currentFilter = [];
-    var referenceObject = BuilderAmisObject && BuilderAmisObject.AmisLib && BuilderAmisObject.AmisLib.getUISchemaSync(values.reference_to);
+    //这里调用getUISchemaSync时传入true强制抓取最新schema是因为：设置自动填充时，如果from中选择了一个刚新建的字段，下面的fromField变量会取不到刚新建的字段，造成设置to属性会报错
+    var referenceObject = BuilderAmisObject && BuilderAmisObject.AmisLib && BuilderAmisObject.AmisLib.getUISchemaSync(values.reference_to, true);
     var fromField = referenceObject && referenceObject.fields[values.from];
 
     if (values.multiple) {
@@ -37,20 +38,34 @@ filtersFunction: !<tag:yaml.org,2002:js/function> |-
         currentFilter.push(['multiple', '!=', true]);
       }
     }
-    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 === "users"){
-            currentFilter.push([['reference_to', '=', "users"],"or", ['reference_to', '=', "space_users"]]);
+    if (fromField) {
+        if(fromField.type == "select"){
+          //要注意下拉框字段类型有data_type属性，可能为boolean/number/text/null，默认值为null，表示text类型
+          var fromFieldDataType = fromField.data_type || "text";
+          currentFilter.push(['type', '=', 'select']);
+          if (fromFieldDataType === "text") {
+            currentFilter.push([['data_type', '=', 'text'], 'or', ['data_type', '=', null]]);
           }
-          else{
-            if (fromField.reference_to) {
-              currentFilter.push(['reference_to', '=', fromField.reference_to]);
+          else {
+            currentFilter.push(['data_type', '=', fromFieldDataType]);
+          }
+        }
+        else if (fromField.data_type) {
+            // 公式字段类型按data_type属性处理
+            currentFilter.push(['type', 'in', fieldFilters[fromField.data_type] || fromField.data_type.split()]);
+        } else {
+          currentFilter.push(['type', 'in', fieldFilters[fromField.type] || fromField.type.split()]);
+          if (fromField.type == "lookup" || fromField.type == "master_detail") {
+            if(fromField.reference_to === "users"){
+              currentFilter.push([['reference_to', '=', "users"],"or", ['reference_to', '=', "space_users"]]);
             }
-            if (fromField.reference_to_field) {
-              currentFilter.push(['reference_to_field', '=', fromField.reference_to_field]);
+            else{
+              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]);
+              }
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.18-beta.29",
+    "version": "2.7.18-beta.30",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,14 +12,14 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.18-beta.29",
-        "@steedos/service-object-mixin": "2.7.18-beta.29",
-        "@steedos/standard-objects": "2.7.18-beta.29",
+        "@steedos/metadata-core": "2.7.18-beta.30",
+        "@steedos/service-object-mixin": "2.7.18-beta.30",
+        "@steedos/standard-objects": "2.7.18-beta.30",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "7312209bd2ecaa4c6784f4ab8720d6cd40bca994"
+    "gitHead": "93e59ac338615bceb8712d1f19c752fd29eb5be4"
 }