aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/StableVersion' into dev_vite

Browse Source
This commit is contained in:
X1627315083
2025-11-17 17:16:49 +08:00
parent 39152ab910 bb9ee415e4
commit 61c49d99cd
4 changed files with 977 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/component/Canvas/CanvasEditor/fabric-canvas-events.text Normal file
View File

@@ -0,0 +1,23 @@
1. 初始化事件
object:added：当新对象被添加到画布上时触发。
object:removed：当对象从画布上移除时触发。
selection:created：当选择对象时触发。
selection:updated：当选择的对象被更新时触发。
selection:cleared：当所有对象都被取消选择时触发。
2. 鼠标事件
mouse:down：鼠标按下时触发。
mouse:move：鼠标移动时触发。
mouse:up：鼠标释放时触发。
mouse:over：鼠标移到画布上时触发。
mouse:out：鼠标移出画布时触发。
mouse:wheel：鼠标滚轮滚动时触发。
3. 触摸事件（在触摸屏设备上）
touch:start：触摸开始时触发。
touch:move：触摸移动时触发。
touch:end：触摸结束时触发。
4. 键盘事件
key:down：键盘按键按下时触发。
key:up：键盘按键释放时触发。

3
src/component/Detail/detailLeft/module/currentList.vue
View File

@@ -57,7 +57,8 @@ export default defineComponent({
const getDetailListData = reactive({ const getDetailListData = reactive({
}) })
const selectImgItem = (file:any)=>{ const selectImgItem = (data:any)=>{
let file = JSON.parse(JSON.stringify(data))
if(props.type != 'models'){ if(props.type != 'models'){
if(!file.resData?.minIOPath){ if(!file.resData?.minIOPath){
file.minIOPath = getMinioUrl(file?.imgUrl || file?.resData?.url) file.minIOPath = getMinioUrl(file?.imgUrl || file?.resData?.url)

33
src/component/HomePage/renew.vue
View File

@@ -265,17 +265,17 @@
@completePayment="cancelDsign" @completePayment="cancelDsign"
type="renew" type="renew"
></payMethod> ></payMethod>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, computed, reactive, toRefs, onMounted, onBeforeUnmount } from "vue"; import { defineComponent, computed, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import payMethod from "@/component/Pay/payMethod.vue"; import payMethod from "@/component/Pay/payMethod.vue";
import { useStore } from "vuex"; import { useStore } from "vuex";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { Https } from "@/tool/https"; import { Https } from "@/tool/https";
import md5 from "md5"; import md5 from "md5";
export default defineComponent({ export default defineComponent({
components: { components: {
payMethod, payMethod,
}, },
@@ -547,10 +547,10 @@ export default defineComponent({
window.open(url); window.open(url);
}, },
}, },
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.renew { .renew {
:deep(.ant-modal-body) { :deep(.ant-modal-body) {
padding: 0; padding: 0;
} }
@@ -958,5 +958,6 @@ export default defineComponent({
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
} }
} }
} }
</style> </style>

2
src/component/WorksPage/newScaleImage.vue
View File

@@ -452,7 +452,7 @@ export default defineComponent({
return message.info(t('newScaleImage.jsContent2')) return message.info(t('newScaleImage.jsContent2'))
} }
let id = await getWorks(imgData.scaleImageData.id) let id = await getWorks(imgData.scaleImageData.id)
router.push(`/home?history=${id}`) router.push(`/home/history/${id}`)
// router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}}) // router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}})
store.commit('setChooseIsDesign',false) store.commit('setChooseIsDesign',false)
// router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) // router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})