@nocobase/database 1.8.0-alpha.9 → 1.8.0-beta.10
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.
- package/lib/fields/password-field.js +10 -15
- package/lib/operators/eq.js +1 -14
- package/package.json +4 -4
|
@@ -72,32 +72,27 @@ const _PasswordField = class _PasswordField extends import_field.Field {
|
|
|
72
72
|
}
|
|
73
73
|
init() {
|
|
74
74
|
const { name } = this.options;
|
|
75
|
-
this.listener = async (
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
} else {
|
|
86
|
-
instance.set(name, instance.previous(name));
|
|
87
|
-
}
|
|
75
|
+
this.listener = async (model) => {
|
|
76
|
+
if (!model.changed(name)) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const value = model.get(name);
|
|
80
|
+
if (value) {
|
|
81
|
+
const hash = await this.hash(value);
|
|
82
|
+
model.set(name, hash);
|
|
83
|
+
} else {
|
|
84
|
+
model.set(name, model.previous(name));
|
|
88
85
|
}
|
|
89
86
|
};
|
|
90
87
|
}
|
|
91
88
|
bind() {
|
|
92
89
|
super.bind();
|
|
93
90
|
this.on("beforeCreate", this.listener);
|
|
94
|
-
this.on("beforeBulkCreate", this.listener);
|
|
95
91
|
this.on("beforeUpdate", this.listener);
|
|
96
92
|
}
|
|
97
93
|
unbind() {
|
|
98
94
|
super.unbind();
|
|
99
95
|
this.off("beforeCreate", this.listener);
|
|
100
|
-
this.off("beforeBulkCreate", this.listener);
|
|
101
96
|
this.off("beforeUpdate", this.listener);
|
|
102
97
|
}
|
|
103
98
|
};
|
package/lib/operators/eq.js
CHANGED
|
@@ -31,20 +31,7 @@ __export(eq_exports, {
|
|
|
31
31
|
module.exports = __toCommonJS(eq_exports);
|
|
32
32
|
var import_sequelize = require("sequelize");
|
|
33
33
|
var eq_default = {
|
|
34
|
-
$eq(val
|
|
35
|
-
if (ctx == null ? void 0 : ctx.fieldPath) {
|
|
36
|
-
const field = ctx.db.getFieldByPath(ctx.fieldPath);
|
|
37
|
-
if ((field == null ? void 0 : field.type) === "string" && typeof val !== "string") {
|
|
38
|
-
if (Array.isArray(val)) {
|
|
39
|
-
return {
|
|
40
|
-
[import_sequelize.Op.in]: val.map((v) => String(v))
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
return {
|
|
44
|
-
[import_sequelize.Op.eq]: String(val)
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
|
-
}
|
|
34
|
+
$eq(val) {
|
|
48
35
|
if (Array.isArray(val)) {
|
|
49
36
|
return {
|
|
50
37
|
[import_sequelize.Op.in]: val
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/database",
|
|
3
|
-
"version": "1.8.0-
|
|
3
|
+
"version": "1.8.0-beta.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
7
7
|
"license": "AGPL-3.0",
|
|
8
8
|
"dependencies": {
|
|
9
|
-
"@nocobase/logger": "1.8.0-
|
|
10
|
-
"@nocobase/utils": "1.8.0-
|
|
9
|
+
"@nocobase/logger": "1.8.0-beta.10",
|
|
10
|
+
"@nocobase/utils": "1.8.0-beta.10",
|
|
11
11
|
"async-mutex": "^0.3.2",
|
|
12
12
|
"chalk": "^4.1.1",
|
|
13
13
|
"cron-parser": "4.4.0",
|
|
@@ -38,5 +38,5 @@
|
|
|
38
38
|
"url": "git+https://github.com/nocobase/nocobase.git",
|
|
39
39
|
"directory": "packages/database"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "09fe854edfc44f45422fa983093dd34694416c5a"
|
|
42
42
|
}
|