diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index 861c40dad7..07c3a56f68 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -150,6 +150,7 @@ export function taskList(spage, size, data) { return request({ url: '/dataset/group/isKettleRunning', method: 'post', + // eslint-disable-next-line no-undef loading: showLoading }) } diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 1908e14d82..96bae648b8 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -70,7 +70,7 @@ export default { return this.curComponent && this.config === this.curComponent }, curGap() { - return this.config.auxiliaryMatrix ? this.componentGap : 0 + return this.config.auxiliaryMatrix ? this.componentGap : 0 }, ...mapState([ 'mobileLayoutStatus', diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index a56ec4bd6c..f54f5ef3eb 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -471,6 +471,7 @@ function removeItem(index) { this.yourList.splice(index, 1, {}) } +// eslint-disable-next-line no-unused-vars function initPosition(_this) { _this.yourList.forEach(item => { checkItemPosition.call(_this, item, { @@ -501,6 +502,7 @@ function addItem(item, index) { // makeCoordinate.call(this, item); } +// eslint-disable-next-line no-unused-vars function changeToCoord(left, top, width, height) { return { x1: left, @@ -517,6 +519,7 @@ function changeToCoord(left, top, width, height) { * * @param {any} tCoord 比对对象的坐标 */ +// eslint-disable-next-line no-unused-vars function findClosetCoords(item, tCoord) { if (isOverlay) return let i = coordinates.length @@ -560,6 +563,7 @@ function findClosetCoords(item, tCoord) { * * @param {any} item */ +// eslint-disable-next-line no-unused-vars function makeCoordinate(item) { const width = this.cellWidth * (item.sizex) - this.baseMarginLeft const height = this.cellHeight * (item.sizey) - this.baseMarginTop @@ -750,7 +754,7 @@ function findBelowItems(item) { return _.sortBy(_.values(belowItems), 'y') } - +// eslint-disable-next-line no-unused-vars function getoPsitionBox() { return positionBox } @@ -1287,6 +1291,7 @@ export default { this.resizeStart.call(null, e, item, index) // e.preventDefault(); + // eslint-disable-next-line no-unused-vars const target = $(e.target) if (!this.infoBox) { diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 0e8ce60e93..7116db4ed1 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -283,24 +283,7 @@ export default { ] } }, - watch: { - innerOpacity: { - handler(oldVal, newVal) { - this.styleInfo['opacity'] = this.innerOpacity / 100 - } - }, - curComponent: { - handler(oldVal, newVal) { - this.$nextTick(() => { - this.init() - }) - // console.log('curComponent change') - } - } - }, - mounted() { - this.init() - }, + computed: { boardDivColor() { const style = { @@ -348,6 +331,25 @@ export default { ]) }, + watch: { + innerOpacity: { + handler(oldVal, newVal) { + this.styleInfo['opacity'] = this.innerOpacity / 100 + } + }, + curComponent: { + handler(oldVal, newVal) { + this.$nextTick(() => { + this.init() + }) + // console.log('curComponent change') + } + } + }, + mounted() { + this.init() + }, + methods: { init() { if (this.styleInfo['opacity']) { diff --git a/frontend/src/components/canvas/custom-component/DeVideo.vue b/frontend/src/components/canvas/custom-component/DeVideo.vue index 7e1b0aea74..3a31a25e44 100644 --- a/frontend/src/components/canvas/custom-component/DeVideo.vue +++ b/frontend/src/components/canvas/custom-component/DeVideo.vue @@ -1,6 +1,6 @@