diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index b27871b0..695a9627 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -1,7 +1,7 @@ /*列表上方操作按钮区域*/ .ant-card-body .table-operator { - margin-bottom: 8px; + //margin-bottom: 8px; } /** Button按钮间距 */ .table-operator .ant-btn { @@ -12,7 +12,7 @@ } .table-operator .ant-btn-group .ant-btn:last-child { - margin: 0 8px 8px 0; + margin: 0 8px 0px 0; } /*列表td的padding设置 可以控制列表大小*/ .ant-table-tbody .ant-table-row td { @@ -58,4 +58,19 @@ } /**隐藏样式-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: 4px; +} +.ant-card-body .table-operator{ + margin-bottom: 4px !important; +} +.ant-tabs-bar { + margin-bottom: 0px; +} \ No newline at end of file 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 ? '收起' : '展开' }} + 查询 + 重置 + @@ -42,9 +43,9 @@

- - 已选择 {{ table.selectedRowKeys.length }}项   - 清空 + + + 刷新
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 ? '收起' : '展开' }} - - diff --git a/jero-web/src/components/onlineForm/OnlineForm.css b/jero-web/src/components/onlineForm/OnlineForm.css index 12708f2b..81d0dd9f 100644 --- a/jero-web/src/components/onlineForm/OnlineForm.css +++ b/jero-web/src/components/onlineForm/OnlineForm.css @@ -156,7 +156,7 @@ } .ant-card-body .table-operator[data-v-76e1a326] { - margin-bottom: 18px + margin-bottom: 4px } .ant-table-tbody .ant-table-row td[data-v-76e1a326] { @@ -196,7 +196,7 @@ } .ant-card-body .table-operator[data-v-54bf704f] { - margin-bottom: 18px + margin-bottom: 4px } .ant-table-tbody .ant-table-row td[data-v-54bf704f] { @@ -329,7 +329,7 @@ th[data-v-125d8be6] { } .ant-card-body .table-operator { - margin-bottom: 18px + margin-bottom: 4px } .anty-row-operator button { @@ -492,7 +492,7 @@ th[data-v-125d8be6] { } .ant-card-body .table-operator[data-v-67102101] { - margin-bottom: 18px + margin-bottom: 4px } .ant-table-tbody .ant-table-row td[data-v-67102101] { @@ -532,7 +532,7 @@ th[data-v-125d8be6] { } .ant-card-body .table-operator { - margin-bottom: 8px + margin-bottom: 4px } .table-operator .ant-btn { @@ -775,7 +775,7 @@ th[data-v-125d8be6] { } .ant-card-body .table-operator[data-v-b7645c0c] { - margin-bottom: 18px + margin-bottom: 4px } .ant-table-tbody .ant-table-row td[data-v-b7645c0c] { diff --git a/jero-web/src/components/onlineForm/onlineForm.js b/jero-web/src/components/onlineForm/onlineForm.js index 4535a342..346ec54b 100644 --- a/jero-web/src/components/onlineForm/onlineForm.js +++ b/jero-web/src/components/onlineForm/onlineForm.js @@ -1716,25 +1716,7 @@ } })], 1)], 1) : e._e()], 1), n("div", { style: e.table_area_style - }, [n("div", { - staticClass: "ant-alert ant-alert-info", - staticStyle: { - "margin-bottom": "16px" - } - }, [n("i", { - staticClass: "anticon anticon-info-circle ant-alert-icon" - }), e._v(" 已选择 "), n("a", { - staticStyle: { - "font-weight": "600" - } - }, [e._v(e._s(e.selectedRowKeys.length))]), e._v("项\n "), n("a", { - staticStyle: { - "margin-left": "24px" - }, - on: { - click: e.onClearSelected - } - }, [e._v("清空")])]), n("a-table", { + }, [ n("a-table", { ref: "table", attrs: { size: "middle", @@ -8623,25 +8605,7 @@ } })], 1)], 1) : e._e()], 1), n("div", { style: e.table_area_style - }, [n("div", { - staticClass: "ant-alert ant-alert-info", - staticStyle: { - "margin-bottom": "16px" - } - }, [n("i", { - staticClass: "anticon anticon-info-circle ant-alert-icon" - }), e._v(" 已选择 "), n("a", { - staticStyle: { - "font-weight": "600" - } - }, [e._v(e._s(e.selectedRowKeys.length))]), e._v("项\n "), n("a", { - staticStyle: { - "margin-left": "24px" - }, - on: { - click: e.onClearSelected - } - }, [e._v("清空")])]), n("a-table", { + }, [ n("a-table", { ref: "table", attrs: { size: "middle", @@ -27279,25 +27243,7 @@ } })], 1)], 1) : e._e()], 1), n("div", { style: e.table_area_style - }, [n("div", { - staticClass: "ant-alert ant-alert-info", - staticStyle: { - "margin-bottom": "16px" - } - }, [n("i", { - staticClass: "anticon anticon-info-circle ant-alert-icon" - }), e._v(" 已选择 "), n("a", { - staticStyle: { - "font-weight": "600" - } - }, [e._v(e._s(e.selectedRowKeys.length))]), e._v("项\n "), n("a", { - staticStyle: { - "margin-left": "24px" - }, - on: { - click: e.onClearSelected - } - }, [e._v("清空")])]), n("a-table", { + }, [ n("a-table", { ref: "table", attrs: { size: "middle", @@ -29406,7 +29352,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -29425,7 +29371,7 @@ staticClass: "table-operator" }, [e.buttonSwitch.add ? n("a-button", { attrs: { - type: "primary", + type: "default", icon: "plus" }, on: { @@ -31710,7 +31656,7 @@ } }, [e._v("查询")]), n("a-button", { attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -37656,7 +37602,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -39018,7 +38964,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -43922,7 +43868,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -45162,7 +45108,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -45172,7 +45118,7 @@ staticClass: "table-operator" }, [n("a-button", { attrs: { - type: "primary", + type: "default", icon: "plus" }, on: { @@ -45200,26 +45146,7 @@ attrs: { type: "down" } - })], 1)], 1) : e._e()], 1), n("div", [n("div", { - staticClass: "ant-alert ant-alert-info", - staticStyle: { - "margin-bottom": "16px" - } - }, [n("i", { - staticClass: "anticon anticon-info-circle ant-alert-icon" - }), e._v("\n 已选择\n "), n("a", { - staticStyle: { - "font-weight": "600" - } - }, [e._v("\n " + e._s(e.selectedRowKeys.length) + "\n ")]), e._v("\n 项\n "), n( - "a", { - staticStyle: { - "margin-left": "24px" - }, - on: { - click: e.onClearSelected - } - }, [e._v("清空")])]), n("a-table", { + })], 1)], 1) : e._e()], 1), n("div", [ n("a-table", { ref: "table", attrs: { size: "middle", @@ -45472,6 +45399,7 @@ })) }, goPageOnline: function(e) { + debugger this.$router.push({ path: "/online/cgreport/" + e }) @@ -66840,7 +66768,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -66848,25 +66776,7 @@ } }, [e._v("重置")])], 1)])], 1)], 1)], 1), n("div", { staticClass: "table-operator" - }), n("div", [n("div", { - staticClass: "ant-alert ant-alert-info", - staticStyle: { - "margin-bottom": "16px" - } - }, [n("i", { - staticClass: "anticon anticon-info-circle ant-alert-icon" - }), e._v("\n 已选择\n "), n("a", { - staticStyle: { - "font-weight": "600" - } - }, [e._v(e._s(e.selectedRowKeys.length))]), e._v("\n 项\n "), n("a", { - staticStyle: { - "margin-left": "24px" - }, - on: { - click: e.onClearSelected - } - }, [e._v("清空")])]), n("a-table", { + }), n("div", [ n("a-table", { ref: "table", attrs: { size: "middle", @@ -67912,7 +67822,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -72474,7 +72384,7 @@ "margin-left": "8px" }, attrs: { - type: "primary", + type: "default", icon: "reload" }, on: { @@ -72495,7 +72405,7 @@ staticClass: "table-operator" }, [n("a-button", { attrs: { - type: "primary", + type: "default", icon: "plus" }, on: { @@ -72503,7 +72413,7 @@ } }, [e._v("新增")]), n("a-button", { attrs: { - type: "primary", + type: "default", icon: "highlight" }, on: { @@ -72511,7 +72421,7 @@ } }, [e._v("自定义按钮")]), n("a-button", { attrs: { - type: "primary", + type: "default", icon: "strikethrough" }, on: { @@ -72519,7 +72429,7 @@ } }, [e._v("JS增强")]), n("a-button", { attrs: { - type: "primary", + type: "default", icon: "filter" }, on: { @@ -72527,7 +72437,7 @@ } }, [e._v("SQL增强")]), n("a-button", { attrs: { - type: "primary", + type: "default", icon: "tool" }, on: { @@ -72535,7 +72445,7 @@ } }, [e._v("JAVA增强")]), n("a-button", { attrs: { - type: "primary", + type: "default", icon: "database" }, on: { @@ -72543,7 +72453,7 @@ } }, [e._v("导入数据库表")]), n("a-button", { attrs: { - type: "primary", + type: "default", icon: "database" }, on: { @@ -72567,25 +72477,7 @@ attrs: { type: "down" } - })], 1)], 1) : e._e()], 1), n("div", [n("div", { - staticClass: "ant-alert ant-alert-info", - staticStyle: { - "margin-bottom": "16px" - } - }, [n("i", { - staticClass: "anticon anticon-info-circle ant-alert-icon" - }), e._v("\n 已选择\n "), n("a", { - staticStyle: { - "font-weight": "600" - } - }, [e._v(e._s(e.selectedRowKeys.length))]), e._v("\n 项\n "), n("a", { - staticStyle: { - "margin-left": "24px" - }, - on: { - click: e.onClearSelected - } - }, [e._v("清空")])]), n("a-table", { + })], 1)], 1) : e._e()], 1), n("div", [ n("a-table", { ref: "table", attrs: { size: "middle", @@ -73084,6 +72976,7 @@ this.onlineUrlTitle = "", this.onlineUrlVisible = !1 }, handleOnlineUrlShow: function(e) { + "erp" === e.themeTemplate ? this.onlineUrl = "/online/cgformErpList/".concat(e.id) : "innerTable" === e.themeTemplate ? this.onlineUrl = "/online/cgformInnerTableList/".concat(e.id) : "tab" === e.themeTemplate ? this.onlineUrl = "/online/cgformTabList/".concat(e.id) : "Y" == e.isTree ? this.onlineUrl = "/online/cgformTreeList/".concat( 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 {