@steedos/service-core-objects 3.0.0-beta.50 → 3.0.0-beta.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -37,20 +37,34 @@ filtersFunction: !<tag:yaml.org,2002:js/function> |-
|
|
|
37
37
|
currentFilter.push(['multiple', '!=', true]);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
if (fromField
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
if(
|
|
46
|
-
currentFilter.push([['
|
|
40
|
+
if (fromField) {
|
|
41
|
+
if(fromField.type == "select"){
|
|
42
|
+
//要注意下拉框字段类型有data_type属性，可能为boolean/number/text/null，默认值为null，表示text类型
|
|
43
|
+
var fromFieldDataType = fromField.data_type || "text";
|
|
44
|
+
currentFilter.push(['type', '=', 'select']);
|
|
45
|
+
if (fromFieldDataType === "text") {
|
|
46
|
+
currentFilter.push([['data_type', '=', 'text'], 'or', ['data_type', '=', null]]);
|
|
47
47
|
}
|
|
48
|
-
else{
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
else {
|
|
49
|
+
currentFilter.push(['data_type', '=', fromFieldDataType]);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
else if (fromField.data_type) {
|
|
53
|
+
// 公式字段类型按data_type属性处理
|
|
54
|
+
currentFilter.push(['type', 'in', fieldFilters[fromField.data_type] || fromField.data_type.split()]);
|
|
55
|
+
} else {
|
|
56
|
+
currentFilter.push(['type', 'in', fieldFilters[fromField.type] || fromField.type.split()]);
|
|
57
|
+
if (fromField.type == "lookup" || fromField.type == "master_detail") {
|
|
58
|
+
if(fromField.reference_to === "users"){
|
|
59
|
+
currentFilter.push([['reference_to', '=', "users"],"or", ['reference_to', '=', "space_users"]]);
|
|
51
60
|
}
|
|
52
|
-
|
|
53
|
-
|
|
61
|
+
else{
|
|
62
|
+
if (fromField.reference_to) {
|
|
63
|
+
currentFilter.push(['reference_to', '=', fromField.reference_to]);
|
|
64
|
+
}
|
|
65
|
+
if (fromField.reference_to_field) {
|
|
66
|
+
currentFilter.push(['reference_to_field', '=', fromField.reference_to_field]);
|
|
67
|
+
}
|
|
54
68
|
}
|
|
55
69
|
}
|
|
56
70
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-core-objects",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.51",
|
|
4
4
|
"main": "package.service.js",
|
|
5
5
|
"private": false,
|
|
6
6
|
"publishConfig": {
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
"steedos"
|
|
11
11
|
],
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@steedos/service-package-loader": "3.0.0-beta.
|
|
13
|
+
"@steedos/service-package-loader": "3.0.0-beta.51",
|
|
14
14
|
"json2xls": "^0.1.2",
|
|
15
15
|
"lodash": "^4.17.21"
|
|
16
16
|
},
|
|
17
17
|
"description": "steedos package",
|
|
18
18
|
"repository": {},
|
|
19
19
|
"license": "MIT",
|
|
20
|
-
"gitHead": "
|
|
20
|
+
"gitHead": "0fedafbed697ae5af821ebefc496d380fb08a5c2"
|
|
21
21
|
}
|