diff --git a/lib/design2/ui.js b/lib/design2/ui.js index 7385c93..10c5ff9 100644 --- a/lib/design2/ui.js +++ b/lib/design2/ui.js @@ -155,7 +155,9 @@ $('body').keydown(function (event) { $('#addPic').click(function () { OpenDialog() function OpenDialog() { - dialog + var dialogApi = (typeof dialog !== 'undefined' && dialog) ? dialog : (window.platformBridge && window.platformBridge.showOpenDialog ? { showOpenDialog: function (opts) { return window.platformBridge.showOpenDialog(opts); } } : null); + if (!dialogApi) return; + dialogApi .showOpenDialog({ title: language_str('selectPic'), //请选择图片 buttonLabel: language_str('comf'), //"确认" @@ -163,8 +165,9 @@ $('#addPic').click(function () { }) .then((result) => { if (result.canceled) return - //console.log(result.filePaths) - fabric.Image.fromURL(result.filePaths[0], function (image) { + var url = (result.files && result.files[0]) ? URL.createObjectURL(result.files[0]) : (result.filePaths && result.filePaths[0]); + if (!url) return + fabric.Image.fromURL(url, function (image) { //image.left = pointer.x; image.setSrc(image.toDataURL(), function (image) { pre_add_image = image