@indfnd/utils 0.0.34 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indfnd/utils",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "author": "huxuetong",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/api/platform/oss.ts

@@ -1,8 +1,58 @@
-import { axios } from '@/utils'
+import { CONTENT_TYPE, axios } from '@/utils'
 import { config } from '@/config'
+import { AxiosRequestConfig, ResponseType } from 'axios'
 
 const CONTEXT = config.ossServerContext
 
-export function getOssFileApi(fileId: string) {
-  return axios.get(`${CONTEXT}/oss/file/get/${fileId}`)
+/**
+ * 文档中心下载文件的url，主要用于图片等直接写在 href 里
+ *
+ * @param fileId 文件Id
+ * @returns url
+ */
+export function getOssFileUrl(fileId = '') {
+  return `${CONTEXT}/oss/file/get/${fileId}`
+}
+
+/**
+ * 文档中心上传文件的url
+ *
+ * @returns url
+ */
+export function putOssFileUrl() {
+  return `${CONTEXT}/oss/file/put`
+}
+
+/**
+ * 获取文档中心文件
+ *
+ * @param fileId 文件Id
+ * @param responseType 数据类型，支持 arraybuffer | blob | document | json | text | stream
+ * @returns 文件内容
+ */
+export function getOssFileApi(fileId: string, responseType?: ResponseType) {
+  const config = {} as AxiosRequestConfig
+  if (responseType) {
+    config.responseType = responseType
+  }
+  return axios.get(getOssFileUrl(fileId), config)
+}
+
+/**
+ * 将文件上传到文档中心
+ *
+ * @param filename 文件名
+ * @param blob 文件的Blob数据
+ * @returns 文件Id
+ */
+export function putOssFileApi(filename: string, blob: Blob) {
+  let formData = new FormData()
+  formData.append('file', blob, filename)
+
+  return axios({
+    method: 'post',
+    url: putOssFileUrl(),
+    headers: { 'Content-Type': CONTENT_TYPE.multiForm },
+    data: formData,
+  })
 }

package/src/utils/blob.ts

@@ -0,0 +1,27 @@
+/**
+ * 将base64转换为Blob
+ *
+ * @param base64Data base64数据
+ * @param contentType 数据的MIME Type，如 png 为 image/png
+ * @returns Blob数据
+ */
+export function base64ToBlob(base64Data: string, contentType: string): Blob {
+  contentType = contentType || ''
+  const sliceSize = 1024
+  const byteCharacters = atob(base64Data)
+  const bytesLength = byteCharacters.length
+  const slicesCount = Math.ceil(bytesLength / sliceSize)
+  const byteArrays = new Array(slicesCount)
+
+  for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+    const begin = sliceIndex * sliceSize
+    const end = Math.min(begin + sliceSize, bytesLength)
+
+    const bytes = new Array(end - begin)
+    for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+      bytes[i] = byteCharacters[offset].charCodeAt(0)
+    }
+    byteArrays[sliceIndex] = new Uint8Array(bytes)
+  }
+  return new Blob(byteArrays, { type: contentType })
+}

package/src/utils/event.ts

@@ -35,7 +35,7 @@ function offFn() {
 }
 
 /**
- * @description 绑定事件 on(element, event, handler)
+ * 绑定事件 on(element, event, handler)
  */
 export function on(element, event, handler) {
   const fn = onFn()
@@ -44,10 +44,29 @@ export function on(element, event, handler) {
 }
 
 /**
- * @description 解绑事件 off(element, event, handler)
+ * 解绑事件 off(element, event, handler)
  */
 export function off(element, event, handler) {
   const fn = offFn()
   fn(element, event, handler)
   return fn
 }
+
+export const stopPropagation = (event: Event) => event.stopPropagation()
+
+/**
+ * 事件 preventDefault
+ *
+ * @param event 事件
+ * @param isStopPropagation 是否阻止冒泡
+ */
+export function preventDefault(event: Event, isStopPropagation?: Boolean) {
+  /* istanbul ignore else */
+  if (typeof event.cancelable !== 'boolean' || event.cancelable) {
+    event.preventDefault()
+  }
+
+  if (isStopPropagation) {
+    stopPropagation(event)
+  }
+}

package/src/utils/index.ts

@@ -2,6 +2,7 @@ export * from './cache'
 export * from './request'
 export * from './sm3'
 
+export * from './blob'
 export * from './date'
 export * from './enum'
 export * from './excel'

package/src/utils/request/content-type.ts

@@ -10,7 +10,7 @@ export function setContentType(headers: any, type: string) {
 
 export const CONTENT_TYPE = {
   form: 'application/x-www-form-urlencoded',
-  'multi-form': 'multipart/form-data',
+  multiForm: 'multipart/form-data',
   body: 'application/json',
   os: 'application/octet-stream',
 }

package/src/utils/request/interceptors.ts

@@ -98,8 +98,7 @@ export function inspectorError(error) {
   if (error?.code === 'ECONNABORTED') {
     // 超时
     window.apiErrorHandler && window.apiErrorHandler('请求超时，请稍后再试')
-  }
-  if (error.response.status !== 200) {
+  } else if (error?.response?.status !== 200) {
     window.apiErrorHandler && window.apiErrorHandler('请求出错了')
   }
   return Promise.reject(error)

package/src/utils/table.ts

@@ -2,10 +2,11 @@
  * @Author: huxuetong
  * @Date: 2023-10-27 15:05:25
  * @Last Modified by: huxuetong
- * @Last Modified time: 2024-02-21 17:34:35
+ * @Last Modified time: 2024-03-01 16:43:10
  */
 
 import _ from 'lodash'
+import { isNil } from './is-type'
 
 const GROUP_SEP = '__'
 const VALUE_SEP = '--'
@@ -19,6 +20,12 @@ interface ColumnGroup {
   keyProp?: string
   titleProp?: string
   titleFormatter?: (title: string) => string
+  // 动态列的列顺序key
+  sortProp?: string
+  // 动态列的列顺序 asc | desc，默认asc
+  sortOrder?: boolean | 'asc' | 'desc'
+  // 当动态列为最后一层只有一个指标，又不想再展示一行指标时，指标对应的属性key
+  keyLastSuffix?: string
 
   // 每层分组表头下继续分组
   children?: ColumnGroup[]
@@ -32,8 +39,6 @@ interface row2columnOption {
   titlePropName?: string
   // 组织列定义 key 的前缀
   keyPrefix?: string
-  // 组织列定义 key 的后缀
-  keyLastSuffix?: string
 }
 
 interface Column {
@@ -54,18 +59,28 @@ function renderColumnTree(
   columnGroup: ColumnGroup,
   option: row2columnOption = {},
 ): Column | Column[] {
-  const { key, keyProp, title, titleProp, titleFormatter, children, ...args } = columnGroup
   const {
-    keyPropName = 'key',
-    titlePropName = 'title',
-    keyPrefix = '',
-    keyLastSuffix = '',
-  } = option
+    key,
+    keyProp,
+    title,
+    titleProp,
+    titleFormatter,
+    sortProp = keyProp,
+    sortOrder = 'asc',
+    keyLastSuffix,
+    children,
+    ...args
+  } = columnGroup
+  const { keyPropName = 'key', titlePropName = 'title', keyPrefix = '' } = option
 
   // 动态列
   if (keyProp) {
-    const columnGroupData = _.uniqBy(data, columnGroup.keyProp)
-    return columnGroupData.map((item) => {
+    let columnGroupData = _.uniqBy(data, columnGroup.keyProp) || []
+    const unSortData = columnGroupData.filter((item) => isNil(item[sortProp]))
+    const sortData = columnGroupData.filter((item) => !isNil(item[sortProp]))
+    const sortedData = _.orderBy(sortData, [sortProp], [sortOrder]).concat(unSortData)
+
+    return sortedData.map((item) => {
       const columnTitle = titleFormatter ? titleFormatter(item[titleProp]) : item[titleProp]
 
       // 不是最后一层，继续组织tree

package/types/api/platform/oss.d.ts

@@ -1,2 +1,37 @@
-export declare function getOssFileApi(fileId: string): Promise<import('axios').AxiosResponse<any>>
+import { ResponseType } from 'axios'
+/**
+ * 文档中心下载文件的url，主要用于图片等直接写在 href 里
+ *
+ * @param fileId 文件Id
+ * @returns url
+ */
+export declare function getOssFileUrl(fileId?: string): string
+/**
+ * 文档中心上传文件的url
+ *
+ * @returns url
+ */
+export declare function putOssFileUrl(): string
+/**
+ * 获取文档中心文件
+ *
+ * @param fileId 文件Id
+ * @param responseType 数据类型，支持 arraybuffer | blob | document | json | text | stream
+ * @returns 文件内容
+ */
+export declare function getOssFileApi(
+  fileId: string,
+  responseType?: ResponseType,
+): Promise<import('axios').AxiosResponse<any>>
+/**
+ * 将文件上传到文档中心
+ *
+ * @param filename 文件名
+ * @param blob 文件的Blob数据
+ * @returns 文件Id
+ */
+export declare function putOssFileApi(
+  filename: string,
+  blob: Blob,
+): import('axios').AxiosPromise<any>
 //# sourceMappingURL=oss.d.ts.map

package/types/api/platform/oss.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oss.d.ts","sourceRoot":"","sources":["../../../src/api/platform/oss.ts"],"names":[],"mappings":"AAKA,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,+CAE3C"}
+{"version":3,"file":"oss.d.ts","sourceRoot":"","sources":["../../../src/api/platform/oss.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,YAAY,EAAE,MAAM,OAAO,CAAA;AAIxD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,SAAK,UAExC;AAED;;;;GAIG;AACH,wBAAgB,aAAa,WAE5B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY,+CAMxE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,qCAUzD"}

package/types/utils/blob.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 将base64转换为Blob
+ *
+ * @param base64Data base64数据
+ * @param contentType 数据的MIME Type，如 png 为 image/png
+ * @returns Blob数据
+ */
+export declare function base64ToBlob(base64Data: string, contentType: string): Blob
+//# sourceMappingURL=blob.d.ts.map

package/types/utils/blob.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blob.d.ts","sourceRoot":"","sources":["../../src/utils/blob.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAmB1E"}

package/types/utils/event.d.ts

@@ -1,5 +1,5 @@
 /**
- * @description 绑定事件 on(element, event, handler)
+ * 绑定事件 on(element, event, handler)
  */
 export declare function on(
   element: any,
@@ -7,11 +7,19 @@ export declare function on(
   handler: any,
 ): (element: any, event: any, handler: any) => void
 /**
- * @description 解绑事件 off(element, event, handler)
+ * 解绑事件 off(element, event, handler)
  */
 export declare function off(
   element: any,
   event: any,
   handler: any,
 ): (element: HTMLElement, event: string, handler: EventListenerOrEventListenerObject) => void
+export declare const stopPropagation: (event: Event) => void
+/**
+ * 事件 preventDefault
+ *
+ * @param event 事件
+ * @param isStopPropagation 是否阻止冒泡
+ */
+export declare function preventDefault(event: Event, isStopPropagation?: Boolean): void
 //# sourceMappingURL=event.d.ts.map

package/types/utils/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/utils/event.ts"],"names":[],"mappings":"AAoCA;;GAEG;AACH,wBAAgB,EAAE,CAAC,OAAO,KAAA,EAAE,KAAK,KAAA,EAAE,OAAO,KAAA,oDAIzC;AAED;;GAEG;AACH,wBAAgB,GAAG,CAAC,OAAO,KAAA,EAAE,KAAK,KAAA,EAAE,OAAO,KAAA,8FAI1C"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/utils/event.ts"],"names":[],"mappings":"AAoCA;;GAEG;AACH,wBAAgB,EAAE,CAAC,OAAO,KAAA,EAAE,KAAK,KAAA,EAAE,OAAO,KAAA,oDAIzC;AAED;;GAEG;AACH,wBAAgB,GAAG,CAAC,OAAO,KAAA,EAAE,KAAK,KAAA,EAAE,OAAO,KAAA,8FAI1C;AAED,eAAO,MAAM,eAAe,UAAW,KAAK,SAA4B,CAAA;AAExE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,iBAAiB,CAAC,EAAE,OAAO,QASvE"}

package/types/utils/index.d.ts

@@ -1,6 +1,7 @@
 export * from './cache'
 export * from './request'
 export * from './sm3'
+export * from './blob'
 export * from './date'
 export * from './enum'
 export * from './excel'

package/types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AAErB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AAErB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,YAAY,CAAA"}

package/types/utils/request/content-type.d.ts

@@ -2,7 +2,7 @@ export declare function getContentType(config: any): any
 export declare function setContentType(headers: any, type: string): void
 export declare const CONTENT_TYPE: {
   form: string
-  'multi-form': string
+  multiForm: string
   body: string
   os: string
 }

package/types/utils/request/interceptors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interceptors.d.ts","sourceRoot":"","sources":["../../../src/utils/request/interceptors.ts"],"names":[],"mappings":"AAuBA,wBAAgB,mBAAmB,CAAC,MAAM,KAAA,OAwCzC;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,KAAA,OA6B5C;AAED,wBAAgB,cAAc,CAAC,KAAK,KAAA,kBASnC"}
+{"version":3,"file":"interceptors.d.ts","sourceRoot":"","sources":["../../../src/utils/request/interceptors.ts"],"names":[],"mappings":"AAuBA,wBAAgB,mBAAmB,CAAC,MAAM,KAAA,OAwCzC;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,KAAA,OA6B5C;AAED,wBAAgB,cAAc,CAAC,KAAK,KAAA,kBAQnC"}

package/types/utils/table.d.ts

@@ -4,6 +4,9 @@ interface ColumnGroup {
   keyProp?: string
   titleProp?: string
   titleFormatter?: (title: string) => string
+  sortProp?: string
+  sortOrder?: boolean | 'asc' | 'desc'
+  keyLastSuffix?: string
   children?: ColumnGroup[]
   [propName: string]: any
 }
@@ -11,7 +14,6 @@ interface row2columnOption {
   keyPropName?: string
   titlePropName?: string
   keyPrefix?: string
-  keyLastSuffix?: string
 }
 interface Column {
   key?: string

package/types/utils/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/utils/table.ts"],"names":[],"mappings":"AAYA,UAAU,WAAW;IAEnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IAGd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAG1C,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAA;IACxB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;CACxB;AAED,UAAU,gBAAgB;IAExB,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,UAAU,MAAM;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;CACxB;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CACjB;AA8FD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAM,EACrB,YAAY,EAAE,WAAW,EAAO,EAChC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,gBAAqB,GAC5B,gBAAgB,CA0BlB;AAkDD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,GAAE,KAAK,CAAC,GAAG,CAAM,EACrB,OAAO,GAAE,MAAM,EAAO,EACtB,MAAM,GAAE,gBAAqB,GAC5B,KAAK,CAAC,GAAG,CAAC,CAMZ"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/utils/table.ts"],"names":[],"mappings":"AAaA,UAAU,WAAW;IAEnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IAGd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAE1C,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB,SAAS,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;IAEpC,aAAa,CAAC,EAAE,MAAM,CAAA;IAGtB,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAA;IACxB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;CACxB;AAED,UAAU,gBAAgB;IAExB,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,UAAU,MAAM;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;CACxB;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CACjB;AAwGD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAM,EACrB,YAAY,EAAE,WAAW,EAAO,EAChC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,gBAAqB,GAC5B,gBAAgB,CA0BlB;AAkDD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,GAAE,KAAK,CAAC,GAAG,CAAM,EACrB,OAAO,GAAE,MAAM,EAAO,EACtB,MAAM,GAAE,gBAAqB,GAC5B,KAAK,CAAC,GAAG,CAAC,CAMZ"}