@myun/gimi-chat 0.9.76 → 0.9.77

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

@@ -15,7 +15,7 @@ import FileUpload from "../../../file-upload";
 import styles from "./index.module.css";
 import classNames from "classnames";
 import { useTranslation } from "react-i18next";
-
+import { useAppSelector } from "../../../../store/hooks";
 // 思考工具项组件
 var ThinkingToolItem = function ThinkingToolItem(_ref) {
   var item = _ref.item,
@@ -162,8 +162,15 @@ var AskToolItem = function AskToolItem(_ref4) {
     _useState8 = _slicedToArray(_useState7, 2),
     showContent = _useState8[0],
     setShowContent = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    uploadDisabled = _useState10[0],
+    setUploadDisabled = _useState10[1];
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var fileList = useAppSelector(function (state) {
+    return state.gimiMenu.fileList;
+  });
   var askTextMap = {
     RUNNING: "等待人工确认",
     COMPLETED: "用户已确认"
@@ -190,10 +197,15 @@ var AskToolItem = function AskToolItem(_ref4) {
     detailInfo = _React$useMemo.detailInfo,
     optionsList = _React$useMemo.optionsList,
     questionContent = _React$useMemo.questionContent;
-  React.useEffect(function () {
+  useEffect(function () {
     var isAnswered = item.status === 'ANSWERED' || item.confirmStatus === 'CONFIRMED';
     setDisabled(Boolean(isAnswered));
   }, [item.confirmStatus, item.status]);
+  useEffect(function () {
+    setUploadDisabled((fileList === null || fileList === void 0 ? void 0 : fileList.findIndex(function (v) {
+      return (v === null || v === void 0 ? void 0 : v.status) === "uploading" || (v === null || v === void 0 ? void 0 : v.status) === "padding";
+    })) !== -1);
+  }, [fileList]);
   var onAskItemClick = function onAskItemClick(key, value) {
     if (disabled) return;
     setDisabled(true);
@@ -238,13 +250,19 @@ var AskToolItem = function AskToolItem(_ref4) {
     }, optionRender(v));
   })), 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(FileUpload, {
+    disabled: uploadDisabled
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classNames(styles.uploadIcon, uploadDisabled ? styles.disableFile : '')
   }, /*#__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", {
+    color: uploadDisabled ? 'var(--theme-softNeutral, #D9DCE5)' : 'var(--theme-deepNeutral, #2E394C)'
+  }), /*#__PURE__*/React.createElement("span", {
+    style: uploadDisabled ? {
+      color: "var(--theme-softNeutral, #D9DCE5)"
+    } : {}
+  }, uploadDisabled ? t('askCard.uploading') : 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

@@ -171,12 +171,9 @@
 }
 .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;
 }

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

@@ -300,6 +300,9 @@ var AnswerItem = function AnswerItem(_ref) {
                       var options = (_eventData2 = eventData) === null || _eventData2 === void 0 || (_eventData2 = _eventData2.data) === null || _eventData2 === void 0 || (_eventData2 = _eventData2.results) === null || _eventData2 === void 0 || (_eventData2 = _eventData2.askShowInfo) === null || _eventData2 === void 0 ? void 0 : _eventData2.options;
                       if (clickedOptionId && options && options[clickedOptionId]) {
                         askContent = options[clickedOptionId];
+                      } else {
+                        var _eventData3;
+                        askContent = ((_eventData3 = eventData) === null || _eventData3 === void 0 || (_eventData3 = _eventData3.data) === null || _eventData3 === void 0 ? void 0 : _eventData3.results["".concat(eventData.id, ".USER_RESPONSE")]) || '';
                       }
                     } catch (error) {}
                     newItem.content = askContent;

package/dist/hooks/useCommonChatAPI.js

@@ -34,7 +34,6 @@ import useScroll from "./useScroll";
 // 获取推荐课程
 import { useChatRecommend } from "./useChatRecommend";
 import { set, cloneDeep } from 'lodash';
-import { FileStatus } from "../interfaces/fileInterface";
 import useChatHistory from "./useChatHistory";
 var useCommonChatAPI = function useCommonChatAPI(props) {
   var _useTranslation = useTranslation(),
@@ -1345,46 +1344,75 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
       return;
     }
     setMsgLoading(true);
-    startChat(messageList, false, undefined, true);
+    startChat(messageList, false, undefined, true, true);
   }, [startChat, status]);
   React.useEffect(function () {
     var hasValidFile = (fileList === null || fileList === void 0 ? void 0 : fileList.length) > 0;
     var messageList = messageListRef.current || [];
     var lastMessage = messageList[messageList.length - 1];
-    var targetMessage = messageList[messageList.length - 2];
+    // const targetMessage = messageList[messageList.length - 2];
     if (hasValidFile && lastMessage) {
-      setDisableSend(true);
+      setDisableSend(hasValidFile);
       var uploadFile = fileList[0];
-      var isLastMessageEmptyUserChat = (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'ask'; // 空内容
-      if (!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
-        }), _objectSpread(_objectSpread({}, messageList[messageList.length - 1]), {}, {
-          messageFiles: [uploadFile]
+
+      // 当有文件内容时处理请求
+      if (uploadFile !== null && uploadFile !== void 0 && uploadFile.content && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'ask') {
+        var _lastMessage$toolList, _messageListRef$curre;
+        var moduleInfo = lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleInfo;
+        var updatedToolList = (_lastMessage$toolList = lastMessage.toolList) === null || _lastMessage$toolList === void 0 ? void 0 : _lastMessage$toolList.map(function (tool) {
+          return tool.status === 'RUNNING' ? _objectSpread(_objectSpread({}, tool), {}, {
+            moduleType: "ask",
+            status: 'COMPLETED',
+            confirmStatus: "CONFIRMED",
+            content: uploadFile.content
+          }) : tool;
+        });
+        var updatedMessageList = [].concat(_toConsumableArray(messageList.slice(0, -1)), [_objectSpread(_objectSpread({}, lastMessage), {}, {
+          toolList: updatedToolList
         })]);
         dispatch(setMessageList({
-          messageList: newMessageList
+          messageList: updatedMessageList
         }));
-        // 当有文件内容时处理请求
-        if (uploadFile !== null && uploadFile !== void 0 && uploadFile.content && (targetMessage === null || targetMessage === void 0 ? void 0 : targetMessage.moduleType) === 'ask') {
-          var _messageListRef$curre;
-          var moduleInfo = targetMessage === null || targetMessage === void 0 ? void 0 : targetMessage.moduleInfo;
-          var _inputModel = _defineProperty({}, "".concat(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.id, ".input"), '');
-          inputModelRef.current = _inputModel;
-          if (((_messageListRef$curre = messageListRef.current) === null || _messageListRef$curre === void 0 ? void 0 : _messageListRef$curre.length) > 0) {
-            handleSendFile(newMessageList);
-          }
+        var _inputModel = _defineProperty({}, "".concat(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.id, ".input"), '');
+        inputModelRef.current = _inputModel;
+        if (((_messageListRef$curre = messageListRef.current) === null || _messageListRef$curre === void 0 ? void 0 : _messageListRef$curre.length) > 0) {
+          handleSendFile(updatedMessageList);
         }
-      } else {
-        var _newMessageList2 = [].concat(_toConsumableArray(messageList.slice(0, -1)), [_objectSpread(_objectSpread({}, messageList[messageList.length - 1]), {}, {
-          disableUploadFile: true
-        }), createUserChat('', "".concat(conversationIdRef.current))]);
-        dispatch(setMessageList({
-          messageList: _newMessageList2
-        }));
       }
     }
+    // if (hasValidFile && lastMessage) {
+    //     setDisableSend(true);
+    //     const uploadFile = fileList[0];
+    //     const isLastMessageEmptyUserChat = lastMessage?.moduleType === 'ask'; // 空内容
+    //     if (!isLastMessageEmptyUserChat) {
+    //         const shouldEnableUpload = uploadFile.status === FileStatus.UPLOAD_FAILED || uploadFile.status === FileStatus.ANALYSE_FAILED;
+    //         const newMessageList = [...messageList.slice(0, -2),
+    //         { ...messageList[messageList.length - 2], disableUploadFile: !shouldEnableUpload },
+    //         { ...messageList[messageList.length - 1], messageFiles: [uploadFile] }];
+    //         dispatch(setMessageList({ messageList: newMessageList }));
+    //         // 当有文件内容时处理请求
+    //         if (uploadFile?.content && targetMessage?.moduleType === 'ask') {
+    //             const moduleInfo = targetMessage?.moduleInfo;
+    //             const _inputModel = {
+    //                 [`${moduleInfo?.id}.input`]: '',
+    //             };
+    //             inputModelRef.current = _inputModel;
+    //             if (messageListRef.current?.length > 0) {
+    //                 handleSendFile(newMessageList);
+    //             }
+    //         }
+    //     } else {
+    //         // const newMessageList = [
+    //         //     ...messageList.slice(0, -1),
+    //         //     {
+    //         //         ...messageList[messageList.length - 1],
+    //         //         disableUploadFile: true,
+    //         //     },
+    //         //     createUserChat('', `${conversationIdRef.current}`),
+    //         // ];
+    //         // dispatch(setMessageList({ messageList: newMessageList }));
+    //     }
+    // }
   }, [fileList, dispatch, handleSendFile, createUserChat]);
   var onSucessExcel = React.useCallback(function (value) {
     // setDisableSend(true);

package/dist/i18n/locales/en-US.d.ts

@@ -111,6 +111,7 @@ declare const enUS: {
     'common.scoreUnit': string;
     'common.networkUnavailable': string;
     'askCard.fileUpload': string;
+    'askCard.uploading': string;
     'upload.readFailed': string;
     'upload.networkRetry': string;
     'upload.failedMaxRetry': string;

package/dist/i18n/locales/en-US.js

@@ -111,6 +111,7 @@ var enUS = {
   'common.scoreUnit': 'Points',
   'common.networkUnavailable': 'Network connection error',
   'askCard.fileUpload': 'File Upload',
+  'askCard.uploading': 'Uploading',
   'upload.readFailed': 'File read failed',
   'upload.networkRetry': 'Network error, waiting to retry',
   'upload.failedMaxRetry': 'Upload failed, max retries reached',

package/dist/i18n/locales/zh-CN.d.ts

@@ -113,6 +113,7 @@ declare const zhCN: {
     'common.scoreUnit': string;
     'common.networkUnavailable': string;
     'askCard.fileUpload': string;
+    'askCard.uploading': string;
     'upload.readFailed': string;
     'upload.networkRetry': string;
     'upload.failedMaxRetry': string;

package/dist/i18n/locales/zh-CN.js

@@ -113,6 +113,7 @@ var zhCN = {
   'common.scoreUnit': '分',
   'common.networkUnavailable': '无法连接到网络',
   'askCard.fileUpload': '文件上传',
+  'askCard.uploading': '上传中',
   'upload.readFailed': '文件读取失败',
   'upload.networkRetry': '网络异常，等待恢复后重试',
   'upload.failedMaxRetry': '文件上传失败，已达到最大重试次数',