react_hsbc_teller 1.4.4 → 1.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",

package/packages/pages/video/video.jsx

@@ -68,6 +68,7 @@ class Video extends Component {
   cancel = axios.CancelToken.source()
   signCanvas = React.createRef();
   state = {
+    signNoClick: false,
     listVideoPicture: [],
     isScreenSwitching: false,
     whiteboardWidth: '',
@@ -278,6 +279,7 @@ class Video extends Component {
     try {
       let result = await API.getBase64Image({ fileName: data});
       console.log('getBase64Image',result)
+      this.tabTitlesClick('customerScreen', 'delect')
       this.props.imgCallback({
         type: result.data.type + '', 
         file: result.data.base64Image}
@@ -1453,6 +1455,7 @@ class Video extends Component {
       else if (Mival.typeId == 1220) {
         // 一炒多的图片
         if (Mival.sessionId == this.state.sessionId) {
+          this.tabTitlesClick('customerScreen', 'delect')
           this.props.imgCallback({
             type: Mival.data.type + '', 
             file: Mival.data.file}
@@ -1463,6 +1466,7 @@ class Video extends Component {
       } else if (Mival.typeId == 1216) {
         // 签字回调
         if (Mival.sessionId == this.state.sessionId) {
+          this.tabTitlesClick('customerScreen', 'delect')
           this.props.signatureCallback()
         }
       } else if (Mival.typeId == 1218) {
@@ -4017,11 +4021,30 @@ class Video extends Component {
     }
   }
   handleOkSign = () => {
+    console.log(this.signCanvas.current.canvas.drawing.toDataURL('image/png'))
     this.props.imgRMCallback(
       this.signCanvas.current.canvas.drawing.toDataURL('image/png').replace(/data.+?;base64,/, "")
     )
   }
+  onCancelSign=()=>{
+    this.setState({
+      signNoClick: false
+    })
+    this.props.onCancelSign()
+  }
+  signImage=()=>{
+    if(!this.state.signNoClick) {
+      this.setState({
+        signNoClick: true
+      })
+    }
+  }
   handleCancelSign=()=>{
+    if(this.state.signNoClick) {
+      this.setState({
+        signNoClick: false
+      })
+    }
     this.signCanvas.current.clear()
   }
   
@@ -5034,15 +5057,20 @@ class Video extends Component {
             
             
           </Modal>
-          <Modal title="签字白板" width={600} destroyOnClose={true} closable={false} centered={true} visible={isTranscribing} footer={
+          <Modal title="签字白板" width={600} destroyOnClose={true} centered={true} visible={isTranscribing} onCancel={this.onCancelSign} footer={
             [
               <div key='okSign'>
                 <Button className="modelButtonCancel" onClick={this.handleCancelSign}>清除</Button>
-              <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSign}>确定</Button>
+                {
+                  this.state.signNoClick && <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSign}>确定</Button>
+                }
+              {
+                !this.state.signNoClick && <Button className="modelButtonCancel" type="primary" danger >确定</Button>
+              }
               </div>
             ]
           }>
-            <div className="content">
+            <div className="content" onClick={this.signImage}>
               <CanvasDraw
                 ref={this.signCanvas}
                 brushColor="#000"
@@ -5051,6 +5079,7 @@ class Video extends Component {
                 canvasWidth="100%"
                 canvasHeight="100%"
                 hideGrid={true}
+                
               ></CanvasDraw>
             </div>
           </Modal>

package/packages/pages/video/video.less

@@ -326,6 +326,7 @@
   font-size: 16px!important;
   color: #5C5C5C!important;
   border: 1px #5C5C5C solid!important;
+  background: #d9d9d9!important;
   border-spacing: 20px!important;
 }
 .modelButtonCancelOne{