ph-utils 0.16.5 → 0.17.2

package/lib/date.js

@@ -12,17 +12,11 @@ const ofArgs = {
 const units = {
     Date: ["date", "Date", "day", "Day", "D", "d"],
     Month: ["Month", "month", "m"],
-    Year: ["Year", "year", "y"],
+    FullYear: ["Year", "year", "y"],
     Hours: ["Hours", "hours", "H"],
     Minutes: ["Minutes", "Minute", "minute", "minutes", "M"],
     Seconds: ["Seconds", "seconds", "Second", "second", "s"],
-    Milliseconds: [
-        "Milliseconds",
-        "Millisecond",
-        "milliseconds",
-        "illisecond",
-        "S",
-    ],
+    Milliseconds: ["Milliseconds", "Millisecond", "milliseconds", "illisecond", "S"],
 };
 /**
  * 不足位数, 前位补 0
@@ -135,15 +129,7 @@ export function parse(date) {
  */
 export function dateOf(date, unit, isEnd = false) {
     /* 如果是设置某一天的开始时刻, 就需要将时、分、秒、毫秒设置为0，依次类推设置 */
-    const periods = [
-        "Year",
-        "Month",
-        "Date",
-        "Hours",
-        "Minutes",
-        "Seconds",
-        "Milliseconds",
-    ];
+    const periods = ["Year", "Month", "Date", "Hours", "Minutes", "Seconds", "Milliseconds"];
     let index = periods.indexOf(getUnit(unit || "Date"));
     const clone = parse(date);
     index++;
@@ -154,9 +140,7 @@ export function dateOf(date, unit, isEnd = false) {
             // 设置为某个月的最后一天的日期
             value = getLastDayOfMonth(clone);
         }
-        Date.prototype["set" + periods[index]].apply(clone, [
-            setValues[index],
-        ]);
+        Date.prototype["set" + periods[index]].apply(clone, [setValues[index]]);
     }
     return clone;
 }

package/lib/dom.d.ts

@@ -119,7 +119,7 @@ export declare function html(element: HTMLElement, htmlstr?: string): string | u
  * @param textstr 可选，如果传递该参数，则表示设置；否则表示获取
  * @returns
  */
-export declare function text(element: HTMLElement, textstr?: string): string | undefined;
+export declare function text(element: HTMLElement, textstr?: string): string | undefined | null;
 export declare function iterate<T>(elems: T[], fn: (el: T, index: number) => any): void;
 export declare function iterate(elems: NodeList | HTMLCollection | NodeListOf<HTMLElement>, fn: (el: HTMLElement, index: number) => any): void;
 /**
@@ -222,4 +222,31 @@ export declare function formatStyle(styleObj: FormatStyleParam): string;
  * transition($el, [["opacity", "0", "0.3s"]], "leave", () => {  $el.remove(); });
  */
 export declare function transition(el: HTMLElement, nameOrProperties: string | [string, string, string][], dir?: "leave" | "enter", finish?: () => void): void;
+/**
+ * 计算光标位置
+ *
+ * 根据输入值的变化计算新的光标位置，主要用于输入框内容变化时的光标位置调整
+ *
+ * @param start - 光标起始位置，通常为: input.selectionStart
+ * @param end - 光标结束位置（通常与起始位置相同，用于选择范围），通常为: input.selectionEnd
+ * @param oldValue - 变化前的值
+ * @param newValue - 变化后的值
+ * @returns 新的光标位置对象，包含新的起始和结束位置
+ *
+ * @example
+ * // 删除字符时，光标向前移动
+ * calcuteCursorPosition(2, 2, "abc", "ac"); // 返回 { start: 1, end: 1 }
+ *
+ * @example
+ * // 添加字符时，光标向后移动
+ * calcuteCursorPosition(2, 2, "ac", "abc"); // 返回 { start: 3, end: 3 }
+ *
+ * @example
+ * // 替换字符时，保持位置
+ * calcuteCursorPosition(2, 2, "abc", "axc"); // 返回 { start: 2, end: 2 }
+ */
+export declare function calcuteCursorPosition(start: number, end: number, oldValue: string, newValue: string): {
+    start: number;
+    end: number;
+};
 export {};

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);
+                        }
                     }
                 }
             }
@@ -550,3 +552,50 @@ export function transition(el, nameOrProperties, dir = "enter", finish) {
         }
     }, { once: true });
 }
+/**
+ * 计算光标位置
+ *
+ * 根据输入值的变化计算新的光标位置，主要用于输入框内容变化时的光标位置调整
+ *
+ * @param start - 光标起始位置，通常为: input.selectionStart
+ * @param end - 光标结束位置（通常与起始位置相同，用于选择范围），通常为: input.selectionEnd
+ * @param oldValue - 变化前的值
+ * @param newValue - 变化后的值
+ * @returns 新的光标位置对象，包含新的起始和结束位置
+ *
+ * @example
+ * // 删除字符时，光标向前移动
+ * calcuteCursorPosition(2, 2, "abc", "ac"); // 返回 { start: 1, end: 1 }
+ *
+ * @example
+ * // 添加字符时，光标向后移动
+ * calcuteCursorPosition(2, 2, "ac", "abc"); // 返回 { start: 3, end: 3 }
+ *
+ * @example
+ * // 替换字符时，保持位置
+ * calcuteCursorPosition(2, 2, "abc", "axc"); // 返回 { start: 2, end: 2 }
+ */
+export function calcuteCursorPosition(start, end, oldValue, newValue) {
+    // 5. 【关键】计算新光标位置并恢复
+    let newStart = start;
+    let newEnd = end;
+    // 简单策略：如果新值比旧值短，说明删了字符，光标前移
+    // 更健壮的做法：对比差异，但通常可简化处理
+    if (newValue.length < oldValue.length) {
+        // 例如：用户在中间删了一个非法字符
+        newStart = Math.max(0, start - (oldValue.length - newValue.length));
+        newEnd = newStart;
+    }
+    else if (newValue.length > oldValue.length) {
+        // 插入合法字符，光标通常就在插入点后，可保持原偏移
+        // 但需防止超出长度
+        newStart = Math.min(newValue.length, start + (newValue.length - oldValue.length));
+        newEnd = newStart;
+    }
+    else {
+        // 长度不变（如替换），保持原位置（但要限制范围）
+        newStart = Math.min(newValue.length, start);
+        newEnd = newStart;
+    }
+    return { start: newStart, end: newEnd };
+}

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,99 +1,99 @@
-{
-  "name": "ph-utils",
-  "description": "js 开发工具集，前后端都可以使用(commonjs和es module)",
-  "main": "lib/index.js",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "browser": "lib/index.js",
-  "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "import": "./lib/index.js"
-    },
-    "./file": {
-      "types": "./lib/file.d.ts",
-      "import": "./lib/file.js"
-    },
-    "./date": {
-      "types": "./lib/date.d.ts",
-      "import": "./lib/date.js"
-    },
-    "./server": {
-      "types": "./lib/server.d.ts",
-      "import": "./lib/server.js"
-    },
-    "./validator": {
-      "types": "./lib/validator.d.ts",
-      "import": "./lib/validator.js"
-    },
-    "./crypto": {
-      "types": "./lib/crypto.d.ts",
-      "import": "./lib/crypto.js"
-    },
-    "./crypto_node": {
-      "types": "./lib/crypto_node.d.ts",
-      "import": "./lib/crypto_node.js"
-    },
-    "./web": {
-      "types": "./lib/web.d.ts",
-      "import": "./lib/web.js"
-    },
-    "./dom": {
-      "types": "./lib/dom.d.ts",
-      "import": "./lib/dom.js"
-    },
-    "./copy": {
-      "types": "./lib/copy.d.ts",
-      "import": "./lib/copy.js"
-    },
-    "./storage": {
-      "types": "./lib/storage.d.ts",
-      "import": "./lib/storage.js"
-    },
-    "./color": {
-      "types": "./lib/color.d.ts",
-      "import": "./lib/color.js"
-    },
-    "./logger": {
-      "types": "./lib/logger.d.ts",
-      "import": "./lib/logger.js"
-    },
-    "./array": {
-      "types": "./lib/array.d.ts",
-      "import": "./lib/array.js"
-    },
-    "./theme": {
-      "types": "./lib/theme.d.ts",
-      "import": "./lib/theme.js"
-    },
-    "./*": "./lib/*"
-  },
-  "version": "0.16.5",
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "git+https//gitee.com/towardly/ph.git",
-    "directory": "packages/utils"
-  },
-  "license": "MIT",
-  "author": "Tenny <tenny.shu@foxmail.com>",
-  "bugs": {
-    "url": "https://gitee.com/towardly/ph/issues"
-  },
-  "homepage": "https://gitee.com/towardly/ph/tree/master/packages/utils",
-  "devDependencies": {
-    "@types/node": "^22.8.2",
-    "typescript": "^5.6.3"
-  },
-  "files": [
-    "lib"
-  ],
-  "keywords": [
-    "node",
-    "utils",
-    "javascript",
-    "date",
-    "dom",
-    "file"
-  ]
-}
+{
+  "name": "ph-utils",
+  "version": "0.17.2",
+  "description": "js 开发工具集，前后端都可以使用(commonjs和es module)",
+  "keywords": [
+    "date",
+    "dom",
+    "file",
+    "javascript",
+    "node",
+    "utils"
+  ],
+  "homepage": "https://gitee.com/towardly/ph/tree/master/packages/utils",
+  "bugs": {
+    "url": "https://gitee.com/towardly/ph/issues"
+  },
+  "license": "MIT",
+  "author": "Tenny <tenny.shu@foxmail.com>",
+  "repository": {
+    "type": "git",
+    "url": "git+https//gitee.com/towardly/ph.git",
+    "directory": "packages/utils"
+  },
+  "files": [
+    "lib"
+  ],
+  "type": "module",
+  "main": "lib/index.js",
+  "module": "lib/index.js",
+  "browser": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js"
+    },
+    "./file": {
+      "types": "./lib/file.d.ts",
+      "import": "./lib/file.js"
+    },
+    "./date": {
+      "types": "./lib/date.d.ts",
+      "import": "./lib/date.js"
+    },
+    "./server": {
+      "types": "./lib/server.d.ts",
+      "import": "./lib/server.js"
+    },
+    "./validator": {
+      "types": "./lib/validator.d.ts",
+      "import": "./lib/validator.js"
+    },
+    "./crypto": {
+      "types": "./lib/crypto.d.ts",
+      "import": "./lib/crypto.js"
+    },
+    "./crypto_node": {
+      "types": "./lib/crypto_node.d.ts",
+      "import": "./lib/crypto_node.js"
+    },
+    "./web": {
+      "types": "./lib/web.d.ts",
+      "import": "./lib/web.js"
+    },
+    "./dom": {
+      "types": "./lib/dom.d.ts",
+      "import": "./lib/dom.js"
+    },
+    "./copy": {
+      "types": "./lib/copy.d.ts",
+      "import": "./lib/copy.js"
+    },
+    "./storage": {
+      "types": "./lib/storage.d.ts",
+      "import": "./lib/storage.js"
+    },
+    "./color": {
+      "types": "./lib/color.d.ts",
+      "import": "./lib/color.js"
+    },
+    "./logger": {
+      "types": "./lib/logger.d.ts",
+      "import": "./lib/logger.js"
+    },
+    "./array": {
+      "types": "./lib/array.d.ts",
+      "import": "./lib/array.js"
+    },
+    "./theme": {
+      "types": "./lib/theme.d.ts",
+      "import": "./lib/theme.js"
+    },
+    "./*": "./lib/*"
+  },
+  "devDependencies": {
+    "@types/node": "^22.8.2",
+    "typescript": "^5.6.3"
+  }
+}