@peng_kai/kit 0.2.0-beta.0 → 0.2.0-beta.10

package/tsconfig.json

@@ -1,50 +1,50 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "jsx": "preserve",
-    "jsxFactory": "h",
-    "jsxFragmentFactory": "Fragment",
-    "lib": [
-      "ESNext",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "allowImportingTsExtensions": true,
-
-    /* Linting */
-    "strict": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": false,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noEmit": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "isolatedModules": true,
-    "skipLibCheck": true
-  },
-  "include": [
-    "admin/**/*.ts",
-    "admin/**/*.d.ts",
-    "admin/**/*.tsx",
-    "admin/**/*.vue",
-    "antd/**/*.ts",
-    "antd/**/*.d.ts",
-    "antd/**/*.tsx",
-    "antd/**/*.vue",
-    "request/**/*.ts",
-    "request/**/*.d.ts",
-    "utils/**/*.ts",
-    "utils/**/*.d.ts",
-    "vue/**/*.ts",
-    "vue/**/*.d.ts",
-    "vue/**/*.tsx",
-    "vue/**/*.vue"
-  ]
-}
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "jsx": "preserve",
+    "jsxFactory": "h",
+    "jsxFragmentFactory": "Fragment",
+    "lib": [
+      "ESNext",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "allowImportingTsExtensions": true,
+
+    /* Linting */
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "admin/**/*.ts",
+    "admin/**/*.d.ts",
+    "admin/**/*.tsx",
+    "admin/**/*.vue",
+    "antd/**/*.ts",
+    "antd/**/*.d.ts",
+    "antd/**/*.tsx",
+    "antd/**/*.vue",
+    "request/**/*.ts",
+    "request/**/*.d.ts",
+    "utils/**/*.ts",
+    "utils/**/*.d.ts",
+    "vue/**/*.ts",
+    "vue/**/*.d.ts",
+    "vue/**/*.tsx",
+    "vue/**/*.vue"
+  ]
+}

package/utils/date.ts

@@ -1,12 +1,4 @@
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import 'dayjs/locale/zh';
-import 'dayjs/locale/en';
-
-export { default as dayjs } from 'dayjs';
-
-dayjs.locale('zh');
-dayjs.extend(relativeTime);
+import dayjs from '../libs/dayjs';
 
 /**
  * 返回给定日期的一天的开始时间。

package/utils/upload/AwsS3.ts

@@ -15,9 +15,7 @@ export class AwsS3 {
   public domain = '';
   public bucket = '';
   public region = '';
-
   private s3Client: S3Client | undefined = undefined;
-  private lastRefreshParams = 0;
 
   public constructor(private getParams: TGetParams, private fileHandler?: FileHandler) {
   }
@@ -52,11 +50,6 @@ export class AwsS3 {
   }
 
   private async refreshClient() {
-    const needRefresh = (Date.now() - this.lastRefreshParams) > 5 * 60 * 1000;
-
-    if (!needRefresh)
-      return this.s3Client;
-
     const params = await this.getParams();
     this.domain = params.domain;
     this.bucket = params.bucket;
@@ -69,7 +62,6 @@ export class AwsS3 {
         sessionToken: params.sessionToken,
       },
     });
-    this.lastRefreshParams = Date.now();
 
     return this.s3Client;
   }

package/vue/components/infinite-query/index.ts

@@ -1 +1 @@
-export { default as InfiniteQuery } from './src/InfiniteQuery.vue';
+export { default as InfiniteQuery } from './src/InfiniteQuery.vue';

package/vue/components/infinite-query/src/InfiniteQuery.vue

@@ -1,199 +1,199 @@
-<script lang="ts">
-import { computed, ref, unref } from 'vue';
-import type { UseInfiniteQueryReturnType } from '@tanstack/vue-query';
-import { useCreateTrigger } from './useCreateTrigger';
-
-export type { ISlotProvide };
-
-interface ISlotProvide {
-  isInitialLoading: boolean
-  isInitialLoadingError: boolean
-  isEmpty: boolean
-  isMoreLoading: boolean
-  isMoreLoadingError: boolean
-  isNoMore: boolean
-  refetch: () => void
-}
-</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 = withDefaults(defineProps<{
-  queryier: T
-  distance?: string
-}>(), {
-  distance: '50px',
-});
-
-const { queryier } = props;
-const pages = computed(() => queryier.data.value?.pages);
-const isInitialLoading = computed(() => queryier.isPending.value);
-const isInitialLoadingError = computed(() => queryier.isLoadingError.value && !isInitialLoading.value);
-const isMoreLoading = computed(
-  () => (queryier.isFetchingNextPage.value || queryier.isFetching.value) && !isInitialLoading.value,
-);
-const isEmpty = computed(() => queryier.isSuccess.value && !pages.value?.[0].list?.length);
-const isMoreLoadingError = computed(() => queryier.isRefetchError.value && !isMoreLoading.value);
-const isNoMore = 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 refetchLastPage() {
-  queryier.refetch();
-}
-
-function fetchNextPage() {
-  const { isFetching, isLoading, hasNextPage } = queryier;
-
-  if (isFetching.value || isLoading.value || !hasNextPage?.value)
-    return;
-
-  queryier.fetchNextPage();
-}
-
-function refetch() {
-  if (isNoMore.value)
-    refetchLastPage();
-  else if (isMoreLoadingError.value)
-    fetchNextPage();
-  else
-    queryier.refetch();
-}
-
-function triggerFetchNextPage() {
-  if (queryier.isError.value)
-    return;
-
-  fetchNextPage();
-}
-
-useCreateTrigger($container, triggerFetchNextPage, props.distance);
-
-const slotProvide = computed<ISlotProvide>(() => ({
-  isInitialLoading: isInitialLoading.value,
-  isInitialLoadingError: isInitialLoadingError.value,
-  isMoreLoading: isMoreLoading.value,
-  isMoreLoadingError: isMoreLoadingError.value,
-  isNoMore: isNoMore.value,
-  isEmpty: isEmpty.value,
-  refetch,
-}));
-</script>
-
-<template>
-  <div ref="$container" class="infinite-query-wrapper" :style="containerCssVars">
-    <div class="list">
-      <template v-for="(page) of pages">
-        <template v-for="record of page.list">
-          <!-- eslint-disable-next-line vue/no-extra-parens -->
-          <slot name="default" :record="(record as TRecord)" />
-        </template>
-      </template>
-    </div>
-
-    <slot
-      name="status" v-bind="slotProvide"
-    >
-      <slot name="initialLoading">
-        <div v-if="isInitialLoading" class="initial-loading">
-          <i class="i-svg-spinners:180-ring-with-bg loading-icon" />
-        </div>
-      </slot>
-
-      <slot name="initialLoadingError">
-        <div v-if="isInitialLoadingError" class="initial-loading-error" @click="refetch()">
-          <span>加载失败，点击重试</span>
-        </div>
-      </slot>
-
-      <slot name="empty">
-        <div v-if="isEmpty" class="empty">
-          <span>暂无数据</span>
-        </div>
-      </slot>
-
-      <slot name="oreLoading">
-        <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>
-      </slot>
-
-      <slot name="moreLoadingError">
-        <div v-if="isMoreLoadingError" class="more-loading-error" @click="refetch()">
-          <span class="text">加载失败，点击重试</span>
-        </div>
-      </slot>
-
-      <slot name="noMore">
-        <div v-if="isNoMore" class="no-more" @click="refetch()">
-          <span class="text">暂无更多</span>
-        </div>
-      </slot>
-    </slot>
-  </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,
-.empty,
-.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';
+
+export type { ISlotProvide };
+
+interface ISlotProvide {
+  isInitialLoading: boolean
+  isInitialLoadingError: boolean
+  isEmpty: boolean
+  isMoreLoading: boolean
+  isMoreLoadingError: boolean
+  isNoMore: boolean
+  refetch: () => void
+}
+</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 = withDefaults(defineProps<{
+  queryier: T
+  distance?: string
+}>(), {
+  distance: '50px',
+});
+
+const { queryier } = props;
+const pages = computed(() => queryier.data.value?.pages);
+const isInitialLoading = computed(() => queryier.isPending.value);
+const isInitialLoadingError = computed(() => queryier.isLoadingError.value && !isInitialLoading.value);
+const isMoreLoading = computed(
+  () => (queryier.isFetchingNextPage.value || queryier.isFetching.value) && !isInitialLoading.value,
+);
+const isEmpty = computed(() => queryier.isSuccess.value && !pages.value?.[0].list?.length);
+const isMoreLoadingError = computed(() => queryier.isRefetchError.value && !isMoreLoading.value);
+const isNoMore = 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 refetchLastPage() {
+  queryier.refetch();
+}
+
+function fetchNextPage() {
+  const { isFetching, isLoading, hasNextPage } = queryier;
+
+  if (isFetching.value || isLoading.value || !hasNextPage?.value)
+    return;
+
+  queryier.fetchNextPage();
+}
+
+function refetch() {
+  if (isNoMore.value)
+    refetchLastPage();
+  else if (isMoreLoadingError.value)
+    fetchNextPage();
+  else
+    queryier.refetch();
+}
+
+function triggerFetchNextPage() {
+  if (queryier.isError.value)
+    return;
+
+  fetchNextPage();
+}
+
+useCreateTrigger($container, triggerFetchNextPage, props.distance);
+
+const slotProvide = computed<ISlotProvide>(() => ({
+  isInitialLoading: isInitialLoading.value,
+  isInitialLoadingError: isInitialLoadingError.value,
+  isMoreLoading: isMoreLoading.value,
+  isMoreLoadingError: isMoreLoadingError.value,
+  isNoMore: isNoMore.value,
+  isEmpty: isEmpty.value,
+  refetch,
+}));
+</script>
+
+<template>
+  <div ref="$container" class="infinite-query-wrapper" :style="containerCssVars">
+    <div class="list">
+      <template v-for="(page) of pages">
+        <template v-for="record of page.list">
+          <!-- eslint-disable-next-line vue/no-extra-parens -->
+          <slot name="default" :record="(record as TRecord)" />
+        </template>
+      </template>
+    </div>
+
+    <slot
+      name="status" v-bind="slotProvide"
+    >
+      <slot name="initialLoading">
+        <div v-if="isInitialLoading" class="initial-loading">
+          <i class="i-svg-spinners:180-ring-with-bg loading-icon" />
+        </div>
+      </slot>
+
+      <slot name="initialLoadingError">
+        <div v-if="isInitialLoadingError" class="initial-loading-error" @click="refetch()">
+          <span>加载失败，点击重试</span>
+        </div>
+      </slot>
+
+      <slot name="empty">
+        <div v-if="isEmpty" class="empty">
+          <span>暂无数据</span>
+        </div>
+      </slot>
+
+      <slot name="oreLoading">
+        <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>
+      </slot>
+
+      <slot name="moreLoadingError">
+        <div v-if="isMoreLoadingError" class="more-loading-error" @click="refetch()">
+          <span class="text">加载失败，点击重试</span>
+        </div>
+      </slot>
+
+      <slot name="noMore">
+        <div v-if="isNoMore" class="no-more" @click="refetch()">
+          <span class="text">暂无更多</span>
+        </div>
+      </slot>
+    </slot>
+  </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,
+.empty,
+.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/vue/components/infinite-query/src/useCreateTrigger.ts

@@ -1,39 +1,39 @@
-import { onUnmounted, watch } from 'vue';
-import type { Ref } from 'vue';
-import { useIntersectionObserver, useIntervalFn } from '@vueuse/core';
-
-export function useCreateTrigger(containerEle: Ref<HTMLElement | undefined>, callback: Function, distance: string) {
-  const triggerEl = document.createElement('div');
-
-  Object.assign(triggerEl.style, {
-    position: 'relative',
-    zIndex: '5',
-    marginTop: `-${distance}`,
-    marginBottom: distance,
-    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);
-  });
-
-  onUnmounted(() => {
-    triggerEl.remove();
-  });
-}
+import { onUnmounted, watch } from 'vue';
+import type { Ref } from 'vue';
+import { useIntersectionObserver, useIntervalFn } from '@vueuse/core';
+
+export function useCreateTrigger(containerEle: Ref<HTMLElement | undefined>, callback: Function, distance: string) {
+  const triggerEl = document.createElement('div');
+
+  Object.assign(triggerEl.style, {
+    position: 'relative',
+    zIndex: '5',
+    marginTop: `-${distance}`,
+    marginBottom: distance,
+    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);
+  });
+
+  onUnmounted(() => {
+    triggerEl.remove();
+  });
+}