@liujitcn/kratos-taro-app-system 0.0.17 → 0.0.19

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.17",
+  "version": "0.0.19",
   "type": "module",
   "files": [
     "dist",
@@ -21,6 +21,8 @@
       "import": "./dist/build.mjs",
       "default": "./dist/build.mjs"
     },
+    "./api/*": "./src/api/*",
+    "./rpc/*": "./src/rpc/*",
     "./views/*": "./src/views/*",
     "./package.json": "./package.json"
   },
@@ -31,8 +33,8 @@
     "@tarojs/components": "4.2.1",
     "@tarojs/taro": "4.2.1",
     "react": "18.3.1",
-    "@liujitcn/kratos-taro-app-ui": "^0.0.17",
-    "@liujitcn/kratos-taro-app-core": "^0.0.17"
+    "@liujitcn/kratos-taro-app-core": "^0.0.19",
+    "@liujitcn/kratos-taro-app-ui": "^0.0.19"
   },
   "scripts": {
     "build": "pnpm run build:entries && pnpm pack --pack-destination ../../../dist/npm",

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/ai_message.proto
 

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

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/ai_session.proto
 
 /* eslint-disable */
-import type { AiMessageStatus, Terminal } from "../../common/v1/enum";
 import type { Timestamp } from "../../google/protobuf/timestamp";
 import type { AiToolCall } from "./ai_tool";
+import type { AiMessageStatus, Terminal } from "./enum";
 
 /** AI 助手消息列表查询条件 */
 export interface ListAiMessageRequest {

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

@@ -1,11 +1,11 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/ai_tool.proto
 
 /* eslint-disable */
-import type { Terminal } from "../../common/v1/enum";
+import type { Terminal } from "./enum";
 
 /** AI 助手快捷入口列表查询条件 */
 export interface ListAiShortcutRequest {

package/src/rpc/{common → base}/v1/enum.ts

@@ -1,18 +1,31 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
-// source: common/v1/enum.proto
+// source: base/v1/enum.proto
 
 /* eslint-disable */
 
-/** 状态 */
-export enum Status {
-  UNKNOWN = 0,
-  /** ENABLE - 启用 */
-  ENABLE = 1,
-  /** DISABLE - 禁用 */
-  DISABLE = 2,
+/** 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,
 }
 
 /** 系统配置位置 */
@@ -39,33 +52,3 @@ export enum PasswordCryptoScene {
   /** UPDATE_USER_PASSWORD - 个人修改密码加密场景 */
   UPDATE_USER_PASSWORD = 4,
 }
-
-/** AI 助手消息状态 */
-export enum AiMessageStatus {
-  /** UNKNOWN_AAMS - 未知AI助手消息状态 */
-  UNKNOWN_AAMS = 0,
-  /** GENERATING_AAMS - 生成中 */
-  GENERATING_AAMS = 1,
-  /** SUCCESS_AAMS - 成功 */
-  SUCCESS_AAMS = 2,
-  /** FAILED_AAMS - 失败 */
-  FAILED_AAMS = 3,
-}
-
-/** 支付通知资源类型 */
-export enum ResourceType {
-  /** TRANSACTION - 支付 */
-  TRANSACTION = 0,
-  /** REFUND - 退款 */
-  REFUND = 1,
-}
-
-/** 终端类型 */
-export enum Terminal {
-  /** TERMINAL_UNSPECIFIED - 未知终端 */
-  TERMINAL_UNSPECIFIED = 0,
-  /** TERMINAL_APP - 移动端 */
-  TERMINAL_APP = 1,
-  /** TERMINAL_ADMIN - 管理端 */
-  TERMINAL_ADMIN = 2,
-}

package/src/rpc/google/protobuf/timestamp.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: google/protobuf/timestamp.proto
 

package/src/views/pagesMember/ai/components/Composer.tsx

@@ -1,5 +1,5 @@
 import { Button, Text, Textarea, View } from '@tarojs/components'
-import { Microphone, Plus, Share } from '@liujitcn/kratos-taro-app-ui'
+import { UniIcon } from '@liujitcn/kratos-taro-app-ui'
 import type { AiAttachment } from '../../../../rpc/base/v1/ai_session'
 import './composer.scss'
 
@@ -24,7 +24,7 @@ export default function Composer(props: ComposerProps) {
     <View className='composer' style={{ paddingBottom: props.bottom }}>
       <View className='composer-main'>
         <Button className='attach-button' hoverClass='none' onClick={props.onAttach}>
-          <Plus size={30} color='#111' />
+          <UniIcon type='plusempty' size={30} color='#111' />
         </Button>
         <View className='composer-card'>
           {props.attachments.length ? (
@@ -54,7 +54,7 @@ export default function Composer(props: ComposerProps) {
             hoverClass='none'
             onClick={props.onRecord}
           >
-            <Microphone size={28} color={props.recording ? '#00a96b' : '#111'} />
+            <UniIcon type='mic' size={28} color={props.recording ? '#00a96b' : '#111'} />
           </Button>
         </View>
         <Button
@@ -63,7 +63,7 @@ export default function Composer(props: ComposerProps) {
           hoverClass='none'
           onClick={props.onSend}
         >
-          <Share size={28} color={props.disabled ? '#111' : '#00a96b'} />
+          <UniIcon type='paperplane' size={28} color={props.disabled ? '#111' : '#00a96b'} />
         </Button>
       </View>
     </View>

package/src/views/pagesMember/ai/index.scss

@@ -28,10 +28,29 @@ page {
 }
 
 .ai-navbar.is-weapp {
+  position: relative;
   height: 88PX;
   padding-top: 44PX;
 }
 
+.ai-navbar.is-weapp .nav-back-button,
+.ai-navbar.is-weapp .nav-menu-button {
+  position: absolute;
+  bottom: 0;
+  height: 44PX;
+}
+
+.ai-navbar.is-weapp .nav-back-button { left: 0; }
+.ai-navbar.is-weapp .nav-menu-button {
+  left: 56px;
+  right: auto;
+}
+.ai-navbar.is-weapp .ai-navbar__title {
+  width: 100%;
+  height: 44PX;
+  line-height: 44PX;
+}
+
 .nav-back-button,
 .nav-menu-button {
   display: flex;

package/src/views/pagesMember/ai/index.tsx

@@ -6,13 +6,13 @@ import {
   navigateAppRoute,
   uploadFile,
 } from '@liujitcn/kratos-taro-app-core'
-import { ArrowLeft, Category } from '@liujitcn/kratos-taro-app-ui'
+import { UniIcon } from '@liujitcn/kratos-taro-app-ui'
 import { defAiMessageService, StreamAiMessageByChunkedRequest } from '../../../api/base/ai_message'
 import { defAiSessionService } from '../../../api/base/ai_session'
 import { defAiToolService } from '../../../api/base/ai_tool'
 import type { AiAttachment, AiMessage, AiSession } from '../../../rpc/base/v1/ai_session'
 import type { AiShortcut, AiToolCall } from '../../../rpc/base/v1/ai_tool'
-import { AiMessageStatus, Terminal } from '../../../rpc/common/v1/enum'
+import { AiMessageStatus, Terminal } from '../../../rpc/base/v1/enum'
 import Composer from './components/Composer'
 import SessionDrawer from './components/SessionDrawer'
 import WelcomePanel from './components/WelcomePanel'
@@ -70,7 +70,13 @@ export default function AiPage() {
   }
   let safeAreaTop = windowInfo.safeArea?.top || windowInfo.statusBarHeight || windowInfo.safeAreaInsets?.top || 0
   if (process.env.TARO_ENV === 'weapp') safeAreaTop ||= 44
-  const safeAreaBottom = Math.max(windowInfo.safeAreaInsets?.bottom || 0, 9)
+  // 部分微信基础库只返回 safeArea 坐标，需要用屏幕高度反推底部安全区。
+  const measuredSafeAreaBottom =
+    windowInfo.safeAreaInsets?.bottom ??
+    (windowInfo.screenHeight && windowInfo.safeArea?.bottom
+      ? Math.max(windowInfo.screenHeight - windowInfo.safeArea.bottom, 0)
+      : 0)
+  const safeAreaBottom = Math.max(measuredSafeAreaBottom, 9)
   const composerBottom = `${safeAreaBottom + 48}px`
   const drawerTopPadding = `${safeAreaTop + 12}px`
 
@@ -605,11 +611,11 @@ export default function AiPage() {
     <View className='ai-page'>
       <View className={`ai-navbar${process.env.TARO_ENV === 'weapp' ? ' is-weapp' : ''}`}>
         <Button className='nav-back-button' hoverClass='none' onClick={navigateBack}>
-          <ArrowLeft size={24} color='#111' />
+          <UniIcon type='left' size={24} color='#111' />
         </Button>
         <View className='ai-navbar__title'>AI 助手</View>
         <Button className='nav-menu-button' hoverClass='none' onClick={() => setShowSessionDrawer((open) => !open)}>
-          <Category size={24} color='#111' />
+          <UniIcon type='bars' size={24} color='#111' />
         </Button>
       </View>
       <ScrollView
@@ -641,7 +647,7 @@ export default function AiPage() {
                 className={`message-row ${item.role === 'user' ? 'is-user' : 'is-ai'}`}
               >
                 <View
-                  className={`bubble ${item.role === 'ai' ? 'ai-bubble' : 'user-bubble'}${item.status === AiMessageStatus.GENERATING_AAMS ? ' is-streaming' : ''}`}
+                  className={`bubble ${item.role === 'ai' ? 'ai-bubble' : 'user-bubble'}${item.status === AiMessageStatus.GENERATING_AMS ? ' is-streaming' : ''}`}
                   onLongPress={() => void handleMessageAction(item)}
                 >
                   {item.role === 'ai' && item.model ? (
@@ -743,7 +749,7 @@ function normalizeMessageList(list?: AiMessage[] | null) {
 }
 
 function hasSuccessfulAiMessages(list: ChatMessageItem[]) {
-  return list.some((item) => item.status === AiMessageStatus.SUCCESS_AAMS)
+  return list.some((item) => item.status === AiMessageStatus.SUCCESS_AMS)
 }
 
 function mapMessageItem(message: AiMessage, role: ChatRole): ChatMessageItem {
@@ -759,7 +765,7 @@ function mapMessageItem(message: AiMessage, role: ChatRole): ChatMessageItem {
     step: message.output_content?.step ?? '',
     blocks_json: message.output_content?.blocks_json ?? '',
   }
-  const status = Number(message.status ?? AiMessageStatus.SUCCESS_AAMS)
+  const status = Number(message.status ?? AiMessageStatus.SUCCESS_AMS)
   return {
     ...message,
     key: `${message.id}:${role}`,
@@ -795,14 +801,14 @@ function createLocalUserMessage(payload: { text: string; attachments: AiAttachme
     output_content: undefined,
     attachments: payload.attachments,
     created_at: { seconds: Math.floor(now / 1000), nanos: (now % 1000) * 1_000_000 },
-    status: AiMessageStatus.GENERATING_AAMS,
+    status: AiMessageStatus.GENERATING_AMS,
     token: { input: 0, output: 0, cache: 0, total: 0 },
     tools: [],
     first_token_ms: 0,
     duration_ms: 0,
   }, 'user')
   message.localOnly = true
-  message.status = AiMessageStatus.GENERATING_AAMS
+  message.status = AiMessageStatus.GENERATING_AMS
   return message
 }
 
@@ -820,7 +826,7 @@ function createThinkingMessage(options?: { sessionID?: string; messageID?: strin
     },
     attachments: [],
     created_at: { seconds: Math.floor(now / 1000), nanos: (now % 1000) * 1_000_000 },
-    status: AiMessageStatus.GENERATING_AAMS,
+    status: AiMessageStatus.GENERATING_AMS,
     token: { input: 0, output: 0, cache: 0, total: 0 },
     tools: [],
     first_token_ms: 0,
@@ -854,7 +860,7 @@ function appendStreamingDelta(current: ChatMessageItem[], payload: AiStreamPaylo
   return current.map((item) => {
     if (item.streamKey !== streamKey || item.role === 'user') return item
     const baseContent = item.content === THINKING_MESSAGE_CONTENT ? '' : item.content
-    return { ...item, content: `${baseContent}${payload.delta}`, status: AiMessageStatus.GENERATING_AAMS }
+    return { ...item, content: `${baseContent}${payload.delta}`, status: AiMessageStatus.GENERATING_AMS }
   })
 }
 
@@ -863,7 +869,7 @@ function markThinkingMessageFailed(current: ChatMessageItem[]) {
     item.localOnly
       ? {
           ...item,
-          status: AiMessageStatus.FAILED_AAMS,
+          status: AiMessageStatus.FAILED_AMS,
           content: item.role === 'ai' ? '这次回复没有成功返回，你可以直接重试刚才的问题。' : item.content,
         }
       : item,
@@ -874,7 +880,7 @@ function markStreamingError(current: ChatMessageItem[], payload: AiStreamPayload
   const streamKey = buildStreamMessageKey(payload.session_id, payload.message_id)
   return current.map((item) =>
     item.localOnly && item.streamKey === streamKey
-      ? { ...item, status: AiMessageStatus.FAILED_AAMS, content: '这次回复没有成功返回，你可以直接重试刚才的问题。' }
+      ? { ...item, status: AiMessageStatus.FAILED_AMS, content: '这次回复没有成功返回，你可以直接重试刚才的问题。' }
       : item,
   )
 }