baja-lite 1.3.36 → 1.3.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.36",
+  "version": "1.3.38",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {

package/sql.js

@@ -1206,6 +1206,7 @@ class Build {
      * @param param
      */
     constructor(isCount, isSum, param = {}) {
+        this.orderSeted = false;
         this.isCount = isCount;
         this.isSum = isSum;
         this.orderBy = param.sortName ? `${param.sortName} ${param.sortType ?? 'ASC'}` : '';
@@ -1346,6 +1347,7 @@ class Build {
                 return '';
             }
             else {
+                this.orderSeted = true;
                 const orderBy = new Array();
                 if (this.orderBy) {
                     orderBy.push(this.orderBy);
@@ -1473,6 +1475,12 @@ class Build {
             return "''";
         };
     }
+    get OrderSeted() {
+        return this.orderSeted;
+    }
+    get OrderBy() {
+        return this.orderBy;
+    }
 }
 Build.page = 'COUNT(1) zccw1986 ';
 function replaceCdata(rawText) {
@@ -1691,14 +1699,26 @@ export class SqlCache {
         const buildParam = new Build(options.isCount === true, options.isSum === true, options);
         if (typeof sqlSource === 'function') {
             const _sql = sqlSource(options);
-            return mustache.render(_sql, buildParam, this.sqlFNMap);
+            let sql = mustache.render(_sql, buildParam, this.sqlFNMap);
+            if (buildParam.OrderSeted === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+                sql += ` ORDER BY ${buildParam.OrderBy}`;
+            }
+            return sql;
         }
         else if (typeof sqlSource === 'string') {
-            return mustache.render(sqlSource, buildParam, this.sqlFNMap);
+            let sql = mustache.render(sqlSource, buildParam, this.sqlFNMap);
+            if (buildParam.OrderSeted === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+                sql += ` ORDER BY ${buildParam.OrderBy}`;
+            }
+            return sql;
         }
         else if (typeof sqlSource === 'object') {
             const _sql = convert(sqlSource, options, matchSqlid, this.sqlMap);
-            return mustache.render(_sql, buildParam, this.sqlFNMap);
+            let sql = mustache.render(_sql, buildParam, this.sqlFNMap);
+            if (buildParam.OrderSeted === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+                sql += ` ORDER BY ${buildParam.OrderBy}`;
+            }
+            return sql;
         }
         return '';
     }
@@ -3517,7 +3537,7 @@ class StreamQuery {
     incr(key, value = 1) {
         const pkey = `p${this._prefix}${this._index++}`;
         const keyName = this[_fields][String(key)]?.C2();
-        this._updateColumns.push(`${keyName} = ${keyName} + :${pkey}`);
+        this._updateColumns.push(`${keyName} = IFNULL(${keyName}, 0) + :${pkey}`);
         this._param[pkey] = value;
         return this;
     }