@indfnd/utils 0.0.38 → 0.0.39

package/package.json

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

package/src/api/item.ts

@@ -6,15 +6,9 @@ const CONTEXT = config.ismAmServerContext
 export function listItemTreeApi(params) {
   return axios.get(`${CONTEXT}/tree/item/listItemTree`, { params })
 }
-
-export function getPriceCode(params) {
-  return axios.get(`${CONTEXT}/tree/item/listComTree`, { params })
-}
-
-export function getPriceSeg(params) {
-  return axios.get(`${CONTEXT}/tree/item/listComTree`, { params })
+export function getPriceInfo() {
+  return axios.get(`${CONTEXT}/basic/getPriceInfo`, {});
 }
-
 export function getItem(params) {
-  return axios.get(`${CONTEXT}/tree/item/listComTree`, { params })
+  return axios.get(`${CONTEXT}/basic/getItem`, { params });
 }

package/src/api/platform/user.ts

@@ -1,11 +1,14 @@
-import { axios } from '@/utils'
+import { axios, Base64ForLogin } from '@/utils'
 import { config } from '@/config'
 
 const CONTEXT = config.authServerContext
 
 export function loginApi({ userName, password, validCodeId, validCodeInput }) {
-  const data = { username: userName, password, validCodeId, validCodeInput }
-  return axios.formPost(CONTEXT + '/sso/login', data)
+  let upw = encodeURIComponent(password)
+  upw = Base64ForLogin.encode(upw)
+
+  const data = { usn: userName, upw, validCodeId, validCodeInput }
+  return axios.formPost(CONTEXT + '/sso/auth/login', data)
 }
 
 export function getUserInfoApi() {

package/src/utils/base64.ts

@@ -0,0 +1,124 @@
+// copy from @lambo-design/shared
+let Base64ForLogin = {
+  Base64Chars: 'abcdefghijklmnopqrstuv' + 'wxyzABCDEFGHIJKLMNOP' + 'QRSTUVWXYZ0123456789@*-',
+  /**
+   * Encode a string to a Base64 string follow Bse64 regular.
+   * @param s, a normal string
+   * @return a Base64 string
+   */
+  encode: function (s) {
+    if (!s || s.length == 0) return s
+
+    var d = ''
+    var b = this.ucs2_utf8(s)
+    var b0, b1, b2, b3
+    var len = b.length
+    var i = 0
+    while (i < len) {
+      var tmp = b[i++]
+      b0 = (tmp & 0xfc) >> 2
+      b1 = (tmp & 0x03) << 4
+      if (i < len) {
+        tmp = b[i++]
+        b1 |= (tmp & 0xf0) >> 4
+        b2 = (tmp & 0x0f) << 2
+        if (i < len) {
+          tmp = b[i++]
+          b2 |= (tmp & 0xc0) >> 6
+          b3 = tmp & 0x3f
+        } else {
+          b3 = 64 // 1 byte "-" is supplement
+        }
+      } else {
+        b2 = b3 = 64 // 2 bytes "-" are supplement
+      }
+
+      d += this.Base64Chars.charAt(b0)
+      d += this.Base64Chars.charAt(b1)
+      d += this.Base64Chars.charAt(b2)
+      d += this.Base64Chars.charAt(b3)
+    }
+
+    return d
+  },
+
+  /**
+   * Encodes a ucs2 string to a utf8 integer array.
+   * @param s, a string
+   * @return an integer array
+   */
+  ucs2_utf8: function (s) {
+    if (!s) return null
+    var d = new Array()
+    if (s == '') return d
+
+    var c = 0,
+      i = 0,
+      j = 0
+    var len = s.length
+    while (i < len) {
+      c = s.charCodeAt(i++)
+      if (c <= 0x7f) {
+        // 1 byte
+
+        d[j++] = c
+      } else if (c >= 0x80 && c <= 0x7ff) {
+        // 2 bytes
+
+        d[j++] = ((c >> 6) & 0x1f) | 0xc0
+        d[j++] = (c & 0x3f) | 0x80
+      } else {
+        // 3 bytes
+
+        d[j++] = (c >> 12) | 0xe0
+        d[j++] = ((c >> 6) & 0x3f) | 0x80
+        d[j++] = (c & 0x3f) | 0x80
+      }
+    }
+
+    return d
+  },
+  /**
+   * Encodes a utf8 integer array to a ucs2 string.
+   * @param s, an integer array
+   * @return a string
+   */
+  utf8_ucs2: function (s) {
+    if (!s) return null
+    var len = s.length
+    if (len == 0) return ''
+
+    var d = ''
+    var c = 0,
+      i = 0,
+      tmp = 0
+    while (i < len) {
+      c = s[i++]
+      if ((c & 0xe0) == 0xe0) {
+        // 3 bytes
+
+        tmp = (c & 0x0f) << 12
+        c = s[i++]
+        tmp |= (c & 0x3f) << 6
+        c = s[i++]
+        tmp |= c & 0x3f
+      } else if ((c & 0xc0) == 0xc0) {
+        // 2 bytes
+
+        tmp = (c & 0x1f) << 6
+        c = s[i++]
+        tmp |= c & 0x3f
+      } else {
+        // 1 byte
+
+        tmp = c
+      }
+
+      d += String.fromCharCode(tmp)
+    }
+
+    return d
+  },
+}
+
+export { Base64ForLogin }

package/src/utils/index.ts

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

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-02 11:27:58
+ * @Last Modified time: 2024-03-05 09:02:45
  */
 
 import _ from 'lodash'
-import { isNil } from './is-type'
+import { isFunction, isNil } from './is-type'
 
 const GROUP_SEP = '__'
 const VALUE_SEP = '--'
@@ -29,6 +29,9 @@ interface ColumnGroup {
   // 是否限制下层表头的数据要基于本层，如省份下的地市只有该省的
   isLimitChildren?: boolean
 
+  // 表头的鼠标悬浮提示，为true时展示表头文字，支持使用函数自定义提示内容
+  headerTooltip?: boolean | string | ((data: any, parents: Array<any>) => string)
+
   // 每层分组表头下继续分组
   children?: ColumnGroup[]
   [propName: string]: any
@@ -39,8 +42,6 @@ interface row2columnOption {
   keyPropName?: string
   // 组织后表格列定义title对应属性名称
   titlePropName?: string
-  // 组织列定义 key 的前缀
-  keyPrefix?: string
 }
 
 interface Column {
@@ -55,11 +56,43 @@ interface row2columnResult {
   data: Array<any>
 }
 
+// 组织表头树形时的一些配置，会递归更改的
+interface renderColumnTreeOption extends row2columnOption {
+  // 组织列定义 key 的前缀
+  keyPrefix?: string
+  // 上层表头的数据们
+  parents?: Array<any>
+}
+
+function renderHeaderTooltip({
+  tooltip,
+  item,
+  parents,
+  title,
+}: {
+  tooltip: boolean | string | ((data: any, parents: Array<any>) => string)
+  item: any
+  parents: Array<any>
+  title: string
+}): string | null {
+  let text = null
+  if (tooltip) {
+    if (isFunction(tooltip)) {
+      text = tooltip(item, parents)
+    } else if (tooltip === true) {
+      text = title
+    } else {
+      text = tooltip
+    }
+  }
+  return text
+}
+
 // 根据各层分组定义组织出表头
 function renderColumnTree(
   data: Array<any>,
   columnGroup: ColumnGroup,
-  option: row2columnOption = {},
+  option: renderColumnTreeOption = {},
 ): Column | Column[] {
   const {
     key,
@@ -71,10 +104,11 @@ function renderColumnTree(
     sortOrder = 'asc',
     keyLastSuffix,
     isLimitChildren,
+    headerTooltip,
     children,
     ...args
   } = columnGroup
-  const { keyPropName = 'key', titlePropName = 'title', keyPrefix = '' } = option
+  const { keyPropName = 'key', titlePropName = 'title', keyPrefix = '', parents = [] } = option
 
   // 动态列
   if (keyProp) {
@@ -96,12 +130,22 @@ function renderColumnTree(
           let nextData = isLimitChildren
             ? data.filter((temp) => temp[keyProp] === item[keyProp])
             : data
-          return renderColumnTree(nextData, child, { ...option, keyPrefix: prefix })
+          return renderColumnTree(nextData, child, {
+            ...option,
+            keyPrefix: prefix,
+            parents: [...parents, item],
+          })
         })
 
         return {
           ...args,
           [titlePropName]: columnTitle,
+          headerTooltip: renderHeaderTooltip({
+            tooltip: headerTooltip,
+            item,
+            parents,
+            title: columnTitle,
+          }),
           children: _.flatten(columnChildren), // 多层动态列下，上面的层级拿到的是个二维数组，flatten一下
         }
       }
@@ -116,6 +160,13 @@ function renderColumnTree(
     })
   }
 
+  const headerTooltipText = renderHeaderTooltip({
+    tooltip: headerTooltip,
+    item: {},
+    parents,
+    title,
+  })
+
   // 非动态列 不是最后一层
   if (children && children.length) {
     // 非动态列的下一层一般都是在一行数据上的，所以拼接key时不加__做不同层级的分割，而是和下一层一起作为属性名
@@ -124,9 +175,19 @@ function renderColumnTree(
       return renderColumnTree(data, child, { ...option, keyPrefix: prefix })
     })
 
-    return { ...args, [titlePropName]: title, children: _.flatten(columnChildren) }
+    return {
+      ...args,
+      [titlePropName]: title,
+      headerTooltip: headerTooltipText,
+      children: _.flatten(columnChildren),
+    }
+  }
+  return {
+    ...args,
+    [keyPropName]: `${keyPrefix}${key}`,
+    [titlePropName]: title,
+    headerTooltip: headerTooltipText,
   }
-  return { ...args, [keyPropName]: `${keyPrefix}${key}`, [titlePropName]: title }
 }
 
 // 获取最后一层的表头

package/types/api/item.d.ts

@@ -1,5 +1,4 @@
 export declare function listItemTreeApi(params: any): Promise<import('axios').AxiosResponse<any>>
-export declare function getPriceCode(params: any): Promise<import('axios').AxiosResponse<any>>
-export declare function getPriceSeg(params: any): Promise<import('axios').AxiosResponse<any>>
+export declare function getPriceInfo(): Promise<import('axios').AxiosResponse<any>>
 export declare function getItem(params: any): Promise<import('axios').AxiosResponse<any>>
 //# sourceMappingURL=item.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/api/item.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,MAAM,KAAA,+CAErC;AAED,wBAAgB,YAAY,CAAC,MAAM,KAAA,+CAElC;AAED,wBAAgB,WAAW,CAAC,MAAM,KAAA,+CAEjC;AAED,wBAAgB,OAAO,CAAC,MAAM,KAAA,+CAE7B"}
+{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/api/item.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,MAAM,KAAA,+CAErC;AACD,wBAAgB,YAAY,gDAE3B;AACD,wBAAgB,OAAO,CAAC,MAAM,KAAA,+CAE7B"}

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

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/api/platform/user.ts"],"names":[],"mappings":"AAKA,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;;;;;CAAA,+CAG3E;AAED,wBAAgB,cAAc,gDAE7B;AAED,wBAAgB,kBAAkB,gDAEjC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,KAAA,+CAErC;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,UAEhD;AAED,wBAAgB,SAAS,gDAExB"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/api/platform/user.ts"],"names":[],"mappings":"AAKA,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;;;;;CAAA,+CAM3E;AAED,wBAAgB,cAAc,gDAE7B;AAED,wBAAgB,kBAAkB,gDAEjC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,KAAA,+CAErC;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,UAEhD;AAED,wBAAgB,SAAS,gDAExB"}

package/types/utils/base64.d.ts

@@ -0,0 +1,23 @@
+declare let Base64ForLogin: {
+  Base64Chars: string
+  /**
+   * Encode a string to a Base64 string follow Bse64 regular.
+   * @param s, a normal string
+   * @return a Base64 string
+   */
+  encode: (s: any) => any
+  /**
+   * Encodes a ucs2 string to a utf8 integer array.
+   * @param s, a string
+   * @return an integer array
+   */
+  ucs2_utf8: (s: any) => any[]
+  /**
+   * Encodes a utf8 integer array to a ucs2 string.
+   * @param s, an integer array
+   * @return a string
+   */
+  utf8_ucs2: (s: any) => string
+}
+export { Base64ForLogin }
+//# sourceMappingURL=base64.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"base64.d.ts","sourceRoot":"","sources":["../../src/utils/base64.ts"],"names":[],"mappings":"AACA,QAAA,IAAI,cAAc;;IAEhB;;;;OAIG;;IAqCH;;;;OAIG;;IAgCH;;;;OAIG;;CAqCJ,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/types/utils/index.d.ts

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

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,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,UAAU,CAAA;AACxB,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/table.d.ts

@@ -8,13 +8,13 @@ interface ColumnGroup {
   sortOrder?: boolean | 'asc' | 'desc'
   keyLastSuffix?: string
   isLimitChildren?: boolean
+  headerTooltip?: boolean | string | ((data: any, parents: Array<any>) => string)
   children?: ColumnGroup[]
   [propName: string]: any
 }
 interface row2columnOption {
   keyPropName?: string
   titlePropName?: string
-  keyPrefix?: 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":"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"}
+{"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;AA0KD;;;;;;;;;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"}