@seafile/sdoc-editor 3.0.232 → 3.0.233

package/dist/extension/plugins/link/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.upsertLinkText = exports.updateLink = exports.unWrapLinkNode = exports.parseHtmlString = exports.isWeChat = exports.isSdocFile = exports.isNodeInCurrentView = exports.isMenuDisabled = exports.isLinkToolBarActive = exports.isExdrawFile = exports.isEmptyNode = exports.isCommonFile = exports.insertLink = exports.getMenuPosition = exports.getLinkType = exports.getElementHref = exports.genLinkNode = exports.checkLink = void 0;
+exports.upsertLinkText = exports.updateLink = exports.unWrapLinkNode = exports.parseHtmlString = exports.isWeChat = exports.isSdocFile = exports.isNodeInCurrentView = exports.isMenuDisabled = exports.isLinkToolBarActive = exports.isExdrawFile = exports.isEmptyNode = exports.isCommonFile = exports.insertLink = exports.getMenuPosition = exports.getLinkType = exports.getLinkFileInfo = exports.getElementHref = exports.genLinkNode = exports.decodeLinkUrl = exports.checkLink = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
@@ -248,25 +248,32 @@ var unWrapLinkNode = exports.unWrapLinkNode = function unWrapLinkNode(editor) {
     }
   });
 };
-var isSdocFile = exports.isSdocFile = function isSdocFile(res, url) {
-  var files_info = res.data.files_info;
-  var fileInfo = files_info[url];
+var decodeLinkUrl = exports.decodeLinkUrl = function decodeLinkUrl(url) {
+  try {
+    return decodeURIComponent(url);
+  } catch (e) {
+    return url;
+  }
+};
+var getLinkFileInfo = exports.getLinkFileInfo = function getLinkFileInfo(res, url) {
+  var _res$data;
+  var filesInfo = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.files_info) || {};
+  var decodedUrl = decodeLinkUrl(url);
+  return filesInfo[decodedUrl] || filesInfo[url];
+};
+var isSdocFile = exports.isSdocFile = function isSdocFile(fileInfo) {
   var _ref3 = fileInfo || {},
     is_dir = _ref3.is_dir,
     file_ext = _ref3.file_ext;
   return !is_dir && file_ext === 'sdoc';
 };
-var isExdrawFile = exports.isExdrawFile = function isExdrawFile(res, url) {
-  var files_info = res.data.files_info;
-  var fileInfo = files_info[url];
+var isExdrawFile = exports.isExdrawFile = function isExdrawFile(fileInfo) {
   var _ref4 = fileInfo || {},
     is_dir = _ref4.is_dir,
     file_ext = _ref4.file_ext;
   return !is_dir && file_ext === 'exdraw';
 };
-var isCommonFile = exports.isCommonFile = function isCommonFile(res, url) {
-  var files_info = res.data.files_info;
-  var fileInfo = files_info[url];
+var isCommonFile = exports.isCommonFile = function isCommonFile(fileInfo) {
   var _ref5 = fileInfo || {},
     is_dir = _ref5.is_dir,
     file_ext = _ref5.file_ext;

package/dist/extension/plugins/link/plugin.js

@@ -44,7 +44,7 @@ var withLink = function withLink(editor) {
   };
   newEditor.insertData = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee(data) {
-      var text, selectedElems, isCodeContext, res, fileName, fileUuid, _fileName, fileParentPath, filePath, repoId, _fileName2, _fileUuid, url, pathname, _context$getSetting, parts, wikiPageId, title, wikiPageList, page, linkedNodeId, _title, params, link, _link, embedLinkType, _link2, _Editor$next, _Editor$next2, focusPath, focusPoint, _t;
+      var text, selectedElems, isCodeContext, res, fileInfo, fileName, fileUuid, _fileName, fileParentPath, filePath, repoId, _fileName2, _fileUuid, url, pathname, _context$getSetting, parts, wikiPageId, title, wikiPageList, page, linkedNodeId, _title, params, link, _link, embedLinkType, _link2, _Editor$next, _Editor$next2, focusPath, focusPoint, _t;
       return (0, _regenerator2["default"])().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
@@ -73,34 +73,36 @@ var withLink = function withLink(editor) {
             return _context2["default"].getLinkFilesInfo([text]);
           case 3:
             res = _context.v;
-            if (!(0, _helpers4.isSdocFile)(res, text)) {
+            fileInfo = (0, _helpers4.getLinkFileInfo)(res, text);
+            if (!(fileInfo && (0, _helpers4.isSdocFile)(fileInfo))) {
               _context.n = 4;
               break;
             }
-            fileName = res.data.files_info[text].name;
-            fileUuid = res.data.files_info[text].file_uuid;
+            fileName = fileInfo.name;
+            fileUuid = fileInfo.file_uuid;
             (0, _helpers2.insertSdocFileLink)(editor, fileName, fileUuid);
             _context.n = 10;
             break;
           case 4:
-            if (!(0, _helpers4.isExdrawFile)(res, text)) {
+            if (!(fileInfo && (0, _helpers4.isExdrawFile)(fileInfo))) {
               _context.n = 5;
               break;
             }
-            _fileName = res.data.files_info[text].name;
-            fileParentPath = res.data.files_info[text].parent_path;
+            _fileName = fileInfo.name;
+            fileParentPath = fileInfo.parent_path;
             filePath = fileParentPath + '/' + _fileName;
-            repoId = res.data.files_info[text].repo_id;
+            repoId = fileInfo.repo_id;
+            console.log('insertWhiteboard', _fileName, filePath, repoId);
             (0, _helper2.insertWhiteboard)(editor, _fileName, filePath, repoId);
             _context.n = 10;
             break;
           case 5:
-            if (!(0, _helpers4.isCommonFile)(res, text)) {
+            if (!(fileInfo && (0, _helpers4.isCommonFile)(fileInfo))) {
               _context.n = 6;
               break;
             }
-            _fileName2 = res.data.files_info[text].name;
-            _fileUuid = res.data.files_info[text].file_uuid;
+            _fileName2 = fileInfo.name;
+            _fileUuid = fileInfo.file_uuid;
             (0, _helpers.insertFileLink)(editor, _fileName2, _fileUuid);
             _context.n = 10;
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.232",
+  "version": "3.0.233",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8cf7a004d8b3d37e3e0f0c841a405122d5449477"
+  "gitHead": "9c710e1191cba9e4a85a901058e5d3ac2769fad9"
 }