sculp-js 1.3.0 → 1.3.2

package/README.md

@@ -54,7 +54,7 @@
 
   - stringCamelCase
   - stringKebabCase
-  - getStrWidthPx
+  - getStrWidthPx (web)
 
 - Unique
 
@@ -69,18 +69,19 @@
   - calculateDate
   - calculateDateTime
 
-- Download
+- Download (web)
 
   - downloadURL
   - downloadHref
   - downloadBlob
   - downloadData
 
-- File
+- File (web)
 
   - chooseLocalFile
+  - compressImg 压缩图片
 
-- Dom
+- Dom （web）
 
   - hasClass
   - addClass
@@ -89,11 +90,11 @@
   - getStyle
   - getComputedCssVal
 
-- Watermark
+- Watermark (web)
 
   - genCanvasWM
 
-- Clipboard
+- Clipboard (web)
   - copyText
 
 ## Install

package/lib/cjs/array.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/async.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/clipboard.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/cookie.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/date.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */
@@ -163,64 +163,50 @@ function formatDate(value, format = 'YYYY-MM-DD HH:mm:ss') {
 }
 /**
  * 计算向前或向后N天的具体日期
- * @param {string} strDate - 参考日期
+ * @param {DateValue} originDate - 参考日期
  * @param {number} n - 正数：向后推算；负数：向前推算
  * @param {string} sep - 日期格式的分隔符
  * @returns {string} 计算后的目标日期
  */
-function calculateDate(strDate, n, sep = '-') {
-    //strDate 为字符串日期 如:'2019-01-01' n为你要传入的参数，当前为0，前一天为-1，后一天为1
-    const dateArr = strDate.split(sep); //这边给定一个特定时间
-    const newDate = new Date(+dateArr[0], +dateArr[1] - 1, +dateArr[2]);
-    const befminuts = newDate.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
-    const beforeDat = new Date();
-    beforeDat.setTime(befminuts);
-    const befMonth = beforeDat.getMonth() + 1;
-    const mon = befMonth >= 10 ? befMonth : '0' + befMonth;
-    const befDate = beforeDat.getDate();
-    const da = befDate >= 10 ? befDate : '0' + befDate;
-    const finalNewDate = beforeDat.getFullYear() + '-' + mon + '-' + da;
+function calculateDate(originDate, n, sep = '-') {
+    //originDate 为字符串日期 如:'2019-01-01' n为你要传入的参数，当前为0，前一天为-1，后一天为1
+    const date = new Date(originDate); //这边给定一个特定时间
+    const newDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+    const millisecondGap = newDate.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
+    const targetDate = new Date(millisecondGap);
+    const finalNewDate = targetDate.getFullYear() +
+        sep +
+        String(targetDate.getMonth() + 1).padStart(2, '0') +
+        '-' +
+        String(targetDate.getDate()).padStart(2, '0');
     return finalNewDate;
 }
 /**
- * 计算向前或向后N天的具体时间日期
+ * 计算向前或向后N天的具体日期时间
+ * @param {DateValue} originDateTime - 参考日期时间
  * @param {number} n - 正数：向后推算；负数：向前推算
  * @param {string} dateSep - 日期分隔符
  * @param {string} timeSep - 时间分隔符
  * @returns {string} 转换后的目标日期时间
  */
-function calculateDateTime(n, dateSep = '-', timeSep = ':') {
-    const date = new Date();
-    const separator1 = '-';
-    const separator2 = ':';
-    let year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    let strDate = date.getDate() + n;
-    if (strDate > new Date(year, month, 0).getDate()) {
-        month += 1;
-        strDate -= new Date(year, month, 0).getDate();
-        if (month > 12) {
-            year += 1;
-            month = 1;
-        }
-    }
-    if (month >= 1 && month <= 9) {
-        month = '0' + month;
-    }
-    if (strDate >= 0 && strDate <= 9) {
-        strDate = '0' + strDate;
-    }
-    return (year +
+function calculateDateTime(originDateTime, n, dateSep = '-', timeSep = ':') {
+    const date = new Date(originDateTime);
+    const separator1 = dateSep;
+    const separator2 = timeSep;
+    const dateTime = new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
+    const millisecondGap = dateTime.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
+    const targetDateTime = new Date(millisecondGap);
+    return (targetDateTime.getFullYear() +
         separator1 +
-        month +
+        String(targetDateTime.getMonth() + 1).padStart(2, '0') +
         separator1 +
-        strDate +
+        String(targetDateTime.getDate()).padStart(2, '0') +
         ' ' +
-        date.getHours() +
+        String(targetDateTime.getHours()).padStart(2, '0') +
         separator2 +
-        date.getMinutes() +
+        String(targetDateTime.getMinutes()).padStart(2, '0') +
         separator2 +
-        date.getSeconds());
+        String(targetDateTime.getSeconds()).padStart(2, '0'));
 }
 
 exports.calculateDate = calculateDate;

package/lib/cjs/dom.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/download.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/easing.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/file.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/func.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/number.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/object.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/path.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/qs.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/random.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/string.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/tooltip.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/tree.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */
@@ -16,8 +16,8 @@ const defaultFieldOptions = { keyField: 'key', childField: 'children', pidField:
  * @returns {*}
  */
 function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
-    let level = 0, isBreak = false;
-    const walk = (arr, parent) => {
+    let isBreak = false;
+    const walk = (arr, parent, level = 0) => {
         if (isReverse) {
             for (let i = arr.length - 1; i >= 0; i--) {
                 if (isBreak) {
@@ -33,9 +33,8 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
                 }
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     // @ts-ignore
-                    walk(arr[i][children], arr[i]);
+                    walk(arr[i][children], arr[i], level + 1);
                 }
             }
         }
@@ -54,9 +53,8 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
                 }
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     // @ts-ignore
-                    walk(arr[i][children], arr[i]);
+                    walk(arr[i][children], arr[i], level + 1);
                 }
             }
         }
@@ -72,9 +70,9 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
  * @returns {any[]} 新的一棵树
  */
 function forEachMap(tree, iterator, children = 'children', isReverse = false) {
-    let level = 0, isBreak = false;
+    let isBreak = false;
     const newTree = [];
-    const walk = (arr, parent, newTree) => {
+    const walk = (arr, parent, newTree, level = 0) => {
         if (isReverse) {
             for (let i = arr.length - 1; i >= 0; i--) {
                 if (isBreak) {
@@ -91,10 +89,9 @@ function forEachMap(tree, iterator, children = 'children', isReverse = false) {
                 newTree.push(re);
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     newTree[newTree.length - 1][children] = [];
                     // @ts-ignore
-                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children]);
+                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children], level + 1);
                 }
                 else {
                     // children非有效数组时，移除该属性字段
@@ -118,10 +115,9 @@ function forEachMap(tree, iterator, children = 'children', isReverse = false) {
                 newTree.push(re);
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     newTree[newTree.length - 1][children] = [];
                     // @ts-ignore
-                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children]);
+                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children], level + 1);
                 }
                 else {
                     // children非有效数组时，移除该属性字段

package/lib/cjs/type.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/unique.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/url.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/watermark.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/cjs/we-decode.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/array.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/async.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/clipboard.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/cookie.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/date.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */
@@ -161,64 +161,50 @@ function formatDate(value, format = 'YYYY-MM-DD HH:mm:ss') {
 }
 /**
  * 计算向前或向后N天的具体日期
- * @param {string} strDate - 参考日期
+ * @param {DateValue} originDate - 参考日期
  * @param {number} n - 正数：向后推算；负数：向前推算
  * @param {string} sep - 日期格式的分隔符
  * @returns {string} 计算后的目标日期
  */
-function calculateDate(strDate, n, sep = '-') {
-    //strDate 为字符串日期 如:'2019-01-01' n为你要传入的参数，当前为0，前一天为-1，后一天为1
-    const dateArr = strDate.split(sep); //这边给定一个特定时间
-    const newDate = new Date(+dateArr[0], +dateArr[1] - 1, +dateArr[2]);
-    const befminuts = newDate.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
-    const beforeDat = new Date();
-    beforeDat.setTime(befminuts);
-    const befMonth = beforeDat.getMonth() + 1;
-    const mon = befMonth >= 10 ? befMonth : '0' + befMonth;
-    const befDate = beforeDat.getDate();
-    const da = befDate >= 10 ? befDate : '0' + befDate;
-    const finalNewDate = beforeDat.getFullYear() + '-' + mon + '-' + da;
+function calculateDate(originDate, n, sep = '-') {
+    //originDate 为字符串日期 如:'2019-01-01' n为你要传入的参数，当前为0，前一天为-1，后一天为1
+    const date = new Date(originDate); //这边给定一个特定时间
+    const newDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+    const millisecondGap = newDate.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
+    const targetDate = new Date(millisecondGap);
+    const finalNewDate = targetDate.getFullYear() +
+        sep +
+        String(targetDate.getMonth() + 1).padStart(2, '0') +
+        '-' +
+        String(targetDate.getDate()).padStart(2, '0');
     return finalNewDate;
 }
 /**
- * 计算向前或向后N天的具体时间日期
+ * 计算向前或向后N天的具体日期时间
+ * @param {DateValue} originDateTime - 参考日期时间
  * @param {number} n - 正数：向后推算；负数：向前推算
  * @param {string} dateSep - 日期分隔符
  * @param {string} timeSep - 时间分隔符
  * @returns {string} 转换后的目标日期时间
  */
-function calculateDateTime(n, dateSep = '-', timeSep = ':') {
-    const date = new Date();
-    const separator1 = '-';
-    const separator2 = ':';
-    let year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    let strDate = date.getDate() + n;
-    if (strDate > new Date(year, month, 0).getDate()) {
-        month += 1;
-        strDate -= new Date(year, month, 0).getDate();
-        if (month > 12) {
-            year += 1;
-            month = 1;
-        }
-    }
-    if (month >= 1 && month <= 9) {
-        month = '0' + month;
-    }
-    if (strDate >= 0 && strDate <= 9) {
-        strDate = '0' + strDate;
-    }
-    return (year +
+function calculateDateTime(originDateTime, n, dateSep = '-', timeSep = ':') {
+    const date = new Date(originDateTime);
+    const separator1 = dateSep;
+    const separator2 = timeSep;
+    const dateTime = new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
+    const millisecondGap = dateTime.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
+    const targetDateTime = new Date(millisecondGap);
+    return (targetDateTime.getFullYear() +
         separator1 +
-        month +
+        String(targetDateTime.getMonth() + 1).padStart(2, '0') +
         separator1 +
-        strDate +
+        String(targetDateTime.getDate()).padStart(2, '0') +
         ' ' +
-        date.getHours() +
+        String(targetDateTime.getHours()).padStart(2, '0') +
         separator2 +
-        date.getMinutes() +
+        String(targetDateTime.getMinutes()).padStart(2, '0') +
         separator2 +
-        date.getSeconds());
+        String(targetDateTime.getSeconds()).padStart(2, '0'));
 }
 
 export { calculateDate, calculateDateTime, dateParse, dateToEnd, dateToStart, formatDate, isValidDate };

package/lib/es/dom.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/download.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/easing.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/file.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/func.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/number.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/object.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/path.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/qs.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/random.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/string.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/tooltip.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/tree.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */
@@ -14,8 +14,8 @@ const defaultFieldOptions = { keyField: 'key', childField: 'children', pidField:
  * @returns {*}
  */
 function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
-    let level = 0, isBreak = false;
-    const walk = (arr, parent) => {
+    let isBreak = false;
+    const walk = (arr, parent, level = 0) => {
         if (isReverse) {
             for (let i = arr.length - 1; i >= 0; i--) {
                 if (isBreak) {
@@ -31,9 +31,8 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
                 }
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     // @ts-ignore
-                    walk(arr[i][children], arr[i]);
+                    walk(arr[i][children], arr[i], level + 1);
                 }
             }
         }
@@ -52,9 +51,8 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
                 }
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     // @ts-ignore
-                    walk(arr[i][children], arr[i]);
+                    walk(arr[i][children], arr[i], level + 1);
                 }
             }
         }
@@ -70,9 +68,9 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
  * @returns {any[]} 新的一棵树
  */
 function forEachMap(tree, iterator, children = 'children', isReverse = false) {
-    let level = 0, isBreak = false;
+    let isBreak = false;
     const newTree = [];
-    const walk = (arr, parent, newTree) => {
+    const walk = (arr, parent, newTree, level = 0) => {
         if (isReverse) {
             for (let i = arr.length - 1; i >= 0; i--) {
                 if (isBreak) {
@@ -89,10 +87,9 @@ function forEachMap(tree, iterator, children = 'children', isReverse = false) {
                 newTree.push(re);
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     newTree[newTree.length - 1][children] = [];
                     // @ts-ignore
-                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children]);
+                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children], level + 1);
                 }
                 else {
                     // children非有效数组时，移除该属性字段
@@ -116,10 +113,9 @@ function forEachMap(tree, iterator, children = 'children', isReverse = false) {
                 newTree.push(re);
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
-                    ++level;
                     newTree[newTree.length - 1][children] = [];
                     // @ts-ignore
-                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children]);
+                    walk(arr[i][children], arr[i], newTree[newTree.length - 1][children], level + 1);
                 }
                 else {
                     // children非有效数组时，移除该属性字段

package/lib/es/type.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/unique.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/url.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/watermark.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/es/we-decode.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */

package/lib/index.d.ts

@@ -160,20 +160,21 @@ declare function dateToEnd(value: DateValue): Date;
 declare function formatDate(value: DateValue, format?: string): string;
 /**
  * 计算向前或向后N天的具体日期
- * @param {string} strDate - 参考日期
+ * @param {DateValue} originDate - 参考日期
  * @param {number} n - 正数：向后推算；负数：向前推算
  * @param {string} sep - 日期格式的分隔符
  * @returns {string} 计算后的目标日期
  */
-declare function calculateDate(strDate: string, n: number, sep?: string): string;
+declare function calculateDate(originDate: DateValue, n: number, sep?: string): string;
 /**
- * 计算向前或向后N天的具体时间日期
+ * 计算向前或向后N天的具体日期时间
+ * @param {DateValue} originDateTime - 参考日期时间
  * @param {number} n - 正数：向后推算；负数：向前推算
  * @param {string} dateSep - 日期分隔符
  * @param {string} timeSep - 时间分隔符
  * @returns {string} 转换后的目标日期时间
  */
-declare function calculateDateTime(n: number, dateSep?: string, timeSep?: string): string;
+declare function calculateDateTime(originDateTime: DateValue, n: number, dateSep?: string, timeSep?: string): string;
 
 type EasingName = 'ease' | 'linear' | 'ease-in' | 'ease-out' | 'ease-in-out' | string;
 

package/lib/umd/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.3.0
+ * core v1.3.1
  * (c) 2023-2024 chandq
  * Released under the MIT License.
  */
@@ -7,7 +7,7 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('bezier-easing')) :
     typeof define === 'function' && define.amd ? define(['exports', 'bezier-easing'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.sculpJs = {}, global.bezier));
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.core = {}, global.bezier));
 })(this, (function (exports, bezier) { 'use strict';
 
     /**
@@ -913,64 +913,50 @@
     }
     /**
      * 计算向前或向后N天的具体日期
-     * @param {string} strDate - 参考日期
+     * @param {DateValue} originDate - 参考日期
      * @param {number} n - 正数：向后推算；负数：向前推算
      * @param {string} sep - 日期格式的分隔符
      * @returns {string} 计算后的目标日期
      */
-    function calculateDate(strDate, n, sep = '-') {
-        //strDate 为字符串日期 如:'2019-01-01' n为你要传入的参数，当前为0，前一天为-1，后一天为1
-        const dateArr = strDate.split(sep); //这边给定一个特定时间
-        const newDate = new Date(+dateArr[0], +dateArr[1] - 1, +dateArr[2]);
-        const befminuts = newDate.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
-        const beforeDat = new Date();
-        beforeDat.setTime(befminuts);
-        const befMonth = beforeDat.getMonth() + 1;
-        const mon = befMonth >= 10 ? befMonth : '0' + befMonth;
-        const befDate = beforeDat.getDate();
-        const da = befDate >= 10 ? befDate : '0' + befDate;
-        const finalNewDate = beforeDat.getFullYear() + '-' + mon + '-' + da;
+    function calculateDate(originDate, n, sep = '-') {
+        //originDate 为字符串日期 如:'2019-01-01' n为你要传入的参数，当前为0，前一天为-1，后一天为1
+        const date = new Date(originDate); //这边给定一个特定时间
+        const newDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+        const millisecondGap = newDate.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
+        const targetDate = new Date(millisecondGap);
+        const finalNewDate = targetDate.getFullYear() +
+            sep +
+            String(targetDate.getMonth() + 1).padStart(2, '0') +
+            '-' +
+            String(targetDate.getDate()).padStart(2, '0');
         return finalNewDate;
     }
     /**
-     * 计算向前或向后N天的具体时间日期
+     * 计算向前或向后N天的具体日期时间
+     * @param {DateValue} originDateTime - 参考日期时间
      * @param {number} n - 正数：向后推算；负数：向前推算
      * @param {string} dateSep - 日期分隔符
      * @param {string} timeSep - 时间分隔符
      * @returns {string} 转换后的目标日期时间
      */
-    function calculateDateTime(n, dateSep = '-', timeSep = ':') {
-        const date = new Date();
-        const separator1 = '-';
-        const separator2 = ':';
-        let year = date.getFullYear();
-        let month = date.getMonth() + 1;
-        let strDate = date.getDate() + n;
-        if (strDate > new Date(year, month, 0).getDate()) {
-            month += 1;
-            strDate -= new Date(year, month, 0).getDate();
-            if (month > 12) {
-                year += 1;
-                month = 1;
-            }
-        }
-        if (month >= 1 && month <= 9) {
-            month = '0' + month;
-        }
-        if (strDate >= 0 && strDate <= 9) {
-            strDate = '0' + strDate;
-        }
-        return (year +
+    function calculateDateTime(originDateTime, n, dateSep = '-', timeSep = ':') {
+        const date = new Date(originDateTime);
+        const separator1 = dateSep;
+        const separator2 = timeSep;
+        const dateTime = new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
+        const millisecondGap = dateTime.getTime() + 1000 * 60 * 60 * 24 * parseInt(String(n)); //计算前几天用减，计算后几天用加，最后一个就是多少天的数量
+        const targetDateTime = new Date(millisecondGap);
+        return (targetDateTime.getFullYear() +
             separator1 +
-            month +
+            String(targetDateTime.getMonth() + 1).padStart(2, '0') +
             separator1 +
-            strDate +
+            String(targetDateTime.getDate()).padStart(2, '0') +
             ' ' +
-            date.getHours() +
+            String(targetDateTime.getHours()).padStart(2, '0') +
             separator2 +
-            date.getMinutes() +
+            String(targetDateTime.getMinutes()).padStart(2, '0') +
             separator2 +
-            date.getSeconds());
+            String(targetDateTime.getSeconds()).padStart(2, '0'));
     }
 
     /**
@@ -2052,8 +2038,8 @@
      * @returns {*}
      */
     function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
-        let level = 0, isBreak = false;
-        const walk = (arr, parent) => {
+        let isBreak = false;
+        const walk = (arr, parent, level = 0) => {
             if (isReverse) {
                 for (let i = arr.length - 1; i >= 0; i--) {
                     if (isBreak) {
@@ -2069,9 +2055,8 @@
                     }
                     // @ts-ignore
                     if (arr[i] && Array.isArray(arr[i][children])) {
-                        ++level;
                         // @ts-ignore
-                        walk(arr[i][children], arr[i]);
+                        walk(arr[i][children], arr[i], level + 1);
                     }
                 }
             }
@@ -2090,9 +2075,8 @@
                     }
                     // @ts-ignore
                     if (arr[i] && Array.isArray(arr[i][children])) {
-                        ++level;
                         // @ts-ignore
-                        walk(arr[i][children], arr[i]);
+                        walk(arr[i][children], arr[i], level + 1);
                     }
                 }
             }
@@ -2108,9 +2092,9 @@
      * @returns {any[]} 新的一棵树
      */
     function forEachMap(tree, iterator, children = 'children', isReverse = false) {
-        let level = 0, isBreak = false;
+        let isBreak = false;
         const newTree = [];
-        const walk = (arr, parent, newTree) => {
+        const walk = (arr, parent, newTree, level = 0) => {
             if (isReverse) {
                 for (let i = arr.length - 1; i >= 0; i--) {
                     if (isBreak) {
@@ -2127,10 +2111,9 @@
                     newTree.push(re);
                     // @ts-ignore
                     if (arr[i] && Array.isArray(arr[i][children])) {
-                        ++level;
                         newTree[newTree.length - 1][children] = [];
                         // @ts-ignore
-                        walk(arr[i][children], arr[i], newTree[newTree.length - 1][children]);
+                        walk(arr[i][children], arr[i], newTree[newTree.length - 1][children], level + 1);
                     }
                     else {
                         // children非有效数组时，移除该属性字段
@@ -2154,10 +2137,9 @@
                     newTree.push(re);
                     // @ts-ignore
                     if (arr[i] && Array.isArray(arr[i][children])) {
-                        ++level;
                         newTree[newTree.length - 1][children] = [];
                         // @ts-ignore
-                        walk(arr[i][children], arr[i], newTree[newTree.length - 1][children]);
+                        walk(arr[i][children], arr[i], newTree[newTree.length - 1][children], level + 1);
                     }
                     else {
                         // children非有效数组时，移除该属性字段

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "sculp-js",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "packageManager": "npm@8.19.2",
   "description": "js工具库",
   "scripts": {
     "prepare": "husky install",
     "build": "rollup  --bundleConfigAsCjs --config rollup.config.js",
+    "build:core": "BUILD_TARGET=core rollup  --bundleConfigAsCjs --config rollup.config.js",
     "build:terser": "node scripts/build.js",
     "test:unit": "jest",
     "test": "jest --coverage",