diff --git a/litemall-admin/package.json b/litemall-admin/package.json index 53ff1dd3..fe1987ad 100644 --- a/litemall-admin/package.json +++ b/litemall-admin/package.json @@ -43,7 +43,7 @@ "url": "https://github.com/linlinjava/litemall/issues" }, "dependencies": { - "@tinymce/tinymce-vue": "1.1.0", + "@tinymce/tinymce-vue": "3.0.1", "v-charts": "1.19.0", "axios": "0.18.1", "clipboard": "2.0.4", diff --git a/litemall-admin/static/tinymce4.7.5/langs/zh_CN.js b/litemall-admin/public/tinymce4.7.5/langs/zh_CN.js similarity index 100% rename from litemall-admin/static/tinymce4.7.5/langs/zh_CN.js rename to litemall-admin/public/tinymce4.7.5/langs/zh_CN.js diff --git a/litemall-admin/static/tinymce4.7.5/plugins/codesample/css/prism.css b/litemall-admin/public/tinymce4.7.5/plugins/codesample/css/prism.css similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/codesample/css/prism.css rename to litemall-admin/public/tinymce4.7.5/plugins/codesample/css/prism.css diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif b/litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif rename to litemall-admin/public/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif diff --git a/litemall-admin/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css b/litemall-admin/public/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css similarity index 100% rename from litemall-admin/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css rename to litemall-admin/public/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/content.inline.min.css b/litemall-admin/public/tinymce4.7.5/skins/lightgray/content.inline.min.css similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/content.inline.min.css rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/content.inline.min.css diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/content.min.css b/litemall-admin/public/tinymce4.7.5/skins/lightgray/content.min.css similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/content.min.css rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/content.min.css diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff b/litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/img/anchor.gif b/litemall-admin/public/tinymce4.7.5/skins/lightgray/img/anchor.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/img/anchor.gif rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/img/anchor.gif diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/img/loader.gif b/litemall-admin/public/tinymce4.7.5/skins/lightgray/img/loader.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/img/loader.gif rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/img/loader.gif diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/img/object.gif b/litemall-admin/public/tinymce4.7.5/skins/lightgray/img/object.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/img/object.gif rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/img/object.gif diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/img/trans.gif b/litemall-admin/public/tinymce4.7.5/skins/lightgray/img/trans.gif similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/img/trans.gif rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/img/trans.gif diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/skin.min.css b/litemall-admin/public/tinymce4.7.5/skins/lightgray/skin.min.css similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/skin.min.css rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/skin.min.css diff --git a/litemall-admin/static/tinymce4.7.5/skins/lightgray/skin.min.css.map b/litemall-admin/public/tinymce4.7.5/skins/lightgray/skin.min.css.map similarity index 100% rename from litemall-admin/static/tinymce4.7.5/skins/lightgray/skin.min.css.map rename to litemall-admin/public/tinymce4.7.5/skins/lightgray/skin.min.css.map diff --git a/litemall-admin/static/tinymce4.7.5/tinymce.min.js b/litemall-admin/public/tinymce4.7.5/tinymce.min.js similarity index 100% rename from litemall-admin/static/tinymce4.7.5/tinymce.min.js rename to litemall-admin/public/tinymce4.7.5/tinymce.min.js