Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

zyd_private/DragAndPrint/DragSetting.js

@@ -7,10 +7,37 @@
  * 在up 的时候 更新元素dom的新位置到props
  * */
 
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import styles from './index.less';
+import { InputNumber } from 'antd';
 import { imageStyleAll, A4Height, A4Width, styleCount } from './ViewPrint/config';
 
+let domIdTemp = '';
+
+const HandleDetailFunction = ({ isDownObj }) => {
+  for (let item in isDownObj) {
+    if (isDownObj[item]) {
+      domIdTemp = item;
+    }
+  }
+  if (!domIdTemp) {
+    return null;
+  }
+  const dom = document.getElementById(domIdTemp);
+  const x = dom.style.left;
+  const y = dom.style.top;
+  return <Fragment >
+    <span dangerouslySetInnerHTML={{ __html: dom.innerHTML }} />
+    <InputNumber precision={0}
+                 min={0}
+                 value={x}/>
+    <InputNumber precision={0}
+                 min={0}
+                 value={y}/>
+  </Fragment>;
+};
+
+
 export default class Index extends Component {
   constructor(props) {
     super(props);
@@ -26,7 +53,7 @@ export default class Index extends Component {
     };
   }
 
-	handleOnMouseDown = (e, id) => {
+  handleOnMouseDown = (e, id) => { // 鼠标按钮 按下
     const div = document.getElementById(id);
     const { isDownObj } = this.state;
     const newDrag = {
@@ -46,7 +73,7 @@ export default class Index extends Component {
     });
   };
 
-	handleOnMouseMove = (e) => {
+  handleOnMouseMove = (e) => { // 鼠标 移动
     const { drag, isDownObj } = this.state;
     if (new Date().getTime() - this.time1 < 17) {
       this.time1 = new Date().getTime();
@@ -86,7 +113,7 @@ export default class Index extends Component {
     }
   };
 
-	handleOnMouseUp = (e, id) => {
+  handleOnMouseUp = (e, id) => { // 鼠标 按钮 收起
     const { drag, isDownObj } = this.state;
     let { mouseX, mouseY, objX, objY } = drag;
     if (isDownObj[id]) {
@@ -121,16 +148,18 @@ export default class Index extends Component {
   render() {
     const {
       backgroundUrl,
-			configAll: { config, wide, high, },
+      configAll: { config, wide, high },
     } = this.props;
-
+    const { isDownObj } = this.state;
     const imageStyle = {
       height: `${high}cm` || A4Height,
       width: `${wide}cm` || A4Width,
     };
-    console.log(imageStyle);
     return (
       <div className={styles.outSideDiv}>
+       {/* <div style={{ marginLeft: '45%', height: '100px' }}>
+          <HandleDetailFunction isDownObj={isDownObj}/>
+        </div>*/}
         <div
           onMouseMove={(e) => {
             this.handleOnMouseMove(e);
@@ -155,11 +184,13 @@ export default class Index extends Component {
                 key={item.id}
                 onMouseDown={(e) => {
                   this.handleOnMouseDown(e, domId);
+                  console.log(domId);
                 }}
                 onMouseUp={(e) => {
                   this.handleOnMouseUp(e, domId);
                 }}
                 id={domId}
+
                 style={{
                   top: `${item.y || 20 + index * 40}px`,
                   left: `${item.x || 20}px`,

zyd_private/DragAndPrint/ViewPrint/index2.js

 import React, { Component, Fragment } from 'react';
 import { queryConfig } from '../services';
 import { getInfo } from '@/highOrderComponent/Service';
-import { message, Button } from 'antd';
+import { message } from 'antd';
 import Shell from '@/baseComponent/Shell';
 import ButtonDiy from '@/baseComponent/ButtonDiy';
 import router from 'umi/router';
@@ -101,9 +101,7 @@ export default class ViewPrint extends Component {
     } else {
       info = defaultConfigInfo;
     }
-    console.log(info);
     const { printMeth } = configAll;
-    const { wide, high } = configAll;
     const { LODOP } = window;
     let dom = document.getElementById(`printDomId-${printIndex}`);
     if (optionType >= 1) {
@@ -114,8 +112,11 @@ export default class ViewPrint extends Component {
       return false;
     }
     const strHTML = dom.innerHTML;
+    if(!LODOP.PageDataEx || !LODOP.PageDataEx.companyname || !LODOP.PageDataEx.license){
+      console.log(LODOP.PageDataEx, 'license未注入成功,正在重新注册');
       LODOP.SET_SHOW_MODE('LANGUAGE', 0);
       LODOP.SET_LICENSES('成都市知用科技有限公司', '649677881727389907689190562356', '', '');
+    }
     // LODOP.PRINT_INITA(0, 0, `${wide}cm`, `${high}cm`, `printDomId${printIndex}`);
     LODOP.PRINT_INIT(`${Math.random() * 10000 + 'test'}`);
     LODOP.SET_PRINT_MODE('RESELECT_PAGESIZE', true);