@indfnd/utils 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indfnd/utils",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "author": "huxuetong",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -27,7 +27,7 @@
     "type-check": "vue-tsc --noEmit -p tsconfig.json --composite false",
     "build-only": "vite build",
     "dts": "rimraf types/ && vue-tsc -p tsconfig.types.json",
-    "release": "node build/auto-build.js && yarn release-minor && git push --follow-tags && yarn re-publish",
+    "release": "node build/auto-build.js && yarn release-patch && git push --follow-tags && yarn re-publish",
     "release-major": "standard-version --release-as major",
     "release-minor": "standard-version --release-as minor",
     "release-patch": "standard-version --release-as patch",

package/src/api/index-desc.ts

@@ -4,11 +4,11 @@ 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 Promise.resolve({
+  //   data: [
+  //     { indexCode: 'comName', indexName: '商业公司', indexDesc: '这个是商业公司的描述' },
+  //     { indexCode: 'comSname', indexName: '商业公司简称', indexDesc: '这个是商业公司简称的描述' },
+  //   ],
+  // })
   return axios.get(`${UC_CONTEXT}/index-desc/list`, { params })
 }

package/src/utils/request/index.ts

@@ -7,7 +7,7 @@ export * from './url-params'
 export * from './content-type'
 export { responseInterceptors }
 
-const instance: AxiosExtendsInstance = axios.create({ timeout: 60 * 1000 })
+const instance: AxiosExtendsInstance = axios.create({ timeout: 5 * 60 * 1000 })
 instance.interceptors.request.use(requestInterceptors, inspectorError)
 instance.interceptors.response.use(responseInterceptors, inspectorError)
 

package/src/utils/table.ts

@@ -2,11 +2,11 @@
  * @Author: huxuetong
  * @Date: 2023-10-27 15:05:25
  * @Last Modified by: huxuetong
- * @Last Modified time: 2024-03-15 17:01:07
+ * @Last Modified time: 2024-03-27 18:18:47
  */
 
-import _ from 'lodash'
-import { isFunction, isNil } from './is-type'
+import _, { head } from 'lodash'
+import { isFunction, isNil, isString } from './is-type'
 
 const GROUP_SEP = '__'
 const VALUE_SEP = '--'
@@ -42,6 +42,12 @@ interface row2columnOption {
   keyPropName?: string
   // 组织后表格列定义title对应属性名称
   titlePropName?: string
+  // 合计列的扁平化定义
+  sumColumnDefs?: Array<{ key: string; title: string; [propName: string]: any }>
+  // 合计列的key
+  sumColKeyProp?: 'sumColCode'
+  // 合计列的title
+  sumColTitleProp?: 'sumColName'
 }
 
 interface Column {
@@ -112,7 +118,8 @@ function renderColumnTree(
 
   // 动态列
   if (keyProp) {
-    let columnUniqData = _.uniqBy(data, columnGroup.keyProp) || []
+    let columnUniqData =
+      _.uniqBy(data, columnGroup.keyProp)?.filter((item) => !isNil(item[columnGroup.keyProp])) || []
     if (sortProp) {
       const unSortData = columnUniqData.filter((item) => isNil(item[sortProp]))
       const sortData = columnUniqData.filter((item) => !isNil(item[sortProp]))
@@ -230,6 +237,49 @@ function renderRowData(data: Array<any>, keys: string[]) {
   return value
 }
 
+function getRowKeyValue(item: any, rowKey: string | string[]): string {
+  if (!item) return ''
+  if (isString(rowKey)) return item[rowKey] || ''
+  for (const key of rowKey) {
+    if (item[key]) {
+      return item[key]
+    }
+  }
+  return ''
+}
+
+function renderSumColumn(keys, titles, idx, columns, def) {
+  if (idx >= keys.length) return
+
+  const key = keys[idx]
+  let header = _.find(columns, { key })
+  if (!header) {
+    header = { key, title: titles[idx], children: [] }
+    columns.push(header)
+
+    if (idx === keys.length - 1) {
+      Object.assign(header, def, { title: titles[idx] })
+      return
+    }
+  }
+
+  renderSumColumn(keys, titles, idx + 1, header.children, def)
+}
+
+function renderSumColumns({ sumColumnDefs }: row2columnOption): Column[] {
+  const columns = []
+
+  for (const def of sumColumnDefs) {
+    const { key, title } = def
+    const keys = key.split(GROUP_SEP)
+    const titles = title.split(GROUP_SEP)
+
+    renderSumColumn(keys, titles, 0, columns, def)
+  }
+
+  return columns
+}
+
 /**
  * 行转列公共方法
  * ! 目前是根据非动态列下全是非动态列的分组来组织的，若动态列和非动态列相互穿插分组，那就糟糕了
@@ -243,22 +293,42 @@ function renderRowData(data: Array<any>, keys: string[]) {
 export function row2column(
   data: Array<any> = [],
   columnGroups: ColumnGroup[] = [],
-  rowKey: string,
+  rowKey: string | string[],
   option: row2columnOption = {},
 ): row2columnResult {
   // 组织表头
-  const columns = _.flatten<Column>(
-    columnGroups.map((group) => renderColumnTree(data, group, option)),
-  )
+  const columns = []
+  if (option.sumColumnDefs && option.sumColumnDefs.length) {
+    columns.push(...renderSumColumns(option))
+  }
+  const groupColumns =
+    _.flatten<Column>(columnGroups.map((group) => renderColumnTree(data, group, option))) || []
+  columns.push(...groupColumns)
   const leafColumns = getLeafColumns(columns)
 
   // 组织数据
-  const rowKeyUniqData = _.uniqBy(data, rowKey)
-  const groupData = _.groupBy(data, rowKey)
+  const rowKeyUniqData =
+    _.uniqBy(data, (item) => getRowKeyValue(item, rowKey))?.filter(
+      (item) => !isNil(getRowKeyValue(item, rowKey)),
+    ) || []
+  const groupData = _.groupBy(data, (item) => getRowKeyValue(item, rowKey))
   const rltData = rowKeyUniqData.map((item) => {
-    const rowGroupData = groupData[item[rowKey]] || []
+    const rowKeyValue = getRowKeyValue(item, rowKey)
+    const rowGroupData = groupData[rowKeyValue] || []
     const newItem = { ...item }
 
+    if (option.sumColumnDefs && option.sumColumnDefs.length) {
+      option.sumColumnDefs.forEach((def) => {
+        const { key } = def
+        const keys = key.split(GROUP_SEP) || []
+        const code = keys?.[0] || ''
+        const indexCol = keys?.[keys.length - 1] || ''
+        const { sumColKeyProp = 'sumColCode' } = option
+        const itemData = _.find(rowGroupData, { [sumColKeyProp]: code }) || {}
+        newItem[key] = itemData[indexCol]
+      })
+    }
+
     leafColumns.forEach((column) => {
       const columnKey: string = column[option.keyPropName || 'key'] || ''
       const keys = columnKey.split(GROUP_SEP) || []

package/src/utils/validate.ts

@@ -135,7 +135,7 @@ export function checkTel(val) {
 export function checkVehicleNo(str: string): boolean {
   // 新能源车
   const newReg =
-    /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z]-(([DF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))$/
+    /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z](-)?(([DF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))$/
 
   if (newReg.test(str)) {
     return true
@@ -143,7 +143,7 @@ export function checkVehicleNo(str: string): boolean {
 
   // 非新能源车
   const reg =
-    /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z]-[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]$/
+    /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z](-)?[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]$/
 
   return reg.test(str)
 }

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/request/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAC3D,OAAO,EAAuB,oBAAoB,EAAkB,MAAM,gBAAgB,CAAA;AAG1F,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAE/B,QAAA,MAAM,QAAQ,EAAE,oBAA2D,CAAA;AAU3E,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/request/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAC3D,OAAO,EAAuB,oBAAoB,EAAkB,MAAM,gBAAgB,CAAA;AAG1F,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAE/B,QAAA,MAAM,QAAQ,EAAE,oBAA+D,CAAA;AAU/E,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,CAAA"}

package/types/utils/table.d.ts

@@ -15,6 +15,13 @@ interface ColumnGroup {
 interface row2columnOption {
   keyPropName?: string
   titlePropName?: string
+  sumColumnDefs?: Array<{
+    key: string
+    title: string
+    [propName: string]: any
+  }>
+  sumColKeyProp?: 'sumColCode'
+  sumColTitleProp?: 'sumColName'
 }
 interface Column {
   key?: string
@@ -39,7 +46,7 @@ interface row2columnResult {
 export declare function row2column(
   data: Array<any>,
   columnGroups: ColumnGroup[],
-  rowKey: string,
+  rowKey: string | string[],
   option?: row2columnOption,
 ): row2columnResult
 /**

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;IAEtB,eAAe,CAAC,EAAE,OAAO,CAAA;IAGzB,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,CAAA;IAG/E,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;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;AAgLD;;;;;;;;;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,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,CAAA;IAG/E,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,aAAa,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC,CAAA;IAE9E,aAAa,CAAC,EAAE,YAAY,CAAA;IAE5B,eAAe,CAAC,EAAE,YAAY,CAAA;CAC/B;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;AA4ND;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAM,EACrB,YAAY,EAAE,WAAW,EAAO,EAChC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EACzB,MAAM,GAAE,gBAAqB,GAC5B,gBAAgB,CA8ClB;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"}