diff --git a/.gitignore b/.gitignore index f0e3fe4..3496be6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules /dist config.json +/.vite screenshot/node_modules/ screenshot/dist/ diff --git a/src/assets/styles/main.less b/src/assets/styles/main.less index 96f5033..3296d29 100644 --- a/src/assets/styles/main.less +++ b/src/assets/styles/main.less @@ -26,9 +26,14 @@ body { border-style: solid; border-color: #e5e7eb; // font-size: 14px; - scrollbar-width: none; /* 火狐滚动条无法自定义宽度,只能通过此属性使滚动条宽度变细 */ + // scrollbar-width: none; /* 火狐滚动条无法自定义宽度,只能通过此属性使滚动条宽度变细 */ -ms-overflow-style: none; /* 隐藏滚动条(在IE和Edge两个浏览器中很难更改样式,固采取隐藏方式) */ } +@-moz-document url-prefix() { + * { + scrollbar-width: none; + } +} // html ::-webkit-scrollbar { // display: none; /* Chrome Safari */ // } @@ -40,12 +45,13 @@ body { } &::-webkit-scrollbar-thumb { border-radius: 3px; - background-color: #ccd4de; + background-color: #d9dcdf; + cursor: pointer; // box-shadow: 0 0 1px hsl(0deg 0% 100% / 50%); } &::-webkit-scrollbar-track { - background-color: #f0f1f3; - // background-color: transparent; + // background-color: #f0f1f3; + background-color: transparent; // border-radius: 3px; } @@ -129,6 +135,7 @@ p { position: fixed; z-index: 99999; pointer-events: none; + opacity: .9; } .hide { opacity: 0 !important; diff --git a/src/common/methods/DesignFeatures/setWidgetData.ts b/src/common/methods/DesignFeatures/setWidgetData.ts index 2a74872..8c7e69d 100644 --- a/src/common/methods/DesignFeatures/setWidgetData.ts +++ b/src/common/methods/DesignFeatures/setWidgetData.ts @@ -2,8 +2,8 @@ * @Author: ShawnPhang * @Date: 2022-02-22 15:06:14 * @Description: 设置元素时根据类型处理 - * @LastEditors: ShawnPhang - * @LastEditTime: 2023-07-03 10:10:53 + * @LastEditors: ShawnPhang + * @LastEditTime: 2024-03-22 16:00:17 */ // import store from '@/store' // import { getImage } from '../getImgDetail' @@ -31,7 +31,6 @@ export default async function(type: string, item: TCommonItemData, data: Record< setting.width = img.width setting.height = img.height // parseInt(100 / item.value.ratio, 10) setting.imgUrl = item.value.url - console.log("setting", setting) } if (type === 'mask') { setting.mask = item.value.url diff --git a/src/components/business/moveable/Moveable.vue b/src/components/business/moveable/Moveable.vue index a87b12d..0a80932 100644 --- a/src/components/business/moveable/Moveable.vue +++ b/src/components/business/moveable/Moveable.vue @@ -364,10 +364,13 @@ export default defineComponent({ if (this.resizeTempData) { this.$store.commit('resize', this.resizeTempData) this.resizeTempData = null - setTimeout(async () => { - await this.$nextTick() - this.moveable.updateRect() - }, 10) + // await this.$nextTick() + this.moveable.updateRect() + // 临时处理缩放后细线问题 + this.$store.commit('setShowMoveable', false) + setTimeout(() => { + this.$store.commit('setShowMoveable', true) + }, 10); } try { if (this.dActiveElement.type === 'w-text') { diff --git a/src/components/modules/layout/designBoard/index.vue b/src/components/modules/layout/designBoard/index.vue index 749e6c3..e04dd91 100644 --- a/src/components/modules/layout/designBoard/index.vue +++ b/src/components/modules/layout/designBoard/index.vue @@ -1,61 +1,61 @@ @@ -333,13 +333,17 @@ function getChilds(uuid: string) {