Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

This commit is contained in:
2026-04-16 17:31:33 +08:00
5 changed files with 30 additions and 14 deletions

View File

@@ -1251,8 +1251,8 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
border-color: #000 !important; border-color: #000 !important;
} }
.ant-spin .ant-spin-dot { .ant-spin .ant-spin-dot {
width: 1.5em; width: 4.5rem;
height: 1.5em; height: 4.5rem;
} }
.ant-spin-dot-item { .ant-spin-dot-item {
background-color: #000000 !important; background-color: #000000 !important;
@@ -2470,6 +2470,22 @@ textarea:focus {
opacity: 0.8; opacity: 0.8;
border-radius: 0.7rem; border-radius: 0.7rem;
} }
.mini-scrollbar::-webkit-scrollbar {
width: 0.4rem;
}
.mini-scrollbar::-webkit-scrollbar-thumb {
border-radius: 0.4rem;
background: rgba(0, 0, 0, 0.2);
}
.mosaic-bg {
--mosaic-bg-size: 1rem;
--mosaic-bg-color1: #efefef;
--mosaic-bg-color2: #fff;
background-image: repeating-conic-gradient(var(--mosaic-bg-color1) 0% 25%, var(--mosaic-bg-color2) 0% 50%);
background-repeat: repeat;
background-position: 50% 50%;
background-size: var(--mosaic-bg-size) var(--mosaic-bg-size);
}
.mark_loading { .mark_loading {
position: fixed; position: fixed;
width: 100%; width: 100%;

View File

@@ -1379,8 +1379,8 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
} }
//loding样式 //loding样式
.ant-spin .ant-spin-dot{ .ant-spin .ant-spin-dot{
width: 1.5em; width: 4.5rem;
height: 1.5em; height: 4.5rem;
} }
.ant-spin-dot-item{ .ant-spin-dot-item{
background-color: #000000 !important; background-color: #000000 !important;

View File

@@ -233,10 +233,10 @@ export default defineComponent({
let sketchH = editPrintElementData.sketchWH.height * editPrintElementData.sketchWH.scale[1] let sketchH = editPrintElementData.sketchWH.height * editPrintElementData.sketchWH.scale[1]
let x = sketchW / 2 - (sketchW * (width / editPrintElementData.sketchWH.width)/2) let x = sketchW / 2 - (sketchW * (width / editPrintElementData.sketchWH.width)/2)
let y = sketchH / 2 -(sketchH * height/2) let y = sketchH / 2 -(sketchH * height/2)
if(editPrintElementData.stateOverallSingle !== 'single'){ // if(editPrintElementData.stateOverallSingle !== 'single'){
x = sketchW / 2 // x = sketchW / 2
y = sketchH / 2 // y = sketchH / 2
} // }
let location = [x,y] let location = [x,y]
resolve({scale,location}) resolve({scale,location})
} }

View File

@@ -245,7 +245,7 @@ const { showDrafts } = toRefs(data);
v-bind="config" v-bind="config"
:group="{ :group="{
name: 'sortable', name: 'sortable',
pull: true, pull: false,
put: true put: true
}" }"
> >

View File

@@ -20,8 +20,8 @@ const fun = ref(null)
let deleteDraftsRef = ref(null) let deleteDraftsRef = ref(null)
const open = (fun)=>{ const open = (deleteFun)=>{
fun.value = fun fun.value = deleteFun
emit('update:visible', true) emit('update:visible', true)
} }