@liujitcn/kratos-taro-app-core 0.0.1 → 0.0.18

package/README.md

@@ -8,13 +8,14 @@
 - 统一 HTTP、上传、下载、文件预览与 RSA/AES 密码加密。
 - Zustand 用户、配置和导航状态。
 - 接口驱动的逻辑路由、访问模式、自绘 tabBar 和稳定 `viewKey`。
-- 打包静态资源公共路径解析，以及 H5 默认导航栏兼容框架。
+- 页面静态资源 export、动态资源公共路径解析，以及 H5 默认导航栏兼容框架。
 - 首页、登录、协议、WebView、启动/错误状态页面。
 - H5 与微信小程序共用的模块页面装配 runner。
 
 ## 公开入口
 
-- `@liujitcn/kratos-taro-app-core`：启动、模块、导航、状态和常用工具，包含 `resolveBundledAsset()`。
+- `@liujitcn/kratos-taro-app-core`：启动、模块、导航、状态和常用工具，包含动态路径使用的 `resolveBundledAsset()`。
+- `@liujitcn/kratos-taro-app-core/static/*`：页面图片等可由 Webpack 静态分析的打包资源。
 - `@liujitcn/kratos-taro-app-core/build`：构建期模块描述。
 - `@liujitcn/kratos-taro-app-core/runner`：Taro 构建装配入口。
 - `api/*`、`components/*`、`rpc/*`、`styles/*`、`utils/*`、`views/*`：白名单子路径。

package/package.json

@@ -1,7 +1,13 @@
 {
   "name": "@liujitcn/kratos-taro-app-core",
   "description": "Runtime, navigation, authentication, and build foundation for Kratos Taro apps.",
-  "version": "0.0.1",
+  "license": "MIT",
+  "homepage": "https://github.com/liujitcn/kratos-admin",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:liujitcn/kratos-admin.git"
+  },
+  "version": "0.0.18",
   "type": "module",
   "files": [
     "dist",

package/src/styles/base.scss

@@ -26,18 +26,21 @@ button::after {
   border: 0;
 }
 
+// 与 uni-app H5 一致，仅在路由页内容溢出时显示系统滚动条。
+.taro_page {
+  overflow-y: auto !important;
+}
+
 // Taro H5 的默认确认色与 uni-app H5 不同，统一为基线平台色。
 .taro-model__confirm {
   color: #007aff !important;
 }
 
-// H5 路由页和 ScrollView 同时滚动，隐藏滚动条避免重复占用内容宽度。
-.taro_page,
+// H5 ScrollView 使用内部滚动，隐藏其滚动条避免额外占用内容宽度。
 .taro-scroll-view__scroll-y {
   scrollbar-width: none;
 }
 
-.taro_page::-webkit-scrollbar,
 .taro-scroll-view__scroll-y::-webkit-scrollbar {
   display: none;
   width: 0;

package/src/utils/navigation.ts

@@ -15,6 +15,12 @@ function buildRouteUrl(path: string, query: Record<string, RouteQueryValue> = {}
   return queryString ? `${path}?${queryString}` : path
 }
 
+/** 规范化应用内部路由，避免多余的前导斜杠导致 Taro 跳转失败。 */
+function normalizeRouteUrl(url: string): string {
+  return `/${url.replace(/^\/+/, '')}`
+}
+
+/** 获取当前页面及其跨端查询参数。 */
 function getCurrentRouteUrl(): string {
   const pages = getCurrentPages()
   const currentPage = pages[pages.length - 1] as
@@ -26,24 +32,21 @@ function getCurrentRouteUrl(): string {
     | undefined
   if (!currentPage?.route) return ''
   return buildRouteUrl(
-    `/${currentPage.route}`,
-    currentPage.options ?? currentPage.$taroParams ?? {},
+    normalizeRouteUrl(currentPage.route),
+    { ...currentPage.$taroParams, ...currentPage.options },
   )
 }
 
 /** 保存当前页面路由，登录成功后恢复到用户原来的页面。 */
 export function saveCurrentRoute(): void {
   const currentRoute = getCurrentRouteUrl()
-  if (!currentRoute || currentRoute.startsWith(LOGIN_PAGE)) {
-    Taro.removeStorageSync(LAST_ROUTE_KEY)
-    return
-  }
+  if (!currentRoute || currentRoute.startsWith(LOGIN_PAGE)) return
   Taro.setStorageSync(LAST_ROUTE_KEY, currentRoute)
 }
 
 /** 保存指定页面路由，供登录成功后继续原访问目标。 */
 export function saveLoginRedirectUrl(url: string): void {
-  const normalizedUrl = url.startsWith('/') ? url : `/${url}`
+  const normalizedUrl = normalizeRouteUrl(url)
   if (!normalizedUrl.startsWith(LOGIN_PAGE)) Taro.setStorageSync(LAST_ROUTE_KEY, normalizedUrl)
 }
 
@@ -54,6 +57,17 @@ export function consumeLoginRedirectUrl(): string {
   return url
 }
 
+/** 登录成功后恢复访问目标，并仅在跳转成功后清理保存的地址。 */
+export async function restoreLoginRedirect(): Promise<void> {
+  const savedRoute = Taro.getStorageSync<string>(LAST_ROUTE_KEY) || ''
+  const targetRoute = savedRoute ? normalizeRouteUrl(savedRoute) : homeTabPage
+  if (targetRoute.startsWith(homeTabPage)) Taro.setStorageSync('SwitchTabIndex', true)
+  await Taro.reLaunch({ url: targetRoute })
+  if (savedRoute && Taro.getStorageSync<string>(LAST_ROUTE_KEY) === savedRoute) {
+    Taro.removeStorageSync(LAST_ROUTE_KEY)
+  }
+}
+
 /** 跳转到登录页，并在跳转前记录当前页面。 */
 export function navigateToLogin(redirectUrl?: string): void {
   if (typeof redirectUrl === 'string' && redirectUrl) saveLoginRedirectUrl(redirectUrl)

package/src/views/pages/index/index.scss

@@ -1,6 +1,6 @@
 .home-page {
   min-height: 100vh;
-  padding: 44px 28px 156px;
+  padding: 44px 28px 56px;
   box-sizing: border-box;
   background-color: #f7f7f8;
 }
@@ -37,6 +37,7 @@
 }
 
 .home-title {
+  margin-top: 8px;
   color: #fff;
   font-size: 40px;
   font-weight: 600;

package/src/views/pages/index/index.tsx

@@ -1,11 +1,9 @@
 import { Image, Text, View } from '@tarojs/components'
 import { useLoad } from '@tarojs/taro'
-import { resolveBundledAsset } from '../../../module'
+import defaultLogo from '@liujitcn/kratos-taro-app-core/static/images/logo_icon.png'
 import { useSettingStore } from '../../../stores'
 import './index.scss'
 
-const defaultLogo = resolveBundledAsset('static/images/logo_icon.png')
-
 /** 应用首页。 */
 export default function HomePage() {
   const settings = useSettingStore((state) => state.data)

package/src/views/pages/login/login.tsx

@@ -1,12 +1,12 @@
 import { Button, Image, Input, Text, View } from '@tarojs/components'
 import Taro, { useLoad } from '@tarojs/taro'
 import { useMemo, useRef, useState } from 'react'
+import defaultLogo from '@liujitcn/kratos-taro-app-core/static/images/logo_icon.png'
 import { defLoginService } from '../../../api/base/login'
-import { resolveBundledAsset } from '../../../module'
 import { navigateAppRoute } from '../../../navigation'
 import type { LoginRequest } from '../../../rpc/base/v1/login'
 import { useSettingStore, useUserStore } from '../../../stores'
-import { consumeLoginRedirectUrl, homeTabPage } from '../../../utils/navigation'
+import { restoreLoginRedirect } from '../../../utils/navigation'
 import { encryptPassword, PASSWORD_CRYPTO_SCENE } from '../../../utils/passwordCrypto'
 import BehaviorCaptcha from './components/BehaviorCaptcha'
 import type {
@@ -17,7 +17,6 @@ import './login.scss'
 
 const behaviorCaptchaTypes = new Set(['slide', 'click', 'rotate'])
 const wechatMiniProvider = 'wechatmini'
-const defaultLogo = resolveBundledAsset('static/images/logo_icon.png')
 
 type BehaviorPayload = BehaviorCaptchaData & {
   type?: string
@@ -246,14 +245,12 @@ export default function LoginPage() {
     return result.confirm
   }
 
+  /** 完成用户资料加载并恢复登录前页面。 */
   const loginSuccess = async () => {
     await userStore.getUserProfile()
     await Taro.showToast({ icon: 'success', title: '登录成功' })
-    setTimeout(() => {
-      const lastRoute = consumeLoginRedirectUrl() || homeTabPage
-      if (lastRoute.startsWith(homeTabPage)) Taro.setStorageSync('SwitchTabIndex', true)
-      void Taro.reLaunch({ url: lastRoute })
-    }, 500)
+    await new Promise<void>((resolve) => setTimeout(resolve, 500))
+    await restoreLoginRedirect()
   }
 
   const validateLoginForm = async () => {

package/src/views/pages/webview/webview.tsx

@@ -1,11 +1,14 @@
 import { Button, Text, View, WebView } from '@tarojs/components'
 import Taro, { useLoad } from '@tarojs/taro'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import './webview.scss'
 
 /** 统一外链承载页。 */
 export default function WebViewPage() {
   const [url, setUrl] = useState('')
+  const [iframeLoaded, setIframeLoaded] = useState(false)
+  const [iframeTimedOut, setIframeTimedOut] = useState(false)
+  const isH5 = process.env.TARO_ENV === 'h5'
 
   useLoad((query) => {
     const nextUrl = decodeURIComponent(query?.url || '')
@@ -14,21 +17,35 @@ export default function WebViewPage() {
     if (title) void Taro.setNavigationBarTitle({ title })
   })
 
-  if (!url) {
-    return (
-      <View className='webview-container'>
-        <View className='webview-empty'>
-          <Text className='webview-empty__title'>链接无法打开</Text>
-          <Text className='webview-empty__desc'>缺少有效链接地址</Text>
-        </View>
-      </View>
-    )
-  }
+  useEffect(() => {
+    if (!isH5 || !url) return undefined
+    setIframeLoaded(false)
+    setIframeTimedOut(false)
+    const timer = window.setTimeout(() => setIframeTimedOut(true), 800)
+    return () => window.clearTimeout(timer)
+  }, [isH5, url])
+
+  const showFallback = !url || (isH5 && iframeTimedOut && !iframeLoaded)
+  const emptyDescription = url
+    ? '当前 H5 页面可能被目标站点限制嵌入'
+    : '缺少有效链接地址'
 
   return (
     <View className='webview-container'>
-      <WebView src={url} onMessage={(event) => console.log('收到H5消息:', event.detail)} />
-      {process.env.TARO_ENV === 'h5' ? (
+      {url ? (
+        <WebView
+          src={url}
+          onLoad={() => setIframeLoaded(true)}
+          onMessage={(event) => console.log('收到H5消息:', event.detail)}
+        />
+      ) : null}
+      {showFallback ? (
+        <View className='webview-empty'>
+          <Text className='webview-empty__title'>链接无法打开</Text>
+          <Text className='webview-empty__desc'>{emptyDescription}</Text>
+        </View>
+      ) : null}
+      {isH5 && url && iframeTimedOut ? (
         <Button
           className='webview-open-button'
           onClick={() => window.open(url, '_blank', 'noopener,noreferrer')}