@indfnd/utils 0.1.8 → 0.1.10

package/package.json

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

package/src/utils/cache/permission-cache.ts

@@ -1,6 +1,6 @@
 import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/storage'
 
-const PERMISSION_KEY = 'ibp-permission'
+const PERMISSION_KEY = 'ibp-sc-permission'
 
 export function getPermissionCache() {
   return getSessionStorage(PERMISSION_KEY)

package/src/utils/enum.ts

@@ -101,6 +101,10 @@ export function renderColumnEnums(columns = [], enumRelation = {}) {
         column.cellRendererParams.datas = enums
       }
     }
+
+    if (column.children && column.children.length) {
+      column.children = renderColumnEnums(column.children, enumRelation)
+    }
   })
   return rlt
 }

package/src/utils/half-year.ts

@@ -1,12 +1,15 @@
 // 获取半年
 export function getHalfYear(date: string) {
-  if (!date || date.length < 6) {
+  if (!date || date.length < 4) {
     return ''
   }
 
   const year = date.substring(0, 4)
   const month = date.substring(4, 6)
   const halfYear = getHalfYearNum(parseInt(month))
+  if (!month) {
+    return `${year}`
+  }
   return `${year}H${halfYear}`
 }
 
@@ -20,21 +23,29 @@ export function getHalfYearNum(month: number | string) {
 }
 
 export function formatHalfYear(halfYear: string) {
-  if (!halfYear || halfYear.length < 6) {
+  if (!halfYear || halfYear.length < 4) {
     return halfYear
   }
 
   const year = halfYear.substring(0, 4)
+  const month = halfYear.substring(4, 6)
+  if (!month) {
+    return `${year}全年`
+  }
   const halfYearNum = parseInt(halfYear.substring(5))
   const halfStr = halfYearNum === 1 ? '上半年' : '下半年'
   return `${year}${halfStr}`
 }
 
 export function getHalfYearBeginMonth(halfYear: string) {
-  if (!halfYear || halfYear.length < 6) {
+  if (!halfYear || halfYear.length < 4) {
     return halfYear
   }
   const year = halfYear.substring(0, 4)
+  const month = halfYear.substring(4, 6)
+  if (!month) {
+    return `${year}01`
+  }
   const halfYearNum = parseInt(halfYear.substring(5))
   const beginMonth = halfYearNum * 6 - 5
   const monthStr = beginMonth < 10 ? `0${beginMonth}` : `${beginMonth}`
@@ -42,10 +53,14 @@ export function getHalfYearBeginMonth(halfYear: string) {
 }
 
 export function getHalfYearEndMonth(halfYear: string) {
-  if (!halfYear || halfYear.length < 6) {
+  if (!halfYear || halfYear.length < 4) {
     return halfYear
   }
   const year = halfYear.substring(0, 4)
+  const month = halfYear.substring(4, 6)
+  if (!month) {
+    return `${year}12`
+  }
   const halfYearNum = parseInt(halfYear.substring(5))
   const endMonth = halfYearNum * 2
   const monthStr = endMonth < 10 ? `0${endMonth}` : `${endMonth}`

package/src/utils/table.ts

@@ -2,7 +2,7 @@
  * @Author: huxuetong
  * @Date: 2023-10-27 15:05:25
  * @Last Modified by: huxuetong
- * @Last Modified time: 2024-03-27 18:18:47
+ * @Last Modified time: 2024-05-06 10:23:47
  */
 
 import _, { head } from 'lodash'
@@ -183,7 +183,7 @@ function renderColumnTree(
   // 非动态列 不是最后一层
   if (children && children.length) {
     // 非动态列的下一层一般都是在一行数据上的，所以拼接key时不加__做不同层级的分割，而是和下一层一起作为属性名
-    const prefix = `${keyPrefix}${key}`
+    const prefix = `${keyPrefix}${key || ''}`
     const columnChildren = children.map((child) => {
       return renderColumnTree(data, child, { ...option, keyPrefix: prefix })
     })
@@ -197,7 +197,7 @@ function renderColumnTree(
   }
   return {
     ...args,
-    [keyPropName]: `${keyPrefix}${key}`,
+    [keyPropName]: `${keyPrefix}${key || ''}`,
     [titlePropName]: title,
     headerTooltip: headerTooltipText,
   }

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

@@ -1 +1 @@
-{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/utils/enum.ts"],"names":[],"mappings":"AAGA,eAAe;AACf,eAAO,MAAM,kBAAkB,YAAY,CAAA;AAC3C,iBAAiB;AACjB,eAAO,MAAM,cAAc;;;CAAyB,CAAA;AACpD,kBAAkB;AAClB,eAAO,MAAM,mBAAmB;;;GAG/B,CAAA;AAGD,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;CAwBnB,CAAA;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,IAAI,QAAK,EAAE,KAAK,SAAM,EAAE,KAAK,SAAM;;;IAEjE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,QAAK,EAAE,KAAK,SAAM,EAAE,KAAK,SAAM,OAEjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,QAAK,EAAE,YAAY,KAAK,SAyBhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,QAAK,EAAE,YAAY,KAAK,SAgBjE"}
+{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/utils/enum.ts"],"names":[],"mappings":"AAGA,eAAe;AACf,eAAO,MAAM,kBAAkB,YAAY,CAAA;AAC3C,iBAAiB;AACjB,eAAO,MAAM,cAAc;;;CAAyB,CAAA;AACpD,kBAAkB;AAClB,eAAO,MAAM,mBAAmB;;;GAG/B,CAAA;AAGD,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;CAwBnB,CAAA;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,IAAI,QAAK,EAAE,KAAK,SAAM,EAAE,KAAK,SAAM;;;IAEjE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,QAAK,EAAE,KAAK,SAAM,EAAE,KAAK,SAAM,OAEjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,QAAK,EAAE,YAAY,KAAK,SA6BhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,QAAK,EAAE,YAAY,KAAK,SAgBjE"}

package/types/utils/half-year.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"half-year.d.ts","sourceRoot":"","sources":["../../src/utils/half-year.ts"],"names":[],"mappings":"AACA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UASvC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,aAOpD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,UAS9C;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,UASrD;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UASnD"}
+{"version":3,"file":"half-year.d.ts","sourceRoot":"","sources":["../../src/utils/half-year.ts"],"names":[],"mappings":"AACA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAYvC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,aAOpD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,UAa9C;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,UAarD;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAanD"}