backend-plus 2.7.0-beta.8 → 2.7.0
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/for-client/css/my-menu.styl +13 -15
- package/for-client/css/my-tables.styl +28 -28
- package/for-client/css/my-things.styl +12 -12
- package/for-client/img/fuentes.txt +1 -1
- package/for-client/login.jade +3 -3
- package/for-client/my-localdb.js +2 -2
- package/for-client/my-localdb.js.map +1 -1
- package/for-client/my-menu.js +9 -9
- package/for-client/my-tables.js +179 -141
- package/for-client/my-things.js +18 -18
- package/for-client/my-websqldb.js +1 -1
- package/for-client/my-websqldb.js.map +1 -1
- package/for-client/new-password-result.jade +2 -2
- package/install/semver_to_decimal-fun.sql +1 -1
- package/lib/backend-plus.d.ts +39 -35
- package/lib/backend-plus.js +42 -87
- package/lib/in-backend-plus.d.ts +1 -1
- package/lib/my-debugger.js +2 -2
- package/lib/procedures-table.js +55 -42
- package/lib/table-def-adapt.js +5 -5
- package/lib/table-mixin.js +0 -2
- package/lib/tables/table-locks.js +1 -1
- package/lib/tables/table-tokens.js +1 -1
- package/package.json +23 -13
- package/src/for-client/my-localdb.ts +15 -15
- package/src/for-client/my-websqldb.ts +5 -5
- package/src/test/karma-test-localdb.ts +2 -2
- package/unlogged/auto-login.js +1 -1
- package/unlogged/compatibilidad.js +2 -2
- package/unlogged/css/chpass.styl +6 -6
- package/unlogged/css/login.styl +4 -4
- package/unlogged/globals.d.ts +1 -1
- package/unlogged/my-ajax.js +20 -20
- package/unlogged/my-start.js +1 -1
package/for-client/my-things.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
/// <reference path="../node_modules/types.d.ts/modules/typed-controls/index.d.ts" />
|
|
4
4
|
//no/ <reference path="../node_modules/types.d.ts/modules/dialog-promise/index.d.ts" />
|
|
5
5
|
/// <reference path="../node_modules/types.d.ts/modules/codenautas-umd/index.d.ts" />
|
|
6
|
-
/* No sabemos cómo referenciar a los tipos escritos en mwOwn/index.d.ts */
|
|
6
|
+
/* No sabemos cómo referenciar a los tipos escritos en mwOwn/index.d.ts */
|
|
7
7
|
//NO/ <reference path="../node_modules/types.d.ts/modules/myOwn/index.d.ts" />
|
|
8
8
|
/// <reference path="../node_modules/types.d.ts/modules/myOwn/in-myOwn.d.ts" />
|
|
9
9
|
/// <reference path="./in-backend-plus.d.ts" />
|
|
@@ -88,7 +88,7 @@ var LocalDb = require('./my-localdb').LocalDb;
|
|
|
88
88
|
var WebSqlDb = require('./my-websqldb').WebsqlDb;
|
|
89
89
|
|
|
90
90
|
|
|
91
|
-
/** @param {string} name
|
|
91
|
+
/** @param {string} name
|
|
92
92
|
* @param {number|undefined} version
|
|
93
93
|
* @returns {Promise<IDBDatabase>}
|
|
94
94
|
*/
|
|
@@ -181,9 +181,9 @@ myOwn.deleteLocalDb = function deleteLocalDb(){
|
|
|
181
181
|
try{
|
|
182
182
|
switch(gridBuffer) {
|
|
183
183
|
case 'idbx':
|
|
184
|
-
return LocalDb.deleteDatabase(my.appName+my.clientVersion);
|
|
184
|
+
return LocalDb.deleteDatabase(my.appName+my.clientVersion);
|
|
185
185
|
case 'wsql':
|
|
186
|
-
return WebSqlDb.deleteDatabase(my.appName+my.clientVersion);
|
|
186
|
+
return WebSqlDb.deleteDatabase(my.appName+my.clientVersion);
|
|
187
187
|
default:
|
|
188
188
|
throw new Error('grid buffer name is bad defined')
|
|
189
189
|
}
|
|
@@ -191,7 +191,7 @@ myOwn.deleteLocalDb = function deleteLocalDb(){
|
|
|
191
191
|
my.log(err);
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
|
-
|
|
194
|
+
|
|
195
195
|
}
|
|
196
196
|
myOwn.autoSetup = function autoSetup(){
|
|
197
197
|
var my=this;
|
|
@@ -206,12 +206,12 @@ myOwn.autoSetup = function autoSetup(){
|
|
|
206
206
|
my.promiseChainAutoSetup=promiseChain;
|
|
207
207
|
return promiseChain;
|
|
208
208
|
}
|
|
209
|
-
|
|
209
|
+
|
|
210
210
|
myOwn["log-severities"] = {
|
|
211
211
|
error:{permanent:true },
|
|
212
212
|
log :{permanent:false},
|
|
213
213
|
};
|
|
214
|
-
|
|
214
|
+
|
|
215
215
|
myOwn.log = function log(severity, message){
|
|
216
216
|
var my=this;
|
|
217
217
|
var consoleMessage;
|
|
@@ -318,7 +318,7 @@ myOwn.insertRow = function insertRow(where){
|
|
|
318
318
|
}
|
|
319
319
|
var tr = section.insertRow(iRow);
|
|
320
320
|
if(where.smooth){
|
|
321
|
-
if(where.smooth===true){
|
|
321
|
+
if(where.smooth===true){
|
|
322
322
|
where.smooth={};
|
|
323
323
|
}
|
|
324
324
|
var trDummy = section.insertRow(iRow);
|
|
@@ -404,7 +404,7 @@ myOwn.alertError = function(err){
|
|
|
404
404
|
dialogWindow.appendChild(html.table([html.tr([
|
|
405
405
|
html.td({class:'dialog-error-img'}, [html.img({src:my.path.img+'warning128.png'})]),
|
|
406
406
|
html.td([
|
|
407
|
-
html.pre(myOwn.propertiesWhiteList.map(function(name){
|
|
407
|
+
html.pre(myOwn.propertiesWhiteList.map(function(name){
|
|
408
408
|
return err[name]?err[name]+'\n':'';
|
|
409
409
|
}).join('')),
|
|
410
410
|
html.div([button])
|
|
@@ -441,9 +441,9 @@ myOwn.testKeepAlive = function testKeepAlive(){
|
|
|
441
441
|
}
|
|
442
442
|
var speed=1000/(1+new Date().getTime()-startTime);
|
|
443
443
|
if(isNaN(lightServer.result.speed)){
|
|
444
|
-
lightServer.result.speed = speed;
|
|
444
|
+
lightServer.result.speed = speed;
|
|
445
445
|
}
|
|
446
|
-
lightServer.result.speed = Math.ceil((lightServer.result.speed*7 + speed)/8);
|
|
446
|
+
lightServer.result.speed = Math.ceil((lightServer.result.speed*7 + speed)/8);
|
|
447
447
|
lightServer.title = lightServer.result.speed;
|
|
448
448
|
}
|
|
449
449
|
}).then(function(){
|
|
@@ -483,10 +483,10 @@ myOwn.scrollToTop = function(element, to, duration) {
|
|
|
483
483
|
change = to - start,
|
|
484
484
|
increment = 20;
|
|
485
485
|
var me = this;
|
|
486
|
-
var animateScroll = function(elapsedTime) {
|
|
486
|
+
var animateScroll = function(elapsedTime) {
|
|
487
487
|
elapsedTime += increment;
|
|
488
|
-
var position = me.easeInOut(elapsedTime, start, change, duration);
|
|
489
|
-
element.scrollTop = position;
|
|
488
|
+
var position = me.easeInOut(elapsedTime, start, change, duration);
|
|
489
|
+
element.scrollTop = position;
|
|
490
490
|
if (elapsedTime < duration) {
|
|
491
491
|
setTimeout(function() {
|
|
492
492
|
animateScroll(elapsedTime);
|
|
@@ -505,7 +505,7 @@ myOwn["connection-status"]={
|
|
|
505
505
|
noNetwork: { show: true , mustAsk: false, id:'light-network-signal', img:'network-no-signal'},
|
|
506
506
|
};
|
|
507
507
|
|
|
508
|
-
myOwn.debuggingStatus=false; // /*
|
|
508
|
+
myOwn.debuggingStatus=false; // /*
|
|
509
509
|
if(new Date()<bestGlobals.datetime.ymdHms(2016,10,25,14,50,0)){
|
|
510
510
|
myOwn.debuggingStatus=function(statusCode){
|
|
511
511
|
myOwn.debuggingStatus.count=(myOwn.debuggingStatus.count||0)+1
|
|
@@ -714,7 +714,7 @@ myOwn.captureKeys = function captureKeys() {
|
|
|
714
714
|
}
|
|
715
715
|
if(evento.which==115 && !evento.shiftKey && !evento.ctrlKey && !evento.altKey && !evento.metaKey){ // F4
|
|
716
716
|
/** @type {HTMLElement} */
|
|
717
|
-
var activeElement = this.activeElement && this.activeElement.tagName!='BODY' && this.activeElement || document.mayBeRepetibleButton;
|
|
717
|
+
var activeElement = this.activeElement && this.activeElement.tagName!='BODY' && this.activeElement || document.mayBeRepetibleButton;
|
|
718
718
|
var info=tableInfo(activeElement);
|
|
719
719
|
if(info.table){
|
|
720
720
|
var abovePos=info.tr.rowIndex-1;
|
|
@@ -880,9 +880,9 @@ myOwn.createSmartButton = function createSmartButton(opts){
|
|
|
880
880
|
var button=opts.button || html.button(opts.buttonProperties||{}, opts.buttonContent||opts.buttonLabel).create();
|
|
881
881
|
Object.defineProperty(button, 'smartState', {
|
|
882
882
|
get:function(){ return this.getAttribute('smart-button'); },
|
|
883
|
-
set:function(value){
|
|
883
|
+
set:function(value){
|
|
884
884
|
this.disabled=value!='active';
|
|
885
|
-
this.setAttribute('smart-button',value);
|
|
885
|
+
this.setAttribute('smart-button',value);
|
|
886
886
|
}
|
|
887
887
|
})
|
|
888
888
|
button.smartState=opts.initialState||'unkown';
|
|
@@ -341,7 +341,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
341
341
|
fieldNames.forEach(function (fieldName, i) {
|
|
342
342
|
whereExpr.push(fieldName + '=' + SqlTools.quoteLiteral(key[i]));
|
|
343
343
|
});
|
|
344
|
-
sql = "SELECT
|
|
344
|
+
sql = "SELECT *\n from " + SqlTools.quoteIdent(tableName) + "\n where " + whereExpr.join(' and ');
|
|
345
345
|
return [4 /*yield*/, this.executeQuery(sql, [])];
|
|
346
346
|
case 2:
|
|
347
347
|
result = _a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"my-websqldb.js","sourceRoot":"","sources":["../src/for-client/my-websqldb.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"my-websqldb.js","sourceRoot":"","sources":["../src/for-client/my-websqldb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAA,iDAAiD;IACjD,YAAY,CAAC;;;IACb,uFAAuF;IACvF,kEAAkE;IAClE,+EAA+E;IAC/E,0DAA0D;IAC1D,uDAAuD;IACvD,uDAAuD;IACvD,oDAAoD;IACpD,oDAAoD;IACpD,iDAAiD;IACjD,iDAAiD;IACjD,8CAA8C;IAE9C,gCAAkC;IAElC,6CAAwC;IACxC,oCAAsC;IAQ3B,QAAA,gBAAgB,GAAgB;QACvC,iBAAiB,EAAC,IAAI;KACzB,CAAA;IAED;QAGI,kBAAmB,IAAW;YAAX,SAAI,GAAJ,IAAI,CAAO;YAC1B,IAAI,OAAO,GAAG,GAAG,CAAC;YAClB,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,IAAI,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC;YAC9B,IAAI,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;YAC7B,IAAG,CAAC;gBACA,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;gBAC/D,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACvD,CAAC;YAAA,OAAM,GAAG,EAAC,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACzB,MAAM,GAAG,CAAC;YACd,CAAC;QACL,CAAC;QACa,iCAAc,GAA5B;;;;;;4BACQ,gBAAgB,GAAkB,EAAC,iBAAiB,EAAE,KAAK,EAAC,CAAC;4BAC7D,aAAa,GAAG,EAAC,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAC,KAAK,EAAC,CAAC;;;;4BAE3D,QAAQ,GAAiB;gCACzB,IAAI,EAAC,SAAS;gCACd,MAAM,EAAC;oCACH,EAAC,IAAI,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,EAAC;oCACjC,EAAC,IAAI,EAAC,OAAO,EAAI,QAAQ,EAAC,SAAS,EAAC;iCACvC;gCACD,UAAU,EAAC,CAAC,SAAS,CAAC;6BACzB,CAAC;4BACF,qBAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAA;;4BAAtC,SAAsC,CAAC;4BACvC,qBAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,EAAA;;4BAA3C,SAA2C,CAAC;4BAC5C,qBAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAC,CAAC,sBAAsB,CAAC,EAAE,IAAI,CAAC,EAAA;;4BAA3D,SAA2D,CAAC;;;;4BAE5D,aAAa,CAAC,KAAK,GAAC,IAAI,CAAC;4BACzB,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;4BAC1C,qBAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,EAAA;;4BAA3C,SAA2C,CAAC;;gCAEhD,sBAAO,gBAAgB,EAAC;;;;SAC3B;QACO,yCAAsB,GAA9B,UAA+B,QAAwB;YACnD,IAAI,MAAM,GAAC;gBACP,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,MAAM;gBACf,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,MAAM;gBACb,IAAI,EAAE,MAAM;aACf,CAAC;YACF,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,IAAI,SAAS,GAAY,EAAE,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,6BAA6B,GAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAC,IAAI,CAAC,CAAC;YAClF,IAAI,MAAM,GAAO,EAAE,CAAC;YACpB,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,UAAS,QAAwB;gBACrD,IAAI,SAAS,GAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAE,GAAG,GAAC,QAAQ,CAAC,QAAQ,GAAC,GAAG,CAAC;gBACnE,IAAG,QAAQ,CAAC,QAAQ,IAAE,CAAC,EAAC,CAAC;oBACrB,SAAS,GAAG,SAAS,CAAC;gBAC1B,CAAC;gBACD,MAAM,CAAC,IAAI,CACP,IAAI,GAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACvC,GAAG,GAAC,SAAS;oBACb,CAAC,QAAQ,CAAC,YAAY,IAAE,IAAI,CAAA,CAAC,CAAA,WAAW,GAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA,CAAC,CAAA,EAAE,CAAC;oBACzF,CAAC,QAAQ,CAAC,cAAc,IAAE,IAAI,CAAA,CAAC,CAAA,WAAW,GAAC,QAAQ,CAAC,cAAc,CAAA,CAAC,CAAA,EAAE,CAAC,CACzE,CAAC;gBACF,IAAG,QAAQ,CAAC,QAAQ,KAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAC,CAAC;oBACvD,SAAS,CAAC,IAAI,CACV,cAAc,GAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;wBACjD,kBAAkB,GAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAC,MAAM,CAAC;wBAC5D,UAAU,GAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAC,QAAQ,CACzD,CAAC;gBACN,CAAC;gBACD,IAAG,QAAQ,CAAC,QAAQ,KAAG,KAAK,EAAC,CAAC;oBAC1B,SAAS,CAAC,IAAI,CACV,cAAc,GAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;wBACjD,gBAAgB,GAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAC,gBAAgB,CACvE,CAAC;gBACN,CAAC;YACL,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAChC,IAAG,QAAQ,CAAC,UAAU,EAAC,CAAC;gBACpB,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,UAAS,IAAI,IAAG,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAC,GAAG,CAAC,CAAC;YAC9H,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA,CAAA,wCAAwC;QACnE,CAAC;QACa,uBAAc,GAA5B,UAA6B,IAAW;YACpC,MAAM;YACN,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC5B,CAAC;QACK,+BAAY,GAAlB,UAAmB,GAAU,EAAE,MAAgB;;;;oBACvC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;oBACjB,sBAAO,IAAI,OAAO,CAAC,UAAS,OAAO,EAAE,MAAM;4BACvC,IAAI,CAAC,EAAE;gCAAE,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC;4BACvC,IAAI,MAA0B,CAAC;4BAC/B,EAAE,CAAC,WAAW,CAAC,UAAS,EAAiB;gCACrC,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,IAAE,EAAE,EAAE,UAAS,GAAG,EAAC,GAAG;oCAC3C,MAAM,GAAC,GAAG,CAAC,IAAI,CAAC;gCACpB,CAAC,CAAC,CAAC;4BACP,CAAC,EAAC,UAAS,GAAG;gCACV,MAAM,CAAC,GAAG,CAAC,CAAC;4BAChB,CAAC,EAAC,SAAS,OAAO;gCACd,OAAO,CAAC,MAAM,CAAC,CAAC;4BACpB,CAAC,CAAC,CAAC;wBACP,CAAC,CAAC,EAAC;;;SACN;QAAA,CAAC;QACI,iCAAc,GAApB,UAAqB,GAAU,EAAE,IAAS;;;;oBAClC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;oBACjB,sBAAO,IAAI,OAAO,CAAC,UAAS,OAAO,EAAE,MAAM;4BACvC,IAAI,CAAC,EAAE;gCAAE,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC;4BACvC,EAAE,CAAC,WAAW,CAAC,UAAe,EAAiB;;;wCAC3C,IAAI,CAAC,OAAO,CAAC,UAAe,IAAI;;;oDAC5B,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;;;;yCAC3B,CAAC,CAAA;;;;6BACL,EAAC,UAAS,EAAE,EAAC,GAAG;gCACb,MAAM,CAAC,GAAG,CAAC,CAAC;4BAChB,CAAC,EAAC,UAAS,EAAE,EAAC,GAAG;gCACb,OAAO,EAAE,CAAC;4BACd,CAAC,CAAC,CAAA;wBACN,CAAC,CAAC,EAAC;;;SACN;QAAA,CAAC;QACI,oCAAiB,GAAvB,UAAwB,QAAwB;;;;gCAC5C,qBAAM,IAAI,CAAC,YAAY,CAAC,wFAAwF,EAAC,EAAE,CAAC,EAAA;;4BAApH,SAAoH,CAAC;4BACrH,qBAAM,IAAI,CAAC,YAAY,CAAC,+DAA+D,EACtF,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAA;;4BAD3C,SAC2C,CAAC;4BAC5C,qBAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,GAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,EAAE,CAAC,EAAA;;4BAAvF,SAAuF,CAAC;4BACxF,qBAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAC,EAAE,CAAC,EAAA;;4BAAjE,SAAiE,CAAC;;;;;SACrE;QACK,+BAAY,GAAlB,UAAmB,SAAgB;;;;;gCACE,qBAAM,IAAI,CAAC,YAAY,CAAC,0CAA0C,EAAC,CAAC,SAAS,CAAC,CAAC,EAAA;;4BAA5G,MAAM,GAAuB,SAA+E;4BAChH,IAAG,MAAM,CAAC,MAAM,EAAC,CAAC;gCACd,sBAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAC;4BAC1C,CAAC;iCAAI,CAAC;gCACF,sBAAO,SAAS,EAAA;4BACpB,CAAC;;;;;SACJ;QACK,kCAAe,GAArB,UAAsB,SAAgB;;;;;gCACnB,qBAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA7C,QAAQ,GAAG,SAAkC;4BACjD,sBAAO,QAAQ,CAAA,CAAC,CAAA,IAAI,CAAA,CAAC,CAAA,KAAK,EAAC;;;;SAC9B;QACO,oDAAiC,GAAzC,UAA0C,gBAAoC,EAAE,WAAmB;YAC/F,IAAI,GAAG,GAAO,EAAE,CAAC;YACjB,KAAI,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,gBAAgB,CAAC,MAAM,EAAC,CAAC,EAAE,EAAC,CAAC;gBACxC,IAAI,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACtC,IAAG,WAAW,EAAC,CAAC;oBACZ,MAAM,GAAG,IAAA,uBAAQ,EAAC,MAAM,EAAC,EAAE,CAAC,CAAA;gBAChC,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrB,CAAC;YACD,OAAO,GAAG,CAAC;QACf,CAAC;QACO,sCAAmB,GAA3B,UAA4B,SAAgB,EAAE,kBAAoC;YAC9E,IAAI,cAAc,GAAG,kBAAkB,CAAC,IAAI,CAAC,UAAS,KAAK;gBACvD,OAAO,KAAK,CAAC,IAAI,IAAE,SAAS,CAAC;YACjC,CAAC,CAAC,CAAA;YACF,OAAO,cAAc,CAAA,CAAC,CAAA,IAAI,CAAA,CAAC,CAAA,KAAK,CAAA;QACpC,CAAC;QACO,wCAAqB,GAA7B,UAA8B,QAAwB;YAClD,IAAI,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,UAAS,KAAK;gBACnD,OAAO,KAAK,CAAC,QAAQ,IAAE,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAE,WAAW,IAAI,KAAK,CAAC,QAAQ,IAAE,SAAS,CAAC;YACzH,CAAC,CAAC,CAAA;YACF,OAAO,WAAW,CAAC;QACvB,CAAC;QACO,4CAAyB,GAAjC,UAAkC,OAAa,EAAE,kBAAoC;YACjF,OAAO,CAAC,OAAO,CAAC,UAAS,GAAG;gBACxB,IAAG,kBAAkB,EAAC,CAAC;oBACnB,kBAAkB,CAAC,OAAO,CAAC,UAAS,iBAAiB;wBACjD,IAAI,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC;wBACvC,GAAG,CAAC,SAAS,CAAC,GAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;oBAC9C,CAAC,CAAC,CAAA;gBACN,CAAC;YACL,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAClB,CAAC;QACK,iCAAc,GAApB,UAAwB,SAAgB,EAAE,GAAO;;;;;;;4BAElC,qBAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAC,GAAG,CAAC,EAAA;gCAAvC,sBAAO,SAAgC,EAAC;;;4BAExC,sBAAO,SAAS,EAAA;;;;;SAEvB;QACK,yBAAM,GAAZ,UAAgB,SAAgB,EAAE,GAAO,EAAE,oBAA6B;;;;;;4BACpE,oBAAoB,GAAC,oBAAoB,IAAE,KAAK,CAAC;4BAClC,qBAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA7C,QAAQ,GAAG,SAAkC;4BAC7C,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;4BACnD,UAAU,GAAC,QAAQ,CAAC,UAAU,CAAC;4BAC/B,SAAS,GAAY,EAAE,CAAC;4BAC5B,UAAU,CAAC,OAAO,CAAC,UAAS,SAAS,EAAE,CAAC;gCACpC,SAAS,CAAC,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;4BACnE,CAAC,CAAC,CAAA;4BACE,GAAG,GACH,iCACU,GAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAC,0BAC/B,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;4BAC7B,qBAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAC,EAAE,CAAC,EAAA;;4BAAxC,MAAM,GAAG,SAA+B;iCAEzC,CAAC,oBAAoB,EAArB,wBAAqB;4BACD,qBAAM,IAAI,CAAC,qBAAqB,EAAA;;4BAAnD,gBAAgB,GAAG,SAAgC,CAAC;;;4BAEpD,WAAW,GAAG,CAAC,oBAAoB,IAAI,gBAAgB,CAAC,iBAAiB,CAAC;4BAC1E,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;4BAC9H,IAAG,eAAe,CAAC,CAAC,CAAC,EAAC,CAAC;gCACnB,sBAAO,eAAe,CAAC,CAAC,CAAC,EAAC;4BAC9B,CAAC;iCAAI,CAAC;gCACF,MAAM,KAAK,CAAC,uBAAuB,CAAC,CAAC;4BACzC,CAAC;;;;;SACJ;QACK,2BAAQ,GAAd,UAAkB,SAAgB,EAAE,SAAa;;;;;gCAC9B,qBAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA7C,QAAQ,GAAG,SAAkC;4BAC7C,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;4BACnD,UAAU,GAAC,QAAQ,CAAC,UAAU,CAAC;4BAC/B,SAAS,GAAY,EAAE,CAAC;4BAC5B,SAAS,CAAC,OAAO,CAAC,UAAS,GAAG,EAAE,CAAC;gCAC7B,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;4BACpE,CAAC,CAAC,CAAA;4BACE,GAAG,GAAG,gBAAgB,GAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;4BAC1D,IAAG,SAAS,CAAC,MAAM,EAAC,CAAC;gCACjB,GAAG,IAAG,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;4BAC9C,CAAC;4BACY,qBAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAC,EAAE,CAAC,EAAA;;4BAAxC,MAAM,GAAG,SAA+B;4BACrB,qBAAM,IAAI,CAAC,qBAAqB,EAAA;;4BAAnD,gBAAgB,GAAG,SAAgC;4BACvD,sBAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,EAAC;;;;SAC1I;QACK,yBAAM,GAAZ,UAAgB,SAAgB;;;;;gCACb,qBAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA7C,QAAQ,GAAG,SAAkC;4BAC7C,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;4BACzC,qBAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAC,EAAE,CAAC,EAAA;;4BAArF,OAAO,GAAG,SAA2E;4BAClE,qBAAM,IAAI,CAAC,qBAAqB,EAAA;;4BAAnD,gBAAgB,GAAG,SAAgC;4BACvD,sBAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,iCAAiC,CAAC,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,EAAC;;;;SAC3I;QACK,mCAAgB,GAAtB;;;;;gCACkB,qBAAM,IAAI,CAAC,YAAY,CAAC,mDAAmD,EAAC,EAAE,CAAC,EAAA;;4BAAzF,OAAO,GAAG,SAA+E;4BACzF,UAAU,GAAmB,EAAE,CAAC;4BACpC,KAAQ,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,OAAO,CAAC,MAAM,EAAC,CAAC,EAAE,EAAC,CAAC;gCAC/B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;4BACrD,CAAC;4BACD,sBAAO,UAAU,EAAC;;;;SACrB;QACK,0BAAO,GAAb,UAAc,SAAgB;;;;;gCACO,qBAAM,IAAI,CAAC,YAAY,CAAC,mCAAmC,GAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAC,EAAE,CAAC,EAAA;;4BAA3H,MAAM,GAAuB,SAA8F;4BAC/H,sBAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,EAAC;;;;SACvC;QACK,yBAAM,GAAZ,UAAgB,SAAgB,EAAE,OAAS;;;;;;4BACnC,GAAG,GAAG,IAAI,CAAC;4BACX,kBAAkB,GAAG,SAAS,kBAAkB,CAAC,EAAa;gCAC9D,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;;;;;wDACX,qBAAM,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,CAAC,EAAA;;oDAAhD,UAAU,GAAC,SAAqC;yDACjD,UAAU,EAAV,wBAAU;oDACL,EAAE,GAAY,EAAE,CAAC;oDACrB,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,UAAS,KAAmC;wDAC1D,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;oDACnC,CAAC,CAAC,CAAA;oDACE,oBAAoB,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,UAAS,KAAmC;wDACpF,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAA;oDACxC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAA;yDACX,oBAAoB,EAApB,wBAAoB;oDACA,qBAAM,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,EAAA;;oDAA1D,QAAQ,GAAO,SAA2C;oDAC9D,IAAG,QAAQ,EAAC,CAAC;wDACT,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,UAAS,KAAK;4DACnC,OAAO,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;wDACvD,CAAC,CAAC,CAAA;oDACN,CAAC;;;;;;iCAGZ,CAAC,CAAA;4BACN,CAAC,CAAA;4BACY,qBAAM,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA1C,QAAQ,GAAC,SAAiC;4BAC1C,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;4BACnD,aAAa,GAAoB,EAAE,CAAC;4BACxC,IAAG,QAAQ,CAAC,WAAW,EAAC,CAAC;gCACrB,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,UAAe,EAAE;;;4CAC1C,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;;;;iCAC9C,CAAC,CAAC;4BACP,CAAC;4BACD,IAAG,QAAQ,CAAC,eAAe,EAAC,CAAC;gCACzB,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,UAAe,EAAE;;;4CAC9C,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;;;;iCAC9C,CAAC,CAAC;4BACP,CAAC;4BACM,qBAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC;;;;;;oDACrC,UAAU,GAAU,EAAE,CAAC;oDACvB,WAAW,GAAU,EAAE,CAAC;oDACxB,mBAAmB,GAAU,EAAE,CAAC;oDACpC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAS,KAAK,EAAC,GAAG;wDACtC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;wDAC1C,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,EAAC,WAAW,CAAC,CAAA,CAAC,CAAA,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA,CAAC,CAAA,KAAK,CAAC,CAAC,CAAC;wDAC9G,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oDACpC,CAAC,CAAC,CAAA;oDACF,qBAAM,GAAG,CAAC,YAAY,CAClB,yBAAyB,GAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;4DACpD,IAAI,GAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAC,YAAY,GAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAC,IAAI,EAC1E,EAAE,CAAC,EAAA;;oDAHJ,SAGI,CAAC;oDACL,sBAAO,OAAO,EAAA;;;;iCACjB,CAAC,EAAA;gCAdF,sBAAO,SAcL,EAAC;;;;SACN;QACK,0BAAO,GAAb,UAA4B,SAAgB,EAAE,QAAY;;;;;;4BAElD,GAAG,GAAG,IAAI,CAAC;4BACX,IAAI,GAAW,EAAE,CAAC;4BACT,qBAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA3C,QAAQ,GAAC,SAAkC;4BAC3C,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;4BACvD,QAAQ,CAAC,OAAO,CAAC,UAAS,OAAO;gCAC7B,IAAG,CAAC,GAAG,EAAC,CAAC;oCACL,IAAI,UAAU,GAAU,EAAE,CAAC;gCAC/B,CAAC;gCACD,IAAI,MAAM,GAAO,EAAE,CAAC;gCACpB,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAS,KAAK,EAAC,GAAG;oCACtC,IAAG,CAAC,GAAG,EAAC,CAAC;wCACL,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;oCAC9C,CAAC;oCACD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,EAAC,WAAW,CAAC,CAAA,CAAC,CAAA,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA,CAAC,CAAA,KAAK,CAAC,CAAC;gCACtF,CAAC,CAAC,CAAA;gCACF,IAAG,CAAC,GAAG,EAAC,CAAC;oCACL,GAAG,GAAG,yBAAyB,GAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;wCACtD,IAAI,GAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAC,YAAY,GAAE,MAAM,CAAC,GAAG,CAAC,UAAA,CAAC,IAAE,OAAA,GAAG,EAAH,CAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAC,IAAI,CAAC;gCACvF,CAAC;gCACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BACtB,CAAC,CAAC,CAAC;4BACH,qBAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,EAAA;;4BAApC,SAAoC,CAAC;;;;;SACxC;QACK,wBAAK,GAAX;;;oBACI,MAAM;oBACN,sBAAO,OAAO,CAAC,OAAO,EAAE,EAAA;;;SAC3B;QACK,wBAAK,GAAX,UAAY,SAAgB;;;;gCACxB,qBAAM,IAAI,CAAC,YAAY,CACnB,cAAc,GAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAC,GAAG,EACpD,EAAE,CAAC,EAAA;;4BAFJ,SAEI,CAAC;;;;;SACR;QACL,eAAC;IAAD,CAAC,AAvUD,IAuUC;IAvUY,4BAAQ"}
|
|
@@ -28,7 +28,7 @@ html(lang=lang)
|
|
|
28
28
|
div
|
|
29
29
|
img.formImg(src='img/login-logo-icon.png')
|
|
30
30
|
p.
|
|
31
|
-
Se ha solicitado el restablecimiento de contraseña para la dirección de correo electrónico ingresada.
|
|
32
|
-
Si esta corresponde a un usuario activo en nuestro sistema, en breve recibirá un mensaje con un enlace seguro para establecer una nueva contraseña.
|
|
31
|
+
Se ha solicitado el restablecimiento de contraseña para la dirección de correo electrónico ingresada.
|
|
32
|
+
Si esta corresponde a un usuario activo en nuestro sistema, en breve recibirá un mensaje con un enlace seguro para establecer una nueva contraseña.
|
|
33
33
|
p.
|
|
34
34
|
Le pedimos revisar su bandeja de entrada, incluyendo las carpetas de correo no deseado o spam y las de correos no prioritarios.
|
|
@@ -9,4 +9,4 @@ select *, semver_to_decimal(semver), 'ERROR semver_to_decimal!!!!!!!!!!!!!'
|
|
|
9
9
|
from (select '12.3.4' semver, 12.3 result
|
|
10
10
|
union values ('12', 12),('12.3',12.3),('12.3.3-r12',12.3),('12b',12)
|
|
11
11
|
)
|
|
12
|
-
where semver_to_decimal(semver) is distinct from result;
|
|
12
|
+
where semver_to_decimal(semver) is distinct from result;
|
package/lib/backend-plus.d.ts
CHANGED
|
@@ -16,11 +16,11 @@ export type Server=net.Server;
|
|
|
16
16
|
|
|
17
17
|
export type CoreFunctionParameters<T extends Record<string, any>> = T;
|
|
18
18
|
|
|
19
|
-
export type MarkdownDoc = 'markdown documentation with `` can content newlines. The identation of the first line is deleted in all others'|'etc...';
|
|
19
|
+
export type MarkdownDoc = 'markdown documentation with `` can content newlines. The identation of the first line is deleted in all others'|'etc...';
|
|
20
20
|
|
|
21
21
|
export interface ProcedureParameter {
|
|
22
22
|
name: string
|
|
23
|
-
encoding?: string
|
|
23
|
+
encoding?: string
|
|
24
24
|
defaultValue?: any
|
|
25
25
|
typeName?: string
|
|
26
26
|
references?: string
|
|
@@ -41,7 +41,7 @@ export interface ProcedureDef<T = any> {
|
|
|
41
41
|
action: string
|
|
42
42
|
parameters: ProcedureParameter[]
|
|
43
43
|
method?: 'get'|'post'
|
|
44
|
-
coreFunction: CoreFunction<T>
|
|
44
|
+
coreFunction: CoreFunction<T>
|
|
45
45
|
encoding?:'JSON4all'|'JSON'|'download'
|
|
46
46
|
multipart?:true
|
|
47
47
|
progress?:true
|
|
@@ -67,11 +67,11 @@ export interface User {
|
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
export interface Context {
|
|
70
|
-
be:AppBackend,
|
|
71
|
-
user:User,
|
|
72
|
-
session:{[K:string]:any},
|
|
73
|
-
username:string,
|
|
74
|
-
machineId:string,
|
|
70
|
+
be:AppBackend,
|
|
71
|
+
user:User,
|
|
72
|
+
session:{[K:string]:any},
|
|
73
|
+
username:string,
|
|
74
|
+
machineId:string,
|
|
75
75
|
navigator:string
|
|
76
76
|
}
|
|
77
77
|
|
|
@@ -175,7 +175,7 @@ export type SequenceDefinition = {
|
|
|
175
175
|
name:string
|
|
176
176
|
firstValue:number
|
|
177
177
|
prefix?:string /* Prefix for the generated value */
|
|
178
|
-
}
|
|
178
|
+
}
|
|
179
179
|
export type SequenceMadMaxDefinition = {
|
|
180
180
|
madMax: string[] // grouping of mad max sequences
|
|
181
181
|
firstValue?: number
|
|
@@ -199,18 +199,18 @@ export interface FieldDefinition extends EditableDbDefinition {
|
|
|
199
199
|
inTable?:boolean /* default:!clientSide && !sql.fields[...].expr. Is a real fisical field in the table */
|
|
200
200
|
/* sizeByte?:number deprecated size in bytes for numbers */
|
|
201
201
|
allowEmptyText?:boolean /* if a text field accepts '' as a valid value */
|
|
202
|
-
mobileInputType?:string
|
|
202
|
+
mobileInputType?:string
|
|
203
203
|
extraRow?:number
|
|
204
204
|
inexactNumber?:number /* default:depends on typeName if = means abs(x-v)<espilon
|
|
205
205
|
/* ------------ For client: -------------- */
|
|
206
206
|
visible?:boolean
|
|
207
207
|
width?:number /* Width in pixels for the grid */
|
|
208
|
-
references?:string /* table name */
|
|
209
|
-
referencesField?:string
|
|
208
|
+
references?:string /* table name */
|
|
209
|
+
referencesField?:string
|
|
210
210
|
aggregate?:'avg'|'sum'|'count'|'min'|'max'|'countTrue' /* keyof myOwn.TableAggregates */
|
|
211
211
|
defaultForOtherFields?:boolean /* the field that stores the "other fields" of a flexible imported table */
|
|
212
|
-
specialValueWhenInsert?:string
|
|
213
|
-
exportMetadata?:ExportMetadataDefinition
|
|
212
|
+
specialValueWhenInsert?:string
|
|
213
|
+
exportMetadata?:ExportMetadataDefinition
|
|
214
214
|
description?:string
|
|
215
215
|
dataLength?:number
|
|
216
216
|
dataDecimals?:number
|
|
@@ -252,16 +252,16 @@ export type FieldsForConnectDetailTable = (string | {source:string, target:strin
|
|
|
252
252
|
|
|
253
253
|
export type FkActions = 'no action'|'restrict'|'cascade'|'set null'|'set default';
|
|
254
254
|
export interface ForeignKey {
|
|
255
|
-
references:string,
|
|
256
|
-
fields:FieldsForConnect,
|
|
257
|
-
onUpdate?: FkActions,
|
|
258
|
-
onDelete?: FkActions,
|
|
259
|
-
displayAllFields?: boolean,
|
|
255
|
+
references:string,
|
|
256
|
+
fields:FieldsForConnect,
|
|
257
|
+
onUpdate?: FkActions,
|
|
258
|
+
onDelete?: FkActions,
|
|
259
|
+
displayAllFields?: boolean,
|
|
260
260
|
alias?:string,
|
|
261
261
|
abr?:string,
|
|
262
262
|
label?:string,
|
|
263
|
-
displayFields?:string[],
|
|
264
|
-
consName?:string,
|
|
263
|
+
displayFields?:string[],
|
|
264
|
+
consName?:string,
|
|
265
265
|
initiallyDeferred?:boolean
|
|
266
266
|
displayAfterFieldName?:string|boolean
|
|
267
267
|
forceDeferrable?:boolean
|
|
@@ -284,10 +284,12 @@ export type TableDefinition = EditableDbDefinition & {
|
|
|
284
284
|
primaryKey:string[]
|
|
285
285
|
refrescable?: boolean
|
|
286
286
|
sql?:{
|
|
287
|
+
select?: string[]
|
|
287
288
|
primaryKey4Delete?:string[]
|
|
288
289
|
isTable?:boolean
|
|
289
290
|
from?:string
|
|
290
291
|
where?:string
|
|
292
|
+
broadWhere?:string
|
|
291
293
|
postCreateSqls?:string
|
|
292
294
|
skipEnance?: boolean
|
|
293
295
|
isReferable?: boolean
|
|
@@ -325,7 +327,7 @@ export type TableDefinition = EditableDbDefinition & {
|
|
|
325
327
|
constraints?:Constraint[]
|
|
326
328
|
detailTables?:DetailTable[]
|
|
327
329
|
offline?:{
|
|
328
|
-
mode:'reference'|'master'|'detail'
|
|
330
|
+
mode:'reference'|'master'|'detail'
|
|
329
331
|
details:string[]
|
|
330
332
|
}
|
|
331
333
|
clientSide?:string /* keyof: myOwn.clientSides */
|
|
@@ -338,6 +340,7 @@ export type TableDefinition = EditableDbDefinition & {
|
|
|
338
340
|
policy?:string
|
|
339
341
|
firstDisplayCount?:number
|
|
340
342
|
firstDisplayOverLimit?:number
|
|
343
|
+
forInsertOnlyMode?:boolean
|
|
341
344
|
description?:MarkdownDoc
|
|
342
345
|
exportJsonFieldAsColumns?:string
|
|
343
346
|
importCuidado?:boolean
|
|
@@ -350,8 +353,9 @@ export type TableDefinition = EditableDbDefinition & {
|
|
|
350
353
|
functionDef?:{
|
|
351
354
|
parameters?:ProcedureParameter[]
|
|
352
355
|
}
|
|
356
|
+
|
|
353
357
|
}
|
|
354
|
-
export type TableDefinitionInternal = RequireSome<TableDefinition,
|
|
358
|
+
export type TableDefinitionInternal = RequireSome<TableDefinition,
|
|
355
359
|
'allow'|'sql'
|
|
356
360
|
> & {
|
|
357
361
|
field:Record<string, FieldDefinitionInternal>
|
|
@@ -370,7 +374,7 @@ export interface ClientSetup {
|
|
|
370
374
|
procedures:ProcedureDef[]
|
|
371
375
|
}
|
|
372
376
|
export type StartOptions={
|
|
373
|
-
readConfig?:{whenNotExist:'ignore'},
|
|
377
|
+
readConfig?:{whenNotExist:'ignore'},
|
|
374
378
|
config?:string|object
|
|
375
379
|
"dump-db"?:boolean
|
|
376
380
|
testing?:true
|
|
@@ -407,7 +411,7 @@ export interface AppConfigBin { // executable
|
|
|
407
411
|
"zip-fixed-parameters":string // fixed parameters to pass to zipper
|
|
408
412
|
}
|
|
409
413
|
|
|
410
|
-
export interface AppConfigServer
|
|
414
|
+
export interface AppConfigServer
|
|
411
415
|
{
|
|
412
416
|
"base-url": string // rool path in the url
|
|
413
417
|
port: number // port of the API services
|
|
@@ -416,12 +420,12 @@ export interface AppConfigServer
|
|
|
416
420
|
"silent-startup": boolean // less logs when startup
|
|
417
421
|
"kill-9": string // a way to kill from URL with a token
|
|
418
422
|
bitacoraSchema: string
|
|
419
|
-
bitacoraTableName: string
|
|
423
|
+
bitacoraTableName: string
|
|
420
424
|
useCors: boolean //habilita Cross-Origin Resource Sharing
|
|
421
425
|
allowedHosts:string[] //determina API allowed hosts (necesita habilitar useCors)
|
|
422
426
|
policy?:string
|
|
423
427
|
}
|
|
424
|
-
export interface AppConfigDb
|
|
428
|
+
export interface AppConfigDb
|
|
425
429
|
{
|
|
426
430
|
motor: 'postgresql'
|
|
427
431
|
database: string
|
|
@@ -435,7 +439,7 @@ export interface AppConfigDb
|
|
|
435
439
|
no_login: boolean // if no login is needed. Used only for all public sites
|
|
436
440
|
"downloadable-backup-path": string // OS path of the encrypted downloadable backup
|
|
437
441
|
}
|
|
438
|
-
export interface AppConfigLogin
|
|
442
|
+
export interface AppConfigLogin
|
|
439
443
|
{
|
|
440
444
|
schema: string // schema of the user table
|
|
441
445
|
table: string // user table
|
|
@@ -469,13 +473,13 @@ export interface AppConfigLogin
|
|
|
469
473
|
}
|
|
470
474
|
"double-dragon": boolean // app user must match db user
|
|
471
475
|
}
|
|
472
|
-
export interface AppConfigInstall
|
|
476
|
+
export interface AppConfigInstall
|
|
473
477
|
{
|
|
474
478
|
"table-data-dir": string // SO path to the .tab files in the db creation script
|
|
475
479
|
dump: { // configuration of --dump-db, the db creation script
|
|
476
480
|
"drop-his": boolean // include drop schema his in the db creation script
|
|
477
|
-
db: {
|
|
478
|
-
owner: string
|
|
481
|
+
db: {
|
|
482
|
+
owner: string
|
|
479
483
|
extensions: string[] // extensions to be installed (gist, pg_trgm, pgcrypto)
|
|
480
484
|
enances: 'file' // if the enances must be dumped in a separate file
|
|
481
485
|
// from here info to set the owner and replace owner and user used in devel when script creation
|
|
@@ -533,7 +537,7 @@ export interface AppConfig {
|
|
|
533
537
|
devel: {
|
|
534
538
|
delay: number // msec avg random delay in API responses (to emulate slow nets)
|
|
535
539
|
"cache-content": boolean // if the cache header must be sent to the client (when no devel config the default is true)
|
|
536
|
-
forceShowAsEditable: boolean // force "editable" behavior in grids
|
|
540
|
+
forceShowAsEditable: boolean // force "editable" behavior in grids
|
|
537
541
|
"tests-can-delete-db": boolean
|
|
538
542
|
}
|
|
539
543
|
mailer: { // config to send mails
|
|
@@ -545,7 +549,7 @@ export interface AppConfig {
|
|
|
545
549
|
}
|
|
546
550
|
}
|
|
547
551
|
}
|
|
548
|
-
bin: AppConfigBin
|
|
552
|
+
bin: AppConfigBin
|
|
549
553
|
data: {
|
|
550
554
|
transformers: {
|
|
551
555
|
text: string // define the inputTransformers for text comming from the fron-end via the API
|
|
@@ -595,7 +599,7 @@ export class AppBackend{
|
|
|
595
599
|
tableDefAdapt(tableDef:TableDefinition, context:Context):TableDefinition
|
|
596
600
|
pushApp(dirname:string):void
|
|
597
601
|
dumpDbTableFields(tableDefinition:TableDefinition):string[]
|
|
598
|
-
dumpDbSchemaPartial(partialTableStructures:TableDefinitions, opts?:DumpOptions):Promise<{mainSql:string; enancePart:string}>
|
|
602
|
+
dumpDbSchemaPartial(partialTableStructures:TableDefinitions, opts?:DumpOptions):Promise<{mainSql:string; enancePart:string}>
|
|
599
603
|
getContextForDump(): ContextForDump
|
|
600
604
|
getClientSetupForSendToFrontEnd(req:Request):Promise<ClientSetup>
|
|
601
605
|
configList(): (object|string)[]
|
|
@@ -619,4 +623,4 @@ export class AppBackend{
|
|
|
619
623
|
transformInput:<T>(fieldDefinition: FieldDefinitionInternal, value:T) => T
|
|
620
624
|
}
|
|
621
625
|
|
|
622
|
-
}
|
|
626
|
+
}
|
package/lib/backend-plus.js
CHANGED
|
@@ -63,7 +63,37 @@ var myOwn = require('../for-client/my-things.js');
|
|
|
63
63
|
|
|
64
64
|
var typeStore = require('type-store');
|
|
65
65
|
var json4all = require('json4all');
|
|
66
|
-
var
|
|
66
|
+
var xlsxNow = require('xlsx-now/node');
|
|
67
|
+
var xlsxNowCore = require('xlsx-now');
|
|
68
|
+
var Big = require('big.js');
|
|
69
|
+
|
|
70
|
+
// Los tipos que las queries devuelven y no son valores nativos de una celda.
|
|
71
|
+
// Sin esto xlsx-now los rechaza, porque un objeto que nadie reclama no tiene
|
|
72
|
+
// una única forma correcta de escribirse.
|
|
73
|
+
var xlsxTypes = xlsxNowCore.defaultTypes;
|
|
74
|
+
// Un timestamp es una fecha: se escribe como tal y no como texto.
|
|
75
|
+
xlsxTypes = xlsxNowCore.withType(xlsxTypes, bestGlobals.Datetime, {
|
|
76
|
+
convert: (value, context) => xlsxNowCore.dateValue(new Date(value.getTime()), context)
|
|
77
|
+
});
|
|
78
|
+
// Igual que en la exportación del cliente: días, con formato de duración.
|
|
79
|
+
xlsxTypes = xlsxNowCore.withType(xlsxTypes, bestGlobals.TimeInterval, {
|
|
80
|
+
convert: (value) => ({v:value.timeInterval.ms?value.timeInterval.ms/(1000*60*60*24):null, numFmt:'[h]:mm:ss'})
|
|
81
|
+
});
|
|
82
|
+
// decimal y hugeint. Como texto cuando el double ya no los representa exacto,
|
|
83
|
+
// para no devolver un número redondeado con apariencia de exacto.
|
|
84
|
+
xlsxTypes = xlsxNowCore.withType(xlsxTypes, Big, {
|
|
85
|
+
convert: function(value){
|
|
86
|
+
var text = value.toString();
|
|
87
|
+
var asNumber = Number(text);
|
|
88
|
+
return Number.isSafeInteger(asNumber) || String(asNumber) === text
|
|
89
|
+
? {v:asNumber}
|
|
90
|
+
: {v:text, t:'inlineStr'};
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
// jsonb, jsona, gpoint, point y cualquier otro objeto sin tipo propio.
|
|
94
|
+
xlsxTypes = xlsxNowCore.withType(xlsxTypes, Object, {
|
|
95
|
+
convert: (value) => ({v:JSON.stringify(value), t:'inlineStr'})
|
|
96
|
+
});
|
|
67
97
|
|
|
68
98
|
var loginPlus = require('login-plus');
|
|
69
99
|
var dashDashDir=Array.prototype.indexOf.call(process.argv,'--dir')
|
|
@@ -85,9 +115,6 @@ function md5(text){
|
|
|
85
115
|
const DEFAULT_ITERATIONS = 4096;
|
|
86
116
|
const HASH_ALGORITHM = 'sha256';
|
|
87
117
|
|
|
88
|
-
// primera version de scram sha 256. El Verifier completo tenía 64 bytes.
|
|
89
|
-
const LEGACY_KEY_LENGTH = 64;
|
|
90
|
-
|
|
91
118
|
// Formato nuevo/PG-Compatible: El Client Key tiene 32 bytes (SHA-256).
|
|
92
119
|
const SCRAM_KEY_LENGTH = 32;
|
|
93
120
|
|
|
@@ -185,57 +212,6 @@ async function verifyScramPG(password, storedScramString) {
|
|
|
185
212
|
return storedKeyMatch && serverKeyMatch;
|
|
186
213
|
}
|
|
187
214
|
|
|
188
|
-
/**
|
|
189
|
-
* Verifica una contraseña contra el hash SCRAM Legacy (64 bytes).
|
|
190
|
-
* Formato Legacy: SCRAM-SHA-256$<iteraciones>:<Salt>$<Verifier(64 bytes)>
|
|
191
|
-
* @param {string} password - Contraseña en texto plano.
|
|
192
|
-
* @param {string} storedScramString - Cadena SCRAM Legacy.
|
|
193
|
-
* @returns {Promise<boolean>} True si la contraseña es válida.
|
|
194
|
-
*/
|
|
195
|
-
async function verifyScramLegacy(password, storedScramString) {
|
|
196
|
-
if (!storedScramString.startsWith('SCRAM-SHA-256$')) {
|
|
197
|
-
// No es formato SCRAM. Debe ser MD5 u otro algoritmo.
|
|
198
|
-
return false;
|
|
199
|
-
}
|
|
200
|
-
|
|
201
|
-
// Parsea la cadena SCRAM
|
|
202
|
-
// Ejemplo: SCRAM-SHA-256$4096:SALT_BASE64$VERIFIER_BASE64
|
|
203
|
-
const parts = storedScramString.split('$');
|
|
204
|
-
if (parts.length !== 3) {
|
|
205
|
-
throw new Error('Formato SCRAM almacenado inválido.');
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
// Obtiene iteraciones y salt de la segunda parte (ej: '4096:SALT_BASE64')
|
|
209
|
-
const [storedIterations, storedSalt] = parts[1].split(':');
|
|
210
|
-
const storedVerifier = parts[2];
|
|
211
|
-
|
|
212
|
-
if (!storedSalt || !storedVerifier || isNaN(parseInt(storedIterations))) {
|
|
213
|
-
throw new Error('Datos de SCRAM incompletos o malformados.');
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
const iterations = parseInt(storedIterations);
|
|
217
|
-
|
|
218
|
-
// Deriva la clave de la contraseña ingresada
|
|
219
|
-
const generatedVerifierBuffer = await deriveKey(
|
|
220
|
-
password,
|
|
221
|
-
storedSalt,
|
|
222
|
-
iterations,
|
|
223
|
-
LEGACY_KEY_LENGTH
|
|
224
|
-
);
|
|
225
|
-
const generatedVerifier = bufferToBase64(generatedVerifierBuffer);
|
|
226
|
-
|
|
227
|
-
// Compara de manera segura contra el Verificador Almacenado
|
|
228
|
-
const storedVerifierBuffer = Buffer.from(storedVerifier, 'base64');
|
|
229
|
-
const generatedVerifierBufferFromBase64 = Buffer.from(generatedVerifier, 'base64');
|
|
230
|
-
|
|
231
|
-
// Usa crypto.timingSafeEqual para evitar ataques de temporización
|
|
232
|
-
if (generatedVerifierBufferFromBase64.length !== storedVerifierBuffer.length) {
|
|
233
|
-
return false;
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
return crypto.timingSafeEqual(generatedVerifierBufferFromBase64, storedVerifierBuffer);
|
|
237
|
-
}
|
|
238
|
-
|
|
239
215
|
var dist=regexpDistCheck.test(packagejson.main)?'dist/':'';
|
|
240
216
|
|
|
241
217
|
/**
|
|
@@ -1253,7 +1229,6 @@ AppBackend.prototype.start = function start(opts){
|
|
|
1253
1229
|
done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
|
|
1254
1230
|
return
|
|
1255
1231
|
}else{
|
|
1256
|
-
let needsMigration = false;
|
|
1257
1232
|
const user = data.row;
|
|
1258
1233
|
if(!user[passFieldName]){
|
|
1259
1234
|
done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
|
|
@@ -1261,34 +1236,20 @@ AppBackend.prototype.start = function start(opts){
|
|
|
1261
1236
|
}
|
|
1262
1237
|
const usaScramSha256 = user[passFieldName].startsWith('SCRAM-SHA-256$')
|
|
1263
1238
|
if (usaScramSha256){
|
|
1264
|
-
|
|
1265
|
-
// 1. Intento con formato PG-Compatible (Nuevo)
|
|
1266
|
-
if(await verifyScramPG(password, user[passFieldName])){
|
|
1267
|
-
isScramValid = true;
|
|
1268
|
-
}
|
|
1269
|
-
|
|
1270
|
-
// 2. Intento con formato Legacy (64 bytes)
|
|
1271
|
-
else if(await verifyScramLegacy(password, user[passFieldName])){
|
|
1272
|
-
isScramValid = true;
|
|
1273
|
-
needsMigration = true;
|
|
1274
|
-
}
|
|
1275
|
-
if(!isScramValid){
|
|
1239
|
+
if(!await verifyScramPG(password, user[passFieldName])){
|
|
1276
1240
|
done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
|
|
1277
1241
|
return
|
|
1278
1242
|
}
|
|
1279
1243
|
}else{
|
|
1280
1244
|
if (md5(password+username.toLowerCase()) === user[passFieldName]){
|
|
1281
|
-
|
|
1245
|
+
if (be.config.log["pass-migration"]) console.log('Ejecutando migración a SCRAM...');
|
|
1246
|
+
await updatePassword({client, username, password, setUpdateDate:false, errorIfNoResult:true});
|
|
1247
|
+
if (be.config.log["pass-migration"]) console.log('Migración completada.');
|
|
1282
1248
|
}else{
|
|
1283
1249
|
done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
|
|
1284
1250
|
return
|
|
1285
1251
|
}
|
|
1286
1252
|
}
|
|
1287
|
-
if(needsMigration){
|
|
1288
|
-
if (be.config.log["pass-migration"]) console.log('Ejecutando migración a SCRAM...');
|
|
1289
|
-
await updatePassword({client, username, password, setUpdateDate:false, errorIfNoResult:true});
|
|
1290
|
-
if (be.config.log["pass-migration"]) console.log('Migración completada.');
|
|
1291
|
-
}
|
|
1292
1253
|
}
|
|
1293
1254
|
//continua validando
|
|
1294
1255
|
if(data.rowCount==1){
|
|
@@ -1358,9 +1319,6 @@ AppBackend.prototype.start = function start(opts){
|
|
|
1358
1319
|
if (oldPassword !== false) {
|
|
1359
1320
|
if (storedHash.startsWith('SCRAM-SHA-256$')) {//Intento SCRAM-SHA-256
|
|
1360
1321
|
ok = await verifyScramPG(oldPassword, storedHash);
|
|
1361
|
-
if (!ok) {
|
|
1362
|
-
ok = await verifyScramLegacy(oldPassword, storedHash);
|
|
1363
|
-
}
|
|
1364
1322
|
} else { //Intento MD5
|
|
1365
1323
|
const md5Hash = md5(oldPassword + username.toLowerCase());
|
|
1366
1324
|
ok = (md5Hash === storedHash);
|
|
@@ -2379,7 +2337,9 @@ AppBackend.prototype.clientIncludes = function clientIncludes(req, opts) {
|
|
|
2379
2337
|
if (!hideBEPlusInclusions) {
|
|
2380
2338
|
list = [
|
|
2381
2339
|
// { type: 'js', module: 'xlsx', modPath: 'dist', file: 'xlsx.core.min.js' },
|
|
2382
|
-
{ type: 'js', module: '
|
|
2340
|
+
{ type: 'js', module: 'fflate', modPath: '../umd', file: 'index.js' },
|
|
2341
|
+
{ type: 'js', module: 'xlsx-now', modPath: '../../umd', file: 'xlsx-now.umd.js' },
|
|
2342
|
+
{ type: 'js', module: 'xlsx-now', modPath: '../../umd', file: 'xlsx-now-browser.umd.js' },
|
|
2383
2343
|
{ type: 'js', module: 'require-bro' },
|
|
2384
2344
|
{ type: 'js', module: 'js-yaml', modPath: 'browser', file: 'js-yaml.umd.min.js' },
|
|
2385
2345
|
{ type: 'js', module: 'cast-error' },
|
|
@@ -3820,21 +3780,16 @@ AppBackend.prototype.exportacionesGenerico = async function exportacionesGeneric
|
|
|
3820
3780
|
}
|
|
3821
3781
|
if(fileName){
|
|
3822
3782
|
context.informProgress({message:'armando XLSX'})
|
|
3823
|
-
var
|
|
3824
|
-
result.map(({title, rows})=>{
|
|
3783
|
+
var sheets = result.map(({title, rows})=>{
|
|
3825
3784
|
var rowsA = rows.map(row=>Object.values(row));
|
|
3826
3785
|
if(rows[0]){
|
|
3827
|
-
rowsA.unshift(Object.keys(rows[0]));
|
|
3786
|
+
rowsA.unshift({'#line': 'array', values:Object.keys(rows[0]), s: {bold: true}});
|
|
3828
3787
|
}
|
|
3829
|
-
|
|
3830
|
-
XLSX.utils.book_append_sheet(wb, ws, title);
|
|
3831
|
-
return ws;
|
|
3788
|
+
return {name:title, rows:rowsA};
|
|
3832
3789
|
})
|
|
3833
3790
|
context.informProgress({message:`guardando XLSX: ${fileName}`})
|
|
3834
3791
|
await bestGlobals.sleep(100);
|
|
3835
|
-
await
|
|
3836
|
-
(err)=>err?reject(err):resolve()
|
|
3837
|
-
))
|
|
3792
|
+
await xlsxNow.writeXlsxFile(`dist/client/${fileName}`, {sheets, types:xlsxTypes, autoWidthMax:50, freezeRows:1});
|
|
3838
3793
|
}
|
|
3839
3794
|
return [
|
|
3840
3795
|
...(fileName?[{url:fileName, label:csvFileName?'xlsx de control':fileName}]:[]),
|
package/lib/in-backend-plus.d.ts
CHANGED