zmdms-utils 0.0.23 → 0.0.25

package/dist/es/common.js

@@ -1,6 +1,6 @@
+import { __assign } from './_virtual/_tslib.js';
 import mitt from './node_modules/mitt/dist/mitt.js';
 
-// 基础函数
 /**
  * 同步阻断
  * @param time 秒
@@ -210,5 +210,20 @@ function isImageExtension(extension) {
 function isNonEmpty(number) {
     return number !== null && number !== undefined;
 }
+/**
+ * 遍历一个对象，将值是数组的项，用逗号拼接起来
+ */
+function parseJoin(params) {
+    if (params) {
+        var newParams = __assign({}, params);
+        for (var key in newParams) {
+            if (Array.isArray(newParams[key])) {
+                newParams[key] = newParams[key].join(",");
+            }
+        }
+        return newParams;
+    }
+    return params;
+}
 
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseQueryParams, specialString, unescapeString };
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString };

package/dist/es/parseTime.js

@@ -30,6 +30,7 @@ function parseTime(config) {
         // 浅拷贝一下
         var newParams_1 = Object.assign({}, params);
         fromKeys.forEach(function (fromKey, index) {
+            var _a, _b;
             var toKey = toKeys[index];
             var endTypeItem = Array.isArray(endType) ? endType[index] : endType;
             // 1. 从一个键 转成 一个键
@@ -55,12 +56,12 @@ function parseTime(config) {
                     endEndType = endTypeItem[1];
                 }
                 newParams_1[toKey1] = getParseResult({
-                    value: newParams_1[fromKey],
+                    value: (_a = newParams_1[fromKey]) === null || _a === void 0 ? void 0 : _a[0],
                     index: index,
                     endType: startEndType,
                 });
                 newParams_1[toKey2] = getParseResult({
-                    value: newParams_1[fromKey],
+                    value: (_b = newParams_1[fromKey]) === null || _b === void 0 ? void 0 : _b[1],
                     index: index,
                     endType: endEndType,
                 });
@@ -134,7 +135,7 @@ function parseTime(config) {
 function parseByResult(option) {
     var _a = option.format, format = _a === void 0 ? defaultFormat : _a, _b = option.type, type = _b === void 0 ? "string" : _b;
     return function (option) {
-        var value = option.value, _a = option.index, index = _a === void 0 ? 0 : _a, endType = option.endType;
+        var value = option.value, _a = option.index, index = _a === void 0 ? 0 : _a, endType = option.endType; option.formatType;
         if (!value) {
             return undefined;
         }
@@ -144,14 +145,14 @@ function parseByResult(option) {
         if (parseType === "string") {
             var dayjsValue = dayjs.isDayjs(value) ? value : dayjs(value);
             if (parseEndType === "startOf") {
-                return dayjsValue
-                    .startOf("day")
-                    .format(parseFormat.length === 10 ? "".concat(parseFormat, " HH:mm:ss") : parseFormat);
+                return dayjsValue.startOf("day").format(
+                // parseFormat.length === 10 ? `${parseFormat} HH:mm:ss` : parseFormat
+                parseFormat);
             }
             if (parseEndType === "endOf") {
-                return dayjsValue
-                    .endOf("day")
-                    .format(parseFormat.length === 10 ? "".concat(parseFormat, " HH:mm:ss") : parseFormat);
+                return dayjsValue.endOf("day").format(
+                // parseFormat.length === 10 ? `${parseFormat} HH:mm:ss` : parseFormat
+                parseFormat);
             }
             return dayjsValue.format(parseFormat);
         }

package/dist/es/src/parseTimeTest.js

@@ -53,12 +53,12 @@ function parseTime(config) {
           endEndType = endTypeItem[1];
         }
         newParams[toKey1] = getParseResult({
-          value: newParams[fromKey],
+          value: newParams[fromKey]?.[0],
           index,
           endType: startEndType,
         });
         newParams[toKey2] = getParseResult({
-          value: newParams[fromKey],
+          value: newParams[fromKey]?.[1],
           index,
           endType: endEndType,
         });
@@ -241,4 +241,15 @@ console.log(
       ["startOf", "startOf"],
     ],
   })
+);
+console.log(
+  parseTime({
+    params: {
+      time: [dayjs(), dayjs()],
+      timea: dayjs(),
+    },
+    fromKeys: ["time", "timea"],
+    toKeys: [["time1", "time2"], "timea"],
+    format: ["YYYY-MM-DD", "YYYY-MM-DD HH:mm:ss"],
+  })
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/common.ts

@@ -220,3 +220,19 @@ export function isImageExtension(extension: string): boolean {
 export function isNonEmpty(number: any) {
   return number !== null && number !== undefined;
 }
+
+/**
+ * 遍历一个对象，将值是数组的项，用逗号拼接起来
+ */
+export function parseJoin(params?: any) {
+  if (params) {
+    let newParams: any = { ...params };
+    for (let key in newParams) {
+      if (Array.isArray(newParams[key])) {
+        newParams[key] = newParams[key].join(",");
+      }
+    }
+    return newParams;
+  }
+  return params;
+}

package/src/parseTime.ts

@@ -82,12 +82,12 @@ export default function parseTime(config: IConfig) {
           endEndType = endTypeItem[1];
         }
         newParams[toKey1] = getParseResult({
-          value: newParams[fromKey],
+          value: newParams[fromKey]?.[0],
           index,
           endType: startEndType,
         });
         newParams[toKey2] = getParseResult({
-          value: newParams[fromKey],
+          value: newParams[fromKey]?.[1],
           index,
           endType: endEndType,
         });
@@ -168,12 +168,13 @@ interface IResultProps {
   value?: any;
   index?: number;
   endType?: IEndType | IEndType[];
+  formatType?: string;
 }
 function parseByResult(option: IProps) {
   const { format = defaultFormat, type = "string" } = option;
 
   return (option: IResultProps) => {
-    const { value, index = 0, endType } = option;
+    const { value, index = 0, endType, formatType } = option;
     if (!value) {
       return undefined;
     }
@@ -183,18 +184,16 @@ function parseByResult(option: IProps) {
     if (parseType === "string") {
       const dayjsValue = dayjs.isDayjs(value) ? value : dayjs(value);
       if (parseEndType === "startOf") {
-        return dayjsValue
-          .startOf("day")
-          .format(
-            parseFormat.length === 10 ? `${parseFormat} HH:mm:ss` : parseFormat
-          );
+        return dayjsValue.startOf("day").format(
+          // parseFormat.length === 10 ? `${parseFormat} HH:mm:ss` : parseFormat
+          parseFormat
+        );
       }
       if (parseEndType === "endOf") {
-        return dayjsValue
-          .endOf("day")
-          .format(
-            parseFormat.length === 10 ? `${parseFormat} HH:mm:ss` : parseFormat
-          );
+        return dayjsValue.endOf("day").format(
+          // parseFormat.length === 10 ? `${parseFormat} HH:mm:ss` : parseFormat
+          parseFormat
+        );
       }
       return dayjsValue.format(parseFormat);
     } else {

package/src/parseTimeTest.js

@@ -51,12 +51,12 @@ function parseTime(config) {
           endEndType = endTypeItem[1];
         }
         newParams[toKey1] = getParseResult({
-          value: newParams[fromKey],
+          value: newParams[fromKey]?.[0],
           index,
           endType: startEndType,
         });
         newParams[toKey2] = getParseResult({
-          value: newParams[fromKey],
+          value: newParams[fromKey]?.[1],
           index,
           endType: endEndType,
         });
@@ -240,3 +240,14 @@ console.log(
     ],
   })
 );
+console.log(
+  parseTime({
+    params: {
+      time: [dayjs(), dayjs()],
+      timea: dayjs(),
+    },
+    fromKeys: ["time", "timea"],
+    toKeys: [["time1", "time2"], "timea"],
+    format: ["YYYY-MM-DD", "YYYY-MM-DD HH:mm:ss"],
+  })
+);