ph-utils 0.17.1 → 0.17.2

package/README.md

@@ -1,7 +1,7 @@
-## ph-utils
-
-整理了 js 前后端开发(web + nodejs)时常用的一些工具；[详细文档](https://gitee.com/towardly/ph/wikis/Home?sort_id=4035190)
-
-### 包含如下工具文件
-
-`index` 基础工具类、`date` 跟日期相关的工具类、`file` 文件操作相关工具类[**服务端**]、`server` 服务端工具类、`validator` 数据验证、`dom` 浏览器节点操作相关[**前端**]、`web` 一些只适用于前端相关的工具、`color` 颜色相关工具
+## ph-utils
+
+整理了 js 前后端开发(web + nodejs)时常用的一些工具；[详细文档](https://gitee.com/towardly/ph/wikis/Home?sort_id=4035190)
+
+### 包含如下工具文件
+
+`index` 基础工具类、`date` 跟日期相关的工具类、`file` 文件操作相关工具类[**服务端**]、`server` 服务端工具类、`validator` 数据验证、`dom` 浏览器节点操作相关[**前端**]、`web` 一些只适用于前端相关的工具、`color` 颜色相关工具

package/lib/dom.js

@@ -36,27 +36,29 @@ export function create(tag, option = {}, ctx) {
         if (option) {
             for (const key in option) {
                 const value = option[key];
-                if (key === "class") {
-                    $el.className = formatClass(value);
-                }
-                else if (key === "style") {
-                    $el.style.cssText = formatStyle(value);
-                }
-                else if (key === "textContent" && value) {
-                    $el.textContent = value;
-                }
-                else if (key === "innerHTML" && value) {
-                    $el.innerHTML = value;
-                }
-                else if (key === "outerHTML" && value) {
-                    $el.outerHTML = value;
-                }
-                else {
-                    if (value === true) {
-                        $el.setAttribute(key, "");
+                if (value != null) {
+                    if (key === "class") {
+                        $el.className = formatClass(value);
+                    }
+                    else if (key === "style") {
+                        $el.style.cssText = formatStyle(value);
+                    }
+                    else if (key === "textContent" && value) {
+                        $el.textContent = value;
+                    }
+                    else if (key === "innerHTML" && value) {
+                        $el.innerHTML = value;
+                    }
+                    else if (key === "outerHTML" && value) {
+                        $el.outerHTML = value;
                     }
                     else {
-                        $el.setAttribute(key, value);
+                        if (value === true) {
+                            $el.setAttribute(key, "");
+                        }
+                        else {
+                            $el.setAttribute(key, value);
+                        }
                     }
                 }
             }

package/lib/theme.js

@@ -19,11 +19,8 @@ export async function initTheme() {
     if ($themeStyle == null) {
         $themeStyle = document.createElement("style");
         $themeStyle.id = "theme-style";
-        $themeStyle.innerHTML = `
-      :root{color-scheme:light dark;}
-      html.light{color-scheme: light;}
-      html.dark {color-scheme: dark;}
-    `;
+        $themeStyle.innerHTML =
+            ":root{color-scheme:light dark;}html.light{color-scheme: light;}html.dark {color-scheme: dark;}";
         document.head.appendChild($themeStyle);
     }
     // 获取已经应用的主题设置
@@ -103,7 +100,7 @@ export function getColorTheme(defaultValue) {
     const match = root.className.match(/color-([0-9a-fA-F]{6})/);
     if (match == null) {
         // 获取 --nt-primary-color 的值
-        let color = getComputedStyle(root).getPropertyValue("--nt-primary-color");
+        let color = getComputedStyle(root).getPropertyValue("--l-primary-color");
         if (color === "") {
             color = localStorage.getItem("web-theme-color");
         }
@@ -130,13 +127,10 @@ export function initColorTheme() {
  */
 export async function toggleColorTheme(color) {
     const vars = [
-        `--nt-primary-color: ${color};`,
         `--l-primary-color: ${color};`,
-        `--nt-primary-color-dark1: ${adjust(color, 1, false)};`,
         `--l-primary-color-dark1: ${adjust(color, 1, false)};`,
     ];
     for (let i = 1; i <= 5; i++) {
-        vars.push(`--nt-primary-color-light${i}: ${adjust(color, i)};`);
         vars.push(`--l-primary-color-light${i}: ${adjust(color, i)};`);
     }
     let $style = document.getElementById("color-theme-style");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ph-utils",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "js 开发工具集，前后端都可以使用(commonjs和es module)",
   "keywords": [
     "date",
@@ -96,4 +96,4 @@
     "@types/node": "^22.8.2",
     "typescript": "^5.6.3"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Tenny
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/lib/clipboard.d.ts

@@ -1,11 +0,0 @@
-/**
- * 复制数据, 可以从多种类型的数据
- *    1. 直接复制文本: await copy("待复制的文本")
- *    2. 复制节点上的 data-copy-text:
- *      <button data-copy-text="这是待复制的文本">复制</button>
- *      await copy(e.target) // or await copy("#a") or await copy(document.querySelector('#a'))
- *    3. 直接复制节点本身数据: await copy('#a')
- * @param {string | HTMLElement} source 复制源, 从中解析待复制的数据
- * @returns {Promise<boolean>} 是否复制成功
- */
-export declare function copy(source: string | HTMLElement): Promise<boolean>;

package/lib/clipboard.js

@@ -1,101 +0,0 @@
-/**
- * 创建一个临时节点缓存待复制数据
- * @param {String} value - 待复制文本
- * @return {HTMLElement}
- */
-function createFakeElement(value) {
-    const fakeElement = document.createElement("textarea");
-    fakeElement.style.border = "0";
-    fakeElement.style.padding = "0";
-    fakeElement.style.margin = "0";
-    fakeElement.style.position = "absolute";
-    fakeElement.style.left = "-9999px";
-    fakeElement.style.top = "-9999";
-    fakeElement.setAttribute("readonly", "");
-    fakeElement.value = value;
-    return fakeElement;
-}
-/** 通过执行 execCommand 来执行复制 */
-function copyFromCommand(text) {
-    // 添加节点
-    const fakeEl = createFakeElement(text);
-    document.body.append(fakeEl);
-    fakeEl.focus();
-    fakeEl.select();
-    // 执行复制
-    const res = document.execCommand("copy");
-    fakeEl.remove(); // 删除节点
-    return Promise.resolve(res);
-}
-/** 使用 navigator.clipboard 复制 */
-function copyFromClipboard(text) {
-    const theClipboard = navigator.clipboard;
-    if (theClipboard != null) {
-        return theClipboard
-            .writeText(text)
-            .then(() => {
-            Promise.resolve(true);
-        })
-            .catch(() => Promise.resolve(false));
-    }
-    return Promise.resolve(false);
-}
-/** 解析待复制的文本 */
-function parseCopyText(source) {
-    let copyText = null; // 待复制文本
-    let sourceEl = null;
-    // 获取待复制数据
-    if (typeof source === "string") {
-        // 从节点拿数据
-        if (source.startsWith("#") || source.startsWith(".")) {
-            sourceEl = document.querySelector(source);
-            if (sourceEl == null) {
-                copyText = source;
-            }
-        }
-        else {
-            copyText = source;
-        }
-    }
-    if (source instanceof HTMLElement) {
-        sourceEl = source;
-    }
-    // 从节点获取待复制数据
-    if (sourceEl != null) {
-        if (sourceEl.hasAttribute("data-copy-text")) {
-            copyText = sourceEl.getAttribute("data-copy-text");
-        }
-        else {
-            const tagName = sourceEl.tagName;
-            if (tagName === "INPUT" || tagName === "TEXTAREA") {
-                copyText = sourceEl.value;
-            }
-            else {
-                copyText = sourceEl.textContent;
-            }
-        }
-    }
-    return copyText;
-}
-/**
- * 复制数据, 可以从多种类型的数据
- *    1. 直接复制文本: await copy("待复制的文本")
- *    2. 复制节点上的 data-copy-text:
- *      <button data-copy-text="这是待复制的文本">复制</button>
- *      await copy(e.target) // or await copy("#a") or await copy(document.querySelector('#a'))
- *    3. 直接复制节点本身数据: await copy('#a')
- * @param {string | HTMLElement} source 复制源, 从中解析待复制的数据
- * @returns {Promise<boolean>} 是否复制成功
- */
-export async function copy(source) {
-    // 待复制文本
-    const copyText = parseCopyText(source);
-    if (copyText == null) {
-        return Promise.resolve(false);
-    }
-    const v = await copyFromClipboard(copyText);
-    if (v === false) {
-        return copyFromCommand(copyText);
-    }
-    return Promise.resolve(true);
-}