diff --git a/src/assets/style/style.css b/src/assets/style/style.css index a2af9c91..e345e798 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1689,7 +1689,6 @@ textarea:focus { z-index: 2; display: flex; align-items: center; - position: sticky; padding-bottom: calc(2rem*1.2); background: #fff; top: 0; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index c7589b62..2fe437c3 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1827,7 +1827,6 @@ textarea:focus{ z-index: 2; display: flex; align-items: center; - position: sticky; padding-bottom: calc(2rem*1.2); background: #fff; top: 0; diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index d040fa27..504eae6c 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -1266,7 +1266,7 @@ export default defineComponent({ ] let oldOperation = '' let canvasKeyDown = (event) => { - let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote'] + let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote','MetaLeft'] if(keys.indexOf(event.code) > -1){ event.preventDefault(); } diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index 03ad4c89..278db7be 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -914,6 +914,9 @@ methods: { .productImg_left{ width: 25%; position: relative; + display: flex; + height: 100%; + flex-direction: column; .Guide_1_32{ height: 100%; overflow-y: auto; @@ -976,9 +979,7 @@ methods: { } } .productImg_content_item_generate_btn{ - position: absolute; - bottom: 0; - top: auto; + margin-top: auto; width: 100%; justify-content: space-around; .input_box{ diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index f04895bb..2c7befac 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -537,6 +537,9 @@ export default defineComponent({ z-index: 9; .productImg_left{ width: 100%; + display: flex; + height: 100%; + flex-direction: column; .input_box_btnBox{ width: 100%; } @@ -544,7 +547,7 @@ export default defineComponent({ justify-content: flex-end; } .productImg_content_item_generate_btn{ - transform: translateY(100%); + // transform: translateY(100%); position: absolute; bottom: 0; top: auto;