@nocobase/data-source-manager 2.0.40 → 2.0.41

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 +1 -1
  2. package/package.json +7 -7
package/lib/database-data-source.js CHANGED
@@ -102,7 +102,7 @@ const _DatabaseDataSource = class _DatabaseDataSource extends import_data_source
102
102
  };
103
103
  const incomingPossibleTypes = Array.isArray(fieldOptions.possibleTypes) ? fieldOptions.possibleTypes : fieldOptions.type ? [fieldOptions.type] : [];
104
104
  const hasCompatibleStorageType = this.hasCompatibleStorageType(fieldOptions.type, modelOptions.type);
105
- const shouldUseIncomingType = Boolean(fieldOptions.rawType) && (modelOptions.rawType ? fieldOptions.rawType !== modelOptions.rawType && !hasCompatibleStorageType : !incomingPossibleTypes.includes(modelOptions.type) && !hasCompatibleStorageType);
105
+ const shouldUseIncomingType = Boolean(fieldOptions.rawType) && Boolean(modelOptions.rawType || modelOptions.type) && (modelOptions.rawType ? fieldOptions.rawType !== modelOptions.rawType && !hasCompatibleStorageType : !incomingPossibleTypes.includes(modelOptions.type) && !hasCompatibleStorageType);
106
106
  if (shouldUseIncomingType) {
107
107
  newOptions.type = fieldOptions.type;
108
108
  newOptions.interface = fieldOptions.interface;
package/package.json CHANGED
@@ -1,16 +1,16 @@
1
1
  {
2
2
  "name": "@nocobase/data-source-manager",
3
- "version": "2.0.40",
3
+ "version": "2.0.41",
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.0.40",
10
- "@nocobase/cache": "2.0.40",
11
- "@nocobase/database": "2.0.40",
12
- "@nocobase/resourcer": "2.0.40",
13
- "@nocobase/utils": "2.0.40",
9
+ "@nocobase/actions": "2.0.41",
10
+ "@nocobase/cache": "2.0.41",
11
+ "@nocobase/database": "2.0.41",
12
+ "@nocobase/resourcer": "2.0.41",
13
+ "@nocobase/utils": "2.0.41",
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": "31cef2047fddf5a609cc820328bc88eea79c7b82"
22
+ "gitHead": "53a937012eb64a52cf0776a2193dce41c7c90ac5"
23
23
  }