dtable-ui-component 7.0.0 → 7.0.1-beta.1

package/lib/ImageEditor/images-previewer/image-preview/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _dtableUtils = require("dtable-utils");
 var _DTableToolTip = _interopRequireDefault(require("../../../DTableToolTip"));
 var _DeleteTip = _interopRequireDefault(require("../../../DeleteTip"));
 var _url = require("../../../utils/url");
@@ -99,7 +100,7 @@ class ImagePreviewer extends _react.default.Component {
       });
       return;
     }
-    let imageThumbnailUrl = (0, _url.getImageThumbnailUrl)(imageItemUrl, config);
+    let imageThumbnailUrl = (0, _dtableUtils.getImageThumbnailUrl)(imageItemUrl, config);
     (0, _url.checkImgExists)(imageThumbnailUrl).then(() => {
       this.setState({
         imageThumbnailUrl: imageThumbnailUrl

package/lib/ImageEditor/pc-editor/addition-previewer/local-image-addition/index.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
+var _dtableUtils = require("dtable-utils");
 var _UploadProgress = _interopRequireDefault(require("../../../../UploadProgress"));
-var _url = require("../../../../utils/url");
 var _FileUploader = _interopRequireDefault(require("../../../../FileUploader"));
 var _lang = require("../../../../lang");
 require("./index.css");
@@ -163,7 +163,7 @@ class LocalImageAddition extends _react.default.Component {
       const uploadLocalImageValue = this.props.uploadLocalImageValue;
       let uploadedFileList = [];
       uploadedFileList = uploadLocalImageValue.length > 0 && uploadLocalImageValue.map((imgSrc, index) => {
-        let imageThumbnailUrl = (0, _url.getImageThumbnailUrl)(imgSrc);
+        let imageThumbnailUrl = (0, _dtableUtils.getImageThumbnailUrl)(imgSrc);
         return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "dtable-ui-image-wrapper",
           onMouseEnter: event => this.showDeleteIcon(event, index),

package/lib/ImageFormatter/images-lazy-load.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _dtableUtils = require("dtable-utils");
 var _Loading = _interopRequireDefault(require("../Loading"));
-var _url = require("../utils/url");
 var _jsxRuntime = require("react/jsx-runtime");
 const ImagesLazyLoad = _ref => {
   let images = _ref.images,
@@ -52,7 +52,7 @@ const ImagesLazyLoad = _ref => {
     setLoadedImages([]);
     setLoadedCount(0);
     currentImages.forEach((item, index) => {
-      const url = (0, _url.getImageThumbnailUrl)(item, {
+      const url = (0, _dtableUtils.getImageThumbnailUrl)(item, {
         server,
         dtableUuid
       });

package/lib/ImageFormatter/index.js

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _dtableUtils = require("dtable-utils");
 var _imagesLazyLoad = _interopRequireDefault(require("./images-lazy-load"));
 var _ImagePreviewerLightbox = _interopRequireDefault(require("../ImagePreviewerLightbox"));
-var _url = require("../utils/url");
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 class ImageFormatter extends _react.default.Component {
@@ -80,7 +80,10 @@ class ImageFormatter extends _react.default.Component {
     }
     if (isSample) {
       let item = value[0];
-      let url = (0, _url.getImageThumbnailUrl)(item, server);
+      let url = (0, _dtableUtils.getImageThumbnailUrl)(item, {
+        server,
+        dtableUuid
+      });
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: className,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {

package/lib/ImagePreviewerLightbox/index.js

@@ -9,6 +9,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactImageLightbox = _interopRequireDefault(require("@seafile/react-image-lightbox"));
+var _dtableUtils = require("dtable-utils");
 var _url = require("../utils/url");
 var _lang = require("../lang");
 require("@seafile/react-image-lightbox/style.css");
@@ -70,7 +71,7 @@ function ImagePreviewerLightbox(props) {
   const canRotateImage = onRotateImage && !readOnly && !['gif', 'heic', 'heif'].includes((0, _url.getFileSuffix)(URL)) && (0, _url.isInternalImg)(URL, server);
   let mainSrc = URL;
   if ((0, _url.needUseThumbnailImage)(URL)) {
-    mainSrc = (0, _url.getImageThumbnailUrl)(URL, {
+    mainSrc = (0, _dtableUtils.getImageThumbnailUrl)(URL, {
       server,
       dtableUuid,
       workspaceID,

package/lib/ImageThumbnail/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _DTableToolTip = _interopRequireDefault(require("../DTableToolTip"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _dtableUtils = require("dtable-utils");
 var _DeleteTip = _interopRequireDefault(require("../DeleteTip"));
 var _url = require("../utils/url");
 var _lang = require("../lang");
@@ -24,7 +25,7 @@ class ImageThumbnail extends _react.default.Component {
         });
         return;
       }
-      const imageThumbnailUrl = (0, _url.getImageThumbnailUrl)(src);
+      const imageThumbnailUrl = (0, _dtableUtils.getImageThumbnailUrl)(src);
       (0, _url.checkImgExists)(imageThumbnailUrl).then(() => {
         this.setState({
           imageThumbnailUrl

package/lib/utils/url.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.needUseThumbnailImage = exports.isTargetUrl = exports.isInternalURL = exports.isInternalImg = exports.isDigitalSignsUrl = exports.isCustomAssetUrl = exports.isBase64 = exports.isAIUrl = exports.imageCheck = exports.getValidFileImageUrls = exports.getImageThumbnailUrl = exports.getFileThumbnailInfo = exports.getFileSuffix = exports.getFileName = exports.getFileIconUrl = exports.generateCurrentBaseImageUrl = exports.generateCurrentBaseImageThumbnailUrl = exports.checkSVGImage = exports.checkImgExists = void 0;
+exports.needUseThumbnailImage = exports.isTargetUrl = exports.isInternalURL = exports.isInternalImg = exports.isDigitalSignsUrl = exports.isCustomAssetUrl = exports.isBase64 = exports.isAIUrl = exports.imageCheck = exports.getValidFileImageUrls = exports.getFileThumbnailInfo = exports.getFileSuffix = exports.getFileName = exports.getFileIconUrl = exports.generateCurrentBaseImageUrl = exports.generateCurrentBaseImageThumbnailUrl = exports.checkSVGImage = exports.checkImgExists = void 0;
+var _dtableUtils = require("dtable-utils");
 var _file = require("../constants/file");
 const isTargetUrl = (target, url) => {
   if (!url || typeof url !== 'string') return false;
@@ -95,32 +96,6 @@ const generateCurrentBaseImageUrl = _ref2 => {
   return "".concat(validServer, "/workspace/").concat(workspaceID, "/asset/").concat(dtableUuid).concat(partUrl);
 };
 exports.generateCurrentBaseImageUrl = generateCurrentBaseImageUrl;
-const getImageThumbnailUrl = function (url) {
-  let _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-    server = _ref3.server,
-    dtableUuid = _ref3.dtableUuid,
-    workspaceID = _ref3.workspaceID,
-    _ref3$size = _ref3.size,
-    size = _ref3$size === void 0 ? 256 : _ref3$size;
-  if (!url || typeof url !== 'string') return '';
-  if (server && dtableUuid && isCustomAssetUrl(url)) {
-    const assetUuid = url.slice(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
-    return server + '/dtable/' + dtableUuid + '/custom-asset-thumbnail/' + assetUuid + '?size=' + size;
-  }
-  if (isAIUrl(url) || checkSVGImage(url) || !isInternalImg(url) || isBase64(url)) return url;
-  if (server && workspaceID && dtableUuid && isDigitalSignsUrl(url)) {
-    return generateCurrentBaseImageThumbnailUrl({
-      server,
-      workspaceID,
-      dtableUuid,
-      size,
-      partUrl: url
-    });
-  }
-  if (url.includes('/thumbnail/workspace')) return url;
-  return url.replace('/workspace', '/thumbnail/workspace') + '?size=' + size;
-};
-exports.getImageThumbnailUrl = getImageThumbnailUrl;
 const getFileName = url => {
   if (!url) return null;
   let validUrl = url;
@@ -145,9 +120,9 @@ const imageCheck = filename => {
 };
 exports.imageCheck = imageCheck;
 const isInternalURL = function (url) {
-  let _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-    _ref4$server = _ref4.server,
-    server = _ref4$server === void 0 ? '' : _ref4$server;
+  let _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    _ref3$server = _ref3.server,
+    server = _ref3$server === void 0 ? '' : _ref3$server;
   if (!url || typeof url !== 'string') return false;
   return server && url.indexOf(server) > -1;
 };
@@ -182,10 +157,10 @@ const getFileIconUrl = (filename, direntType) => {
 };
 exports.getFileIconUrl = getFileIconUrl;
 const getFileThumbnailInfo = function (file) {
-  let _ref5 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-    server = _ref5.server,
-    dtableUuid = _ref5.dtableUuid,
-    workspaceID = _ref5.workspaceID;
+  let _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    server = _ref4.server,
+    dtableUuid = _ref4.dtableUuid,
+    workspaceID = _ref4.workspaceID;
   const defaultIcon = _file.FILEEXT_ICON_MAP['default'];
   const defaultIconUrl = _file.FILEEXT_ICON_URL_MAP[defaultIcon];
   if (!file || !file.name) return {
@@ -195,7 +170,7 @@ const getFileThumbnailInfo = function (file) {
   const isImage = imageCheck(file.name);
   if (isImage && server) return {
     isImage,
-    fileIconUrl: getImageThumbnailUrl(file.url, {
+    fileIconUrl: (0, _dtableUtils.getImageThumbnailUrl)(file.url, {
       server,
       dtableUuid,
       workspaceID

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "7.0.0",
+  "version": "7.0.1-beta.1",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "5.0.9",
@@ -8,7 +8,7 @@
     "@seafile/seafile-editor": "^3.0.34",
     "classnames": "~2.5.*",
     "dayjs": "1.10.7",
-    "dtable-utils": "~5.0.27",
+    "dtable-utils": "5.0.32-beta.2",
     "is-hotkey": "0.2.0",
     "rc-checkbox": "3.5.0",
     "react-color": "2.19.3",