af-mobile-client-vue3 1.4.88 → 1.4.90

package/__dummy__

@@ -1,10 +1,10 @@
-{
-  "cells": [],
-  "metadata": {
-    "language_info": {
-      "name": "python"
-    }
-  },
-  "nbformat": 4,
-  "nbformat_minor": 2
+{
+  "cells": [],
+  "metadata": {
+    "language_info": {
+      "name": "python"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 2
 }

package/build/vite/optimize.ts

@@ -1,36 +1,36 @@
-const include = [
-  'axios',
-  'echarts',
-  'lodash-es',
-  'resize-detector',
-  'vant/es',
-  'vant/es/cell-group/style/index',
-  'vant/es/popup/style/index',
-  'vant/es/picker/style/index',
-  'vant/es/cell/style/index',
-  'vant/es/switch/style/index',
-  'vant/es/space/style/index',
-  'vant/es/button/style/index',
-  'vant/es/empty/style/index',
-  'vant/es/icon/style/index',
-  'vant/es/stepper/style/index',
-  'vant/es/image/style/index',
-  'vant/es/form/style/index',
-  'vant/es/field/style/index',
-  'vant/es/notify/style/index',
-  'vant/es/config-provider/style/index',
-  'vant/es/nav-bar/style/index',
-  'vant/es/tabbar/style/index',
-  'vant/es/tabbar-item/style/index',
-  'vant/es/list/style/index',
-  'vant/es/text-ellipsis/style/index',
-  // 确保 @matechat/core 及其依赖 xss 被正确预构建
-  '@matechat/core',
-]
-
-const exclude = [
-  '@iconify/json',
-  '@iconify/vue',
-]
-
-export { exclude, include }
+const include = [
+  'axios',
+  'echarts',
+  'lodash-es',
+  'resize-detector',
+  'vant/es',
+  'vant/es/cell-group/style/index',
+  'vant/es/popup/style/index',
+  'vant/es/picker/style/index',
+  'vant/es/cell/style/index',
+  'vant/es/switch/style/index',
+  'vant/es/space/style/index',
+  'vant/es/button/style/index',
+  'vant/es/empty/style/index',
+  'vant/es/icon/style/index',
+  'vant/es/stepper/style/index',
+  'vant/es/image/style/index',
+  'vant/es/form/style/index',
+  'vant/es/field/style/index',
+  'vant/es/notify/style/index',
+  'vant/es/config-provider/style/index',
+  'vant/es/nav-bar/style/index',
+  'vant/es/tabbar/style/index',
+  'vant/es/tabbar-item/style/index',
+  'vant/es/list/style/index',
+  'vant/es/text-ellipsis/style/index',
+  // 确保 @matechat/core 及其依赖 xss 被正确预构建
+  '@matechat/core',
+]
+
+const exclude = [
+  '@iconify/json',
+  '@iconify/vue',
+]
+
+export { exclude, include }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.4.88",
+  "version": "1.4.90",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@iconify/vue": "4.3.0",
-    "@matechat/core": "^1.10.0",
+    "@matechat/core": "^1.11.1",
     "@micro-zoe/micro-app": "1.0.0-rc.26",
     "@unhead/vue": "2.0.12",
     "@vant/area-data": "^2.0.0",

package/public/favicon.svg

@@ -1,4 +1,4 @@
-<svg t="1709866807903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4913" width="32" height="32">
-  <path d="M512 598.528a111.232 111.232 0 0 0-111.232 111.2064V870.4h222.464v-160.6656c0-61.44-49.792-111.232-111.232-111.232z m0 58.0608c-30.72 0-55.6032 24.9088-55.6032 55.6288v105.0368h111.2064v-105.0368c0-30.72-24.8832-55.6288-55.6032-55.6288z" fill="#FB4D31" p-id="4914"></path>
-  <path d="M542.08 270.208l45.2608-78.5408a24.5248 24.5248 0 0 0 0-25.6A26.4448 26.4448 0 0 0 564.1472 153.6a26.3424 26.3424 0 0 0-22.5792 13.44L512 217.6256l-29.5424-50.5344c-4.5824-8.192-13.184-13.312-22.5536-13.4912a26.4448 26.4448 0 0 0-23.2448 12.4928 24.5248 24.5248 0 0 0 0 25.6l45.2352 78.5152L156.928 832.768a24.4736 24.4736 0 0 0 0.3328 25.088c4.8384 7.8336 13.3888 12.544 22.5792 12.5184h664.3456c9.3184 0 17.92-4.7616 22.6304-12.4672a24.4736 24.4736 0 0 0 0.3072-25.088l-325.0176-562.688v0.0512zM619.52 816.64h-33.3568c-12.3648 0-9.6768 0.1024-65.0496 0H512c-55.3728 0.1024-24.704 0-61.7984 0H225.28L512 322.1248 798.72 816.64h-179.2z" fill="#000000" p-id="4915"></path>
-</svg>
+<svg t="1709866807903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4913" width="32" height="32">
+  <path d="M512 598.528a111.232 111.232 0 0 0-111.232 111.2064V870.4h222.464v-160.6656c0-61.44-49.792-111.232-111.232-111.232z m0 58.0608c-30.72 0-55.6032 24.9088-55.6032 55.6288v105.0368h111.2064v-105.0368c0-30.72-24.8832-55.6288-55.6032-55.6288z" fill="#FB4D31" p-id="4914"></path>
+  <path d="M542.08 270.208l45.2608-78.5408a24.5248 24.5248 0 0 0 0-25.6A26.4448 26.4448 0 0 0 564.1472 153.6a26.3424 26.3424 0 0 0-22.5792 13.44L512 217.6256l-29.5424-50.5344c-4.5824-8.192-13.184-13.312-22.5536-13.4912a26.4448 26.4448 0 0 0-23.2448 12.4928 24.5248 24.5248 0 0 0 0 25.6l45.2352 78.5152L156.928 832.768a24.4736 24.4736 0 0 0 0.3328 25.088c4.8384 7.8336 13.3888 12.544 22.5792 12.5184h664.3456c9.3184 0 17.92-4.7616 22.6304-12.4672a24.4736 24.4736 0 0 0 0.3072-25.088l-325.0176-562.688v0.0512zM619.52 816.64h-33.3568c-12.3648 0-9.6768 0.1024-65.0496 0H512c-55.3728 0.1024-24.704 0-61.7984 0H225.28L512 322.1248 798.72 816.64h-179.2z" fill="#000000" p-id="4915"></path>
+</svg>

package/scripts/verifyCommit.js

@@ -1,19 +1,19 @@
-import fs from 'node:fs'
-
-// import process from 'node:process'
-
-const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
-
-const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
-// const mergeRe = /^(Merge pull request|Merge branch)/
-
-if (!commitRE.test(msg)) {
-  // if (!mergeRe.test(msg)) {
-  // console.log('git commit unpass')
-  // console.error('git commit error, needs title(scope): desc')
-  // process.exit(1)
-  // }
-}
-else {
-  console.log('git commit pass')
-}
+import fs from 'node:fs'
+
+// import process from 'node:process'
+
+const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
+
+const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
+// const mergeRe = /^(Merge pull request|Merge branch)/
+
+if (!commitRE.test(msg)) {
+  // if (!mergeRe.test(msg)) {
+  // console.log('git commit unpass')
+  // console.error('git commit error, needs title(scope): desc')
+  // process.exit(1)
+  // }
+}
+else {
+  console.log('git commit pass')
+}

package/src/components/common/MateChat/apiService.ts

@@ -40,6 +40,19 @@ export function generateOutLinkUid(): string {
   return `${type}_${userId}`
 }
 
+/**
+ * 获取用户平台 OpenID
+ * @returns OpenID
+ */
+export function getOpenId(): string {
+  const userStore = useUserStore()
+  const userInfo = userStore.getUserInfo()
+  if (userInfo.platformUserId) {
+    return userInfo.platformUserId
+  }
+  return null
+}
+
 /**
  * 发送聊天请求
  * @param content 用户输入的内容
@@ -58,6 +71,10 @@ export function chatCompletions(
     chatId,
     stream: false,
     detail: false,
+    variables: {
+      openid: getOpenId(),
+      // openid: 'oUx6l5gyHp3JNt9465QCKZOgjB9E',
+    },
     messages: [
       {
         role: 'user',
@@ -142,6 +159,10 @@ export async function chatCompletionsStream(
     chatId,
     stream: true,
     detail: false,
+    variables: {
+      openid: getOpenId(),
+      // openid: 'oYt6WtxACKSH4XmIe0E3jUvx70U0',
+    },
     messages: [
       {
         role: 'user',

package/src/components/common/MateChat/components/MateChatContent.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { MateChatConfig } from '@af-mobile-client-vue3/components/common/MateChat/types'
+import type { MateChatConfig, MateChatOptionsMessage } from '@af-mobile-client-vue3/components/common/MateChat/types'
 import liuliLogo from '@af-mobile-client-vue3/assets/img/component/liuli.png'
 import userAvatarImg from '@af-mobile-client-vue3/components/common/MateChat/assets/035-avatar-13.svg'
 import MateChatHeader from '@af-mobile-client-vue3/components/common/MateChat/components/MateChatHeader.vue'
@@ -45,10 +45,10 @@ function onCardClick(msg: any) {
     router.push(msg.action.path)
   }
 }
-function parseCard(content: string) {
+function parseStructured(content: string): any | null {
   try {
     const data = JSON.parse(content)
-    if (data && data.msgType === 'card') {
+    if (data && (data.msgType === 'card' || data.msgType === 'options')) {
       return data
     }
   }
@@ -56,6 +56,46 @@ function parseCard(content: string) {
   return null
 }
 
+function parseCard(content: string) {
+  const data = parseStructured(content)
+  if (data && data.msgType === 'card') {
+    return data
+  }
+  return null
+}
+
+function parseOptions(content: string): MateChatOptionsMessage | null {
+  const data = parseStructured(content) as MateChatOptionsMessage | null
+  if (!data || data.msgType !== 'options') {
+    return null
+  }
+  if (!Array.isArray(data.options)) {
+    return null
+  }
+  return data
+}
+
+function getDisplayContent(content: string): string {
+  const card = parseCard(content)
+  if (card) {
+    return card.msg || ''
+  }
+
+  const opt = parseOptions(content)
+  if (opt) {
+    return opt.msg || ''
+  }
+
+  return content
+}
+
+function handleOptionClick(item: any) {
+  const text = item?.sendText || item?.send || item?.value || item?.label
+  if (typeof text === 'string' && text.trim()) {
+    onSubmit(text)
+  }
+}
+
 // 消息容器的 ref
 const messageContainerRef = ref<HTMLElement | null>(null)
 // 滚动锚点的 ref
@@ -161,7 +201,7 @@ function handleSelectSession(session: { chatId: string, title: string, lastTime:
         />
         <McBubble v-else :content="msg.content" :avatar-config="{ imgSrc: liuliLogo }" :loading="msg.loading">
           <McMarkdownCard
-            :content="parseCard(msg.content) ? (parseCard(msg.content).msg || '') : msg.content"
+            :content="getDisplayContent(msg.content)"
             :typing="msg.typing === true"
           />
           <template v-if="parseCard(msg.content)">
@@ -174,12 +214,26 @@ function handleSelectSession(session: { chatId: string, title: string, lastTime:
               </div>
             </div>
           </template>
+          <template v-else-if="parseOptions(msg.content) && !msg.loading">
+            <PromptList
+              class="mc-options"
+              :list="(parseOptions(msg.content)?.options || []).map((opt, i) => ({
+                value: opt.value || String(i),
+                label: opt.label,
+                desc: opt.desc,
+                sendText: opt.send || opt.label,
+              }))"
+              :direction="parseOptions(msg.content)?.direction || 'vertical'"
+              :variant="parseOptions(msg.content)?.variant || 'default'"
+              @item-click="handleOptionClick"
+            />
+          </template>
         </McBubble>
       </template>
       <!-- 滚动锚点 -->
       <div ref="scrollAnchorRef" class="scroll-anchor" />
     </McLayoutContent>
-    <div class="shortcut" style="display: flex; align-items: center; gap: 8px">
+    <!-- <div class="shortcut" style="display: flex; align-items: center; gap: 8px">
       <PromptList
         v-if="!startPage && simplePrompt && simplePrompt.length"
         :list="simplePrompt"
@@ -189,8 +243,8 @@ function handleSelectSession(session: { chatId: string, title: string, lastTime:
         style="flex: 1"
         @item-click="onSubmit($event.desc)"
       />
-    </div>
-    <McLayoutSender>
+    </div> -->
+    <McLayoutSender class="mc-layout-sender">
       <McInput
         :value="inputValue"
         placeholder="请输入您的问题，我会为您解答"
@@ -223,12 +277,36 @@ function handleSelectSession(session: { chatId: string, title: string, lastTime:
   box-shadow: 0 25px 70px rgba(0, 0, 0, 0.2);
 }
 
+.mc-layout-sender {
+  background: #ffffff;
+  z-index: 10;
+  position: relative;
+}
+
 /* 移动端适配 */
 @media (max-width: 768px) {
   .chat-card {
     border-radius: 16px;
     padding: 8px;
   }
+
+  // 修复移动端键盘弹出时的布局问题
+  :deep(.mc-layout-sender) {
+    background: #ffffff;
+    z-index: 100;
+    padding-bottom: env(safe-area-inset-bottom);
+    // border-top: 1px solid #f0f0f0;
+  }
+
+  .shortcut {
+    padding: 0 4px;
+    // 键盘弹出时，如果空间不足，允许快捷入口滚动而不是挤压
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
 }
 
 .content-container {
@@ -267,6 +345,40 @@ function handleSelectSession(session: { chatId: string, title: string, lastTime:
   color: #86909c;
 }
 
+:deep(.mc-options.prompt-list) {
+  gap: 8px;
+}
+
+:deep(.mc-options .prompt-item) {
+  padding: 10px 12px;
+  gap: 10px;
+  border-radius: 10px;
+  border: 1px solid rgba(94, 124, 224, 0.12);
+  background: rgba(94, 124, 224, 0.06);
+}
+
+:deep(.mc-options .prompt-item:hover) {
+  transform: none;
+  box-shadow: none;
+  border-color: rgba(94, 124, 224, 0.18);
+  background: rgba(94, 124, 224, 0.08);
+}
+
+:deep(.mc-options .prompt-item__label) {
+  font-size: 13px;
+  line-height: 18px;
+  margin-bottom: 2px;
+}
+
+:deep(.mc-options .prompt-item__desc) {
+  font-size: 12px;
+  line-height: 16px;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
 .input-foot-wrapper {
   display: flex;
   justify-content: space-between;