diff --git a/src/renderer/index.html b/src/renderer/index.html index 1de810c..974cb39 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -8,7 +8,7 @@ http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" /> --> - + diff --git a/src/renderer/src/api/file/img.js b/src/renderer/src/api/file/img.js new file mode 100644 index 0000000..6d833e9 --- /dev/null +++ b/src/renderer/src/api/file/img.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +// 新增图片存eos +export function saveUploadFile(data) { + return request({ + url: '/education/uploadfile/saveUploadFile', + method: 'post', + headers: { + 'Content-Type': 'multipart/form-data' + }, + data: data + }) +} + +// 新增批量图片存eos +export function saveUploadFiles(data) { + return request({ + url: '/education/uploadfile/saveUploadFiles', + method: 'post', + headers: { + 'Content-Type': 'multipart/form-data' + }, + data: data + }) +} + +// 修改basecomment +export function updateUploadFile(data) { + return request({ + url: '/education/uploadfile', + method: 'put', + data: data + }) +} + +// 删除basecomment +export function delUploadFile(id) { + return request({ + url: '/education/uploadfile/' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index bb304c2..2ed2c70 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4723712 */ - src: url('iconfont.woff2?t=1731913617367') format('woff2'), - url('iconfont.woff?t=1731913617367') format('woff'), - url('iconfont.ttf?t=1731913617367') format('truetype'); + src: url('iconfont.woff2?t=1732173266977') format('woff2'), + url('iconfont.woff?t=1732173266977') format('woff'), + url('iconfont.ttf?t=1732173266977') format('truetype'); } .iconfont { @@ -13,6 +13,26 @@ -moz-osx-font-smoothing: grayscale; } +.icon-jiqiren_o:before { + content: "\eb62"; +} + +.icon-zhaoxiangji:before { + content: "\e679"; +} + +.icon-huaban:before { + content: "\e6e2"; +} + +.icon-tubiao_wuxing-:before { + content: "\e612"; +} + +.icon-soutibao-:before { + content: "\e605"; +} + .icon-baocun:before { content: "\e60e"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index 7893178..24b7b1a 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,v,t,i,z,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,i=l.document,z=!1,o(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function o(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file +window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,v,t,i,z,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),a()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(t=a,i=l.document,z=!1,o(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function o(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}M()}})(window); \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.json b/src/renderer/src/assets/iconfont/iconfont.json index 0db8c88..127b376 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -5,6 +5,41 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "5387814", + "name": "机器人_o", + "font_class": "jiqiren_o", + "unicode": "eb62", + "unicode_decimal": 60258 + }, + { + "icon_id": "630128", + "name": "照相机", + "font_class": "zhaoxiangji", + "unicode": "e679", + "unicode_decimal": 59001 + }, + { + "icon_id": "12592146", + "name": "画板", + "font_class": "huaban", + "unicode": "e6e2", + "unicode_decimal": 59106 + }, + { + "icon_id": "6025688", + "name": "图标_五星-2", + "font_class": "tubiao_wuxing-", + "unicode": "e612", + "unicode_decimal": 58898 + }, + { + "icon_id": "11756625", + "name": "搜题宝-37", + "font_class": "soutibao-", + "unicode": "e605", + "unicode_decimal": 58885 + }, { "icon_id": "11467388", "name": "保存", diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index e7e25fc..1c84d13 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.ttf and b/src/renderer/src/assets/iconfont/iconfont.ttf differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index 96e1662..ebaaadf 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff and b/src/renderer/src/assets/iconfont/iconfont.woff differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff2 b/src/renderer/src/assets/iconfont/iconfont.woff2 index 51f82f7..6637ccb 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff2 and b/src/renderer/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/renderer/src/assets/images/borderstyle.png b/src/renderer/src/assets/images/borderstyle.png new file mode 100644 index 0000000..3ac9a18 Binary files /dev/null and b/src/renderer/src/assets/images/borderstyle.png differ diff --git a/src/renderer/src/assets/images/borderwidth.png b/src/renderer/src/assets/images/borderwidth.png new file mode 100644 index 0000000..e071630 Binary files /dev/null and b/src/renderer/src/assets/images/borderwidth.png differ diff --git a/src/renderer/src/assets/images/mouse-pointer.png b/src/renderer/src/assets/images/mouse-pointer.png new file mode 100644 index 0000000..6098aae Binary files /dev/null and b/src/renderer/src/assets/images/mouse-pointer.png differ diff --git a/src/renderer/src/components/tinymce/tinymce.vue b/src/renderer/src/components/tinymce/tinymce.vue index 30b84ca..d0837e3 100644 --- a/src/renderer/src/components/tinymce/tinymce.vue +++ b/src/renderer/src/components/tinymce/tinymce.vue @@ -46,7 +46,8 @@ import "tinymce/plugins/anchor"; //锚点 import { ref, reactive, defineProps, defineEmits, nextTick, onMounted, computed, watch } from 'vue' import { getStaticUrl } from '@/utils/tool' -//import { listUploadfile, getUploadFile, delUploadFile, addUploadFile, saveUploadFile } from "@/api/comm/uploadfile"; +import useUserStore from '@/store/modules/user' +import { saveUploadFile } from "@/api/file/img"; const emits = defineEmits(["update:modelValue", "setHtml"]); //这里我选择将数据定义在props里面，方便在不同的页面也可以配置出不同的编辑器，当然也可以直接在组件中直接定义 @@ -107,6 +108,8 @@ const props = defineProps({ default: () => ({ userId: 0, fileAlias: '单题上传' }), }, }); + +const userStore = useUserStore().user; const pasteImgName = ref(''); const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址 @@ -184,10 +187,10 @@ const init = reactive({ min_height: props.minHeight, draggable_modal: true, extended_valid_elements: '*[.*]', - // external_plugins: { - // tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`, - // //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`, - // }, + external_plugins: { + tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`, + //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`, + }, // setup: function (editor) { // }, @@ -212,29 +215,31 @@ const init = reactive({ // 插入/编辑图片(普通) - 因此处上传可传图片和文件故仅参考, 实际以[images_upload_handler]这个为准 file_picker_callback: function(callback, value, meta) { + return; + //文件分类 - let filetype='.pdf, .txt, .zip, .rar, .7z, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .mp3, .mp4'; - let upURL = '/common/upload'; - //为不同插件指定文件类型及后端地址 - switch(meta.filetype){ - case 'image': - filetype='.jpg, .jpeg, .png, .gif'; - //upURL='upimg.php'; - break; - case 'media': - filetype='.mp3, .mp4'; - //upURL='upfile.php'; - break; - case 'file': - default: - } + // let filetype='.pdf, .txt, .zip, .rar, .7z, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .mp3, .mp4'; + // let upURL = '/common/upload'; + // //为不同插件指定文件类型及后端地址 + // switch(meta.filetype){ + // case 'image': + // filetype='.jpg, .jpeg, .png, .gif'; + // //upURL='upimg.php'; + // break; + // case 'media': + // filetype='.mp3, .mp4'; + // //upURL='upfile.php'; + // break; + // case 'file': + // default: + // } - // 模拟出一个input用于添加本地文件 - let input = document.createElement('input'); - input.setAttribute('type', 'file'); - input.setAttribute('accept', filetype); + // // 模拟出一个input用于添加本地文件 + // let input = document.createElement('input'); + // input.setAttribute('type', 'file'); + // input.setAttribute('accept', filetype); - // 暂时屏蔽 + // // 暂时屏蔽 // input.onchange = function() { // const file = this.files[0]; // const formData = new FormData(); @@ -250,7 +255,7 @@ const init = reactive({ // }); // }; - input.click(); + // input.click(); }, // 插入/编辑图片(上传) @@ -278,22 +283,25 @@ const init = reactive({ formData.append("entpcourseid", 0); formData.append("filetype", "image"); formData.append("suffix", "image"); - formData.append("status", '0'); - if(props.upFileParams?.hasOwnProperty('deptId')){ - formData.append("entpid", props.upFileParams.deptId); + formData.append("status", '1'); + if(userStore.deptId && userStore.deptId != null){ + formData.append("entpid", userStore.deptId); } - if(props.upFileParams?.hasOwnProperty('userId')){ - formData.append("userid", props.upFileParams.userId); + if(userStore.userId && userStore.userId != null){ + formData.append("userid", userStore.userId); } - if(props.upFileParams?.hasOwnProperty('edudegree')){ - let edudegree = props.upFileParams.edudegree.toString(); + if(userStore.edudegree && userStore.edudegree != null){ + let edudegree = userStore.edudegree.toString(); if(edudegree != '' && edudegree.indexOf('年级') == -1){ edudegree += '年级'; } formData.append("edudegree", edudegree); } - if(props.upFileParams?.hasOwnProperty('edusubject')){ - formData.append("edusubject", props.upFileParams.edusubject); + if(userStore.edusubject && userStore.edusubject != null){ + formData.append("edusubject", userStore.edusubject); + } + if(userStore.edustage && userStore.edustage != null){ + formData.append("edustage", userStore.edustage); } if(props.upFileParams?.hasOwnProperty('lessionId')){ formData.append("evalid", props.upFileParams.lessionId); @@ -301,19 +309,22 @@ const init = reactive({ if(props.upFileParams?.hasOwnProperty('fileAlias')){ formData.append("filegroup", props.upFileParams.fileAlias); } + loading.value = true; + console.log('formData->', formData); // 暂时屏蔽 - // saveUploadFile(formData) - // .then((res) => { - // loading.value = false; - // return resolve(res.fileurl); - // }) - // .catch((err) => { - // loading.value = false; - // return reject('err:' + err); - // }); + saveUploadFile(formData) + .then((res) => { + console.log('res->', res); + loading.value = false; + return resolve(res.fileurl); + }) + .catch((err) => { + loading.value = false; + return reject('err:' + err); + }); } ), diff --git a/src/renderer/src/components/whiteboard/whiteboard.vue b/src/renderer/src/components/whiteboard/whiteboard.vue index 53fb108..0ec6a25 100644 --- a/src/renderer/src/components/whiteboard/whiteboard.vue +++ b/src/renderer/src/components/whiteboard/whiteboard.vue @@ -1,5 +1,5 @@ @@ -122,7 +123,7 @@
-