namirasoft-field-node 1.4.40 → 1.4.42
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.
|
@@ -8,7 +8,10 @@ export declare class NSFListController {
|
|
|
8
8
|
}): {
|
|
9
9
|
[table: string]: BaseDatabase_FilterTable;
|
|
10
10
|
};
|
|
11
|
-
static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[],
|
|
12
|
-
[table: string]:
|
|
11
|
+
static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], res: {
|
|
12
|
+
[table: string]: {
|
|
13
|
+
conditions: WhereOptions[];
|
|
14
|
+
required: boolean;
|
|
15
|
+
};
|
|
13
16
|
}, tables: NSFTables<D>): Includeable[];
|
|
14
17
|
}
|
|
@@ -56,25 +56,31 @@ class NSFListController {
|
|
|
56
56
|
};
|
|
57
57
|
return ans;
|
|
58
58
|
}
|
|
59
|
-
static handle_getIncludes(name, includes,
|
|
59
|
+
static handle_getIncludes(name, includes, res, tables) {
|
|
60
60
|
let ans = [...includes];
|
|
61
|
-
|
|
61
|
+
let entity_category = `${name}_category`;
|
|
62
|
+
let entity_field = `${name}_field`;
|
|
63
|
+
let entity_tag = `${name}_tag`;
|
|
64
|
+
if (res[entity_category].conditions.length > 0)
|
|
62
65
|
ans.push({
|
|
63
66
|
model: tables.entity_category.model,
|
|
64
67
|
attributes: [],
|
|
65
|
-
where: { [sequelize_1.Op.and]:
|
|
68
|
+
where: { [sequelize_1.Op.and]: res[entity_category].conditions },
|
|
69
|
+
required: res[entity_category].required
|
|
66
70
|
});
|
|
67
|
-
if (
|
|
71
|
+
if (res[entity_field].conditions.length > 0)
|
|
68
72
|
ans.push({
|
|
69
73
|
model: tables.entity_field.model,
|
|
70
74
|
attributes: [],
|
|
71
|
-
where: { [sequelize_1.Op.and]:
|
|
75
|
+
where: { [sequelize_1.Op.and]: res[entity_field].conditions },
|
|
76
|
+
required: res[entity_field].required
|
|
72
77
|
});
|
|
73
|
-
if (
|
|
78
|
+
if (res[entity_tag].conditions.length > 0)
|
|
74
79
|
ans.push({
|
|
75
80
|
model: tables.entity_tag.model,
|
|
76
81
|
attributes: [],
|
|
77
|
-
where: { [sequelize_1.Op.and]:
|
|
82
|
+
where: { [sequelize_1.Op.and]: res[entity_tag].conditions },
|
|
83
|
+
required: res[entity_tag].required
|
|
78
84
|
});
|
|
79
85
|
return ans;
|
|
80
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":";;;AAAA,yCAA+B;AAK/B,0EAAuE;AACvE,qDAA2C;AAE3C,MAAa,iBAAiB;IAE1B,MAAM,CAAC,gBAAgB,CAAC,IAAY,EAAE,MAAsD;QAExF,IAAI,GAAG,qBAAQ,MAAM,CAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,GAAG,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG;YACtB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,WAAW;oBACzB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG;YACnB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,QAAQ;oBACtB,MAAM,EAAE,WAAW;iBACtB;gBACD,kBAAkB,EAAE,CAAC,MAAc,EAAE,EAAE;oBAEnC,IAAI,0BAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,mDAAwB,CAAC,KAAK,CAAC;wBAC7D,OAAO,CAAC,eAAe,MAAM,GAAG,CAAC,CAAC;oBACtC,OAAO,EAAE,CAAC;gBACd,CAAC;aACJ;YACD,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE;gBAE3B,IAAI,0BAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,mDAAwB,CAAC,KAAK,CAAC;oBAC7D,OAAO,OAAO,CAAC;gBACnB,OAAO,MAAM,CAAC;YAClB,CAAC;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG;YACjB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,MAAM;oBACpB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,CAAC,kBAAkB,CAA8B,IAAY,EAAE,QAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -62,26 +62,32 @@ export class NSFListController
|
|
|
62
62
|
};
|
|
63
63
|
return ans;
|
|
64
64
|
}
|
|
65
|
-
static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[],
|
|
65
|
+
static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], res: { [table: string]: { conditions: WhereOptions[], required: boolean }; }, tables: NSFTables<D>): Includeable[]
|
|
66
66
|
{
|
|
67
67
|
let ans = [...includes];
|
|
68
|
-
|
|
68
|
+
let entity_category = `${name}_category`;
|
|
69
|
+
let entity_field = `${name}_field`;
|
|
70
|
+
let entity_tag = `${name}_tag`;
|
|
71
|
+
if (res[entity_category].conditions.length > 0)
|
|
69
72
|
ans.push({
|
|
70
73
|
model: tables.entity_category.model,
|
|
71
74
|
attributes: [],
|
|
72
|
-
where: { [Op.and]:
|
|
75
|
+
where: { [Op.and]: res[entity_category].conditions },
|
|
76
|
+
required: res[entity_category].required
|
|
73
77
|
});
|
|
74
|
-
if (
|
|
78
|
+
if (res[entity_field].conditions.length > 0)
|
|
75
79
|
ans.push({
|
|
76
80
|
model: tables.entity_field.model,
|
|
77
81
|
attributes: [],
|
|
78
|
-
where: { [Op.and]:
|
|
82
|
+
where: { [Op.and]: res[entity_field].conditions },
|
|
83
|
+
required: res[entity_field].required
|
|
79
84
|
});
|
|
80
|
-
if (
|
|
85
|
+
if (res[entity_tag].conditions.length > 0)
|
|
81
86
|
ans.push({
|
|
82
87
|
model: tables.entity_tag.model,
|
|
83
88
|
attributes: [],
|
|
84
|
-
where: { [Op.and]:
|
|
89
|
+
where: { [Op.and]: res[entity_tag].conditions },
|
|
90
|
+
required: res[entity_tag].required
|
|
85
91
|
});
|
|
86
92
|
return ans;
|
|
87
93
|
}
|