From 5d9dc7b77d63c36cd9b386c7989fac86fa8e1cb4 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 22 Nov 2024 09:20:25 +0800 Subject: [PATCH 01/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=98=E7=94=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 1 + public/js/aligning_guidelines.js | 2 +- public/js/fabric.brushes.js | 211 +- src/component/Canvas/argument.vue | 197 ++ src/component/Canvas/canvasContent.vue | 184 ++ src/component/Canvas/detail.vue | 305 +++ src/component/Canvas/index.vue | 187 ++ src/component/Canvas/test.vue | 48 + src/component/Canvas/tool.vue | 168 ++ src/component/Detail/editFrontBack.vue | 1 - src/component/Events/eventsDetail.vue | 1 + src/component/HomePage/ExportModel.vue | 5 - src/component/LoginPage/googleLogin.vue | 61 + .../LoginPage/verificationCodeInput.vue | 4 +- src/component/modules/liquefaction.vue | 16 +- src/tool/canvasDrawing.js | 46 +- src/tool/canvasGeneral.js | 1926 ++++++++++++++++- src/views/HomeView/HomeView.vue | 5 +- src/views/LoginPage.vue | 840 +++---- 19 files changed, 3643 insertions(+), 565 deletions(-) create mode 100644 src/component/Canvas/argument.vue create mode 100644 src/component/Canvas/canvasContent.vue create mode 100644 src/component/Canvas/detail.vue create mode 100644 src/component/Canvas/test.vue create mode 100644 src/component/Canvas/tool.vue create mode 100644 src/component/LoginPage/googleLogin.vue diff --git a/public/index.html b/public/index.html index 42d11a35..998cf12f 100644 --- a/public/index.html +++ b/public/index.html @@ -9,6 +9,7 @@ AiDA + diff --git a/public/js/aligning_guidelines.js b/public/js/aligning_guidelines.js index b21c56ce..5d38301e 100644 --- a/public/js/aligning_guidelines.js +++ b/public/js/aligning_guidelines.js @@ -4,7 +4,7 @@ * */ var ctx,canvasAligning -function initAligningGuidelines(canvas,bor) { +function initAligningGuidelines(canvas,bor){ ctx = canvas.getSelectionContext() canvasAligning = canvas setCanvasAligning(bor) diff --git a/public/js/fabric.brushes.js b/public/js/fabric.brushes.js index 51b3f331..e6ecf90c 100644 --- a/public/js/fabric.brushes.js +++ b/public/js/fabric.brushes.js @@ -126,6 +126,40 @@ fabric.Point.prototype.normalize = function(thickness) { * Convert a brush drawing on the upperCanvas to an image on the fabric canvas. * This makes the drawing editable, it can be moved, rotated, scaled, skewed etc. */ +fabric.BaseBrush.prototype.convertToPath = function() { + console.log(this.canvas.upperCanvasEl); + var pixelRatio = this.canvas.getRetinaScaling(), + c = fabric.util.copyCanvasElement(this.canvas.upperCanvasEl), + xy = fabric.util.trimCanvas(c), + path = this._points.map(arr => { + arr[1] = arr[1] / this.canvas.getZoom() + arr[2] = arr[2] / this.canvas.getZoom() + return arr.join(' ') + }).join(' '), + pathElemetn = new fabric.Path(path); + if(!xy){ + return + } + let pointerX = this.canvas.viewportTransform[4]; + let pointerY = this.canvas.viewportTransform[5]; + pathElemetn.set({ + strokeDashArray: [this._width*3, this._width*3], + strokeWidth: this._width, + stroke: 'black', + fill:'transparent', + }).setCoords(); + let group = new fabric.Group([pathElemetn],{ + left:((xy.x)/pixelRatio-pointerX)/this.canvas.getZoom(), + top:((xy.y)/pixelRatio-pointerY)/this.canvas.getZoom(), + custom:{ + dashed:true + } + }) + + this.canvas.add(group).clearContext(this.canvas.contextTop); + this.canvas.clearContext(this.canvas.contextTop); +} + fabric.BaseBrush.prototype.convertToImg = function() { var pixelRatio = this.canvas.getRetinaScaling(), c = fabric.util.copyCanvasElement(this.canvas.upperCanvasEl), @@ -135,8 +169,13 @@ fabric.BaseBrush.prototype.convertToImg = function() { return } let pointerX = this.canvas.viewportTransform[4]; - let pointerY = this.canvas.viewportTransform[5]; - img.set({left:(xy.x)/pixelRatio-pointerX,top:(xy.y)/pixelRatio-pointerY,'scaleX':1/pixelRatio,'scaleY':1/pixelRatio}).setCoords(); + let pointerY = this.canvas.viewportTransform[5]; + img.set({ + left:((xy.x)/pixelRatio-pointerX)/this.canvas.getZoom(), + top:((xy.y)/pixelRatio-pointerY)/this.canvas.getZoom(), + 'scaleX':1/pixelRatio/this.canvas.getZoom(), + 'scaleY':1/pixelRatio/this.canvas.getZoom() + }).setCoords(); this.canvas.add(img).clearContext(this.canvas.contextTop); this.canvas.clearContext(this.canvas.contextTop); } @@ -234,8 +273,8 @@ fabric.CrayonBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this.canvas.contextTop.globalAlpha = this.opacity; this._size = this.width / 2 + this._baseWidth; this._drawn = false; @@ -243,8 +282,8 @@ fabric.CrayonBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this.update(pointer); this.draw(this.canvas.contextTop); }, @@ -399,7 +438,6 @@ fabric.InkBrush = fabric.util.createClass(fabric.BaseBrush, { initialize: function(canvas, opt) { opt = opt || {}; - this.canvas = canvas; this.width = opt.width || this.width; this.color = opt.color || this.color; @@ -409,8 +447,8 @@ fabric.InkBrush = fabric.util.createClass(fabric.BaseBrush, { }, _render: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; var len, i, point = this.setPointer(pointer), subtractPoint = point.subtract(this._lastPoint), distance = point.distanceFrom(this._lastPoint), @@ -422,7 +460,7 @@ fabric.InkBrush = fabric.util.createClass(fabric.BaseBrush, { } if (distance > 30) { - // this.drawSplash(point, this._inkAmount); + this.drawSplash(point, this._inkAmount); } }, @@ -475,8 +513,8 @@ fabric.InkBrush = fabric.util.createClass(fabric.BaseBrush, { }, _resetTip: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; var len, i, point = this.setPointer(pointer); this._strokes = []; @@ -510,8 +548,8 @@ fabric.LongfurBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points = [pointer]; this._count = 0; @@ -524,8 +562,8 @@ fabric.LongfurBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points.push(pointer); var i, dx, dy, d, size, @@ -609,8 +647,8 @@ fabric.WritingBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = pointer; this.canvas.contextTop.strokeStyle = this.color; this.canvas.contextTop.lineWidth = this._lineWidth; @@ -619,8 +657,8 @@ fabric.WritingBrush = fabric.util.createClass(fabric.BaseBrush, { onMouseMove: function(pointer) { if (this.canvas._isCurrentlyDrawing) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._render(pointer); } }, @@ -680,8 +718,8 @@ fabric.MarkerBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = pointer; this.canvas.contextTop.strokeStyle = this.color; this.canvas.contextTop.lineWidth = this._lineWidth; @@ -690,8 +728,8 @@ fabric.MarkerBrush = fabric.util.createClass(fabric.BaseBrush, { onMouseMove: function(pointer) { if (this.canvas._isCurrentlyDrawing) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._render(pointer); } }, @@ -702,6 +740,67 @@ fabric.MarkerBrush = fabric.util.createClass(fabric.BaseBrush, { this.convertToImg(); } }); // End MarkerBrush +/** + * test + * Based on code by Tennison Chan. + */ +fabric.Test = fabric.util.createClass(fabric.BaseBrush, { + color: '#000', + opacity: 1, + + _points: [], + + _width: 2, + initialize: function(canvas, opt) { + opt = opt || {}; + this.canvas = canvas; + this._width = opt._width || this._width; + this.color = opt.color || this.color; + + }, + + _render: function(pointer) { + + var ctx, lineWidthDiff, i, len; + ctx = this.canvas.contextTop; + + this._points.push(['L', pointer.x, pointer.y]); + + // if(this._points.length % 10 < 5){ + let points = this._points + ctx.beginPath(); + ctx.moveTo(points[points.length - 2][1], points[points.length - 2][2]); + ctx.lineTo(points[points.length - 1][1], points[points.length - 1][2]); + ctx.stroke(); + // } + }, + + onMouseDown: function(pointer) { + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; + this._points = [] + this._points.push(['M', pointer.x, pointer.y]); + + var ctx = this.canvas.contextTop; + ctx.strokeStyle = 'rgba(' + 0 + ',' + 0 + ',' + 0 + ',' + 1 + ')'; + ctx.lineWidth = this._width * this.canvas.getZoom(); + ctx.lineJoin = ctx.lineCap = 'round'; + }, + + onMouseMove: function(pointer) { + if (this.canvas._isCurrentlyDrawing) { + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; + this._render(pointer); + } + }, + + onMouseUp: function() { + this._points.push(['Z']); + this.convertToPath(); + } +}); // End test + /** * MarkerBrush * Based on code by Tennison Chan. @@ -756,8 +855,8 @@ fabric.MarkerBrush1 = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = pointer; this.canvas.contextTop.strokeStyle = this.color; this.canvas.contextTop.lineWidth = this._lineWidth; @@ -766,8 +865,8 @@ fabric.MarkerBrush1 = fabric.util.createClass(fabric.BaseBrush, { onMouseMove: function(pointer) { if (this.canvas._isCurrentlyDrawing) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._render(pointer); } }, @@ -833,8 +932,8 @@ fabric.PenBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = pointer; this.canvas.contextTop.lineWidth = this._lineWidth; this._size = this.width + this._baseWidth; @@ -842,8 +941,8 @@ fabric.PenBrush = fabric.util.createClass(fabric.BaseBrush, { onMouseMove: function(pointer) { if (this.canvas._isCurrentlyDrawing) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._render(pointer); } }, @@ -900,8 +999,8 @@ fabric.RibbonBrush = fabric.util.createClass(fabric.BaseBrush, { for (var i = 0; i < this._nrPainters; i++) { this._painters.push({ dx:this.canvas.width / 2, dy:this.canvas.height / 2, ax:0, ay:0, div:.1, ease:Math.random() * .2 + .6 }); } - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = pointer; //ctx.globalCompositeOperation = 'source-over'; @@ -918,8 +1017,8 @@ fabric.RibbonBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = pointer; }, @@ -954,8 +1053,8 @@ fabric.ShadedBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points = [pointer]; var ctx = this.canvas.contextTop, @@ -967,8 +1066,8 @@ fabric.ShadedBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points.push(pointer); var ctx = this.canvas.contextTop, @@ -1025,8 +1124,8 @@ fabric.SketchyBrush = fabric.util.createClass(fabric.BaseBrush, { onMouseDown: function(pointer) { this._count = 0; - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points = [pointer]; var ctx = this.canvas.contextTop, @@ -1037,8 +1136,8 @@ fabric.SketchyBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points.push(pointer); var i, dx, dy, d, factor = .3 * this.width, @@ -1124,8 +1223,8 @@ fabric.SpraypaintBrush = fabric.util.createClass(fabric.BaseBrush, { onMouseDown: function(pointer) { this.canvas.contextTop.globalAlpha = this.opacity; - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._point = new fabric.Point(pointer.x, pointer.y); this._lastPoint = this._point; @@ -1138,8 +1237,8 @@ fabric.SpraypaintBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = this._point; this._point = new fabric.Point(pointer.x, pointer.y); }, @@ -1214,8 +1313,8 @@ fabric.SquaresBrush = fabric.util.createClass(fabric.BaseBrush, { var ctx = this.canvas.contextTop, color = fabric.util.colorValues(this.color), bgColor = fabric.util.colorValues(this.bgColor); - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._lastPoint = pointer; this._drawn = false; @@ -1227,8 +1326,8 @@ fabric.SquaresBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; var ctx = this.canvas.contextTop, dx = pointer.x - this._lastPoint.x, dy = pointer.y - this._lastPoint.y, @@ -1281,16 +1380,16 @@ fabric.WebBrush = fabric.util.createClass(fabric.BaseBrush, { }, onMouseDown: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points = [pointer]; this._count = 0; this._colorValues = fabric.util.colorValues(this.color); }, onMouseMove: function(pointer) { - pointer.x = pointer.x + this.canvas.viewportTransform[4]; - pointer.y = pointer.y + this.canvas.viewportTransform[5]; + pointer.x = (pointer.x * this.canvas.getZoom()) + this.canvas.viewportTransform[4]; + pointer.y = (pointer.y * this.canvas.getZoom()) + this.canvas.viewportTransform[5]; this._points.push(pointer); var ctx = this.canvas.contextTop, diff --git a/src/component/Canvas/argument.vue b/src/component/Canvas/argument.vue new file mode 100644 index 00000000..d66f0359 --- /dev/null +++ b/src/component/Canvas/argument.vue @@ -0,0 +1,197 @@ + + + + + \ No newline at end of file diff --git a/src/component/Canvas/canvasContent.vue b/src/component/Canvas/canvasContent.vue new file mode 100644 index 00000000..28c5690f --- /dev/null +++ b/src/component/Canvas/canvasContent.vue @@ -0,0 +1,184 @@ + + + + + \ No newline at end of file diff --git a/src/component/Canvas/detail.vue b/src/component/Canvas/detail.vue new file mode 100644 index 00000000..5249260c --- /dev/null +++ b/src/component/Canvas/detail.vue @@ -0,0 +1,305 @@ + + + + + \ No newline at end of file diff --git a/src/component/Canvas/index.vue b/src/component/Canvas/index.vue index e69de29b..17f06653 100644 --- a/src/component/Canvas/index.vue +++ b/src/component/Canvas/index.vue @@ -0,0 +1,187 @@ + + + \ No newline at end of file diff --git a/src/component/Canvas/test.vue b/src/component/Canvas/test.vue new file mode 100644 index 00000000..e5de0018 --- /dev/null +++ b/src/component/Canvas/test.vue @@ -0,0 +1,48 @@ + + + + + \ No newline at end of file diff --git a/src/component/Canvas/tool.vue b/src/component/Canvas/tool.vue new file mode 100644 index 00000000..dd392ef0 --- /dev/null +++ b/src/component/Canvas/tool.vue @@ -0,0 +1,168 @@ + + + + + \ No newline at end of file diff --git a/src/component/Detail/editFrontBack.vue b/src/component/Detail/editFrontBack.vue index 74d00e92..dd04ce89 100644 --- a/src/component/Detail/editFrontBack.vue +++ b/src/component/Detail/editFrontBack.vue @@ -211,7 +211,6 @@ export default defineComponent({ } let setClone = ()=>{ - let canvasBox = document.querySelector(".editFrontBack_center .exportCanvasBox_center"); let oldCanvasDom = canvasBox.querySelector('.canvas-container') let oldCanvasDom1 = canvasBox.querySelector('canvas') diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue index 3f2b6c92..69751de6 100644 --- a/src/component/Events/eventsDetail.vue +++ b/src/component/Events/eventsDetail.vue @@ -77,6 +77,7 @@ export default defineComponent({ } let setBack = ()=>{ router.go(-1); + // router.push('/home/events') } let openButton = (data:any,index:number)=>{ if(filter.loadingShow[index]){ diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 21511b8a..e7f893af 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -711,11 +711,6 @@ export default defineComponent({ let heightScale = imgObj.height / height imgWidth = imgObj.width * heightScale } - // imgWidth = - - // (canvasWH.value.width - - // (likeDesign - 1) * 20) / - // likeDesign; } return imgWidth } diff --git a/src/component/LoginPage/googleLogin.vue b/src/component/LoginPage/googleLogin.vue new file mode 100644 index 00000000..9c276203 --- /dev/null +++ b/src/component/LoginPage/googleLogin.vue @@ -0,0 +1,61 @@ + + + diff --git a/src/component/LoginPage/verificationCodeInput.vue b/src/component/LoginPage/verificationCodeInput.vue index 4d8b92b7..c958cedb 100644 --- a/src/component/LoginPage/verificationCodeInput.vue +++ b/src/component/LoginPage/verificationCodeInput.vue @@ -42,8 +42,8 @@ export default defineComponent({ cIndex() { this.resetCaret(); }, - lastCode(val) { - if (val) { + lastCode(newVal,oldVal) { + if (newVal && newVal != oldVal) { this.$refs.input[this.ctSize - 1].blur(); this.sendCaptcha(); } diff --git a/src/component/modules/liquefaction.vue b/src/component/modules/liquefaction.vue index cf9aade6..73fda132 100644 --- a/src/component/modules/liquefaction.vue +++ b/src/component/modules/liquefaction.vue @@ -98,10 +98,16 @@ export default defineComponent({ canvasImgData.width = img.width canvasImgData.height = img.height let canvasBox = document.querySelector('.liquefaction .liquefaction_canvas_box') - let width = canvasBox.offsetHeight / img.height * img.width canvas = document.getElementById('c') + let scale = canvasBox.offsetWidth / img.width + let width = canvasBox.offsetWidth + let height = img.height * scale + if(height > canvasBox.offsetHeight){ + height = canvasBox.offsetHeight + width = img.width / img.height * height + } canvas.width = width - canvas.height = canvasBox.offsetHeight + canvas.height = height let optfor = false const context = canvas.getContext('2d'); context.drawImage(img, 1, 1, canvas.width, canvas.height); @@ -351,7 +357,11 @@ export default defineComponent({ text-align: center; // overflow-x: auto; position: relative; - overflow-y: hidden; + // overflow-y: hidden; + display: flex; + align-items: center; + overflow: hidden; + justify-content: center; } .liquefaction_parameter{ padding-top: 5rem; diff --git a/src/tool/canvasDrawing.js b/src/tool/canvasDrawing.js index 315ad983..7bec16a8 100644 --- a/src/tool/canvasDrawing.js +++ b/src/tool/canvasDrawing.js @@ -32,10 +32,15 @@ function JSchangeType(canvas, val) { } } //绘制直线 -function JScanvasMouseDown(str,e, width,patterning) {//创建线 +function JScanvasMouseDown(e, data) {//创建线 let downPoint = e.absolutePointer let currentPatterning - switch (str) { + let fill = data?.fill || 'rgba(0, 0, 0, 0.2)' + let radius = data?.radius || 5 + let width = data?.width || 0 + let selectable = data?.selectable + let strokeDashArray = data?.strokeDashArray || [0,0] + switch (data.str) { case 'rect': let top = Math.min(downPoint.y) let left = Math.min(downPoint.x) @@ -44,9 +49,13 @@ function JScanvasMouseDown(str,e, width,patterning) {//创建线 currentPatterning = new fabric.Rect({ top, left, - fill: 'rgba(0, 0, 0, 0.2)', - rx:5, - ry:5, + fill: fill, + stroke:'#000', + strokeWidth:width, + strokeDashArray:strokeDashArray, + rx:radius, + ry:radius, + selectable, }) break case 'line': @@ -55,7 +64,7 @@ function JScanvasMouseDown(str,e, width,patterning) {//创建线 downPoint.x, downPoint.y // 结束点坐标 ], { - stroke: 'rgba(0, 0, 0, 0.2)', // 笔触颜色 + stroke: fill, // 笔触颜色 strokeLineCap: 'round', strokeWidth:Number(width), } @@ -66,9 +75,9 @@ function JScanvasMouseDown(str,e, width,patterning) {//创建线 top: downPoint.y, left: downPoint.x, radius: 0, - fill: 'rgba(0, 0, 0, 0.2)', + fill: fill, // fill: 'transparent', - // stroke: 'rgba(0, 0, 0, 0.2)' + // stroke: fill }) break case 'triangle': @@ -77,9 +86,9 @@ function JScanvasMouseDown(str,e, width,patterning) {//创建线 left: downPoint.x, width: 0, height: 0, - fill: 'rgba(0, 0, 0, 0.2)', + fill: fill, // fill: 'transparent', - // stroke: 'rgba(0, 0, 0, 0.2)' + // stroke: fill }) break case 'ellipse': @@ -88,9 +97,9 @@ function JScanvasMouseDown(str,e, width,patterning) {//创建线 left: downPoint.x, rx: 0, ry: 0, - fill: 'rgba(0, 0, 0, 0.2)', + fill: fill, // fill: 'transparent', - // stroke: 'rgba(0, 0, 0, 0.2)' + // stroke: fill }) break case 'fold': @@ -99,7 +108,7 @@ function JScanvasMouseDown(str,e, width,patterning) {//创建线 { x: downPoint.x, y: downPoint.y } ],{ fill: 'transparent', - stroke: 'rgba(0, 0, 0, 0.2)', + stroke: fill, objectCaching: false, strokeWidth:Number(width), selection:false, @@ -269,14 +278,15 @@ async function JSSetTexture(src,){ }) return img } -function JSSetRemoveImage(fun){ +let JSSetRemoveImage = (fun)=>{ const deleteIcon = cuowuImg // 创建删除图片元素 + const cornerSize = 24 let deleteImg = document.createElement('img') deleteImg.src = deleteIcon - function renderIcon(icon) { - return function (ctx, left, top, styleOverride, fabricObject) { - var size = this.cornerSize; + let renderIcon = (icon) => { + return (ctx, left, top, styleOverride, fabricObject)=> { + var size = cornerSize; ctx.save(); ctx.translate(left, top); ctx.rotate(fabric.util.degreesToRadians(fabricObject.angle)); @@ -292,7 +302,7 @@ function JSSetRemoveImage(fun){ cursorStyle: 'pointer', mouseUpHandler:fun, render: renderIcon(deleteImg), - cornerSize: 24 + cornerSize: cornerSize }) } function JSSetGroup(data){ diff --git a/src/tool/canvasGeneral.js b/src/tool/canvasGeneral.js index aef7b8db..f74492af 100644 --- a/src/tool/canvasGeneral.js +++ b/src/tool/canvasGeneral.js @@ -8,19 +8,11 @@ import { JSSetTexture, JSSetRemoveImage, } from "@/tool/canvasDrawing"; -class myCanvas { +import { getMousePosition } from "@/tool/mdEvent"; +import { file } from "jszip"; +class MyCanvas { + canvas=null constructor() { - this.canvasDomParent = null; - this.canvas = null; - this.canvasDom = null; - this.pencilBtn = null; - this.pencilType = null; - this.keyDown = [];//键盘按下 - this._clipboard = null; //剪切板 - this.isLoadCanvas = false//撤回或者反撤回false为撤回 - this.reverseCanvasState=[];//撤回 - this.normalCanvasState=[];//反撤回 - this.canvasState = {}//当前内容 this.pencilList = { textFontFamilyList:[ { value: 'Arial', name: 'select font' }, @@ -69,60 +61,1702 @@ class myCanvas { url:'/image/brush/SpraypaintBrush.jpg' }, ] - } + this.canvasDomParent = null; + this.canvas = MyCanvas.canvas; + this.addPresent = {} + this.canvasWH={ + width:0, + height:0, + } + this.createPatterning = {//创建图形 + state:false, + content:null, + current:null, //临时图形 + polyLineBtn:null, + textDataShow:false, + } + this.mouse = { + point:null, + upPoint:null, + isMovePostion:false, + isDown:false, + lastPosX:0, + lastPosY:0, + } + this.keyboard={ + down:[] + } + this.pencilbtnStyle ={//笔触图形 + background:'', + width:0+'px', + height:0+'px', + display:'none', + left:0+'px', + top:0+'px', + } + this.layer = { + list:[], + selectLayer:{ + group:null, + id:-1, + }, + currentIndex:0, + } + this.liquefaction = { + img:null, + type:'', + dashed:null, + } + this.clipPath = { + isImg:false, + img:null, + clipGroup:null + } + this.dashed = { + state:false,//用来判断鼠标是否移入dashed 如果移入就变为可拖拽 + isDrawingMode:false,//用来获取移入前是否是绘画模式 + } + this.fontFamily = this.pencilList.textFontFamilyList[0].value + this.createText=null + this.pencilBtn = null; + this.pencilType = null; + this.canvasPencilColor = '#000000' + this.colorHistoryList = ['rgb(0, 0, 0)'] + + this.keyDown = [];//键盘按下 + this.oldOperation = '' + //笔触 + this.brushwork = { + value:'PencilBrush', + width:{}, + color:'#000000', + texture:0, + } + this.texture={ + value:0, + list:[], + } + for (let index = 0; index < 20; index++) { + this.texture.list.push({value:index,url:`/image/texture/texture${index}.webp`}) + } + + this._clipboard = null; //剪切板 + this.isLoadCanvas = false//撤回或者反撤回false为撤回 + this.reverseCanvasState=[];//撤回 + this.normalCanvasState=[];//反撤回 + this.canvasState = {}//当前内容 + this.operation = 'movePosition' + this.operationMode = 'fill' + this.setTimeOut = {//定时器 + color:null, + width:null, + colorHistory:null, + canvasWH:null, + updataLayer:null, + }//给切换颜色设置防抖 + } - canvasInit(dom, val) { - this.canvasDomParent = dom; + async canvasInit (dom, val){//初始化 this.canvasClear() + this.canvasWH = val + + this.canvasDomParent = dom; var canvasDom = document.createElement("canvas"); this.canvasDomParent.appendChild(canvasDom); - this.canvas = new fabric.Canvas(canvasDom, { - backgroundColor: "rgba(255, 255, 255)", - width: val.width?val.width:this.canvasDomParent.getBoundingClientRect().width, - height: val.height?val.height:this.canvasDomParent.getBoundingClientRect().height, + + MyCanvas.canvas = new fabric.Canvas(canvasDom, { + backgroundColor: "rgba(230, 230, 230)", + width: this.canvasWH.width, + height: this.canvasWH.height, isDrawingMode: val.isDrawingMode, // 开启绘图模式 selectionFullyContained: true, selectionKey:'ctrlKey', includeDefaultValues: false,//尚未测试 精简导出JSON + // freeDrawingCursor: 'none', + preserveObjectStacking:true, }); + // MyCanvas.canvas.freeDrawingCursor= 'none' + this.initCanvasWH('init') + fabric.Object.prototype.cornerSize = 10//选中后的操作按钮大小 + fabric.Object.prototype.transparentCorners = false //实心 if(!fabric.Object.prototype.controls.deleteControl){//设置元素删除 - JSSetRemoveImage(this.deleteObject) + JSSetRemoveImage(this.deleteObject.bind(this)) }else{ - fabric.Object.prototype.controls.deleteControl.mouseUpHandler = this.deleteObject + fabric.Object.prototype.controls.deleteControl.mouseUpHandler = this.deleteObject.bind(this) } - - this.canvas.on("object:modified", ()=>{ + MyCanvas.canvas.on("object:modified", (event)=>{ this.updateCanvasState('') + this.updataLayer() }); - this.canvasKeyDown = this.canvasKeyDown.bind(this); this.canvasKeyUp = this.canvasKeyUp.bind(this); + // let rect1 = new fabric.Rect({ + // left: 0, + // top: 0, + // width: 500, + // height: 500, + // fill: "red", + // }); + // MyCanvas.canvas.add(rect1) + // rect1.on('mouseover', function() { + // // rect1.set({ fill: 'green' }); // 鼠标移入时改变颜色为绿色 + // // canvas.renderAll(); // 重新渲染画布 + // }); + + // // 为矩形添加 mouseleave 事件 + // rect1.on('mouseout', function() { + // // rect1.set({ fill: 'blue' }); // 鼠标移出时恢复颜色为蓝色 + // // canvas.renderAll(); // 重新渲染画布 + // }); + // return + // rect1.filters.push(new fabric.Image.filters.Grayscale()) + // MyCanvas.canvas.add(rect1) + // // MyCanvas.canvas.add(rect1) + // let rect = new fabric.Rect({ + // left: 0, + // top: 0, + // width: MyCanvas.canvas.width, + // height: MyCanvas.canvas.height, + // inverted:true, + // fill: "red", + // }); + // // let rect2 = new fabric.Rect({ + // // width: MyCanvas.canvas.width, + // // height: MyCanvas.canvas.height, + // // fill:'#FFF' + // // }); + // // // MyCanvas.canvas.add(rect2) + // fabric.Image.fromURL('https://www.minio.aida.com.hk:12024/aida-collection-element/83/Moodboard/7a5fec0f-5a8c-4f1e-80c0-c4cda335d7c5.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20241112%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20241112T060752Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=25c5fa23dc447d1d06b4efeeec23454c797219df9c45d2cec231d0c8372754ce',(img)=>{ + // let scale = { + // X:MyCanvas.canvas.width/img.width, + // Y:MyCanvas.canvas.height/img.height + // } + // rect.set({ + // fill: new fabric.Pattern({ + // source: img.getElement(), // 传入图片元素 + // repeat: 'no-repeat' // 设置图片不重复 + // }), + // clipPath : rect1 + // }) + // img.set({ + // scaleX:scale.X, + // scaleY:scale.Y, + // left:0, + // top:0, + // }) + // MyCanvas.canvas.add(rect) + // },{ crossOrigin: "Anonymous" }) + // // // MyCanvas.canvas.add(rect1) + // // // rect1.clipPath = group + // // // MyCanvas.canvas.forEachObject((item) =>{ + // // // if(item.clipPath){ + // // // item.clipPath.add(rect2) + // // // // item.clipPath = group + // // // } + // // // }) + // return + + MyCanvas.canvas.on("mouse:move", this.setCanvasMove.bind(this)); + MyCanvas.canvas.on("mouse:down",this.setCanvasDown.bind(this)); + MyCanvas.canvas.on("mouse:up",this.setCanvasUp.bind(this)); + MyCanvas.canvas.on("mouse:wheel",this.setCanvasWheel.bind(this)); + //双击 + MyCanvas.canvas.on("mouse:dblclick", event=>{ + if(this.operation == 'fold'){ + this.foldEnd('Enter') + } + }); + document.addEventListener('mousemove', this.mouseMove.bind(this)); + document.addEventListener('touchmove', this.touchmove.bind(this)); document.addEventListener("keydown", this.canvasKeyDown); document.addEventListener("keyup", this.canvasKeyUp); - initAligningGuidelines(this.canvas,true) - JSchangeType(this.canvas,'init') - this.updateCanvasState('') - this.canvas.on("object:added", (event)=>{ - if(!this.isLoadCanvas)this.updateCanvasState('') + initAligningGuidelines(MyCanvas.canvas, true); + JSchangeType(MyCanvas.canvas,'init') + // await this.createBg() + await this.createLayer({str:'init'})//创建图层并且使用 + MyCanvas.canvas.on("object:added", (event)=>{ + this.addLayer(event) }); - return this.canvas + this.canvas = MyCanvas.canvas; + return MyCanvas.canvas } + initCanvasWH(str){ + let scale + if(this.canvasWH.width>this.canvasWH.height)scale = this.canvasDomParent.offsetWidth / this.canvasWH.width + if(this.canvasWH.width{ + if(obj.type != 'group' && !obj.isType('path')){ + obj.selectable = false + } + }); + }else if(['dashedPencil', 'dashed'].includes(str)){ + this.setGroupGrid('all') + MyCanvas.canvas.isDrawingMode = false + this.pencilbtnStyle.display = `none` + this.setCursor('crosshair') + MyCanvas.canvas.freeDrawingCursor = 'crosshair' + if(str == 'dashedPencil')this.setDashedPencil() + MyCanvas.canvas.forEachObject((obj) =>{ + if(obj.type != 'group' && !obj.isType('path')){ + obj.selectable = false + } + }); + }else if(str){ + this.pencilbtnStyle.display = `none` + this.setCursor('auto'); + MyCanvas.canvas.isDrawingMode = false + MyCanvas.canvas.forEachObject((obj) =>{ + if(obj.type != 'group' && !obj.isType('path')){ + obj.selectable = false + } + }); + } + if(str == 'dashed' || str == 'dashedPencil' || str != 'movePosition'){ + if(this.layer.selectLayer.group.custom.groupType == 'Grid')this.setGroupGrid('all') + this.clipPath = { + isImg:false, + clipGroup:null, + img:null, + } + } + } + setCursor(str){ + MyCanvas.canvas.defaultCursor = str; + MyCanvas.canvas.moveCursor = str; + MyCanvas.canvas.hoverCursor = str; + MyCanvas.canvas.upperCanvasEl.style.cursor = str; + } + setCanvasMove = (event)=>{ + + if(this.mouse.isMovePostion && this.operation == 'move') return this.setCanvasPosition(event) + if(MyCanvas.canvas.isDrawingMode){ + }else{ + let getActiveObject = MyCanvas.canvas.getActiveObject() + if( + !this.clipPath.isImg && + this.mouse.isDown && + getActiveObject && + getActiveObject.custom.dashed && + this.layer.selectLayer.group.custom?.groupType == 'Grid' && + this.operation == 'movePosition' && + getActiveObject._objects.length == 1 + ){ + this.setclipPathImg() + } + if(this.createPatterning.state){ + let str = this.operation + if(this.operation == 'dashed')str = 'rect' + JScanvasMouseMove(str,event,this.createPatterning.current,this.mouse.point,this.keyboard.down) + MyCanvas.canvas.requestRenderAll() + } + } + } + setCanvasPosition(event){ + const e = event; + const vpt = MyCanvas.canvas.viewportTransform; + + vpt[4] += e.pointer.x - this.mouse.lastPosX; // 更新水平偏移 + vpt[5] += e.pointer.y - this.mouse.lastPosY; // 更新垂直偏移 + + MyCanvas.canvas.requestRenderAll(); // 请求重绘画布 + this.mouse.lastPosX = e.pointer.x; + this.mouse.lastPosY = e.pointer.y; + } + // setRemoveDashed(){ + // MyCanvas.canvas.forEachObject((obj) =>{ + // if(obj.custom.dashed && obj._objects){ + // let rect = obj._objects.filter(item => item.type == 'rect')[0] + // obj.remove(rect) + // MyCanvas.canvas.renderAll(); + // } + // }); + // } + //设置再画布上按下 + setCanvasDown(event){ + if(event.target && event.target.custom?.dashed && ['dashedPencil', 'dashed'].includes(this.operation)){ + // if(MyCanvas.canvas.isDrawingMode){ + // MyCanvas.canvas.isDrawingMode = false; + // } + this.dashed.state = true + }else if(!event.target?.custom?.dashed){ + // if(['dashedPencil'].includes(this.operation)){ + // MyCanvas.canvas.isDrawingMode = true; + // } + this.dashed.state = false + } + let dashedGroup = MyCanvas.canvas.getObjects().filter(obj => obj.custom.dashed)[0]; + if(this.dashed.state && (this.operation == 'dashed' || this.operation == 'dashedPencil') && dashedGroup)return + if(!this.dashed.state && (this.operation == 'dashed' || this.operation == 'dashedPencil') && !event.target?.custom?.dashed && dashedGroup){ + MyCanvas.canvas.remove(dashedGroup) + } + if(this.operation == 'movePosition' && !event?.target?.custom?.dashed && this.layer.selectLayer.group.custom.groupType == 'Grid')this.setGroupGrid('all'); + + //设置移动端按下添加元素 + this.mouse.isDown = true + this.mouse.lastPosX = event.pointer.x; + this.mouse.lastPosY = event.pointer.y; + if(this.operation == 'move'){ + this.mouse.isMovePostion = true; + this.setCursor('grabbing'); + return + } + if(this.operation == 'zoomIn' || this.operation == 'zoomOut'){ + this.setCanvasZoom(event) + return + } + // this.setRemoveDashed() + if(this.addPresent.upScaleChecked){//创建元素 + this.present.upScaleChecked = false + this.present = {} + let pointerVpt = canvas.restorePointerVpt(event.pointer) + switch (currentType.value.type) { + case 'colorBoards': + let rect = setGroup(currentType.value.data) + setCanvasColor(pointerVpt.y, pointerVpt.x,rect) + break + default : + createImage(pointerVpt.y, pointerVpt.x,currentType.value.type) + break + } + // 创建完元素，把当前操作的元素类型设置回 null + currentType.value.type = null + currentType.value.data = null + } + this.mouse.point = event.absolutePointer + let arr = ['rect','line','circle','triangle','ellipse','fold','dashed'] + if(arr.indexOf(this.operation) > -1){ + JSchangeType(MyCanvas.canvas,this.operation) + this.createPatterning.state = true + MyCanvas.canvas.forEachObject((obj) =>{ + obj.set('selectable', false); // 禁用选中 + }); + if(this.createPatterning.current && this.operation == 'fold'){ + MyCanvas.canvas.skipTargetFind = false + this.createPatterning.current.points.push({ + x: this.mouse.point.x, + y: this.mouse.point.y + }) + }else{ + let width = this.brushwork.width[this.operation]?this.brushwork.width[this.operation]:20 + let data = { + str:this.operation, + width, + selectable:true, + } + if(this.operation == 'dashed'){ + width = 1 / MyCanvas.canvas.getZoom() + data = { + fill:'transparent', + strokeDashArray: [width*3, width*3], + width, + radius:0, + str:'rect', + selectable:true, + } + }else if(this.operation == 'rect'){ + data.width = 0 + } + this.createPatterning.current = JScanvasMouseDown(event,data) + if(this.operation == 'dashed')this.createPatterning.current.set({custom:{dashed:true}}) + MyCanvas.canvas.add(this.createPatterning.current) + if(this.operation == 'fold'){ + this.createPatterning.polyLineBtn = JScreateCheck(event) + this.createPatterning.polyLineBtn.on('mousedown',this.foldEnd.bind(this)) + MyCanvas.canvas.add(this.createPatterning.polyLineBtn) + } + } + }else{ + // var clickedObject = event.target; + // if (clickedObject instanceof fabric.Textbox && this.operation != 'text') { + // this.createPatterning.textDataShow = true + // this.createText = clickedObject + // console.log(1); + // }else{ + // console.log(2); + // this.createPatterning.textDataShow = false + // this.createText = {} + // } + // this.createPatterning.state = false + } + } + setTextData(obj){ + this.fontFamily = obj.fontFamily + this.brushwork.width['text'] = obj.fontSize + this.brushwork.color = obj.fill + } + async setCanvasUp(event){ + this.mouse.isDown = false + if(this.mouse.isMovePostion){ + this.mouse.isMovePostion = false + this.setCursor('grab'); + return + } + if(this.operation == 'eraser')return this.updataLayer() + this.mouse.upPoint = event.absolutePointer + if(MyCanvas.canvas.isDrawingMode){ + setTimeout(() => { + // pencilbtnStyle.value.display = `none` + this.updateCanvasState() + }, 100); + }else{ + // event.target && (event.target.bringToFront())//设置优先级 + } + if(this.createPatterning.state){ + switch (this.operation) { + case 'line': + this.createPatterning.current.set({stroke: this.brushwork.color}) + break + case 'fold': + // this.createPatterning.current.set({stroke: this.brushwork.color}) + break + default : + if(JSON.stringify(this.mouse.point) == JSON.stringify(this.mouse.upPoint)){ + MyCanvas.canvas.remove(this.createPatterning.current) + return + } + if(this.operation == 'dashed'){ + + this.createPatterning.current.set({fill: 'transparent'}) + }else if(this.operationMode == 'fill'){ + this.createPatterning.current.set({fill: this.brushwork.color}) + }else if (this.operationMode == 'border'){ + this.createPatterning.current.set({fill: 'transparent',stroke: this.brushwork.color,strokeWidth: this.brushwork.width[this.operation]?this.brushwork.width[this.operation]:20}) + } + break + } + if(this.operation == 'fold'){ + MyCanvas.canvas.forEachObject((obj) =>{ + if(this.isSelectable(obj)){ + obj.selectable = true + }else{ + obj.selectable = false + } + }); + MyCanvas.canvas.bringToFront(this.createPatterning.polyLineBtn);//设置优先级最高 + }else if(this.operation){ + this.createPatterning.state = false + MyCanvas.canvas.renderAll(); + if(this.operation == 'dashed'){ + await this.setDashed(this.createPatterning.current) + }else{ + this.addLayer({target:this.createPatterning.current}) + this.setOperation('movePosition') + } + this.clearPatterning()//临时图形置为空并且添加撤回对象里面 + } + } + } + + async setclipPathImg(){//裁剪图片 + if(!this.clipPath.clipGroup)return + this.clipPath.isImg = true + + let clipPathElement = this.clipPath.clipGroup._objects.filter(obj => obj.type != 'image')[0] + let imgBG = MyCanvas.canvas.getObjects().filter(obj => obj.custom.isSelectable && obj.type == 'rect')[0]; + let position = { + left:this.clipPath.clipGroup?.left - (imgBG.left?imgBG.left:0), + top:this.clipPath.clipGroup?.top - (imgBG.top?imgBG.top:0), + width:this.clipPath.clipGroup?.width, + height:this.clipPath.clipGroup?.height, + } + // await this.setGroupGrid() + //添加裁剪后的图片 + let elements = MyCanvas.canvas.getObjects().filter(obj => this.isAddToLayer(obj)); + let imgData = await this.groupToImg(elements,position,'clipPath') + let img = await this.createImage({minioUrl:imgData}) + img.set({ + scaleX:1, + scaleY:1, + left:0 - position.width/2, + top:0 - position.height/2, + }) + img.clipPath = clipPathElement + this.clipPath.clipGroup.insertAt(img) + //裁剪 + this.layer.selectLayer.group.custom.groupType = 'Grid' + clipPathElement.clone(cloned=>{ + cloned.set({left:position.left,top:position.top,strokeWidth:0}) + if(imgBG?.custom?.state != 'success')this.setClipPath(imgBG,cloned) + }) + } + setDashedPencil(){ + MyCanvas.canvas.isDrawingMode = true + let pencil = new fabric.Test(MyCanvas.canvas,{}); //普通笔 + MyCanvas.canvas.freeDrawingBrush = pencil + } + async setDashed(obj){ + MyCanvas.canvas.remove(obj) + let position = { + left:obj.left, + top:obj.top, + width:obj.width, + height:obj.height, + } + await obj.clone((cloned)=>{ + let {width,height,left,top} = position + // cloned.set({left:cloned.strokeWidth/2,top:cloned.strokeWidth/2}) + let group = new fabric.Group([cloned],{ + left:left + cloned.strokeWidth/2, + top:top + cloned.strokeWidth/2, + width,height, + custom:{ + dashed:true + } + }) + MyCanvas.canvas.add(group) + }) + + // this.addLayer({target:obj})//更新参数 + // for (let index = 0; index < elements.length; index++) { + // const item = elements[index]; + // await new Promise((resolve, reject) => { + // if(this.isAddToLayer(item)){ + // item.clone((cloned)=>{ + // this.setClone(item,cloned) + // if(item.custom?.layerId != -1){ + // temporar.add(cloned) + // } + // resolve() + // }) + // } + // }) + // } + // const {left,height,top,width} = position + // let scale = 1.2/MyCanvas.canvas.getZoom()<1?1.2:1.2/MyCanvas.canvas.getZoom() + // let data = temporar.toDataURL({left,height:height+scale,top,width:width+scale}); + // let img = await this.createImage({minioUrl:data}) + // img.set({scaleX:1,scaleY:1}) + // MyCanvas.canvas.forEachObject((item) =>{ + // if(item.custom.isSelectable)return + // if(!this.isAddToLayer(item))return + // let imgScale = { + // pX:(item.scaleX?item.scaleX:1), + // pY:(item.scaleY?item.scaleY:1), + // } + // let scaleWH = item.width / (item.width * imgScale.pX) + // let rect = new fabric.Rect({ + // left:left * scaleWH - item.left - item.width / 2, + // top:top * scaleWH - item.top - item.height / 2, + // width:width * scaleWH, + // height:height * scaleWH, + // }) + // let group + // if(item.clipPath){ + // item.clipPath.clone(cloned =>{ + // group = cloned + // }) + // }else{ + // group = new fabric.Group([],) + // } + // group.set({ + // width:item.width * imgScale.pX, + // height:item.height * imgScale.pY, + // left: -item.width * imgScale.pX / 2, + // top: -item.height * imgScale.pY / 2, + // inverted:true, + // }) + // group.add(rect) + // item.set({clipPath:group}) + // MyCanvas.canvas.renderAll(); // 请求重绘画布 + // }) + // img.set({ + // left:left, + // top:top, + // custom:{ + // layerId:this.layer.selectLayer.id, + // }, + // // hasControls:false, + // }) + // MyCanvas.canvas.add(img) + } + async setGridOrObject(id,str){ + this.layer.list.forEach((item) => { + if(item.id == id)item.groupType = str + }) + await this.lookingLayer(id).then(rv=>{ + rv.custom.groupType = str + }) + if(str == 'Grid'){ + await this.setGroupGrid() + }else{ + await this.setGroupGrid('all') + } + this.setOperation('movePosition') + } + async copyLayer(id){ + let createId = new Date().getTime() + let elements = MyCanvas.canvas.getObjects().filter(obj => obj.custom.layerId == id) + let copyElements = [] + for (let i = 0; i < elements.length; i++) { + await new Promise((resolve, reject) => { + let item = elements[i] + item.clone((clonedObj)=>{ + this.setClone(item,clonedObj) + clonedObj.custom.layerId = createId + copyElements.push(clonedObj) + resolve('') + }) + }) + } + await this.createLayer({id:createId}) + copyElements.forEach( item=>MyCanvas.canvas.add(item)) + } + async setGroupGrid(str){//group变为图片 + // MyCanvas.canvas.discardActiveObject();//取消所有选中边框 + let elements = MyCanvas.canvas.getObjects().filter(obj => this.isAddToLayer(obj) && !obj.custom.dashed && obj.type); + if(str == 'all'){ + elements = MyCanvas.canvas.getObjects().filter(obj => this.isAddToLayer(obj) && obj.type); + } + let layerBg = elements.filter(obj => obj.custom.isSelectable)[0] + let scaleXY = { + scaleX:layerBg?.scaleX?layerBg?.scaleX:1, + scaleY:layerBg?.scaleY?layerBg?.scaleY:1, + width:layerBg?.width?layerBg?.width:MyCanvas.canvas.width, + height:layerBg?.height?layerBg?.height:MyCanvas.canvas.height, + } + let imgData = await this.groupToImg(elements,{},'setGrid',scaleXY) + let img = await this.createImage({minioUrl:imgData}) + elements.forEach((obj) =>{ + if(obj.custom.isSelectable){ + }else{ + MyCanvas.canvas.remove(obj) + } + }); + if(layerBg){ + layerBg.custom.state = '' + delete layerBg.eraser + layerBg.set({ + scaleX:1, + scaleY:1, + width: scaleXY.width * scaleXY.scaleX, + height: scaleXY.height * scaleXY.scaleY, + clipPath:null, + fill: new fabric.Pattern({ + source: img.getElement(), // 传入图片元素 + repeat: 'no-repeat' // 设置图片不重复 + }), + hasBorders: true, + hasControls: true + }) + this.setGroupStyle(layerBg) + }else{ + const rect = new fabric.Rect({ + // left:0, + // top:0, + width: MyCanvas.canvas.width, + height: MyCanvas.canvas.height, + strokeWidth:0, + fill: new fabric.Pattern({ + source: img.getElement(), // 传入图片元素 + repeat: 'no-repeat' // 设置图片不重复 + }), + custom:{ + isSelectable:true, + }, + hasBorders: true, + hasControls: true + }); + this.setGroupStyle(rect) + MyCanvas.canvas.add(rect) + } + MyCanvas.canvas.renderAll() // 刷新画布，改变group的visible属性，必须通过刷新画布，才能应用新属性值 + } + //液化 + getLiquefactionImgObj(){ + return new Promise(async (resolve, reject) => { + let img,str = null + const activeObject = this.canvas.getActiveObject(); // 获取选中的对象 + let dashedGroup = MyCanvas.canvas.getObjects().filter(obj => obj.custom.dashed)[0]; + + if (activeObject && activeObject.type === 'image' && + activeObject.custom.type == 'upImgFiles' + ){ + img = activeObject + this.liquefaction.type = 'upImgFiles' + + }else if(dashedGroup){//判断选取是否存在 + if( + dashedGroup._objects.filter(item => item.type == 'image').length == 0 && + this.layer.selectLayer.group.custom.groupType == 'Grid' + ){ + await this.setclipPathImg() + }else if(dashedGroup._objects.filter(item => item.type == 'image').length == 0){ + resolve() + return + } + await new Promise((resolve, reject) => { + dashedGroup.clone(async (cloned)=>{ + this.setClone(dashedGroup,cloned) + this.liquefaction.dashed = dashedGroup + this.liquefaction.type = 'dashed' + cloned._objects = cloned._objects.filter(item => item.type == 'image') + console.log( await cloned.toDataURL()); + img = await cloned.toDataURL() + resolve() + }) + }) + }else if(this.layer.selectLayer.group.custom.groupType == 'Grid'){//判断当前图层是否可以做为液化图片 + let bg = this.canvas.getObjects().filter(item => item.custom?.isSelectable)[0] + img = bg.fill.source.src + this.liquefaction.type = 'layer' + } + console.log(img); + this.liquefaction.img = img + resolve(this.liquefaction) + }) + + } + async setLiquefactionImgObj(liquefaction,data){ + if(liquefaction.type == 'upImgFiles'){ + await new Promise((resolve, reject) => { + console.log(liquefaction.img); + liquefaction.img.setSrc(data, (value)=>{ + delete liquefaction.img.minioUrl + resolve() + }) + }) + }else if(liquefaction.type == 'dashed'){ + if(liquefaction.dashed){ + await new Promise((resolve, reject) => { + liquefaction.dashed._objects = liquefaction.dashed._objects.filter(item => item.type != 'image') + fabric.Image.fromURL(data, (value)=>{ + value.set({ + left:-liquefaction.dashed.width/2, + top:-liquefaction.dashed.height/2, + }) + liquefaction.dashed.insertAt(value) + resolve() + }) + }) + // canvasObj.addDashedImg(value) + } + }else if(liquefaction.type == 'layer'){ + let bg = this.canvas.getObjects().filter(item => item.custom?.isSelectable)[0] + let img = await this.createImage({minioUrl:data}) + bg.set({ + fill: new fabric.Pattern({ + source: img.getElement(), // 传入图片元素 + repeat: 'no-repeat' // 设置图片不重复 + }), + }) + } + MyCanvas.canvas.renderAll(); + this.updateCanvasState() + } + //end液化 + setGroupStyle(obj){ + obj.set({ + borderColor:'#4584ff', + cornerStrokeColor :'#4584ff', + cornerStyle:'circle' + }) + obj.setControlsVisibility({ + mtr:false, + deleteControl:false + }) + // obj.controls.deleteControl.mouseUpHandler = null + } + setClipPath(img,clipPath){ + let imgScale = { + pX:(img?.scaleX?img.scaleX:1), + pY:(img?.scaleY?img.scaleY:1), + } + clipPath.set({ + left: clipPath.left - img.width*imgScale.pX/2, + top: clipPath.top - img.height*imgScale.pY/2, + inverted:true, + }) + img.set({clipPath:clipPath}) + img.custom.state = 'success' + MyCanvas.canvas.renderAll() // 刷新画布，改变group的visible属性，必须通过刷新画布，才能应用新属性值 + } + async groupToImg(elements,imgData,type,scaleXY){ + let temporar = this.temporarilyExport(scaleXY) + let bg = elements.filter(item => item.custom?.isSelectable)[0] + let xy = { + x:bg?.left?bg?.left:0, + y:bg?.top?bg?.top:0, + } + for (let index = 0; index < elements.length; index++) { + const item = elements[index]; + await new Promise((resolve, reject) => { + item.clone((cloned)=>{ + this.setClone(item,cloned) + if(item.custom?.dashed && item._objects){ + cloned._objects = cloned._objects.filter(item => item.type == 'image') + } + // if(type == 'setGrid'){ + cloned.set({ + left: cloned.left - xy.x, + top: cloned.top - xy.y, + }) + // } + if(cloned.custom?.layerId != -1){ + temporar.add(cloned) + } + resolve() + }) + }) + } + let data = temporar.toDataURL(imgData); + this.closeTemporarilyExport(temporar) + return data + } + setCanvasWheel(opt){ + const delta = opt.e.deltaY // 滚轮，向上滚一下是 -100，向下滚一下是 100 + let zoom = MyCanvas.canvas.getZoom() // 获取画布当前缩放值 + zoom *= 0.999 ** delta + if (zoom > 20) zoom = 20 + if (zoom < 0.01) zoom = 0.01 + MyCanvas.canvas.zoomToPoint( + { // 关键点 + x: opt.e.offsetX, + y: opt.e.offsetY + }, + zoom + ) + opt.e.preventDefault() + opt.e.stopPropagation() + this.setPencilWidth() + } + foldEnd(key){ + MyCanvas.canvas.skipTargetFind = true + let points = this.createPatterning.current.points + if(key == 'Enter'){ + }else{ + points.pop() + } + points.pop() + this.createPatterning.state = false + MyCanvas.canvas.remove(this.createPatterning.current) + MyCanvas.canvas.remove(this.createPatterning.polyLineBtn) + let polyline = new fabric.Polyline(points, { + fill: this.operationMode == 'fill'? this.brushwork.color : 'transparent', + stroke: this.brushwork.color, + strokeWidth:this.brushwork.width[this.operation]?this.brushwork.width[this.operation]:20, + // selection:false, + }) + polyline.set({ + left:polyline.left+polyline.strokeWidth / 2, + top:polyline.top+polyline.strokeWidth / 2, + }) + MyCanvas.canvas.add(polyline) + this.clearPatterning()//临时图形置为空并且添加撤回对象里面 + // this.layerAddElement(polyline) + } + clearPatterning(){ + if(this.createPatterning.state){ + MyCanvas.canvas.remove(this.createPatterning.current) + } + this.createPatterning.current = null + MyCanvas.canvas.remove(this.createPatterning.polyLineBtn) + this.updateCanvasState() + } + textureValueChange = (value)=>{ + this.texture.value = value + this.setTexture() + } + setOperationMode(str){ + this.operationMode = str + } + brushworkChange = (value)=>{ + this.brushwork.value = value + this.setPencil() + } + setLayerIndex(str){//设置优先级 + var activeObject = MyCanvas.canvas.getActiveObject(); + switch (str) { + case 'Front': + MyCanvas.canvas.bringToFront(activeObject)//顶层 + // this.layer.selectLayer.group.bringToFront(activeObject) + break + case 'Back': + MyCanvas.canvas.sendToBack(activeObject)//底层 + // this.layer.selectLayer.group.sendToBack(activeObject) + break + case 'Forward': + MyCanvas.canvas.bringForward(activeObject) + // this.layer.selectLayer.group.bringForward(activeObject) + break + case 'Backwards': + MyCanvas.canvas.sendBackwards(activeObject) + // this.layer.selectLayer.group.sendBackwards(activeObject) + break + } + + } + setPencil(){ + let pencil + MyCanvas.canvas.isDrawingMode = true//开启绘画模式 + if(this.brushwork.value == 'PencilBrush'){ + pencil = new fabric.PencilBrush(MyCanvas.canvas,{}); //普通笔 + }else if(this.brushwork.value == 'Marking'){ + pencil = new fabric.PencilBrush(MyCanvas.canvas,); //记号笔 + }else if(this.brushwork.value == 'InkBrush'){ + pencil = new fabric.InkBrush(MyCanvas.canvas,{}); //油画笔 + }else if(this.brushwork.value=='CrayonBrush'){ + pencil = new fabric.CrayonBrush(MyCanvas.canvas,{}); //蜡笔 + }else if(this.brushwork.value == 'RibbonBrush'){ + pencil = new fabric.RibbonBrush(MyCanvas.canvas,{width: 1,}); //色带 + }else if(this.brushwork.value == 'MarkerBrush'){ + pencil = new fabric.MarkerBrush(MyCanvas.canvas,{}); //书写笔 + // pencil = new fabric.PenBrush(MyCanvas.canvas,{}); //书写笔 + }else if(this.brushwork.value == 'WritingBrush'){ + pencil = new fabric.WritingBrush(MyCanvas.canvas,{}); //毛笔 + }else if(this.brushwork.value == 'LongfurBrush'){ + pencil = new fabric.LongfurBrush(MyCanvas.canvas,{width: 1,}); //色带 + }else if(this.brushwork.value == 'SpraypaintBrush'){ + pencil = new fabric.SpraypaintBrush(MyCanvas.canvas,{}); //长毛刷 + } + + MyCanvas.canvas.freeDrawingBrush = pencil + if(this.brushwork.value == 'RibbonBrush' || this.brushwork.value == 'LongfurBrush'){ + MyCanvas.canvas.freeDrawingBrush.width = 1; + } + if(this.brushwork.value == 'Marking'){ + MyCanvas.canvas.freeDrawingBrush.color = this.hexToRgba(this.brushwork.color,.5); + // }else if(this.brushwork.value == 'InkBrush'){ + // canvas.freeDrawingBrush.color = this.hexToRgba(this.brushwork.color,.2); + }else{ + MyCanvas.canvas.freeDrawingBrush.color = this.hexToRgba(this.brushwork.color,1); + } + this.setPencilWidth() + this.pencilbtnStyle.background = this.brushwork.color + MyCanvas.canvas.freeDrawingBrush.isEraser = false + } + setCanvasZoom(opt){ + let zoom = MyCanvas.canvas.getZoom() // 获取画布当前缩放值 + let num = -100 + if(this.operation == 'zoomOut') num = 100 + zoom *= 0.999 ** num + if (zoom > 20) zoom = 20 + if (zoom < 0.01) zoom = 0.01 + // MyCanvas.canvas.setDimensions(MyCanvas.canvas.width *= zoom,MyCanvas.canvas.height *= zoom) + // MyCanvas.canvas.wrapperEl.style.zoom = zoom + MyCanvas.canvas.zoomToPoint( + { // 关键点 + x: opt.pointer.x, + y: opt.pointer.y + }, + zoom + ) + opt.e.preventDefault() + opt.e.stopPropagation() + this.setPencilWidth() + } + async addImage (imgData){ + let img = await this.createImage(imgData) + let position = { + // left: 0, + // top:MyCanvas.canvas.wrapperEl.parentNode.scrollTop, + left: MyCanvas.canvas.width/2, + top: MyCanvas.canvas.height/2, + + } + img.set({ + custom:{ + type:'upImgFiles' + } + }) + await this.createLayer({}) + this.setCanvasImage(img,position,"upImgFiles",imgData) + } + createImage(imgData){ + return new Promise((resolve, reject) => { + fabric.Image.fromURL(imgData.minioUrl,(img) => { + resolve(img) + },{ crossOrigin: "Anonymous" }) + }) + } + setImageWidth = (key,img)=>{ + const CW = MyCanvas.canvas.width + const CH = MyCanvas.canvas.height + let WH = CW>CH?'H':'W' + let imgWidth; //这是设置画布等宽 + if(WH == 'W'){ + imgWidth = CW / 2; + }else{ + let heightScale = (CH/2) / img.height + imgWidth = img.width * heightScale + } + // let sketchGrouping = 6 + // if(key == 'upImgFiles'){ + // imgWidth = imgWidth / 8; + // }else if (key == "printboardFiles") { + // imgWidth = imgWidth / 14; + // }else if (key == "sketchboardFiles"||key == 'moodboardFiles'||key == 'FinalizeImage') { + // imgWidth = + // (imgWidth - + // (sketchGrouping - 1) * 20) / + // sketchGrouping; + // }else if (key == "likeDesignCollectionList") { + // if(img){ + // let imgObj = JSON.parse(JSON.stringify(img)) + // let height = imgObj.height + // imgObj.height = imgWidth / 8 * 1.8 + // let heightScale = imgObj.height / height + // imgWidth = imgObj.width * heightScale + // } + // }else { + // if(img){ + // let imgObj = JSON.parse(JSON.stringify(img)) + // if(imgObj.height > imgObj.width){ + // let heightScale = (MyCanvas.canvas.height/2) / imgObj.height + // imgWidth = imgObj.width * heightScale + // }else{ + // imgWidth /= 2 + // } + // } + // } + return imgWidth + } + async setCanvasImage(img,position,key,data){ + let minioUrl = ''//表示收藏或者generate + let imgUrl = data.imgUrl + if (key == "likeDesignCollectionList") { + imgUrl = data.designOutfitUrl; + } + let imgWidth = await this.setImageWidth(key,img); + if(imgUrl?.split('?')){ + let url = imgUrl.split('?')[0] + var match = url.match(/:(\d+)\/(.*)/); + minioUrl = match[2] + } + let proportion = img.height / img.width; //计算图形宽高比例 + let scaleWH = imgWidth / img.width; //计算放到画布上缩小倍率 + let scale = { + X: imgWidth / img.width, + Y: (img.width * proportion * scaleWH) / img.height, + } + img.set({ + left:position.left - img.width*scale.X/2, + top:position.top - img.height*scale.Y / 2, + minioUrl, + scaleX:scale.X, + scaleY:scale.Y, + }); + MyCanvas.canvas.add(img) + this.updateCanvasState('') + } + setMove(){ + MyCanvas.canvas.isDrawingMode = false + MyCanvas.canvas.forEachObject((obj) =>{ + if(this.isSelectable(obj)){ + obj.selectable = true + }else{ + obj.selectable = false + } + }); + MyCanvas.canvas.renderAll() // 刷新画布，改变group的visible属性，必须通过刷新画布，才能应用新属性值 + } + async setTexture(){ + MyCanvas.canvas.isDrawingMode = true//开启绘画模式 + let img = await JSSetTexture(this.texture.list[this.texture.value].url) + let zoom = MyCanvas.canvas.getZoom() // 获取画布当前缩放值 + let patternBrush = new fabric.PatternBrush(MyCanvas.canvas) + patternBrush.source = img + patternBrush.width = Number(this.brushwork.width[this.operation]) / zoom; // 设置画笔大小 + this.setPencilWidth() + MyCanvas.canvas.freeDrawingBrush = patternBrush + } + setEraser(){ + MyCanvas.canvas.isDrawingMode = true + let eraser = new fabric.EraserBrush(MyCanvas.canvas) + MyCanvas.canvas.freeDrawingBrush = eraser + this.pencilbtnStyle.background = '#fff' + MyCanvas.canvas.freeDrawingBrush.isEraser = true + this.setPencilWidth() + MyCanvas.canvas.requestRenderAll(); + + } + hexToRgba(hex, alpha){ + const r = parseInt(hex.slice(1, 3), 16); + const g = parseInt(hex.slice(3, 5), 16); + const b = parseInt(hex.slice(5, 7), 16); + return `rgba(${r}, ${g}, ${b}, ${alpha})`; + } + pencilColor(){ + if(this.createText?.set){ + this.setFontFamily() + return + } + if(MyCanvas.canvas.freeDrawingBrush.isEraser){ + }else{ + this.pencilbtnStyle.background = this.brushwork.color + } + if(this.brushwork.value == 'Marking'){ + MyCanvas.canvas.freeDrawingBrush.color = this.hexToRgba(this.brushwork.color,.5); + }else if(this.brushwork.value == 'InkBrush'){ + MyCanvas.canvas.freeDrawingBrush.color = this.hexToRgba(this.brushwork.color,.2); + }else{ + MyCanvas.canvas.freeDrawingBrush.color = this.hexToRgba(this.brushwork.color,1); + } + } + setFontFamily=()=>{ + if(this.createText.set){ + this.createText.set({ + fontFamily:this.fontFamily, + fontSize:this.brushwork.width[this.operation]?this.brushwork.width[this.operation]:20, + fill:this.brushwork.color, + }) + MyCanvas.canvas.renderAll(); + } + } + setPencilColor(){//切换颜色给铅笔设置颜色 + clearTimeout(this.setTimeOut.color) + clearTimeout(this.setTimeOut.colorHistory) + this.setTimeOut.color = setTimeout(()=>{ + this.pencilColor() + },200) + this.setTimeOut.colorHistory = setTimeout(()=>{ + this.colorHistoryList.push(this.brushwork.color) + },1000) + } + setCanvasWH = (str)=>{ + clearTimeout(this.setTimeOut.canvasWH) + this.setTimeOut.canvasWH = setTimeout(()=>{ + MyCanvas.canvas.setWidth(this.canvasWH.width); + MyCanvas.canvas.setHeight(this.canvasWH.height); + // MyCanvas.canvas.width = this.canvasWH.width + // MyCanvas.canvas.height = this.canvasWH.height + this.initCanvasWH('updata') + },1000) + } + setColorHistory = (value)=>{ + this.brushwork.color = value + this.pencilColor() + } + setPencilWidth(){//切换颜色给铅笔设置颜色 + let zoom = MyCanvas.canvas.getZoom() // 获取画布当前缩放值 + clearTimeout(this.setTimeOut.width) + this.setTimeOut.width = setTimeout(()=>{ + if(!this.brushwork.width[this.operation])this.brushwork.width[this.operation]=20 + // MyCanvas.canvas.freeDrawingBrush.width = Number(this.brushwork.width[this.operation]); + let arr = ['PencilBrush','Marking'] + this.pencilbtnStyle.height = this.brushwork.width[this.operation]+'px' + this.pencilbtnStyle.width = this.brushwork.width[this.operation]+'px' + if(arr.indexOf(this.brushwork.value) > -1){ + MyCanvas.canvas.freeDrawingBrush.width = Number(this.brushwork.width[this.operation]) / zoom; + }else{ + MyCanvas.canvas.freeDrawingBrush.width = Number(this.brushwork.width[this.operation]); + } + if((this.brushwork.value == 'LongfurBrush' || this.brushwork.value == 'RibbonBrush') && this.operation == 'pencil'){ + MyCanvas.canvas.freeDrawingBrush.width = 1; + this.pencilbtnStyle.height = 1+'px' + this.pencilbtnStyle.width = 1+'px' + } + },100) + } + //关闭u或者创建文字 + setTextFun(e){ + if(this.operation != 'text'){ + return + } + MyCanvas.canvas.forEachObject((obj) =>{ + if(obj.type == 'textbox' && !obj.text){ + MyCanvas.canvas.remove(obj); + } + }); + var clickedObject = e.target; + if (clickedObject instanceof fabric.Textbox) { + this.createText = clickedObject + this.setTextData(this.createText) + }else{ + + var pointer = MyCanvas.canvas.getPointer(e.pointer); + var x = pointer.x; + var y = pointer.y; + this.createText = new fabric.Textbox('', { + left: x, + top: y, + width: 50, + fontSize: this.brushwork.width[this.operation]?this.brushwork.width[this.operation]:20, + fontFamily:this.fontFamily, + fill:this.canvasPencilColor, + + }) + MyCanvas.canvas.add(this.createText) + // this.layer.selectLayer.group.add(this.createText) + this.createText.enterEditing(); + MyCanvas.canvas.setActiveObject(this.createText).renderAll(); + this.removeSetText() + } + } + setText(){ + MyCanvas.canvas.on('mouse:down',(event)=>{ + if(this.operation == 'zoomIn' || this.operation == 'zoomOut'){ + }else{ + this.setTextFun(event) + } + }) + } + removeSetText(){ + MyCanvas.canvas.off('mouse:down',this.setTextFun.bind(this)) + } + // async createBg(){// + // await new Promise((resolve, reject) => { + // let url = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC' + // fabric.Image.fromURL(url, (backgroundImage)=>{ + // backgroundImage.set({ + // }) + // const rect = new fabric.Rect({ + // left: 0, + // top: 0, + // width: MyCanvas.canvas.width, + // height: MyCanvas.canvas.height, + // fill:'#FFF', + // // fill: new fabric.Pattern({ + // // source: backgroundImage.getElement(), // 使用图像元素作为填充 + // // repeat: 'repeat', // 设置为重复 + // // patternTransform: [this.canvasWH.width/this.canvasDomParent.offsetWidth, 0, 0, this.canvasWH.width/this.canvasDomParent.offsetWidth, 0, 0] + // // }), + // }); + + // const group = new fabric.Group([rect], { + // width: MyCanvas.canvas.width, + // height: MyCanvas.canvas.height, + // erasable:false, + // selectable:false, + // }); + // group.custom.layerId = -1 + // MyCanvas.canvas.add(group) + // MyCanvas.canvas.clipPath = rect + // resolve() + // }); + // }) + // } + createLayer(data){ + let {str,id} = data + let canvasData = MyCanvas.canvas.toJSON(['selectable','minioUrl','custom']); + return new Promise(async (resolve, reject) => { + MyCanvas.canvas.discardActiveObject(); + if(!id)id = new Date().getTime() + let index = this.layer.currentIndex += 1 + const rect = new fabric.Rect({ + left: -MyCanvas.canvas.width / 2, + top: -MyCanvas.canvas.height / 2, + // left:0, + // top:0, + width: MyCanvas.canvas.width, + height: MyCanvas.canvas.height, + strokeWidth:0, + fill:'#FFF', + custom:{ + layerId:id, + isSelectable:true, + }, + // erasable:false, + selectable:false, + }); + rect.clone((cloned)=>{ + rect.clipPath = cloned + }) + const group = new fabric.Group([], { + width: MyCanvas.canvas.width, + height: MyCanvas.canvas.height, + left:0, + top:0, + selectable:false, + erasable:false, + subTargetCheck:true, + evented:false, + // originX:'left', + // originY:'top', + custom:{ + layerId:id, + type:'layer' , + groupType:'Object', + layerIndex:index, + selectLayerIndex:(index) * 10000, + } + }); + if(str == 'init'){ + group.moveTo(group.custom.selectLayerIndex) + group.add(rect) + group.clone((cloned)=>{ + cloned.set({left:0,top:0}) + MyCanvas.canvas.clipPath = cloned + }) + } + MyCanvas.canvas.add(group) + let img = group.toDataURL({ + width: MyCanvas.canvas.width, + height: MyCanvas.canvas.height, + }) + this.layer.list.unshift({ + name:`Layer${index}`, + id,img,isShow:true, + groupType:'Object', + index,}) + await this.selectLayer(id) + MyCanvas.canvas.renderAll(); + this.updateCanvasState() + resolve(group) + }) + } + layerAddElement(obj){ + let group = this.layer.selectLayer.group + obj.left = obj.left - group.width/2 + obj.top = obj.top - group.height/2 + group.add(obj) + MyCanvas.canvas.remove(obj) + this.updataLayerImg(this.layer.selectLayer.id,group.toDataURL({ + width: MyCanvas.canvas.width, + height: MyCanvas.canvas.height + })) + } + addLayer(options){ + if(this.createPatterning.state)return + this.clipPath.clipGroup = MyCanvas.canvas.getObjects().filter(obj => obj.custom?.dashed)?.[0]; + if (options.target.type === 'group' && options.target.custom?.layerId) return; + if(!options.target?.custom?.layerId){ + if(options.target?.custom){ + options.target.custom.layerId = this.layer.selectLayer.id + }else{ + options.target.set({custom:{layerId : this.layer.selectLayer.id}}) + } + } + //判断是否可以点击空白地方进行选中 + if(options.target?.custom?.dashed){ + options.target.set({perPixelTargetFind:false,erasable:false,hasBorders: false,hasControls: false}) + // MyCanvas.canvas.setActiveObject(options.target); + MyCanvas.canvas.skipTargetFind = false + this.setOperation('movePosition') + }else if(options.target.type == 'textbox'){ + options.target.set({perPixelTargetFind:false}) + }else{ + options.target.set({perPixelTargetFind:true}) + } + //设置优先级 + if(options.target?.custom?.isSelectable && (options.target?.type == 'rect')){ + options.target.custom.selectLayerIndex = this.layer.selectLayer.group.custom.layerIndex * 10000 + }else{ + options.target.custom.selectLayerIndex = this.layer.selectLayer.group.custom.selectLayerIndex += 1 + if(this.clipPath.clipGroup){ + this.clipPath.clipGroup.custom.selectLayerIndex = this.layer.selectLayer.group.custom.selectLayerIndex + 1 + } + } + if(options.target.isType('path'))options.target.selectable=false + let arr = MyCanvas.canvas.getObjects().sort((a, b) =>{ + return a.custom.selectLayerIndex - b.custom.selectLayerIndex; + }); + arr.forEach((item,index)=>{ + item.moveTo(index) + }) + + if(!options?.target?.custom?.dashed && this.layer.selectLayer.group.custom.groupType == 'Grid')this.setGroupGrid('all') + + MyCanvas.canvas.renderAll(); + + this.updataLayer() + } + upLayerIndex(list){ + list.forEach((item,index)=>{ + let arr = MyCanvas.canvas.getObjects().filter(obj => obj.custom.layerId == item.id) + arr.forEach((obj)=>{ + if(obj.custom.type == 'layer')obj.custom.layerIndex = item.index + let selectLayerIndex = obj.custom.selectLayerIndex+'' + selectLayerIndex = selectLayerIndex.replace(/^\d/, item.index); + obj.custom.selectLayerIndex = Number(selectLayerIndex) + }) + // arrList.unshift(obj) + }) + // this.layer.list = arrList + let arr = MyCanvas.canvas.getObjects().sort((a, b) =>{ + return a.custom.selectLayerIndex - b.custom.selectLayerIndex; + }); + arr.forEach((item,index)=>item.moveTo(index)) + } + updataLayer(){ + clearTimeout(this.setTimeOut.updataLayer) + this.setTimeOut.updataLayer = setTimeout(async()=>{ + let elements + elements = MyCanvas.canvas.getObjects().filter(obj => { + return this.isAddToLayer(obj) + }); + const group = new fabric.Group([], { + width: this.layer.selectLayer.group.width, + height: this.layer.selectLayer.group.height, + erasable:false, + selectable:false, + }); + for (let i = 0; i < elements.length; i++) { + await new Promise((resolve, reject) => { + let item = elements[i] + item.clone((clonedObj)=>{ + this.setClone(item,clonedObj) + clonedObj.left = clonedObj.left - this.layer.selectLayer.group.width/2 + clonedObj.top = clonedObj.top - this.layer.selectLayer.group.height/2 + if(clonedObj.custom?.dashed){ + let clipPath = clonedObj._objects.filter(item => item.type != 'image')[0] + clonedObj.remove(clipPath) + } + group.add(clonedObj) + resolve('') + }) + }) + } + this.updataLayerImg(this.layer.selectLayer.id,group.toDataURL({ + width: this.layer.selectLayer.group.width, + height: this.layer.selectLayer.group.height + }) + ) + },500) + } + updataLayerImg(id,img){ + this.layer.list.forEach(v => { + if (v.id === id) { + v.img = img + } + }) + } + async layerDelete(index,id){ + if(this.layer.list.length == 1)return + for (let i = index; i < this.layer.list.length; i++) { + this.layer.list[this.layer.list.length - i-1].index-- + } + this.layer.list.splice(index,1) + if(id == this.layer.selectLayer.id){ + MyCanvas.canvas.remove(this.layer.selectLayer.group) + MyCanvas.canvas.forEachObject((obj) =>{ + if(obj.type != 'group' && obj.custom?.layerId == id){ + MyCanvas.canvas.remove(obj) + } + }); + this.layer.selectLayer.id = -1 + this.selectLayer(this.layer.list[this.layer.list.length - 1].id) + }else{ + let group = await this.lookingLayer(id,'setLayerIndex') + MyCanvas.canvas.remove(group) + } + this.updateCanvasState() + } + async selectLayer(id){ + await new Promise(async (resolve, reject) => { + if(this.layer.selectLayer.id != -1){ + await this.mergeGroup() + } + let group = await this.lookingLayer(id,'setRubber') + group.custom.selectLayerIndex = group.custom.layerIndex*10000 + this.layer.selectLayer.group = group + this.layer.selectLayer.id = id + await this.expandGroup() + MyCanvas.canvas.renderAll() // 刷新画布，改变group的visible属性，必须通过刷新画布，才能应用新属性值 + this.setOperation('movePosition') + resolve('') + }) + } + async mergeGroup(){ + const elements = MyCanvas.canvas.getObjects().filter(obj => this.isAddToLayer(obj)); + let isClipPath = MyCanvas.canvas.getObjects().filter(obj => obj.custom.dashed); + if(isClipPath.length>0)await this.setGroupGrid('all') + let group = await this.lookingLayer(this.layer.selectLayer.id,'setlayerIndex') + group.set({visible:true}) + for (let index = 0; index < elements.length; index++) { + const item = elements[index]; + await new Promise((resolve, reject) => { + item.clone((v)=>{ + this.setClone(item,v) + v.left = v.left - group.width/2 + v.top = v.top - group.height/2 + if(v.custom?.dashed){ + // MyCanvas.canvas.remove(item) + // let img = v._objects.filter(item => item.type == 'image')[0] + // if(img){ + // img.set({ + // left:v.left, + // top:v.top, + // custom:{ + // layerId:v.custom.layerId + // } + // }) + // group.add(img) + // } + }else{ + group.add(v) + } + resolve('') + }) + }) + } + elements.forEach(v => MyCanvas.canvas.remove(v)) + } + async expandGroup(){ + const elements = this.layer.selectLayer.group._objects.filter(obj => this.isAddToLayer(obj)); + // fabric.util.enlivenObjects(elements, (clonedObjects) => { + this.layer.selectLayer.group.set({visible:false}) + for (let index = 0; index < elements.length; index++) { + const item = elements[index]; + await new Promise((resolve, reject) => { + item.clone((v)=>{ + this.setClone(item,v) + v.left = v.left + this.layer.selectLayer.group.width/2 + v.top = v.top + this.layer.selectLayer.group.height/2 + if(v.custom?.dashed){ + // this.layer.selectLayer.group._objects.remove(item) + // let img = v._objects.filter(item => item.type == 'image')[0] + // if(img){ + // img.set({ + // left:v.left, + // top:v.top, + // custom:{ + // layerId:v.custom.layerId + // } + // }) + // MyCanvas.canvas.add(img) + // } + }else{ + MyCanvas.canvas.add(v) + } + if(index == elements.length - 1){ + elements.forEach(v => this.layer.selectLayer.group.remove(v)) + } + resolve() + }) + }) + } + } + lookingLayer(id,str){ + return new Promise((resolve, reject) => { + const groups = MyCanvas.canvas.getObjects() + let group = null + groups.forEach(v => { + if(str && v?.custom?.type === 'layer' && (str == 'setlayerIndex' || str == 'setRubber')){ + let layerIndex = v?.custom?.layerIndex * 10000 + v.moveTo(layerIndex) + } + if(v?.custom?.layerId == id){ + if(str && str == 'setRubber'){ + v.set({erasable:'deep'}) + } + + }else if(v?.custom?.type === 'layer'){ + v.set({erasable:false}) + } + if (v?.custom?.layerId === id && v?.custom?.type === 'layer') { + group = v + } + }) + resolve(group) + }) + + } canvasKeyUp(event){ - this.keyDown = this.keyDown.filter(function(item) { + this.keyDown = this.keyDown.filter((item) => { + if(item.code !== 'AltLeft'){ + if(this.oldOperation)this.setOperation(this.oldOperation) + } return event.code !== item; }) } + async layerShowHide(id,item){ + // console.log(id); + + item.isShow = !item.isShow + MyCanvas.canvas.forEachObject((obj)=>{ + if(obj.custom.layerId == id)obj.visible = item.isShow + }) + MyCanvas.canvas.renderAll() // 刷新画布，改变group的visible属性，必须通过刷新画布，才能应用新属性值 + + } canvasKeyDown(event){ if(this.keyDown.indexOf(event.key)>-1){ }else{ this.keyDown.push(event.code) - if(event.key === 'Enter' && operation.value == 'fold'){ - foldEnd('Enter') + if(event.key === 'Enter' && this.operation == 'fold'){ + this.foldEnd('Enter') }else if(event.key === 'Delete'){ - deleteObject() + this.deleteObject() }else if(this.keyDown.indexOf('ControlLeft') > -1 && this.keyDown.indexOf('KeyZ') > -1 && this.keyDown.indexOf('ShiftLeft') > -1){ this.historyState('reverse') }else if(this.keyDown.indexOf('ControlLeft') > -1 && this.keyDown.indexOf('KeyZ') > -1){ @@ -131,88 +1765,159 @@ class myCanvas { this.copy() }else if(this.keyDown.indexOf('ControlLeft') > -1 && this.keyDown.indexOf('KeyV') > -1){ this.paste() + }else if(this.keyDown.indexOf('AltLeft') > -1 && this.keyDown.length == 1 && this.operation != 'move'){ + this.oldOperation = this.operation + this.setOperation('move') } } } canvasClear(){ - let oldCanvasDom = this.canvasDomParent.querySelector('.canvas-container') - let oldCanvasDom1 = this.canvasDomParent.querySelector('canvas') + if(MyCanvas.canvas?.dispose)MyCanvas.canvas.dispose() + let oldCanvasDom = this.canvasDomParent?.querySelector('.canvas-container') + let oldCanvasDom1 = this.canvasDomParent?.querySelector('canvas') if(oldCanvasDom)oldCanvasDom.remove() if(oldCanvasDom1)oldCanvasDom1.remove() this.reverseCanvasState=[];//撤回 this.normalCanvasState=[];//反撤回 + MyCanvas.canvas = null + this.canvas = null + this.layer = { + list:[], + selectLayer:{ + group:null, + id:-1, + }, + currentIndex: 0, + } + this.mouse = { + point:null, + upPoint:null, + isMovePostion:false, + lastPosX:0, + lastPosY:0, + } + this.brushwork = { + value:'PencilBrush', + width:{}, + color:'#000000', + texture:0, + } + this.operation = 'movePosition' document.removeEventListener("keydown", this.canvasKeyDown); document.removeEventListener("keyup", this.canvasKeyUp); + document.removeEventListener('mousemove', this.mouseMove); + document.removeEventListener('touchmove', this.touchmove); } //删除选中元素 - deleteObject = ()=> { - if(!this.canvas.getActiveObjects()){ + deleteObject(){ + if(!MyCanvas.canvas.getActiveObjects()){ return } - let target = this.canvas.getActiveObjects() + let target = MyCanvas.canvas.getActiveObjects() target.forEach((item)=>{ - this.canvas.fxRemove(item, { + MyCanvas.canvas.fxRemove(item, { onComplete:()=>{ - this.canvas.discardActiveObject(); // 丢弃当前选中的对象 - this.canvas.renderAll(); // 重新渲染 Canvas + MyCanvas.canvas.discardActiveObject(); // 丢弃当前选中的对象 + MyCanvas.canvas.renderAll(); // 重新渲染 Canvas } }) - this.canvas.FX_DURATION = 300 + MyCanvas.canvas.FX_DURATION = 200 + // MyCanvas.canvas.remove(item) }) + this.updataLayer() this.updateCanvasState('remove') } + async getDashedImg(cloned){ + let position = { + left:cloned?.left, + top:cloned?.top, + width:cloned?.width + cloned?.strokeWidth*2, + height:cloned?.height + cloned?.strokeWidth*2, + } + let elements = MyCanvas.canvas.getObjects().filter(obj => this.isAddToLayer(obj)); + let imgData = await this.groupToImg(elements,position,'clipPath')//矩形裁剪图片 + let img = await this.createImage({minioUrl:imgData}) + img.set({ + left:position.left, + top:position.top, + }) + return img + } //复制粘贴 - copy(canvas){ - var activeObject = this.canvas.getActiveObject(); + async copy(canvas){ + var activeObject = MyCanvas.canvas.getActiveObject(); if(!activeObject){ return } - activeObject.clone((cloned)=>{ - this._clipboard = cloned; + let copyObj = null + await new Promise((resolve, reject) => { + activeObject.clone(async (cloned)=>{ + this.setClone(activeObject,cloned) + if(cloned.custom.dashed){ + copyObj = await this.getDashedImg(cloned) + }else{ + copyObj = cloned + } + resolve() + }) }) + + this._clipboard = copyObj; } - paste = () => {//粘贴 + async paste(){//粘贴 if(!this._clipboard){ return } + await this.createLayer({}) this._clipboard.clone(clonedObj => { - this.canvas.discardActiveObject() // 取消选择 - - // 设置新内容的坐标位置 + // this.setClone(this._clipboard,clonedObj) + MyCanvas.canvas.discardActiveObject() // 取消选择 clonedObj.set({ - left: clonedObj.left + 10, - top: clonedObj.top + 10, - evented: true + left: clonedObj.left, + top: clonedObj.top, + selectable: true + }) + if (clonedObj.type === 'activeSelection') { + // 活动选择需要一个对画布的引用 + clonedObj.forEachObject((obj)=>{ + MyCanvas.canvas.add(obj) }) - if (clonedObj.type === 'activeSelection') { - // 活动选择需要一个对画布的引用 - clonedObj.canvas = canvas; - clonedObj.forEachObject((obj)=>{ - this.canvas.add(obj) - }) - - clonedObj.setCoords() - } else { - this.canvas.add(clonedObj) - } - this._clipboard.top += 10 - this._clipboard.left += 10 - this.canvas.setActiveObject(clonedObj) - this.canvas.requestRenderAll() + clonedObj.setCoords() + } else { + MyCanvas.canvas.add(clonedObj) + // this.layer.selectLayer.group.add(clonedObj) + } + MyCanvas.canvas.setActiveObject(clonedObj) + MyCanvas.canvas.requestRenderAll() }) + this._clipboard = null this.updateCanvasState() } - + isSelectable(obj){//判断元素是否允许选中 + return (obj.custom?.type != 'layer' && (!obj.custom?.isSelectable || this.layer.selectLayer.group.custom.groupType == 'Grid') && !obj.isType('path')) + //isSelectable已废弃，现在isSelectable作为判断是否是背景来使用 + return (obj.custom?.type != 'layer' && !obj.isType('path')) + } + isAddToLayer(obj){//判断元素是否允许添加 + return(obj.custom?.type != 'layer' && obj.custom?.layerId == this.layer.selectLayer.id) + } //撤回反撤回 //设置画布监听修改添加事件，用来做撤回功能 updateCanvasState(str){ - const canvasAsJson = JSON.stringify(this.canvas.toJSON()); + let canvasData = MyCanvas.canvas.toJSON(['custom','selectable','minioUrl']); + if(canvasData.clipPath){ + canvasData.clipPath.left = 0 + canvasData.clipPath.top = 0 + } + let canvasAsJson = JSON.stringify(canvasData) + let layerList = JSON.stringify(this.layer.list) + let layerId = this.layer.selectLayer.id if(str == 'loadingCompleted'){ // this.reverseCanvasState.push(canvasAsJson); } - this.normalCanvasState.push(canvasAsJson); + this.normalCanvasState.push({canvasAsJson,layerList,layerId}); if (this.isLoadCanvas) { this.reverseCanvasState = [] this.isLoadCanvas = false; @@ -220,22 +1925,85 @@ class myCanvas { } } //撤回 - historyState(str){ + async historyState(str){ if(str == 'reverse' && this.reverseCanvasState.length > 0){//反撤回 let obj = this.reverseCanvasState.pop() - // this.canvasState = this.reverseCanvasState[this.reverseCanvasState.length-1] - this.canvasState = obj + let layerList = JSON.parse(obj.layerList) + this.layer.list = layerList + this.layer.selectLayer.id = obj.layerId + this.canvasState = obj.canvasAsJson this.normalCanvasState.push(obj); }else if(str == '' && this.normalCanvasState.length > 1){ let obj = this.normalCanvasState.pop() - this.canvasState = this.normalCanvasState[this.normalCanvasState.length-1] + let select = this.normalCanvasState[this.normalCanvasState.length-1] + this.canvasState = select.canvasAsJson + this.layer.list = JSON.parse(select.layerList) + this.layer.selectLayer.id = select.layerId this.reverseCanvasState.push(obj); this.isLoadCanvas = true; }else{ return } - this.canvas.loadFromJSON(this.canvasState, () => {}); + MyCanvas.canvas.loadFromJSON(this.canvasState, () => {}); + MyCanvas.canvas.setBackgroundColor({ + source:'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC', + repeat: 'repeat', + },MyCanvas.canvas.renderAll.bind(MyCanvas.canvas), + ) + } + temporarilyExport(data){ + let scaleXY = { + scaleX:data?.scaleX?data?.scaleX:1, + scaleY:data?.scaleY?data?.scaleY:1, + } + let width = data?.width || MyCanvas.canvas.width + let height = data?.height || MyCanvas.canvas.height + var canvasDom = document.createElement("canvas"); + let exportCanvas = new fabric.Canvas(canvasDom, { + width:width*scaleXY.scaleX, + height:height*scaleXY.scaleY, + scaleX:scaleXY.scaleX, + scaleY:scaleXY.scaleY, + isDrawingMode: false, // 开启绘图模式 + }); + return exportCanvas + } + closeTemporarilyExport(temporar){ + if(temporar){ + temporar.wrapperEl.remove() + temporar.dispose() + } + } + setClone(obj,goal){ + if(obj.custom){ + goal.set({custom:JSON.parse(JSON.stringify(obj.custom))}) + } + goal.perPixelTargetFind = obj.perPixelTargetFind + goal.hasBorders = obj.hasBorders + goal.hasControls = obj.hasControls + goal.selectable = obj.selectable + goal.erasable = obj.erasable + if(obj.minioUrl)goal.minioUrl = obj.minioUrl + } + //导出 + selectExport(){ + let layer = this.layer.list.filter(item=>item.id == this.layer.selectLayer.id)[0] + return layer.img + } + allExport(){ + let exportCanvas = this.temporarilyExport() + MyCanvas.canvas.forEachObject((obj) =>{ + if(obj.custom?.layerId != -1){ + obj.clone((cloned)=>{ + this.setClone(obj,cloned) + exportCanvas.add(cloned) + }) + + } + }); + let data = exportCanvas.toDataURL("image/png"); + this.closeTemporarilyExport(exportCanvas) + return data } } - -export default new myCanvas() \ No newline at end of file +export default new MyCanvas() \ No newline at end of file diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index beeee67c..a6ff662b 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -218,8 +218,9 @@ - + + - diff --git a/src/component/Account/accountMessage.vue b/src/component/Account/accountMessage.vue index ea9df2e3..a3f807c4 100644 --- a/src/component/Account/accountMessage.vue +++ b/src/component/Account/accountMessage.vue @@ -1,11 +1,5 @@ + \ No newline at end of file diff --git a/src/component/DetailCopy/model/position.vue b/src/component/DetailCopy/model/position.vue deleted file mode 100644 index e69de29b..00000000 diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index e89ca646..2c9fbc1a 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -1273,6 +1273,7 @@ export default defineComponent({ if(keyDown.indexOf(event.code)>-1){ }else{ keyDown.push(event.code) + // console.log(keyDown.indexOf('ControlLeft') > -1 , keyDown.indexOf('MetaLeft') > -1, event.code == 'KeyC') if(event.code === 'Enter' && operation.value == 'fold'){ foldEnd('Enter') }else if(event.key === 'Delete'){ @@ -1311,7 +1312,6 @@ export default defineComponent({ // } } } - console.log(keyDown); } let getColor = async ()=>{ try { @@ -1336,8 +1336,6 @@ export default defineComponent({ keyDown = keyDown.filter(function(item) { return event.code !== item; }) - console.log(keyDown,'UP',event.code); - if(event.code == 'Backquote' && oldOperation){ // setOperation(oldOperation) oldOperation = '' diff --git a/src/lang/cn.ts b/src/lang/cn.ts index da4f1359..88738867 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -628,6 +628,13 @@ export default { Interact:'互动', hisWorks:'他的作品', works:'作品', + //取消 + jsContent1:'太贵了', + jsContent2:'系统不友好', + jsContent3:'太慢了', + jsContent4:'操作困难', + jsContent5:'教程不充足', + jsContent6:'无法生成需要的内容', }, frontPage:{ BindWechat:'绑定微信', diff --git a/src/lang/en.ts b/src/lang/en.ts index 5168c2a9..ab455113 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -627,6 +627,13 @@ export default { Interact:'interact', hisWorks:'His works', works:'Works', + //取消 + jsContent1:'Too expensive', + jsContent2:'Sytem not user friendly', + jsContent3:'Too Slowy', + jsContent4:'Difficult to edit', + jsContent5:'Insufficlent Tutorial/Support', + jsContent6:'Unable to generate what you need', }, frontPage:{ BindWechat:'Bind Wechat', diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index b2399397..df6eed03 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -211,7 +211,7 @@ - + @@ -233,7 +233,7 @@ - + diff --git a/src/views/feedbackSurvey.vue b/src/views/feedbackSurvey.vue index 145ff306..f6b19f89 100644 --- a/src/views/feedbackSurvey.vue +++ b/src/views/feedbackSurvey.vue @@ -789,6 +789,7 @@ export default defineComponent({ margin: 1rem; height: 100%; overflow-y: auto; + padding-bottom: 2rem; &.active{ #title { font-size: 3rem; diff --git a/src/views/feedbackSurveyCN.vue b/src/views/feedbackSurveyCN.vue index aacd89e1..0f4baae4 100644 --- a/src/views/feedbackSurveyCN.vue +++ b/src/views/feedbackSurveyCN.vue @@ -712,6 +712,7 @@ export default defineComponent({ margin: 1rem; height: 100%; overflow-y: auto; + padding-bottom: 2rem; #main{ background: linear-gradient(45deg, #eee4f3, #f3f4e6); From cd3be5aea408b18873f3e67084554e5425dab385 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Sat, 25 Jan 2025 12:37:50 +0800 Subject: [PATCH 51/71] fix --- .../Transaction/TransactionTable.vue | 19 +++++++++++++++++++ src/tool/https.js | 2 ++ src/views/HomeView/HomeView.vue | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index bdfc145d..91220970 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -101,6 +101,9 @@
Search
+
{ + filter.tableLoading = true; + // let data = setHistoryListData(); + let data = '' + Https.axiosPost(Https.httpUrls.queryTransactionDownload, data,{type: 'application/vnd.ms-excel;charset=utf-8'}).then( + (rv: any) => { + console.log(rv); + + if (rv) { + console.log(rv); + } + } + ); }; let lastGeTrialList = (str: string) => { clearHistoryList(); @@ -494,6 +512,7 @@ export default defineComponent({ searchHistoryList, lastGeTrialList, gettrialList, + downloadTransaction, filterOption, }; }, diff --git a/src/tool/https.js b/src/tool/https.js index 9c9737e0..5871ec69 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -62,6 +62,7 @@ axios.interceptors.response.use((res) =>{ // message.warning(res.data.errMsg) // return Promise.reject(res.data); // }else + console.log(res); if (res.data) { if (res.data.errCode === 0) { // message.error(res.data.errMsg) @@ -264,6 +265,7 @@ export const Https = { getCities:`/api/inquiry/getCities`,//获取所有付款订单使用的国家 getUserInfo:`/api/inquiry/getUserInfo`,//查询所有用户 queryTransaction:`/api/inquiry/queryTransaction`,//查询交易记录 + queryTransactionDownload:`/api/inquiry/queryTransaction/download`,//导出交易记录 //查询某个时间内design点击次数 getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批 getAllQuestionnaire:`/api/inquiry/getAllQuestionnaire`,//拒绝审批 diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index df6eed03..0ab06011 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -211,7 +211,7 @@ - + From 1640fed81e82550e360333ee7f39d28d82c6369d Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 27 Jan 2025 16:01:17 +0800 Subject: [PATCH 52/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style/style.css | 2 +- src/assets/style/style.less | 2 +- .../Transaction/TransactionTable.vue | 52 +++++++++++++++---- src/component/HomePage/ExportModel.vue | 6 ++- src/tool/https.js | 1 - 5 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/assets/style/style.css b/src/assets/style/style.css index e345e798..7f2c6859 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1693,7 +1693,7 @@ textarea:focus { background: #fff; top: 0; flex-wrap: wrap; - --width: 70%; + --width: 65%; } .collection_modal_body .input_border .input_box, .design_detail_modal_component .input_border .input_box, diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 2fe437c3..59419bf7 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1831,7 +1831,7 @@ textarea:focus{ background: #fff; top: 0; flex-wrap: wrap; - --width:70%; + --width:65%; .input_box{ position: relative; z-index: 2; diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index 91220970..905030d6 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -175,6 +175,7 @@ import { import { formatTime } from "@/tool/util"; import { useStore } from "vuex"; import { Https } from "@/tool/https"; +import {getCookie,clonAllCookie} from '@/tool/cookie' export default defineComponent({ components: {}, setup() { @@ -458,19 +459,48 @@ export default defineComponent({ ); }; //导出报表 - let downloadTransaction = () => { + let downloadTransaction = async () => { + return filter.tableLoading = true; - // let data = setHistoryListData(); - let data = '' - Https.axiosPost(Https.httpUrls.queryTransactionDownload, data,{type: 'application/vnd.ms-excel;charset=utf-8'}).then( - (rv: any) => { - console.log(rv); + let data = setHistoryListData(); + // ?uniqueId=5956dc1e-3ae6-48bb-8c19-b7d9b4ba2332-1-83&userId=83&timeZone=Asia%2FShanghai&type=Generate + + let jsonData:any = setHistoryListData() + + let str = JSON.stringify(jsonData) + let url = 'https://develop.api.aida.com.hk/api/inquiry/queryTransaction/download' + `?params=${encodeURIComponent(str)}` + // const response:any = await axios.get(Https.httpUrls.queryTransactionDownload, { + // responseType: 'blob', // 重要：确保设置响应类型为 'blob' + // params:{params:str} + // }).then((rv)=>{ + // console.log(rv); + // }) + fetch(url,{ + headers: { + 'Authorization': `${getCookie('token')}`, // 添加 Bearer token 验证 + } + }) + .then(response => { + console.log(response); - if (rv) { - console.log(rv); - } - } - ); + // return response.blob(); // 将响应转为 Blob 类型 + }) + .then((blob:any) => { + // 创建一个 URL 对象链接 Blob 数据 + console.log(blob); + + const objectURL = URL.createObjectURL(blob); + // 创建一个临时的 标签 + const link = document.createElement('a'); + link.href = objectURL; + link.download = 'download'; // 设置下载的文件名 + // 触发点击事件，下载文件 + link.click(); + // 清理 + URL.revokeObjectURL(objectURL); // 释放 objectURL + }) + .catch(error => { + }); }; let lastGeTrialList = (str: string) => { clearHistoryList(); diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 2c9fbc1a..66a90b83 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -555,8 +555,10 @@ export default defineComponent({ let createCanvas = (oldExportCanvas) => { showUpgradePlan.value = true; clearTimeout(submitCanvasContent) - document.addEventListener("keydown", setCanvasKeyDown); - document.addEventListener("keyup", clearCanvasKeyDown); + setCanvasKeyDown() + clearCanvasKeyDown() + // document.addEventListener("keydown", setCanvasKeyDown); + // document.addEventListener("keyup", clearCanvasKeyDown); normalCanvasState.value = [] reverseCanvasState.value = [] allBoardData.value.likeDesignCollectionList = diff --git a/src/tool/https.js b/src/tool/https.js index 5871ec69..5db5d63d 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -62,7 +62,6 @@ axios.interceptors.response.use((res) =>{ // message.warning(res.data.errMsg) // return Promise.reject(res.data); // }else - console.log(res); if (res.data) { if (res.data.errCode === 0) { // message.error(res.data.errMsg) From 19b942743ed3e9f0f526079adb64fcac85f2fcdb Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 27 Jan 2025 16:22:34 +0800 Subject: [PATCH 53/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/ExportModel.vue | 26 +++++++++++--------------- src/component/modules/liquefaction.vue | 3 ++- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 66a90b83..9738d8e3 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -314,7 +314,7 @@
- +
@@ -556,7 +556,6 @@ export default defineComponent({ showUpgradePlan.value = true; clearTimeout(submitCanvasContent) setCanvasKeyDown() - clearCanvasKeyDown() // document.addEventListener("keydown", setCanvasKeyDown); // document.addEventListener("keyup", clearCanvasKeyDown); normalCanvasState.value = [] @@ -595,12 +594,6 @@ export default defineComponent({ }); canvas.preserveObjectStacking = true; //鼠标移动 - // canvas.wrapperEl.onmouseover = setCanvasKeyDown;//document上添加按下和抬起事件 - // canvas.wrapperEl.onmouseout = clearCanvasKeyDown;//document上添加按下和抬起事件 - - // canvas.on("mouse:over", event =>setCanvasKeyDown(event));//document上添加按下和抬起事件 - // canvas.on("mouse:out", clearCanvasKeyDown);//document上添加按下和抬起事件 - canvas.on("mouse:move", event =>setCanvasMove(event)); canvas.on("mouse:down", event=>setCanvasDown(event)); canvas.on("mouse:up", event=>setCanvasUp(event)); @@ -953,7 +946,6 @@ export default defineComponent({ centered:true, onOk() { showUpgradePlan.value = false; - canvas.off("mouse:out", clearCanvasKeyDown); canvas.dispose(); position = { //设置每个图形位置的初始值 @@ -2096,12 +2088,12 @@ export default defineComponent({ userlikeGroupId:userlikeGroupId, } publishModal.init(data) - document.removeEventListener("keydown", setCanvasKeyDown); - document.removeEventListener("keyup", clearCanvasKeyDown); + document.removeEventListener('keydown',canvasKeyDown); + document.removeEventListener('keyup', canvasKeyUp); } const clearPublish = ()=>{ - document.addEventListener("keydown", setCanvasKeyDown); - document.addEventListener("keyup", clearCanvasKeyDown); + document.addEventListener('keydown',canvasKeyDown); + document.addEventListener('keyup', canvasKeyUp); } let setSubmit = ()=>{ let data = setCanvasContent(false) @@ -2159,11 +2151,15 @@ export default defineComponent({ updateCanvasState() }); } + const clearLiquefaction = ()=>{ + setCanvasKeyDown() + } let setLiquefaction = ()=>{ const activeObjects = canvas.getActiveObjects(); // 获取选中的对象 if (activeObjects.length === 1 && activeObjects[0].type === 'image') { liquefactionData = activeObjects[0] liquefaction.value.init(activeObjects[0]) + clearCanvasKeyDown() } else { message.info(useI18.t('exportModel.jsContent6')) return null; @@ -2192,8 +2188,7 @@ export default defineComponent({ }); onBeforeUnmount(()=>{ - document.removeEventListener("keydown", setCanvasKeyDown); - document.removeEventListener("keyup", clearCanvasKeyDown); + clearCanvasKeyDown() }) return { toSvg, @@ -2259,6 +2254,7 @@ export default defineComponent({ //液化 liquefaction, submitLiquefaction, + clearLiquefaction, setLiquefaction, }; }, diff --git a/src/component/modules/liquefaction.vue b/src/component/modules/liquefaction.vue index cedc1834..a1bfd0c0 100644 --- a/src/component/modules/liquefaction.vue +++ b/src/component/modules/liquefaction.vue @@ -68,7 +68,7 @@ import { getMousePosition } from "@/tool/mdEvent"; export default defineComponent({ components: { }, - emits: ['submitLiquefaction'], + emits: ['submitLiquefaction','clearLiquefaction'], setup(props,{emit}) { // let presentState = ref('paypal'); let liqufeaction = ref(false); @@ -357,6 +357,7 @@ export default defineComponent({ } let cancelDsign = ()=>{ liqufeaction.value = false + emit('clearLiquefaction') } let routesChange = (str)=>{ liqufeactionData[str] = Math.round(liqufeactionData[str]/10)*10; From 4f6623d5b26d8322bae5032849a7284a19e55c83 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 27 Jan 2025 16:53:59 +0800 Subject: [PATCH 54/71] fix --- .../Transaction/TransactionTable.vue | 62 ++++++------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index 905030d6..a6f9abe1 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -101,9 +101,9 @@
Search
- +
{ - return + let downloadTransaction = () => { filter.tableLoading = true; let data = setHistoryListData(); - // ?uniqueId=5956dc1e-3ae6-48bb-8c19-b7d9b4ba2332-1-83&userId=83&timeZone=Asia%2FShanghai&type=Generate - - let jsonData:any = setHistoryListData() - - let str = JSON.stringify(jsonData) - let url = 'https://develop.api.aida.com.hk/api/inquiry/queryTransaction/download' + `?params=${encodeURIComponent(str)}` - // const response:any = await axios.get(Https.httpUrls.queryTransactionDownload, { - // responseType: 'blob', // 重要：确保设置响应类型为 'blob' - // params:{params:str} - // }).then((rv)=>{ - // console.log(rv); - // }) - fetch(url,{ - headers: { - 'Authorization': `${getCookie('token')}`, // 添加 Bearer token 验证 - } - }) - .then(response => { - console.log(response); - - // return response.blob(); // 将响应转为 Blob 类型 - }) - .then((blob:any) => { - // 创建一个 URL 对象链接 Blob 数据 - console.log(blob); - - const objectURL = URL.createObjectURL(blob); - // 创建一个临时的 标签 - const link = document.createElement('a'); - link.href = objectURL; - link.download = 'download'; // 设置下载的文件名 - // 触发点击事件，下载文件 - link.click(); - // 清理 - URL.revokeObjectURL(objectURL); // 释放 objectURL - }) - .catch(error => { - }); + Https.axiosPost(Https.httpUrls.queryTransactionDownload, data).then( + (rv: any) => { + if (rv) { + fetch(rv) + .then(response => response.blob()) // 将响应转换为 Blob 对象 + .then(blob => { + // 创建一个指向 Blob 对象的 URL + const link = document.createElement('a'); + link.href = URL.createObjectURL(blob); // 将 Blob 对象转换为可下载的 URL + link.download = 'transaction'; // 设置文件名 + filter.tableLoading = false; + link.click(); // 触发下载 + URL.revokeObjectURL(link.href); // 释放 URL 对象 + }) + } + } + ); }; let lastGeTrialList = (str: string) => { clearHistoryList(); From 6ce51878f43ea95e4b00ba2c27917d8941e7ed4a Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 3 Feb 2025 13:22:34 +0800 Subject: [PATCH 55/71] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E9=83=A8=E5=88=86=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Account/frontPage/cancelRenewal.vue | 9 +++-- src/component/DetailCopy/designDetail.vue | 11 +++--- src/component/DetailCopy/model/index.vue | 2 ++ .../DetailCopy/model/modelPosition.vue | 6 ++-- src/component/HomePage/ExportModel.vue | 36 +++++++++---------- src/lang/cn.ts | 3 +- src/lang/en.ts | 3 +- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue index b822754c..d78ea3f9 100644 --- a/src/component/Account/frontPage/cancelRenewal.vue +++ b/src/component/Account/frontPage/cancelRenewal.vue @@ -14,7 +14,7 @@
-
+
{{ $t('cancelRenewal.Continue') }}
{{ $t('cancelRenewal.cancel') }}
@@ -166,8 +166,13 @@ export default defineComponent({ >.cause_list{ > .cause_item{ display: flex; + align-items: center; + font-size: 1.6rem; + font-weight: 600; input{ margin-right: 1rem; + width: 2.2rem; + height: 2.2rem; } } >textarea{ diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue index a44841b1..0e5842e9 100644 --- a/src/component/DetailCopy/designDetail.vue +++ b/src/component/DetailCopy/designDetail.vue @@ -58,7 +58,7 @@