@provis/provis-common-be-module 1.6.0 → 1.7.0

package/dist/helpers/combineObj.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (obj1: any, obj2: any) => any;
+export default _default;

package/dist/helpers/combineObj.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
+exports.default = (obj1, obj2) => {
+    const combine = Object.assign({}, obj2);
+    for (const key in obj1) {
+        if (combine[key]) {
+            if ((0, lodash_1.isEmpty)(combine[key])) {
+                combine[key] = obj1[key];
+            }
+        }
+        else {
+            combine[key] = obj1[key];
+        }
+    }
+    return combine;
+};

package/dist/helpers/index.d.ts

@@ -19,4 +19,5 @@ import searchValue from "./searchValue";
 import readExcel from "./readExcel";
 import generateHashString from "./generateHashString";
 import mergeObj from "./mergeObj";
-export { addDateTime, amountDescription, axiosGet, axiosPost, axiosPut, compareDiffObj, convertCurrencySymbol, convertDateTimeFormat, convertObjToNumber, convertToCurrency, filterObj, generateRelationId, getCurrentDate, getDiffValue, getObjByKeys, loop, loopBackward, searchValue, readExcel, generateHashString, mergeObj, };
+import combineObj from "./combineObj";
+export { addDateTime, amountDescription, axiosGet, axiosPost, axiosPut, compareDiffObj, convertCurrencySymbol, convertDateTimeFormat, convertObjToNumber, convertToCurrency, filterObj, generateRelationId, getCurrentDate, getDiffValue, getObjByKeys, loop, loopBackward, searchValue, readExcel, generateHashString, mergeObj, combineObj, };

package/dist/helpers/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeObj = exports.generateHashString = exports.readExcel = exports.searchValue = exports.loopBackward = exports.loop = exports.getObjByKeys = exports.getDiffValue = exports.getCurrentDate = exports.generateRelationId = exports.filterObj = exports.convertToCurrency = exports.convertObjToNumber = exports.convertDateTimeFormat = exports.convertCurrencySymbol = exports.compareDiffObj = exports.axiosPut = exports.axiosPost = exports.axiosGet = exports.amountDescription = exports.addDateTime = void 0;
+exports.combineObj = exports.mergeObj = exports.generateHashString = exports.readExcel = exports.searchValue = exports.loopBackward = exports.loop = exports.getObjByKeys = exports.getDiffValue = exports.getCurrentDate = exports.generateRelationId = exports.filterObj = exports.convertToCurrency = exports.convertObjToNumber = exports.convertDateTimeFormat = exports.convertCurrencySymbol = exports.compareDiffObj = exports.axiosPut = exports.axiosPost = exports.axiosGet = exports.amountDescription = exports.addDateTime = void 0;
 const addDateTime_1 = require("./addDateTime");
 exports.addDateTime = addDateTime_1.default;
 const amountDescription_1 = require("./amountDescription");
@@ -43,3 +43,5 @@ const generateHashString_1 = require("./generateHashString");
 exports.generateHashString = generateHashString_1.default;
 const mergeObj_1 = require("./mergeObj");
 exports.mergeObj = mergeObj_1.default;
+const combineObj_1 = require("./combineObj");
+exports.combineObj = combineObj_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@provis/provis-common-be-module",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "This common module for Provis internal backend use lib",
   "main": "dist/index.js",
   "scripts": {
@@ -13,6 +13,7 @@
   "dependencies": {
     "axios": "^0.21.1",
     "js-sha512": "^0.9.0",
+    "lodash": "^4.17.21",
     "uniqid": "^5.3.0",
     "xlsx": "^0.16.8"
   },