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

Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
李志鹏
2025-10-16 13:31:29 +08:00
parent ef6dd763ce 4e53a99c9d
commit 74ef116d79
5 changed files with 132 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/component/Account/message/system.vue
View File

@@ -133,8 +133,13 @@ export default defineComponent({
} }
.modal_title_text_intro{ .modal_title_text_intro{
margin-left: 4rem; margin-left: 4rem;
} }
} }
} }
.modal_title_text_intro{
word-break: break-word;
white-space: pre-wrap;
}
} }
</style> </style>

31
src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
View File

@@ -69,7 +69,7 @@
<div class="operate_item" @click="editAffiliate(record)">Edit</div> <div class="operate_item" @click="editAffiliate(record)">Edit</div>
</div> </div>
<div v-else-if="column?.openType" @click="openDetail(record,column?.openType)"> <div v-else-if="column?.openType" @click="openDetail(record,column?.openType)">
{{ text }} HDK {{ text }} HKD
</div> </div>
</template> </template>
</a-table> </a-table>
@@ -109,20 +109,26 @@ export default defineComponent({
key: "username", key: "username",
}, },
{ {
title: 'Create Time',
align: "center",
width: 200,
dataIndex: "createTime",
key: "createTime",
sorter: true,
},{
title: 'State', title: 'State',
align: "center", align: "center",
ellipsis: true, ellipsis: true,
width: 100, width: 100,
dataIndex: "status", dataIndex: "status",
key: "status", key: "status",
},{
title: 'Commission Percent',
align: "center",
ellipsis: true,
width: 100,
dataIndex: "commissionPercent",
key: "commissionPercent",
customRender: (record: any) => {
if(record.text){
return record.text+'%'
}else{
return '-'
}
},
},{ },{
title: 'Total income', title: 'Total income',
align: "center", align: "center",
@@ -154,6 +160,13 @@ export default defineComponent({
width: 250, width: 250,
dataIndex: "link", dataIndex: "link",
key: "link", key: "link",
},{
title: 'Create Time',
align: "center",
width: 200,
dataIndex: "createTime",
key: "createTime",
sorter: true,
},{ },{
title: 'Updata Time', title: 'Updata Time',
align: "center", align: "center",

182
src/component/Canvas/CanvasEditor/index.vue
View File

@@ -20,11 +20,10 @@ import { SelectionManager } from "./managers/selection/SelectionManager";
import { RedGreenModeManager } from "./managers/RedGreenModeManager"; import { RedGreenModeManager } from "./managers/RedGreenModeManager";
import texturePresetManager from "./managers/brushes/TexturePresetManager"; import texturePresetManager from "./managers/brushes/TexturePresetManager";
import { BrushStore } from "./store/BrushStore"; import { BrushStore } from "./store/BrushStore";
import cuowuImg from '@/assets/images/homePage/cuowu.svg' import cuowuImg from "@/assets/images/homePage/cuowu.svg";
import { Https } from "@/tool/https"; import { Https } from "@/tool/https";
import SelectImages from '@/component/common/SelectImages.vue' import SelectImages from "@/component/common/SelectImages.vue";
import { UrlToFile } from '@/tool/util' import { UrlToFile } from "@/tool/util";
// import { MinimapManager } from "./managers/minimap/MinimapManager"; // import { MinimapManager } from "./managers/minimap/MinimapManager";
@@ -105,14 +104,16 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, // 是否显示固定图层 default: false, // 是否显示固定图层
}, },
isGeneral: { // 从generalMiniCanvas来的 isGeneral: {
// 从generalMiniCanvas来的
type: Boolean, type: Boolean,
default:false default: false,
}, },
isEdit: { // 从design点击喜欢过的图片,再点击顶部的编辑图标 isEdit: {
// 从design点击喜欢过的图片,再点击顶部的编辑图标
type: Boolean, type: Boolean,
default: false default: false,
} },
}); });
// 引用和状态 // 引用和状态
@@ -269,7 +270,7 @@ onMounted(async () => {
layerManager, layerManager,
activeTool, // 响应式引用，存储当前选中的工具 activeTool, // 响应式引用，存储当前选中的工具
brushSize: brushSize.value, // 可选，初始画笔大小 brushSize: brushSize.value, // 可选，初始画笔大小
t, // 国际化函数 t, // 国际化函数
}); });
// 初始化文本编辑功能 // 初始化文本编辑功能
@@ -416,10 +417,9 @@ onMounted(async () => {
canvasManagerLoaded.value = true; canvasManagerLoaded.value = true;
// 添加删除按钮 // 添加删除按钮
// if(!fabric.Object.prototype.controls.deleteControl)addRemoveBtn(removeLayer) // if(!fabric.Object.prototype.controls.deleteControl)addRemoveBtn(removeLayer)
addRemoveBtn(removeLayer) addRemoveBtn(removeLayer);
// 触发组件初始化事件 // 触发组件初始化事件
nextTick(() => { nextTick(() => {
@@ -468,15 +468,15 @@ onMounted(async () => {
// 使用window的resize事件代替ResizeObserver // 使用window的resize事件代替ResizeObserver
// 只有当窗口大小变化时才更新画布尺寸 // 只有当窗口大小变化时才更新画布尺寸
// window.addEventListener("resize", handleWindowResize); // window.addEventListener("resize", handleWindowResize);
if(props.config.initZoom) { if (props.config.initZoom) {
const width = canvasManager.width; const width = canvasManager.width;
const height = canvasManager.height; const height = canvasManager.height;
const cwidth = props.config.width; const cwidth = props.config.width;
const cheight = props.config.height; const cheight = props.config.height;
let zoom = Math.min(1,width/cwidth,height/cheight); let zoom = Math.min(1, width / cwidth, height / cheight);
if(zoom < 1) zoom -= 0.05; if (zoom < 1) zoom -= 0.05;
setZoom(zoom); // 设置画布缩放 setZoom(zoom); // 设置画布缩放
} }
}); });
watchEffect(() => { watchEffect(() => {
@@ -518,7 +518,7 @@ onBeforeUnmount(() => {
liquifyManager = null; liquifyManager = null;
selectionManager = null; selectionManager = null;
redGreenModeManager = null; redGreenModeManager = null;
// fabric.Object.prototype.controls.deleteControl = undefined; // fabric.Object.prototype.controls.deleteControl = undefined;
// 移除window resize事件监听 // 移除window resize事件监听
// window.removeEventListener("resize", handleWindowResize); // window.removeEventListener("resize", handleWindowResize);
@@ -541,18 +541,17 @@ function handleWindowResize() {
function resetZoom() { function resetZoom() {
canvasManager.resetZoom(); canvasManager.resetZoom();
} }
function setZoom(zoom) { function setZoom(zoom) {
setTimeout(()=>{ setTimeout(() => {
if (!canvasManager) return; if (!canvasManager) return;
const newZoom = Math.max(zoom, 0.1); // 减少10%，最小0.1倍 const newZoom = Math.max(zoom, 0.1);
// 使用画布中心作为缩放点 // 使用画布中心作为缩放点
const centerPoint = { const centerPoint = {
x: canvasManager.canvas.width / 2, x: canvasManager.canvas.width / 2,
y: canvasManager.canvas.height / 2, y: canvasManager.canvas.height / 2,
}; };
canvasManager.animateZoom(centerPoint, newZoom); canvasManager.animateZoom(centerPoint, newZoom);
}) });
} }
function zoomIn() { function zoomIn() {
@@ -645,35 +644,36 @@ function moveLayerDown(layerId) {
layerManager.moveLayer(layerId, "down"); layerManager.moveLayer(layerId, "down");
} }
function addRemoveBtn(fun){//添加删除按钮 function addRemoveBtn(fun) {
const deleteIcon = cuowuImg //添加删除按钮
// 创建删除图片元素 const deleteIcon = cuowuImg;
let deleteImg = document.createElement('img') // 创建删除图片元素
deleteImg.src = deleteIcon let deleteImg = document.createElement("img");
function renderIcon(icon) { deleteImg.src = deleteIcon;
return function (ctx, left, top, styleOverride, fabricObject) { function renderIcon(icon) {
var size = this.cornerSize; return function (ctx, left, top, styleOverride, fabricObject) {
ctx.save(); var size = this.cornerSize;
ctx.translate(left, top); ctx.save();
ctx.rotate(fabric.util.degreesToRadians(fabricObject.angle)); ctx.translate(left, top);
ctx.drawImage(icon, -size/3, -size/3, size/1.5, size/1.5); ctx.rotate(fabric.util.degreesToRadians(fabricObject.angle));
ctx.restore(); ctx.drawImage(icon, -size / 3, -size / 3, size / 1.5, size / 1.5);
} ctx.restore();
} };
fabric.Object.prototype.controls.deleteControl = new fabric.Control({ }
x: 0.5, fabric.Object.prototype.controls.deleteControl = new fabric.Control({
y: -0.5, x: 0.5,
offsetY: -16, y: -0.5,
offsetX: 16, offsetY: -16,
cursorStyle: 'pointer', offsetX: 16,
mouseUpHandler:deleteFun, cursorStyle: "pointer",
render: renderIcon(deleteImg), mouseUpHandler: deleteFun,
cornerSize: 24 render: renderIcon(deleteImg),
}) cornerSize: 24,
});
} }
function deleteFun(){ function deleteFun() {
removeLayer(layerManager.activeLayerId.value) removeLayer(layerManager.activeLayerId.value);
} }
function removeLayer(layerId) { function removeLayer(layerId) {
@@ -748,14 +748,14 @@ function handleImageUpload(event) {
const selectImages = ref(null); const selectImages = ref(null);
const handleImageSelect = (data) => { const handleImageSelect = (data) => {
UrlToFile(data.url,data.name).then((file)=>{ UrlToFile(data.url, data.name).then((file) => {
handleImageUpload({ target: { files: [file] } }) handleImageUpload({ target: { files: [file] } });
}) });
} };
function triggerLibrary() { function triggerLibrary() {
// console.log('CanvasEditor', '打开收藏') // console.log('CanvasEditor', '打开收藏')
if (props.isGeneral || props.isEdit) { if (props.isGeneral || props.isEdit) {
selectImages.value.init() selectImages.value.init();
} else { } else {
emit("trigger-library"); emit("trigger-library");
} }
@@ -858,14 +858,14 @@ const changeCanvas = async (command) => {
...command, // 传递完整的命令数据 ...command, // 传递完整的命令数据
}; };
emit("changeCanvas", commandData); emit("changeCanvas", commandData);
if(command.canUndo || command.canRedo){ if (command.canUndo || command.canRedo) {
setTimeout(async ()=>{ setTimeout(async () => {
const imageData = await canvasManager.exportImage({ const imageData = await canvasManager.exportImage({
restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度 restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度
isCropByBg:true, isCropByBg: true,
}); });
emit("trigger-red-green-mouseup", imageData); emit("trigger-red-green-mouseup", imageData);
},100) }, 100);
} }
}; };
@@ -939,7 +939,7 @@ defineExpose({
layerId = "", // 导出具体图层ID layerId = "", // 导出具体图层ID
layerIdArray = [], // 导出多个图层ID数组 layerIdArray = [], // 导出多个图层ID数组
expPicType = "png", // 导出图片类型 JPG 或 PNG ,SVG expPicType = "png", // 导出图片类型 JPG 或 PNG ,SVG
isEnhanceImg, // 是否是增强图片 isEnhanceImg, // 是否是增强图片
} = {}) => { } = {}) => {
return canvasManager.exportImage({ return canvasManager.exportImage({
isContainBg, isContainBg,
@@ -948,7 +948,7 @@ defineExpose({
layerId, layerId,
layerIdArray, layerIdArray,
expPicType, expPicType,
isEnhanceImg, isEnhanceImg,
}); });
}, },
/** /**
@@ -1103,12 +1103,15 @@ defineExpose({
@undo-redo-status-changed="changeCanvas" @undo-redo-status-changed="changeCanvas"
@trigger-library="triggerLibrary" @trigger-library="triggerLibrary"
> >
<template #customToolsTop="{ toolTopProps }"> <template #customToolsTop="{ toolTopProps }">
<slot name="customToolsTop" :tool-button-props="toolTopProps" /> <slot name="customToolsTop" :tool-button-props="toolTopProps" />
</template> </template>
<!-- 扩展插槽 --> <!-- 扩展插槽 -->
<template #customToolsBottom="{ toolButtonProps }"> <template #customToolsBottom="{ toolButtonProps }">
<slot name="customToolsBottom" :tool-button-props="toolButtonProps" /> <slot
name="customToolsBottom"
:tool-button-props="toolButtonProps"
/>
</template> </template>
</ToolsSidebar> </ToolsSidebar>
</div> </div>
@@ -1131,14 +1134,14 @@ defineExpose({
<!-- 文本编辑面板 --> <!-- 文本编辑面板 -->
<TextEditorPanel <TextEditorPanel
v-if="canvasManagerLoaded && !enabledRedGreenMode" v-if="canvasManagerLoaded && !enabledRedGreenMode"
:canvas="canvasManager?.canvas" :canvas="canvasManager && canvasManager.canvas"
:commandManager="commandManager" :commandManager="commandManager"
/> />
<!-- 液化编辑面板 --> <!-- 液化编辑面板 -->
<LiquifyPanel <LiquifyPanel
v-if="canvasManagerLoaded && !enabledRedGreenMode" v-if="canvasManagerLoaded && !enabledRedGreenMode"
:canvas="canvasManager?.canvas" :canvas="canvasManager && canvasManager.canvas"
:commandManager="commandManager" :commandManager="commandManager"
:liquifyManager="liquifyManager" :liquifyManager="liquifyManager"
:layerManager="layerManager" :layerManager="layerManager"
@@ -1148,7 +1151,7 @@ defineExpose({
<!-- 选区面板 --> <!-- 选区面板 -->
<SelectionPanel <SelectionPanel
v-if="canvasManagerLoaded && !enabledRedGreenMode" v-if="canvasManagerLoaded && !enabledRedGreenMode"
:canvas="canvasManager?.canvas" :canvas="canvasManager && canvasManager.canvas"
:commandManager="commandManager" :commandManager="commandManager"
:selectionManager="selectionManager" :selectionManager="selectionManager"
:layerManager="layerManager" :layerManager="layerManager"
@@ -1224,12 +1227,12 @@ defineExpose({
@change="handleImageUpload" @change="handleImageUpload"
/> />
<SelectImages <SelectImages
ref="selectImages" ref="selectImages"
full-data full-data
radio radio
@select="handleImageSelect" @select="handleImageSelect"
:api="Https.httpUrls.queryLibraryPage" :api="Https.httpUrls.queryLibraryPage"
isLibrary isLibrary
/> />
</div> </div>
</template> </template>
@@ -1246,7 +1249,8 @@ defineExpose({
flex-direction: column; flex-direction: column;
/* height: 100vh; */ /* height: 100vh; */
background-color: #ffffff; background-color: #ffffff;
font-family: pingfang_medium, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; font-family: pingfang_medium, -apple-system, BlinkMacSystemFont, "Segoe UI",
sans-serif;
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;

13
src/component/home/design/index.vue
View File

@@ -1098,8 +1098,11 @@ export default defineComponent({
generateCourseItem.oldSort = generateCourseItem.sort generateCourseItem.oldSort = generateCourseItem.sort
generateCourseItem.sort = list[index]?.childList.length + 1 generateCourseItem.sort = list[index]?.childList.length + 1
if(data.status == 'add'){ if(data.status == 'add'){
if(str == 'noBatch')upDataSort(generateCourseItem,index,str) if(list[index]?.childList.filter((item:any)=>(item.id == generateCourseItem?.id)).length == 0){
list[index]?.childList.push(generateCourseItem) if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
// list[index]?.childList.push(generateCourseItem)
list[index]?.childList.push(generateCourseItem)
}
} }
}else{ }else{
let index = list.findIndex((item:any)=>(item.userLikeSortId == generateCourseItem.parentId)) let index = list.findIndex((item:any)=>(item.userLikeSortId == generateCourseItem.parentId))
@@ -1108,8 +1111,10 @@ export default defineComponent({
list[index].childList = [] list[index].childList = []
} }
if(data.status == 'add'){ if(data.status == 'add'){
if(str == 'noBatch')upDataSort(generateCourseItem,index,str) if(list[index]?.childList.filter((item:any)=>(item.id == generateCourseItem?.id)).length == 0){
list[index]?.childList.push(generateCourseItem) if(str == 'noBatch')upDataSort(generateCourseItem,index,str)
list[index]?.childList.push(generateCourseItem)
}
}else{ }else{
upDataSuccess(generateCourseItem) upDataSuccess(generateCourseItem)
// let childIndex = list[index].childList.findIndex((item:any)=>(item.id == generateCourseItem?.oldId || generateCourseItem?.id)) // let childIndex = list[index].childList.findIndex((item:any)=>(item.id == generateCourseItem?.oldId || generateCourseItem?.id))

2
src/component/home/design/tools.vue
View File

@@ -257,7 +257,7 @@ export default defineComponent({
{value:'disposeMoodboard',name:'Entirety Moodboard',nameCn:'整体情绪版'}, {value:'disposeMoodboard',name:'Entirety Moodboard',nameCn:'整体情绪版'},
{value:'moodboardFiles',name:'Moodboard',nameCn:'情绪版'}, {value:'moodboardFiles',name:'Moodboard',nameCn:'情绪版'},
{value:'printboardFiles',name:'Printboard',nameCn:'印花板'}, {value:'printboardFiles',name:'Printboard',nameCn:'印花板'},
{value:'sketchboardFiles',name:'Sketchboard',nameCn:'整体情绪版'}, {value:'sketchboardFiles',name:'Sketchboard',nameCn:'线稿版'},
] ]
allCollectionStr.forEach((itemStr:any)=>{ allCollectionStr.forEach((itemStr:any)=>{
let list = [] as any let list = [] as any