@liujitcn/kratos-uni-app-core 0.0.21 → 0.0.24

package/src/views/pages/index/index.vue

@@ -7,8 +7,8 @@ import { useI18n } from '../../../locales'
 
 const settingStore = useSettingStore()
 const { t } = useI18n()
-const mainTitle = computed(() => settingStore.getData('mainTitle') || t('core.home.mainTitle'))
-const subTitle = computed(() => settingStore.getData('subTitle') || t('core.home.subTitle'))
+const mainTitle = computed(() => settingStore.getData('mainTitle') || t('core.home.main_title'))
+const subTitle = computed(() => settingStore.getData('subTitle') || t('core.home.sub_title'))
 const appLogo = computed(() => settingStore.getData('appLogo') || defaultLogo)
 
 onLoad(() => {
@@ -27,7 +27,7 @@ onLoad(() => {
     </view>
 
     <view class="section">
-      <text class="section-title">{{ t('core.home.techStack') }}</text>
+      <text class="section-title">{{ t('core.home.tech_stack') }}</text>
       <view class="info-list">
         <view class="info-row">
           <text class="info-label">{{ t('core.home.framework') }}</text>
@@ -38,38 +38,38 @@ onLoad(() => {
           <text class="info-value">TypeScript</text>
         </view>
         <view class="info-row">
-          <text class="info-label">{{ t('core.home.stateManagement') }}</text>
+          <text class="info-label">{{ t('core.home.state_management') }}</text>
           <text class="info-value">Pinia</text>
         </view>
         <view class="info-row">
-          <text class="info-label">{{ t('core.home.styleSolution') }}</text>
+          <text class="info-label">{{ t('core.home.style_solution') }}</text>
           <text class="info-value">Sass + rpx</text>
         </view>
       </view>
     </view>
 
     <view class="section">
-      <text class="section-title">{{ t('core.home.demoScope') }}</text>
+      <text class="section-title">{{ t('core.home.demo_scope') }}</text>
       <view class="demo-list">
         <view class="demo-item">
           <view class="demo-dot">1</view>
           <view class="demo-copy">
-            <text class="demo-title">{{ t('core.home.crossPlatform') }}</text>
-            <text class="demo-desc">{{ t('core.home.crossPlatformDescription') }}</text>
+            <text class="demo-title">{{ t('core.home.cross_platform') }}</text>
+            <text class="demo-desc">{{ t('core.home.cross_platform_description') }}</text>
           </view>
         </view>
         <view class="demo-item">
           <view class="demo-dot">2</view>
           <view class="demo-copy">
-            <text class="demo-title">{{ t('core.home.accountCapability') }}</text>
-            <text class="demo-desc">{{ t('core.home.accountCapabilityDescription') }}</text>
+            <text class="demo-title">{{ t('core.home.account_capability') }}</text>
+            <text class="demo-desc">{{ t('core.home.account_capability_description') }}</text>
           </view>
         </view>
         <view class="demo-item">
           <view class="demo-dot">3</view>
           <view class="demo-copy">
-            <text class="demo-title">{{ t('core.home.staticHome') }}</text>
-            <text class="demo-desc">{{ t('core.home.staticHomeDescription') }}</text>
+            <text class="demo-title">{{ t('core.home.static_home') }}</text>
+            <text class="demo-desc">{{ t('core.home.static_home_description') }}</text>
           </view>
         </view>
       </view>

package/src/views/pages/login/login.vue

@@ -19,7 +19,7 @@ const userStore = useUserStore()
 const settingStore = useSettingStore()
 const { locale, setLocale, t } = useI18n()
 const localeOptions = computed(() => getLanguageOptions())
-const localeLabels = computed(() => localeOptions.value.map((item) => item.language_name))
+const localeLabels = computed(() => localeOptions.value.map((item) => item.native_name))
 const localeIndex = computed(() =>
   Math.max(
     0,
@@ -31,10 +31,10 @@ const loginSettingsReady = ref(false)
 let loginSettingsPromise: Promise<boolean> | undefined
 
 const configuredMainTitle = computed(
-  () => settingStore.getData('mainTitle') || t('core.home.mainTitle'),
+  () => settingStore.getData('mainTitle') || t('core.home.main_title'),
 )
 const configuredSubTitle = computed(
-  () => settingStore.getData('subTitle') || t('core.login.defaultSubTitle'),
+  () => settingStore.getData('subTitle') || t('core.login.default_sub_title'),
 )
 const configuredAppLogo = computed(() => settingStore.getData('appLogo') || defaultLogo)
 const showTenantCode = computed(() => settingStore.getData('showTenantCode') !== 'false')
@@ -121,7 +121,7 @@ const resolveMiniCaptchaImage = (payload: string, captchaId: string) => {
       data: payload.slice(commaIndex + 1),
       encoding: 'base64',
       success: () => resolve(filePath),
-      fail: () => reject(new Error(t('core.login.captchaWriteFailed'))),
+      fail: () => reject(new Error(t('core.login.captcha_write_failed'))),
     })
   })
 }
@@ -137,7 +137,7 @@ const refreshMiniCaptcha = async () => {
     miniForm.captcha_id = captcha.captcha_id
     miniForm.captcha_code = ''
   } catch {
-    await uni.showToast({ icon: 'none', title: t('core.login.captchaLoadFailed') })
+    await uni.showToast({ icon: 'none', title: t('core.login.captcha_load_failed') })
   }
 }
 
@@ -171,7 +171,7 @@ const wxLogin = async () => {
   try {
     loginCode = (await wx.login()).code
   } catch {
-    await uni.showToast({ icon: 'none', title: t('core.login.wechatFailed') })
+    await uni.showToast({ icon: 'none', title: t('core.login.wechat_failed') })
     loading.value = false
     return
   }
@@ -188,7 +188,7 @@ const wxLogin = async () => {
     await loginSuccess()
   } catch (error) {
     if (!isWechatUnboundError(error)) {
-      await uni.showToast({ icon: 'none', title: t('core.login.wechatFailed') })
+      await uni.showToast({ icon: 'none', title: t('core.login.wechat_failed') })
       return
     }
     miniBinding.value = true
@@ -207,7 +207,7 @@ const bindMiniAccount = async () => {
     return
   }
   if (!miniForm.user_name || !miniPasswordValue.value) {
-    await uni.showToast({ icon: 'none', title: t('core.login.userNamePassword') })
+    await uni.showToast({ icon: 'none', title: t('core.login.user_name_password') })
     return
   }
   if (!miniForm.captcha_id || !miniForm.captcha_code) {
@@ -216,7 +216,10 @@ const bindMiniAccount = async () => {
   }
   loading.value = true
   try {
-    const password = await encryptPassword(miniPasswordValue.value, PASSWORD_CRYPTO_SCENE.LOGIN)
+    const password = await encryptPassword(
+      miniPasswordValue.value,
+      PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_LOGIN,
+    )
     const code = (await wx.login()).code
     await userStore.bindOauthSession({
       provider: wechatMiniProvider,
@@ -338,7 +341,7 @@ const behaviorCaptchaConfig = computed(() => {
       verticalPadding: 0,
       horizontalPadding: 0,
       iconSize: 20,
-      title: t('core.login.behaviorRotate'),
+      title: t('core.login.behavior_rotate'),
     }
   }
   return {
@@ -354,8 +357,8 @@ const behaviorCaptchaConfig = computed(() => {
     dotSize: 20,
     title:
       currentCaptchaType.value === 'click'
-        ? t('core.login.behaviorClick')
-        : t('core.login.behaviorPuzzle'),
+        ? t('core.login.behavior_click')
+        : t('core.login.behavior_puzzle'),
   }
 })
 const behaviorCaptchaTheme = {
@@ -377,11 +380,11 @@ const behaviorCaptchaTheme = {
 const getCaptcha = async () => {
   const requestedCaptchaType = configuredCaptchaType.value
   if (!requestedCaptchaType) {
-    throw new Error(t('core.login.captchaTypeMissing'))
+    throw new Error(t('core.login.captcha_type_missing'))
   }
   const data = await defLoginService.Captcha({ type: requestedCaptchaType })
   if (!data.type) {
-    throw new Error(t('core.login.captchaTypeResponseMissing'))
+    throw new Error(t('core.login.captcha_type_response_missing'))
   }
   currentCaptchaType.value = data.type
   if (!isBehaviorCaptcha.value) {
@@ -405,7 +408,7 @@ const refreshCaptcha = async () => {
     behaviorDialogVisible.value = false
     await uni.showToast({
       icon: 'none',
-      title: error instanceof Error ? error.message : t('core.login.captchaLoadFailed'),
+      title: error instanceof Error ? error.message : t('core.login.captcha_load_failed'),
     })
     return false
   }
@@ -473,7 +476,7 @@ const validateLoginForm = async () => {
   if (!form.value.user_name) {
     await uni.showToast({
       icon: 'none',
-      title: t('core.login.userName'),
+      title: t('core.login.user_name'),
     })
     return false
   }
@@ -503,7 +506,10 @@ const verifyCaptchaToken = async (captchaCode: string) => {
 }
 // 执行真正的账号登录流程。
 const submitLogin = async (captchaCode: string) => {
-  const password = await encryptPassword(passwordValue.value, PASSWORD_CRYPTO_SCENE.LOGIN)
+  const password = await encryptPassword(
+    passwordValue.value,
+    PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_LOGIN,
+  )
   return userStore.login({
     ...form.value,
     tenant_code: showTenantCode.value ? form.value.tenant_code : '0000',
@@ -591,7 +597,7 @@ const onSubmit = async () => {
 const loginSuccess = async () => {
   await userStore.getUserProfile()
   // 成功提示
-  await uni.showToast({ icon: 'success', title: t('core.login.loginSuccess') })
+  await uni.showToast({ icon: 'success', title: t('core.login.login_success') })
   setTimeout(() => {
     const lastRoute = uni.getStorageSync('lastRoute') || homeTabPage
     if (lastRoute.startsWith(homeTabPage)) {
@@ -610,7 +616,7 @@ const checkedAgreePrivacy = async () => {
   }
 
   if (!settingStore.getData('serviceProtocol') || !settingStore.getData('privacyProtocol')) {
-    await uni.showToast({ icon: 'none', title: t('core.login.protocolMissing') })
+    await uni.showToast({ icon: 'none', title: t('core.login.protocol_missing') })
     return false
   }
 
@@ -623,7 +629,7 @@ const checkedAgreePrivacy = async () => {
   return new Promise<boolean>((resolve) => {
     uni.showModal({
       title: t('common.title.notice'),
-      content: t('core.login.protocolPrompt'),
+      content: t('core.login.protocol_prompt'),
       confirmText: t('common.action.confirm'),
       cancelText: t('common.action.cancel'),
       success: ({ confirm }) => {
@@ -654,7 +660,7 @@ const loadLoginSettings = () => {
       // #ifdef H5
       const captchaType = configuredCaptchaType.value
       if (!captchaType) {
-        throw new Error(t('core.login.captchaTypeMissing'))
+        throw new Error(t('core.login.captcha_type_missing'))
       }
       currentCaptchaType.value = captchaType
       await loadPageCaptcha()
@@ -667,7 +673,7 @@ const loadLoginSettings = () => {
     } catch (error) {
       await uni.showToast({
         icon: 'none',
-        title: error instanceof Error ? error.message : t('core.protocol.loadFailed'),
+        title: error instanceof Error ? error.message : t('core.protocol.load_failed'),
       })
       loginSettingsPromise = undefined
       return false
@@ -722,7 +728,7 @@ onLoad(() => {
           class="login-input"
           type="text"
           confirm-type="next"
-          :placeholder="t('core.login.userNameMobile')"
+          :placeholder="t('core.login.user_name_mobile')"
           @confirm="onSubmit"
         />
         <input
@@ -760,7 +766,7 @@ onLoad(() => {
         <view v-if="behaviorDialogVisible" class="login-behavior-mask">
           <view class="login-behavior-panel">
             <view v-if="behaviorLoading" class="login-behavior-loading">{{
-              t('core.login.behaviorLoading')
+              t('core.login.behavior_loading')
             }}</view>
             <GoCaptchaUni
               :type="currentCaptchaType"
@@ -787,7 +793,7 @@ onLoad(() => {
           {{ t('core.login.wechat') }}
         </button>
         <view v-else class="login-form">
-          <view class="login-bind-tip">{{ t('core.login.wechatBindTip') }}</view>
+          <view class="login-bind-tip">{{ t('core.login.wechat_bind_tip') }}</view>
           <input
             v-if="showTenantCode"
             v-model="miniForm.tenant_code"
@@ -799,7 +805,7 @@ onLoad(() => {
             v-model="miniForm.user_name"
             class="login-input"
             type="text"
-            :placeholder="t('core.login.userNameMobile')"
+            :placeholder="t('core.login.user_name_mobile')"
           />
           <input
             v-model="miniPasswordValue"
@@ -825,7 +831,7 @@ onLoad(() => {
             :loading="loading"
             @tap="bindMiniAccount"
           >
-            {{ t('core.login.bindWechat') }}
+            {{ t('core.login.bind_wechat') }}
           </button>
         </view>
         <!-- #endif -->
@@ -833,11 +839,11 @@ onLoad(() => {
       <view class="login-tips" :class="{ animate__shakeY: isAgreePrivacyShakeY }">
         <view class="login-agreement" @tap="toggleAgreePrivacy">
           <view class="login-agree-icon" :class="{ checked: isAgreePrivacy }"></view>
-          <text class="login-agree-desc">{{ t('core.login.agreePrefix') }}</text>
+          <text class="login-agree-desc">{{ t('core.login.agree_prefix') }}</text>
           <text class="login-agree-link" @tap.stop="onOpenServiceProtocol">{{
             t('core.login.service')
           }}</text>
-          <text class="login-agree-separator">{{ t('core.login.agreeSeparator') }}</text>
+          <text class="login-agree-separator">{{ t('core.login.agree_separator') }}</text>
           <text class="login-agree-link" @tap.stop="onOpenPrivacyContract">{{
             t('core.login.privacy')
           }}</text>
@@ -1149,16 +1155,22 @@ onLoad(() => {
   .login-agreement {
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
     justify-content: center;
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
     gap: 6rpx;
-    white-space: nowrap;
+    box-sizing: border-box;
   }
 
   .login-agree-separator {
-    white-space: nowrap;
+    min-width: 0;
+    overflow-wrap: anywhere;
   }
 
   .login-agree-icon {
+    flex: 0 0 auto;
     width: 26rpx;
     height: 26rpx;
     margin-right: 2rpx;
@@ -1175,13 +1187,15 @@ onLoad(() => {
   }
 
   .login-agree-link {
-    white-space: nowrap;
+    min-width: 0;
+    overflow-wrap: anywhere;
     color: #28bb9c;
   }
 
   .login-agree-desc {
+    min-width: 0;
+    overflow-wrap: anywhere;
     color: #9ca3af;
-    white-space: nowrap;
   }
 }
 </style>

package/src/views/pages/login/protocal.vue

@@ -55,7 +55,7 @@ const loadProtocol = async (type?: string) => {
     await settingStore.loadData()
     const protocol = settingStore.getData(key)
     if (!protocol) {
-      throw new Error(t('core.protocol.notConfigured', { title }))
+      throw new Error(t('core.protocol.not_configured', { title }))
     }
 
     await uni.setNavigationBarTitle({ title })
@@ -63,7 +63,7 @@ const loadProtocol = async (type?: string) => {
   } catch (error) {
     await uni.showToast({
       icon: 'none',
-      title: error instanceof Error ? error.message : t('core.protocol.loadFailed'),
+      title: error instanceof Error ? error.message : t('core.protocol.load_failed'),
     })
     setTimeout(() => {
       uni.navigateBack()

package/src/views/pages/status/index.vue

@@ -13,18 +13,19 @@ const stateTitle = computed(() =>
   state.value === 'BOOTSTRAP_LOADING' ? t('core.status.loading') : t(`core.status.${state.value}`),
 )
 
-onLoad(async (options) => {
+onLoad((options) => {
   state.value = (options?.state as BootstrapViewKey | undefined) ?? 'BOOTSTRAP_LOADING'
   detail.value = options?.detail ? decodeURIComponent(options.detail) : ''
   if (options?.bootstrap !== '1') return
-  try {
-    await initializeAppNavigation()
-    navigateAppRoute(options?.route ? decodeURIComponent(options.route) : 'app/home', {
-      replace: true,
+  void initializeAppNavigation()
+    .then(() => {
+      navigateAppRoute(options?.route ? decodeURIComponent(options.route) : 'app/home', {
+        replace: true,
+      })
+    })
+    .catch((error) => {
+      launchAppStatus('CONFIG_ERROR', error instanceof Error ? error.message : String(error))
     })
-  } catch (error) {
-    launchAppStatus('CONFIG_ERROR', error instanceof Error ? error.message : String(error))
-  }
 })
 </script>
 

package/src/views/pages/webview/webview.vue

@@ -17,14 +17,14 @@
     <!-- #endif -->
 
     <view v-if="showFallback" class="webview-empty">
-      <view class="webview-empty__title">{{ t('core.webview.openFailed') }}</view>
+      <view class="webview-empty__title">{{ t('core.webview.open_failed') }}</view>
       <view class="webview-empty__desc">{{ emptyDesc }}</view>
     </view>
 
     <!-- #ifdef H5 -->
     <!-- X-Frame-Options 拒绝嵌入时浏览器仍可能触发 iframe load，始终保留外部打开入口。 -->
     <button v-if="isH5 && url && isIframeTimedOut" class="webview-open-button" @tap="openInBrowser">
-      {{ t('common.action.openInNewWindow') }}
+      {{ t('common.action.open_in_new_window') }}
     </button>
     <!-- #endif -->
   </view>
@@ -46,9 +46,9 @@ const showFallback = computed(
 )
 const emptyDesc = computed(() => {
   if (!url.value) {
-    return t('core.webview.invalidUrl')
+    return t('core.webview.invalid_url')
   }
-  return t('core.webview.embedBlocked')
+  return t('core.webview.embed_blocked')
 })
 
 onLoad((query) => {

package/src/vite.ts

@@ -582,6 +582,7 @@ function scanViews(root: string): Array<{ route: string; source: string }> {
 function appendPage(manifest: PagesManifest, page: ScannedPage): void {
   const [first, ...rest] = page.route.split('/')
   if (!first.startsWith('pages') || first === 'pages') {
+    if (manifest.pages.some((item) => normalizeRoute(item.path) === page.route)) return
     manifest.pages.push({ path: page.route, style: page.style })
     return
   }
@@ -591,22 +592,22 @@ function appendPage(manifest: PagesManifest, page: ScannedPage): void {
     subPackage = { root: first, pages: [] }
     manifest.subPackages.push(subPackage)
   }
+  if (subPackage.pages.some((item) => normalizeRoute(`${first}/${item.path}`) === page.route))
+    return
   subPackage.pages.push({ path: rest.join('/'), style: page.style })
 }
 
 function createPageWrapper(page: ScannedPage): string {
   const source = page.source.replace(/\\/g, '/')
   return `<script setup lang="ts">
-import type { Component } from 'vue'
 import KratosPage from ${JSON.stringify(source)}
 import KratosTabBar from '@liujitcn/kratos-uni-app-core/components/KratosTabBar.vue'
 
 defineOptions({ inheritAttrs: false })
-const Page = KratosPage as Component
 </script>
 
 <template>
-  <Page v-bind="$attrs" />
+  <KratosPage v-bind="$attrs" />
   <KratosTabBar route=${JSON.stringify(page.route)} />
 </template>
 `

package/src/rpc/base/v1/enum.ts

@@ -1,54 +0,0 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.11.8
-//   protoc               unknown
-// source: base/v1/enum.proto
-
-/* eslint-disable */
-
-/** AI 助手消息状态 */
-export enum AiMessageStatus {
-  /** UNKNOWN_AMS - 未知AI助手消息状态 */
-  UNKNOWN_AMS = 0,
-  /** GENERATING_AMS - 生成中 */
-  GENERATING_AMS = 1,
-  /** SUCCESS_AMS - 成功 */
-  SUCCESS_AMS = 2,
-  /** FAILED_AMS - 失败 */
-  FAILED_AMS = 3,
-}
-
-/** 终端类型 */
-export enum Terminal {
-  /** UNKNOWN_TERMINAL - 未知终端 */
-  UNKNOWN_TERMINAL = 0,
-  /** TERMINAL_APP - 移动端 */
-  TERMINAL_APP = 1,
-  /** TERMINAL_ADMIN - 管理端 */
-  TERMINAL_ADMIN = 2,
-}
-
-/** 系统配置位置 */
-export enum BaseConfigSite {
-  UNKNOWN_BCS = 0,
-  /** SYSTEM - 系统内使用 */
-  SYSTEM = 1,
-  /** ADMIN - 管理端 */
-  ADMIN = 2,
-  /** APP - 移动端 */
-  APP = 3,
-}
-
-/** 密码加密场景枚举 */
-export enum PasswordCryptoScene {
-  /** UNKNOWN_PCS - 未指定密码加密场景 */
-  UNKNOWN_PCS = 0,
-  /** LOGIN - 登录密码加密场景 */
-  LOGIN = 1,
-  /** CREATE_BASE_USER - 新增后台用户密码加密场景 */
-  CREATE_BASE_USER = 2,
-  /** RESET_BASE_USER_PASSWORD - 重置后台用户密码加密场景 */
-  RESET_BASE_USER_PASSWORD = 3,
-  /** UPDATE_USER_PASSWORD - 个人修改密码加密场景 */
-  UPDATE_USER_PASSWORD = 4,
-}

package/src/rpc/system/common/v1/enum.ts

@@ -1,80 +0,0 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.11.8
-//   protoc               unknown
-// source: system/common/v1/enum.proto
-
-/* eslint-disable */
-
-/** 系统配置类型 */
-export enum BaseConfigType {
-  UNKNOWN_BCT = 0,
-  /** TEXT - 文本 */
-  TEXT = 1,
-  /** IMAGE - 图片 */
-  IMAGE = 2,
-  /** RICH_TEXT - 富文本 */
-  RICH_TEXT = 3,
-  /** DICT - 字典 */
-  DICT = 4,
-  /** BOOLEAN - 布尔 */
-  BOOLEAN = 5,
-}
-
-/** 定时任务日志状态 */
-export enum BaseJobLogStatus {
-  UNKNOWN_BJLS = 0,
-  /** SUCCESS - 成功 */
-  SUCCESS = 1,
-  /** FAIL - 失败 */
-  FAIL = 2,
-}
-
-/** 菜单类型 */
-export enum BaseMenuType {
-  UNKNOWN_MT = 0,
-  /** FOLDER - 目录 */
-  FOLDER = 1,
-  /** MENU - 菜单 */
-  MENU = 2,
-  /** BUTTON - 按钮 */
-  BUTTON = 3,
-  /** EXT_LINK - 外部链接 */
-  EXT_LINK = 4,
-}
-
-/** 角色数据范围 */
-export enum BaseRoleDataScope {
-  UNKNOWN_RDS = 0,
-  /** ALL - 全部数据 */
-  ALL = 1,
-  /** DEPT_AND_CHILDREN - 部门及子部门数据 */
-  DEPT_AND_CHILDREN = 2,
-  /** SELF_DEPT - 本部门数据 */
-  SELF_DEPT = 3,
-  /** SELF_USER - 本人数据 */
-  SELF_USER = 4,
-}
-
-/** 用户性别 */
-export enum BaseUserGender {
-  UNKNOWN_BUG = 0,
-  /** SECRET - 保密 */
-  SECRET = 1,
-  /** BOY - 男 */
-  BOY = 2,
-  /** GIRL - 禁用 */
-  GIRL = 3,
-}
-
-/** 代码生成表状态 */
-export enum CodeGenTableStatus {
-  /** UNKNOWN_CGTS - 未指定 */
-  UNKNOWN_CGTS = 0,
-  /** DRAFT_CGTS - 草稿 */
-  DRAFT_CGTS = 1,
-  /** GENERATED_CGTS - 已生成 */
-  GENERATED_CGTS = 2,
-  /** DISABLED_CGTS - 停用 */
-  DISABLED_CGTS = 3,
-}