From d9fe262616b64f559499c32c890b2e17ce2afdab Mon Sep 17 00:00:00 2001 From: GongFlying <150640661+gzcqqqqqqqq1@users.noreply.github.com> Date: Tue, 17 Mar 2026 16:40:52 +0800 Subject: [PATCH 1/4] update image-lightbox --- package-lock.json | 29 ++++++++++++--- package.json | 4 +- src/ImagePreviewerLightbox/index.css | 55 +++++++++++++++++++++++++--- src/ImagePreviewerLightbox/index.js | 26 +++++++++---- src/locales/de.json | 5 +++ src/locales/en.json | 6 +++ src/locales/es.json | 5 +++ src/locales/fr.json | 5 +++ src/locales/pt.json | 5 +++ src/locales/ru.json | 5 +++ src/locales/zh-CN.json | 5 +++ 11 files changed, 128 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index e154334f..f8323a8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "dtable-ui-component", - "version": "6.0.105", + "version": "6.0.105@aol0.22", "lockfileVersion": 3, "requires": true, "packages": { @@ -8,7 +8,7 @@ "name": "dtable-ui-component", "version": "6.0.105", "dependencies": { - "@seafile/react-image-lightbox": "4.0.2", + "@seafile/react-image-lightbox": "^5.0.4", "@seafile/seafile-calendar": "~0.0.32", "@seafile/seafile-editor": "~2.0.14", "classnames": "~2.5.*", @@ -4266,12 +4266,15 @@ "dev": true }, "node_modules/@seafile/react-image-lightbox": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@seafile/react-image-lightbox/-/react-image-lightbox-4.0.2.tgz", - "integrity": "sha512-rQy2X1JDltLE9hLcOQIee6dxW3UwUtWhjgbcOt/aq1BkqWG3mWzGdnHBUmFGfJMvwdbMgEPbDD3yDErBYy6P3w==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@seafile/react-image-lightbox/-/react-image-lightbox-5.0.4.tgz", + "integrity": "sha512-vOOZayfjjMM2UD0O5/4TrHq8KImFf05jmAxErAY9LK/jLP96hVk1UL0mNac27IfQ4LiMsW8Ql32Zxt/EWXn1MQ==", + "license": "MIT", "dependencies": { + "classnames": "^2.3.2", "prop-types": "^15.8.1", - "react-modal": "^3.16.1" + "react-modal": "^3.16.1", + "reactstrap": "^9.2.3" }, "peerDependencies": { "react": "^16.x || ^17.x || ^18.x", @@ -4326,6 +4329,20 @@ "xtend": "4.0.2" } }, + "node_modules/@seafile/seafile-editor/node_modules/@seafile/react-image-lightbox": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@seafile/react-image-lightbox/-/react-image-lightbox-4.0.2.tgz", + "integrity": "sha512-rQy2X1JDltLE9hLcOQIee6dxW3UwUtWhjgbcOt/aq1BkqWG3mWzGdnHBUmFGfJMvwdbMgEPbDD3yDErBYy6P3w==", + "license": "MIT", + "dependencies": { + "prop-types": "^15.8.1", + "react-modal": "^3.16.1" + }, + "peerDependencies": { + "react": "^16.x || ^17.x || ^18.x", + "react-dom": "^16.x || ^17.x || ^18.x" + } + }, "node_modules/@seafile/seafile-editor/node_modules/classnames": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", diff --git a/package.json b/package.json index 75f22005..0891e649 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "dtable-ui-component", - "version": "6.0.105", + "version": "6.0.106-btuk.3", "main": "./lib/index.js", "dependencies": { - "@seafile/react-image-lightbox": "4.0.2", + "@seafile/react-image-lightbox": "^5.0.4", "@seafile/seafile-calendar": "~0.0.32", "@seafile/seafile-editor": "~2.0.14", "classnames": "~2.5.*", diff --git a/src/ImagePreviewerLightbox/index.css b/src/ImagePreviewerLightbox/index.css index 49e867b3..479bbfe6 100644 --- a/src/ImagePreviewerLightbox/index.css +++ b/src/ImagePreviewerLightbox/index.css @@ -4,18 +4,61 @@ } .ril__outer .ril__toolbarItem { - height: 50px; - color: #fff; - display: inline-block; - font-size: 120%; - line-height: 50px; max-width: 100%; - overflow: hidden; + display: flex; + justify-content: center; + align-items: center; padding: 0; + color: #fff; + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.ril__outer .ril__toolbarItem button { + background-size: 20px; + width: 100%; +} + +.ril__builtinButton:hover, +.ril__builtinButton:focus { + background-color: #666; + opacity: 1 !important; +} + +.ril__viewOriginalButton { + height: 40px; + width: 178px!important; + -ms-flex-negative: 0; + background: #333; + border-radius: 8px; + color: #fff; + flex-shrink: 0; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal +} + +.mobile-image-footer-choice .ril__builtinButton { + opacity: 1 !important; +} + +.ril__builtinButton:hover, +.ril__builtinButton:focus { + background-color: #666 !important; + opacity: 1 !important; +} + +.ril__builtinButtonDisabled { + cursor: default; + opacity: 0.5 !important; +} + +.ril__builtinButtonDisabled:hover { + opacity: 0.5 !important; +} + .ril-caption .ril__builtinButton { width: 24px; } diff --git a/src/ImagePreviewerLightbox/index.js b/src/ImagePreviewerLightbox/index.js index 55b37b8f..08512fc4 100644 --- a/src/ImagePreviewerLightbox/index.js +++ b/src/ImagePreviewerLightbox/index.js @@ -27,8 +27,12 @@ function ImagePreviewerLightbox(props) { }); const imagesLength = imageSrcList.length; - const URL = imageSrcList[imageIndex]; + const [currentImageIndex, setCurrentImageIndex] = React.useState(imageIndex || 0); + const URL = imageSrcList[currentImageIndex]; + React.useEffect(() => { + setCurrentImageIndex(imageIndex); + }, [imageIndex]); // Handle URL has special symbol %$ let imageName = ''; @@ -49,17 +53,20 @@ function ImagePreviewerLightbox(props) { const imageTitleDOM = props.imageTitle || ( {imageName} - ({imageIndex + 1}/{imagesLength}) + ({currentImageIndex + 1}/{imagesLength}) ); return ( setCurrentImageIndex(index)} wrapperClassName={classnames('dtable-ui-component', className)} imageTitle={imageTitleDOM} mainSrc={mainSrc} - nextSrc={imageSrcList[(imageIndex + 1) % imagesLength]} - prevSrc={imageSrcList[(imageIndex + imagesLength - 1) % imagesLength]} + nextSrc={imageSrcList[(currentImageIndex + 1) % imagesLength]} + prevSrc={imageSrcList[(currentImageIndex + imagesLength - 1) % imagesLength]} imagePadding={70} viewOriginalImageLabel={getLocale('View_original_image')} enableRotate={canRotateImage} @@ -69,9 +76,14 @@ function ImagePreviewerLightbox(props) { onClickMoveUp={props.moveToPrevRowImage} onClickMoveDown={props.moveToNextRowImage} onViewOriginal={props.onViewOriginal} - onRotateImage={canRotateImage ? (deg) => {onRotateImage(imageIndex, deg);} : null} - onClickDelete={(!readOnly && deleteImage) ? () => {deleteImage(imageIndex, 'previewer');} : null} + onRotateImage={canRotateImage ? (deg) => {onRotateImage(currentImageIndex, deg);} : null} + onClickDelete={(!readOnly && deleteImage) ? () => {deleteImage(currentImageIndex, 'previewer');} : null} onClickDownload={downloadImage ? () => {downloadImage(URL);} : null} + zoomInTip={getLocale('Zoom_in')} + zoomOutTip={getLocale('Zoom_out')} + rotateTip={getLocale('Rotate_image')} + deleteTip={getLocale('Delete_image')} + downloadImageTip={getLocale('Download_image')} /> ); } @@ -89,8 +101,6 @@ ImagePreviewerLightbox.propTypes = { moveToNextRowImage: PropTypes.func, onViewOriginal: PropTypes.func, closeImagePopup: PropTypes.func.isRequired, - moveToPrevImage: PropTypes.func.isRequired, - moveToNextImage: PropTypes.func.isRequired, downloadImage: PropTypes.func, deleteImage: PropTypes.func, onRotateImage: PropTypes.func, diff --git a/src/locales/de.json b/src/locales/de.json index 4f8253f4..76aeb5f1 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -23,6 +23,11 @@ "Specific_departments": "Bestimmte Bereiche", "Deleted_department": "Gelöschter Bereich", "View_original_image": "View original image", + "Rotate_image": "Rotate image", + "Delete_image": "delete image", + "Download_image": "Download image", + "Zoom_in": "Zoom in", + "Zoom_out": "Zoom out", "Add_filter": "Filter hinzufügen", "And": "Und", "Or": "Oder", diff --git a/src/locales/en.json b/src/locales/en.json index d91a061e..6d3a0e58 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -23,6 +23,12 @@ "Specific_departments": "Specific departments", "Deleted_department": "Deleted department", "View_original_image": "View original image", + + "Rotate_image": "Rotate image", + "Delete_image": "delete image", + "Download_image": "Download image", + "Zoom_in": "Zoom in", + "Zoom_out": "Zoom out", "Add_filter": "Add filter", "And": "And", "Or": "Or", diff --git a/src/locales/es.json b/src/locales/es.json index c726b749..6cccdcb9 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -23,6 +23,11 @@ "Specific_departments": "Specific departments", "Deleted_department": "Deleted department", "View_original_image": "View original image", + "Rotate_image": "Rotate image", + "Delete_image": "delete image", + "Download_image": "Download image", + "Zoom_in": "Zoom in", + "Zoom_out": "Zoom out", "Add_filter": "Añadir filtro", "And": "Y", "Or": "O", diff --git a/src/locales/fr.json b/src/locales/fr.json index ca2cc026..d55d0530 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -23,6 +23,11 @@ "Specific_departments": "Départements spécifiques", "Deleted_department": "Département supprimé", "View_original_image": "View original image", + "Rotate_image": "Rotate image", + "Delete_image": "delete image", + "Download_image": "Download image", + "Zoom_in": "Zoom in", + "Zoom_out": "Zoom out", "Add_filter": "Ajouter un filtre", "And": "Et", "Or": "Ou", diff --git a/src/locales/pt.json b/src/locales/pt.json index b9aea184..16cb79b7 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -23,6 +23,11 @@ "Specific_departments": "Specific departments", "Deleted_department": "Deleted department", "View_original_image": "View original image", + "Rotate_image": "Rotate image", + "Delete_image": "delete image", + "Download_image": "Download image", + "Zoom_in": "Zoom in", + "Zoom_out": "Zoom out", "Add_filter": "Adicione o filtro", "And": "E", "Or": "Ou", diff --git a/src/locales/ru.json b/src/locales/ru.json index e8b9093e..04a6ad52 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -23,6 +23,11 @@ "Specific_departments": "Указанные отделы", "Deleted_department": "Удаленный отдел", "View_original_image": "View original image", + "Rotate_image": "Rotate image", + "Delete_image": "delete image", + "Download_image": "Download image", + "Zoom_in": "Zoom in", + "Zoom_out": "Zoom out", "Add_filter": "Добавить фильтр", "And": "И", "Or": "Или", diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index 96b5387f..3b4614eb 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -23,6 +23,11 @@ "Specific_departments": "具体部门", "Deleted_department": "已删除部门", "View_original_image": "View original image", + "Rotate_image": "旋转", + "Delete_image": "删除", + "Download_image": "下载", + "Zoom_in": "放大", + "Zoom_out": "缩小", "Add_filter": "增加过滤条件", "And": "并且", "Or": "或者", From b5c0d799d59b733a751d36cf1f5481e62e25f82c Mon Sep 17 00:00:00 2001 From: GongFlying <150640661+gzcqqqqqqqq1@users.noreply.github.com> Date: Tue, 17 Mar 2026 16:45:06 +0800 Subject: [PATCH 2/4] update image-lightbox --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0891e649..856fe8de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dtable-ui-component", - "version": "6.0.106-btuk.3", + "version": "6.0.105", "main": "./lib/index.js", "dependencies": { "@seafile/react-image-lightbox": "^5.0.4", From 1bce98d8424d15589c616dcd1a773bda9196778c Mon Sep 17 00:00:00 2001 From: GongFlying <150640661+gzcqqqqqqqq1@users.noreply.github.com> Date: Thu, 26 Mar 2026 17:17:41 +0800 Subject: [PATCH 3/4] update grades --- package-lock.json | 4 ++-- package.json | 2 +- src/ImagePreviewerLightbox/index.css | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 701b4bb0..1f6fd4d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dtable-ui-component", - "version": "6.0.107", + "version": "6.0.107rol.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dtable-ui-component", - "version": "6.0.107", + "version": "6.0.107rol.1", "dependencies": { "@seafile/react-image-lightbox": "^5.0.4", "@seafile/seafile-calendar": "~0.0.32", diff --git a/package.json b/package.json index 9d550387..f2d857e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dtable-ui-component", - "version": "6.0.107", + "version": "6.0.108", "main": "./lib/index.js", "dependencies": { "@seafile/react-image-lightbox": "^5.0.4", diff --git a/src/ImagePreviewerLightbox/index.css b/src/ImagePreviewerLightbox/index.css index 479bbfe6..4089780c 100644 --- a/src/ImagePreviewerLightbox/index.css +++ b/src/ImagePreviewerLightbox/index.css @@ -27,17 +27,17 @@ } .ril__viewOriginalButton { - height: 40px; - width: 178px!important; - -ms-flex-negative: 0; - background: #333; - border-radius: 8px; - color: #fff; - flex-shrink: 0; - font-size: 16px; - font-style: normal; - font-weight: 400; - line-height: normal + height: 40px; + width: 178px!important; + -ms-flex-negative: 0; + background: #333; + border-radius: 8px; + color: #fff; + flex-shrink: 0; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal } .mobile-image-footer-choice .ril__builtinButton { From ef062d96b888bf4627d63dacc8938896b2984feb Mon Sep 17 00:00:00 2001 From: GongFlying <150640661+gzcqqqqqqqq1@users.noreply.github.com> Date: Sat, 28 Mar 2026 17:03:39 +0800 Subject: [PATCH 4/4] update time --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2d857e8..9d550387 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dtable-ui-component", - "version": "6.0.108", + "version": "6.0.107", "main": "./lib/index.js", "dependencies": { "@seafile/react-image-lightbox": "^5.0.4",