From 1d88745fc1d5b2a62a6f2b9bca765c76ea48427c Mon Sep 17 00:00:00 2001 From: litian <2804272236@qq.com> Date: 星期三, 15 五月 2024 21:30:53 +0800 Subject: [PATCH] sc --- src/views/home.vue | 1801 ++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 1,182 insertions(+), 619 deletions(-) diff --git a/src/views/home.vue b/src/views/home.vue index 54bdea4..118f144 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,11 +1,12 @@ <template> <div class="homeBox"> <div class="headerBox"> - <div><img :src="logo" /></div> + <!-- <span class="logoTxt">鍖椾含甯堣寖澶у鍑虹増闆嗗洟</span> --> + <img :src="logo" /> <div class="userInfoBox"> <div></div> <div></div> - <div><div class="layout">閫�鍑�</div></div> + <div><div class="layout hover" @click="layoutBtn">閫�鍑�</div></div> </div> </div> <div class="contentBox"> @@ -24,14 +25,58 @@ </div> <div class="reload hover" @click="reload()">鍒锋柊</div> <!-- 璁剧疆 --> - <el-popover placement="right" :width="200" trigger="click"> + <el-popover placement="right" :width="300" trigger="click"> <div class="settingBox"> <el-form :model="settingForm" label-width="auto" style="max-width: 400px"> - <el-form-item label="绛旈闊虫晥"> - <el-switch v-model="settingForm.acoustics" /> + <el-form-item label="瀛椾綋澶у皬"> + <div class="lineStyle"> + <div class="lineTypeBox"> + <div + v-for="item in settingForm.fontSizeList" + :key="item.key" + :class=" + settingForm.fontSizeActive == item.key + ? 'typeItem lineTypeActive' + : 'typeItem' + " + @click="fontSizeSelect(item)" + > + {{ item.lable }} + <div class="activeIcon" v-if="settingForm.fontSizeActive == item.key"> + <img :src="xuanzhong" /> + </div> + </div> + </div> + </div> </el-form-item> - <el-form-item label="绛旈鍔ㄧ敾"> - <el-switch v-model="settingForm.animation" /> + <div class="inline"> + <el-form-item label="绛旈闊虫晥"> + <el-switch v-model="settingForm.acoustics" /> + </el-form-item> + <el-form-item label="绛旈鍔ㄧ敾"> + <el-switch v-model="settingForm.animation" /> + </el-form-item> + </div> + <el-form-item label="搴曡壊"> + <div class="bgColor"> + <div + v-for="item in settingForm.bgColorList" + :key="item.key" + class="flex1 hover" + @click="bgColorSelect(item)" + > + <div + :style="{ + background: item.key, + 'border-color': + item.key == settingForm.bgColorActive ? '#0093FF' : '#EBEBEB' + }" + class="scribeItem" + > + <img :src="xuanzhong1" v-if="item.key == settingForm.bgColorActive" /> + </div> + </div> + </div> </el-form-item> </el-form> </div> @@ -72,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"> @@ -94,36 +143,47 @@ ></div> </div> </div> - <div class="list-box" v-loading="scribeData.loading"> - <div v-if="scribeData.noteList.length > 0 && !scribeData.loading"> - <div v-for="(item, index) in scribeData.noteList" :key="item.key" class="listItem"> - <div class="itemBox noteStyle"> - <div class="textBox"> - <div class="title"> - <div class="title-con"> - <div class="round" :style="{ background: item.color }"></div> - <span>{{ item.name }}</span> - </div> - <div> - <el-icon size="18" color="#0093ff" @click="jumpContent('note' + index)" - ><LocationInformation - /></el-icon> - <img :src="bianji" @click="update(item, 'note')" /> - <img :src="shanchu" @click="deleteBtn(item, 'note')" /> - </div> + <div class="list-box"> + <div v-if=" scribeData.noteList.length > 0"> + <div v-for="(item, index) in scribeData.noteList" :key="item.key" class="listItem"> + <div class="textBox"> + <div class="title"> + <div class="title-con"> + <div class="border-left" :style="{ 'border-right-color': item.color }"></div> + <span>{{ item.createDate }}</span> </div> - <div class="noteText"> - <div class="con">{{ item.note }}</div> - </div> - <div class="chapter"> - <span class="createDate">{{ item.createDate }}</span> - <span class="chapterName">{{ item.chapter }}</span> + <div> + <img :src="bianji" @click="update(item)" /> + <img :src="shanchu" @click="deleteBtn(item)" /> </div> </div> + <div + class="noteText hover 123456" + @click="jumpContent(item)" + :style="{ + background: + item.color == '#F5E12A' + ? 'rgba(255,234,41,0.1)' + : item.color == '#76F0AE' + ? 'rgba(83,255,162,0.1)' + : item.color == '#59CFF5' + ? 'rgba(93,216,255,0.1)' + : item.color == '#CAA5FC' + ? 'rgba(205,167,255,0.1)' + : item.color == '#F5A0B9' + ? 'rgba(255,167,193,0.1)' + : item.color + }" + > + <div class="con hover"> + {{ item.note }} + </div> + </div> + <div class="chapter">{{ item.txt }}</div> </div> </div> </div> - <div v-if="scribeData.noteList.length == 0 && !scribeData.loading"> + <div v-if=" scribeData.noteList.length == 0"> <el-empty :image-size="60" description="鏆傛棤鏁版嵁" /> </div> </div> @@ -156,20 +216,38 @@ <div class="inputBox" v-if="!searchShow"> <el-input class="custom-input" placeholder="璇疯緭鍏ュ唴瀹�" v-model="searchText"> <template #prefix> - <el-icon @click="searchBook"><Search /></el-icon> + <el-icon @click="searchBook" class="hover"><Search /></el-icon> </template> </el-input> </div> </div> <div class="list-box"> - <div v-if="resourceData.length > 0" class="resourceList"> + <div v-if="resourceDataList.length > 0" class="resourceList"> <el-row :gutter="20"> - <el-col :span="12" v-for="(item, index) in resourceData" :key="item"> - <div class="resourceItem hover"> + <el-col :span="12" v-for="(item, index) in resourceDataList" :key="item"> + <div class="resourceItem hover" @click="goResourceDetail(item)"> <div class="resourceImg"> - <img :src="video" mode="" /> + <img :src="item.icon" mode="" v-if="item.icon" /> + <el-icon v-else-if="activeClassify == 'image'" size="30"><Picture /></el-icon> + <el-icon v-else-if="activeClassify == 'audio'" size="30"><Headset /></el-icon> + <el-icon v-else-if="activeClassify == 'video'" size="30" + ><VideoCamera + /></el-icon> + <el-icon + v-else-if="activeClassify == 'other' && item.fileType == 'PDF'" + size="30" + ><Files + /></el-icon> + <el-icon + v-else-if="activeClassify == 'other' && item.fileType == ''" + size="30" + ><Tickets + /></el-icon> </div> - <div class="rName" @click="goResourceDetail(item)">{{ item.name }}</div> + <div class="rName" v-if="searchText != ''" v-html="item.name"></div> + <div class="rName" v-else :title="item.resourceName"> + {{ item.resourceName }} + </div> </div> </el-col> </el-row> @@ -191,13 +269,19 @@ <div class="" v-if="activeMenu == 4"> <div class="list-box"> <div class="screenshot" v-if="screenshotList.length > 0"> - <div - v-for="(item, index) in screenshotList" - :key="item" - class="captureItem" - @click="getCapture(item)" - > - <img :src="item.imgUrl" class="capture" mode="aspectFill" /> + <div v-for="(item, index) in screenshotList" :key="item" class="captureItem"> + <div class="imgBox"> + <img + :src="item.imgUrl" + class="capture" + mode="aspectFill" + @click="getCapture(item)" + /> + <div class="deleteBox hover" @click="deleteScreenshot(item, 'capture')"> + <img :src="shanchu" /> + </div> + </div> + <div class="captureName" :title="item.name">{{ item.name }}</div> </div> </div> <div v-else> @@ -227,7 +311,7 @@ <div class="">宸蹭笂璇撅細{{ headerData.classTime }}</div> </div> <div class="progress"> - <div class="bookName">瀛﹀墠鍎跨鍗敓涓庝繚鍋ワ紙绗笁鐗堬級</div> + <div class="bookName">{{ bookName }}</div> <div>{{ headerData.process }}%</div> </div> <div class="rightBox"> @@ -237,18 +321,20 @@ <div><img :src="zoomOut" @click="changePageSize('reduce')" /></div> </div> <div class="brushImgBox"> - <div><img :src="huabi2" class="brushImg" />鐢荤瑪</div> + <div @click="jumpContent('note' + index)"> + <img :src="huabi2" class="brushImg" />鐢荤瑪 + </div> </div> </div> </div> <!-- 寰簲鐢ㄧ洅瀛� --> - <div class="pageBox-content" @scroll="pageScroll"> + <div class="pageBox-content"> <div class="content-box"> <div id="container" @mousedown="handleMouseDown" @mousemove="handleMousemove" - @mouseup="handleMouseUp" + :style="{ background: settingForm.bgColorActive }" ></div> <!-- 鐢荤瑪鐢诲竷 --> <div class="canvas-box" v-show="canvasShow"> @@ -260,7 +346,7 @@ <!-- 鏁欏缁勪欢 --> <div class="toolBox"> <div class="toolTitle"> - 鏁欏缁勪欢 + <span>{{ toolState.open ? '鏁欏缁勪欢' : '缁勪欢' }}</span> <div class="text"></div> </div> <div class="menuList"> @@ -332,34 +418,71 @@ > <el-popover placement="right" - :width=" - floatingToolData.activeToolData == '鏍囨敞' - ? 120 - : floatingToolData.activeToolData == '娓呴櫎' - ? 200 - : 250 - " + width="120" trigger="click" - v-if=" - floatingToolData.activeToolData == '鐢荤瑪' || - floatingToolData.activeToolData == '娓呴櫎' || - floatingToolData.activeToolData == '鏂囧瓧' || - floatingToolData.activeToolData == '鏍囨敞' - " + v-if="floatingToolData.activeToolData == '鏍囨敞'" > <div class="popinnerBox"> - <div class="brush" v-if="floatingToolData.activeToolData == '鐢荤瑪'"> + <div class="label" v-if="floatingToolData.activeToolData == '鏍囨敞'"> + <div class="labelItem hover" @click="labelShow('hide')"> + <img :src="hide" /> + <div>闅愯棌</div> + </div> + <div class="labelItem hover" @click="labelShow('show')"> + <img :src="show" /> + <div>鏄剧ず</div> + </div> + </div> + </div> + <template #reference> + <div + :class=" + floatingToolData.activeToolData == item.name + ? 'floatToolActive floatToolItem' + : 'floatToolItem' + " + > + <img + :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon" + alt="" + /> + <div class="text">{{ item.name }}</div> + </div> + </template> + </el-popover> + <div + :class=" + floatingToolData.activeToolData == item.name + ? 'floatToolActive floatToolItem' + : 'floatToolItem' + " + v-else + @click="floatItemHandle(item)" + > + <img + :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon" + alt="" + /> + <div class="text">{{ item.name }}</div> + </div> + </div> + </div> + <div class="brushBox" v-if="floatingToolData.activeToolData == '鐢荤瑪'"> + <div class="toolList"> + <el-popover placement="top" width="250" trigger="click"> + <div class="popinnerBox"> + <div class="brush"> <div class="thickness"> <div - :class="floatingToolData.thicknessActive == '1' ? 'small active' : 'small'" + :class="toolSelectData.thicknessActive == '1' ? 'small active' : 'small'" @click="selectThickness('1')" ></div> <div - :class="floatingToolData.thicknessActive == '3' ? 'middle active' : 'middle'" + :class="toolSelectData.thicknessActive == '3' ? 'middle active' : 'middle'" @click="selectThickness('3')" ></div> <div - :class="floatingToolData.thicknessActive == '5' ? 'large active' : 'large'" + :class="toolSelectData.thicknessActive == '5' ? 'large active' : 'large'" @click="selectThickness('5')" ></div> </div> @@ -367,27 +490,27 @@ <div class="lineTypeBox"> <div :class=" - floatingToolData.lineTypeActive == 'solid' + toolSelectData.lineTypeActive == 'solid' ? 'typeItem lineTypeActive' : 'typeItem' " @click="selectLineType('solid')" > <div class="solid"></div> - <div class="activeIcon" v-if="floatingToolData.lineTypeActive == 'solid'"> + <div class="activeIcon" v-if="toolSelectData.lineTypeActive == 'solid'"> <img :src="xuanzhong" /> </div> </div> <div :class=" - floatingToolData.lineTypeActive == 'dashed' + toolSelectData.lineTypeActive == 'dashed' ? 'typeItem lineTypeActive' : 'typeItem' " @click="selectLineType('dashed')" > <div class="dashed"></div> - <div class="activeIcon" v-if="floatingToolData.lineTypeActive == 'dashed'"> + <div class="activeIcon" v-if="toolSelectData.lineTypeActive == 'dashed'"> <img :src="xuanzhong" /> </div> </div> @@ -400,38 +523,40 @@ @click="lineColorSelect(item)" > <div :style="{ background: item.key }" class="scribeItem"> - <img :src="xuanzhong" v-if="item.key == floatingToolData.lineColorActive" /> + <img :src="xuanzhong" v-if="item.key == toolSelectData.lineColorActive" /> </div> </div> </div> </div> </div> - <div class="cleanup" v-if="floatingToolData.activeToolData == '娓呴櫎'"> - <div class="cleanupItem hover" @click="cleanUpSelect('prev')"> - <img :src="clearPrevious" /> - <div>娓呴櫎涓婁竴姝�</div> + </div> + <template #reference> + <div class="floatToolItem" @click="toolSelectHandle('huabi')"> + <div class="imgBox"> + <img :src="hide" alt="" /> </div> - <div class="cleanupItem hover" @click="cleanUpSelect('all')"> - <img :src="clear" /> - <div>娓呴櫎鍏ㄩ儴</div> - </div> + <div class="text">鐢荤瑪</div> </div> - <div class="write" v-if="floatingToolData.activeToolData == '鏂囧瓧'"> + </template> + </el-popover> + <el-popover placement="top" width="250" trigger="click"> + <div class="popinnerBox"> + <div class="write"> <div class="characters"> <div - :class="floatingToolData.fontSizeActive == '14' ? 'small active' : 'small'" + :class="toolSelectData.fontSizeActive == '14' ? 'small active' : 'small'" @click="selectfontSize('14')" > 灏� </div> <div - :class="floatingToolData.fontSizeActive == '16' ? 'middle active' : 'middle'" + :class="toolSelectData.fontSizeActive == '16' ? 'middle active' : 'middle'" @click="selectfontSize('16')" > 涓� </div> <div - :class="floatingToolData.fontSizeActive == '18' ? 'large active' : 'large'" + :class="toolSelectData.fontSizeActive == '18' ? 'large active' : 'large'" @click="selectfontSize('18')" > 澶� @@ -446,33 +571,99 @@ @click="lineColorSelect(item)" > <div :style="{ background: item.key }" class="scribeItem"> - <img :src="xuanzhong" v-if="item.key == floatingToolData.lineColorActive" /> + <img :src="xuanzhong" v-if="item.key == toolSelectData.lineColorActive" /> </div> </div> </div> </div> </div> - <div class="label" v-if="floatingToolData.activeToolData == '鏍囨敞'"> - <div class="labelItem hover" @click="labelShow('hide')"> - <img :src="hide" /> - <div>闅愯棌</div> + </div> + <template #reference> + <div class="floatToolItem" @click="toolSelectHandle('wenzi')"> + <div class="imgBox"> + <img :src="wenzi2" alt="" /> </div> - <div class="labelItem hover" @click="labelShow('show')"> - <img :src="show" /> - <div>鏄剧ず</div> + <div class="text">鏂囧瓧</div> + </div> + </template> + </el-popover> + <el-popover placement="top" width="250" trigger="click"> + <div class="popinnerBox"> + <div class="write"> + <div class="characters"> + <div + :class="floatingToolData.fontSizeActive == '14' ? 'small active' : 'small'" + @click="selectfontSize('14')" + > + 灏� + </div> + <div + :class="toolSelectData.fontSizeActive == '16' ? 'middle active' : 'middle'" + @click="selectfontSize('16')" + > + 涓� + </div> + <div + :class="toolSelectData.fontSizeActive == '18' ? 'large active' : 'large'" + @click="selectfontSize('18')" + > + 澶� + </div> + </div> + <div class="lineStyle"> + <div class="colorSelectBox"> + <div + v-for="item in colorSelectList" + :key="item.key" + class="flex1 hover" + @click="lineColorSelect(item)" + > + <div :style="{ background: item.key }" class="scribeItem"> + <img :src="xuanzhong" v-if="item.key == toolSelectData.lineColorActive" /> + </div> + </div> + </div> </div> </div> </div> <template #reference> - <div class="floatToolItem"> - <img :src="item.icon" alt="" /> - <div class="text">{{ item.name }}</div> + <div class="floatToolItem" @click="toolSelectHandle('tuxing')"> + <div class="imgBox"> + <img :src="tuxing" alt="" /> + </div> + <div class="text">鍥惧舰</div> </div> </template> </el-popover> - <div class="floatToolItem" v-else @click="floatItemHandle(item)"> - <img :src="item.icon" alt="" /> - <div class="text">{{ item.name }}</div> + <div class="floatToolItem" @click="toolSelectHandle('xiangpi')"> + <div class="imgBox"> + <img :src="clearPrevious" alt="" /> + </div> + <div class="text">姗$毊鎿�</div> + </div> + <div class="floatToolItem" @click="toolSelectHandle('chexiao')"> + <div class="imgBox"> + <img :src="clear" alt="" /> + </div> + <div class="text">鎾ら攢</div> + </div> + <div class="floatToolItem" @click="toolSelectHandle('chongzuo')"> + <div class="imgBox"> + <img :src="hide" alt="" /> + </div> + <div class="text">閲嶅仛</div> + </div> + <div class="floatToolItem" @click="toolSelectHandle('qingchu')"> + <div class="imgBox"> + <img :src="hide" alt="" /> + </div> + <div class="text">娓呴櫎</div> + </div> + <div class="floatToolItem layOutTool" @click="toolSelectHandle('tuichu')"> + <div class="imgBox"> + <img :src="tuichu" alt="" /> + </div> + <div class="text">閫�鍑�</div> </div> </div> </div> @@ -483,10 +674,7 @@ v-show="showToolBox" :style="{ top: `${dialogToolData.top}px`, left: `${dialogToolData.left}px` }" > - <div - class="colorSelectBox" - v-show="toolActive == '楂樹寒' || toolActive == '鍒掔嚎' || toolActive == '绗旇'" - > + <div class="colorSelectBox" v-show="toolActive == '楂樹寒' || toolActive == '鍒掔嚎'"> <div v-for="item in colorSelectList" :key="item.key" @@ -494,11 +682,11 @@ @click="clickSelect(item)" > <div :style="{ background: item.key }" class="scribeItem"> - <img :src="xuanzhong" v-if="item.key == colorActive" /> + <img :src="xuanzhong1" v-if="item.key == colorActive" /> </div> </div> </div> - <div class="toolSelectBox"> + <div class="toolSelectBox" v-show="!(toolActive == '楂樹寒' || toolActive == '鍒掔嚎')"> <div :class="item.name == toolActive ? 'dialogToolItem active' : 'dialogToolItem'" v-for="item in dialogToolList" @@ -514,9 +702,18 @@ </div> </div> </div> - <el-dialog title="璧勬簮" align-center v-model="resourVisble" width="840"> - <div class="videoBox" v-if="resourType == 'video'"> - <video controls object-fit="fill" :src="testVideo"></video> + <!-- 鍒掔嚎锛岄珮浜垹闄� --> + <div + class="lineDeleteBox" + v-show="lineDelete.showLineDelete" + :style="{ top: `${lineDelete.top}px`, left: `${lineDelete.left}px` }" + > + <el-button @click="delUserKey">鍒犻櫎</el-button> + </div> + + <el-dialog title="璧勬簮" align-center v-model="resourVisble" width="845" class="resourDialog"> + <div class="videoBox" v-if="resourType == '瑙嗛'"> + <video controls controlslist="nodownload" :src="testVideo"></video> </div> <div class="wordBox" v-if="resourType == 'word'"> <vue-office-docx :src="testWord" /> @@ -530,19 +727,29 @@ class="myNoteDialogs" > <div class="formBox"> - <el-form ref="form" :model="formData" label-width="80px"> - <el-form-item label="绗旇鏍囬"> - <el-input v-model="formData.name"></el-input> - </el-form-item> - <el-form-item label="绗旇鍐呭"> - <el-input type="textarea" v-model="formData.desc"></el-input> - </el-form-item> - </el-form> + <el-input + type="textarea" + :rows="4" + v-model="formData.desc" + placeholder="璇疯緭鍏ョ瑪璁板唴瀹�" + ></el-input> + </div> + <div class="noteColorSelectBox"> + <div + v-for="item in colorSelectList" + :key="item.key" + class="flex1 hover" + @click="clickSelectColor(item)" + > + <div :style="{ background: item.key }" class="scribeItem"> + <img :src="xuanzhong" v-if="item.key == noteColorActive" /> + </div> + </div> </div> <template #footer> <span class="dialog-footer"> <el-button @click="handleClose">鍙� 娑�</el-button> - <el-button type="primary" @click="addNote">纭� 瀹�</el-button> + <el-button type="primary" @click="addUserKey">纭� 瀹�</el-button> </span> </template> </el-dialog> @@ -552,9 +759,33 @@ width="60%" :closeOnClickModal="false" title="鍥剧墖" + class="resourDialog" > <div class="imgUrlBox"> <img :src="imgUrl" mode="aspectFill" /> + </div> + </el-dialog> + <el-dialog + title="淇濆瓨鎴浘" + align-center + v-model="screenshotVisble" + :before-close="screenshotClose" + width="400" + class="resourDialog screenshotDialog" + > + <div class="formBox"> + <el-input v-model="nameData" placeholder="璇疯緭鍏ユ埅鍥惧悕绉�"></el-input> + </div> + <template #footer> + <span class="dialog-footer"> + <el-button @click="screenshotClose">鍙� 娑�</el-button> + <el-button type="primary" @click="addScreenshot" :loading="screenshotLoading">纭� 瀹�</el-button> + </span> + </template> + </el-dialog> + <el-dialog title="鐧惧害鐧剧" align-center v-model="baiduVisible" width="60%" class="myDialogs"> + <div class="wendabox"> + <iframe :src="'https://baike.baidu.com/item/' + selectText" frameborder="0"></iframe> </div> </el-dialog> <el-dialog title="AI鏅鸿兘闂瓟" align-center v-model="wendaVisible" width="26%" class="myDialogs"> @@ -564,7 +795,8 @@ </el-dialog> <el-dialog title="璇嶅吀" align-center v-model="cidianVisible" width="60%" class="myDialogs"> <div class="wendabox"> - <iframe src="https://www.vocabulary.com/" frameborder="0"></iframe> + <!-- <iframe src="https://www.vocabulary.com/" frameborder="0"></iframe> --> + <dictionary :searchCon="selectText" /> </div> </el-dialog> <el-dialog @@ -591,17 +823,21 @@ </template> <script setup lang="ts"> -import { ref, reactive, watch, onMounted, inject } from 'vue' +import { ref, reactive, watch, onMounted, onBeforeMount, inject } from 'vue' +import { ctxUrl, resourceUrl, requestCtx } from '@/assets/js/config' import { useRouter, useRoute } from 'vue-router' import useClipboard from 'vue-clipboard3' const { toClipboard } = useClipboard() const request = inject('request') +const toolClass = inject('toolClass') +const qiankunActions = inject('qiankunActions') //鑾峰彇璺敱鍣� -let $router = useRouter() +let router = useRouter() //鑾峰彇褰撳墠璺敱鐨勪俊鎭� -let $route = useRoute() +let route = useRoute() import moment from 'moment' -import { ElMessage, ElMessageBox } from 'element-plus' +import dictionary from '@/views/components/dictionary.vue' +import { ElMessage, ElMessageBox, valueEquals } from 'element-plus' import logo from '@/assets/images/header/logo.png' import mulu from '@/assets/images/menu/mulu.png' import biji from '@/assets/images/menu/biji.png' @@ -640,6 +876,7 @@ import qingchu1 from '../assets/images/operation/Clearaway-b.png' import wenzi from '../assets/images/operation/wenzi-w.png' import wenzi1 from '../assets/images/operation/wenzi-b.png' +import wenzi2 from '../assets/images/operation/wenzi.png' import biaoqianw from '../assets/images/operation/biaoqian-w.png' import biaoqian1 from '../assets/images/operation/biaoqian-b.png' import baiban from '../assets/images/operation/baiban-w.png' @@ -652,6 +889,8 @@ import clearPrevious from '../assets/images/operation/clearPrevious.png' import hide from '../assets/images/operation/hide.png' import show from '../assets/images/operation/show.png' +import tuichu from '../assets/images/operation/tuichu.png' +import tuxing from '../assets/images/operation/tuxing.png' import gaoliang from '../assets/images/operation/gaoliang.png' import gaoliang1 from '../assets/images/operation/gaoliang-b.png' @@ -667,9 +906,12 @@ import AIyuedu1 from '../assets/images/operation/AIyuedu-b.png' import cidian2 from '../assets/images/operation/cidian.png' import cidian1 from '../assets/images/operation/cidian-b.png' +import baidu from '../assets/images/operation/baidu.png' +import baidu1 from '../assets/images/operation/baidu-b.png' import yuyinyuedu from '../assets/images/operation/yuyinyuedu.png' import yuyinyuedu1 from '../assets/images/operation/yuyinyuedu-b.png' import xuanzhong from '../assets/images/operation/xuanzhong.png' +import xuanzhong1 from '../assets/images/operation/xuanzhong1.png' import zoomIn from '../assets/images/operation/zoomIn.png' import zoomOut from '../assets/images/operation/zoomOut.png' @@ -687,32 +929,115 @@ import { start } from 'qiankun' import axios from 'axios' import { fabric } from 'fabric' + +import { loadMicroApp } from 'qiankun' +import { microApps } from '@/child.ts' const canvasWith = ref(1000) const canvasheight = ref(3000) +const screenWidth = ref( + window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth +) +let microApp = null // 寰簲鐢ㄥ疄渚� +const bookName = ref('') +const bookId = ref(1) +const activeCatalog = ref() onMounted(() => { - // canvasWith.value = window.innerWidth - 540 - // canvasheight.value = window.innerHeight - 110 - getNotesList() // 鑾峰彇楂樹寒 - getlineHeightList() //鑾峰彇楂樹寒 - getScribeList() //鑾峰彇鍒掔嚎 getCatalogueData() getResourceData() - getScreenshotList() - // setTimeout(() => { - // canvasWith.value = document.getElementById('container').offsetWidth - // canvasheight.value = document.getElementById('container').offsetHeight - // }, 5000) + setTimeout(() => { + canvasWith.value = document.querySelector('.content-box').offsetWidth + canvasheight.value = document.querySelector('.content-box').offsetHeight + }, 5000) + if (screenWidth.value < 1180) { + menuState.open = false + toolState.open = false + } + window.onresize = () => { + return (() => { + screenWidth.value = + window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth + })() + } + + // 鍔犺浇寰簲鐢� + microApp = loadMicroApp(microApps.book1, { + sandbox: { + strictStyleIsolation: true + // experimentalStyleIsolation: true + }, + singular: true + }) + + window.qiankunActions.onGlobalStateChange((state, prev) => { + console.log('鐖跺眰state鍙樺寲', state) + bookName.value = state.bookName + bookId.value = state.bookId + window.qiankunState = state + }) + + // 瀹氫箟鐖跺眰鏂规硶 + console.log(window.qiankunActions) + window.qiankunActions.setGlobalState({ + state: 1, // 鍔犺浇瀛愬簲鐢� + windowSelection: (data) => { + // 缁戝畾瀛愬簲鐢ㄩ�夋嫨鐩戝惉浜嬩欢 + console.log(data, '瀛愬簲鐢ㄩ�夋嫨') + if(data.txt){ + getSelection(data) + }else{ + showToolBox.value = false + } + }, + catalogChange: (data) => { + activeCatalog.value = data.showCatalogList + getSignData() + console.log(data, '绔犺妭鍒囨崲锛氱洰鍓嶆樉绀虹殑涓変釜绔犺妭') + }, + pageChange: (data) => { + // { + // page: 100, + // catalog: 5, + // catalogId: "", + // catalogName: "", + // } + console.log(data, '椤甸潰鍒囨崲锛氱洰鍓嶆樉绀洪〉闈㈠拰瀵瑰簲鐨勭珷鑺備俊鎭�') + }, + + }) + // 璋冪敤瀛愬眰鏂规硶 + // if (window.qiankunState && window.qiankunState.aa) window.qiankunState.aa(1) }) + +watch( + () => screenWidth.value, + (val) => { + screenWidth.value = val + if (screenWidth.value < 1180) { + menuState.open = false + toolState.open = false + } + } +) +watch( + () => bookId.value, + (val) => { + // getNotesList() // 鑾峰彇绗旇 + // getlineHeightList() //鑾峰彇楂樹寒 + // getScribeList() //鑾峰彇鍒掔嚎 + // getScreenshotList() //鎴浘 + } +) //鑾峰彇鐩綍 const catalogueData = ref([]) const getCatalogueData = () => { axios - .get('http://182.92.203.7:3007/books/test/information.json') + .get(resourceUrl + '/1/information.json?t=123') .then(function (response) { + console.log(response.data); var json = response.data // 澶勭悊鑾峰彇鍒扮殑json鏁版嵁 - catalogueData.value = json + catalogueData.value = json.data }) .catch(function (error) { console.log(error) @@ -723,7 +1048,6 @@ label: 'label' } const handleNodeClick = (data) => { - console.log(data.id, 12) document.getElementById(data.id).scrollIntoView() } @@ -752,20 +1076,41 @@ } ]) const activeClassify = ref('image') -const searchShow = ref(false) -const resourceData = ref([]) +const searchShow = ref(true) +const resourceData = ref({}) +const resourceDataList = ref([]) +const resourceImgList = ref([]) +const resourceVideoList = ref([]) +const resourceAudioList = ref([]) +const resourceDocList = ref([]) const resourVisble = ref(false) const resourType = ref('') const testVideo = ref('') //瑙嗛閾炬帴 const testWord = ref('') //word閾炬帴 const getResourceData = () => { axios - .get('http://182.92.203.7:3007/books/test/resource.json') + .get(resourceUrl + '/1/resource.json') .then(function (response) { var json = response.data // 澶勭悊鑾峰彇鍒扮殑json鏁版嵁 - console.log(json, '璧勬簮') - resourceData.value = json + if (json.length > 0) { + json.forEach((item) => { + if (item.fileType == '鍥剧墖') { + resourceImgList.value.push(item) + } else if (item.fileType == '瑙嗛') { + resourceVideoList.value.push(item) + } else if (item.fileType == '闊抽') { + resourceAudioList.value.push(item) + } else { + resourceDocList.value.push(item) + } + }) + } + resourceDataList.value = resourceImgList.value + classifySelectList[0].count = resourceImgList.value.length + classifySelectList[1].count = resourceAudioList.value.length + classifySelectList[2].count = resourceVideoList.value.length + classifySelectList[3].count = resourceDocList.value.length }) .catch(function (error) { console.log(error) @@ -773,18 +1118,34 @@ } const goResourceDetail = (data) => { - console.log(data, 23) - resourVisble.value = true - resourType.value = data.type - if (data.type == 'video') { - testVideo.value = 'http://182.92.203.7:3007/books/test/resourceData/' + data.name - } else if (data.type == 'word') { - testWord.value = 'http://182.92.203.7:3007/books/test/resourceData/' + data.name + resourType.value = data.fileType + if (data.fileType == '瑙嗛') { + resourVisble.value = true + testVideo.value = requestCtx + '/file/api/ApiDownload?md5=' + data.md5 + } else if (data.fileType == 'PDF') { + window.open(requestCtx + '/file/api/ApiDownload?md5=' + data.md5) + // testWord.value = resourceUrl + '/resourceData/' + data.name } } const classifyClick = (item) => { activeClassify.value = item.key + resourceDataList.value = [] + searchText.value = '' + switch (item.key) { + case 'image': + resourceDataList.value = resourceImgList.value + break + case 'audio': + resourceDataList.value = resourceAudioList.value + break + case 'video': + resourceDataList.value = resourceVideoList.value + break + case 'other': + resourceDataList.value = resourceDocList.value + break + } } const searchBtn = () => { if (searchShow.value) { @@ -823,7 +1184,6 @@ // 閫変腑鑿滃崟 const activeMenu = ref(0) //璧勬簮绫诲瀷 - const resourceType = ref('default') // 鑿滃崟鐐瑰嚮 const menuItemClick = (index) => { @@ -833,7 +1193,7 @@ case '0': break case '1': - getNotesList() + // getSignData() break case '2': break @@ -848,6 +1208,17 @@ //鍒锋柊褰撳墠椤甸潰 const reload = () => { location.reload() + // if (microApp) { + // microApp.unmount() // 鍗歌浇寰簲鐢� + // microApp = loadMicroApp(microApps.book1, { + // sandbox: { + // strictStyleIsolation: true, + // experimentalStyleIsolation: true + // } + // }) + // } else { + // location.reload() + // } } const selectResourceType = (type) => { @@ -860,9 +1231,51 @@ }) const settingForm = reactive({ + fontSizeList: [ + { + lable: '灏�', + key: '14' + }, + { + lable: '涓�', + key: '16' + }, + + { + lable: '澶�', + key: '18' + } + ], + fontSizeActive: '16', acoustics: false, - animation: false + animation: false, + bgColorList: [ + { + lable: '榛�', + key: '#FBF9F4' + }, + { + lable: '缁�', + key: '#F2FFF7' + }, + { + lable: '绱�', + key: '#F6F4FC' + }, + { + lable: '绮�', + key: '#FFFAF9' + } + ], + bgColorActive: '#FBF9F4' }) +const fontSizeSelect = (item) => { + settingForm.fontSizeActive = item.key + document.getElementById('app').style.fontSize = item.key + 'px' +} +const bgColorSelect = (item) => { + settingForm.bgColorActive = item.key +} //绗旇棰滆壊绛涢�� const searchClick = (item) => { if (item != 'all') { @@ -870,11 +1283,29 @@ } else { menuState.notesColor = 'all' } - getNotesList() + // getNotesList() } const searchBook = async () => { if (activeMenu.value == 1) { - getNotesList() + // getNotesList() + getSignData() + + } + if (activeMenu.value == 2) { + let dataList = JSON.parse(JSON.stringify(resourceDataList.value)) + if (searchText.value) { + resourceDataList.value = [] + searchText.value = searchText.value.replace(/^\s*|\s*$/g, '') + let text = searchText.value.replace(/^\s*|\s*$/g, '') + dataList.forEach((item) => { + if (item.name.indexOf(text) > -1) { + let replaceStr = "<span style='background:#F5E12A'>" + text + '</span>' + let htmlStr = item.name.split(text).join(replaceStr) + item.name = '<p>' + htmlStr + '</p>' + resourceDataList.value.push(item) + } + }) + } } } @@ -925,6 +1356,7 @@ icon: moxinggongju } ]) +const baiduVisible = ref(false) const wendaVisible = ref(false) const cidianVisible = ref(false) const functionVisible = ref(false) @@ -984,34 +1416,31 @@ const floatingToolBox = reactive([ { icon: huabi, + activeIcon: huabi1, name: '鐢荤瑪' }, { - icon: qingchu, - name: '娓呴櫎' - }, - { - icon: wenzi, - name: '鏂囧瓧' - }, - { - icon: biaozhu, - name: '鏍囨敞' - }, - { - icon: biaoqianw, - name: '鏍囩' - }, - { + activeIcon: baiban1, icon: baiban, name: '鐧芥澘' }, { + activeIcon: biaozhu1, + icon: biaozhu, + name: '鏍囨敞' + }, + { + activeIcon: biaoqian1, + icon: biaoqianw, + name: '鏍囩' + }, + { + activeIcon: jieping1, icon: jieping, name: '鎴睆' } ]) -const canvas = ref(null) +let canvas = null const floatingToolData = reactive({ activeToolData: '', //閫変腑宸ュ叿 elLeft: 400, @@ -1034,22 +1463,16 @@ floatingToolBox[0].icon = huabi1 break case 1: - floatingToolBox[1].icon = qingchu1 + floatingToolBox[1].icon = baiban1 break case 2: - floatingToolBox[2].icon = wenzi1 + floatingToolBox[2].icon = biaozhu1 break case 3: - floatingToolBox[3].icon = biaozhu1 + floatingToolBox[3].icon = biaoqian1 break case 4: - floatingToolBox[4].icon = biaoqian1 - break - case 5: - floatingToolBox[5].icon = baiban1 - break - case 6: - floatingToolBox[6].icon = jieping1 + floatingToolBox[4].icon = jieping1 break } } @@ -1060,22 +1483,16 @@ floatingToolBox[0].icon = huabi break case 1: - floatingToolBox[1].icon = qingchu + floatingToolBox[1].icon = baiban break case 2: - floatingToolBox[2].icon = wenzi + floatingToolBox[2].icon = biaozhu break case 3: - floatingToolBox[3].icon = biaozhu + floatingToolBox[3].icon = biaoqianw break case 4: - floatingToolBox[4].icon = biaoqianw - break - case 5: - floatingToolBox[5].icon = baiban - break - case 6: - floatingToolBox[6].icon = jieping + floatingToolBox[4].icon = jieping break } } @@ -1084,8 +1501,12 @@ const nameRef = ref() const imgUrl = ref() const confirmDialog = ref<Boolean>(false) -const nameData = ref({ name: '' }) +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) => { @@ -1093,7 +1514,12 @@ switch (item.name) { case '鐢荤瑪': canvasShow.value = true - init() + toolSelectData.activeTool = 'huabi' + break + case '鏍囨敞': + break + case '鏍囩': + reMark() break case '鎴睆': jitT() @@ -1109,51 +1535,73 @@ } } const dragstart = (e) => { - console.log(e) floatingToolData.startclientx = e.clientX floatingToolData.startclienty = e.clientY +} +//鐢荤瑪鎿嶄綔鏍忎簨浠� +const toolSelectData = reactive({ + activeTool: '', + fontSizeActive: '16', + thicknessActive: '3', //鐢荤瑪閫変腑绮楃粏 + lineTypeActive: 'solid', //鐢荤瑪閫変腑绾跨被鍨� + lineColorActive: '#333' //鐢荤瑪閫変腑绾块鑹� +}) +const toolSelectHandle = (title) => { + toolSelectData.activeTool = title + switch (title) { + case 'huabi': + init() + break + case 'wenzi': + break + case 'tuichu': + canvasShow.value = false + floatingToolData.activeToolData = '' + break + case 'qingchu': + canvas.clear() + break + } } //閫変腑鐢荤瑪绮楃粏 const selectThickness = (str) => { - floatingToolData.thicknessActive = str - init() + toolSelectData.thicknessActive = str + canvas.freeDrawingBrush.color = toolSelectData.thicknessActive } const selectLineType = (str) => { - floatingToolData.lineTypeActive = str + toolSelectData.lineTypeActive = str init() } //鐢荤瑪棰滆壊閫夋嫨 const lineColorSelect = (item) => { - floatingToolData.lineColorActive = item.key - init() + toolSelectData.lineColorActive = item.key + canvas.freeDrawingBrush.color = item.key } //鐢诲竷灞炴�� +const isDrawing = ref(true) // 鏄惁寮�鍚粯鍥撅紝true 寮�鍚紱false 鍏抽棴 const init = () => { - canvas.value = new fabric.Canvas('canvasRef', { - isDrawingMode: true // 鍚敤缁樼敾妯″紡 + canvas = new fabric.Canvas('canvasRef', { + isDrawingMode: isDrawing.value // 鍚敤缁樼敾妯″紡 }) - canvas.value.freeDrawingBrush.color = floatingToolData.lineColorActive - canvas.value.freeDrawingBrush.width = floatingToolData.thicknessActive + canvas.freeDrawingBrush.color = toolSelectData.lineColorActive + canvas.freeDrawingBrush.width = toolSelectData.thicknessActive } - -//娓呴櫎涓婁竴姝�/鍏ㄩ儴 -const cleanUpSelect = (str) => { - if (str == 'all') { - canvasShow.value = false - } else { - console.log(history.value) - } -} -//鏍囩鏄剧ず闅愯棌 -const labelShow = (str) => {} //鏂囧瓧澶у皬 const selectfontSize = (str) => { - floatingToolData.fontSizeActive = str + toolSelectData.fontSizeActive = str } +//鏍囨敞鏄剧ず闅愯棌 +const labelShow = (str) => {} + +//鏍囩 +const reMark =() => { + + +} //鎴浘 //鎴浘浜嬩欢 function jitT() { @@ -1166,36 +1614,51 @@ } //纭鍥炶皟 const callback = (val: any) => { - ElMessageBox.confirm('纭瑕佷繚瀛樻埅鍥�?', '鎻愮ず', { - confirmButtonText: '纭', - cancelButtonText: '鍙栨秷' - }) - .then(() => { - screenshotList.value.push({ - createDate: new Date(), - imgUrl: val.base64 - }) - request({ - url: '/identity/api/ApiAppUserSetKey', - method: 'post', - data: { - setKeyRequests: [ - { - domain: 'screenshot', - key: '1', - value: JSON.stringify(screenshotList.value) - } - ] - } - }).then((res) => { - getScreenshotList() - }) - }) - .catch(() => {}) + screenshotVisble.value = true + urlData.value = val.base64 } //鍙栨秷鍥炶皟 const closeFn = (base64: any) => { console.log(base64) + floatingToolData.activeToolData = '' +} +//淇濆瓨鎴浘 +const addScreenshot = () => { + if (nameData.value) { + screenshotData.value.push({ + createDate: new Date(), + imgUrl: urlData.value, + name: nameData.value + }) + screenshotLoading.value = true + request({ + url: '/identity/api/ApiAppUserSetKey', + method: 'post', + data: { + setKeyRequests: [ + { + domain: 'screenshot', + key: bookId.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('鎴浘鍚嶇О涓嶈兘涓虹┖!') + } +} +const screenshotClose = () => { + screenshotVisble.value = false } const getScreenshotList = () => { @@ -1204,83 +1667,82 @@ method: 'post', data: { domain: 'screenshot', - keys: ['1'] + keys: [bookId.value] } }).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() + }) +} //閫変腑鏂囧瓧宸ュ叿鏍� const selectText = ref('') //閫変腑鏂囧瓧 -const selectNode = ref(null) const showToolBox = ref(false) const dialogToolData = reactive({ left: 500, top: 300, + txt: '', + page: '', chapter: '', //閫変腑鏂囧瓧鎵�鍦ㄧ珷鑺� - parentNode: null, lineHeight: [], //楂樹寒 scribeList: [], //鍒掔嚎 notesList: [] //绗旇 }) ///鍐呭閫変腑 -const isMouseDown = ref(false) -const move = ref(false) -const handleMouseDown = () => { - isMouseDown.value = true - showToolBox.value = false - colorActive.value = '' - toolActive.value = '' -} -const handleMousemove = () => { - if (isMouseDown.value) { - move.value = true +const getSelection = (data) => { + if (data.txt) { + dialogToolData.txt = data.txt + dialogToolData.page = data.page + dialogToolData.chapter = data.chapterNum + dialogToolData.left = data.x + dialogToolData.top = data.y + showToolBox.value = true } -} - -const handleMouseUp = (e) => { - if (move.value) { - const txt = window.getSelection()?.toString() - selectText.value = txt - const node = window.getSelection() - let html = node.anchorNode.parentNode.parentNode - dialogToolData.chapter = html.firstChild.innerHTML - console.log(dialogToolData.chapter) - if (txt) { - showToolBox.value = true - dialogToolData.top = e.y - dialogToolData.left = e.x - } - isMouseDown.value = false - } - move.value = false -} - -const pageScroll = (e) => { - showToolBox.value = false - let scroll = e.target.scrollTop - let offsetHeight = document.getElementById('container').offsetHeight - headerData.process = Math.round((scroll / offsetHeight) * 100) } const toolActive = ref('') const colorActive = ref('') +const noteColorActive = ref('') const dialogToolList = reactive([ { icon: gaoliang, activeIcon: gaoliang1, name: '楂樹寒' }, { icon: huaxian, activeIcon: huaxian1, name: '鍒掔嚎' }, { icon: biji2, activeIcon: biji1, name: '绗旇' }, { icon: biaozhu2, activeIcon: biaozhu3, name: '鏍囨敞' }, { icon: fuzhi, activeIcon: fuzhi1, name: '澶嶅埗' }, - { icon: AIyuedu, activeIcon: AIyuedu1, name: 'AI闃呰' } - // { icon: cidian2, activeIcon: cidian1, name: '璇嶅吀' }, + { icon: AIyuedu, activeIcon: AIyuedu1, name: 'AI闃呰' }, + { icon: cidian2, activeIcon: cidian1, name: '璇嶅吀' }, + { icon: baidu, activeIcon: cidian1, name: '鐧剧' } // { icon: yuyinyuedu, activeIcon: yuyinyuedu1, name: '璇煶闃呰' } // { icon: cidian2, activeIcon: cidian1, name: '缈昏瘧' } ]) @@ -1299,7 +1761,7 @@ }, { label: '绱壊', - key: '#CAA5FC ' + key: '#CAA5FC' }, { label: '绮夎壊', @@ -1310,7 +1772,6 @@ //绗旇寮圭獥 const addNoteVisble = ref(false) const formData = reactive({ - name: '', desc: '' }) //绗旇寮圭獥鍏抽棴 @@ -1357,7 +1818,7 @@ dialogToolList[6].icon = cidian1 break case 7: - dialogToolList[7].icon = yuyinyuedu1 + dialogToolList[7].icon = baidu1 break } } @@ -1387,7 +1848,7 @@ dialogToolList[6].icon = cidian2 break case 7: - dialogToolList[7].icon = yuyinyuedu + dialogToolList[7].icon = baidu break } } @@ -1405,8 +1866,9 @@ case '楂樹寒': break case '绗旇': - formData.name = '' formData.desc = '' + addNoteVisble.value = true + showToolBox.value = false break case '鏍囨敞': break @@ -1428,242 +1890,162 @@ case '璇嶅吀': cidianVisible.value = true break + case '鐧剧': + baiduVisible.value = true + break } } const clickSelect = (item) => { colorActive.value = item.key - if (toolActive.value == '绗旇') { - addNoteVisble.value = true - } - if (toolActive.value == '楂樹寒') { - dialogToolData.lineHeight.push({ - selectNode: selectNode.value, - selectText: selectText.value, - color: colorActive.value, - chapter: dialogToolData.chapter, - color: item.key, - createDate: new Date() - }) - request({ - url: '/identity/api/ApiAppUserSetKey', - method: 'post', - data: { - setKeyRequests: [ - { - domain: 'highLight', - key: '1', - value: JSON.stringify([dialogToolData.lineHeight]) - } - ] - } - }).then((res) => { - showToolBox.value = false - colorActive.value = '' - toolActive.value = '' - getlineHeightList() - }) - } - if (toolActive.value == '鍒掔嚎') { - dialogToolData.scribeList.push({ - selectNode: selectNode.value, - selectText: selectText.value, - color: colorActive.value, - chapter: dialogToolData.chapter, - color: item.key, - createDate: new Date() - }) - request({ - url: '/identity/api/ApiAppUserSetKey', - method: 'post', - data: { - setKeyRequests: [ - { - domain: 'underline', - key: '1', - value: JSON.stringify(dialogToolData.scribeList) - } - ] - } - }).then((res) => { - colorActive.value = '' - showToolBox.value = false - toolActive.value = '' - getScribeList() - }) - } + addUserKey() +} +//绗旇閫夐鑹� +const clickSelectColor = (item) => { + noteColorActive.value = item.key } -const lock = ref(false) -const addNote = () => { - const obj = { - name: formData.name, - desc: formData.desc - } - if (!lock.value) { - lock.value = true - if (formData.desc.replace(/^\s*|\s*$/g, '')) { - if (formData.name.replace(/^\s*|\s*$/g, '')) { - dialogToolData.notesList.push({ - selectText: selectText.value, - color: colorActive.value, - chapter: dialogToolData.chapter, - createDate: new Date(), - name: formData.name.replace(/^\s*|\s*$/g, ''), - note: formData.desc.replace(/^\s*|\s*$/g, '') - }) - request({ - url: '/identity/api/ApiAppUserSetKey', - method: 'post', - data: { - setKeyRequests: [ - { - domain: 'notes', - key: '1', - value: JSON.stringify(dialogToolData.notesList) - } - ] - } - }).then((res) => { - showToolBox.value = false - addNoteVisble.value = false - colorActive.value = '' - toolActive.value = '' - // getNotesList() - setTimeout(() => { - lock.value = false - }, 1000) - }) - } else { - ElMessage.error('绗旇鏍囬涓嶈兘涓虹┖!') - lock.value = false +const addUserKey = () => { + let dom = '' + let data = null + switch (toolActive.value) { + case '楂樹寒': + dom = 'highLightData-' + bookId.value + data = dialogToolData.lineHeight[dialogToolData.chapter] + data.push({ + id: toolClass.uuid(8), + txt: dialogToolData.txt, + page: dialogToolData.page, + type: 'Highlight', + color: colorActive.value + }) + break + case '鍒掔嚎': + dom = 'underline-' + bookId.value + data = dialogToolData.scribeList[dialogToolData.chapter] + data.push({ + id: toolClass.uuid(8), + txt: dialogToolData.txt, + page: dialogToolData.page, + type: 'Dashing', + color: colorActive.value + }) + break + case '绗旇': + if (!formData.desc.replace(/^\s*|\s*$/g, '')) { + ElMessage.error('绗旇鍐呭涓嶈兘涓虹┖!') + return } - } else { - ElMessage.error('绗旇鍐呭涓嶈兘涓虹┖!') - lock.value = false - } + if (!noteColorActive.value) { + ElMessage.error('璇烽�夋嫨绗旇棰滆壊!') + return + } + dom = 'notes-' + bookId.value + data = dialogToolData.notesList.length != 0 ? dialogToolData.notesList[dialogToolData.chapter] : [] + data.push({ + id: toolClass.uuid(8), + txt: dialogToolData.txt, + page: dialogToolData.page, + type: 'Note', + color: noteColorActive.value, + createDate: new Date(), + note: formData.desc.replace(/^\s*|\s*$/g, '') + }) + + break } -} -//绗旇 -const getNotesList = () => { - scribeData.noteList = [] - scribeData.loading = true request({ - url: '/identity/api/ApiGetAppUserKey', + url: '/identity/api/ApiAppUserSetKey', method: 'post', data: { - domain: 'notes', - keys: ['1'] + setKeyRequests: [ + { + domain: dom, + key: dialogToolData.chapter, + value: JSON.stringify(data) + } + ] } }).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.getElementById('container') - console.log(list, '绗旇') - 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) - } - } - //椤甸潰娣诲姞绗旇 - let containerElement = document.createElement('span') - containerElement.style.textDecoration = 'underline' - containerElement.innerText = item.selectText - let rReg1 = new RegExp(`${item.selectText}`, 'ig') - let text1 = textDom1.innerHTML - let rHtml1 = '' - rHtml1 = text1.replace( - rReg1, - `<span style="text-decoration:underline;text-underline-thickness:2px;text-underline-offset:4px;text-decoration-color:${item.color}" class="underline">${item.selectText}</span><img src="${biji1}" style="cursor: pointer" onclick="notesVisbleShow('${item.selectText}')"/>` - ) - textDom1.innerHTML = rHtml1 - }) - } - scribeData.loading = false - } + showToolBox.value = false + addNoteVisble.value = false + colorActive.value = '' + noteColorActive.value = '' + toolActive.value = '' + getSignData() }) } -//鍒掔嚎 -const getScribeList = () => { - scribeData.scribeDataList = [] + + + +const getSignData = () => { request({ url: '/identity/api/ApiGetAppUserKey', method: 'post', data: { - domain: 'underline', - keys: ['1'] + domain: 'highLightData-' + bookId.value, + keys: activeCatalog.value.map((item) => item + '') } }).then((res) => { - if (res && res.length > 0 && res[0].value) { - dialogToolData.scribeList = JSON.parse(res[0].value) - scribeData.scribeDataList = JSON.parse(res[0].value) - let textDom1 = document.getElementById('container') - console.log(scribeData.scribeDataList, '鍒掔嚎') - if (scribeData.scribeDataList.length > 0) { - for (let i = 0; i < scribeData.scribeDataList.length; i++) { - let item = scribeData.scribeDataList[i] - let containerElement = document.createElement('span') - containerElement.style.textDecoration = 'underline' - containerElement.innerText = item.selectText - let rReg1 = new RegExp(`${item.selectText}`, 'ig') - let text1 = textDom1.innerHTML - let rHtml1 = '' - rHtml1 = text1.replace( - rReg1, - `<span style="text-decoration:underline;text-decoration-style: wavy;text-underline-thickness:2px;text-decoration-color:${item.color};cursor: pointer">${item.selectText}</span>` - ) - textDom1.innerHTML = rHtml1 + if (res && res.length > 0) { + for (let i = 0; i < res.length; i++) { + const item = res[i] + const data = JSON.parse(item.value) + // 鍌ㄥ�� + dialogToolData.lineHeight[item.key] = data + // 娓叉煋 + for (let j = 0; j < data.length; j++) { + const citem = data[j] + if (window.qiankunState && window.qiankunState.renderSign) + window.qiankunState.renderSign(citem.type, citem) } } } }) -} -//楂樹寒 -const getlineHeightList = () => { - scribeData.lineHeightList = [] request({ url: '/identity/api/ApiGetAppUserKey', method: 'post', data: { - domain: 'highLight', - keys: ['1'] + domain: 'underline-' + bookId.value, + keys: activeCatalog.value.map((item) => item + '') } }).then((res) => { - if (res && res.length > 0 && res[0].value) { - dialogToolData.lineHeight = JSON.parse(res[0].value) - scribeData.lineHeightList = JSON.parse(res[0].value) - console.log(scribeData.lineHeightList, '楂樹寒') - let textDom = document.getElementById('container') - if (scribeData.lineHeightList.length > 0) { - for (let i = 0; i < scribeData.lineHeightList.length; i++) { - let item = scribeData.lineHeightList[i] - let heightLightElement = document.createElement('i') - heightLightElement.style.backgroundColor = item.color - heightLightElement.innerText = item.selectText - let rReg = new RegExp(`${item.selectText}`, 'ig') - let text = textDom.innerHTML - let rHtml = '' - rHtml = text.replace( - rReg, - `<span style="background: ${item.color};padding: 2px;cursor: pointer">${item.selectText}</span>` - ) - textDom.innerHTML = rHtml + if (res && res.length > 0) { + for (let i = 0; i < res.length; i++) { + const item = res[i] + const data = JSON.parse(item.value) + // 鍌ㄥ�� + dialogToolData.scribeList[item.key] = data + // 娓叉煋 + for (let j = 0; j < data.length; j++) { + const citem = data[j] + if (window.qiankunState && window.qiankunState.renderSign) + window.qiankunState.renderSign(citem.type, citem) + } + } + } + }) + request({ + url: '/identity/api/ApiGetAppUserKey', + method: 'post', + data: { + domain: 'notes-' + bookId.value, + keys: activeCatalog.value.map((item) => item + '') + } + }).then((res) => { + if (res && res.length > 0) { + for (let i = 0; i < res.length; i++) { + const item = res[i] + const data = JSON.parse(item.value) + // 鍌ㄥ�� + scribeData.noteList = data + dialogToolData.notesList[item.key] = data + console.log(dialogToolData.notesList,"notesList") + // 娓叉煋 + for (let j = 0; j < data.length; j++) { + const citem = data[j] + if (window.qiankunState && window.qiankunState.renderSign) + window.qiankunState.renderSign(citem.type, citem) } } } @@ -1671,74 +2053,161 @@ } //姝f枃涓垹闄ら珮浜紝鍒掔嚎锛岀瑪璁版搷浣滄 +const lineDelete = reactive({ + showLineDelete: false, + top: 0, + left: 0, + deleteType: '', + id: '' +}) + +// 鍒掔嚎銆佺瑪璁般�侀珮浜偣鍑诲洖璋� +window.signClick = (type, id)=>{ + console.log("signClick鐐瑰嚮浜嬩欢鍥炶皟鐨勫疄渚�", type, id); + // if (window.qiankunState && window.qiankunState.delSign) window.qiankunState.delSign({ids:[id]}) + if(type == 'Note'){ + let data = dialogToolData.notesList.filter((item) => id.indexOf(item.id) == -1) + console.log(data) + formData.desc = notes.note + noteColorActive.value = notes.color + addNoteVisble.value = true + }else{ + lineDelete.showLineDelete = true + lineDelete.deleteType = type + lineDelete.id = id + } +} + window.notesVisbleShow = function (txt) { addNoteVisble.value = true - let notes = dialogToolData.notesList.find((item) => item.selectText == txt) - formData.name = notes.name + let notes = dialogToolData.notesList.find((item) => item.id == id) formData.desc = notes.note + colorActive.value = notes.color + selectNode.value = notes.selectNode + selectText.value = notes.selectText + selectPage.value = notes.selectPage + dialogToolData.chapter = notes.chapter } -window.deleteScribeShow = function (txt) { - console.log(txt, 2) - let list = scribeData.scribeDataList.filter((item) => item.selectText != txt) +const delUserKey = () => { + let type = lineDelete.deleteType + let ids = lineDelete.id + let dom = '' + let data = null + switch (type) { + case 'Highlight': + dom = 'highLightData-' + bookId.value + data = dialogToolData.lineHeight + break + case 'Dashing': + dom = 'underline-' + bookId.value + data = dialogToolData.scribeList + break + } + data = data.filter((item) => ids.indexOf(item.id) == -1) + console.log(data[0]) + let list = data[0].filter((item) => item.id != ids) + console.log(list) request({ url: '/identity/api/ApiAppUserSetKey', method: 'post', data: { setKeyRequests: [ { - domain: 'underline', - key: '1', + domain: dom, + key: dialogToolData.chapter, value: JSON.stringify(list) } ] } }).then((res) => { - getScribeList() + if (window.qiankunState && window.qiankunState.delSign) window.qiankunState.delSign({ids:[ids]}) + getSignData() }) } -window.deletelineHeightShow = function (txt) { - console.log(txt, 1) - let list = scribeData.lineHeightList.filter((item) => item.selectText != txt) - request({ - url: '/identity/api/ApiAppUserSetKey', - method: 'post', - data: { - setKeyRequests: [ - { - domain: 'highLight', - key: '1', - value: JSON.stringify(list) + +const lineDeleteBtn = () => { + if (lineDelete.deleteType == 'underline') { + let list = scribeData.scribeDataList.filter((item) => item.selectText != lineDelete.deleteTxt) + request({ + url: '/identity/api/ApiAppUserSetKey', + method: 'post', + data: { + setKeyRequests: [ + { + domain: 'underline', + key: bookId.value, + value: JSON.stringify(list) + } + ] + } + }).then((res) => { + lineDelete.showLineDelete = false + let list = document.querySelectorAll('.underline') + list.forEach((itemNode) => { + if (itemNode.innerText == lineDelete.deleteTxt) { + itemNode.removeAttribute('style') + itemNode.className = '' + itemNode.removeAttribute('onclick') } - ] - } - }).then((res) => { - getlineHeightList() - }) + }) + getScribeList() + }) + } else if (lineDelete.deleteType == 'highLight') { + let list = scribeData.lineHeightList.filter((item) => item.selectText != lineDelete.deleteTxt) + request({ + url: '/identity/api/ApiAppUserSetKey', + method: 'post', + data: { + setKeyRequests: [ + { + domain: 'highLight', + key: bookId.value, + value: JSON.stringify(list) + } + ] + } + }).then((res) => { + lineDelete.showLineDelete = false + let list = document.querySelectorAll('.highLight') + list.forEach((itemNode) => { + if (itemNode.innerText == lineDelete.deleteTxt) { + itemNode.removeAttribute('style') + itemNode.className = '' + itemNode.removeAttribute('onclick') + } + }) + getlineHeightList() + }) + } } -const jumpContent = (id) => { - document.getElementById(id).scrollIntoView() +//绗旇璺宠浆 +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), 1 ) - selectText.value = item.selectText - colorActive.value = item.color + dialogToolData.txt = item.txt + dialogToolData.page = item.page + dialogToolData.chapter = item.chapterNum + noteColorActive.value = item.color dialogToolData.chapter = item.chapter - formData.name = item.name formData.desc = item.note addNoteVisble.value = true } //鍒犻櫎 -const deleteBtn = (item, type) => { +const deleteBtn = (item) => { if (type == 'note') { // 绉婚櫎 - let list = scribeData.noteList.filter((itemData) => itemData.selectText !== item.selectText) + let list = dialogToolData.noteList.filter((itemData) => itemData.id !== item.id) request({ url: '/identity/api/ApiAppUserSetKey', method: 'post', @@ -1746,7 +2215,7 @@ setKeyRequests: [ { domain: 'notes', - key: '1', + key: bookId.value, value: JSON.stringify(list) } ] @@ -1756,10 +2225,12 @@ message: '鍒犻櫎绗旇鎴愬姛!', type: 'success' }) + if (window.qiankunState && window.qiankunState.delSign) window.qiankunState.delSign({ids:[id]}) getNotesList() }) } } + //鍐呭鍖哄煙椤堕儴鏄剧ず @@ -1806,44 +2277,49 @@ headerData.pageSize = Number(headerData.pageSize) - 5 } } + +const layoutBtn = () => { + localStorage.clear() + console.log(888) + router.push('/login') +} </script> <style lang="less"> .homeBox { width: 100%; height: 100%; - background:#C6C6C6; + background: #87ccff; border-radius: 10px; display: flex; flex-direction: column; - padding:0 15px; + padding: 0 15px; .headerBox { height: 48px; // background-image: url('@/assets/images/header/top-bg.png'); background-size: 100% 100%; background-repeat: no-repeat; padding: 0 20px; - display:flex; + display: flex; justify-content: space-between; align-items: center; - p { + .logoTxt { font-size: 24px; - color: #ffffff; + color: #333; letter-spacing: 2px; font-weight: bold; } - .userInfoBox{ - display:flex; + .userInfoBox { + display: flex; align-items: center; - .layout{ + .layout { width: 69px; height: 30px; - background: #0093FF; + background: #0093ff; border-radius: 15px; - color:#fff; - text-align:center; - line-height:30px; - + color: #fff; + text-align: center; + line-height: 30px; } } } @@ -1859,14 +2335,14 @@ box-sizing: border-box; position: relative; box-shadow: 10px 0 10px -10px rgba(0, 0, 0, 0.07); - background:#fff; - border-radius:16px 0px 0px 0px; + background: #fff; + border-radius: 16px 0px 0px 0px; .menuItem { text-align: center; line-height: 1; cursor: pointer; padding: 5px 0 10px 0; - width:63px; + width: 63px; margin: 10px auto; border-radius: 10px; &.active, @@ -1998,7 +2474,7 @@ border: 1px solid #0093ff !important; border-radius: 50px; overflow: hidden; - background:#fff; + background: #fff; } .is-focus, .el-input__wrapper { @@ -2028,22 +2504,22 @@ .all { width: 50px; - height: 20px; + height: 22px; border-radius: 17px; margin: 10px 10px 10px 0; border: 1px solid #d8d8d8; text-align: center; - line-height: 17px; + line-height: 20px; font-size: 12px; } .allActive { width: 50px; - height: 20px; + height: 22px; border-radius: 17px; margin: 10px 10px 10px 0; text-align: center; - line-height: 17px; + line-height: 20px; color: #fff; background: #0093ff; border: 1px solid #0093ff; @@ -2053,7 +2529,7 @@ .scribeItem { width: 18px; height: 18px; - border-radius: 50%; + border-radius: 3px; margin: 10px auto; border: none; } @@ -2074,11 +2550,14 @@ padding: 10px 0; align-items: center; .resourceImg { - width: 130px; + // width: 130px; height: 80px; background: #fff; - border-radius:5px; + border-radius: 5px; overflow: hidden; + display: flex; + align-items: center; + justify-content: center; img { height: 100%; width: 100%; @@ -2087,7 +2566,7 @@ } .rName { - margin-top:10px; + margin-top: 10px; height: 20px; line-height: 20px; display: -webkit-box; @@ -2105,12 +2584,37 @@ flex-wrap: wrap; justify-content: space-between; .captureItem { - border: 1px solid #d8d8d8; margin-bottom: 10px; width: 46%; - .capture { + position: relative; + .imgBox { + border: 1px solid #d8d8d8; width: 100%; height: 80px; + margin-bottom: 5px; + } + .deleteBox { + position: absolute; + top: 2px; + right: 2px; + width: 20px; + height: 20px; + background: rgba(44, 44, 44, 0.3); + text-align: center; + padding: 2px; + } + // .capture { + // width: 100%; + // } + .captureName { + height: 20px; + line-height: 20px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; + text-overflow: ellipsis; + color: #000; } } } @@ -2120,15 +2624,25 @@ position: relative; margin: 10px; line-height: 20px; + background: #fff; + border-radius: 5px; + padding: 10px 0; .textBox { - padding: 0 5px 10px 5px; .title { display: flex; justify-content: space-between; align-items: center; + margin-right: 10px; + .border-left { + height: 25px; + border-right: 4px solid; + border-radius: 0 5px 5px 0; + margin-right: 10px; + } .title-con { display: flex; align-items: center; + color: #949494; .round { width: 10px; height: 10px; @@ -2143,50 +2657,26 @@ } .chapter { color: #b7b7b7; - margin-top: 5px; - } - .chapterName { - float: right; - width: 150px; + margin: 5px 5px 5px 14px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - text-align: right; + border-left: 3px solid #b7b7b7; + border-left-radius: 20px; + padding: 0 5px; } } .noteText { - text-indent: 2ch; - margin-top: 5px; - .label { - width: 40px; - flex-shrink: 0; - } - + margin: 10px 10px 10px 15px; + border-radius: 3px; + padding: 2px 5px; .con { max-height: 65px; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; overflow: hidden; - } - } - .deleteBox { - position: absolute; - right: 0; - top: 0; - height: 100%; - width: 70px; - background-color: #0093ff; - color: #fff; - display: flex; - align-items: center; - - span { - margin: 0 auto; - } - - .el-icon { - margin-right: 5px; } } } @@ -2235,13 +2725,12 @@ margin: 0 5px; } } - .progress{ - text-align:center; - .bookName{ - font-weight:bold; - margin-bottom:3px; + .progress { + text-align: center; + .bookName { + font-weight: bold; + margin-bottom: 3px; } - } .rightBox { display: flex; @@ -2272,14 +2761,17 @@ } .pageBox-content { height: calc(100% - 57px); - overflow-y: auto; background: #fbf9f4; .content-box { + height: 100%; position: relative; - } - #container { - background: #fbf9f4; - // height: 100%; + #container { + background: #fbf9f4; + height: 100%; + #__qiankun_microapp_wrapper_for_app_content__ { + height: 100%; + } + } } .canvas-box { height: 100%; @@ -2295,8 +2787,8 @@ .toolBox { position: relative; box-shadow: -3px 0px 6px 1px rgba(0, 0, 0, 0.07); - background:#fff; - border-radius:0px 16px 0px 0px; + background: #fff; + border-radius: 0px 16px 0px 0px; .toolTitle { height: 57px; line-height: 53px; @@ -2339,7 +2831,7 @@ position: absolute; line-height: 22px; top: 50%; - right: 65px; + right: 50px; text-align: center; box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16); img { @@ -2348,7 +2840,7 @@ } } .right { - right: 174px !important; + right: 184px !important; border-radius: 0px 3px 3px 0px !important; } .classRoomBox { @@ -2415,7 +2907,7 @@ width: 85px; background-image: linear-gradient(to bottom, #0093ff, #005dff); position: fixed; - height: 430px; + height: 310px; top: 300px; left: 450px; z-index: 99; @@ -2436,17 +2928,51 @@ margin-right: 5px; } } + .floatToolItem:hover, + .floatToolActive { + background-color: #fff; + color: #0093ff; + } } - .floatToolItem:hover { - background-color: #fff; - color: #0093ff; + .brushBox { + position: fixed; + left: 500px; + bottom: 20px; + z-index: 99; + border-radius: 5px; + background: #fff; + // padding: 10px; + overflow: hidden; + border: 1px solid #0093ff; + .toolList { + display: flex; + justify-content: center; + align-items: center; + .floatToolItem { + margin: 10px; + width: 48px; + border-radius: 5px; + text-align: center; + flex: 1; + .imgBox { + height: 22px; + width: 22px; + text-align: center; + margin: 0 auto; + margin-bottom: 5px; + } + } + .layOutTool { + padding-left: 15px; + border-left: 1px solid #e0e0e0; + } + } } .dialogToolBox { position: fixed; z-index: 2; - .toolSelectBox { height: 57px; display: flex; @@ -2507,6 +3033,14 @@ } } } +.lineDeleteBox { + position: fixed; + z-index: 2; + border: 1px solid #0093ff; + padding: 20px 8px; + background: #fff; + border-radius: 5px; +} .wendabox { width: 100%; height: 700px; @@ -2515,16 +3049,18 @@ height: 100%; } } -.myNoteDialogs { - width: 400px !important; -} -.myDialogs { - width: 628px; + +.myDialogs, +.myNoteDialogs, +.resourDialog { + padding: 0 !important; + border-radius: 10px !important; + overflow: hidden; .el-dialog__header { - padding: 15px; - margin-right: 0; - border-bottom: 1px solid #f4f4f4; + padding: 10px; + text-align: center; + background: #f4f5f9; } .el-dialog__title { @@ -2533,18 +3069,42 @@ } .el-dialog__headerbtn { - top: 6px; - right: 6px; + top: 0px !important; + right: 0px !important; } - + .el-dialog__body { + padding: 20px !important; + } .el-dialog__footer { - padding: 15px; - border-top: 1px solid #f4f4f4; + padding: 10px 20px 20px !important; + text-align: right; + box-sizing: border-box; } - - .myDialogs-footer { - .el-button { - padding: 0 20px; +} +.myDialogs { + width: 628px; +} +.myNoteDialogs { + width: 500px !important; +} +.screenshotDialog { + width: 400px !important; +} +.noteColorSelectBox { + margin-top: 10px; + width: 190px; + display: flex; + .flex1 { + flex: 1; + .scribeItem { + width: 18px; + height: 18px; + border-radius: 3px; + margin: 10px auto; + border: none; + display: flex; + justify-content: center; + align-items: center; } } } @@ -2557,5 +3117,8 @@ .imgUrlBox { width: 100%; text-align: center; + img { + width: 100%; + } } </style> -- Gitblit v1.9.1