@xuda.io/xuda-dbs-plugin-xuda 1.0.159 → 1.0.161
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/server.js +7 -6
- package/studio.mjs +8 -6
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@xuda.io/xuda-dbs-plugin-xuda",
|
3
|
-
"version": "1.0.
|
3
|
+
"version": "1.0.161",
|
4
4
|
"description": "Xuda Database Socket for Xuda's proprietary structure powered by CouchDB",
|
5
5
|
"scripts": {
|
6
6
|
"pub": "npm version patch --force && npm publish --access public"
|
package/server.js
CHANGED
@@ -254,8 +254,8 @@ const get_opt = function (e, table_obj) {
|
|
254
254
|
opt.sort = sort;
|
255
255
|
}
|
256
256
|
|
257
|
-
if (e?.
|
258
|
-
opt.sort = e.
|
257
|
+
if (e?.sortModel?.length) {
|
258
|
+
opt.sort = e.sortModel;
|
259
259
|
if (opt.sort) {
|
260
260
|
for (const [key, val] of Object.entries(opt.sort)) {
|
261
261
|
var field_name = val.colId;
|
@@ -464,7 +464,7 @@ const get_opt = function (e, table_obj) {
|
|
464
464
|
for (const [key, val] of Object.entries(opt.fields)) {
|
465
465
|
opt.fields[key] = "udfData.data." + val;
|
466
466
|
}
|
467
|
-
if (!e?.
|
467
|
+
if (!e?.sortModel?.length) {
|
468
468
|
// added 2021 09 10
|
469
469
|
if (opt.sort) {
|
470
470
|
for (const [key, val] of Object.entries(opt.sort)) {
|
@@ -742,17 +742,18 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
|
|
742
742
|
const index_name = `index_${e.table_id}_${new Date()
|
743
743
|
.valueOf()
|
744
744
|
.toString()}`;
|
745
|
-
|
745
|
+
const _selector = _.cloneDeep(opt.selector);
|
746
|
+
const _sort = _.cloneDeep(opt.sort);
|
746
747
|
mango_index_obj = {
|
747
748
|
index: {
|
748
749
|
fields: Object.keys(
|
749
750
|
_.reduce(
|
750
|
-
|
751
|
+
_sort,
|
751
752
|
(ret, val) => {
|
752
753
|
ret[Object.keys(val)[0]] = val;
|
753
754
|
return ret;
|
754
755
|
},
|
755
|
-
|
756
|
+
_selector
|
756
757
|
)
|
757
758
|
),
|
758
759
|
},
|
package/studio.mjs
CHANGED
@@ -283,8 +283,8 @@ const get_opt = function (e, table_obj) {
|
|
283
283
|
opt.sort = sort;
|
284
284
|
}
|
285
285
|
|
286
|
-
if (e?.
|
287
|
-
opt.sort = e.
|
286
|
+
if (e?.sortModel?.length) {
|
287
|
+
opt.sort = e.sortModel;
|
288
288
|
if (opt.sort) {
|
289
289
|
for (const [key, val] of Object.entries(opt.sort)) {
|
290
290
|
var field_name = val.colId;
|
@@ -493,7 +493,7 @@ const get_opt = function (e, table_obj) {
|
|
493
493
|
for (const [key, val] of Object.entries(opt.fields)) {
|
494
494
|
opt.fields[key] = "udfData.data." + val;
|
495
495
|
}
|
496
|
-
if (!e?.
|
496
|
+
if (!e?.sortModel?.length) {
|
497
497
|
// added 2021 09 10
|
498
498
|
if (opt.sort) {
|
499
499
|
for (const [key, val] of Object.entries(opt.sort)) {
|
@@ -764,7 +764,7 @@ const query_db = async function (e, db, table_obj) {
|
|
764
764
|
ddoc: `mango_index_table_${e.table_id}`,
|
765
765
|
};
|
766
766
|
const result = await db.createIndex(mango_index_obj);
|
767
|
-
console.log("createIndex", result);
|
767
|
+
// console.log("createIndex", result);
|
768
768
|
throw new Error("creating index in progress");
|
769
769
|
} catch (err) {
|
770
770
|
return { code: -1, data: err.message };
|
@@ -777,16 +777,18 @@ const query_db = async function (e, db, table_obj) {
|
|
777
777
|
.valueOf()
|
778
778
|
.toString()}`;
|
779
779
|
|
780
|
+
const _selector = _.cloneDeep(opt.selector);
|
781
|
+
const _sort = _.cloneDeep(opt.sort);
|
780
782
|
mango_index_obj = {
|
781
783
|
index: {
|
782
784
|
fields: Object.keys(
|
783
785
|
_.reduce(
|
784
|
-
|
786
|
+
_sort,
|
785
787
|
(ret, val) => {
|
786
788
|
ret[Object.keys(val)[0]] = val;
|
787
789
|
return ret;
|
788
790
|
},
|
789
|
-
|
791
|
+
_selector
|
790
792
|
)
|
791
793
|
),
|
792
794
|
},
|