baja-lite 1.5.2 → 1.5.4

package/object.d.ts

@@ -104,6 +104,13 @@ export declare const arraySplit: <T = any>(datas: T[], { everyLength, groupCount
     everyLength?: number | undefined;
     groupCount?: number | undefined;
 }) => T[][];
+/**
+ * 合并对象（浅），忽略后续参数的null、undefined、空字符串
+ * @param source
+ * @param os
+ * @returns
+ */
+export declare const assginObject: <T extends Object>(source: T, ...os: T[]) => T;
 export declare const P2C: (pro: string, IF?: boolean) => string;
 export declare const C2P: (pro: string, IF?: boolean) => string;
 export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L[], hump?: boolean, convert?: Record<string, (data: any) => any>): T[];

package/object.js

@@ -237,6 +237,17 @@ export const arraySplit = (datas, { everyLength = 0, groupCount = 0 } = {}) => {
         throw new Error('参数错误!');
     }
 };
+/**
+ * 合并对象（浅），忽略后续参数的null、undefined、空字符串
+ * @param source
+ * @param os
+ * @returns
+ */
+export const assginObject = (source, ...os) => {
+    const result = { ...source };
+    os.forEach(o => Object.entries(o).forEach(([key, value]) => value !== null && value !== undefined && `${value}`.trim() !== '' && (result[key] = value)));
+    return result;
+};
 const P2CEX = /[A-Z]/g;
 export const P2C = (pro, IF = true) => (IF ? pro.replace(P2CEX, (a) => `_${a.toLowerCase()}`) : pro);
 const C2PEX = /_([a-z])/g;

package/package.json

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

package/sql.js

@@ -2907,12 +2907,12 @@ export class SqlService {
     }
     transaction(option) {
         if (option.sync === SyncMode.Sync) {
-            return option.dao.transaction(SyncMode.Sync, option.fn);
+            return option.dao.transaction(SyncMode.Sync, option.fn, option.conn);
         }
         else {
             return new Promise(async (resolve, reject) => {
                 try {
-                    const rt = await option.dao.transaction(SyncMode.Async, option.fn);
+                    const rt = await option.dao.transaction(SyncMode.Async, option.fn, option.conn);
                     resolve(rt);
                 }
                 catch (error) {