Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
W
WebPublic
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
前端开发小组
WebPublic
Commits
918883fe
提交
918883fe
authored
1月 04, 2022
作者:
钟是志
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
签章组件 支持自定义图片宽度
上级
465eb2f8
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
59 行增加
和
53 行删除
+59
-53
PictureSignature.js
one_stop_public/libs/PictureSignature/PictureSignature.js
+58
-52
styles.less
one_stop_public/libs/PictureSignature/styles.less
+1
-1
没有找到文件。
one_stop_public/libs/PictureSignature/PictureSignature.js
浏览文件 @
918883fe
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
styles
from
'./styles.less'
;
import
styles
from
'./styles.less'
;
import
{
Modal
,
Button
,
Icon
,
message
}
from
'antd'
;
import
{
Modal
,
Button
,
Icon
,
message
}
from
'antd'
;
import
ShowItem
,
{
dragEventList
,
zipImage
}
from
'./ShowItem'
;
import
ShowItem
,
{
dragEventList
,
zipImage
}
from
'./ShowItem'
;
import
{
apiRequest
}
from
"../../utils/request"
;
import
{
apiRequest
}
from
'../../utils/request'
;
import
{
deepCopy
}
from
"@/webPublic/one_stop_public/utils/myutils"
;
import
{
deepCopy
}
from
'@/webPublic/one_stop_public/utils/myutils'
;
let
fakeFileInfo
=
{
let
fakeFileInfo
=
{
path
:
'/u/202112/25143111x0ki.jpg'
,
// 超大的图片
path
:
'/u/202112/25143111x0ki.jpg'
,
// 超大的图片
name
:
'摇摇后摇.jpg'
,
name
:
'摇摇后摇.jpg'
,
};
};
const
getContent
=
(
signConfig
=
[],
ratioX
)
=>
{
const
getContent
=
(
signConfig
=
[],
ratioX
)
=>
{
let
data
=
deepCopy
(
signConfig
);
let
data
=
deepCopy
(
signConfig
);
return
JSON
.
stringify
({
return
JSON
.
stringify
({
objs
:
data
.
map
(
(
g
)
=>
{
objs
:
data
.
map
(
g
=>
{
// 1200 的 x => 1500的 x
// 1200 的 x => 1500的 x
//
//
g
.
x
=
Math
.
ceil
(
g
.
x
*
ratioX
,
10
);
g
.
x
=
Math
.
ceil
(
g
.
x
*
ratioX
,
10
);
...
@@ -25,7 +24,7 @@ const getContent = (signConfig = [], ratioX) => {
...
@@ -25,7 +24,7 @@ const getContent = (signConfig = [], ratioX) => {
g
.
y
=
g
.
y
+
20
;
g
.
y
=
g
.
y
+
20
;
// g.x = g.x + 20;
// g.x = g.x + 20;
}
}
if
(
g
.
type
===
'image'
)
{
if
(
g
.
type
===
'image'
)
{
g
.
w
=
Math
.
ceil
(
g
.
w
*
ratioX
);
g
.
w
=
Math
.
ceil
(
g
.
w
*
ratioX
);
g
.
h
=
Math
.
ceil
(
g
.
h
*
ratioX
);
g
.
h
=
Math
.
ceil
(
g
.
h
*
ratioX
);
}
}
...
@@ -35,7 +34,6 @@ const getContent = (signConfig = [], ratioX) => {
...
@@ -35,7 +34,6 @@ const getContent = (signConfig = [], ratioX) => {
});
});
};
};
export
default
function
PictureSignature
({
export
default
function
PictureSignature
({
json
,
json
,
disabled
,
disabled
,
...
@@ -45,18 +43,18 @@ export default function PictureSignature({
...
@@ -45,18 +43,18 @@ export default function PictureSignature({
form
,
form
,
// fileInfo,
// fileInfo,
...
others
...
others
})
{
})
{
let
imageRef
=
useRef
();
let
imageRef
=
useRef
();
const
[
fileInfo
,
setFileInfo
]
=
useState
({
...
others
?.
fileInfo
});
const
[
fileInfo
,
setFileInfo
]
=
useState
({
...
others
?.
fileInfo
});
// const [fileInfo, setFileInfo] = useState(fakeFileInfo);
// const [fileInfo, setFileInfo] = useState(fakeFileInfo);
const
[
openEdit
,
setOpenEdit
]
=
useState
(
false
);
const
[
openEdit
,
setOpenEdit
]
=
useState
(
false
);
const
[
showModal
,
setShowModal
]
=
useState
(
false
);
const
[
showModal
,
setShowModal
]
=
useState
(
false
);
const
[
otherProps
,
setOtherProps
]
=
useState
({});
const
[
otherProps
,
setOtherProps
]
=
useState
({});
const
[
imageInfo
,
setImageInfo
]
=
useState
(
null
);
const
[
imageInfo
,
setImageInfo
]
=
useState
(
null
);
const
changeShowModal
=
()
=>
{
const
changeShowModal
=
()
=>
{
if
(
!
showModal
)
{
if
(
!
showModal
)
{
if
(
!
imageInfo
&&
!
disabled
)
{
if
(
!
imageInfo
&&
!
disabled
)
{
zipImage
(
fileInfo
.
path
,
fileInfo
.
name
,
otherProps
?.
backgroundImageWidth
).
then
(
(
res
)
=>
{
zipImage
(
fileInfo
.
path
,
fileInfo
.
name
,
otherProps
?.
backgroundImageWidth
).
then
(
res
=>
{
let
image
=
new
Image
();
//新建一个img标签(还没嵌入DOM节点)
let
image
=
new
Image
();
//新建一个img标签(还没嵌入DOM节点)
image
.
src
=
basicUrl
+
res
;
image
.
src
=
basicUrl
+
res
;
image
.
onload
=
()
=>
{
image
.
onload
=
()
=>
{
...
@@ -83,7 +81,6 @@ export default function PictureSignature({
...
@@ -83,7 +81,6 @@ export default function PictureSignature({
imageRef
.
current
=
true
;
imageRef
.
current
=
true
;
dragEventList
(
setOtherProps
,
otherProps
);
dragEventList
(
setOtherProps
,
otherProps
);
}
}
},
[
otherProps
]);
},
[
otherProps
]);
useEffect
(()
=>
{
useEffect
(()
=>
{
...
@@ -100,21 +97,28 @@ export default function PictureSignature({
...
@@ -100,21 +97,28 @@ export default function PictureSignature({
}
}
},
[
json
.
otherProps
]);
},
[
json
.
otherProps
]);
const
{
ModalProps
,
signConfig
,
footerButtons
,
originButtons
,
backgroundImageWidth
,
saveSignConfigValue
=
''
}
=
otherProps
;
const
{
ModalProps
,
signConfig
,
footerButtons
,
originButtons
,
backgroundImageWidth
,
saveSignConfigValue
=
''
,
showImageWidth
=
1200
,
}
=
otherProps
;
const
handleClickButton
=
(
clickType
)
=>
{
const
handleClickButton
=
clickType
=>
{
switch
(
clickType
)
{
switch
(
clickType
)
{
case
'startEdit'
:
// 开始签章
case
'startEdit'
:
// 开始签章
// console.log(imageInfo);
// console.log(imageInfo);
setOpenEdit
(
true
);
setOpenEdit
(
true
);
break
;
break
;
case
'confirm'
:
// 确定
case
'confirm'
:
// 确定
onChangeFile
({
...
fileInfo
},
imageIndex
);
onChangeFile
({...
fileInfo
},
imageIndex
);
changeShowModal
();
changeShowModal
();
break
;
break
;
case
'save'
:
// 保存签章
case
'save'
:
// 保存签章
let
ratioX
=
backgroundImageWidth
/
1200
;
// 本来是 1500 的 图片 宽度变成了 1200 高度变成了 1200/1500 * imageInfo.height;
let
ratioX
=
backgroundImageWidth
/
showImageWidth
;
// 本来是 1500 的 图片 宽度变成了 1200 高度变成了 1200/1500 * imageInfo.height;
// let ratioY = 1200 / backgroundImageWidth * imageInfo.height;
// let ratioY = 1200 / backgroundImageWidth * imageInfo.height;
// console.log(ratioX);
// console.log(ratioX);
// return ;
// return ;
...
@@ -122,33 +126,33 @@ export default function PictureSignature({
...
@@ -122,33 +126,33 @@ export default function PictureSignature({
apiRequest
(
'/ImageLibApi/merge'
,
{
apiRequest
(
'/ImageLibApi/merge'
,
{
background
:
fileInfo
?.
path
,
background
:
fileInfo
?.
path
,
content
,
content
,
}).
then
(
(
res
)
=>
{
}).
then
(
res
=>
{
if
(
form
&&
saveSignConfigValue
)
{
if
(
form
&&
saveSignConfigValue
)
{
form
.
setFieldsValue
({
form
.
setFieldsValue
({
[
saveSignConfigValue
]:
content
,
[
saveSignConfigValue
]:
content
,
})
})
;
}
}
if
(
res
&&
res
.
path
)
{
if
(
res
&&
res
.
path
)
{
message
.
success
(
'操作成功'
);
message
.
success
(
'操作成功'
);
let
newPath
=
res
.
path
;
let
newPath
=
res
.
path
;
fileInfo
.
originPath
=
fileInfo
.
path
;
fileInfo
.
originPath
=
fileInfo
.
path
;
fileInfo
.
path
=
newPath
;
fileInfo
.
path
=
newPath
;
setFileInfo
({
...
fileInfo
});
setFileInfo
({
...
fileInfo
});
setOpenEdit
(
false
);
setOpenEdit
(
false
);
}
}
})
})
;
break
;
break
;
case
'restore'
:
// 还原图片
case
'restore'
:
// 还原图片
if
(
fileInfo
.
originPath
)
{
if
(
fileInfo
.
originPath
)
{
fileInfo
.
path
=
fileInfo
.
originPath
;
fileInfo
.
path
=
fileInfo
.
originPath
;
setFileInfo
({
...
fileInfo
});
setFileInfo
({
...
fileInfo
});
setOpenEdit
(
false
);
setOpenEdit
(
false
);
}
}
break
;
break
;
default
:
default
:
return
true
;
return
true
;
}
}
}
}
;
const
Footer
=
()
=>
{
const
Footer
=
()
=>
{
if
(
disabled
)
{
if
(
disabled
)
{
...
@@ -157,10 +161,11 @@ export default function PictureSignature({
...
@@ -157,10 +161,11 @@ export default function PictureSignature({
if
(
openEdit
)
{
if
(
openEdit
)
{
return
footerButtons
.
map
(
g
=>
{
return
footerButtons
.
map
(
g
=>
{
return
(
return
(
<
Button
type
=
{
g
.
type
}
<
Button
type
=
{
g
.
type
}
key
=
{
g
.
key
}
key
=
{
g
.
key
}
onClick
=
{()
=>
{
onClick
=
{()
=>
{
handleClickButton
(
g
.
clickType
)
handleClickButton
(
g
.
clickType
);
}}
}}
>
>
{
g
.
name
}
{
g
.
name
}
...
@@ -170,10 +175,11 @@ export default function PictureSignature({
...
@@ -170,10 +175,11 @@ export default function PictureSignature({
}
else
{
}
else
{
return
originButtons
.
map
(
g
=>
{
return
originButtons
.
map
(
g
=>
{
return
(
return
(
<
Button
type
=
{
g
.
type
}
<
Button
type
=
{
g
.
type
}
key
=
{
g
.
key
}
key
=
{
g
.
key
}
onClick
=
{()
=>
{
onClick
=
{()
=>
{
handleClickButton
(
g
.
clickType
)
handleClickButton
(
g
.
clickType
);
}}
}}
>
>
{
g
.
name
}
{
g
.
name
}
...
@@ -187,8 +193,7 @@ export default function PictureSignature({
...
@@ -187,8 +193,7 @@ export default function PictureSignature({
}
}
// console.log(imageInfo, fileInfo);
// console.log(imageInfo, fileInfo);
return
(
return
(
<
div
className
=
{
styles
.
outSideDiv
}
<
div
className
=
{
styles
.
outSideDiv
}
>
>
{
fileInfo
&&
fileInfo
?.
path
&&
(
{
fileInfo
&&
fileInfo
?.
path
&&
(
<
img
<
img
className
=
{
styles
.
onePic
}
className
=
{
styles
.
onePic
}
...
@@ -205,9 +210,9 @@ export default function PictureSignature({
...
@@ -205,9 +210,9 @@ export default function PictureSignature({
onCancel
=
{
changeShowModal
}
onCancel
=
{
changeShowModal
}
getContainer
=
{
false
}
getContainer
=
{
false
}
className
=
{
styles
.
ModalClass
}
className
=
{
styles
.
ModalClass
}
footer
=
{
<
Footer
/>
}
footer
=
{
<
Footer
/>
}
title
=
{
'图片签章'
}
title
=
{
'图片签章'
}
width
=
{
'1250
px'
}
width
=
{
showImageWidth
+
50
+
'
px'
}
bodyStyle
=
{{
bodyStyle
=
{{
minHeight
:
'700px'
,
minHeight
:
'700px'
,
overflow
:
'auto'
,
overflow
:
'auto'
,
...
@@ -223,8 +228,8 @@ export default function PictureSignature({
...
@@ -223,8 +228,8 @@ export default function PictureSignature({
className
=
{
styles
.
modalDiv
}
className
=
{
styles
.
modalDiv
}
style
=
{{
style
=
{{
backgroundImage
:
`url(
${
basicUrl
+
fileInfo
?.
path
})
`,
backgroundImage
:
`url(
${
basicUrl
+
fileInfo
?.
path
})
`,
width:
1200
,
width:
showImageWidth
,
height:
(imageInfo.height / (imageInfo.width / 1200)
),
height:
imageInfo.height / (imageInfo.width / showImageWidth
),
}}
}}
alt={'拖拽区域'}
alt={'拖拽区域'}
draggable={false}
draggable={false}
...
@@ -243,14 +248,10 @@ export default function PictureSignature({
...
@@ -243,14 +248,10 @@ export default function PictureSignature({
left: g.x,
left: g.x,
}}
}}
>
>
<div className={styles.draggableIcon}
<div className={styles.draggableIcon} data-mes={g.key} draggable={true}>
data-mes={g.key}
draggable={true}>
<Icon type="scissor" />
<Icon type="scissor" />
</div>
</div>
<ShowItem {...g}
<ShowItem {...g} basicUrl={basicUrl} />
basicUrl={basicUrl}
/>
</div>
</div>
);
);
})}
})}
...
@@ -261,6 +262,9 @@ export default function PictureSignature({
...
@@ -261,6 +262,9 @@ export default function PictureSignature({
<img
<img
src={basicUrl + fileInfo?.path}
src={basicUrl + fileInfo?.path}
alt={fileInfo.name}
alt={fileInfo.name}
style={{
width: `
$
{
showImageWidth
}
px
`,
}}
/>
/>
</div>
</div>
)}
)}
...
@@ -272,29 +276,31 @@ export default function PictureSignature({
...
@@ -272,29 +276,31 @@ export default function PictureSignature({
}
}
export function SignArray(props) {
export function SignArray(props) {
const {
value, onChange, basicUrl, json, form
} = props;
const {
value, onChange, basicUrl, json, form
} = props;
// console.log(props);
// console.log(props);
let files = value?.files || [];
let files = value?.files || [];
const onChangeFile = (newFielInfo, imageIndex) => {
const onChangeFile = (newFielInfo, imageIndex) => {
if
(newFielInfo && newFielInfo.path)
{
if
(newFielInfo && newFielInfo.path)
{
files[imageIndex] = newFielInfo;
files[imageIndex] = newFielInfo;
value.files = files;
value.files = files;
onChange(value);
onChange(value);
}
}
}
}
;
// console.log(value, '222222222222222')
// console.log(value, '222222222222222')
return <div>
return (
{
<div>
files.map((g, index) => {
{files.map((g, index) => {
return <PictureSignature json={json}
return (
<PictureSignature
json={json}
basicUrl={basicUrl}
basicUrl={basicUrl}
fileInfo={g}
fileInfo={g}
form={form}
form={form}
imageIndex={index}
imageIndex={index}
onChangeFile={onChangeFile}
onChangeFile={onChangeFile}
/>
/>
})
);
}
})
}
</div>
</div>
);
}
}
one_stop_public/libs/PictureSignature/styles.less
浏览文件 @
918883fe
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
place-items: center;
place-items: center;
//min-height: 800px;
//min-height: 800px;
img{
img{
width: 1200px;
//
width: 1200px;
height: auto;
height: auto;
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论