sculp-js 1.8.4 → 1.10.0

package/lib/es/base64.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/clipboard.js

@@ -1,30 +1,26 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
 
-import { setStyle } from './dom.js';
-
-const textEl = document.createElement('textarea');
-setStyle(textEl, {
-    position: 'absolute',
-    top: '-9999px',
-    left: '-9999px',
-    opacity: 0
-});
-document.body.appendChild(textEl);
 /**
  * 复制文本
  * @param {string} text
  */
 function copyText(text) {
+    const textEl = document.createElement('textarea');
+    textEl.style.position = 'absolute';
+    textEl.style.top = '-9999px';
+    textEl.style.left = '-9999px';
     textEl.value = text;
+    document.body.appendChild(textEl);
     textEl.focus({ preventScroll: true });
     textEl.select();
     try {
         document.execCommand('copy');
         textEl.blur();
+        document.body.removeChild(textEl);
     }
     catch (err) {
         // ignore

package/lib/es/cloneDeep.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/cookie.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/date.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/dom.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -131,28 +131,32 @@ function getComputedCssVal(el, property, reNumber = true) {
  * 字符串的像素宽度
  * @param {string} str 目标字符串
  * @param {number} fontSize 字符串字体大小
- * @param {boolean} isRemoveDom 计算后是否移除中间dom元素
+ * @param {boolean} isRemove 计算后是否移除创建的dom元素
  * @returns {*}
  */
-function getStrWidthPx(str, fontSize = 14, isRemoveDom = false) {
+function getStrWidthPx(str, fontSize = 14, isRemove = true) {
     let strWidth = 0;
     console.assert(isString(str), `${str} 不是有效的字符串`);
     if (isString(str) && str.length > 0) {
-        let getEle = document.querySelector('#getStrWidth1494304949567');
+        const id = 'getStrWidth1494304949567';
+        let getEle = document.querySelector(`#${id}`);
         if (!getEle) {
             const _ele = document.createElement('span');
-            _ele.id = 'getStrWidth1494304949567';
+            _ele.id = id;
             _ele.style.fontSize = fontSize + 'px';
             _ele.style.whiteSpace = 'nowrap';
             _ele.style.visibility = 'hidden';
+            _ele.style.position = 'absolute';
+            _ele.style.top = '-9999px';
+            _ele.style.left = '-9999px';
             _ele.textContent = str;
             document.body.appendChild(_ele);
             getEle = _ele;
         }
         getEle.textContent = str;
         strWidth = getEle.offsetWidth;
-        if (isRemoveDom) {
-            document.body.appendChild(getEle);
+        if (isRemove) {
+            getEle.remove();
         }
     }
     return strWidth;

package/lib/es/download.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/easing.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/file.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/func.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -21,7 +21,7 @@ export { chooseLocalFile, compressImg, supportCanvas } from './file.js';
 export { genCanvasWM } from './watermark.js';
 export { debounce, getGlobal, once, setGlobal, throttle } from './func.js';
 export { STRING_POOL, randomNumber, randomString, randomUuid } from './random.js';
-export { HEX_POOL, formatNumber, numberAbbr, numberToHex } from './number.js';
+export { HEX_POOL, formatNumber as formatMoney, formatNumber, humanFileSize, numberAbbr, numberToHex } from './number.js';
 export { UNIQUE_NUMBER_SAFE_LENGTH, uniqueNumber, uniqueString } from './unique.js';
 export { tooltipEvent } from './tooltip.js';
 export { flatTree, forEachDeep, formatTree, fuzzySearchTree, mapDeep, searchTreeById } from './tree.js';

package/lib/es/isEqual.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/math.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/number.js

@@ -1,11 +1,12 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
 
 import { getGlobal } from './func.js';
 import { STRING_ARABIC_NUMERALS, STRING_UPPERCASE_ALPHA, STRING_LOWERCASE_ALPHA } from './string.js';
+import { isNullOrUnDef, isNumber } from './type.js';
 
 const HEX_POOL = `${STRING_ARABIC_NUMERALS}${STRING_UPPERCASE_ALPHA}${STRING_LOWERCASE_ALPHA}`;
 const supportBigInt = typeof BigInt !== 'undefined';
@@ -43,35 +44,75 @@ function numberToHex(decimal, hexPool = HEX_POOL) {
     return ret.join('');
 }
 /**
- * 缩写
+ * 将数字转换为携带单位的字符串
  * @param {number | string} num
  * @param {Array<string>} units
- * @param {number} ratio
- * @param {number} exponent
+ * @param {INumberAbbr} options default: { ratio: 1000, decimals: 0, separator: ' ' }
  * @returns {string}
  */
-const numberAbbr = (num, units, ratio = 1000, exponent) => {
+const numberAbbr = (num, units, options = { ratio: 1000, decimals: 0, separator: ' ' }) => {
+    const { ratio = 1000, decimals = 0, separator = ' ' } = options;
     const { length } = units;
     if (length === 0)
-        throw new Error('至少需要一个单位');
+        throw new Error('At least one unit is required');
     let num2 = Number(num);
     let times = 0;
     while (num2 >= ratio && times < length - 1) {
         num2 = num2 / ratio;
         times++;
     }
-    const value = num2.toFixed(exponent);
+    const value = num2.toFixed(decimals);
     const unit = units[times];
-    return value.toString() + '' + unit;
+    return String(value) + separator + unit;
 };
+/**
+ * Converting file size in bytes to human-readable string
+ *  reference: https://zh.wikipedia.org/wiki/%E5%8D%83%E5%AD%97%E8%8A%82
+ * @param {number | string} num bytes Number in Bytes
+ * @param {IHumanFileSizeOptions} options default: { decimals = 0, si = false, separator = ' ' }
+ *        si: True to use metric (SI) units, aka powers of 1000, the units is
+ *            ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'].
+ *            False to use binary (IEC), aka powers of 1024, the units is
+ *            ['Byte', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB']
+ * @returns
+ */
+function humanFileSize(num, options = { decimals: 0, si: false, separator: ' ' }) {
+    const { decimals = 0, si = false, separator = ' ', baseUnit, maxUnit } = options;
+    let units = si
+        ? ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+        : ['Byte', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+    if (!isNullOrUnDef(baseUnit)) {
+        const targetIndex = units.findIndex(el => el === baseUnit);
+        if (targetIndex !== -1) {
+            units = units.slice(targetIndex);
+        }
+    }
+    if (!isNullOrUnDef(maxUnit)) {
+        const targetIndex = units.findIndex(el => el === maxUnit);
+        if (targetIndex !== -1) {
+            units.splice(targetIndex + 1);
+        }
+    }
+    return numberAbbr(num, units, { ratio: si ? 1000 : 1024, decimals, separator });
+}
 /**
  * 将数字格式化成千位分隔符显示的字符串
- * @param {number} val 数字
- * @param {'int' | 'float'} type 展示分段显示的类型 int:整型 | float:浮点型
+ * @param {number|string} num 数字
+ * @param {number} decimals 格式化成指定小数位精度的参数
  * @returns {string}
  */
-function formatNumber(val, type = 'int') {
-    return type === 'int' ? parseInt(String(val)).toLocaleString() : Number(val).toLocaleString('en-US');
+function formatNumber(num, decimals) {
+    if (isNullOrUnDef(decimals)) {
+        return parseInt(String(num)).toLocaleString();
+    }
+    let prec = 0;
+    if (!isNumber(decimals)) {
+        throw new Error('Decimals must be a positive number not less than zero');
+    }
+    else if (decimals > 0) {
+        prec = decimals;
+    }
+    return Number(Number(num).toFixed(prec)).toLocaleString('en-US');
 }
 
-export { HEX_POOL, formatNumber, numberAbbr, numberToHex };
+export { HEX_POOL, formatNumber as formatMoney, formatNumber, humanFileSize, numberAbbr, numberToHex };

package/lib/es/object.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/path.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/qs.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/random.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/string.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/tooltip.js

@@ -1,55 +1,59 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
 
 import { getStrWidthPx } from './dom.js';
+import { isString } from './type.js';
 
 /**
  * @title tooltip
  * @Desc 自定义的tooltip方法, 支持拖动悬浮提示
  * Created by chendeqiao on 2017/5/8.
  * @example
- *  <span onmouseleave="handleMouseLeave('#root')" onmousemove="handleMouseEnter({rootElId: '#root', title: 'title content', event: event})"
- * 		onmouseenter="handleMouseEnter({'#root', title: 'title content', event: event})">title content </span>
+ *  <span onmouseleave="handleMouseLeave('#root')" onmousemove="handleMouseEnter({rootContainer: '#root', title: 'title content', event: event})"
+ * 		onmouseenter="handleMouseEnter({rootContainer:'#root', title: 'title content', event: event})">title content </span>
  */
 /**
  * 自定义title提示功能的mouseenter事件句柄
  * @param {ITooltipParams} param1
  * @returns {*}
  */
-function handleMouseEnter({ rootElId = '#root', title, event }) {
+function handleMouseEnter({ rootContainer = '#root', title, event, bgColor = '#000', color = '#fff' }) {
     try {
-        const $rootEl = document.querySelector(rootElId);
-        console.assert($rootEl !== null, `未找到id为 ${rootElId} 的dom元素`);
+        const $rootEl = isString(rootContainer) ? document.querySelector(rootContainer) : rootContainer;
+        if (!$rootEl) {
+            throw new Error(`${rootContainer} is not valid Html Element or element selector`);
+        }
         let $customTitle = null;
+        const styleId = 'style-tooltip-inner1494304949567';
         // 动态创建class样式，并加入到head中
-        if (!document.querySelector('.tooltip-inner1494304949567')) {
+        if (!document.querySelector(`#${styleId}`)) {
             const tooltipWrapperClass = document.createElement('style');
             tooltipWrapperClass.type = 'text/css';
+            tooltipWrapperClass.id = styleId;
             tooltipWrapperClass.innerHTML = `
         .tooltip-inner1494304949567 {
           max-width: 250px;
           padding: 3px 8px;
-          color: #fff;
+          color: ${color};
           text-decoration: none;
           border-radius: 4px;
           text-align: left;
+          background-color: ${bgColor};
         }
       `;
             document.querySelector('head').appendChild(tooltipWrapperClass);
         }
-        if (document.querySelector('#customTitle1494304949567')) {
-            $customTitle = document.querySelector('#customTitle1494304949567');
+        $customTitle = document.querySelector('#customTitle1494304949567');
+        if ($customTitle) {
             mouseenter($customTitle, title, event);
         }
         else {
             const $contentContainer = document.createElement('div');
-            $contentContainer.className = 'customTitle';
             $contentContainer.id = 'customTitle1494304949567';
-            $contentContainer.className = 'tooltip';
-            $contentContainer.style.cssText = 'z-index: 99999999; visibility: hidden;';
+            $contentContainer.style.cssText = 'z-index: 99999999; visibility: hidden; position: absolute;';
             $contentContainer.innerHTML =
                 '<div class="tooltip-inner1494304949567" style="word-wrap: break-word; max-width: 44px;">皮肤</div>';
             $rootEl.appendChild($contentContainer);
@@ -102,11 +106,11 @@ function mouseenter($customTitle, title, e) {
 }
 /**
  * 移除提示文案dom的事件句柄
- * @param {string} rootElId
+ * @param {string} rootContainer
  * @returns {*}
  */
-function handleMouseLeave(rootElId = '#root') {
-    const rootEl = document.querySelector(rootElId), titleEl = document.querySelector('#customTitle1494304949567');
+function handleMouseLeave(rootContainer = '#root') {
+    const rootEl = isString(rootContainer) ? document.querySelector(rootContainer) : rootContainer, titleEl = document.querySelector('#customTitle1494304949567');
     if (rootEl && titleEl) {
         rootEl.removeChild(titleEl);
     }

package/lib/es/tree.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -210,7 +210,7 @@ function flatTree(treeList, options = defaultFieldOptions) {
             ...node,
             [childField]: [] // 清空子级
         };
-        item.hasOwnProperty([childField]) && delete item[childField];
+        objectHas(item, childField) && delete item[childField];
         res.push(item);
         if (node[childField]) {
             const children = node[childField].map(item => ({

package/lib/es/type.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/unique.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/url.js

@@ -1,27 +1,37 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
 
+import { isFunction } from './type.js';
 import { pathJoin } from './path.js';
 import { qsParse, qsStringify } from './qs.js';
 
-const anchorEl = document.createElement('a');
 /**
  * url 解析
  * @param {string} url
+ * @param {boolean} isModernApi 使用现代API:URL, 默认true (对无效url解析会抛错), 否则使用a标签来解析（兼容性更强）
  * @returns {Url}
  */
-const urlParse = (url) => {
-    anchorEl.href = url;
-    const { protocol, username, password, host, port, hostname, hash, search, pathname: _pathname } = anchorEl;
+const urlParse = (url, isModernApi = true) => {
+    // @ts-ignore
+    let urlObj = null;
+    if (isFunction(URL) && isModernApi) {
+        urlObj = new URL(url);
+    }
+    else {
+        urlObj = document.createElement('a');
+        urlObj.href = url;
+    }
+    const { protocol, username, password, host, port, hostname, hash, search, pathname: _pathname } = urlObj;
     // fix: ie 浏览器下，解析出来的 pathname 是没有 / 根的
     const pathname = pathJoin('/', _pathname);
     const auth = username && password ? `${username}:${password}` : '';
     const query = search.replace(/^\?/, '');
     const searchParams = qsParse(query);
     const path = `${pathname}${search}`;
+    urlObj = null;
     return {
         protocol,
         auth,

package/lib/es/validator.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/variable.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/watermark.js

@@ -1,9 +1,11 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
 
+import { isString, isNullOrUnDef } from './type.js';
+
 /*
  * @created: Saturday, 2020-04-18 14:38:23
  * @author: chendq
@@ -15,15 +17,14 @@
  * @param {ICanvasWM} canvasWM
  * @example genCanvasWM({ content: 'QQMusicFE' })
  */
-function genCanvasWM(canvasWM) {
-    const { container = document.body, width = '300px', height = '200px', textAlign = 'center', textBaseline = 'middle', font = '20px PingFangSC-Medium,PingFang SC', 
+function genCanvasWM(content = '请勿外传', canvasWM) {
+    const { rootContainer = document.body, width = '300px', height = '150px', textAlign = 'center', textBaseline = 'middle', font = '20px PingFangSC-Medium,PingFang SC', 
     // fontWeight = 500,
-    fillStyle = 'rgba(189, 177, 167, .3)', content = '请勿外传', rotate = 30, zIndex = 2147483647 } = canvasWM;
-    // 仅限主页面添加水印
-    // if (!location.pathname.includes('/home')) {
-    //   return;
-    // }
-    const args = canvasWM;
+    fillStyle = 'rgba(189, 177, 167, .3)', rotate = -20, zIndex = 2147483647, watermarkId = '__wm' } = isNullOrUnDef(canvasWM) ? {} : canvasWM;
+    const container = isString(rootContainer) ? document.querySelector(rootContainer) : rootContainer;
+    if (!container) {
+        throw new Error(`${rootContainer} is not valid Html Element or element selector`);
+    }
     const canvas = document.createElement('canvas');
     canvas.setAttribute('width', width);
     canvas.setAttribute('height', height);
@@ -36,36 +37,36 @@ function genCanvasWM(canvasWM) {
     ctx.rotate((Math.PI / 180) * rotate);
     ctx.fillText(content, parseFloat(width) / 4, parseFloat(height) / 2);
     const base64Url = canvas.toDataURL();
-    const __wm = document.querySelector('.__wm');
+    const __wm = document.querySelector(`#${watermarkId}`);
     const watermarkDiv = __wm || document.createElement('div');
     const styleStr = `opacity: 1 !important; display: block !important; visibility: visible !important;         position:absolute;          left:0; top:0;         width:100%;          height:100%;          z-index:${zIndex};          pointer-events:none;          background-repeat:repeat;          background-image:url('${base64Url}')`;
     watermarkDiv.setAttribute('style', styleStr);
-    watermarkDiv.classList.add('__wm');
+    watermarkDiv.setAttribute('id', watermarkId);
     watermarkDiv.classList.add('nav-height');
     if (!__wm) {
         container.style.position = 'relative';
         container.appendChild(watermarkDiv);
     }
     const getMutableStyle = (ele) => {
-        const computedStle = getComputedStyle(ele);
+        const computedStyle = getComputedStyle(ele);
         return {
-            opacity: computedStle.getPropertyValue('opacity'),
-            zIndex: computedStle.getPropertyValue('z-index'),
-            display: computedStle.getPropertyValue('display'),
-            visibility: computedStle.getPropertyValue('visibility')
+            opacity: computedStyle.getPropertyValue('opacity'),
+            zIndex: computedStyle.getPropertyValue('z-index'),
+            display: computedStyle.getPropertyValue('display'),
+            visibility: computedStyle.getPropertyValue('visibility')
         };
     };
     //@ts-ignore
     const MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
     if (MutationObserver) {
         let mo = new MutationObserver(function () {
-            const __wm = document.querySelector('.__wm'); // 只在__wm元素变动才重新调用 __canvasWM
+            const __wm = document.querySelector(`#${watermarkId}`); // 只在__wm元素变动才重新调用 __canvasWM
             if (!__wm) {
                 // 避免一直触发
                 // console.log('regenerate watermark by delete::')
                 mo.disconnect();
                 mo = null;
-                genCanvasWM(JSON.parse(JSON.stringify(args)));
+                genCanvasWM(content, canvasWM);
             }
             else {
                 const { opacity, zIndex, display, visibility } = getMutableStyle(__wm);
@@ -77,7 +78,7 @@ function genCanvasWM(canvasWM) {
                     mo.disconnect();
                     mo = null;
                     container.removeChild(__wm);
-                    genCanvasWM(JSON.parse(JSON.stringify(args)));
+                    genCanvasWM(content, canvasWM);
                 }
             }
         });

package/lib/es/we-decode.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.8.4
+ * sculp-js v1.10.0
  * (c) 2023-present chandq
  * Released under the MIT License.
  */