Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复便签功能

Browse Source
This commit is contained in:
WangHao
2021-01-24 21:26:28 +08:00
parent 116204666b
commit db1fae1c4f
16 changed files with 2148 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-ui/src/views/bookmark/bookmark/index.vue
View File

@@ -343,7 +343,7 @@
sousuo: '',
drawer: false,
// 遮罩层
loading: true,
// loading: true,
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -454,10 +454,10 @@
return format(time, 'zh_CN'); //转换成类似于几天前的格式
},
},
mounted() {
// document.querySelector("#datalist").addEventListener('scroll', this.handleScroll)
},
// mounted() {
//
// // document.querySelector("#datalist").addEventListener('scroll', this.handleScroll)
// },
computed: {
/**list加载完毕就禁止滚动**/
@@ -1411,7 +1411,7 @@
.sousou-input i {
font-size: 15px;
}
.header-list {
display: flex;
@@ -1485,7 +1485,7 @@
}
.mianUrl-botoom{
height: 900px;
padding-bottom: 20px;
}
.openurl{

33
ruoyi-ui/src/views/bookmark/common/ImportHtml.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<div >
<div style="width:360px;height:260px;margin: 0 auto;margin-top: 40px">
<!-- 用户导入对话框 -->
<!-- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>-->
<el-upload
@@ -26,13 +26,15 @@
<!-- <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
<!-- <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>-->
<!-- </div>-->
<div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入".html"格式文件！</div>
<div class="el-upload__tip title" slot="tip">提示：仅允许导入".html"格式文件！</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" class=" mdui-text-center mdui-btn mdui-btn-raised mdui-text-color-blue-900 mdui-color-light-blue-100" @click="submitFileForm">确 定</el-button>
<!-- <el-button @click="upload.open = false">取 消</el-button>-->
<button class="mdui-btn mdui-btn-raised mdui-btn-dense mdui-color-light-blue-100 mdui-ripple">Button</button>
<button @click="submitUpload" class="isbutton mdui-btn mdui-btn-block mdui-btn-raised mdui-btn-dense mdui-color-blue-100 mdui-ripple">导 入 书 签</button>
</div>
</div>
<!-- </el-dialog>-->
<!-- <el-button-->
@@ -150,10 +152,11 @@
<style scoped>
.text{
border: #6f7180 1px solid;
border: #cecece 1px solid;
border-radius: 10px;
margin-top: 10px;
background-color: #e9e9e9;
margin: 20px;
background-color: #fafcff;
margin-top: 30px;
}
.structure {
@@ -173,4 +176,20 @@
li{
list-style:none;
}
.main{
}
.upload-demo{
}
.title {
color: red;
width: 360px;
height: 10px;
text-align: center;
margin-top: 7px;
}
.isbutton{
margin-top: 10px;
}
</style>

36
ruoyi-ui/src/views/bookmark/common/NqEdit.vue
View File

@@ -1,17 +1,23 @@
<template>
<div class="home" >
<div class="home" v-loading="loading" >
<div class="nqtitle">
<div class="mdui-textfield mdui-textfield-floating-label inputtop">
<input class="mdui-textfield-input edittitle" v-model="queryParamsAndMg.title" type="text" required/>
</div>
<div class="common">
<el-tag type="info" size="small" >{{queryParamsAndMg.updateTime==null?'0000:00:00':queryParamsAndMg.updateTime}}</el-tag>
<el-tag type="info" size="small" >{{queryParamsAndMg.updateTime==null?'2020-12-13 21:24:35':queryParamsAndMg.updateTime}}</el-tag>
<el-link type="info" icon="el-icon-edit" class="editNote" @click="updateEdit">{{updateOpn}}</el-link>
<el-link type="info" icon="el-icon-delete" class="editNote">删除</el-link>
<el-link type="info" icon="el-icon-delete" class="editNote delete">删除</el-link>
<el-link type="info" icon="el-icon-refresh-right" class="editNote">刷新</el-link>
<el-link type="info" icon="el-icon-connection" class="editNote">分享</el-link>
<el-link type="info" class="editNote">|</el-link>
<el-link type="info" icon="el-icon-lock" class="editNote">加密</el-link>
<!-- <el-link type="info" icon="el-icon-unlock" class="editNote">未加密</el-link>-->
<el-link type="info" icon="el-icon-key" class="editNote">改密</el-link>
</div>
</div>
<div v-loading="loading" v-if="!showEditor" class="mian" v-html="queryParamsAndMg.ueditorContent">
<div v-if="!showEditor" class="mian" v-html="queryParamsAndMg.ueditorContent">
</div>
@@ -65,9 +71,8 @@
updateEditor:null
},
mounted() {
this.showEditor=this.updateEditor;
this.getNoteById();
},
updated() {
@@ -98,12 +103,13 @@
ueditorContent: undefined,
},
showEditor:false,
loading:false,
updateOpn:'编辑'
loading:true,
updateOpn:'编辑',
}
},
created() {
this.getNoteById();
},
methods: {
/** 实时更新文章的信息 */
@@ -121,7 +127,7 @@
/** 查询便签管理列表 */
getNoteById() {
var that = this;
that.loading=true;
var blueditor = that.ueditor != null && that.ueditor != '' && that.ueditor != undefined;
var blnoteId = that.noteid != null && that.noteid != '' && that.noteid != undefined;
if (blueditor) {
@@ -133,9 +139,10 @@
if (blueditor && blnoteId) {
userGetNoteInfo(this.queryParamsAndMg.noteId).then(response => {
that.queryParamsAndMg = response.data;
that.loading=false;
});
}
that.loading=false;
},
//鼠标单击的事件
onClick(e, editor) {
@@ -179,12 +186,11 @@
}
.mian {
height: 100%;
height: auto;
overflow-y: auto;
width: 1000px;
width:auto;
/*text-indent: 10px;*/
padding: 10px;
margin-bottom: 10px;
opacity: 0.9;
margin: 15px;
border: 1px solid #D4D4D4;
@@ -210,6 +216,7 @@
.nqtitle{
margin-left: 13px;
margin-bottom: 10px;
margin-right: 17px;
}
.inputtop{
padding-top: 6px;
@@ -219,5 +226,8 @@
align-items: center;
height: 22px;
}
.delete{
color: #ff3b2f;
}
</style>