Merge branch 'main' into feat/chat-support-voice-input

web/app/components/app/chat/index.tsx

@@ -206,7 +206,7 @@ const Answer: FC<IAnswerProps> = ({ item, feedbackDisabled = false, isHideFeedba
     return (
       <Tooltip
         selector={`user-feedback-${randomString(16)}`}
-        content={(isWebScene || (!isUserFeedback && !isWebScene)) ? isLike ? '取消赞同' : '取消反对' : (!isWebScene && isUserFeedback) ? `用户表示${isLike ? '赞同' : '反对'}` : ''}
+        content={((isWebScene || (!isUserFeedback && !isWebScene)) ? isLike ? t('appDebug.operation.cancelAgree') : t('appDebug.operation.cancelDisagree') : (!isWebScene && isUserFeedback) ? `${t('appDebug.operation.userAction')}${isLike ? t('appDebug.operation.agree') : t('appDebug.operation.disagree')}` : '') as string}
       >
         <div
           className={`relative box-border flex items-center justify-center h-7 w-7 p-0.5 rounded-lg bg-white cursor-pointer text-gray-500 hover:text-gray-800 ${(!isWebScene && isUserFeedback) ? '!cursor-default' : ''}`}

web/app/components/share/chat/index.tsx

@@ -369,6 +369,9 @@ const Main: FC<IMainProps> = ({
   }
 
   const checkCanSend = () => {
+    if (currConversationId !== '-1')
+      return true
+
     const prompt_variables = promptConfig?.prompt_variables
     const inputs = currInputs
     if (!inputs || !prompt_variables || prompt_variables?.length === 0)

web/i18n/lang/app-debug.en.ts

@@ -6,6 +6,11 @@ const translation = {
     addFeature: 'Add Feature',
     automatic: 'Automatic',
     stopResponding: 'Stop responding',
+    agree: 'agree',
+    disagree: 'disagree',
+    cancelAgree: 'Cancel agree',
+    cancelDisagree: 'Cancel disagree',
+    userAction: 'User ',
   },
   notSetAPIKey: {
     title: 'LLM provider key has not been set',

web/i18n/lang/app-debug.zh.ts

@@ -6,6 +6,11 @@ const translation = {
     addFeature: '添加功能',
     automatic: '自动编排',
     stopResponding: '停止响应',
+    agree: '赞同',
+    disagree: '反对',
+    cancelAgree: '取消赞同',
+    cancelDisagree: '取消反对',
+    userAction: '用户表示',
   },
   notSetAPIKey: {
     title: 'LLM 提供者的密钥未设置',