Browse Source
Merge pull request #676 from flowerField/master
解决图片跨工作表粘贴和右键粘贴问题
master
文顶顶
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
0 deletions
-
src/controllers/imageCtrl.js
-
src/controllers/selection.js
|
|
|
@ -895,6 +895,10 @@ const imageCtrl = { |
|
|
|
pasteImgItem: function() { |
|
|
|
let _this = this; |
|
|
|
|
|
|
|
if(_this.images == null){ |
|
|
|
_this.images = {}; |
|
|
|
} |
|
|
|
|
|
|
|
let rowIndex = Store.luckysheet_select_save[0].row_focus || 0; |
|
|
|
let colIndex = Store.luckysheet_select_save[0].column_focus || 0; |
|
|
|
let left = colIndex == 0 ? 0 : Store.visibledatacolumn[colIndex - 1]; |
|
|
|
|
|
|
|
@ -15,6 +15,7 @@ import { getSheetIndex } from '../methods/get'; |
|
|
|
import { replaceHtml, getObjType, luckysheetfontformat } from '../utils/util'; |
|
|
|
import Store from '../store'; |
|
|
|
import locale from '../locale/locale'; |
|
|
|
import imageCtrl from './imageCtrl'; |
|
|
|
|
|
|
|
const selection = { |
|
|
|
clearcopy: function (e) { |
|
|
|
@ -596,6 +597,9 @@ const selection = { |
|
|
|
_this.pasteHandlerOfCopyPaste(Store.luckysheet_copy_save); |
|
|
|
} |
|
|
|
} |
|
|
|
else if(data.indexOf("luckysheet_copy_action_image") > - 1){ |
|
|
|
imageCtrl.pasteImgItem(); |
|
|
|
} |
|
|
|
else if (triggerType != "btn") { |
|
|
|
_this.pasteHandler(data); |
|
|
|
} |
|
|
|
|