@myun/gimi-chat 0.9.73 → 0.9.74

package/dist/components/answer-item/component/tool-list/index.js

@@ -11,8 +11,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from "react";
 import { MMarkdown } from '@myun/gimi-design';
 import IconFont from "../../../iconfont-com";
+import FileUpload from "../../../file-upload";
 import styles from "./index.module.css";
 import classNames from "classnames";
+import { useTranslation } from "react-i18next";
 
 // 思考工具项组件
 var ThinkingToolItem = function ThinkingToolItem(_ref) {
@@ -148,6 +150,8 @@ var AskToolItem = function AskToolItem(_ref4) {
     _useState6 = _slicedToArray(_useState5, 2),
     showContent = _useState6[0],
     setShowContent = _useState6[1];
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var askTextMap = {
     RUNNING: "等待用户回答",
     COMPLETED: "用户已回答"
@@ -183,11 +187,6 @@ var AskToolItem = function AskToolItem(_ref4) {
     setDisabled(true);
     handleClickAskList(item, 'click', key, value);
   };
-  var handleInputSubmit = function handleInputSubmit() {
-    if (!inputValue.trim() || disabled) return;
-    setDisabled(true);
-    handleClickAskList(item, 'input', 'answer', inputValue.trim());
-  };
   var optionRender = function optionRender(v) {
     return /*#__PURE__*/React.createElement("span", null, v.value ? v.value : v.key);
   };
@@ -225,7 +224,15 @@ var AskToolItem = function AskToolItem(_ref4) {
         return onAskItemClick(v.key, v.value || v.key);
       }
     }, optionRender(v));
-  }))) : item.content && showContent && /*#__PURE__*/React.createElement("div", {
+  })), detailInfo.uploadFile && detailInfo.answerType === 0 && /*#__PURE__*/React.createElement("div", {
+    className: classNames(styles.showUpload)
+  }, /*#__PURE__*/React.createElement(FileUpload, null, /*#__PURE__*/React.createElement("div", {
+    className: classNames(styles.uploadIcon)
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "icon-shurukuang-webtianjia",
+    size: 26,
+    color: 'var(--theme-deepNeutral, #2E394C)'
+  }), /*#__PURE__*/React.createElement("span", null, t('askCard.fileUpload')))))) : item.content && showContent && /*#__PURE__*/React.createElement("div", {
     className: styles.toolItemContent
   }, /*#__PURE__*/React.createElement(MMarkdown, {
     content: item.content

package/dist/components/answer-item/component/tool-list/index.module.css

@@ -134,6 +134,58 @@
   pointer-events: none;
 }
 
+.showUpload {
+  width: fit-content;
+  min-width: 128px;
+  height: 44px;
+  flex-shrink: 0;
+  border-radius: 22px;
+  border: 1px solid var(--theme-softNeutral, #D9DCE5);
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  padding: 0 12px;
+  box-sizing: border-box;
+  color: var(--theme-deepNeutral, #2E394C);
+  font-family: "PingFang SC";
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+}
+.showUpload :global(.ant-upload) {
+  height: 100%;
+}
+.showUpload .uploadIcon {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.showUpload .uploadIcon span {
+  white-space: nowrap;
+}
+.showUpload .disableFile {
+  border-radius: 22px;
+  border: 1px solid var(--theme-softNeutral, #D9DCE5);
+  background: #fff;
+  color: #ced3d9;
+  font-family: "PingFang SC";
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+}
+.showUpload img {
+  width: 32px;
+  height: 32px;
+  flex-shrink: 0;
+}
+
 @keyframes shine {
   0% {
     left: -60%;

package/dist/components/answer-item/index.js

@@ -303,9 +303,7 @@ var AnswerItem = function AnswerItem(_ref) {
                       }
                     } catch (error) {}
                     newItem.content = askContent;
-                    newItem.data = _objectSpread(_objectSpread({}, newItem.data), {}, {
-                      data: eventData
-                    });
+                    newItem.data = _objectSpread(_objectSpread({}, newItem.data), eventData.data);
                     newItem.status = item.status === 'PENDING' ? 'RUNNING' : 'COMPLETED';
                     newItem.confirmStatus = item.status === 'PENDING' ? 'RUNNING' : 'COMPLETED';
                   }

package/dist/hooks/useChatActions.js

@@ -198,8 +198,6 @@ var useChatActions = function useChatActions(showCopyId, inputModelRef, handleSe
       // if (messageList[messageList.length - 1]?.selectValue) {
       //     return;
       // }
-      console.log(item);
-
       // 根据 operation 类型获取答案内容
       var answerContent = '';
       if (operation === 'click') {

package/dist/hooks/useCommonChatAPI.js

@@ -1003,9 +1003,12 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
         cleanVal,
         userChat,
         prevChatList,
-        _prevChatList,
-        lastItem,
         newChatList,
+        lastItem,
+        _lastItem$toolList,
+        _lastItem$toolList2,
+        lastAskTool,
+        updatedToolList,
         _args10 = arguments;
       return _regeneratorRuntime().wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
@@ -1057,27 +1060,55 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
 
             // 根据isSystemAuto决定是否添加用户消息到列表
             prevChatList = messageListRef.current.slice();
-            if (!isSystemAuto) {
-              setMsgLoading(true);
-              if (((_prevChatList = prevChatList) === null || _prevChatList === void 0 ? void 0 : _prevChatList.length) > 1) {
-                lastItem = prevChatList[prevChatList.length - 1];
-                if (lastItem.moduleType === 'ask') {
-                  prevChatList = [].concat(_toConsumableArray(prevChatList.slice(0, -1)), [_objectSpread(_objectSpread({}, prevChatList[prevChatList.length - 1]), {}, {
-                    disableUploadFile: true
-                  })]);
-                }
-              }
-              newChatList = [].concat(_toConsumableArray(prevChatList), [userChat]);
-              dispatch(setMessageList({
-                messageList: newChatList
-              }));
-              startChat(newChatList, isSystemAuto, conversationId, undefined, skipCreateNewMessage);
-            } else {
-              setMsgLoading(true);
-              // 系统自动上传，直接开始会话，不更新列表
-              startChat(_toConsumableArray(prevChatList), isSystemAuto, conversationId, undefined, skipCreateNewMessage);
+            newChatList = [].concat(_toConsumableArray(prevChatList), [userChat]);
+            if (isSystemAuto) {
+              _context10.next = 40;
+              break;
             }
-          case 25:
+            setMsgLoading(true);
+            if (!((prevChatList === null || prevChatList === void 0 ? void 0 : prevChatList.length) > 1)) {
+              _context10.next = 36;
+              break;
+            }
+            lastItem = prevChatList[prevChatList.length - 1];
+            if (!(lastItem.moduleType === 'ask')) {
+              _context10.next = 36;
+              break;
+            }
+            lastAskTool = (_lastItem$toolList = lastItem.toolList) === null || _lastItem$toolList === void 0 ? void 0 : _lastItem$toolList.find(function (tool) {
+              return tool.moduleType === 'ask';
+            });
+            if (lastAskTool) {
+              _context10.next = 33;
+              break;
+            }
+            return _context10.abrupt("return");
+          case 33:
+            updatedToolList = (_lastItem$toolList2 = lastItem.toolList) === null || _lastItem$toolList2 === void 0 ? void 0 : _lastItem$toolList2.map(function (tool) {
+              return tool.id === lastAskTool.id ? _objectSpread(_objectSpread({}, tool), {}, {
+                moduleType: "ask",
+                status: 'COMPLETED',
+                confirmStatus: "CONFIRMED",
+                content: value
+              }) : tool;
+            });
+            skipCreateNewMessage = true;
+            newChatList = [].concat(_toConsumableArray(prevChatList.slice(0, -1)), [_objectSpread(_objectSpread({}, prevChatList[prevChatList.length - 1]), {}, {
+              disableUploadFile: true,
+              toolList: updatedToolList
+            })]);
+          case 36:
+            dispatch(setMessageList({
+              messageList: newChatList
+            }));
+            startChat(newChatList, isSystemAuto, conversationId, undefined, skipCreateNewMessage);
+            _context10.next = 42;
+            break;
+          case 40:
+            setMsgLoading(true);
+            // 系统自动上传，直接开始会话，不更新列表
+            startChat(_toConsumableArray(prevChatList), isSystemAuto, conversationId, undefined, skipCreateNewMessage);
+          case 42:
           case "end":
             return _context10.stop();
         }
@@ -1326,6 +1357,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
       var uploadFile = fileList[0];
       var isLastMessageEmptyUserChat = (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'ask'; // 空内容
       if (!isLastMessageEmptyUserChat) {
+        console.log('isLastMessageEmptyUserChat', isLastMessageEmptyUserChat);
         var shouldEnableUpload = uploadFile.status === FileStatus.UPLOAD_FAILED || uploadFile.status === FileStatus.ANALYSE_FAILED;
         var newMessageList = [].concat(_toConsumableArray(messageList.slice(0, -2)), [_objectSpread(_objectSpread({}, messageList[messageList.length - 2]), {}, {
           disableUploadFile: !shouldEnableUpload