diff --git a/.stylelintrc.js b/.stylelintrc.js index 0fb43e7d..31766a85 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -25,7 +25,9 @@ module.exports = { 'block-no-empty': true, 'block-opening-brace-newline-after': 'always', 'block-opening-brace-space-before': 'always', - 'declaration-block-no-duplicate-properties': true, + 'declaration-block-no-duplicate-properties': [true, { + ignoreProperties: ['overflow'], + }], 'declaration-block-semicolon-newline-after': 'always', 'declaration-block-trailing-semicolon': 'always', 'selector-pseudo-element-colon-notation': 'double', diff --git a/src/utils/clipboard.ts b/src/utils/clipboard.ts index 6dc1607f..df0e8b9f 100644 --- a/src/utils/clipboard.ts +++ b/src/utils/clipboard.ts @@ -29,12 +29,12 @@ export const copyText = (text: string) => { // 读取剪贴板 export const readClipboard = (): Promise => { return new Promise((resolve, reject) => { - if (navigator.clipboard) { + if (navigator.clipboard?.readText) { navigator.clipboard.readText().then(text => { if (!text) reject('剪贴板为空或者不包含文本') return resolve(text) }) } - else reject('浏览器不支持或禁止访问剪贴板') + else reject('浏览器不支持或禁止访问剪贴板,请使用快捷键 Ctrl + V') }) } \ No newline at end of file diff --git a/src/views/Editor/Canvas/GridLines.vue b/src/views/Editor/Canvas/GridLines.vue index d54fdb2a..3e80f36b 100644 --- a/src/views/Editor/Canvas/GridLines.vue +++ b/src/views/Editor/Canvas/GridLines.vue @@ -8,7 +8,6 @@ fill="none" :stroke="gridColor" stroke-width="0.3" - shape-rendering="crispEdges" stroke-dasharray="5" > @@ -52,10 +51,10 @@ export default defineComponent({ let path = '' for (let i = 0; i <= Math.floor(maxY / gridSize); i++) { - path += `M0 ${i * gridSize}, L${maxX} ${i * gridSize}` + path += `M0 ${i * gridSize} L${maxX} ${i * gridSize} ` } for (let i = 0; i <= Math.floor(maxX / gridSize); i++) { - path += `M${i * gridSize} 0, L${i * gridSize} ${maxY}` + path += `M${i * gridSize} 0 L${i * gridSize} ${maxY} ` } return path } diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue index 5783d402..d083af4e 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/ChartDataEditor.vue @@ -217,6 +217,7 @@ export default defineComponent({ .editor-content { width: 100%; height: 360px; + overflow: auto; overflow: overlay; position: relative; border-right: 1px solid #ccc; diff --git a/src/views/Editor/Toolbar/index.vue b/src/views/Editor/Toolbar/index.vue index 8f325af4..5b66e95c 100644 --- a/src/views/Editor/Toolbar/index.vue +++ b/src/views/Editor/Toolbar/index.vue @@ -122,6 +122,7 @@ export default defineComponent({ .content { padding: 12px; font-size: 13px; + overflow: auto; overflow: overlay; } \ No newline at end of file diff --git a/src/views/Screen/SlideThumbnails.vue b/src/views/Screen/SlideThumbnails.vue index ce1e92b3..7a0ca1ab 100644 --- a/src/views/Screen/SlideThumbnails.vue +++ b/src/views/Screen/SlideThumbnails.vue @@ -79,6 +79,7 @@ export default defineComponent({ display: flex; flex-wrap: wrap; align-content: flex-start; + overflow: auto; overflow: overlay; .thumbnail { diff --git a/src/views/components/element/ImageElement/index.vue b/src/views/components/element/ImageElement/index.vue index b1548960..8d0d5084 100644 --- a/src/views/components/element/ImageElement/index.vue +++ b/src/views/components/element/ImageElement/index.vue @@ -44,6 +44,7 @@ height: imgPosition.height, filter: filter, }" + @dragstart.prevent alt="" />