From 31e3f020c83990ecc6d86a3abfe67f1559c140c2 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Thu, 3 Aug 2023 11:25:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=A4=B4=E9=83=A8=E4=BF=AE=E6=94=B9=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/assets/less/common.less | 11 ++- jero-web/src/components/jero/JEditor.vue | 77 ++++++++++++++++++- jero-web/src/components/jero/JSuperQuery.vue | 2 +- .../components/jero/modal/JPopupOnlReport.vue | 7 +- .../JSelectBizComponentModal.vue | 8 +- .../src/components/onlineForm/onlineForm.js | 36 ++++----- jero-web/src/components/tools/UserMenu.vue | 21 ++++- jero-web/src/views/demo/JeroDemoList.vue | 8 +- .../views/demo/list/TableInnerEditList.vue | 6 +- jero-web/src/views/demo/list/TableList.vue | 6 +- .../views/modules/message/SysMessageList.vue | 20 ++--- .../message/SysMessageTemplateList.vue | 20 ++--- jero-web/src/views/system/DataLogList.vue | 4 +- jero-web/src/views/system/DepartList.vue | 8 +- jero-web/src/views/system/DepartListSync.vue | 8 +- jero-web/src/views/system/DictList.vue | 18 ++--- jero-web/src/views/system/PermissionList.vue | 6 +- jero-web/src/views/system/QuartzJobList.vue | 8 +- jero-web/src/views/system/RoleUserList.vue | 8 +- .../src/views/system/SysAnnouncementList.vue | 4 +- jero-web/src/views/system/SysCategoryList.vue | 6 +- .../src/views/system/SysCheckRuleList.vue | 16 ++-- .../src/views/system/SysDataSourceList.vue | 8 +- jero-web/src/views/system/SysFillRuleList.vue | 8 +- .../src/views/system/SysGatewayRouteList.vue | 2 +- .../src/views/system/SysUserOnlineList.vue | 2 +- jero-web/src/views/system/TenantList.vue | 2 +- .../src/views/system/UserAnnouncementList.vue | 4 +- jero-web/src/views/system/UserList.vue | 20 ++--- .../src/views/system/log/LoginLogList.vue | 2 +- .../src/views/system/log/OperatorLogList.vue | 2 +- .../src/views/system/modules/DeptUserInfo.vue | 6 +- .../system/modules/SelectUserListModal.vue | 7 +- 33 files changed, 236 insertions(+), 135 deletions(-) diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index b27871b0..194a03a4 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -58,4 +58,13 @@ } /**隐藏样式-modal确定按钮 */ -.jee-hidden{display: none} \ No newline at end of file +.jee-hidden{display: none} + +.ant-col-md-6{ + padding-left: 18px !important; + padding-right: 18px !important; + +} +.table-page-search-wrapper .ant-form-inline .ant-form-item{ + margin-bottom: 12px; +} diff --git a/jero-web/src/components/jero/JEditor.vue b/jero-web/src/components/jero/JEditor.vue index 559bee41..46a9294a 100644 --- a/jero-web/src/components/jero/JEditor.vue +++ b/jero-web/src/components/jero/JEditor.vue @@ -73,7 +73,7 @@ export default { formData.append('file', blobInfo.blob(), blobInfo.filename()) formData.append('biz', 'jeditor') formData.append('jeditor', '1') - uploadAction(window._CONFIG.domianURL + '/sys/common/upload', formData).then((res) => { + uploadAction('/sys/common/upload', formData).then((res) => { if (res.success) { if (res.message === 'local') { const img = 'data:image/jpeg;base64,' + blobInfo.base64() @@ -84,6 +84,28 @@ export default { } } }) + }, + paste_postprocess: function(plugin, args) { + console.log(args.node,"kkkkkk"); + args.node.setAttribute('id', 'hello'); + }, + init_instance_callback: editor => { + if (this.value) { + editor.setContent(this.value) + } + this.hasInit = true + + editor.on('NodeChange Change KeyUp SetContent', () => { + this.hasChange = true + // const val = editor.getContent().replace(/

/g, '') + this.$emit('input', editor.getContent()) + }) + + editor.on('paste', evt => { + // 监听粘贴事件 + console.log('监听粘贴事件', evt) + this.onPaste(evt) + }) } }, myValue: this.value, @@ -94,7 +116,60 @@ export default { this.initATabsChangeAutoReload() }, methods: { + onPaste(event, success, failure) { + // let _this = this + let self = this + // 实现图⽚粘贴上传 + const items = (event.clipboardData || window.clipboardData).items + // items为伪数组微信/QQ截图以及此富⽂本区域内复制粘贴的length为1,⿏标右键复制粘贴图⽚以及⽂本的复制粘贴的length为2 + let len = items.length + for (let i = 0; i < len; i++) { + if (items[i].kind == "file" && items[i].type.indexOf("image") != -1) { + // 判断是否为图⽚类型 + event.preventDefault() // 如果是图⽚阻⽌⾃动粘贴到富⽂本编辑器 + let file = items[i].getAsFile() // 获取⽂件数据 + let blob = new Blob([file], { type: file.type }) //实例化⼀个blob 将图⽚⼤⼩以及类型初始化到blob⾥ + // let index = file.name.lastIndexOf(".") + // let fileName = + // Date.now() + file.name.substring(index, file.name.length) + // fileName --- 图⽚名称可⾃⾏处理 + console.log("粘贴的是图⽚类型", blob, file) + // let file = blobInfo.blob() + const isLt2M = file.size / 1024 < 500 + if (!isLt2M) { + this.$message.warning("上传失败，图片不可超过500KB!") + return false + } + const formdate = new FormData() + formdate.append("file", file) //imageFile文件名和后端统一 + uploadAction('/sys/common/upload', formdate).then((res) => { + debugger + if (res.success) { + if (res.message === 'local') { + const img = 'data:image/jpeg;base64,' + blob.base64() + success(img) + } else { + const img = getFileAccessHttpUrl(res.message) + editor.execCommand( + "mceReplaceContent", + false, + `` + ); + } + } + }) + + .catch(function(err) { + // 上传错误可⾃⾏给出提⽰ + self.$message.error(err) + }) + } else { + // 不是图⽚类型直接粘贴, 跳过oss上传处理 + console.log("粘贴的不是图⽚") + } + } + }, reload () { this.reloading = true this.$nextTick(() => { diff --git a/jero-web/src/components/jero/JSuperQuery.vue b/jero-web/src/components/jero/JSuperQuery.vue index 1695e13b..e9d399b0 100644 --- a/jero-web/src/components/jero/JSuperQuery.vue +++ b/jero-web/src/components/jero/JSuperQuery.vue @@ -19,7 +19,7 @@ - 高级查询 + 高级查询 - 查询 - 重置 - + {{ toggleSearchStatus ? '收起' : '展开' }} + 查询 + 重置 + diff --git a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue index 5a6e62f3..6fbddfdb 100644 --- a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue +++ b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue @@ -20,12 +20,12 @@ + + {{ toggleSearchStatus ? '收起' : '展开' }} + + 查询 重置 - - {{ showMoreQueryItems ? '收起' : '展开' }} - - --> - + + + - + {{site.meta.title}} @@ -272,6 +275,18 @@ export default { diff --git a/jero-web/src/components/page/GlobalFooter.vue b/jero-web/src/components/page/GlobalFooter.vue index d1ee463d..341033f8 100644 --- a/jero-web/src/components/page/GlobalFooter.vue +++ b/jero-web/src/components/page/GlobalFooter.vue @@ -23,8 +23,8 @@ export default {