@peng_kai/kit 0.2.0-beta.27 → 0.2.0-beta.29

package/admin/components/rich-text/index.ts

@@ -1,2 +1,2 @@
-export { default as RichText } from './src/RichText.vue';
+export { default as RichText } from './src/RichText.new.vue';
 export { createImageUploaderForAws3 } from './src/imageUploader';

package/admin/components/rich-text/src/RichText.new.vue

@@ -0,0 +1,164 @@
+<script lang="ts">
+import { useIntervalFn } from '@vueuse/core';
+import CKEditor from '@ckeditor/ckeditor5-vue';
+import { shallowRef } from 'vue';
+import { useInjectDisabled } from 'ant-design-vue/es/config-provider/DisabledContext';
+import { defaultConfig } from './editorConfig';
+import 'https://cdn.ckeditor.com/ckeditor5/41.1.0/super-build/ckeditor.js';
+import 'https://cdn.ckeditor.com/ckeditor5/41.1.0/super-build/translations/zh-cn.js';
+
+function useClassicEditor() {
+  const ClassicEditor = shallowRef();
+
+  const { pause } = useIntervalFn(() => {
+    ClassicEditor.value = (window as any).CKEDITOR?.ClassicEditor;
+    ClassicEditor.value && pause();
+  }, 500);
+
+  return ClassicEditor;
+}
+</script>
+
+<script setup lang="ts">
+const props = defineProps(['modelValue', 'disabled', 'plugins']);
+const emits = defineEmits<{
+  (e: 'update:modelValue', value: string): void
+}>();
+
+const ClassicEditor = useClassicEditor();
+const disabled = useInjectDisabled();
+const editorConfig = { ...defaultConfig };
+editorConfig.extraPlugins = props.plugins;
+</script>
+
+<template>
+  <div class="editor-wrapper">
+    <CKEditor.component
+      v-if="ClassicEditor"
+      :modelValue="props.modelValue"
+      :editor="ClassicEditor"
+      :config="editorConfig"
+      :disabled="props.disabled ?? disabled"
+      @update:modelValue="v => emits('update:modelValue', v)"
+    />
+    <div v-else class="flex justify-center">
+      <i class="i-svg-spinners:180-ring-with-bg block text-5 text-$loading-color" />
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.editor-wrapper {
+  --loading-color: var(--antd-colorPrimary);
+
+  :deep(.ck-editor__main > .ck-content) {
+    height: 500px;
+    overflow: auto;
+  }
+}
+
+:root.dark .editor-wrapper {
+  /* Overrides the border radius setting in the theme. */
+  // --ck-border-radius: 4px;
+
+  /* Overrides the default font size in the theme. */
+  // --ck-font-size-base: 14px;
+
+  /* Helper variables to avoid duplication in the colors. */
+  --ck-custom-background: hsl(270deg 1% 29%);
+  --ck-custom-foreground: hsl(255deg 3% 18%);
+  --ck-custom-border: hsl(300deg 1% 22%);
+  --ck-custom-white: hsl(0deg 0% 100%);
+
+  /* -- Overrides generic colors. ------------------------------------------------------------- */
+
+  --ck-color-base-foreground: var(--ck-custom-background);
+  --ck-color-focus-border: hsl(208deg 90% 62%);
+  --ck-color-text: hsl(0deg 0% 98%);
+  --ck-color-shadow-drop: hsl(0deg 0% 0% / 20%);
+  --ck-color-shadow-inner: hsl(0deg 0% 0% / 10%);
+
+  /* -- Overrides the default .ck-button class colors. ---------------------------------------- */
+
+  --ck-color-button-default-background: var(--ck-custom-background);
+  --ck-color-button-default-hover-background: hsl(270deg 1% 22%);
+  --ck-color-button-default-active-background: hsl(270deg 2% 20%);
+  --ck-color-button-default-active-shadow: hsl(270deg 2% 23%);
+  --ck-color-button-default-disabled-background: var(--ck-custom-background);
+  --ck-color-button-on-background: var(--ck-custom-foreground);
+  --ck-color-button-on-hover-background: hsl(255deg 4% 16%);
+  --ck-color-button-on-active-background: hsl(255deg 4% 14%);
+  --ck-color-button-on-active-shadow: hsl(240deg 3% 19%);
+  --ck-color-button-on-disabled-background: var(--ck-custom-foreground);
+  --ck-color-button-action-background: hsl(168deg 76% 42%);
+  --ck-color-button-action-hover-background: hsl(168deg 76% 38%);
+  --ck-color-button-action-active-background: hsl(168deg 76% 36%);
+  --ck-color-button-action-active-shadow: hsl(168deg 75% 34%);
+  --ck-color-button-action-disabled-background: hsl(168deg 76% 42%);
+  --ck-color-button-action-text: var(--ck-custom-white);
+  --ck-color-button-save: hsl(120deg 100% 46%);
+  --ck-color-button-cancel: hsl(15deg 100% 56%);
+
+  /* -- Overrides the default .ck-dropdown class colors. -------------------------------------- */
+
+  --ck-color-dropdown-panel-background: var(--ck-custom-background);
+  --ck-color-dropdown-panel-border: var(--ck-custom-foreground);
+
+  /* -- Overrides the default .ck-splitbutton class colors. ----------------------------------- */
+
+  --ck-color-split-button-hover-background: var(--ck-color-button-default-hover-background);
+  --ck-color-split-button-hover-border: var(--ck-custom-foreground);
+
+  /* -- Overrides the default .ck-input class colors. ----------------------------------------- */
+
+  --ck-color-input-background: var(--ck-custom-background);
+  --ck-color-input-border: hsl(257deg 3% 43%);
+  --ck-color-input-text: hsl(0deg 0% 98%);
+  --ck-color-input-disabled-background: hsl(255deg 4% 21%);
+  --ck-color-input-disabled-border: hsl(250deg 3% 38%);
+  --ck-color-input-disabled-text: hsl(0deg 0% 78%);
+
+  /* -- Overrides the default .ck-labeled-field-view class colors. ---------------------------- */
+
+  --ck-color-labeled-field-label-background: var(--ck-custom-background);
+
+  /* -- Overrides the default .ck-list class colors. ------------------------------------------ */
+
+  --ck-color-list-background: var(--ck-custom-background);
+  --ck-color-list-button-hover-background: var(--ck-custom-foreground);
+  --ck-color-list-button-on-background: hsl(208deg 88% 52%);
+  --ck-color-list-button-on-text: var(--ck-custom-white);
+
+  /* -- Overrides the default .ck-balloon-panel class colors. --------------------------------- */
+
+  --ck-color-panel-background: var(--ck-custom-background);
+  --ck-color-panel-border: var(--ck-custom-border);
+
+  /* -- Overrides the default .ck-toolbar class colors. --------------------------------------- */
+
+  --ck-color-toolbar-background: var(--ck-custom-background);
+  --ck-color-toolbar-border: var(--ck-custom-border);
+
+  /* -- Overrides the default .ck-tooltip class colors. --------------------------------------- */
+
+  --ck-color-tooltip-background: hsl(252deg 7% 14%);
+  --ck-color-tooltip-text: hsl(0deg 0% 93%);
+
+  /* -- Overrides the default colors used by the ckeditor5-image package. --------------------- */
+
+  --ck-color-image-caption-background: hsl(0deg 0% 97%);
+  --ck-color-image-caption-text: hsl(0deg 0% 20%);
+
+  /* -- Overrides the default colors used by the ckeditor5-widget package. -------------------- */
+
+  --ck-color-widget-blurred-border: hsl(0deg 0% 87%);
+  --ck-color-widget-hover-border: hsl(43deg 100% 68%);
+  --ck-color-widget-editable-focus-background: var(--ck-custom-white);
+
+  /* -- Overrides the default colors used by the ckeditor5-link package. ---------------------- */
+
+  --ck-color-link-default: hsl(190deg 100% 75%);
+  --ck-color-base-background: #141414;
+  --ck-color-base-border: #424242;
+}
+</style>

package/admin/components/rich-text/src/RichText.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { useVModel } from '@vueuse/core';
+import { defineModel, defineProps, withDefaults } from 'vue';
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
 import { Alignment } from '@ckeditor/ckeditor5-alignment';
@@ -212,18 +212,15 @@ const props = withDefaults(defineProps<{
   modelValue: '',
   plugins: () => [],
 });
-const emits = defineEmits<{
-  (e: 'update:modelValue', value: string): void
-}>();
 
-const editorData = useVModel(props, 'modelValue', emits);
+const modelValue = defineModel({ default: '' });
 const localeEditorConfig = { ...editorConfig };
 localeEditorConfig.extraPlugins = [...props.plugins];
 </script>
 
 <template>
   <div class="editor-wrapper">
-    <CKEditor.component v-model="editorData" :editor="ClassicEditor" :config="localeEditorConfig" />
+    <CKEditor.component v-model="modelValue" :editor="ClassicEditor" :config="localeEditorConfig" />
   </div>
 </template>
 

package/admin/components/rich-text/src/editorConfig.ts

@@ -0,0 +1,126 @@
+export const defaultConfig: Record<string, any> = {
+  language: {
+    ui: 'zh-cn',
+  },
+  removePlugins: ['ImportWord', 'ExportWord', 'RevisionHistory', 'RealTimeCollaborativeEditing', 'RealTimeCollaborativeComments', 'RealTimeCollaborativeRevisionHistory', 'RealTimeCollaborativeTrackChanges', 'PresenceList', 'WProofreader', 'DocumentOutline', 'Comments', 'TrackChanges', 'TrackChangesData', 'TableOfContents', 'SlashCommand', 'PasteFromOfficeEnhanced', 'ContentTemplates', 'FormatPainter', 'Mentions', 'PageBreak', 'Pagination', 'AIAssistant', 'CaseChange', 'Template'],
+  toolbar: {
+    items: [
+      'undo',
+      'redo',
+      '|',
+      'showBlocks',
+      'selectAll',
+      '|',
+      'heading',
+      '|',
+      'fontSize',
+      'fontFamily',
+      'fontColor',
+      'fontBackgroundColor',
+      '|',
+      'bold',
+      'italic',
+      'underline',
+      {
+        label: 'Formatting',
+        icon: 'text',
+        items: ['strikethrough', 'subscript', 'superscript', 'code', 'horizontalLine', '|', 'removeFormat'],
+      },
+      '|',
+      'link',
+      'uploadImage',
+      'insertTable',
+      {
+        label: 'Insert',
+        icon: 'plus',
+        items: ['highlight', 'blockQuote', 'mediaEmbed', 'codeBlock', 'htmlEmbed'],
+      },
+      '|',
+      'alignment',
+      '|',
+      'bulletedList',
+      'numberedList',
+      'todoList',
+      'outdent',
+      'indent',
+      '|',
+      'sourceEditing',
+    ],
+    shouldNotGroupWhenFull: true,
+  },
+  htmlSupport: {
+    allow: [
+      {
+        name: /^.*$/,
+        styles: true,
+        attributes: true,
+        classes: true,
+      },
+    ],
+  },
+  fontSize: {
+    options: [10, 12, 14, 'default', 18, 20, 22],
+    supportAllValues: true,
+  },
+  image: {
+    styles: [
+      'alignCenter',
+      'alignLeft',
+      'alignRight',
+    ],
+    resizeOptions: [
+      { name: 'resizeImage:original', label: 'Original', value: null },
+      { name: 'resizeImage:25', label: '25%', value: '25' },
+      { name: 'resizeImage:50', label: '50%', value: '50' },
+      { name: 'resizeImage:75', label: '75%', value: '75' },
+    ],
+    toolbar: [
+      'imageTextAlternative',
+      'toggleImageCaption',
+      '|',
+      'imageStyle:inline',
+      'imageStyle:wrapText',
+      'imageStyle:breakText',
+      'imageStyle:side',
+      '|',
+      'resizeImage',
+    ],
+    resizeUnit: 'px',
+  },
+  list: {
+    properties: {
+      styles: true,
+      startIndex: true,
+      reversed: true,
+    },
+  },
+  link: {
+    addTargetToExternalLinks: true,
+    defaultProtocol: 'https://',
+    decorators: {
+      toggleDownloadable: {
+        mode: 'manual',
+        label: 'Downloadable',
+        attributes: {
+          download: 'file',
+        },
+      },
+    },
+  },
+  table: {
+    contentToolbar: [
+      'tableColumn',
+      'tableRow',
+      'mergeTableCells',
+      'tableProperties',
+      'tableCellProperties',
+      'toggleTableCaption',
+    ],
+  },
+  htmlEmbed: {
+    showPreviews: true,
+  },
+  wordCount: {
+    displayWords: true,
+  },
+};

package/admin/components/rich-text/src/imageUploader.ts

@@ -5,30 +5,32 @@ export { createImageUploaderForAws3 };
 
 function createImageUploaderForAws3(awsS3: AwsS3, rootDir?: string): PluginConstructor {
   return function (editor) {
-    editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
-      return {
-        async upload() {
-          const file = await loader.file;
+    setTimeout(() => {
+      editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
+        return {
+          async upload() {
+            const file = await loader.file;
 
-          if (file) {
-            const { uploader, fileURL } = await awsS3.upload(file, rootDir);
+            if (file) {
+              const { uploader, fileURL } = await awsS3.upload(file, rootDir);
 
-            uploader.on('httpUploadProgress', (progress) => {
-              loader.uploadTotal = progress.total ?? null;
-              loader.uploaded = progress.loaded ?? 0;
-            });
+              uploader.on('httpUploadProgress', (progress) => {
+                loader.uploadTotal = progress.total ?? null;
+                loader.uploaded = progress.loaded ?? 0;
+              });
 
-            await uploader.done();
+              await uploader.done();
 
-            return { default: fileURL };
-          }
+              return { default: fileURL };
+            }
 
-          return {};
-        },
-        abort() {
+            return {};
+          },
+          abort() {
 
-        },
+          },
+        };
       };
-    };
+    });
   };
 }

package/admin/components/scroll-nav/src/ScrollNav.vue

@@ -10,7 +10,7 @@ const $content = document.querySelector(props.selector) as HTMLElement;
 const $contentParent = $content.parentElement;
 const { height: contentParentH } = useElementSize($contentParent);
 const { height: contentH } = useElementSize($content);
-const visible = computed(() => contentParentH.value * 2 < contentH.value);
+const visible = computed(() => contentParentH.value * 1.5 < contentH.value);
 
 function scrollTo(top: number) {
   $contentParent?.scrollTo({ top });

package/admin/components/settings/src/Settings.vue

@@ -119,6 +119,9 @@ const antdPropsResolvers: Record<number, (config: IConfigDetail) => IConfigDetai
   },
 };
 const antdValueResolvers: Record<number, (value: any) => any> = {
+  [FormTypes.NUMBER_INPUT](value) {
+    return String(value);
+  },
   [FormTypes.CHECKBOX](value) {
     if (Array.isArray(value))
       return value.join(',');
@@ -211,6 +214,7 @@ const settingForm = useAntdForm(formSchema, {
     return mapValues(state, (v, k) => {
       const formType = configMap.value[k].form_type;
       const resolver = antdValueResolvers[formType];
+
       return resolver ? resolver(v) : v;
     });
   },
@@ -221,7 +225,7 @@ async function submitSetting() {
   const body = await settingForm.$form.validate?.().catch(() => {});
 
   if (body)
-    await settingMutator.mutateAsync({ requestBody: body });
+    await settingMutator.mutateAsync({ requestBody: settingForm.stateTF });
 }
 
 /** 重置表单内容 */

package/admin/defines/route/defineRoute.ts

@@ -1,14 +1,12 @@
 import type { RouteRecordRaw } from 'vue-router';
 import { definePage } from '../page';
 
-export { defineRoute, RouteSymbol };
-
-const RouteSymbol = Symbol('app-route');
+export { defineRoute };
 
 /** 定义路由 */
 function defineRoute(route: (params: { definePage: typeof definePage }) => RouteRecordRaw[]) {
   const routeFn: any = () => route({ definePage });
-  routeFn[RouteSymbol] = true;
+  routeFn.isRoute = true;
 
   return routeFn;
 }

package/admin/defines/route/getRoutes.ts

@@ -1,7 +1,6 @@
 import type { RouteRecordRaw } from 'vue-router';
 import merge from 'lodash-es/merge';
 import { ENV } from '../../../utils';
-import { RouteSymbol } from './defineRoute';
 
 export { getRoutes };
 
@@ -14,10 +13,11 @@ async function getRoutes() {
   let routes: RouteRecordRaw[] = [];
 
   for (const name in routeFiles) {
-    const module: any = await routeFiles[name]();
+    const moduleLoader: any = routeFiles[name];
+    const routeDefineFn = (typeof moduleLoader === 'function' ? await moduleLoader() : moduleLoader)?.default;
 
-    if (module?.default?.[RouteSymbol])
-      Array.prototype.push.apply(routes, module.default());
+    if (routeDefineFn?.isRoute)
+      routes.push(...routeDefineFn());
   }
 
   // 处理路由

package/admin/defines/route-guard/defineRouteGuard.ts

@@ -6,12 +6,9 @@ export interface IGuardConfig {
   setup: (router: Router) => void
 }
 
-// 路由守卫标识
-export const RouteGuardSymbol = Symbol('app-route-guard');
-
 // 定义路由守卫
 export function defineRouteGuard(guard: IGuardConfig) {
-  (guard as any)[RouteGuardSymbol] = true;
+  (guard as any).isRouteGuard = true;
   guard.order ??= 10;
 
   return guard;

package/admin/defines/route-guard/getRouteGuards.ts

@@ -1,5 +1,4 @@
 import { ENV } from '../../../utils';
-import { RouteGuardSymbol } from './defineRouteGuard';
 import type { IGuardConfig } from './defineRouteGuard';
 
 /**
@@ -14,13 +13,12 @@ export async function getRouteGuards() {
   const routeGuardRecord: { file: string, order: number }[] = [];
 
   for (const name in routeGuardFiles) {
-    const module: any = await routeGuardFiles[name]();
+    const moduleLoader: any = routeGuardFiles[name];
+    const routeGuard = (typeof moduleLoader === 'function' ? await moduleLoader() : moduleLoader)?.default;
 
-    if (module?.default?.[RouteGuardSymbol]) {
-      const guard = module.default;
-
-      routeGuards.push(guard);
-      routeGuardRecord.push({ file: name, order: guard.order });
+    if (routeGuard?.isRouteGuard) {
+      routeGuards.push(routeGuard);
+      routeGuardRecord.push({ file: name, order: routeGuard.order });
     }
   }
 

package/admin/defines/startup/defineStartup.ts

@@ -9,10 +9,8 @@ export type StartupFn = (
   hooks: IHooks
 ) => (void | Promise<void>);
 
-export const StartupSymbol = Symbol('app-startup');
-
 export function defineStartup(startup: StartupFn) {
-  (startup as any)[StartupSymbol] = true;
+  (startup as any).isAppStartup = true;
 
   return startup;
 }

package/admin/defines/startup/runStartup.ts

@@ -1,19 +1,17 @@
 import type { App } from 'vue';
 import { ENV } from '../../../utils';
-import { StartupSymbol } from './defineStartup';
 import type { StartupFn } from './defineStartup';
 
 export async function runStartup(app: App) {
-  const moduleLoaders = runStartup.modules as Record<string, Function>;
+  const moduleLoaders = runStartup.modules as Record<string, any>;
   const startupPaths: string[] = [];
   const onMountCallbacks: Function[] = [];
   (app as any).deps = {};
 
-  for (const [path, moduleLoader] of Object.entries(moduleLoaders)) {
-    const module: any = await moduleLoader();
-    const plugin: StartupFn = module?.default ?? {};
+  for (const [path, loader] of Object.entries(moduleLoaders)) {
+    const plugin: StartupFn = (typeof loader === 'function' ? await loader() : loader)?.default;
 
-    if (!plugin?.[StartupSymbol])
+    if (!(plugin as any)?.isAppStartup)
       continue;
 
     startupPaths.push(path);

package/admin/permission/routerGuard.ts

@@ -26,7 +26,7 @@ export function setupPermissionRouterGuard(router: Router, rouneNames: { index:
 
     // 未登录状态进入需要登录权限的页面
     else if (!isLogin && needLogin)
-      return next({ name: rouneNames.login, replace: true });
+      return next({ name: rouneNames.login, replace: true, query: { redirect: to.fullPath } });
 
     // 登录状态进入需要登录权限的页面，有权限直接通行
     else if (isLogin && needLogin && hasPermission)

package/admin/styles/classCover.scss

@@ -204,3 +204,93 @@
     flex: 1 1 auto;
   }
 }
+
+// Modal 组件中的 Card 组件样式（为了和原 Modal 组件一样）
+.ant-card.antd-cover__card-in-modal {
+  --padding-size: 22px;
+
+  pointer-events: all;
+
+  @media bp-lt-mobilel {
+    --padding-size: 16px;
+  }
+
+  .ant-card-head {
+    min-height: 56px;
+    padding: 0 var(--padding-size);
+
+    @media bp-lt-mobilel {
+      min-height: 51px;
+    }
+  }
+
+  .ant-card-body {
+    height: var(--body-height, auto);
+    min-height: var(--min-body-height, auto);
+    max-height: var(--max-body-height, auto);
+    padding: var(--padding-size);
+    overflow-y: auto;
+  }
+
+  .ant-card-extra .close-btn {
+    --icon-color: var(--antd-colorTextTertiary);
+    --bg-color: transparent;
+
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 22px;
+    height: 22px;
+    padding: 0;
+    font-size: 18px;
+    cursor: pointer;
+    background-color: var(--bg-color);
+    border: 0;
+    border-radius: 4px;
+    transition: all 100ms;
+
+    &::before,
+    &::after {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      display: block;
+      width: 70%;
+      height: 1.5px;
+      content: '';
+      background-color: var(--icon-color);
+    }
+
+    &::before {
+      transform: translate(-50%, -50%) rotateZ(45deg);
+    }
+
+    &::after {
+      transform: translate(-50%, -50%) rotateZ(-45deg);
+    }
+
+    &:hover {
+      --icon-color: var(--antd-colorText);
+      --bg-color: var(--antd-colorFillSecondary);
+    }
+  }
+
+  .ant-card-actions {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end !important;
+    min-height: 56px;
+    padding: 0 var(--padding-size);
+
+    > li {
+      width: auto !important;
+      margin: 0;
+      border-inline-end: none !important;
+
+      &:not(:last-child) {
+        margin-right: 8px;
+      }
+    }
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.2.0-beta.27",
+  "version": "0.2.0-beta.29",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -14,16 +14,41 @@
   },
   "peerDependencies": {
     "ant-design-vue": "4.1.2",
-    "vue": "3.4.19",
+    "vue": "3.4.21",
     "vue-router": "4.3.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.521.0",
-    "@aws-sdk/lib-storage": "^3.521.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.9",
+    "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.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,32 +79,7 @@
     "@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.24.1",
-    "@vueuse/components": "^10.8.0",
-    "@vueuse/core": "^10.8.0",
-    "@vueuse/router": "^10.8.0",
-    "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-i18n": "^9.9.1",
-    "vue-router": "^4.3.0"
-  },
-  "devDependencies": {
     "@peng_kai/lint": "^0.1.0",
     "@types/archiver": "^6.0.2",
     "@types/lodash-es": "^4.17.12",

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

@@ -2,25 +2,42 @@ import type { AxiosInterceptorManager } from 'axios';
 
 const REDIRECT_KEY = 'redirect';
 
-export function toLogin(authPath = `${window.location.origin}/auth/login`, code = 15001): Parameters<AxiosInterceptorManager<any>['use']> {
+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 !== code)
+      if (err.code !== _params.code)
         throw err;
 
-      const currentURL = new URL(window.location.href);
-      const targetURL = new URL(authPath);
+      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)!);
+      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);
+        targetUrl.searchParams.set(REDIRECT_KEY, window.location.href);
 
-      if (currentURL.toString() === targetURL.toString())
-        return;
+      if (currentUrl.toString() === targetUrl.toString())
+        throw err;
 
-      window.location.href = targetURL.toString();
+      _params.toLogin(targetUrl);
+      throw err;
     },
   ];
 }