From e8628fc49447befea29d46cfbaf35f50b4d9c7d8 Mon Sep 17 00:00:00 2001 From: litian <2804272236@qq.com> Date: 星期三, 15 五月 2024 17:16:35 +0800 Subject: [PATCH] 1 --- src/views/home.vue | 165 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 97 insertions(+), 68 deletions(-) diff --git a/src/views/home.vue b/src/views/home.vue index 5570dad..7cf65a4 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -117,8 +117,12 @@ default-expand-all="true" :data="catalogueData" :props="defaultProps" + v-if="catalogueData.length > 0" @node-click="handleNodeClick" /> + <div v-if="catalogueData.length == 0"> + <el-empty :image-size="60" description="鏆傛棤鏁版嵁" /> + </div> </div> <!-- 绗旇 --> <div class="notesBox" v-if="activeMenu == 1"> @@ -155,7 +159,7 @@ </div> <div class="noteText hover 123456" - @click="jumpContent('note' + index)" + @click="jumpContent(item)" :style="{ background: item.color == '#F5E12A' @@ -171,7 +175,7 @@ : item.color }" > - <div class="con hover" @click="jumpContent('note' + index)"> + <div class="con hover"> {{ item.note }} </div> </div> @@ -773,7 +777,7 @@ <template #footer> <span class="dialog-footer"> <el-button @click="screenshotClose">鍙� 娑�</el-button> - <el-button type="primary" @click="addScreenshot">纭� 瀹�</el-button> + <el-button type="primary" @click="addScreenshot" :loading="screenshotLoading">纭� 瀹�</el-button> </span> </template> </el-dialog> @@ -959,15 +963,16 @@ // experimentalStyleIsolation: true } }) + window.qiankunActions.onGlobalStateChange((state, prev) => { console.log('鐖跺眰state鍙樺寲', state) bookName.value = state.bookName bookId.value = state.bookId - window.qiankunState = state; + window.qiankunState = state }) // 瀹氫箟鐖跺眰鏂规硶 - console.log(window.qiankunActions); + console.log(window.qiankunActions) window.qiankunActions.setGlobalState({ state: 1, // 鍔犺浇瀛愬簲鐢� windowSelection: (data) => { @@ -1484,8 +1489,10 @@ const confirmDialog = ref<Boolean>(false) const screenshotVisble = ref<Boolean>(false) const nameData = ref('') //鎴浘鍚嶇О +const screenshotLoading = ref(false) const urlData = ref('') //鎴浘base64 const screenshotList = ref([]) +const screenshotData = ref([]) //娴獥宸ュ叿鏍忕偣鍑讳簨浠� const floatItemHandle = (item) => { @@ -1495,7 +1502,10 @@ canvasShow.value = true toolSelectData.activeTool = 'huabi' break + case '鏍囨敞': + break case '鏍囩': + reMark() break case '鎴睆': jitT() @@ -1570,9 +1580,14 @@ toolSelectData.fontSizeActive = str } -//鏍囩鏄剧ず闅愯棌 +//鏍囨敞鏄剧ず闅愯棌 const labelShow = (str) => {} +//鏍囩 +const reMark =() => { + + +} //鎴浘 //鎴浘浜嬩欢 function jitT() { @@ -1593,13 +1608,15 @@ console.log(base64) floatingToolData.activeToolData = '' } +//淇濆瓨鎴浘 const addScreenshot = () => { if (nameData.value) { - screenshotList.value.push({ + screenshotData.value.push({ createDate: new Date(), imgUrl: urlData.value, name: nameData.value }) + screenshotLoading.value = true request({ url: '/identity/api/ApiAppUserSetKey', method: 'post', @@ -1608,16 +1625,19 @@ { domain: 'screenshot', key: bookId.value, - value: JSON.stringify(screenshotList.value) + value: JSON.stringify(screenshotData.value) } ] } }).then((res) => { + screenshotLoading.value = false getScreenshotList() nameData.value = '' urlData.value = '' floatingToolData.activeToolData = '' screenshotVisble.value = false + }).catch(function (error) { + screenshotLoading.value = false }) } else { ElMessage.error('鎴浘鍚嶇О涓嶈兘涓虹┖!') @@ -1638,12 +1658,37 @@ }).then((res) => { if (res && res.length > 0 && res[0].value) { screenshotList.value = JSON.parse(res[0].value) + screenshotData.value = JSON.parse(res[0].value) } }) } +//鏌ョ湅鎴浘 const getCapture = (item) => { imgUrl.value = item.imgUrl confirmDialog.value = true +} +//鍒犻櫎鎴浘 +const deleteScreenshot = (item) => { + let list = screenshotList.value.filter((itemData) => itemData.imgUrl !== item.imgUrl) + request({ + url: '/identity/api/ApiAppUserSetKey', + method: 'post', + data: { + setKeyRequests: [ + { + domain: 'screenshot', + key: bookId.value, + value: JSON.stringify(list) + } + ] + } + }).then((res) => { + ElMessage({ + message: '鍒犻櫎鎴浘鎴愬姛!', + type: 'success' + }) + getScreenshotList() + }) } //閫変腑鏂囧瓧宸ュ叿鏍� @@ -1972,49 +2017,53 @@ domain: 'notes', keys: [bookId.value] } - }).then((res) => { - if (res && res.length > 0 && res[0].value) { - dialogToolData.notesList = JSON.parse(res[0].value) - let list = JSON.parse(res[0].value) - let textDom1 = document.querySelector('.temp-book') - if (list.length > 0) { - list.forEach((item, index) => { - item.createDate = moment(item.createDate).format('YYYY-MM-DD') - if (searchText.value) { - searchText.value = searchText.value.replace(/^\s*|\s*$/g, '') - let text = searchText.value.replace(/^\s*|\s*$/g, '') - if (item.text.indexOf(text) > -1) { + }) + .then((res) => { + if (res && res.length > 0 && res[0].value) { + dialogToolData.notesList = JSON.parse(res[0].value) + let list = JSON.parse(res[0].value) + let textDom1 = document.querySelector('.temp-book') + if (list.length > 0) { + list.forEach((item, index) => { + item.createDate = moment(item.createDate).format('YYYY-MM-DD') + if (searchText.value) { + searchText.value = searchText.value.replace(/^\s*|\s*$/g, '') + let text = searchText.value.replace(/^\s*|\s*$/g, '') + if (item.text.indexOf(text) > -1) { + if (menuState.notesColor == 'all') { + scribeData.noteList.push(item) + } else if (menuState.notesColor == item.color) { + scribeData.noteList.push(item) + } + } + } else { if (menuState.notesColor == 'all') { scribeData.noteList.push(item) } else if (menuState.notesColor == item.color) { scribeData.noteList.push(item) } } - } else { - if (menuState.notesColor == 'all') { - scribeData.noteList.push(item) - } else if (menuState.notesColor == item.color) { - scribeData.noteList.push(item) - } - } - //椤甸潰娣诲姞绗旇 - let rReg1 = new RegExp(`${item.selectText}`, 'ig') - let text1 = textDom1.innerHTML - let nHtmlText1 = item.selectNode + //椤甸潰娣诲姞绗旇 + let rReg1 = new RegExp(`${item.selectText}`, 'ig') + let text1 = textDom1.innerHTML + let nHtmlText1 = item.selectNode - let nHtml1 = '' - nHtml1 = nHtmlText1.replace( - rReg1, - `<span style="padding-bottom:2px; border-bottom: 2px solid;border-bottom-color:${item.color}" class="notesline">${item.selectText}</span><img src="${biji1}" style="cursor: pointer" onclick="notesVisbleShow('${item.selectText}')"/>` - ) - let rHtml1 = '' - rHtml1 = text1.replace(nHtmlText1, nHtml1) - textDom1.innerHTML = rHtml1 - }) + let nHtml1 = '' + nHtml1 = nHtmlText1.replace( + rReg1, + `<span style="padding-bottom:2px; border-bottom: 2px solid;border-bottom-color:${item.color}" class="notesline">${item.selectText}</span><img src="${biji1}" style="cursor: pointer" onclick="notesVisbleShow('${item.selectText}')"/>` + ) + let rHtml1 = '' + rHtml1 = text1.replace(nHtmlText1, nHtml1) + textDom1.innerHTML = rHtml1 + }) + } } - } - scribeData.loading = false - }) + scribeData.loading = false + }) + .catch((err) => { + scribeData.loading = false + }) } //鍒掔嚎 const getScribeList = () => { @@ -2181,11 +2230,13 @@ } } -const jumpContent = (id) => { - debugger +//绗旇璺宠浆 +const jumpContent = (item) => { + console.log(item) if (window.qiankunState && window.qiankunState.gotoPage) window.qiankunState.gotoPage(5, 100) } +//绗旇缂栬緫 const update = (item, type) => { dialogToolData.notesList.splice( dialogToolData.notesList.findIndex((itemData) => itemData.selectText == item.selectText), @@ -2236,29 +2287,7 @@ } } -//鍒犻櫎鎴浘 -const deleteScreenshot = (item) => { - let list = screenshotList.value.filter((itemData) => itemData.imgUrl !== item.imgUrl) - request({ - url: '/identity/api/ApiAppUserSetKey', - method: 'post', - data: { - setKeyRequests: [ - { - domain: 'screenshot', - key: bookId.value, - value: JSON.stringify(list) - } - ] - } - }).then((res) => { - ElMessage({ - message: '鍒犻櫎鎴浘鎴愬姛!', - type: 'success' - }) - getScreenshotList() - }) -} + //鍐呭鍖哄煙椤堕儴鏄剧ず const headerData = reactive({ -- Gitblit v1.9.1