@liujitcn/kratos-admin-core 0.0.52 → 0.0.54

package/dist/package/declarations/src/components/Dialog/FormDialog.vue.d.ts

@@ -1,5 +1,6 @@
 import type { FormRules } from "element-plus";
 import type { ProFormField, ProFormLabelPosition } from "../../components/ProForm/interface";
+import type { DialogOpenOptions } from "./interface";
 /** 表单弹窗组件属性。 */
 interface FormDialogProps {
     modelValue: boolean;
@@ -27,13 +28,19 @@ declare function validate(): Promise<boolean | undefined>;
 declare function resetFields(): void;
 /** 清理内部 ProForm 校验状态。 */
 declare function clearValidate(props?: string | string[]): void;
-declare var __VLS_24: string, __VLS_25: any, __VLS_28: {};
+/** 异步加载弹窗数据，并只提交最新一次打开请求。 */
+declare function open<T>(options: DialogOpenOptions<T>): Promise<boolean>;
+/** 关闭弹窗并使未完成的打开请求失效。 */
+declare function close(): void;
+declare var __VLS_25: string, __VLS_26: any, __VLS_29: {};
 type __VLS_Slots = {} & {
-    [K in NonNullable<typeof __VLS_24>]?: (props: typeof __VLS_25) => any;
+    [K in NonNullable<typeof __VLS_25>]?: (props: typeof __VLS_26) => any;
 } & {
-    footer?: (props: typeof __VLS_28) => any;
+    footer?: (props: typeof __VLS_29) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<FormDialogProps, {
+    open: typeof open;
+    close: typeof close;
     validate: typeof validate;
     resetFields: typeof resetFields;
     clearValidate: typeof clearValidate;

package/dist/package/declarations/src/components/Dialog/ProDialog.vue.d.ts

@@ -1,3 +1,4 @@
+import { type DialogOpenOptions } from "./interface";
 /** 通用弹窗组件属性。 */
 interface ProDialogProps {
     modelValue: boolean;
@@ -13,6 +14,10 @@ interface ProDialogProps {
     /** 是否展示弹窗底部操作区。 */
     showFooter?: boolean;
 }
+/** 异步加载弹窗数据，并只提交最新一次打开请求。 */
+declare function open<T>(options: DialogOpenOptions<T>): Promise<boolean>;
+/** 关闭弹窗并使未完成的打开请求失效。 */
+declare function close(): void;
 declare var __VLS_13: {
     close: () => void;
     titleId: string;
@@ -25,7 +30,10 @@ type __VLS_Slots = {} & {
 } & {
     footer?: (props: typeof __VLS_18) => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<ProDialogProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const __VLS_base: import("vue").DefineComponent<ProDialogProps, {
+    open: typeof open;
+    close: typeof close;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     confirm: () => any;
     close: () => any;
     "update:modelValue": (value: boolean) => any;

package/dist/package/declarations/src/components/Dialog/interface/index.d.ts

@@ -0,0 +1,16 @@
+/** 弹窗异步打开配置。 */
+export interface DialogOpenOptions<T> {
+    /** 加载弹窗需要展示的数据，不应在异步过程中修改页面状态。 */
+    load: () => Promise<T> | T;
+    /** 最新一次加载完成后提交数据并更新页面状态。 */
+    commit: (data: T) => void;
+}
+/** 弹窗异步打开控制器。 */
+export interface DialogRequestController {
+    /** 执行一次异步打开请求，并丢弃过期请求的结果。 */
+    open<T>(options: DialogOpenOptions<T>): Promise<boolean>;
+    /** 使当前未完成的打开请求失效。 */
+    invalidate(): void;
+}
+/** 创建弹窗异步打开控制器。 */
+export declare function createDialogRequestController(): DialogRequestController;

package/dist/package/declarations/src/locales/generated.d.ts

@@ -60,6 +60,8 @@ export declare const LOCALE_MESSAGES: {
         "common.language.ja-JP": string;
         "common.message.no_data": string;
         "common.message.operation_success": string;
+        "common.message.request_error": string;
+        "common.message.save_success": string;
         "common.message.system_error": string;
         "common.validation.phone_invalid": string;
         "common.validation.phone_required": string;
@@ -73,6 +75,7 @@ export declare const LOCALE_MESSAGES: {
         "common.status.enabled": string;
         "common.value.female": string;
         "common.value.male": string;
+        "common.message.unknown": string;
         "common.value.all": string;
         "core.auth.login_again": string;
         "core.auth.refresh_token_missing": string;
@@ -426,6 +429,8 @@ export declare const LOCALE_MESSAGES: {
         "common.language.ja-JP": string;
         "common.message.no_data": string;
         "common.message.operation_success": string;
+        "common.message.request_error": string;
+        "common.message.save_success": string;
         "common.message.system_error": string;
         "common.validation.phone_invalid": string;
         "common.validation.phone_required": string;
@@ -439,6 +444,7 @@ export declare const LOCALE_MESSAGES: {
         "common.status.enabled": string;
         "common.value.female": string;
         "common.value.male": string;
+        "common.message.unknown": string;
         "common.value.all": string;
         "core.auth.login_again": string;
         "core.auth.refresh_token_missing": string;
@@ -792,6 +798,8 @@ export declare const LOCALE_MESSAGES: {
         "common.language.ja-JP": string;
         "common.message.no_data": string;
         "common.message.operation_success": string;
+        "common.message.request_error": string;
+        "common.message.save_success": string;
         "common.message.system_error": string;
         "common.validation.phone_invalid": string;
         "common.validation.phone_required": string;
@@ -805,6 +813,7 @@ export declare const LOCALE_MESSAGES: {
         "common.status.enabled": string;
         "common.value.female": string;
         "common.value.male": string;
+        "common.message.unknown": string;
         "common.value.all": string;
         "core.auth.login_again": string;
         "core.auth.refresh_token_missing": string;
@@ -1158,6 +1167,8 @@ export declare const LOCALE_MESSAGES: {
         "common.language.ja-JP": string;
         "common.message.no_data": string;
         "common.message.operation_success": string;
+        "common.message.request_error": string;
+        "common.message.save_success": string;
         "common.message.system_error": string;
         "common.validation.phone_invalid": string;
         "common.validation.phone_required": string;
@@ -1171,6 +1182,7 @@ export declare const LOCALE_MESSAGES: {
         "common.status.enabled": string;
         "common.value.female": string;
         "common.value.male": string;
+        "common.message.unknown": string;
         "common.value.all": string;
         "core.auth.login_again": string;
         "core.auth.refresh_token_missing": string;

package/dist/package/src/components/Dialog/FormDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <ProDialog
+    ref="proDialogRef"
     :model-value="modelValue"
     :title="title"
     :width="width"
@@ -53,6 +54,7 @@ import ProDialog from "../../components/Dialog/ProDialog.vue";
 import ProForm from "../../components/ProForm/index.vue";
 import type { ProFormField, ProFormInstance, ProFormLabelPosition } from "../../components/ProForm/interface";
 import { useLocaleStore } from "../../locales";
+import type { DialogOpenOptions } from "./interface";
 
 const { t } = useLocaleStore();
 
@@ -105,6 +107,7 @@ const emit = defineEmits<{
 }>();
 
 const slots = useSlots();
+const proDialogRef = ref<InstanceType<typeof ProDialog>>();
 const proFormRef = ref<ProFormInstance>();
 
 /** 弹窗打开后再清理校验状态，兼容异步加载选项后才显示的表单。 */
@@ -160,7 +163,19 @@ function clearValidate(props?: string | string[]) {
   proFormRef.value?.clearValidate(props);
 }
 
+/** 异步加载弹窗数据，并只提交最新一次打开请求。 */
+function open<T>(options: DialogOpenOptions<T>) {
+  return proDialogRef.value?.open(options) ?? Promise.resolve(false);
+}
+
+/** 关闭弹窗并使未完成的打开请求失效。 */
+function close() {
+  proDialogRef.value?.close();
+}
+
 defineExpose({
+  open,
+  close,
   validate,
   resetFields,
   clearValidate

package/dist/package/src/components/Dialog/ProDialog.vue

@@ -34,7 +34,9 @@
 </template>
 
 <script setup lang="ts" name="ProDialog">
+import { watch } from "vue";
 import { useLocaleStore } from "../../locales";
+import { createDialogRequestController, type DialogOpenOptions } from "./interface";
 
 const { t } = useLocaleStore();
 
@@ -54,7 +56,7 @@ interface ProDialogProps {
   showFooter?: boolean;
 }
 
-withDefaults(defineProps<ProDialogProps>(), {
+const props = withDefaults(defineProps<ProDialogProps>(), {
   title: "",
   width: "500px",
   top: "8vh",
@@ -75,8 +77,31 @@ const emit = defineEmits<{
   closed: [];
 }>();
 
+const dialogRequestController = createDialogRequestController();
+
+watch(
+  () => props.modelValue,
+  value => {
+    if (!value) dialogRequestController.invalidate();
+  }
+);
+
+/** 异步加载弹窗数据，并只提交最新一次打开请求。 */
+async function open<T>(options: DialogOpenOptions<T>) {
+  const opened = await dialogRequestController.open(options);
+  if (opened) emit("update:modelValue", true);
+  return opened;
+}
+
+/** 关闭弹窗并使未完成的打开请求失效。 */
+function close() {
+  dialogRequestController.invalidate();
+  emit("update:modelValue", false);
+}
+
 /** 同步弹窗显示状态到外部。 */
 function handleVisibleChange(value: boolean) {
+  if (!value) dialogRequestController.invalidate();
   emit("update:modelValue", value);
 }
 
@@ -87,12 +112,13 @@ function handleConfirm() {
 
 /** 处理点击取消按钮后的回调，并主动关闭弹窗。 */
 function handleCancel() {
-  emit("update:modelValue", false);
+  close();
   emit("cancel");
 }
 
 /** 处理弹窗关闭时的回调。 */
 function handleClose() {
+  dialogRequestController.invalidate();
   emit("close");
 }
 
@@ -100,4 +126,6 @@ function handleClose() {
 function handleClosed() {
   emit("closed");
 }
+
+defineExpose({ open, close });
 </script>

package/dist/package/src/components/Dialog/interface/index.ts

@@ -0,0 +1,39 @@
+/** 弹窗异步打开配置。 */
+export interface DialogOpenOptions<T> {
+  /** 加载弹窗需要展示的数据，不应在异步过程中修改页面状态。 */
+  load: () => Promise<T> | T;
+  /** 最新一次加载完成后提交数据并更新页面状态。 */
+  commit: (data: T) => void;
+}
+
+/** 弹窗异步打开控制器。 */
+export interface DialogRequestController {
+  /** 执行一次异步打开请求，并丢弃过期请求的结果。 */
+  open<T>(options: DialogOpenOptions<T>): Promise<boolean>;
+  /** 使当前未完成的打开请求失效。 */
+  invalidate(): void;
+}
+
+/** 创建弹窗异步打开控制器。 */
+export function createDialogRequestController(): DialogRequestController {
+  let requestSerial = 0;
+
+  return {
+    async open<T>({ load, commit }: DialogOpenOptions<T>) {
+      const currentSerial = ++requestSerial;
+      let data: T;
+      try {
+        data = await load();
+      } catch (error) {
+        if (currentSerial !== requestSerial) return false;
+        throw error;
+      }
+      if (currentSerial !== requestSerial) return false;
+      commit(data);
+      return currentSerial === requestSerial;
+    },
+    invalidate() {
+      requestSerial += 1;
+    }
+  };
+}

package/dist/package/src/components/ImportExcel/index.vue

@@ -97,7 +97,7 @@ const downloadTemp = () => {
 const uploadExcel = async (param: UploadRequestOptions) => {
   let excelFormData = new FormData();
   excelFormData.append("file", param.file);
-  excelFormData.append("isCover", isCover.value as unknown as Blob);
+  excelFormData.append("isCover", String(isCover.value));
   await parameter.value.importApi!(excelFormData);
   parameter.value.getTableList && parameter.value.getTableList();
   dialogVisible.value = false;

package/dist/package/src/directives/modules/auth.ts

@@ -7,18 +7,27 @@ import type { Directive, DirectiveBinding } from "vue";
 
 const GLOBAL_AUTH_BUTTON_KEY = "__global__";
 
+const originalDisplayMap = new WeakMap<HTMLElement, string>();
+
+/** 根据当前按钮权限更新元素可见性。 */
+function updateAuthElement(el: HTMLElement, binding: DirectiveBinding) {
+  const { value } = binding;
+  const authStore = useAuthStore();
+  const currentPageRoles =
+    authStore.authButtonListGet[authStore.routeName] ?? authStore.authButtonListGet[GLOBAL_AUTH_BUTTON_KEY] ?? [];
+  const hasPermission =
+    value instanceof Array && value.length
+      ? value.every(item => currentPageRoles.includes(item))
+      : currentPageRoles.includes(value);
+  if (!originalDisplayMap.has(el)) originalDisplayMap.set(el, el.style.display);
+  el.style.display = hasPermission ? (originalDisplayMap.get(el) ?? "") : "none";
+}
+
 const auth: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding) {
-    const { value } = binding;
-    const authStore = useAuthStore();
-    const currentPageRoles =
-      authStore.authButtonListGet[authStore.routeName] ?? authStore.authButtonListGet[GLOBAL_AUTH_BUTTON_KEY] ?? [];
-    if (value instanceof Array && value.length) {
-      const hasPermission = value.every(item => currentPageRoles.includes(item));
-      if (!hasPermission) el.remove();
-    } else {
-      if (!currentPageRoles.includes(value)) el.remove();
-    }
+  mounted: updateAuthElement,
+  updated: updateAuthElement,
+  unmounted(el: HTMLElement) {
+    originalDisplayMap.delete(el);
   }
 };
 

package/dist/package/src/hooks/useTable.ts

@@ -15,6 +15,7 @@ export const useTable = (
   dataCallBack?: (data: any) => any,
   requestError?: (error: any) => void
 ) => {
+  let requestSerial = 0;
   const state = reactive<Table.StateProps>({
     // 表格加载状态
     loading: false,
@@ -58,11 +59,13 @@ export const useTable = (
    * */
   const getTableList = async () => {
     if (!api) return;
+    const currentRequestSerial = ++requestSerial;
     state.loading = true;
     try {
       // 先把初始化参数和分页参数放到总参数里面
       Object.assign(state.totalParam, initParam, isPageable ? pageParam.value : {});
       let { data } = await api({ ...state.searchInitParam, ...state.totalParam });
+      if (currentRequestSerial !== requestSerial) return;
       dataCallBack && (data = dataCallBack(data));
       state.tableData = isPageable ? data.list : data;
       // 解构后台返回的分页数据 (如果有分页更新分页信息)
@@ -72,9 +75,10 @@ export const useTable = (
         state.pageable.total = Number.isFinite(total) && total >= 0 ? total : 0;
       }
     } catch (error) {
+      if (currentRequestSerial !== requestSerial) return;
       requestError && requestError(error);
     } finally {
-      state.loading = false;
+      if (currentRequestSerial === requestSerial) state.loading = false;
     }
   };
 

package/dist/package/src/locales/en-US.json

@@ -55,6 +55,8 @@
   "common.language.ja-JP": "Japanese",
   "common.message.no_data": "No data",
   "common.message.operation_success": "Operation completed",
+  "common.message.request_error": "Request failed",
+  "common.message.save_success": "Saved successfully",
   "common.message.system_error": "System error",
   "common.validation.phone_invalid": "Enter a valid phone number",
   "common.validation.phone_required": "Enter a phone number",
@@ -68,6 +70,7 @@
   "common.status.enabled": "Enabled",
   "common.value.female": "Female",
   "common.value.male": "Male",
+  "common.message.unknown": "Unknown",
   "common.value.all": "All",
   "core.auth.login_again": "Log in again",
   "core.auth.refresh_token_missing": "Refresh token is missing",

package/dist/package/src/locales/ja-JP.json

@@ -55,6 +55,8 @@
   "common.language.ja-JP": "日本語",
   "common.message.no_data": "データはまだありません",
   "common.message.operation_success": "操作は成功しました",
+  "common.message.request_error": "リクエストに失敗しました",
+  "common.message.save_success": "保存しました",
   "common.message.system_error": "システムエラー",
   "common.validation.phone_invalid": "正しい携帯電話番号を入力してください",
   "common.validation.phone_required": "携帯電話番号を入力してください",
@@ -68,6 +70,7 @@
   "common.status.enabled": "有効にする",
   "common.value.female": "女性",
   "common.value.male": "男性",
+  "common.message.unknown": "不明",
   "common.value.all": "すべて",
   "core.auth.login_again": "再度ログインしてください",
   "core.auth.refresh_token_missing": "リフレッシュトークンが存在しません",

package/dist/package/src/locales/zh-CN.json

@@ -55,6 +55,8 @@
   "common.language.ja-JP": "日语",
   "common.message.no_data": "暂无数据",
   "common.message.operation_success": "操作成功",
+  "common.message.request_error": "请求失败",
+  "common.message.save_success": "保存成功",
   "common.message.system_error": "系统出错",
   "common.validation.phone_invalid": "请输入正确的手机号码",
   "common.validation.phone_required": "请输入手机号码",
@@ -68,6 +70,7 @@
   "common.status.enabled": "启用",
   "common.value.female": "女",
   "common.value.male": "男",
+  "common.message.unknown": "未知",
   "common.value.all": "全部",
   "core.auth.login_again": "重新登录",
   "core.auth.refresh_token_missing": "刷新令牌不存在",

package/dist/package/src/locales/zh-TW.json

@@ -55,6 +55,8 @@
   "common.language.ja-JP": "日語",
   "common.message.no_data": "暫無資料",
   "common.message.operation_success": "操作成功",
+  "common.message.request_error": "請求失敗",
+  "common.message.save_success": "儲存成功",
   "common.message.system_error": "系統出錯",
   "common.validation.phone_invalid": "請輸入正確的手機號碼",
   "common.validation.phone_required": "請輸入手機號碼",
@@ -68,6 +70,7 @@
   "common.status.enabled": "啟用",
   "common.value.female": "女",
   "common.value.male": "男",
+  "common.message.unknown": "未知",
   "common.value.all": "全部",
   "core.auth.login_again": "重新登入",
   "core.auth.refresh_token_missing": "重新整理令牌不存在",

package/dist/package/src/routers/index.ts

@@ -18,6 +18,12 @@ const routerMode = {
   history: () => createWebHistory()
 };
 
+/** 校验登录回跳地址只能是站内路径。 */
+function resolveSafeRedirect(path: string) {
+  if (!path || path === LOGIN_URL || path.startsWith("//") || /^[a-z][a-z\d+.-]*:/i.test(path)) return HOME_URL;
+  return path.startsWith("/") ? path : HOME_URL;
+}
+
 /**
  * @description 📚 路由参数配置简介
  * @param path ==> 路由菜单访问路径
@@ -63,8 +69,7 @@ router.beforeEach(async to => {
     }
     if (hasAccessToken) {
       // 登录态访问登录页时优先回到显式 redirect，避免 from 为根路径时触发重复重定向。
-      const targetPath = redirectQuery && redirectQuery !== LOGIN_URL ? redirectQuery : HOME_URL;
-      return targetPath;
+      return resolveSafeRedirect(redirectQuery);
     }
     resetRouter();
     return true;

package/dist/package/src/stores/modules/user.ts

@@ -9,6 +9,7 @@ import { UserState } from "../../stores/interface";
 import piniaPersistConfig from "../../stores/helper/persist";
 import { useDictStoreHook } from "../../stores/modules/dict";
 import { useLockScreenStore } from "../../stores/modules/lockScreen";
+import { useAuthStore } from "../../stores/modules/auth";
 
 const defaultUserInfo: UserInfoForm = {
   user_name: "",
@@ -56,7 +57,7 @@ export const useUserStore = defineStore("admin-user", {
     /** 根据接口返回统一更新令牌信息 */
     updateTokenAuth(accessToken: string, tokenType: string, expiresIn?: number) {
       const tokenPrefix = tokenType ? `${tokenType} ` : "";
-      const expiresAt = expiresIn ? Date.now() + expiresIn * 1000 : 0;
+      const expiresAt = expiresIn && expiresIn > 0 ? Date.now() + expiresIn * 1000 : Number.MAX_SAFE_INTEGER;
 
       this.authInvalidated = false;
       this.setToken(`${tokenPrefix}${accessToken}`.trim());
@@ -98,6 +99,7 @@ export const useUserStore = defineStore("admin-user", {
       // 清理登录态时同步清空字典缓存，避免切换账号后读到旧字典。
       useDictStoreHook().clearDictionaryCache();
       useLockScreenStore().clearLock();
+      useAuthStore().$reset();
       this.authVersion += 1;
       this.authInvalidated = true;
       this.setToken("");

package/dist/package/src/utils/utils.ts

@@ -32,9 +32,11 @@ export function formatDateTime(value?: string | number | Date) {
 export function formatSrc(src: string) {
   const value = String(src ?? "").trim();
   if (!value) return value;
-  if (/^(https?:)?\/\//.test(value) || value.startsWith("data:") || value.startsWith("blob:")) {
+  if (/^(https?:)?\/\//.test(value) || value.startsWith("blob:")) {
     return value;
   }
+  if (value.startsWith("data:")) return /^data:image\/(?:gif|jpe?g|png|webp|bmp);base64,/i.test(value) ? value : "";
+  if (/^[a-z][a-z0-9+.-]*:/i.test(value)) return "";
 
   const configuredBase = String(import.meta.env.VITE_APP_STATIC_URL ?? "").trim();
   const staticBase = configuredBase

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-core",
   "private": false,
-  "version": "0.0.52",
+  "version": "0.0.54",
   "type": "module",
   "description": "kratos-admin frontend runtime and base modules",
   "author": {
@@ -236,7 +236,7 @@
   "scripts": {
     "build": "pnpm build:package",
     "build:package": "node ../../scripts/build-package.mjs .",
-    "test": "tsc -p tsconfig.test.json && node --test dist/test/tests/modules.test.js dist/test/tests/dict.test.js dist/test/tests/menu.test.js dist/test/tests/source-patterns.test.js dist/test/tests/codegen-hmr.test.js",
+    "test": "tsc -p tsconfig.test.json && node --test dist/test/tests/modules.test.js dist/test/tests/dict.test.js dist/test/tests/menu.test.js dist/test/tests/source-patterns.test.js dist/test/tests/codegen-hmr.test.js dist/test/tests/dialog-request.test.js",
     "type:check": "vue-tsc --noEmit --skipLibCheck"
   }
 }