diff --git a/components.d.ts b/components.d.ts index 08f545eb..fb059677 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,8 +9,10 @@ export {} declare module 'vue' { export interface GlobalComponents { ABadge: typeof import('ant-design-vue/es')['Badge'] + ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider'] + ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADrawer: typeof import('ant-design-vue/es')['Drawer'] ADropdown: typeof import('ant-design-vue/es')['Dropdown'] AImage: typeof import('ant-design-vue/es')['Image'] @@ -18,17 +20,21 @@ declare module 'vue' { AMenu: typeof import('ant-design-vue/es')['Menu'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AModal: typeof import('ant-design-vue/es')['Modal'] + APagination: typeof import('ant-design-vue/es')['Pagination'] APopover: typeof import('ant-design-vue/es')['Popover'] ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] ASlider: typeof import('ant-design-vue/es')['Slider'] + ASpace: typeof import('ant-design-vue/es')['Space'] ASpin: typeof import('ant-design-vue/es')['Spin'] + ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] ASwitch: typeof import('ant-design-vue/es')['Switch'] ATable: typeof import('ant-design-vue/es')['Table'] ATabPane: typeof import('ant-design-vue/es')['TabPane'] ATabs: typeof import('ant-design-vue/es')['Tabs'] AUpload: typeof import('ant-design-vue/es')['Upload'] + ElCascader: typeof import('element-plus/es')['ElCascader'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] } diff --git a/src/component/Canvas/ExistsImageList/index.vue b/src/component/Canvas/ExistsImageList/index.vue index 31c654a4..d1aaab6c 100644 --- a/src/component/Canvas/ExistsImageList/index.vue +++ b/src/component/Canvas/ExistsImageList/index.vue @@ -179,8 +179,8 @@ const handleImageError = (event) => { //提交选中的T图片 const confirm = ()=>{ - selectList.value = [] emits("select", selectList.value); + selectList.value = [] showPanel.value = false; } diff --git a/src/component/Canvas/canvasExample.vue b/src/component/Canvas/canvasExample.vue index fe69e875..d67bdd41 100644 --- a/src/component/Canvas/canvasExample.vue +++ b/src/component/Canvas/canvasExample.vue @@ -52,6 +52,7 @@ const imageData = [ const handleImageSelect = (selectedImage) => { console.log("选中的图片:", selectedImage); + console.log(selectedImage) // selectedImage 包含:url, name, categoryName, categoryType, originalItem }; diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index fa6f9d3f..897ff9fe 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -158,6 +158,7 @@ export default defineComponent({ isUndividedLayerWithSinglePrint:false, }) + provide('getCanvasIfEdit',detailData.getCanvasIfEdit) provide('singleOveral',detailData.singleOveral) provide('isEditPattern',detailData.isEditPattern) @@ -323,15 +324,14 @@ export default defineComponent({ detailData.selectDetail.maskUrl = '' detailData.selectDetail.maskMinioUrl = '' } - console.log(list[i]) let data:any = { changed:false, color, designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.designType:list[i].designType, id:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.id:list[i].id, - maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl, + maskMinioUrl:((newData && detailData.currentDetailType == 'sketch') || list[i].sketchString)?'':list[i]?.maskMinioUrl, // maskUrl:'', - maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl, + maskUrl:((newData && detailData.currentDetailType == 'sketch') || list[i].sketchString)?'':list[i]?.maskUrl, // offset:[ // -233.13985, // 406.90964