@ray-js/t-agent-ui-ray 0.2.0-beta-10 → 0.2.0-beta-11

package/dist/MessageInput/MessageInputAIStream/index.js

@@ -12,6 +12,7 @@ import { Emitter, EmitterEvent } from '@ray-js/t-agent';
 import cx from 'clsx';
 import imageSvg from '../icons/image.svg';
 import videoSvg from '../icons/video.svg';
+import cameraSvg from '../icons/camera.svg';
 import { useAttachmentInput, useChatAgent, useEmitEvent, useIsUnmounted, useOnEvent, useTranslate } from '../../hooks';
 import AsrInput from './AsrInput';
 import { useSleep } from '../../hooks/useSleep';
@@ -389,7 +390,7 @@ export default function MessageInputAIStream(props) {
           });
           return;
         }
-        await upload('image', 1);
+        await upload('album', 1);
       } catch (e) {
         ty.showToast({
           icon: 'error',
@@ -401,6 +402,29 @@ export default function MessageInputAIStream(props) {
     className: "t-agent-message-input-panel-button-icon"
   }, /*#__PURE__*/React.createElement(Image, {
     src: imageSvg
+  }))), attachmentOptions.image && /*#__PURE__*/React.createElement(Button, {
+    className: "t-agent-message-input-panel-button",
+    onClick: async () => {
+      try {
+        if (uploaded.filter(f => f.type === 'image').length >= (attachmentOptions.imageCount || 1)) {
+          ty.showToast({
+            icon: 'none',
+            title: t('t-agent.input.upload.image.max-reached')
+          });
+          return;
+        }
+        await upload('camera', 1);
+      } catch (e) {
+        ty.showToast({
+          icon: 'error',
+          title: t('t-agent.input.upload.failed')
+        });
+      }
+    }
+  }, /*#__PURE__*/React.createElement(View, {
+    className: "t-agent-message-input-panel-button-icon"
+  }, /*#__PURE__*/React.createElement(Image, {
+    src: cameraSvg
   }))), attachmentOptions.video && /*#__PURE__*/React.createElement(Button, {
     className: "t-agent-message-input-panel-button",
     onClick: async () => {

package/dist/MessageInput/icons/camera.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="18" viewBox="0 0 20 18"><g><path d="M7.82843,2L5.82843,4L2,4L2,16L18,16L18,4L14.1716,4L12.1716,2L7.82843,2ZM7,0L13,0L15,2L19,2C19.5523,2,20,2.44772,20,3L20,17C20,17.5523,19.5523,18,19,18L1,18C0.44772,18,0,17.5523,0,17L0,3C0,2.44772,0.44772,2,1,2L5,2L7,0ZM10,15C6.96243,15,4.5,12.5376,4.5,9.5C4.5,6.46243,6.96243,4,10,4C13.0376,4,15.5,6.46243,15.5,9.5C15.5,12.5376,13.0376,15,10,15ZM10,13C11.933,13,13.5,11.433,13.5,9.5C13.5,7.567,11.933,6,10,6C8.067,6,6.5,7.567,6.5,9.5C6.5,11.433,8.067,13,10,13Z" fill="#3D3D3D" fill-opacity="1"/></g></svg>

package/dist/hooks/useAttachmentInput.d.ts

@@ -18,5 +18,5 @@ export declare function useAttachmentInput({ local }?: {
     setUploaded: import("react").Dispatch<import("react").SetStateAction<UploadFile[]>>;
     uploading: boolean;
     loadBlocks: (blocks: InputBlock[], append?: boolean) => void;
-    upload: (type: 'image' | 'video', count?: any) => Promise<void>;
+    upload: (type: 'image' | 'video' | 'camera' | 'album', count?: any) => Promise<void>;
 };

package/dist/hooks/useAttachmentInput.js

@@ -109,47 +109,80 @@ export function useAttachmentInput() {
   } = useRenderOptions();
   const upload = useCallback(async function (type) {
     let count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-    if (type === 'image') {
+    if (type === 'image' || type === 'camera' || type === 'album') {
       let file = [];
-      try {
-        const sourceType = await new Promise(resolve => {
-          ty.showActionSheet({
-            itemList: [t('t-agent.input.upload.source-type.camera'), t('t-agent.input.upload.source-type.album')],
-            success: _ref => {
-              let {
-                tapIndex
-              } = _ref;
-              if (tapIndex === 0) {
-                ty.authorize({
-                  scope: 'scope.camera',
-                  success() {
-                    resolve('camera');
-                  },
-                  fail() {
-                    ty.showToast({
-                      title: t('t-agent.input.upload.source-type.camera.require-permission'),
-                      icon: 'none'
-                    });
-                    resolve('');
-                  }
-                });
-              } else if (tapIndex === 1) {
-                resolve('album');
-              } else {
+      if (type === 'image') {
+        try {
+          const sourceType = await new Promise(resolve => {
+            ty.showActionSheet({
+              itemList: [t('t-agent.input.upload.source-type.camera'), t('t-agent.input.upload.source-type.album')],
+              success: _ref => {
+                let {
+                  tapIndex
+                } = _ref;
+                if (tapIndex === 0) {
+                  ty.authorize({
+                    scope: 'scope.camera',
+                    success() {
+                      resolve('camera');
+                    },
+                    fail() {
+                      ty.showToast({
+                        title: t('t-agent.input.upload.source-type.camera.require-permission'),
+                        icon: 'none'
+                      });
+                      resolve('');
+                    }
+                  });
+                } else if (tapIndex === 1) {
+                  resolve('album');
+                } else {
+                  resolve('');
+                }
+              },
+              fail() {
                 resolve('');
               }
-            },
-            fail() {
-              resolve('');
-            }
+            });
           });
-        });
-        if (!sourceType) {
+          if (!sourceType) {
+            return;
+          }
+          file = await chooseImage(count, sourceType);
+        } catch (err) {
+          return;
+        }
+      }
+      if (type === 'camera') {
+        try {
+          const allowUseCamera = await new Promise(resolve => {
+            ty.authorize({
+              scope: 'scope.camera',
+              success() {
+                resolve(true);
+              },
+              fail() {
+                ty.showToast({
+                  title: t('t-agent.input.upload.source-type.camera.require-permission'),
+                  icon: 'none'
+                });
+                resolve(false);
+              }
+            });
+          });
+          if (allowUseCamera) {
+            file = await chooseImage(count, 'camera');
+          }
+        } catch (err) {
+          return;
+        }
+      }
+      if (type === 'album') {
+        try {
+          file = await chooseImage(count, 'album');
+        } catch (err) {
           return;
         }
-        file = await chooseImage(count, sourceType);
-      } catch (err) {
-        return;
       }
       await Promise.all(file.map(async _ref2 => {
         let {

package/dist/tiles/FileTile/index.less

@@ -49,6 +49,7 @@
   display: -webkit-box;
   -webkit-line-clamp: 2; /* 控制显示行数 */
   -webkit-box-orient: vertical;
+  line-height: 33rpx;
   height: 66rpx;
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-ui-ray",
-  "version": "0.2.0-beta-10",
+  "version": "0.2.0-beta-11",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -40,5 +40,5 @@
     "@types/echarts": "^4.9.22",
     "@types/markdown-it": "^14.1.1"
   },
-  "gitHead": "a17ba630a9ec71afe6a0fc46c427f664d46acf82"
+  "gitHead": "dd56b31b0095fb82d0fb5d4f58581d00ae2970ee"
 }