@douyinfe/semi-foundation 2.88.0 → 2.88.1

package/aiChatInput/foundation.ts

@@ -1,6 +1,6 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import { Attachment, BaseSkill, Suggestion, Reference, Content, LeftMenuChangeProps, MessageContent } from './interface';
-import { isNumber, isString } from 'lodash';
+import { get, isNumber, isString } from 'lodash';
 import { cssClasses } from './constants';
 import { findSkillSlotInString, getSkillSlotString, transformJSONResult } from './utils';
 
@@ -345,7 +345,9 @@ export default class AIChatInputFoundation extends BaseFoundation<AIChatInputAda
         if ((suggestionVisible || skillVisible) && ['ArrowUp', 'ArrowDown', 'Enter'].includes(event.key)) {
             return true;
         }
-        if (event.key === 'Enter' && !event.shiftKey) {
+        const editor = this._adapter.getEditor() ?? {};
+        const allowHotKeySend = get(editor, 'storage.SemiAIChatInput.allowHotKeySend');
+        if (event.key === 'Enter' && !event.shiftKey && allowHotKeySend) {
             this.handleSend();
             return true;
         }

package/chat/chat.scss

@@ -498,13 +498,17 @@ $module: #{$prefix}-chat;
             color: $color-chat_attachment_clear_icon;
         }
 
-        &-process.#{$prefix}-progress-circle {
+        &-process.#{$prefix}-progress-circle, &-fail {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
         }
 
+        &-fail {
+            color: $color-chat_attachment_fail;
+        }
+
         &-file {
             display: inline-flex;
             flex-direction: row;

package/chat/constants.ts

@@ -49,6 +49,15 @@ const SEND_HOT_KEY = {
     SHIFT_PLUS_ENTER: 'shift+enter'
 };
 
+const FILE_STATUS = {
+    UPLOADING: 'uploading',
+    SUCCESS: 'success',
+    UPLOAD_FAIL: 'uploadFail',
+    VALIDATING: 'validating',
+    VALID_FAIL: 'validateFail',
+    WAIT_UPLOAD: 'wait',
+};
+
 const strings = {
     ROLE,
     CHAT_ALIGN,
@@ -59,6 +68,7 @@ const strings = {
     SHOW_SCROLL_GAP,
     MODE,
     SEND_HOT_KEY,
+    FILE_STATUS
 };
 
 

package/chat/inputboxFoundation.ts

@@ -61,7 +61,15 @@ export default class InputBoxFoundation <P = Record<string, any>, S = Record<str
     getDisableSend = () => {
         const { content, attachment } = this.getStates();
         const { disableSend: disableSendInProps } = this.getProps();
-        const disabledSend = disableSendInProps || (content.length === 0 && attachment.length === 0);
+        /** 不能发送的条件：（满足任1）
+         *  1. props 中禁止发送；2. 没有文本输入，且没有上传文件； 3.上传文件中有状态不为 success 的
+         *  Conditions under which content cannot be sent: (any one of the following conditions must be met)
+         *  1. Sending is disabled in props; 2. No text input and no file upload; 3. There are files uploaded that do not have a success status.
+         */
+        const disabledSend = disableSendInProps || 
+            (content.length === 0 && attachment.length === 0) || 
+            attachment.find(item => item.status !== strings.FILE_STATUS.SUCCESS)
+        ;
         return disabledSend;
     }
 

package/chat/variables.scss

@@ -28,6 +28,7 @@ $color-chat_inputBottom_sendButton_icon-disable: var(--semi-color-primary-disabl
 $color-chat_inputBox_container-border: var(--semi-color-border);  // 输入框容器边框颜色
 $color-chat_attachment_clear_icon: var(--semi-color-text-2);  // 附件清除图标颜色
 $color-chat_attachment_file-bg: var(--semi-color-fill-0); // 附件文件背景颜色
+$color-chat_attachment_fail: var(--semi-color-danger); // 附件上传失败的提示图标颜色
 $color-chat_chatBox_user_attachment_file-bg: var(--semi-color-bg-0); // 用户聊天框附件文件背景颜色
 $color-chat_chatBox_other_attachment_file-bg: var(--semi-color-fill-2); // 聊天框附件文件背景颜色
 $color-chat_attachment_file_icon: var(--semi-color-text-2); // 附件文件图标颜色

package/lib/cjs/aiChatInput/foundation.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
+var _get2 = _interopRequireDefault(require("lodash/get"));
 var _foundation = _interopRequireDefault(require("../base/foundation"));
 var _constants = require("./constants");
 var _utils = require("./utils");
@@ -317,6 +318,7 @@ class AIChatInputFoundation extends _foundation.default {
       this._adapter.focusEditor();
     };
     this.handRichTextArealKeyDown = (view, event) => {
+      var _a;
       // console.log('outer key down handle');
       const {
         suggestionVisible,
@@ -332,7 +334,9 @@ class AIChatInputFoundation extends _foundation.default {
       if ((suggestionVisible || skillVisible) && ['ArrowUp', 'ArrowDown', 'Enter'].includes(event.key)) {
         return true;
       }
-      if (event.key === 'Enter' && !event.shiftKey) {
+      const editor = (_a = this._adapter.getEditor()) !== null && _a !== void 0 ? _a : {};
+      const allowHotKeySend = (0, _get2.default)(editor, 'storage.SemiAIChatInput.allowHotKeySend');
+      if (event.key === 'Enter' && !event.shiftKey && allowHotKeySend) {
         this.handleSend();
         return true;
       }

package/lib/cjs/chat/chat.css

@@ -392,12 +392,15 @@
   right: -8px;
   color: var(--semi-color-text-2);
 }
-.semi-chat-attachment-process.semi-progress-circle {
+.semi-chat-attachment-process.semi-progress-circle, .semi-chat-attachment-fail {
   position: absolute;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
 }
+.semi-chat-attachment-fail {
+  color: var(--semi-color-danger);
+}
 .semi-chat-attachment-file {
   display: inline-flex;
   flex-direction: row;

package/lib/cjs/chat/chat.scss

@@ -498,13 +498,17 @@ $module: #{$prefix}-chat;
             color: $color-chat_attachment_clear_icon;
         }
 
-        &-process.#{$prefix}-progress-circle {
+        &-process.#{$prefix}-progress-circle, &-fail {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
         }
 
+        &-fail {
+            color: $color-chat_attachment_fail;
+        }
+
         &-file {
             display: inline-flex;
             flex-direction: row;

package/lib/cjs/chat/constants.d.ts

@@ -37,5 +37,13 @@ declare const strings: {
         ENTER: string;
         SHIFT_PLUS_ENTER: string;
     };
+    FILE_STATUS: {
+        UPLOADING: string;
+        SUCCESS: string;
+        UPLOAD_FAIL: string;
+        VALIDATING: string;
+        VALID_FAIL: string;
+        WAIT_UPLOAD: string;
+    };
 };
 export { cssClasses, strings, };

package/lib/cjs/chat/constants.js

@@ -43,6 +43,14 @@ const SEND_HOT_KEY = {
   ENTER: 'enter',
   SHIFT_PLUS_ENTER: 'shift+enter'
 };
+const FILE_STATUS = {
+  UPLOADING: 'uploading',
+  SUCCESS: 'success',
+  UPLOAD_FAIL: 'uploadFail',
+  VALIDATING: 'validating',
+  VALID_FAIL: 'validateFail',
+  WAIT_UPLOAD: 'wait'
+};
 const strings = exports.strings = {
   ROLE,
   CHAT_ALIGN,
@@ -52,5 +60,6 @@ const strings = exports.strings = {
   SCROLL_ANIMATION_TIME,
   SHOW_SCROLL_GAP,
   MODE,
-  SEND_HOT_KEY
+  SEND_HOT_KEY,
+  FILE_STATUS
 };

package/lib/cjs/chat/inputboxFoundation.js

@@ -77,7 +77,12 @@ class InputBoxFoundation extends _foundation.default {
       const {
         disableSend: disableSendInProps
       } = this.getProps();
-      const disabledSend = disableSendInProps || content.length === 0 && attachment.length === 0;
+      /** 不能发送的条件：（满足任1）
+       *  1. props 中禁止发送；2. 没有文本输入，且没有上传文件； 3.上传文件中有状态不为 success 的
+       *  Conditions under which content cannot be sent: (any one of the following conditions must be met)
+       *  1. Sending is disabled in props; 2. No text input and no file upload; 3. There are files uploaded that do not have a success status.
+       */
+      const disabledSend = disableSendInProps || content.length === 0 && attachment.length === 0 || attachment.find(item => item.status !== _constants.strings.FILE_STATUS.SUCCESS);
       return disabledSend;
     };
     this.onEnterPress = e => {

package/lib/cjs/chat/variables.scss

@@ -28,6 +28,7 @@ $color-chat_inputBottom_sendButton_icon-disable: var(--semi-color-primary-disabl
 $color-chat_inputBox_container-border: var(--semi-color-border);  // 输入框容器边框颜色
 $color-chat_attachment_clear_icon: var(--semi-color-text-2);  // 附件清除图标颜色
 $color-chat_attachment_file-bg: var(--semi-color-fill-0); // 附件文件背景颜色
+$color-chat_attachment_fail: var(--semi-color-danger); // 附件上传失败的提示图标颜色
 $color-chat_chatBox_user_attachment_file-bg: var(--semi-color-bg-0); // 用户聊天框附件文件背景颜色
 $color-chat_chatBox_other_attachment_file-bg: var(--semi-color-fill-2); // 聊天框附件文件背景颜色
 $color-chat_attachment_file_icon: var(--semi-color-text-2); // 附件文件图标颜色

package/lib/es/aiChatInput/foundation.js

@@ -1,5 +1,6 @@
 import _isString from "lodash/isString";
 import _isNumber from "lodash/isNumber";
+import _get from "lodash/get";
 import BaseFoundation from '../base/foundation';
 import { cssClasses } from './constants';
 import { findSkillSlotInString, getSkillSlotString, transformJSONResult } from './utils';
@@ -310,6 +311,7 @@ export default class AIChatInputFoundation extends BaseFoundation {
       this._adapter.focusEditor();
     };
     this.handRichTextArealKeyDown = (view, event) => {
+      var _a;
       // console.log('outer key down handle');
       const {
         suggestionVisible,
@@ -325,7 +327,9 @@ export default class AIChatInputFoundation extends BaseFoundation {
       if ((suggestionVisible || skillVisible) && ['ArrowUp', 'ArrowDown', 'Enter'].includes(event.key)) {
         return true;
       }
-      if (event.key === 'Enter' && !event.shiftKey) {
+      const editor = (_a = this._adapter.getEditor()) !== null && _a !== void 0 ? _a : {};
+      const allowHotKeySend = _get(editor, 'storage.SemiAIChatInput.allowHotKeySend');
+      if (event.key === 'Enter' && !event.shiftKey && allowHotKeySend) {
         this.handleSend();
         return true;
       }

package/lib/es/chat/chat.css

@@ -392,12 +392,15 @@
   right: -8px;
   color: var(--semi-color-text-2);
 }
-.semi-chat-attachment-process.semi-progress-circle {
+.semi-chat-attachment-process.semi-progress-circle, .semi-chat-attachment-fail {
   position: absolute;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
 }
+.semi-chat-attachment-fail {
+  color: var(--semi-color-danger);
+}
 .semi-chat-attachment-file {
   display: inline-flex;
   flex-direction: row;

package/lib/es/chat/chat.scss

@@ -498,13 +498,17 @@ $module: #{$prefix}-chat;
             color: $color-chat_attachment_clear_icon;
         }
 
-        &-process.#{$prefix}-progress-circle {
+        &-process.#{$prefix}-progress-circle, &-fail {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
         }
 
+        &-fail {
+            color: $color-chat_attachment_fail;
+        }
+
         &-file {
             display: inline-flex;
             flex-direction: row;

package/lib/es/chat/constants.d.ts

@@ -37,5 +37,13 @@ declare const strings: {
         ENTER: string;
         SHIFT_PLUS_ENTER: string;
     };
+    FILE_STATUS: {
+        UPLOADING: string;
+        SUCCESS: string;
+        UPLOAD_FAIL: string;
+        VALIDATING: string;
+        VALID_FAIL: string;
+        WAIT_UPLOAD: string;
+    };
 };
 export { cssClasses, strings, };

package/lib/es/chat/constants.js

@@ -37,6 +37,14 @@ const SEND_HOT_KEY = {
   ENTER: 'enter',
   SHIFT_PLUS_ENTER: 'shift+enter'
 };
+const FILE_STATUS = {
+  UPLOADING: 'uploading',
+  SUCCESS: 'success',
+  UPLOAD_FAIL: 'uploadFail',
+  VALIDATING: 'validating',
+  VALID_FAIL: 'validateFail',
+  WAIT_UPLOAD: 'wait'
+};
 const strings = {
   ROLE,
   CHAT_ALIGN,
@@ -46,6 +54,7 @@ const strings = {
   SCROLL_ANIMATION_TIME,
   SHOW_SCROLL_GAP,
   MODE,
-  SEND_HOT_KEY
+  SEND_HOT_KEY,
+  FILE_STATUS
 };
 export { cssClasses, strings };

package/lib/es/chat/inputboxFoundation.js

@@ -70,7 +70,12 @@ export default class InputBoxFoundation extends BaseFoundation {
       const {
         disableSend: disableSendInProps
       } = this.getProps();
-      const disabledSend = disableSendInProps || content.length === 0 && attachment.length === 0;
+      /** 不能发送的条件：（满足任1）
+       *  1. props 中禁止发送；2. 没有文本输入，且没有上传文件； 3.上传文件中有状态不为 success 的
+       *  Conditions under which content cannot be sent: (any one of the following conditions must be met)
+       *  1. Sending is disabled in props; 2. No text input and no file upload; 3. There are files uploaded that do not have a success status.
+       */
+      const disabledSend = disableSendInProps || content.length === 0 && attachment.length === 0 || attachment.find(item => item.status !== strings.FILE_STATUS.SUCCESS);
       return disabledSend;
     };
     this.onEnterPress = e => {

package/lib/es/chat/variables.scss

@@ -28,6 +28,7 @@ $color-chat_inputBottom_sendButton_icon-disable: var(--semi-color-primary-disabl
 $color-chat_inputBox_container-border: var(--semi-color-border);  // 输入框容器边框颜色
 $color-chat_attachment_clear_icon: var(--semi-color-text-2);  // 附件清除图标颜色
 $color-chat_attachment_file-bg: var(--semi-color-fill-0); // 附件文件背景颜色
+$color-chat_attachment_fail: var(--semi-color-danger); // 附件上传失败的提示图标颜色
 $color-chat_chatBox_user_attachment_file-bg: var(--semi-color-bg-0); // 用户聊天框附件文件背景颜色
 $color-chat_chatBox_other_attachment_file-bg: var(--semi-color-fill-2); // 聊天框附件文件背景颜色
 $color-chat_attachment_file_icon: var(--semi-color-text-2); // 附件文件图标颜色

package/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.88.0",
+    "version": "2.88.1",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.88.0",
-        "@douyinfe/semi-json-viewer-core": "2.88.0",
+        "@douyinfe/semi-animation": "2.88.1",
+        "@douyinfe/semi-json-viewer-core": "2.88.1",
         "@mdx-js/mdx": "^3.0.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
@@ -29,7 +29,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "dd7950d62f3dd702ea384d2df21baafd5912bbd6",
+    "gitHead": "e08d049ae7cbf936679b53146fd9041577c9422b",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",