@d-matrix/utils 1.9.2 → 1.11.0

package/dist/date.d.ts

@@ -1,3 +1,7 @@
+export interface RecentYearOption {
+    label: string;
+    value: number;
+}
 /**
  * Generates an array of numbers representing a range of years between the start year and the end year.
  *
@@ -5,16 +9,20 @@
  * @param {number} end - the ending year of the range (defaults to the current year)
  * @return {number[]} an array of numbers representing the range of years
  */
-export declare const rangeOfYears: (start: number, end?: number) => number[];
-export interface RecentYearOption {
-    label: string;
-    value: number;
-}
+export declare function rangeOfYears(start: number, end?: number): number[];
+export declare type GetRecentYearsOptions = {
+    startYear?: number;
+    recentYears?: number;
+    endYear?: number;
+    suffix?: string;
+};
 /**
- * 获取最近n年, 从大到小
- * @param recentYears 最近几年
- * @param type 控制返回值类型
- * @param suffix 后缀，默认为'年'
+ * 获取n年, 从大到小
+ * @param options
  */
-export declare function getRecentYears(recentYears: number, type: 'number[]'): number[];
-export declare function getRecentYears(recentYears: number, type: 'object[]'): RecentYearOption[];
+export declare function getYears(options: GetRecentYearsOptions & {
+    type: 'number[]';
+}): number[];
+export declare function getYears(options: GetRecentYearsOptions & {
+    type: 'object[]';
+}): RecentYearOption[];

package/dist/date.js

@@ -5,24 +5,43 @@
  * @param {number} end - the ending year of the range (defaults to the current year)
  * @return {number[]} an array of numbers representing the range of years
  */
-export const rangeOfYears = (start, end = new Date().getFullYear()) => Array(end - start + 1)
-    .fill(start)
-    .map((year, index) => year + index);
-export function getRecentYears(recentYears, type, suffix = '年') {
-    const thisYear = new Date().getFullYear();
+export function rangeOfYears(start, end = new Date().getFullYear()) {
+    return Array(end - start + 1)
+        .fill(start)
+        .map((year, index) => year + index);
+}
+export function getYears(options) {
+    const { recentYears = 0, startYear, endYear, suffix = '年', type } = options;
+    const endY = endYear ? endYear : new Date().getFullYear();
+    let ranges = recentYears;
+    if (typeof startYear === 'number') {
+        // 包含startYear
+        ranges = endY - startYear + 1;
+        if (ranges <= 0) {
+            if (process.env.NODE_ENV === 'development') {
+                if (endYear === undefined) {
+                    console.error('startYear不能大于当前年份');
+                }
+                else if (typeof endYear === 'number') {
+                    console.error('endYear不能小于startYear');
+                }
+            }
+            return [];
+        }
+    }
     if (type === 'number[]') {
         const result = [];
-        for (let i = 0; i < recentYears; i++) {
-            result.push(thisYear - i);
+        for (let i = 0; i < ranges; i++) {
+            result.push(endY - i);
         }
         return result;
     }
     if (type === 'object[]') {
         const result = [];
-        for (let i = 0; i < recentYears; i++) {
+        for (let i = 0; i < ranges; i++) {
             result.push({
-                value: thisYear - i,
-                label: `${thisYear - i}${suffix}`,
+                value: endY - i,
+                label: `${endY - i}${suffix}`,
             });
         }
         return result;

package/dist/file.d.ts

@@ -38,12 +38,12 @@ export declare function getFilenameFromContentDispositionHeader(header: {
 }): string;
 declare const HyperLinkTargets: readonly ["_self", "_blank", "_parent", "_top"];
 export declare type HyperLinkTarget = (typeof HyperLinkTargets)[number];
-/**
- * 文件下载
- * @param source 文件地址或blob对象
- * @param fileName 文件名
- * @param isPreview 是否
- */
 export declare function download(source: Blob, fileName?: string): void;
 export declare function download(source: string, fileName?: string, target?: HyperLinkTarget): void;
+/**
+ * 通过创建iframe进行文件下载
+ * @param source
+ * @returns
+ */
+export declare function downloadFileByIframe(source: string): boolean;
 export {};

package/dist/file.js

@@ -79,9 +79,32 @@ export function getFilenameFromContentDispositionHeader(header) {
     return decodeURIComponent(filename);
 }
 const HyperLinkTargets = ['_self', '_blank', '_parent', '_top'];
+/**
+ * 文件下载
+ * @param source 文件地址或blob对象
+ * @param fileName 文件名
+ * @param isPreview 是否
+ */
+// `a.click()` doesn't work for all browsers (#465)
+function click(node) {
+    try {
+        node.dispatchEvent(new MouseEvent('click'));
+    }
+    catch (e) {
+        var evt = document.createEvent('MouseEvents');
+        evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null);
+        node.dispatchEvent(evt);
+    }
+}
 export function download(source, fileName = '', target) {
     const link = document.createElement('a');
     if (typeof source === 'string') {
+        if (!source.length) {
+            if (process.env.NODE_ENV === 'development') {
+                console.error('下载失败，原因：source为空字符串');
+                return;
+            }
+        }
         if (typeof target === 'string' && HyperLinkTargets.includes(target)) {
             link.target = target;
         }
@@ -90,12 +113,40 @@ export function download(source, fileName = '', target) {
         }
         link.href = source;
     }
+    let objectURL;
     if (source instanceof Blob) {
-        const url = window.URL.createObjectURL(source);
-        link.href = url;
+        const objectURL = window.URL.createObjectURL(source);
+        link.href = objectURL;
         link.download = fileName;
     }
     document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
+    click(link);
+    setTimeout(() => {
+        if (typeof objectURL === 'string') {
+            window.URL.revokeObjectURL(objectURL);
+        }
+        document.body.removeChild(link);
+    }, 4e4); // 40S
+}
+/**
+ * 通过创建iframe进行文件下载
+ * @param source
+ * @returns
+ */
+export function downloadFileByIframe(source) {
+    const httpsPath = source.replace(/http:\/\//, "https://");
+    const iframes = document.getElementsByTagName("iframe");
+    if (iframes.length === 0 ||
+        (iframes.length > 0 && iframes[0].className === "fill" && iframes[iframes.length - 1].className === "fill")) {
+        const element = document.createElement("iframe");
+        element.style.display = "none";
+        element.src = httpsPath;
+        document.body.appendChild(element);
+        return true;
+    }
+    if (iframes.length > 0 && iframes[iframes.length - 1].className !== "fill") {
+        iframes[0].src = httpsPath;
+        return true;
+    }
+    return false;
 }

package/dist/index.d.ts

@@ -7,3 +7,4 @@ export * as algorithm from './algorithm';
 export * as file from './file';
 export * as support from './support';
 export * as timer from './timer';
+export * as operator from './operator';

package/dist/index.js

@@ -7,3 +7,4 @@ export * as algorithm from './algorithm';
 export * as file from './file';
 export * as support from './support';
 export * as timer from './timer';
+export * as operator from './operator';

package/dist/operator.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 检查数据类型
+ * @param obj
+ * @returns
+ */
+export declare const trueTypeOf: (obj: unknown) => string;

package/dist/operator.js

@@ -0,0 +1,6 @@
+/**
+ * 检查数据类型
+ * @param obj
+ * @returns
+ */
+export const trueTypeOf = (obj) => Object.prototype.toString.call(obj).slice(8, -1).toLowerCase();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@d-matrix/utils",
   "sideEffects": false,
-  "version": "1.9.2",
+  "version": "1.11.0",
   "description": "A dozen of utils for Front-End Development",
   "main": "dist/index.js",
   "scripts": {

package/readme.md

@@ -16,6 +16,7 @@ A dozen of utils for Front-End Development
 - [file](#file)
 - [support](#support)
 - [timer](#timer)
+- [operator](#operator)
 
 ### clipboard
 
@@ -145,27 +146,34 @@ dom.strip('测试<em>高亮</em>测试'); // '测试高亮测试'
 - `getRecentYears()`
 
 ```ts
-export function getRecentYears(recentYears: number, type: 'number[]'): number[];
-export function getRecentYears(recentYears: number, type: 'object[]'): RecentYearOption[];
-export function getRecentYears(recentYears: number, type: 'number[]' | 'object[]', suffix = '年'): number[] | RecentYearOption[]
+export type GetRecentYearsOptions = {
+  // 开始年份
+  startYear?: number;
+  // 最近几年
+  recentYears?: number;
+  // 截止年份
+  endYear?: number;
+  // 后缀，默认为'年'
+  suffix?: string;
+};
+
+export function getYears(options: GetRecentYearsOptions & { type: 'number[]' }): number[];
+export function getYears(options: GetRecentYearsOptions & { type: 'object[]' }): RecentYearOption[];
+export function getYears(options: GetRecentYearsOptions & { type: 'object[]' | 'number[]' }): number[] | RecentYearOption[]
 ```
 
-获取最近n年
+获取n年，`type`传`number[]`，返回`[2023, 2022, 2021]`数字数组；`type`传`object[]`，返回如下的对象数组
 
-```ts
-import { date } from '@d-matrix/utils';
-
-getRecentYears(5, 'number[]'); // [2024, 2023, 2022, 2021, 2020]
-getRecentYears(5, 'object[]');
-// [
-//   { value: 2024, label: '2024年' },
-//   { value: 2023, label: '2023年' },
-//   { value: 2022, label: '2022年' },
-//   { value: 2021, label: '2021年' },
-//   { value: 2020, label: '2020年' },
-// ]
+```sh
+[
+  { value: 2023, label: '2023年' },
+  { value: 2022, label: '2022年' },
+  { value: 2021, label: '2021年' },
+]
 ```
 
+更多用法，见[测试用例](./tests/date.cy.ts)
+
 ### types
 
 - `WithOptional<T, K extends keyof T>`
@@ -240,9 +248,13 @@ const filename = file.getFilenameFromContentDispositionHeader(header);
 文件下载，`source`是文件地址或`blob`对象。
 
 ```ts
-type HyperLinkTarget = "_self" | "_black" | "_parent" | "_top"
+type HyperLinkTarget = "_self" | "_blank" | "_parent" | "_top"
 ```
 
+- `downloadFileByIframe(source: string): boolean`
+
+通过创建`iframe`进行文件下载
+
 ## support
 
 - `isBrowserEnv(): boolean`
@@ -268,6 +280,25 @@ await sleep(3000); // 暂停3秒
 console.log('continue'); // 继续执行
 ```
 
+## operator
+
+- `trueTypeOf = (obj: unknown): string`
+
+检查数据类型
+
+```ts
+trueTypeOf([]); // array
+trueTypeOf({}); // object
+trueTypeOf(''); // string
+trueTypeOf(new Date()); // date
+trueTypeOf(1); // number
+trueTypeOf(function () {}); // function
+trueTypeOf(/test/i); // regexp
+trueTypeOf(true); // boolean
+trueTypeOf(null); // null
+trueTypeOf(undefined); // undefined
+```
+
 ## 测试
 
 运行全部组件测试