v2.11.22

mengxinssfd · Jul 11, 2021 · 26a2595 · 26a2595
1 parent 2a63eb6
commit 26a2595
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 42 deletions.
diff --git a/lib-cjs/common.js b/lib-cjs/common.js
@@ -199,7 +199,7 @@ function polling(callback, interval, immediate = true) {
     }
     function timeout() {
         const delay = interval - diff;
-        timer = window.setTimeout(() => {
+        timer = setTimeout(() => {
             if (status !== state.running)
                 return;
             const now = Date.now();
@@ -477,47 +477,51 @@ function likeKeys(target, key) {
 exports.likeKeys = likeKeys;
 /**
  * 命令行的参数转为Map
+ * @notice 部分命令行工具中"--"是全写，"-"是缩写 这里未分
  * @param arr 命令行参数数组
  * @param prefix 前缀 --d --f 前缀是"--"
  * @param defaultKey 如果前面没有变量名那么使用默认
  */
 function parseCmdParams(arr, prefix = "-", defaultKey = "default") {
-    const list = arr.slice();
-    let currentKey = defaultKey;
-    const isKeyReg = new RegExp(`^${prefix}`);
     const eqReg = /([^=]+)=([\s\S]+)?/;
+    const isKeyReg = new RegExp(`^${prefix}`);
+    const list = arr.slice();
     const map = new Map();
-    function getKey(key) {
+    let currentKey = defaultKey;
+    let item;
+    function setKey() {
+        let key = item.replace(isKeyReg, "");
         if (eqReg.test(key)) {
             key = RegExp.$1;
             const value = RegExp.$2;
             value && list.unshift(value);
         }
-        return key;
+        currentKey = key;
+        if (!map.has(currentKey)) {
+            map.set(currentKey, true);
+        }
     }
-    function setValue(currentValue) {
-        switch (dataType_1.typeOf(currentValue)) {
+    // fullFight
+    function setValue() {
+        const existValue = map.get(currentKey);
+        switch (dataType_1.typeOf(existValue)) {
             case "undefined":
             case "boolean":
-                map.set(currentKey, it);
+                map.set(currentKey, item);
                 break;
             case "array":
-                currentValue.push(it);
+                existValue.push(item);
                 break;
             default:
-                map.set(currentKey, [currentValue, it]);
+                map.set(currentKey, [existValue, item]);
         }
     }
-    let it;
-    while (it = list.shift()) {
-        if (isKeyReg.test(it)) {
-            currentKey = getKey(it.replace(isKeyReg, ""));
-            if (!map.has(currentKey)) {
-                map.set(currentKey, true);
-            }
+    while (item = list.shift()) {
+        if (isKeyReg.test(item)) {
+            setKey();
             continue;
         }
-        setValue(map.get(currentKey));
+        setValue();
     }
     return map;
 }

diff --git a/lib-cjs/event.js b/lib-cjs/event.js
@@ -125,6 +125,7 @@ exports.addDragEventListener = addDragEventListener;
  * 改成这样可以把数据控制在函数内部
  * @example
  *   onDragEvent(({onDown, onMove, onUp}) => {
+ *       // 目前只有第一次挂载的函数有效，后面的都无效。 那么是否应该可以更改呢
  *       onDown((e, currentXY) => {
  *           console.log("down", e, currentXY);
  *       });

diff --git a/lib-es/common.js b/lib-es/common.js
@@ -191,7 +191,7 @@ export function polling(callback, interval, immediate = true) {
     }
     function timeout() {
         const delay = interval - diff;
-        timer = window.setTimeout(() => {
+        timer = setTimeout(() => {
             if (status !== state.running)
                 return;
             const now = Date.now();
@@ -455,47 +455,51 @@ export function likeKeys(target, key) {
 }
 /**
  * 命令行的参数转为Map
+ * @notice 部分命令行工具中"--"是全写，"-"是缩写 这里未分
  * @param arr 命令行参数数组
  * @param prefix 前缀 --d --f 前缀是"--"
  * @param defaultKey 如果前面没有变量名那么使用默认
  */
 export function parseCmdParams(arr, prefix = "-", defaultKey = "default") {
-    const list = arr.slice();
-    let currentKey = defaultKey;
-    const isKeyReg = new RegExp(`^${prefix}`);
     const eqReg = /([^=]+)=([\s\S]+)?/;
+    const isKeyReg = new RegExp(`^${prefix}`);
+    const list = arr.slice();
     const map = new Map();
-    function getKey(key) {
+    let currentKey = defaultKey;
+    let item;
+    function setKey() {
+        let key = item.replace(isKeyReg, "");
         if (eqReg.test(key)) {
             key = RegExp.$1;
             const value = RegExp.$2;
             value && list.unshift(value);
         }
-        return key;
+        currentKey = key;
+        if (!map.has(currentKey)) {
+            map.set(currentKey, true);
+        }
     }
-    function setValue(currentValue) {
-        switch (typeOf(currentValue)) {
+    // fullFight
+    function setValue() {
+        const existValue = map.get(currentKey);
+        switch (typeOf(existValue)) {
             case "undefined":
             case "boolean":
-                map.set(currentKey, it);
+                map.set(currentKey, item);
                 break;
             case "array":
-                currentValue.push(it);
+                existValue.push(item);
                 break;
             default:
-                map.set(currentKey, [currentValue, it]);
+                map.set(currentKey, [existValue, item]);
         }
     }
-    let it;
-    while (it = list.shift()) {
-        if (isKeyReg.test(it)) {
-            currentKey = getKey(it.replace(isKeyReg, ""));
-            if (!map.has(currentKey)) {
-                map.set(currentKey, true);
-            }
+    while (item = list.shift()) {
+        if (isKeyReg.test(item)) {
+            setKey();
             continue;
         }
-        setValue(map.get(currentKey));
+        setValue();
     }
     return map;
 }
diff --git a/lib-es/event.js b/lib-es/event.js
@@ -121,6 +121,7 @@ export function addDragEventListener({ el, onDown, onMove, onUp, capture = { dow
  * 改成这样可以把数据控制在函数内部
  * @example
  *   onDragEvent(({onDown, onMove, onUp}) => {
+ *       // 目前只有第一次挂载的函数有效，后面的都无效。 那么是否应该可以更改呢
  *       onDown((e, currentXY) => {
  *           console.log("down", e, currentXY);
  *       });

diff --git a/lib-umd/index.js b/lib-umd/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mxssfd/ts-utils",
-  "version": "2.11.21",
+  "version": "2.11.22",
   "description": "utils工具函数ts/js库",
   "main": "./lib-umd/index.js",
   "module": "./lib-es/index.js",

diff --git a/types/common.d.ts b/types/common.d.ts
@@ -110,6 +110,7 @@ declare type ArrayLikeType<T> = T extends ArrayLike<infer R> ? R : never;
 export declare function likeKeys(target: object | Map<string, any>, key: string | RegExp): string[];
 /**
  * 命令行的参数转为Map
+ * @notice 部分命令行工具中"--"是全写，"-"是缩写 这里未分
  * @param arr 命令行参数数组
  * @param prefix 前缀 --d --f 前缀是"--"
  * @param defaultKey 如果前面没有变量名那么使用默认

diff --git a/types/event.d.ts b/types/event.d.ts
@@ -31,6 +31,7 @@ declare type DragHook<T> = (cb: T) => void;
  * 改成这样可以把数据控制在函数内部
  * @example
  *   onDragEvent(({onDown, onMove, onUp}) => {
+ *       // 目前只有第一次挂载的函数有效，后面的都无效。 那么是否应该可以更改呢
  *       onDown((e, currentXY) => {
  *           console.log("down", e, currentXY);
  *       });