@nocobase/data-source-manager 2.1.0-alpha.14 → 2.1.0-alpha.15

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.
Files changed (2) hide show
  1. package/lib/database-data-source.js +3 -1
  2. package/package.json +7 -7
package/lib/database-data-source.js CHANGED
@@ -85,7 +85,9 @@ const _DatabaseDataSource = class _DatabaseDataSource extends import_data_source
85
85
  ...fieldOptions,
86
86
  ...modelOptions
87
87
  };
88
- if (fieldOptions.rawType && modelOptions.rawType && fieldOptions.rawType !== modelOptions.rawType) {
88
+ const incomingPossibleTypes = Array.isArray(fieldOptions.possibleTypes) ? fieldOptions.possibleTypes : fieldOptions.type ? [fieldOptions.type] : [];
89
+ const shouldUseIncomingType = Boolean(fieldOptions.rawType) && (modelOptions.rawType ? fieldOptions.rawType !== modelOptions.rawType : !incomingPossibleTypes.includes(modelOptions.type));
90
+ if (shouldUseIncomingType) {
89
91
  newOptions.type = fieldOptions.type;
90
92
  newOptions.interface = fieldOptions.interface;
91
93
  newOptions.rawType = fieldOptions.rawType;
package/package.json CHANGED
@@ -1,16 +1,16 @@
1
1
  {
2
2
  "name": "@nocobase/data-source-manager",
3
- "version": "2.1.0-alpha.14",
3
+ "version": "2.1.0-alpha.15",
4
4
  "description": "",
5
5
  "license": "Apache-2.0",
6
6
  "main": "./lib/index.js",
7
7
  "types": "./lib/index.d.ts",
8
8
  "dependencies": {
9
- "@nocobase/actions": "2.1.0-alpha.14",
10
- "@nocobase/cache": "2.1.0-alpha.14",
11
- "@nocobase/database": "2.1.0-alpha.14",
12
- "@nocobase/resourcer": "2.1.0-alpha.14",
13
- "@nocobase/utils": "2.1.0-alpha.14",
9
+ "@nocobase/actions": "2.1.0-alpha.15",
10
+ "@nocobase/cache": "2.1.0-alpha.15",
11
+ "@nocobase/database": "2.1.0-alpha.15",
12
+ "@nocobase/resourcer": "2.1.0-alpha.15",
13
+ "@nocobase/utils": "2.1.0-alpha.15",
14
14
  "@types/jsonwebtoken": "^8.5.8",
15
15
  "jsonwebtoken": "^9.0.2"
16
16
  },
@@ -19,5 +19,5 @@
19
19
  "url": "git+https://github.com/nocobase/nocobase.git",
20
20
  "directory": "packages/auth"
21
21
  },
22
- "gitHead": "d8735b541de0ff9557bba704de49c799b4962672"
22
+ "gitHead": "7c86e75b0af4b9f532c8ebf5ef96a7423b0ab60e"
23
23
  }