@agentscope-ai/chat 1.1.42 → 1.1.43-beta.1765432918432

package/components/ChatAnywhere/Input/index.tsx

@@ -1,4 +1,4 @@
-import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react'
+import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
 import { UploadFile } from 'antd';
 import { useProviderContext, ChatInput, uuid, Sender, Attachments } from '@agentscope-ai/chat';
 import cls from 'classnames';
@@ -138,8 +138,19 @@ export default forwardRef(function (_, ref) {
 
   const submitFileList = attachedFiles.map(files => files.filter(file => file.status === 'done'));
   const fileLoading = attachedFiles.some(files => files.some(file => file.status === 'uploading'));
-
-
+  
+  // 检查是否有必需的上传项没有文件
+  const requiredFileMissing = useMemo(() => {
+    return onUpload?.some((item, index) => {
+      if (item.required) {
+        const files = attachedFiles[index] || [];
+        return files.length === 0;
+      }
+      return false;
+    }) ?? false;
+  }, [onUpload, attachedFiles]);
+  
+  const sendDisabled = requiredFileMissing;
 
   return <>
     <Style />
@@ -163,6 +174,7 @@ export default forwardRef(function (_, ref) {
         onChange={setContent}
         maxLength={onInput.maxLength}
         disabled={fileLoading || inputContext.disabled}
+        sendDisabled={sendDisabled}
         scalable={onInput?.zoomable}
         header={senderHeader}
         prefix={<>

package/components/ChatAnywhere/hooks/types.ts

@@ -194,6 +194,11 @@ export interface IChatAnywhereConfigOnUpload {
    * @descriptionEn Pre-upload processing function
    */
   beforeUpload?: GetProp<typeof Upload, 'beforeUpload'>;
+  /**
+   * @description 是否必传
+   * @descriptionEn Whether to required
+   */
+  required?: boolean;
   /**
    * @description 自定义上传请求函数
    * @descriptionEn Custom upload request function

package/components/OperateCard/preset/Rag.tsx

@@ -28,6 +28,12 @@ export interface IRagProps {
     images?: string[];
     link?: string;
   }[]
+  /**
+   * @description 默认展开
+   * @descriptionEn Default Open
+   * @default true
+   */
+  defaultOpen?: boolean;
 }
 
 function Images({ images }: { images: string[] }) {
@@ -54,7 +60,7 @@ function Images({ images }: { images: string[] }) {
 export default function (props: IRagProps) {
   const { getPrefixCls } = useProviderContext();
   const prefixCls = getPrefixCls('operate-card');
-  const { title = '知识库检索', subTitle } = props;
+  const { title = '知识库检索', subTitle, defaultOpen = true } = props;
 
   return <OperateCard
     header={{
@@ -63,7 +69,7 @@ export default function (props: IRagProps) {
       description: subTitle,
     }}
     body={{
-      defaultOpen: true,
+      defaultOpen,
       children: <OperateCard.LineBody>
         {props.list.map((item, index) => {
           return <div key={index} className={`${prefixCls}-rag-item`}>

package/components/Sender/components/ActionButton.tsx

@@ -79,7 +79,7 @@ export function ActionButton(props: ActionButtonProps) {
   const { prefixCls, disabled: rootDisabled } = context;
 
   const onClick = context[action];
-  const mergedDisabled = rootDisabled ?? restProps.disabled ?? context[`${action}Disabled`];
+  const mergedDisabled = rootDisabled || restProps.disabled || context[`${action}Disabled`] || false;
 
   return (
     <IconButton

package/components/Sender/index.tsx

@@ -76,6 +76,12 @@ export interface SenderProps extends Pick<TextareaProps, 'placeholder' | 'onKeyP
    */
   disabled?: boolean;
 
+  /**
+   * @description 是否禁用发送按钮
+   * @descriptionEn Whether to disable the send button
+   */
+  sendDisabled?: boolean;
+
   /**
    * @description 是否启用用户focus时展开输入框组件
    * @descriptionEn Whether to enable the user focus to expand the input box component
@@ -211,6 +217,7 @@ const ForwardSender = React.forwardRef<SenderRef, SenderProps>((props, ref) => {
     value,
     readOnly,
     enableFocusExpand = false,
+    sendDisabled = false,
     submitType = 'enter',
     onSubmit,
     loading,
@@ -326,7 +333,7 @@ const ForwardSender = React.forwardRef<SenderRef, SenderProps>((props, ref) => {
 
   // ============================ Events ============================
   const triggerSend = () => {
-    if (innerValue && onSubmit && !loading) {
+    if (!contextValue.onSendDisabled && onSubmit && !loading) {
       onSubmit(innerValue);
     }
   };
@@ -431,7 +438,7 @@ const ForwardSender = React.forwardRef<SenderRef, SenderProps>((props, ref) => {
   const contextValue = {
     prefixCls: actionBtnCls,
     onSend: triggerSend,
-    onSendDisabled: !innerValue,
+    onSendDisabled: !innerValue || sendDisabled,
     onClear: triggerClear,
     onClearDisabled: !innerValue,
     onCancel,

package/lib/ChatAnywhere/Input/index.js

@@ -13,7 +13,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
 import { useProviderContext, ChatInput, Sender, Attachments } from "../..";
 import cls from 'classnames';
 import { useChatAnywhere } from "../hooks/ChatAnywhereProvider";
@@ -170,6 +170,19 @@ export default /*#__PURE__*/forwardRef(function (_, ref) {
       return file.status === 'uploading';
     });
   });
+
+  // 检查是否有必需的上传项没有文件
+  var requiredFileMissing = useMemo(function () {
+    var _onUpload$some;
+    return (_onUpload$some = onUpload === null || onUpload === void 0 ? void 0 : onUpload.some(function (item, index) {
+      if (item.required) {
+        var files = attachedFiles[index] || [];
+        return files.length === 0;
+      }
+      return false;
+    })) !== null && _onUpload$some !== void 0 ? _onUpload$some : false;
+  }, [onUpload, attachedFiles]);
+  var sendDisabled = requiredFileMissing;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Style, {}), /*#__PURE__*/_jsxs("div", {
       className: cls("".concat(prefixCls, "-wrapper"), _defineProperty(_defineProperty({}, "".concat(prefixCls, "-wrapper-focus"), focus && onInput.enableFocusExpand), "".concat(prefixCls, "-wrapper-blur"), !focus && onInput.enableFocusExpand)),
@@ -183,6 +196,7 @@ export default /*#__PURE__*/forwardRef(function (_, ref) {
         onChange: setContent,
         maxLength: onInput.maxLength,
         disabled: fileLoading || inputContext.disabled,
+        sendDisabled: sendDisabled,
         scalable: onInput === null || onInput === void 0 ? void 0 : onInput.zoomable,
         header: senderHeader,
         prefix: /*#__PURE__*/_jsxs(_Fragment, {

package/lib/ChatAnywhere/hooks/types.d.ts

@@ -191,6 +191,11 @@ export interface IChatAnywhereConfigOnUpload {
      * @descriptionEn Pre-upload processing function
      */
     beforeUpload?: GetProp<typeof Upload, 'beforeUpload'>;
+    /**
+     * @description 是否必传
+     * @descriptionEn Whether to required
+     */
+    required?: boolean;
     /**
      * @description 自定义上传请求函数
      * @descriptionEn Custom upload request function

package/lib/OperateCard/preset/Rag.d.ts

@@ -23,5 +23,11 @@ export interface IRagProps {
         images?: string[];
         link?: string;
     }[];
+    /**
+     * @description 默认展开
+     * @descriptionEn Default Open
+     * @default true
+     */
+    defaultOpen?: boolean;
 }
 export default function (props: IRagProps): import("react/jsx-runtime").JSX.Element;

package/lib/OperateCard/preset/Rag.js

@@ -32,7 +32,9 @@ export default function (props) {
   var prefixCls = getPrefixCls('operate-card');
   var _props$title = props.title,
     title = _props$title === void 0 ? '知识库检索' : _props$title,
-    subTitle = props.subTitle;
+    subTitle = props.subTitle,
+    _props$defaultOpen = props.defaultOpen,
+    defaultOpen = _props$defaultOpen === void 0 ? true : _props$defaultOpen;
   return /*#__PURE__*/_jsx(OperateCard, {
     header: {
       icon: /*#__PURE__*/_jsx(SparkBookLine, {}),
@@ -40,7 +42,7 @@ export default function (props) {
       description: subTitle
     },
     body: {
-      defaultOpen: true,
+      defaultOpen: defaultOpen,
       children: /*#__PURE__*/_jsx(OperateCard.LineBody, {
         children: props.list.map(function (item, index) {
           return /*#__PURE__*/_jsxs("div", {

package/lib/Sender/components/ActionButton.js

@@ -13,7 +13,6 @@ import * as React from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 export var ActionButtonContext = /*#__PURE__*/React.createContext(null);
 export function ActionButton(props) {
-  var _ref;
   var className = props.className,
     action = props.action,
     outClick = props.onClick,
@@ -22,7 +21,7 @@ export function ActionButton(props) {
   var prefixCls = context.prefixCls,
     rootDisabled = context.disabled;
   var _onClick = context[action];
-  var mergedDisabled = (_ref = rootDisabled !== null && rootDisabled !== void 0 ? rootDisabled : restProps.disabled) !== null && _ref !== void 0 ? _ref : context["".concat(action, "Disabled")];
+  var mergedDisabled = rootDisabled || restProps.disabled || context["".concat(action, "Disabled")] || false;
   return /*#__PURE__*/_jsx(IconButton, _objectSpread(_objectSpread({
     bordered: false,
     disabled: mergedDisabled

package/lib/Sender/index.d.ts

@@ -46,6 +46,11 @@ export interface SenderProps extends Pick<TextareaProps, 'placeholder' | 'onKeyP
      * @descriptionEn Whether to disable the entire sender component, including input field and buttons
      */
     disabled?: boolean;
+    /**
+     * @description 是否禁用发送按钮
+     * @descriptionEn Whether to disable the send button
+     */
+    sendDisabled?: boolean;
     /**
      * @description 是否启用用户focus时展开输入框组件
      * @descriptionEn Whether to enable the user focus to expand the input box component

package/lib/Sender/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["styles", "classNames", "className", "rootClassName", "style", "defaultValue", "value", "readOnly", "enableFocusExpand", "submitType", "onSubmit", "loading", "onCancel", "onChange", "onFocus", "onBlur", "actions", "onKeyPress", "onKeyDown", "disabled", "header", "onPaste", "allowSpeech", "onPasteFile", "components", "initialRows", "scalable"];
+var _excluded = ["styles", "classNames", "className", "rootClassName", "style", "defaultValue", "value", "readOnly", "enableFocusExpand", "sendDisabled", "submitType", "onSubmit", "loading", "onCancel", "onChange", "onFocus", "onBlur", "actions", "onKeyPress", "onKeyDown", "disabled", "header", "onPaste", "allowSpeech", "onPasteFile", "components", "initialRows", "scalable"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -57,6 +57,8 @@ var ForwardSender = /*#__PURE__*/React.forwardRef(function (props, ref) {
     readOnly = _ref.readOnly,
     _ref$enableFocusExpan = _ref.enableFocusExpand,
     enableFocusExpand = _ref$enableFocusExpan === void 0 ? false : _ref$enableFocusExpan,
+    _ref$sendDisabled = _ref.sendDisabled,
+    sendDisabled = _ref$sendDisabled === void 0 ? false : _ref$sendDisabled,
     _ref$submitType = _ref.submitType,
     submitType = _ref$submitType === void 0 ? 'enter' : _ref$submitType,
     onSubmit = _ref.onSubmit,
@@ -163,7 +165,7 @@ var ForwardSender = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   // ============================ Events ============================
   var triggerSend = function triggerSend() {
-    if (innerValue && onSubmit && !loading) {
+    if (!contextValue.onSendDisabled && onSubmit && !loading) {
       onSubmit(innerValue);
     }
   };
@@ -254,7 +256,7 @@ var ForwardSender = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var contextValue = {
     prefixCls: actionBtnCls,
     onSend: triggerSend,
-    onSendDisabled: !innerValue,
+    onSendDisabled: !innerValue || sendDisabled,
     onClear: triggerClear,
     onClearDisabled: !innerValue,
     onCancel: onCancel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentscope-ai/chat",
-  "version": "1.1.42",
+  "version": "1.1.43-beta.1765432918432",
   "description": "a free and open-source chat framework for building excellent LLM-powered chat experiences",
   "license": "Apache-2.0",
   "sideEffects": [