@liujitcn/kratos-uni-app-system 0.0.18 → 0.0.20

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "files": [
     "dist",
@@ -30,7 +30,7 @@
     "@dcloudio/uni-app": "3.0.0-5010520260709002",
     "@dcloudio/uni-ui": "^1.4.28",
     "vue": "^3.4.21",
-    "@liujitcn/kratos-uni-app-core": "^0.0.18"
+    "@liujitcn/kratos-uni-app-core": "^0.0.20"
   },
   "devDependencies": {
     "esbuild": "^0.20.2",

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

@@ -5,9 +5,9 @@
 // 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

@@ -5,7 +5,7 @@
 // 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

@@ -2,17 +2,30 @@
 // versions:
 //   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/views/pagesMember/ai/index.vue

@@ -7,7 +7,7 @@ import { defAiToolService } from '../../../api/base/ai_tool'
 import type { AiMessage } from '../../../rpc/base/v1/ai_session'
 import type { AiAttachment, 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 { uploadFile } from '@liujitcn/kratos-uni-app-core/utils/file'
 import { formatSrc } from '@liujitcn/kratos-uni-app-core/utils/index'
 import Composer from './components/Composer.vue'
@@ -70,7 +70,7 @@ safeAreaTop = safeAreaTop || 44
 // #endif
 const safeAreaBottom = Math.max(windowInfo.safeAreaInsets?.bottom || 0, 9)
 const windowHeight = windowInfo.windowHeight || windowInfo.screenHeight || 667
-const composerBottom = `${safeAreaBottom}px`
+const composerBottom = `${safeAreaBottom + 48}px`
 const drawerTopPadding = `${safeAreaTop + 12}px`
 
 const showSessionDrawer = ref(false)
@@ -886,7 +886,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 {
@@ -905,7 +905,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}`,
@@ -945,7 +945,7 @@ function createLocalUserMessage(payload: { text: string; attachments: AiAttachme
         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,
@@ -954,7 +954,7 @@ function createLocalUserMessage(payload: { text: string; attachments: AiAttachme
     'user',
   )
   message.localOnly = true
-  message.status = AiMessageStatus.GENERATING_AAMS
+  message.status = AiMessageStatus.GENERATING_AMS
   return message
 }
 
@@ -983,7 +983,7 @@ function createThinkingMessage(options?: { sessionID?: string; messageID?: strin
         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,
@@ -1034,7 +1034,7 @@ function appendStreamingDelta(current: ChatMessageItem[], payload: AiStreamPaylo
     return {
       ...item,
       content: `${baseContent}${payload.delta}`,
-      status: AiMessageStatus.GENERATING_AAMS,
+      status: AiMessageStatus.GENERATING_AMS,
     }
   })
 }
@@ -1046,7 +1046,7 @@ function markThinkingMessageFailed(current: ChatMessageItem[]) {
     }
     return {
       ...item,
-      status: AiMessageStatus.FAILED_AAMS,
+      status: AiMessageStatus.FAILED_AMS,
       content:
         item.role === 'ai' ? '这次回复没有成功返回，你可以直接重试刚才的问题。' : item.content,
     }
@@ -1061,7 +1061,7 @@ function markStreamingError(current: ChatMessageItem[], payload: AiStreamPayload
     }
     return {
       ...item,
-      status: AiMessageStatus.FAILED_AAMS,
+      status: AiMessageStatus.FAILED_AMS,
       content: '这次回复没有成功返回，你可以直接重试刚才的问题。',
     }
   })
@@ -1187,7 +1187,7 @@ function showError(error: unknown, fallback: string) {
             class="bubble"
             :class="[
               item.role === 'ai' ? 'ai-bubble' : 'user-bubble',
-              item.status === AiMessageStatus.GENERATING_AAMS ? 'is-streaming' : '',
+              item.status === AiMessageStatus.GENERATING_AMS ? 'is-streaming' : '',
             ]"
             @longpress="handleMessageAction(item)"
           >
@@ -1288,6 +1288,33 @@ page {
   /* #endif */
 }
 
+/* #ifdef MP-WEIXIN */
+.ai-navbar {
+  position: relative;
+}
+
+.ai-navbar .nav-back-button,
+.ai-navbar .nav-menu-button {
+  position: absolute;
+  bottom: 0;
+}
+
+.ai-navbar .nav-back-button {
+  left: 0;
+}
+
+.ai-navbar .nav-menu-button {
+  left: 56rpx;
+  right: auto;
+}
+
+.ai-navbar__title {
+  width: 100%;
+  height: 44px;
+  line-height: 44px;
+}
+/* #endif */
+
 .nav-back-button,
 .nav-menu-button {
   display: flex;