@peng_kai/kit 0.2.0-beta.3 → 0.2.0-beta.30

package/antd/hooks/useAntdDrawer.ts

@@ -1,73 +1,73 @@
-import { Button as AButton, Drawer as ADrawer, Space as ASpace } from 'ant-design-vue';
-import { defineComponent, h, isProxy, reactive, toRef, toRefs } from 'vue';
-import type { Component } from 'vue';
-import type { ButtonProps, DrawerProps } from 'ant-design-vue';
-import type { ComponentProps } from 'vue-component-type-helpers';
-import type { Writable } from 'type-fest';
-import { useComponentRef } from '../../vue';
-
-const defaultDrawerProps: DrawerProps = { open: false, destroyOnClose: true, rootClassName: 'antd-cover__basic-drawer' };
-
-interface IComponentConfig<Comp extends Component> {
-  is: Comp
-  props?: Writable<ComponentProps<Comp>>
-}
-
-export function useAntdDrawer<Comp extends Component>(
-  comp: IComponentConfig<Comp> | Comp,
-  drawerProps = defaultDrawerProps,
-) {
-  const _comp = ({ props: {}, ...((comp as any)?.is ? comp : { is: comp }) }) as Required<IComponentConfig<Comp>>;
-  const compProps = reactive(_comp.props);
-  const compRef = useComponentRef(_comp.is);
-  const _drawerProps: DrawerProps = reactive({
-    ...defaultDrawerProps,
-    ...isProxy(drawerProps) ? toRefs(drawerProps) : drawerProps,
-  });
-
-  const open = (newBodyProps?: Partial<typeof compProps>, newAntdModalProps?: Omit<Partial<DrawerProps>, 'open'>) => {
-    Object.assign(_drawerProps, newAntdModalProps);
-    Object.assign(compProps, newBodyProps);
-    _drawerProps.open = true;
-  };
-  const close = () => {
-    _drawerProps.open = false;
-  };
-
-  const DrawerFooter = defineComponent({
-    setup() {
-      const cancelBtnProps: ButtonProps = reactive({ onClick: close });
-      const confirmBtnProps: ButtonProps = reactive({
-        type: 'primary',
-        loading: toRef(() => (compRef as any)?.loading),
-        onClick: () => (compRef as any)?.confirm?.(),
-      });
-
-      return { cancelBtnProps, confirmBtnProps };
-    },
-    render() {
-      const { cancelBtnProps, confirmBtnProps } = this;
-
-      return h(ASpace, {}, () => [
-        h(AButton, cancelBtnProps, () => '取消'),
-        h(AButton, confirmBtnProps, () => '确定'),
-      ]);
-    },
-  });
-  const PresetComponent = defineComponent({
-    render() {
-      return h(ADrawer, _drawerProps, {
-        default: () => h(_comp.is, compProps as any),
-      });
-    },
-  });
-
-  _drawerProps.footer = _drawerProps.footer === undefined ? h(DrawerFooter) : _drawerProps.footer;
-  _drawerProps['onUpdate:open'] = (visiable) => {
-    _drawerProps.open = visiable;
-  };
-  (compProps as any).ref = compRef;
-  (compProps as any).onClose = close;
-
-  return { PresetComponent, drawerProps: _drawerProps, open, close };
-}
+import { Button as AButton, Drawer as ADrawer, Space as ASpace } from 'ant-design-vue';
+import { defineComponent, h, isProxy, reactive, toRef, toRefs } from 'vue';
+import type { Component } from 'vue';
+import type { ButtonProps, DrawerProps } from 'ant-design-vue';
+import type { ComponentProps } from 'vue-component-type-helpers';
+import type { Writable } from 'type-fest';
+import { useComponentRef } from '../../vue';
+
+const defaultDrawerProps: DrawerProps = { open: false, destroyOnClose: true, rootClassName: 'antd-cover__basic-drawer' };
+
+interface IComponentConfig<Comp extends Component> {
+  is: Comp
+  props?: Writable<ComponentProps<Comp>>
+}
+
+export function useAntdDrawer<Comp extends Component>(
+  comp: IComponentConfig<Comp> | Comp,
+  drawerProps = defaultDrawerProps,
+) {
+  const _comp = ({ props: {}, ...((comp as any)?.is ? comp : { is: comp }) }) as Required<IComponentConfig<Comp>>;
+  const compProps = reactive(_comp.props);
+  const compRef = useComponentRef(_comp.is);
+  const _drawerProps: DrawerProps = reactive({
+    ...defaultDrawerProps,
+    ...isProxy(drawerProps) ? toRefs(drawerProps) : drawerProps,
+  });
+
+  const open = (newBodyProps?: Partial<typeof compProps>, newAntdModalProps?: Omit<Partial<DrawerProps>, 'open'>) => {
+    Object.assign(_drawerProps, newAntdModalProps);
+    Object.assign(compProps, newBodyProps);
+    _drawerProps.open = true;
+  };
+  const close = () => {
+    _drawerProps.open = false;
+  };
+
+  const DrawerFooter = defineComponent({
+    setup() {
+      const cancelBtnProps: ButtonProps = reactive({ onClick: close });
+      const confirmBtnProps: ButtonProps = reactive({
+        type: 'primary',
+        loading: toRef(() => (compRef as any)?.loading),
+        onClick: () => (compRef as any)?.confirm?.(),
+      });
+
+      return { cancelBtnProps, confirmBtnProps };
+    },
+    render() {
+      const { cancelBtnProps, confirmBtnProps } = this;
+
+      return h(ASpace, {}, () => [
+        h(AButton, cancelBtnProps, () => '取消'),
+        h(AButton, confirmBtnProps, () => '确定'),
+      ]);
+    },
+  });
+  const PresetComponent = defineComponent({
+    render() {
+      return h(ADrawer, _drawerProps, {
+        default: () => h(_comp.is, compProps as any),
+      });
+    },
+  });
+
+  _drawerProps.footer = _drawerProps.footer === undefined ? h(DrawerFooter) : _drawerProps.footer;
+  _drawerProps['onUpdate:open'] = (visiable) => {
+    _drawerProps.open = visiable;
+  };
+  (compProps as any).ref = compRef;
+  (compProps as any).onClose = close;
+
+  return { PresetComponent, drawerProps: _drawerProps, open, close };
+}

package/antd/hooks/useAntdForm.ts

@@ -25,7 +25,7 @@ interface Options<S, TS> {
   transform?: (state: S) => TS
 }
 
-function useAntdForm<S extends Record<string, any>, TS = S>(schemas: MaybeRefOrGetter<SchemaConfig<S>>, options?: Options<S, TS>) {
+function useAntdForm<S extends Record<string, unknown>, TS = S>(schemas: MaybeRefOrGetter<SchemaConfig<S>>, options?: Options<S, TS>) {
   const schemasR = toRef(schemas);
 
   const state = ref({} as S);

package/antd/hooks/useAntdModal.ts

@@ -33,7 +33,10 @@ export function useAntdModal<Comp extends Component>(
     ...defaultModalProps,
     ...isProxy(modalProps) ? toRefs(modalProps) : modalProps,
     confirmLoading: toRef(() => (compRef as any)?.loading),
-    onOk: () => (compRef as any)?.confirm?.(),
+    onOk: (e: MouseEvent) => {
+      (compRef as any)?.confirm?.(e);
+      modalProps.onOk?.(e);
+    },
   });
   const modalSlotName = _comp.type === 'body' ? 'default' : 'modalRender';
 

package/antd/hooks/useAntdTable.ts

@@ -55,9 +55,10 @@ export function useAntdTable<
     }
   };
   const defineColumns = (columnsGetter: () => LocalColumnsType) => computed(columnsGetter);
-  const defineRowSelection = (rowSelectionGetter: () => LocalTableRowSelection) => {
+  const defineRowSelection = (rowSelectionGetter: () => LocalTableRowSelection = () => ({})) => {
     const rowSelection = reactive(rowSelectionGetter());
 
+    rowSelection.preserveSelectedRowKeys ??= true;
     rowSelection.selectedRowKeys ??= [];
     rowSelection.onChange ??= keys => rowSelection.selectedRowKeys = keys;
 

package/libs/dayjs.ts

@@ -1,5 +1,12 @@
 import dayjs from 'dayjs';
 
+import relativeTime from 'dayjs/plugin/relativeTime';
+import 'dayjs/locale/zh';
+import 'dayjs/locale/en';
+
 export { isDayjs, unix, locale, extend } from 'dayjs';
 export type { Dayjs, PluginFunc, UnitType, UnitTypeLong, UnitTypeLongPlural, UnitTypeShort, QUnitType, ConfigType, ConfigTypeMap, OpUnitType, OptionType, ManipulateType } from 'dayjs';
 export default dayjs;
+
+dayjs.locale('zh');
+dayjs.extend(relativeTime);

package/libs/echarts.ts

@@ -1,4 +1,4 @@
-import echarts from 'echarts';
+import * as echarts from 'echarts';
 
 export type * from 'echarts/types/dist/echarts';
 

package/libs/vue-i18n.ts

@@ -0,0 +1,21 @@
+import type { I18nOptions } from 'vue-i18n';
+
+export * from 'vue-i18n';
+
+export type TDatetimeStyles = Record<
+  'date' | 'time' | 'full' | 'mdhms' | 'mdhm',
+  NonNullable<I18nOptions['datetimeFormats']>[string][string]
+>;
+
+export const presetDatetimeStyles: TDatetimeStyles = {
+  /** 年/月/日 */
+  date: { year: 'numeric', month: '2-digit', day: '2-digit' },
+  /** 时:分:秒 */
+  time: { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false },
+  /** 年/月/日 时:分:秒 */
+  full: { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false },
+  /** 月/日 时:分:秒 */
+  mdhms: { month: '2-digit', day: '2-digit', hour: 'numeric', minute: 'numeric', second: 'numeric', hour12: false },
+  /** 月/日 时:分 */
+  mdhm: { month: '2-digit', day: '2-digit', hour: 'numeric', minute: 'numeric', hour12: false },
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.2.0-beta.3",
+  "version": "0.2.0-beta.30",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -14,16 +14,41 @@
   },
   "peerDependencies": {
     "ant-design-vue": "4.1.2",
-    "vue": "3.4.19",
-    "vue-router": "4.2.5"
+    "vue": "3.4.21",
+    "vue-router": "4.3.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.515.0",
-    "@aws-sdk/lib-storage": "^3.515.0",
+    "@aws-sdk/client-s3": "^3.525.0",
+    "@aws-sdk/lib-storage": "^3.525.1",
     "@babel/generator": "^7.23.6",
-    "@babel/parser": "^7.23.9",
-    "@babel/traverse": "^7.23.9",
-    "@babel/types": "^7.23.9",
+    "@babel/parser": "^7.24.0",
+    "@babel/traverse": "^7.24.0",
+    "@babel/types": "^7.24.0",
+    "@ckeditor/ckeditor5-vue": "^5.1.0",
+    "@tanstack/vue-query": "^5.25.0",
+    "@vueuse/components": "^10.9.0",
+    "@vueuse/core": "^10.9.0",
+    "@vueuse/router": "^10.9.0",
+    "a-calc": "^1.3.11",
+    "ant-design-vue": "^4.1.2",
+    "archiver": "^6.0.2",
+    "axios": "^1.6.7",
+    "bignumber.js": "^9.1.2",
+    "chokidar": "^3.6.0",
+    "dayjs": "^1.11.10",
+    "echarts": "^5.4.3",
+    "execa": "^8.0.1",
+    "fast-glob": "^3.3.2",
+    "localstorage-slim": "^2.7.0",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "pinia": "^2.1.7",
+    "tsx": "^4.7.1",
+    "vue": "^3.4.21",
+    "vue-i18n": "^9.10.1",
+    "vue-router": "^4.3.0"
+  },
+  "devDependencies": {
     "@ckeditor/ckeditor5-adapter-ckfinder": "^41.1.0",
     "@ckeditor/ckeditor5-alignment": "^41.1.0",
     "@ckeditor/ckeditor5-autoformat": "^41.1.0",
@@ -54,38 +79,14 @@
     "@ckeditor/ckeditor5-theme-lark": "^41.1.0",
     "@ckeditor/ckeditor5-typing": "^41.1.0",
     "@ckeditor/ckeditor5-upload": "^41.1.0",
-    "@ckeditor/ckeditor5-vue": "^5.1.0",
     "@ckeditor/ckeditor5-word-count": "^41.1.0",
-    "@tanstack/vue-query": "^5.21.4",
-    "@vueuse/components": "^10.7.2",
-    "@vueuse/core": "^10.7.2",
-    "@vueuse/router": "^10.7.2",
-    "a-calc": "^1.3.8",
-    "ant-design-vue": "^4.1.2",
-    "archiver": "^6.0.1",
-    "axios": "^1.6.7",
-    "bignumber.js": "^9.1.2",
-    "chokidar": "^3.6.0",
-    "dayjs": "^1.11.10",
-    "echarts": "^5.4.3",
-    "execa": "^8.0.1",
-    "fast-glob": "^3.3.2",
-    "localstorage-slim": "^2.7.0",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "pinia": "^2.1.7",
-    "tsx": "^4.7.1",
-    "vue": "^3.4.19",
-    "vue-router": "^4.2.5"
-  },
-  "devDependencies": {
     "@peng_kai/lint": "^0.1.0",
     "@types/archiver": "^6.0.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "18.19.15",
     "@types/nprogress": "^0.2.3",
-    "type-fest": "^4.10.2",
-    "typescript": "^5.3.3",
-    "vue-component-type-helpers": "^1.8.27"
+    "type-fest": "^4.11.1",
+    "typescript": "^5.4.2",
+    "vue-component-type-helpers": "^2.0.6"
   }
 }

package/request/helpers.ts

@@ -1,68 +1,68 @@
-import type { AxiosInstance } from 'axios';
-
-export { isTimeout, getServices, getBaseUrlByEnv, ApiCode, ApiError };
-
-enum ApiCode {
-  NORMAL = 0, // 正常
-  UNKNOWN = -1, // 未知错误
-  TIMEOUT = -2, // 请求超时
-}
-
-function getServices() {
-  const serversModule = getServices.modules;
-  const servers: Record<string, { server: AxiosInstance } | undefined> = {};
-
-  for (const [key, module] of Object.entries(serversModule)) {
-    const name = key.match(/\/([0-9a-zA-Z]+)\.ts$/)?.[1];
-
-    if (name)
-      servers[`${name}.api`] = module as any;
-  }
-
-  return servers;
-}
-getServices.modules = {} as any;
-
-function isTimeout(error: any) {
-  return error?.message?.toLowerCase().includes('timeout');
-}
-
-function getBaseUrlByEnv(service: string, env: Record<string, string>) {
-  let serviceName = '';
-
-  if (/^https?:\/\//.test(service)) {
-    const fileName = service.split('/').pop();
-    serviceName = fileName?.split('.').shift() ?? '';
-  }
-  else {
-    serviceName = service;
-  }
-
-  if (!serviceName)
-    return '';
-
-  const [prefix, target] = env[`VITE_HTTP_PREFIX_${serviceName}`]?.split(' => ') ?? ['', ''];
-
-  return (prefix && target) ? prefix : '';
-}
-
-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;
-  }
-}
+import type { AxiosInstance } from 'axios';
+
+export { isTimeout, getServices, getBaseUrlByEnv, ApiCode, ApiError };
+
+enum ApiCode {
+  NORMAL = 0, // 正常
+  UNKNOWN = -1, // 未知错误
+  TIMEOUT = -2, // 请求超时
+}
+
+function getServices() {
+  const serversModule = getServices.modules;
+  const servers: Record<string, { server: AxiosInstance } | undefined> = {};
+
+  for (const [key, module] of Object.entries(serversModule)) {
+    const name = key.match(/\/([0-9a-zA-Z]+)\.ts$/)?.[1];
+
+    if (name)
+      servers[`${name}.api`] = module as any;
+  }
+
+  return servers;
+}
+getServices.modules = {} as any;
+
+function isTimeout(error: any) {
+  return error?.message?.toLowerCase().includes('timeout');
+}
+
+function getBaseUrlByEnv(service: string, env: Record<string, string>) {
+  let serviceName = '';
+
+  if (/^https?:\/\//.test(service)) {
+    const fileName = service.split('/').pop();
+    serviceName = fileName?.split('.').shift() ?? '';
+  }
+  else {
+    serviceName = service;
+  }
+
+  if (!serviceName)
+    return '';
+
+  const [prefix, target] = env[`VITE_HTTP_PREFIX_${serviceName}`]?.split(' => ') ?? ['', ''];
+
+  return (prefix && target) ? prefix : '';
+}
+
+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/interceptors/returnResultType.ts

@@ -7,15 +7,15 @@ import { ApiCode, ApiError, isTimeout } from '../helpers';
 export function returnResultType(): Parameters<AxiosInterceptorManager<any>['use']> {
   return [
     (resp) => {
-      const { resultType } = resp?.config;
+      const resultType = resp?.config?.resultType;
 
       if (resultType === 'api')
-        return resp.data;
+        return resp?.data;
 
       else if (resultType === 'axios')
         return resp;
 
-      return resp.data?.data;
+      return resp?.data?.data;
     },
     (error) => {
       let code = error?.response?.data?.code || error?.response?.status || ApiCode.UNKNOWN;

package/request/interceptors/toLogin.ts

@@ -1,26 +1,43 @@
-import type { AxiosInterceptorManager } from 'axios';
-
-const REDIRECT_KEY = 'redirect';
-
-export function toLogin(authPath = `${window.location.origin}/auth/login`, code = 15001): Parameters<AxiosInterceptorManager<any>['use']> {
-  return [
-    undefined,
-    (err) => {
-      if (err.code !== code)
-        throw err;
-
-      const currentURL = new URL(window.location.href);
-      const targetURL = new URL(authPath);
-
-      if (currentURL.searchParams.has(REDIRECT_KEY))
-        targetURL.searchParams.set(REDIRECT_KEY, currentURL.searchParams.get(REDIRECT_KEY)!);
-      else
-        targetURL.searchParams.set(REDIRECT_KEY, window.location.href);
-
-      if (currentURL.toString() === targetURL.toString())
-        return;
-
-      window.location.href = targetURL.toString();
-    },
-  ];
-}
+import type { AxiosInterceptorManager } from 'axios';
+
+const REDIRECT_KEY = 'redirect';
+
+interface IParams {
+  loginPath?: string
+  code?: number
+  toLogin?: (targetUrl: URL) => void
+}
+
+const defaultParams: Required<IParams> = {
+  loginPath: `${window.location.origin}/auth/login`,
+  code: 15001,
+  toLogin(targetUrl: URL) {
+    window.history.replaceState(null, '', targetUrl.toString());
+  },
+};
+
+export function toLogin(params: IParams = defaultParams): Parameters<AxiosInterceptorManager<any>['use']> {
+  const _params = { ...defaultParams, ...params };
+
+  return [
+    undefined,
+    (err) => {
+      if (err.code !== _params.code)
+        throw err;
+
+      const currentUrl = new URL(window.location.href);
+      const targetUrl = new URL(_params.loginPath);
+
+      if (currentUrl.searchParams.has(REDIRECT_KEY))
+        targetUrl.searchParams.set(REDIRECT_KEY, currentUrl.searchParams.get(REDIRECT_KEY)!);
+      else
+        targetUrl.searchParams.set(REDIRECT_KEY, window.location.href);
+
+      if (currentUrl.toString() === targetUrl.toString())
+        throw err;
+
+      _params.toLogin(targetUrl);
+      throw err;
+    },
+  ];
+}

package/request/request.ts

@@ -17,9 +17,6 @@ function createRequest<Req, OResp, Resp = Api.TransformPageResult<OResp>>(
   // 返回 API 数据中的 data 字段值，默认
   async function request(reqData: Req, config?: ReqConfig): Promise<Api.GetDataField<Resp>>;
   async function request(reqData: Req, config?: ReqConfig): Promise<any> {
-    // if (isSSR())
-    //   return null;
-
     const params = paramBuilder(reqData);
     const serviceName = params.headers?.['Service-Name'] ?? '';
     const service = createRequest.services[serviceName]?.server;