@digione/node-custom-api 0.1.9-alpha6 → 0.1.9-alpha8
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/package.json +1 -1
- package/utils/db.js +4 -4
- package/utils/file.d.ts +2 -1
- package/utils/file.js +2 -4
- package/utils/stream.js +8 -1
package/package.json
CHANGED
package/utils/db.js
CHANGED
|
@@ -32,7 +32,7 @@ const getWhereVal = (smth) => {
|
|
|
32
32
|
return [key, value].join(` ${smth.comparator} `);
|
|
33
33
|
};
|
|
34
34
|
const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket = false } = {}) => {
|
|
35
|
-
as = as ? as + delimiter : as;
|
|
35
|
+
as = as ? "`" + as + "`" + delimiter : as;
|
|
36
36
|
let symbolKeys = Object.getOwnPropertySymbols(where);
|
|
37
37
|
let rawWhere = (Object.keys(where).concat(symbolKeys)).reduce((result, key) => {
|
|
38
38
|
let value = where[key];
|
|
@@ -48,7 +48,7 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
|
|
|
48
48
|
result = `${result}( ${op}) AND `;
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
|
-
result =
|
|
51
|
+
result = result + "`" + key + "`" + ` IN (${value.map(i => "'" + i + "'").join(',')}) AND `;
|
|
52
52
|
}
|
|
53
53
|
return result;
|
|
54
54
|
}
|
|
@@ -62,10 +62,10 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
|
|
|
62
62
|
return result;
|
|
63
63
|
}
|
|
64
64
|
else if (typeof value == "object" && value['val']) {
|
|
65
|
-
result =
|
|
65
|
+
result = result + "`" + key + "`" + `=${value['val']} AND `;
|
|
66
66
|
return result;
|
|
67
67
|
}
|
|
68
|
-
result = result + key + "=" + value + " AND ";
|
|
68
|
+
result = result + "`" + key + "`" + "=" + value + " AND ";
|
|
69
69
|
}
|
|
70
70
|
return result;
|
|
71
71
|
}, "");
|
package/utils/file.d.ts
CHANGED
|
@@ -171,7 +171,7 @@ export declare class FileUtil {
|
|
|
171
171
|
user_id: any;
|
|
172
172
|
organ_id: any;
|
|
173
173
|
organ_by: any;
|
|
174
|
-
sort:
|
|
174
|
+
sort: any;
|
|
175
175
|
date_added: string;
|
|
176
176
|
name: any;
|
|
177
177
|
filename: any;
|
|
@@ -182,6 +182,7 @@ export declare class FileUtil {
|
|
|
182
182
|
type: any;
|
|
183
183
|
is_hidden: any;
|
|
184
184
|
tags: any;
|
|
185
|
+
custom: any;
|
|
185
186
|
group: any;
|
|
186
187
|
}[]>;
|
|
187
188
|
insertFileUnique(results: Array<any>, { format, thumb, width, height }?: {
|
package/utils/file.js
CHANGED
|
@@ -256,7 +256,7 @@ class FileUtil {
|
|
|
256
256
|
result[width + 'x' + height] = thumb;
|
|
257
257
|
yield (0, db_1.update)(this.ref, file_1.FileModel.getTableName().toString(), { thumb: JSON.stringify(result) }, { where: { id: item['id'] } });
|
|
258
258
|
}
|
|
259
|
-
if (item['filename'] == path) {
|
|
259
|
+
if (thumb && item['filename'] == path) {
|
|
260
260
|
yield this.getStorage();
|
|
261
261
|
let data = yield this.afterQueryFile({ filename: thumb, path: thumb });
|
|
262
262
|
thumb = data.path;
|
|
@@ -582,9 +582,7 @@ class FileUtil {
|
|
|
582
582
|
let item = Object.assign(Object.assign({}, input), { folder_id,
|
|
583
583
|
user_id,
|
|
584
584
|
organ_id,
|
|
585
|
-
organ_by,
|
|
586
|
-
sort,
|
|
587
|
-
date_added, name: reqs[key].originalname || (0, helper_1.getSlug)(32), filename: reqs[key].Key || file.Key || input['filename'], path, mimetype: reqs[key].mimetype, filesize: reqs[key].size, extension: (extension ? "." + extension : ''), type: reqs[key].type || file.type || input['type'], is_hidden, tags: reqs[key].tags || tags, group });
|
|
585
|
+
organ_by, sort: reqs[key].sort || sort, date_added, name: reqs[key].originalname || (0, helper_1.getSlug)(32), filename: reqs[key].Key || file.Key || input['filename'], path, mimetype: reqs[key].mimetype, filesize: reqs[key].size, extension: (extension ? "." + extension : ''), type: reqs[key].type || file.type || input['type'], is_hidden, tags: reqs[key].tags || tags, custom: reqs[key].custom || input['custom'], group });
|
|
588
586
|
if (format) {
|
|
589
587
|
item = yield this.afterQueryFile(item);
|
|
590
588
|
}
|
package/utils/stream.js
CHANGED
|
@@ -474,6 +474,7 @@ class StreamUtil {
|
|
|
474
474
|
if (convert_option) {
|
|
475
475
|
let obj_value = {};
|
|
476
476
|
if (item['field_type'] == "choice") {
|
|
477
|
+
let opt_empty = false;
|
|
477
478
|
if (field_data['choice_data']) {
|
|
478
479
|
let data = [];
|
|
479
480
|
data = field_data['choice_data'].split('\n');
|
|
@@ -496,6 +497,7 @@ class StreamUtil {
|
|
|
496
497
|
data[k] = { key, value };
|
|
497
498
|
}
|
|
498
499
|
else {
|
|
500
|
+
opt_empty = true;
|
|
499
501
|
data[k] = { key: '', value };
|
|
500
502
|
}
|
|
501
503
|
}
|
|
@@ -514,15 +516,20 @@ class StreamUtil {
|
|
|
514
516
|
if (value && value.indexOf('lang:') > -1) {
|
|
515
517
|
item['value'] = (0, i18n_1.__)({ phrase: value, locale: lang_code });
|
|
516
518
|
}
|
|
519
|
+
if (!item['key'])
|
|
520
|
+
opt_empty = true;
|
|
517
521
|
if (convert_value && item['key']) {
|
|
518
522
|
obj_value[item['key']] = item['value'];
|
|
519
523
|
}
|
|
520
524
|
return item;
|
|
521
525
|
});
|
|
522
526
|
}
|
|
527
|
+
if (field_data['default_value'] && !opt_empty && (item['field_value'] == '' || item['field_value'] == null)) {
|
|
528
|
+
item['field_value'] = field_data['default_value'];
|
|
529
|
+
}
|
|
523
530
|
if (convert_value && typeof item['field_value'] != "undefined") {
|
|
524
531
|
let field_value = item['field_value'];
|
|
525
|
-
if (item['field_value'] == null)
|
|
532
|
+
if (item['field_value'] == null && opt_empty)
|
|
526
533
|
field_value = '';
|
|
527
534
|
field_data['value'] = obj_value[field_value];
|
|
528
535
|
}
|