@peng_kai/kit 0.0.14 → 0.0.16

package/{components → vue/components}/infinite-query/src/InfiniteQuery.vue

@@ -1,147 +1,147 @@
-<script lang="ts">
-import { computed, ref, unref } from "vue";
-import type { UseInfiniteQueryReturnType } from '@tanstack/vue-query'
-import { useCreateTrigger } from './useCreateTrigger'
-</script>
-
-<script setup lang="ts" generic="T extends UseInfiniteQueryReturnType<any, any>">
-type TPage = T extends UseInfiniteQueryReturnType<infer P, any> ? NonNullable<P> : any
-type TRecord = TPage extends { list: Array<infer I> } ? I : any
-
-const props = defineProps<{
-  queryier: T
-}>()
-
-const { queryier } = props
-const pages = computed(() => queryier.data.value?.pages)
-// TODO: 状态之间的互斥仍有问题
-const isInitialLoading = computed(() => queryier.isInitialLoading.value)
-const isInitialLoadingError = computed(() => queryier.isLoadingError.value && !isInitialLoading.value)
-const isMoreLoading = computed(
-  () => (queryier.isFetchingNextPage.value || queryier.isFetching.value) && !isInitialLoading.value,
-)
-const isMoreLoadingError = computed(() => queryier.isRefetchError.value && !isMoreLoading.value)
-const noMore = computed(
-  () =>
-    !queryier.hasNextPage?.value
-    && !isInitialLoading.value
-    && !isInitialLoadingError.value
-    && !isMoreLoading.value
-    && !isMoreLoadingError.value,
-)
-const $container = ref<HTMLElement>()
-const containerCssVars = computed(() => {
-  const ctnEle = unref($container)
-
-  if (!ctnEle)
-    return {}
-
-  const rect = ctnEle.getBoundingClientRect()
-
-  return {
-    '--ctn-height': `${rect.height}px`,
-  }
-})
-
-function refetch() {
-  queryier.refetch()
-}
-
-function refetchLastPage() {
-  queryier.refetch({
-    refetchPage(lastPage: any, _index, allPages: any[]) {
-      const lastIndex = allPages?.length - 1
-      return lastPage?.pagination?.page === allPages?.[lastIndex]?.pagination?.page
-    },
-  })
-}
-
-function fetchNextPage() {
-  const { isFetching, isLoading, hasNextPage } = queryier
-
-  if (isFetching.value || isLoading.value || !hasNextPage?.value)
-    return
-
-  queryier.fetchNextPage()
-}
-
-function triggerFetchNextPage() {
-  if (queryier.isError.value)
-    return
-
-  fetchNextPage()
-}
-
-useCreateTrigger($container, triggerFetchNextPage)
-</script>
-
-<template>
-  <div ref="$container" class="infinite-query-wrapper" :style="containerCssVars">
-    <div v-if="isInitialLoading" class="initial-loading">
-      <i class="i-svg-spinners:180-ring-with-bg loading-icon" />
-    </div>
-    <div v-if="isInitialLoadingError" class="initial-loading-error" @click="refetch()">
-      <span>加载失败，点击重试</span>
-    </div>
-
-    <div v-for="(page, i) of pages" :key="i">
-      <template v-for="record of page.list">
-        <slot :record="record as TRecord" />
-      </template>
-    </div>
-
-    <div v-if="isMoreLoading" class="more-loading">
-      <i class="i-svg-spinners:180-ring-with-bg loading-icon" />
-      <span class="ml-1 text">加载中...</span>
-    </div>
-    <div v-if="isMoreLoadingError" class="more-loading-error" @click="fetchNextPage()">
-      <span class="text">加载失败，点击重试</span>
-    </div>
-    <div v-if="noMore" class="no-more" @click="refetchLastPage()">
-      <span class="text">暂无更多</span>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.infinite-query-wrapper {
-  overflow: auto;
-  font-size: 14px;
-}
-
-.loading-icon {
-  display: block;
-  color: var(--antd-colorPrimary);
-  font-size: 1.2em;
-}
-
-.initial-loading,
-.initial-loading-error,
-.more-loading,
-.more-loading-error,
-.no-more {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--antd-colorTextSecondary);
-}
-
-.initial-loading,
-.initial-loading-error {
-  height: var(--ctn-height, 100px);
-}
-
-.initial-loading-error {
-  cursor: pointer;
-}
-
-.more-loading,
-.more-loading-error,
-.no-more {
-  height: 50px;
-}
-
-.more-loading-error {
-  cursor: pointer;
-}
-</style>
+<script lang="ts">
+import { computed, ref, unref } from 'vue';
+import type { UseInfiniteQueryReturnType } from '@tanstack/vue-query';
+import { useCreateTrigger } from './useCreateTrigger';
+</script>
+
+<script setup lang="ts" generic="T extends UseInfiniteQueryReturnType<any, any>">
+type TPage = T extends UseInfiniteQueryReturnType<infer P, any> ? NonNullable<P> : any;
+type TRecord = TPage extends { list: Array<infer I> } ? I : any;
+
+const props = defineProps<{
+  queryier: T
+}>();
+
+const { queryier } = props;
+const pages = computed(() => queryier.data.value?.pages);
+// TODO: 状态之间的互斥仍有问题
+const isInitialLoading = computed(() => queryier.isInitialLoading.value);
+const isInitialLoadingError = computed(() => queryier.isLoadingError.value && !isInitialLoading.value);
+const isMoreLoading = computed(
+  () => (queryier.isFetchingNextPage.value || queryier.isFetching.value) && !isInitialLoading.value,
+);
+const isMoreLoadingError = computed(() => queryier.isRefetchError.value && !isMoreLoading.value);
+const noMore = computed(
+  () =>
+    !queryier.hasNextPage?.value
+    && !isInitialLoading.value
+    && !isInitialLoadingError.value
+    && !isMoreLoading.value
+    && !isMoreLoadingError.value,
+);
+const $container = ref<HTMLElement>();
+const containerCssVars = computed(() => {
+  const ctnEle = unref($container);
+
+  if (!ctnEle)
+    return {};
+
+  const rect = ctnEle.getBoundingClientRect();
+
+  return {
+    '--ctn-height': `${rect.height}px`,
+  };
+});
+
+function refetch() {
+  queryier.refetch();
+}
+
+function refetchLastPage() {
+  queryier.refetch({
+    refetchPage(lastPage: any, _index, allPages: any[]) {
+      const lastIndex = allPages?.length - 1;
+      return lastPage?.pagination?.page === allPages?.[lastIndex]?.pagination?.page;
+    },
+  });
+}
+
+function fetchNextPage() {
+  const { isFetching, isLoading, hasNextPage } = queryier;
+
+  if (isFetching.value || isLoading.value || !hasNextPage?.value)
+    return;
+
+  queryier.fetchNextPage();
+}
+
+function triggerFetchNextPage() {
+  if (queryier.isError.value)
+    return;
+
+  fetchNextPage();
+}
+
+useCreateTrigger($container, triggerFetchNextPage);
+</script>
+
+<template>
+  <div ref="$container" class="infinite-query-wrapper" :style="containerCssVars">
+    <div v-if="isInitialLoading" class="initial-loading">
+      <i class="i-svg-spinners:180-ring-with-bg loading-icon" />
+    </div>
+    <div v-if="isInitialLoadingError" class="initial-loading-error" @click="refetch()">
+      <span>加载失败，点击重试</span>
+    </div>
+
+    <div v-for="(page, i) of pages" :key="i">
+      <template v-for="record of page.list">
+        <slot :record="record as TRecord" />
+      </template>
+    </div>
+
+    <div v-if="isMoreLoading" class="more-loading">
+      <i class="i-svg-spinners:180-ring-with-bg loading-icon" />
+      <span class="ml-1 text">加载中...</span>
+    </div>
+    <div v-if="isMoreLoadingError" class="more-loading-error" @click="fetchNextPage()">
+      <span class="text">加载失败，点击重试</span>
+    </div>
+    <div v-if="noMore" class="no-more" @click="refetchLastPage()">
+      <span class="text">暂无更多</span>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.infinite-query-wrapper {
+  overflow: auto;
+  font-size: 14px;
+}
+
+.loading-icon {
+  display: block;
+  color: var(--antd-colorPrimary);
+  font-size: 1.2em;
+}
+
+.initial-loading,
+.initial-loading-error,
+.more-loading,
+.more-loading-error,
+.no-more {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--antd-colorTextSecondary);
+}
+
+.initial-loading,
+.initial-loading-error {
+  height: var(--ctn-height, 100px);
+}
+
+.initial-loading-error {
+  cursor: pointer;
+}
+
+.more-loading,
+.more-loading-error,
+.no-more {
+  height: 50px;
+}
+
+.more-loading-error {
+  cursor: pointer;
+}
+</style>

package/{components → vue/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/vue/hooks/useComponentRef.ts

@@ -1,27 +1,27 @@
-import { ref } from "vue";
-import type { Component } from 'vue'
-import type { ComponentExposed } from 'vue-component-type-helpers'
+import { ref } from 'vue';
+import type { Component } from 'vue';
+import type { ComponentExposed } from 'vue-component-type-helpers';
 
 export function useComponentRef<C extends Component>(_component: C) {
-  const _cpt = ref<any>()
+  const _cpt = ref<any>();
   const refFn = (cpt: any) => {
-    _cpt.value = cpt
-  }
+    _cpt.value = cpt;
+  };
 
-  type Exposed = typeof refFn & Partial<ComponentExposed<C>>
+  type Exposed = typeof refFn & Partial<ComponentExposed<C>>;
 
   return new Proxy(refFn as Exposed, {
     get(_target, p) {
       if (!_cpt.value)
-        return
+        return;
 
-      return Reflect.get(_cpt.value, p)
+      return Reflect.get(_cpt.value, p);
     },
     set(_target, p, newValue) {
       if (!_cpt.value)
-        return false
+        return false;
 
-      return Reflect.set(_cpt.value, p, newValue)
+      return Reflect.set(_cpt.value, p, newValue);
     },
-  })
+  });
 }

package/vue/hooks/useIsMounted.ts

@@ -1,9 +1,9 @@
-import { ref, onMounted } from "vue";
+import { onMounted, ref } from 'vue';
 
 export function useIsMounted() {
-  const mounted = ref(false)
+  const mounted = ref(false);
 
-  onMounted(() => (mounted.value = true))
+  onMounted(() => (mounted.value = true));
 
-  return mounted
+  return mounted;
 }

package/vue/hooks/useTeleportTarget.ts

@@ -1,13 +1,13 @@
-import { ref, onMounted } from "vue";
+import { onMounted, ref } from 'vue';
 
 export function useTeleportTarget(selectors: string) {
-  const target = ref<HTMLElement | null>()
+  const target = ref<HTMLElement | null>();
 
   onMounted(() => {
     setTimeout(() => {
-      target.value = document.querySelector<HTMLElement>(selectors)
-    })
-  })
+      target.value = document.querySelector<HTMLElement>(selectors);
+    });
+  });
 
-  return target
-}
+  return target;
+}

package/vue/index.ts

@@ -1,3 +1,4 @@
-export { useComponentRef } from './hooks/useComponentRef'
-export { useTeleportTarget } from './hooks/useTeleportTarget'
-export { useIsMounted } from './hooks/useIsMounted'
+export { useComponentRef } from './hooks/useComponentRef';
+export { useTeleportTarget } from './hooks/useTeleportTarget';
+export { useIsMounted } from './hooks/useIsMounted';
+export { InfiniteQuery } from './components/infinite-query';

package/admin/defines/definePage.ts

@@ -1,14 +0,0 @@
-import  { defineComponent, defineAsyncComponent, h } from 'vue'
-import type { AsyncComponentLoader } from 'vue'
-
-export { definePage }
-
-function definePage(loader: AsyncComponentLoader) {
-  return defineComponent({
-    setup() {
-      const Page = defineAsyncComponent(loader)
-
-      return () => h(Page, null)
-    },
-  })
-}

package/admin/defines/defineRoute.helpers.ts

@@ -1,30 +0,0 @@
-import type { RouteLocationNormalizedLoaded, Router } from 'vue-router'
-
-export function getTitle(route?: Pick<RouteLocationNormalizedLoaded, 'meta'>) {
-  const mTitle = route?.meta?.title
-
-  return typeof mTitle === 'function' ? mTitle() : mTitle
-}
-
-export function getMenusByRouter(router: Router) {
-  const menuOrderRE = /^(?<key>\w*)@(?<order>\d+)$/
-  const routes = router.getRoutes()
-
-  return routes
-    .filter(route => menuOrderRE.test((route.meta.menuOrder ?? '')))
-    .map((route) => {
-      const res = route.meta!.menuOrder!.match(menuOrderRE)
-      const parentKey = res?.groups?.key
-      const order = Number(res?.groups?.order)
-      const name = route.name as string
-      const menu = {
-        key: name,
-        label: route.meta.title ?? name,
-        icon: route.meta.icon,
-        trigger: parentKey ? () => router.push({ name }) : () => {},
-        order,
-      }
-
-      return { parentKey, menu }
-    })
-}

package/admin/defines/defineRoute.ts

@@ -1,161 +0,0 @@
-import type { RouteRecordRaw } from 'vue-router'
-import merge from 'lodash-es/merge'
-import type { VNode } from 'vue'
-import { definePage } from './definePage'
-import { ENV } from "../../utils";
-
-export { defineRoute, getRoutes }
-
-const RouteSymbol = Symbol('app-route')
-
-/** 定义路由 */
-function defineRoute(route: (params: { definePage: typeof definePage }) => RouteRecordRaw[]) {
-  const routeFn: any = () => route({ definePage })
-  routeFn[RouteSymbol] = true
-
-  return routeFn
-}
-
-/** 获取路由 */
-async function getRoutes() {
-  const routeFileRE = /\/([A-Za-z0-9-]+.)?route\.ts$/
-  const routeFiles = Object.fromEntries(
-    Object.entries(getRoutes.modules).filter(([n]) => routeFileRE.test(n)),
-  ) as Record<string, Function>
-  let routes: RouteRecordRaw[] = []
-
-  for (const name in routeFiles) {
-    const module: any = await routeFiles[name]()
-
-    if (Object.hasOwn(module?.default ?? {}, RouteSymbol))
-      Array.prototype.push.apply(routes, module.default())
-  }
-
-  // 处理路由
-  routes = meregeDefaultRouteParams(routes)
-  routes = sortRoute(routes)
-
-  // 输出路由
-  if (!ENV.isProd) {
-    console.groupCollapsed('一级路由')
-
-    console.table(
-      routes.map(route => ({ order: route.meta?.order, ...route })),
-      ['order', 'name', 'path'],
-    )
-
-    console.groupEnd()
-  }
-
-  return routes
-}
-getRoutes.modules = {} as any
-
-/** 给路由填充默认参数 */
-const defaultRouteParams: Partial<RouteRecordRaw> = {
-  meta: {
-    title: '标题',
-    icon: undefined,
-    order: 10,
-    requireAuth: true,
-    keepAlive: false,
-    hiddenTab: false,
-    pageKeyFn: route => route.path,
-  },
-}
-
-function meregeDefaultRouteParams(routes: RouteRecordRaw[], parentRoute?: RouteRecordRaw) {
-  const _routes: typeof routes = []
-
-  for (const route of routes) {
-    if (route.children?.length)
-      route.children = meregeDefaultRouteParams(route.children, route)
-
-    const newRoute = merge({}, defaultRouteParams, route)
-    const { menuOrder } = newRoute.meta!
-
-    // 处理 menuOrder
-    if (typeof menuOrder === 'string')
-      newRoute.meta!.menuOrder = menuOrder.replace('..', (parentRoute?.name ?? '') as string)
-
-    _routes.push(newRoute)
-  }
-
-  return _routes
-}
-
-/** 给路由排序 */
-function sortRoute(routes: RouteRecordRaw[]) {
-  const _routes = routes.sort((r1, r2) => r1!.meta!.order! - r2!.meta!.order!)
-
-  for (const route of _routes) {
-    if (route.children?.length)
-      route.children = sortRoute(route.children)
-  }
-
-  return _routes
-}
-
-declare module 'vue-router' {
-  interface RouteMeta {
-    /**
-     * 路由标题
-     *
-     * @description 可用来作 document.title 和菜单的名称
-     *
-     * 默认：APP 名称
-     */
-    title?: string | (() => string)
-    /**
-     * 菜单和面包屑对应的图标
-     *
-     * 默认：`''`
-     */
-    icon?: (() => VNode)
-    /**
-     * 路由添加顺序，仅作用于一级路由
-     *
-     * 默认：`10`
-     */
-    order?: number
-    /**
-     * 是否需要登录
-     *
-     * 默认：`false`
-     */
-    requireAuth?: boolean
-    /**
-     * 缓存页面
-     *
-     * 默认：`true`
-     */
-    keepAlive?: boolean
-    /**
-     * 菜单排序（升序）
-     *
-     * 格式：[parent]@[order]
-     * - `parent`：可选。不填则默认取路由的 name 值，并在作为一级菜单显示
-     * - `order`：必选。路由排序，值越小排越前
-     *
-     * 例子：
-     * - `@10`：一级菜单
-     * - `..@10`：所在的路由层级的父级菜单，例如父级菜单是 admin，那么`..`就是`admin`
-     * - `admin@10`：指定菜单的父级为 `admin`
-     *
-     * 默认：undefined。不在菜单中显示
-     */
-    menuOrder?: string
-    /**
-     * 是否隐藏标签页
-     *
-     * 默认：`false`
-     */
-    hiddenTab?: boolean
-    /**
-     * 用于生成页面运行时的 key
-     *
-     * 默认：取 route 对象中 path 值
-     */
-    pageKeyFn?: (route: RouteLocationNormalizedLoaded) => string
-  }
-}