one-design-next 0.0.41 → 0.0.42

package/dist/attachments/index.js

@@ -1,6 +1,8 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import HoverFill from "../hover-fill";
 import Icon from "../icon";
+import Image from "../image";
+import Tooltip from "../tooltip";
 import "./style";
 var categoryMap = {
   sheet: {
@@ -127,18 +129,24 @@ function formatSize(bytes) {
   if (bytes < 1024 * 1024) return "".concat((bytes / 1024).toFixed(1), " KB");
   return "".concat((bytes / (1024 * 1024)).toFixed(1), " MB");
 }
-function truncateMessage(text, maxChars) {
-  if (text.length <= maxChars) return text;
-  return "".concat(text.slice(0, maxChars), "...");
+
+/** image/* 附件缩略：统一走 Image leaf，不再内联裸 `<img>`。 */
+function AttachmentImage(_ref) {
+  var attachment = _ref.attachment;
+  if (!attachment.url) return null;
+  return /*#__PURE__*/React.createElement(Image, {
+    url: attachment.url,
+    alt: attachment.name
+  });
 }
-export function Attachments(_ref) {
-  var attachments = _ref.attachments,
-    onRemove = _ref.onRemove,
-    onFileClick = _ref.onFileClick,
-    onRetry = _ref.onRetry,
-    onDownload = _ref.onDownload,
-    _ref$compact = _ref.compact,
-    compact = _ref$compact === void 0 ? false : _ref$compact;
+export function Attachments(_ref2) {
+  var attachments = _ref2.attachments,
+    onRemove = _ref2.onRemove,
+    onFileClick = _ref2.onFileClick,
+    onRetry = _ref2.onRetry,
+    onDownload = _ref2.onDownload,
+    _ref2$compact = _ref2.compact,
+    compact = _ref2$compact === void 0 ? false : _ref2$compact;
   if (attachments.length === 0) return null;
 
   /**
@@ -157,8 +165,7 @@ export function Attachments(_ref) {
     var isUploading = status === 'uploading';
     var isError = status === 'error';
     var isExpired = status === 'expired';
-    var clickable = !!onFileClick && !isUploading && !isExpired;
-    var retryable = !!onRetry && isError;
+    var clickable = !!onFileClick && !isUploading && !isExpired && !isError;
     var thumbCardInner = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       "data-odn-attachments-thumb-card-thumb": true,
       style: isImage && !isUploading && !isError ? undefined : isUploading || isError ? undefined : {
@@ -177,9 +184,8 @@ export function Attachments(_ref) {
       style: {
         color: 'var(--odn-color-error)'
       }
-    }) : isImage ? /*#__PURE__*/React.createElement("img", {
-      src: a.url,
-      alt: ""
+    }) : isImage ? /*#__PURE__*/React.createElement(AttachmentImage, {
+      attachment: a
     }) : /*#__PURE__*/React.createElement(Icon, {
       name: meta.icon,
       size: 16,
@@ -192,8 +198,8 @@ export function Attachments(_ref) {
       "data-odn-attachments-thumb-card-name": true
     }, a.name), /*#__PURE__*/React.createElement("div", {
       "data-odn-attachments-thumb-card-type": true
-    }, isError ? truncateMessage(a.errorMessage || '上传失败，请重试', 18) : isExpired ? '已过期' : formatType(a.type, a.name))));
-    return /*#__PURE__*/React.createElement("div", {
+    }, isExpired ? '已过期' : formatType(a.type, a.name))));
+    var cardEl = /*#__PURE__*/React.createElement("div", {
       key: i,
       "data-odn-attachments-item": true,
       "data-odn-attachments-state": status,
@@ -206,17 +212,10 @@ export function Attachments(_ref) {
       "data-odn-attachments-thumb-card": true,
       "data-odn-attachments-thumb-card-image": isImage || undefined,
       "data-odn-attachments-clickable": ""
-    }, thumbCardInner) : retryable ? /*#__PURE__*/React.createElement("button", {
-      type: "button",
-      onClick: function onClick() {
-        return onRetry(i);
-      },
-      "data-odn-attachments-thumb-card": true,
-      "data-odn-attachments-thumb-card-image": isImage || undefined,
-      "data-odn-attachments-retryable": ""
     }, thumbCardInner) : /*#__PURE__*/React.createElement("div", {
       "data-odn-attachments-thumb-card": true,
-      "data-odn-attachments-thumb-card-image": isImage || undefined
+      "data-odn-attachments-thumb-card-image": isImage || undefined,
+      "data-odn-attachments-error": isError || undefined
     }, thumbCardInner), onRemove && /*#__PURE__*/React.createElement("button", {
       onClick: function onClick() {
         return onRemove(i);
@@ -226,10 +225,18 @@ export function Attachments(_ref) {
       name: "x",
       size: 10
     })));
+    if (isError) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        key: i,
+        placement: "top",
+        popup: a.errorMessage || '上传失败'
+      }, cardEl);
+    }
+    return cardEl;
   }
 
   /**
-   * image-thumb 渲染：纯图大缩略方块（56×56 cover、无边框）。
+   * image-thumb 渲染：纯图缩略方块（48×48 cover，与 file-card 等高）。
    *
    * 与文件信息卡（data-odn-attachments-card）严格同源——共享
    * data-odn-attachments-state 三态机、remove 角标。composer 待发送区把 image/*
@@ -242,10 +249,9 @@ export function Attachments(_ref) {
     var isError = status === 'error';
     var isExpired = status === 'expired';
     var clickable = !!onFileClick && !isUploading && !isError && !isExpired;
-    var thumb = /*#__PURE__*/React.createElement("img", {
-      src: a.url,
-      alt: a.name
-    });
+    var thumb = a.url ? /*#__PURE__*/React.createElement(AttachmentImage, {
+      attachment: a
+    }) : null;
     return /*#__PURE__*/React.createElement("div", {
       key: i,
       "data-odn-attachments-item": true,
@@ -266,25 +272,21 @@ export function Attachments(_ref) {
       name: "loading",
       size: 16,
       spin: true
-    })), isError && (onRetry ? /*#__PURE__*/React.createElement("button", {
-      type: "button",
-      "data-odn-attachments-image-overlay": true,
-      "data-odn-attachments-image-overlay-error": "",
-      onClick: function onClick() {
-        return onRetry(i);
-      },
-      title: a.errorMessage || '上传失败，点击重试'
-    }, /*#__PURE__*/React.createElement(Icon, {
-      name: "alert-triangle",
-      size: 16
-    }), /*#__PURE__*/React.createElement("span", null, "\u91CD\u8BD5")) : /*#__PURE__*/React.createElement("div", {
+    })), isError &&
+    /*#__PURE__*/
+    // 图片缩略方块太小塞不下错误文案：错误态只留居中的告警图标，
+    // 具体原因（errorMessage，来自业务层回写）走 hover 向上的 Tooltip。
+    // 图片上传不支持重试——overlay 不承载点击。
+    React.createElement(Tooltip, {
+      placement: "top",
+      popup: a.errorMessage || '上传失败'
+    }, /*#__PURE__*/React.createElement("div", {
       "data-odn-attachments-image-overlay": true,
-      "data-odn-attachments-image-overlay-error": "",
-      title: a.errorMessage || '上传失败'
+      "data-odn-attachments-image-overlay-error": ""
     }, /*#__PURE__*/React.createElement(Icon, {
       name: "alert-triangle",
       size: 16
-    }), /*#__PURE__*/React.createElement("span", null, "\u5931\u8D25"))), onRemove && /*#__PURE__*/React.createElement("button", {
+    }))), onRemove && /*#__PURE__*/React.createElement("button", {
       onClick: function onClick() {
         return onRemove(i);
       },
@@ -427,8 +429,7 @@ export function Attachments(_ref) {
     var isUploading = status === 'uploading';
     var isError = status === 'error';
     var isExpired = status === 'expired';
-    var clickable = !!onFileClick && !isUploading && !isExpired;
-    var retryable = !!onRetry && isError;
+    var clickable = !!onFileClick && !isUploading && !isExpired && !isError;
     var fileCardInner = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       "data-odn-attachments-file-icon": true,
       style: isUploading || isError ? undefined : {
@@ -459,8 +460,8 @@ export function Attachments(_ref) {
       "data-odn-attachments-name": true
     }, a.name), /*#__PURE__*/React.createElement("div", {
       "data-odn-attachments-meta": true
-    }, isError ? truncateMessage(a.errorMessage || '上传失败，请重试', 18) : isExpired ? '已过期' : "".concat(formatType(a.type, a.name)).concat(a.size ? " \xB7 ".concat(formatSize(a.size)) : ''))));
-    return /*#__PURE__*/React.createElement("div", _extends({
+    }, isExpired ? '已过期' : "".concat(formatType(a.type, a.name)).concat(a.size ? " \xB7 ".concat(formatSize(a.size)) : ''))));
+    var cardEl = /*#__PURE__*/React.createElement("div", _extends({
       key: i,
       "data-odn-attachments-item": true,
       "data-odn-attachments-state": status
@@ -473,15 +474,9 @@ export function Attachments(_ref) {
       },
       "data-odn-attachments-card": true,
       "data-odn-attachments-clickable": ""
-    }, fileCardInner) : retryable ? /*#__PURE__*/React.createElement("button", {
-      type: "button",
-      onClick: function onClick() {
-        return onRetry(i);
-      },
-      "data-odn-attachments-card": true,
-      "data-odn-attachments-retryable": ""
     }, fileCardInner) : /*#__PURE__*/React.createElement("div", {
-      "data-odn-attachments-card": true
+      "data-odn-attachments-card": true,
+      "data-odn-attachments-error": isError || undefined
     }, fileCardInner), onRemove && /*#__PURE__*/React.createElement("button", {
       onClick: function onClick() {
         return onRemove(i);
@@ -491,6 +486,14 @@ export function Attachments(_ref) {
       name: "x",
       size: 10
     })));
+    if (isError) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        key: i,
+        placement: "top",
+        popup: a.errorMessage || '上传失败'
+      }, cardEl);
+    }
+    return cardEl;
   }));
 }
 Attachments.displayName = 'Attachments';

package/dist/attachments/style/index.css

@@ -83,15 +83,8 @@
 [data-odn-attachments-card][data-odn-attachments-clickable]:hover {
   border-color: color-mix(in srgb, var(--odn-color-primary) 50%, transparent);
 }
-[data-odn-attachments-card][data-odn-attachments-retryable] {
-  cursor: pointer;
-  border: 1px solid color-mix(in srgb, var(--odn-color-error) 35%, var(--odn-color-black-6));
-  font: inherit;
-  text-align: left;
-  appearance: none;
-}
-[data-odn-attachments-card][data-odn-attachments-retryable]:hover {
-  border-color: color-mix(in srgb, var(--odn-color-error) 55%, transparent);
+[data-odn-attachments-card][data-odn-attachments-error] {
+  border-color: color-mix(in srgb, var(--odn-color-error) 35%, var(--odn-color-black-6));
 }
 
 [data-odn-attachments-file-icon] {
@@ -133,10 +126,6 @@
   color: var(--odn-color-black-8);
 }
 
-[data-odn-attachments-item][data-odn-attachments-state=error] [data-odn-attachments-meta] {
-  color: var(--odn-color-error);
-}
-
 [data-odn-attachments-item][data-odn-attachments-state=expired] {
   opacity: 0.55;
 }
@@ -190,7 +179,7 @@
   grid-template-columns: auto 1fr;
   gap: 8px;
   padding: 6px 10px 6px 6px;
-  min-height: 42px;
+  min-height: 48px;
   border-radius: 6px;
   border: 1px solid var(--odn-color-black-6);
   background: var(--odn-color-solid-black-1);
@@ -207,12 +196,8 @@
 [data-odn-attachments-thumb-card][data-odn-attachments-clickable]:hover {
   border-color: color-mix(in srgb, var(--odn-color-primary) 50%, transparent);
 }
-[data-odn-attachments-thumb-card][data-odn-attachments-retryable] {
-  cursor: pointer;
-  border: 1px solid color-mix(in srgb, var(--odn-color-error) 35%, var(--odn-color-black-6));
-}
-[data-odn-attachments-thumb-card][data-odn-attachments-retryable]:hover {
-  border-color: color-mix(in srgb, var(--odn-color-error) 55%, transparent);
+[data-odn-attachments-thumb-card][data-odn-attachments-error] {
+  border-color: color-mix(in srgb, var(--odn-color-error) 35%, var(--odn-color-black-6));
 }
 
 /* 图片保持原先「无边框」视觉，仅与文件卡片对齐高度。 */
@@ -220,7 +205,7 @@
   border: none;
   background: transparent;
 }
-[data-odn-attachments-thumb-card][data-odn-attachments-thumb-card-image][data-odn-attachments-clickable]:hover, [data-odn-attachments-thumb-card][data-odn-attachments-thumb-card-image][data-odn-attachments-retryable]:hover {
+[data-odn-attachments-thumb-card][data-odn-attachments-thumb-card-image][data-odn-attachments-clickable]:hover {
   border: none;
 }
 
@@ -234,6 +219,11 @@
   border-radius: 3px;
   overflow: hidden;
 }
+[data-odn-attachments-thumb-card-thumb] [data-odn-image] {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
 [data-odn-attachments-thumb-card-thumb] img {
   width: 100%;
   height: 100%;
@@ -275,12 +265,12 @@
 [data-odn-attachments-card]:not([data-odn-attachments-image-card]),
 [data-odn-attachments-thumb-card] {
   width: 192px;
-  min-height: 42px;
+  min-height: 48px;
 }
 
 /* ==========================================================================
- * image-thumb 变体（纯图大缩略方块）
- * 56×56 cover、无边框，承载 image/* + url。与文件信息卡（data-odn-attachments-card）
+ * image-thumb 变体（纯图缩略方块）
+ * 48×48 cover（与 file-card 等高），承载 image/* + url。缩略走 Image leaf（不再裸 `<img>`）。
  * 同源：共享 data-odn-attachments-state 三态机、remove 角标、fresh-done。
  * composer 待发送区即以此变体让"图片大预览 + 文件信息卡"并列同行、等高同源。
  * ========================================================================== */
@@ -290,8 +280,8 @@
 
 [data-odn-attachments-image-thumb] {
   position: relative;
-  width: 56px;
-  height: 56px;
+  width: 48px;
+  height: 48px;
   border-radius: 6px;
   overflow: hidden;
   padding: 0;
@@ -299,6 +289,11 @@
   background: var(--odn-color-black-2);
   box-sizing: border-box;
 }
+[data-odn-attachments-image-thumb] [data-odn-image] {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
 [data-odn-attachments-image-thumb] img {
   width: 100%;
   height: 100%;
@@ -342,20 +337,10 @@
 }
 [data-odn-attachments-image-overlay][data-odn-attachments-image-overlay-error] {
   background: var(--odn-color-solid-black-1);
-  flex-direction: column;
   border: 1px solid color-mix(in srgb, var(--odn-color-error) 35%, var(--odn-color-black-6));
   color: var(--odn-color-error);
-}
-[data-odn-attachments-image-overlay][data-odn-attachments-image-overlay-error]:is(button) {
-  cursor: pointer;
-  appearance: none;
-  font: inherit;
-  font-size: 10px;
   pointer-events: auto;
 }
-[data-odn-attachments-image-overlay][data-odn-attachments-image-overlay-error]:is(button):hover {
-  border-color: color-mix(in srgb, var(--odn-color-error) 55%, transparent);
-}
 
 /* ==========================================================================
  * Report 变体（AI 生成报告入口卡片）

package/dist/composer/index.js

@@ -888,7 +888,7 @@ export var Composer = /*#__PURE__*/forwardRef(function Composer(_ref, ref) {
     ref: editorRef,
     autoSize: {
       minRows: 1,
-      maxRows: 5
+      maxRows: 10
     },
     placeholder: placeholder,
     value: text,

package/dist/composer/style/index.css

@@ -26,6 +26,8 @@
   border: 1px solid var(--odn-color-black-6);
   background: var(--odn-color-bg-elevated);
   transition: border-color 0.15s;
+  max-height: 50vh;
+  min-height: 120px;
 }
 [data-odn-composer-box]:focus-within {
   border-color: color-mix(in srgb, var(--odn-color-brand-6) 50%, transparent);
@@ -175,6 +177,12 @@
  * ScrollArea root 的 height transition 按"目标态"分别定义在 lite 单行 /
  * lite 升格 selector 上，做出「先上再左 / 先右再下」的对称两段动效。
  * ----------------------------------------------------------------- */
+[data-odn-composer] .odn-composer-editor-scroll {
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow: hidden;
+}
+
 [data-odn-composer] [data-odn-composer-editor] {
   position: relative;
   width: 100%;
@@ -435,7 +443,7 @@ p[data-odn-composer-hint] {
  *   三态机 / remove 角标 / fresh-done 全部下沉到 Attachments 组件。
  * ----------------------------------------------------------------- */
 [data-odn-composer-attachments] {
-  --odn-composer-attachment-h: 42px;
+  --odn-composer-attachment-h: 48px;
   display: flex;
   flex-wrap: wrap;
   align-items: flex-start;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one-design-next",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "description": "One Design Next from TAD@tencent.com",
   "packageManager": "pnpm@11.8.0",
   "module": "dist/index.js",