@indfnd/utils 0.0.36 → 0.0.38

package/package.json

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

package/src/api/index-desc.ts

@@ -0,0 +1,14 @@
+import { axios } from '@/utils'
+import { config } from '@/config'
+
+const UC_CONTEXT = config.ucExtServerContext
+
+export function listIndexDescApi(params) {
+  return Promise.resolve({
+    data: [
+      { indexCode: 'comName', indexName: '商业公司', indexDesc: '这个是商业公司的描述' },
+      { indexCode: 'comSname', indexName: '商业公司简称', indexDesc: '这个是商业公司简称的描述' },
+    ],
+  })
+  return axios.get(`${UC_CONTEXT}/index-desc/list`, { params })
+}

package/src/api/index.ts

@@ -1,5 +1,6 @@
 export * from './platform'
 
 export * from './com'
+export * from './index-desc'
 export * from './item'
 export * from './user'

package/src/utils/cache/index-desc.ts

@@ -0,0 +1,15 @@
+import { getLocalStorage, removeLocalStorage, setLocalStorage } from '@/utils/storage'
+
+const INDEX_DESC_KEY = 'indexDesc'
+
+export function getIndexDescCache() {
+  return getLocalStorage(INDEX_DESC_KEY)
+}
+
+export function setIndexDescCache(data: any) {
+  setLocalStorage(INDEX_DESC_KEY, data)
+}
+
+export function clearIndexDescCache() {
+  removeLocalStorage(INDEX_DESC_KEY)
+}

package/src/utils/cache/index.ts

@@ -1,3 +1,4 @@
 // export * from './dict-cache'
+export * from './index-desc'
 export * from './permission-cache'
 export * from './user-cache'

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-01 16:43:10
+ * @Last Modified time: 2024-03-02 11:27:58
  */
 
 import _ from 'lodash'
@@ -26,6 +26,8 @@ interface ColumnGroup {
   sortOrder?: boolean | 'asc' | 'desc'
   // 当动态列为最后一层只有一个指标，又不想再展示一行指标时，指标对应的属性key
   keyLastSuffix?: string
+  // 是否限制下层表头的数据要基于本层，如省份下的地市只有该省的
+  isLimitChildren?: boolean
 
   // 每层分组表头下继续分组
   children?: ColumnGroup[]
@@ -65,9 +67,10 @@ function renderColumnTree(
     title,
     titleProp,
     titleFormatter,
-    sortProp = keyProp,
+    sortProp,
     sortOrder = 'asc',
     keyLastSuffix,
+    isLimitChildren,
     children,
     ...args
   } = columnGroup
@@ -75,12 +78,14 @@ function renderColumnTree(
 
   // 动态列
   if (keyProp) {
-    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)
+    let columnUniqData = _.uniqBy(data, columnGroup.keyProp) || []
+    if (sortProp) {
+      const unSortData = columnUniqData.filter((item) => isNil(item[sortProp]))
+      const sortData = columnUniqData.filter((item) => !isNil(item[sortProp]))
+      columnUniqData = _.orderBy(sortData, [sortProp], [sortOrder]).concat(unSortData)
+    }
 
-    return sortedData.map((item) => {
+    return columnUniqData.map((item) => {
       const columnTitle = titleFormatter ? titleFormatter(item[titleProp]) : item[titleProp]
 
       // 不是最后一层，继续组织tree
@@ -88,7 +93,10 @@ function renderColumnTree(
         // 前缀加__ 和下一层做分割
         const prefix = `${keyPrefix}${keyProp}${VALUE_SEP}${item[keyProp]}${GROUP_SEP}`
         const columnChildren = children.map((child) => {
-          return renderColumnTree(data, child, { ...option, keyPrefix: prefix })
+          let nextData = isLimitChildren
+            ? data.filter((temp) => temp[keyProp] === item[keyProp])
+            : data
+          return renderColumnTree(nextData, child, { ...option, keyPrefix: prefix })
         })
 
         return {

package/types/api/index-desc.d.ts

@@ -0,0 +1,10 @@
+export declare function listIndexDescApi(params: any):
+  | Promise<import('axios').AxiosResponse<any>>
+  | Promise<{
+      data: {
+        indexCode: string
+        indexName: string
+        indexDesc: string
+      }[]
+    }>
+//# sourceMappingURL=index-desc.d.ts.map

package/types/api/index-desc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-desc.d.ts","sourceRoot":"","sources":["../../src/api/index-desc.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,CAAC,MAAM,KAAA;;;;;;GAQtC"}

package/types/api/index.d.ts

@@ -1,5 +1,6 @@
 export * from './platform'
 export * from './com'
+export * from './index-desc'
 export * from './item'
 export * from './user'
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAE1B,cAAc,OAAO,CAAA;AACrB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAE1B,cAAc,OAAO,CAAA;AACrB,cAAc,cAAc,CAAA;AAC5B,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA"}

package/types/utils/cache/index-desc.d.ts

@@ -0,0 +1,4 @@
+export declare function getIndexDescCache(): any
+export declare function setIndexDescCache(data: any): void
+export declare function clearIndexDescCache(): void
+//# sourceMappingURL=index-desc.d.ts.map

package/types/utils/cache/index-desc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-desc.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/index-desc.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,QAEhC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,QAE1C;AAED,wBAAgB,mBAAmB,SAElC"}

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

@@ -1,3 +1,4 @@
+export * from './index-desc'
 export * from './permission-cache'
 export * from './user-cache'
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/index.ts"],"names":[],"mappings":"AACA,cAAc,oBAAoB,CAAA;AAClC,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA;AAC5B,cAAc,oBAAoB,CAAA;AAClC,cAAc,cAAc,CAAA"}

package/types/utils/table.d.ts

@@ -7,6 +7,7 @@ interface ColumnGroup {
   sortProp?: string
   sortOrder?: boolean | 'asc' | 'desc'
   keyLastSuffix?: string
+  isLimitChildren?: boolean
   children?: ColumnGroup[]
   [propName: string]: any
 }

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

@@ -1 +1 @@
-{"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"}
+{"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;IAEtB,eAAe,CAAC,EAAE,OAAO,CAAA;IAGzB,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;AA8GD;;;;;;;;;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"}