@peng_kai/kit 0.0.9 → 0.0.11

package/components/infinite-query/src/useCreateTrigger.ts

@@ -1,35 +1,35 @@
-import  { watch } from "vue";
-import type { Ref } from "vue";
-import { useIntersectionObserver, useIntervalFn } from '@vueuse/core'
-
-export function useCreateTrigger(containerEle: Ref<HTMLElement | undefined>, callback: Function) {
-  const triggerEl = document.createElement('div')
-
-  Object.assign(triggerEl.style, {
-    position: 'relative',
-    zIndex: '5',
-    marginTop: '-150px',
-    marginBottom: '150px',
-    width: '5px',
-    height: '5px',
-    // background: 'red',
-  } satisfies Partial<CSSStyleDeclaration>)
-
-  useIntervalFn(() => {
-    const { transform } = triggerEl.style
-
-    if (transform)
-      triggerEl.style.removeProperty('transform')
-    else triggerEl.style.setProperty('transform', 'translateX(-200%)')
-  }, 500)
-
-  useIntersectionObserver(triggerEl, ([entry]) => {
-    if (entry.isIntersecting)
-      callback()
-  })
-
-  watch(containerEle, (ele) => {
-    if (ele)
-      ele.append(triggerEl)
-  })
-}
+import  { watch } from "vue";
+import type { Ref } from "vue";
+import { useIntersectionObserver, useIntervalFn } from '@vueuse/core'
+
+export function useCreateTrigger(containerEle: Ref<HTMLElement | undefined>, callback: Function) {
+  const triggerEl = document.createElement('div')
+
+  Object.assign(triggerEl.style, {
+    position: 'relative',
+    zIndex: '5',
+    marginTop: '-150px',
+    marginBottom: '150px',
+    width: '5px',
+    height: '5px',
+    // background: 'red',
+  } satisfies Partial<CSSStyleDeclaration>)
+
+  useIntervalFn(() => {
+    const { transform } = triggerEl.style
+
+    if (transform)
+      triggerEl.style.removeProperty('transform')
+    else triggerEl.style.setProperty('transform', 'translateX(-200%)')
+  }, 500)
+
+  useIntersectionObserver(triggerEl, ([entry]) => {
+    if (entry.isIntersecting)
+      callback()
+  })
+
+  watch(containerEle, (ele) => {
+    if (ele)
+      ele.append(triggerEl)
+  })
+}

package/kitDependencies.ts

@@ -1,9 +1,29 @@
-import dayjs from "dayjs";
+import type dayjs from "dayjs";
+import type { useMenu, usePage, usePageTab, usePermission } from "./admin/hooks";
 import type { useRoute, useRouter } from 'vue-router'
 
-export const kitDependencies = {
-  dayjs: dayjs,
-  useRoute: (() => {}) as typeof useRoute,
-  useRouter: (() => {}) as typeof useRouter,
-  menus: undefined as any,
+const KEY = '__PK_KIT_DEPENDENCIES__'
+
+interface Dependencies {
+  dayjs: typeof dayjs
+  useRoute: typeof useRoute
+  useRouter: typeof useRouter
+  useMenu: typeof useMenu
+  usePage: typeof usePage
+  usePageTab: typeof usePageTab
+  usePermission: typeof usePermission
+}
+
+export function setDependencies(deps: Partial<Dependencies>) {
+  window[KEY] = { ...window[KEY], ...deps }
+}
+
+export function getDependencies() {
+  return window[KEY]
+}
+
+declare global {
+  interface Window {
+    [KEY]: Dependencies
+  }
 }

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@peng_kai/kit",
-  "version": "0.0.9",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@tanstack/vue-query": "^4.37.1",
-    "@vueuse/core": "^10.5.0",
-    "ant-design-vue": "^4.0.6",
-    "axios": "^1.6.0",
-    "bignumber.js": "^9.1.2",
-    "dayjs": "^1.11.10",
-    "lodash-es": "^4.17.21",
-    "vue": "^3.3.7",
-    "vue-router": "^4.2.5"
-  },
-  "devDependencies": {
-    "@types/lodash-es": "^4.17.10",
-    "@types/node": "18",
-    "type-fest": "^4.6.0",
-    "vue-component-type-helpers": "^1.8.22"
-  },
-  "peerDependencies": {
-    "@tanstack/vue-query": "4.x",
-    "@vueuse/core": "10.x",
-    "ant-design-vue": "4.0.x",
-    "axios": "1.6.x",
-    "bignumber.js": "9.x",
-    "dayjs": "1.x",
-    "lodash-es": "4.x",
-    "vue": "3.3.x",
-    "vue-router": "4.2.x"
-  }
-}
+{
+  "name": "@peng_kai/kit",
+  "version": "0.0.11",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@tanstack/vue-query": "^4.37.1",
+    "@vueuse/core": "^10.5.0",
+    "ant-design-vue": "^4.0.6",
+    "axios": "^1.6.0",
+    "bignumber.js": "^9.1.2",
+    "dayjs": "^1.11.10",
+    "lodash-es": "^4.17.21",
+    "vue": "^3.3.7",
+    "vue-router": "^4.2.5"
+  },
+  "devDependencies": {
+    "@types/lodash-es": "^4.17.10",
+    "@types/node": "18",
+    "type-fest": "^4.6.0",
+    "vue-component-type-helpers": "^1.8.22"
+  },
+  "peerDependencies": {
+    "@tanstack/vue-query": "4.x",
+    "@vueuse/core": "10.x",
+    "ant-design-vue": "4.0.x",
+    "axios": "1.6.x",
+    "bignumber.js": "9.x",
+    "dayjs": "1.x",
+    "lodash-es": "4.x",
+    "vue": "3.3.x",
+    "vue-router": "4.2.x"
+  }
+}

package/request/helpers.ts

@@ -1,32 +1,32 @@
-export { isTimeout,  ApiCode, ApiError }
-
-enum ApiCode {
-  NORMAL = 0, // 正常
-  UNKNOWN = -1, // 未知错误
-  TIMEOUT = -2, // 请求超时
-}
-
-function isTimeout(error: any) {
-  return error?.message?.toLowerCase().includes('timeout')
-}
-
-class ApiError<TResp = any> extends Error {
-  public static is<ErrorResp = any>(error: any): error is ApiError<ErrorResp> {
-    return !!error?.isApiError
-  }
-
-  /**
-   * 将HTTP status和Api code统一到一个code里
-   */
-  public code: number
-  public msg: string
-  public data: TResp
-  public isApiError = true
-
-  public constructor(info: { code: number; msg: string; data: TResp }) {
-    super(info.msg)
-    this.code = info.code
-    this.msg = info.msg
-    this.data = info.data
-  }
-}
+export { isTimeout,  ApiCode, ApiError }
+
+enum ApiCode {
+  NORMAL = 0, // 正常
+  UNKNOWN = -1, // 未知错误
+  TIMEOUT = -2, // 请求超时
+}
+
+function isTimeout(error: any) {
+  return error?.message?.toLowerCase().includes('timeout')
+}
+
+class ApiError<TResp = any> extends Error {
+  public static is<ErrorResp = any>(error: any): error is ApiError<ErrorResp> {
+    return !!error?.isApiError
+  }
+
+  /**
+   * 将HTTP status和Api code统一到一个code里
+   */
+  public code: number
+  public msg: string
+  public data: TResp
+  public isApiError = true
+
+  public constructor(info: { code: number; msg: string; data: TResp }) {
+    super(info.msg)
+    this.code = info.code
+    this.msg = info.msg
+    this.data = info.data
+  }
+}

package/request/type.d.ts

@@ -1,89 +1,89 @@
-declare namespace Api {
-  type Request = (reqData: any, options?: Options) => Promise<any>
-  // type RequestPagination = (reqData: Partial<PageParam>, options?: Options) => Promise<PaginationData<any>>;
-  interface PageParam {
-    page: number
-    page_size: number
-  }
-  interface PageInfo {
-    has_more: boolean
-    page: number
-    page_size: number
-    total: number
-  }
-  interface PageData<T = any> {
-    list: T[] | null
-    pagination: PaginationInfo
-    [k in string]: any
-  }
-  interface Result<T = any | PageData<any>> {
-    code: number
-    msg: string
-    data: T
-  }
-  type GetParam<A extends Request> = A extends (reqData: infer R) => any ? R : any
-  type GetData<A extends Request> = ReturnType<A> extends Promise<infer D> ? D : any
-  type GetDataItem<A extends Request> = NonNullable<GetData<A>> extends { list: infer L }
-    ? NonNullable<L> extends Array<infer I>
-      ? I
-      : any
-    : any
-  type GetDataField<R> = R extends { data: infer D } ? (D extends { list: any; pagination: any } ? D : D) : any
-
-  /**
-   * 将api返回的分页数据转换成前端使用的分页数据格式，将分页数据格式统一
-   *
-   * ```
-   * {
-   *   code: number,
-   *   msg: string,
-   *   data: {
-   *     list: [],
-   *     pagination: {},
-   *     ...
-   *   }
-   * }
-   * ```
-   */
-  type TransformPageResult<R> = R extends { pagination: infer P; data: infer D }
-    ? D extends Record<string, any>
-      ? D extends { list: any }
-        ? {
-            [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
-          } & {
-            data: D & { pagination: P }
-          }
-        : {
-            [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
-          } & {
-            data: {
-              list: D
-              pagination: P
-            }
-          }
-      : R
-    : R
-}
-
-// 测试用例 ----------------------------
-// type DDD1 = Api.TransformPageResult<{
-//   code: number
-//   msg: string
-//   data: {
-//     name: string
-//   }[]
-//   pagination: {
-//     page: number
-//   }
-// }>
-// type DDD2 = Api.TransformPageResult<{
-//   code: number
-//   msg: string
-//   data: {
-//     list: { name: string }[]
-//     total: {}
-//   }
-//   pagination: {
-//     page: number
-//   }
-// }>
+declare namespace Api {
+  type Request = ((reqData: any, options?: Options) => Promise<any>) & { id: string }
+  // type RequestPagination = (reqData: Partial<PageParam>, options?: Options) => Promise<PaginationData<any>>;
+  interface PageParam {
+    page: number
+    page_size: number
+  }
+  interface PageInfo {
+    has_more: boolean
+    page: number
+    page_size: number
+    total: number
+  }
+  interface PageData<T = any> {
+    list: T[] | null
+    pagination: PaginationInfo
+    [k in string]: any
+  }
+  interface Result<T = any | PageData<any>> {
+    code: number
+    msg: string
+    data: T
+  }
+  type GetParam<A extends Request> = A extends (reqData: infer R) => any ? R : any
+  type GetData<A extends Request> = ReturnType<A> extends Promise<infer D> ? D : any
+  type GetDataItem<A extends Request> = NonNullable<GetData<A>> extends { list: infer L }
+    ? NonNullable<L> extends Array<infer I>
+      ? I
+      : any
+    : any
+  type GetDataField<R> = R extends { data: infer D } ? (D extends { list: any; pagination: any } ? D : D) : any
+
+  /**
+   * 将api返回的分页数据转换成前端使用的分页数据格式，将分页数据格式统一
+   *
+   * ```
+   * {
+   *   code: number,
+   *   msg: string,
+   *   data: {
+   *     list: [],
+   *     pagination: {},
+   *     ...
+   *   }
+   * }
+   * ```
+   */
+  type TransformPageResult<R> = R extends { pagination: infer P; data: infer D }
+    ? D extends Record<string, any>
+      ? D extends { list: any }
+        ? {
+            [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
+          } & {
+            data: D & { pagination: P }
+          }
+        : {
+            [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
+          } & {
+            data: {
+              list: D
+              pagination: P
+            }
+          }
+      : R
+    : R
+}
+
+// 测试用例 ----------------------------
+// type DDD1 = Api.TransformPageResult<{
+//   code: number
+//   msg: string
+//   data: {
+//     name: string
+//   }[]
+//   pagination: {
+//     page: number
+//   }
+// }>
+// type DDD2 = Api.TransformPageResult<{
+//   code: number
+//   msg: string
+//   data: {
+//     list: { name: string }[]
+//     total: {}
+//   }
+//   pagination: {
+//     page: number
+//   }
+// }>

package/tsconfig.json

@@ -1,18 +1,18 @@
-{
-  "compilerOptions": {
-    "target": "es2019",
-    "module": "esnext",
-    "lib": [
-      "esnext",
-      "dom"
-    ],
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "strict": true,
-    "strictNullChecks": true,
-    "resolveJsonModule": true,
-    "skipDefaultLibCheck": true,
-    "skipLibCheck": true,
-    "jsx": "preserve",
-  },
+{
+  "compilerOptions": {
+    "target": "es2019",
+    "module": "esnext",
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "resolveJsonModule": true,
+    "skipDefaultLibCheck": true,
+    "skipLibCheck": true,
+    "jsx": "preserve",
+  },
 }