同步报价

陈鑫涛
1 parent f412b387
Showing 6 changed files with 1051 additions and 700 deletions
src/components/Common/BoxDesignCompontent/index.js
src/components/Common/BoxDesignCompontent/svg.js
src/components/Common/CommonComponent/index.js
src/components/Common/CommonTable/index.js
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
@@ -24,6 +24,7 @@ const BoxDesignEvent = props =&gt; {
       setLoading(false);
       if (!tableData?.length) return
       const shape = tableData?.find(x => x.iTag === 70)?.showDropDown
+      if (!shape) return
       const JsonShape = JSON.parse(shape)
       const arr = Array.from(Object.values(JsonShape));
       setOptions([
@@ -166,6 +167,7 @@ const BoxDesignCompontent = baseProps =&gt; {
     setTableDataList(newList);
     setTableDataLists(newList);
     const shape = tableData.find(x => x.iTag === 70)?.showDropDown
+    if (!shape) return
     const JsonShape = JSON.parse(shape)
     const shapeLists = Array.from(Object.values(JsonShape))
     setShapeList(shapeLists)
@@ -437,6 +439,10 @@ const BoxDesignCompontent = baseProps =&gt; {
         setTopDoubleBoxList(box.filter(topBoxFilter));
         setLeftDoubleBoxList(box.filter(leftBoxFilter));
         setRightDoubleBoxList(box.filter(rightBoxFilter));
+      } else if (Number(type) === 9) {
+        setTopBoxList([])
+        setLeftBoxList([])
+        setRightBoxList([])
       } else {
         const box = [...boxList];
         box.forEach(x => {
@@ -558,11 +564,7 @@ const BoxDesignCompontent = baseProps =&gt; {
     }
     setBoxList(updatedBoxList);
   };
-  // const getImage = fileName => {
-  //   // const imageUrl = `${commonConfig.file_host}file/download?savePathStr=${fileName}&sModelsId=100&token=${props.token}`;
-  //   const imageUrl = `${commonConfig.file_host}file/download?savePathStr=${fileName}&scale=0.1&sModelsId=100&token=${props.token}`;
-  //   return imageUrl;
-  // };
+
   const removeExtension = (filename) => {
     const lastDotIndex = filename.lastIndexOf('.');
     if (lastDotIndex === -1) {
@@ -69,9 +69,10 @@ const SvgBox = props =&gt; {
   useEffect(() => {
     setTimeout(() => {
       const svg = svgRef.current;
-      if (svg) {
-        initSVG();
+     if (svg) {
+        initSVG()
       }
+
     }, 0);
   }, [boxList, svgType]);
@@ -343,6 +344,8 @@ const SvgBox = props =&gt; {
       const rightOffect = boxList.find(x => x.sName === "右偏移")?.value || 0;
       viewBoxWidth = Math.max(topLength, bottomLength) + Number(leftOffect) + Number(rightOffect);
       viewBoxHeight = Number(headWidth) + Number(orderWidth) + max;
+    } else if (Number(svgType) === 9) {
+
     }
     // 计算缩放比例
     let scale = 1;
@@ -412,6 +415,10 @@ const SvgBox = props =&gt; {
           xSvg = Math.max(Math.abs(bottomLength), Math.abs(topLength));
         } else if (Number(svgType) === 4) {
           xSvg = (boxHeight * 2 + boxLength) / 2;
+        } else if (Number(svgType) === 9) {
+          // const data = calculateCupDimensionsAndStart(boxLength, boxWidth, boxHeight, g)
+          // xSvg = (data?.startX + 100) * scale
+          // ySvg = (data?.startDistance + 100) * scale
         } else {
           xSvg = zbtb?.value;
         }
@@ -423,6 +430,7 @@ const SvgBox = props =&gt; {
           `${-(xSvg * scale)} ${dSvgBoxWidth ? (dSvgBoxWidth === 100 ? -ySvg : 0) : -ySvg} ${dSvgBoxWidth ? dSvgBoxWidth + ySvg : 500} ${dSvgBoxHeight ? dSvgBoxHeight - ySvg - bottom * scale : 250 + ySvg
           }`
         );
+
         svg.setAttribute("width", `${dSvgBoxWidth ? dSvgBoxWidth : 500}px`);
         svg.setAttribute("height", `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`);
         svgContainerRef.current.style.width = `${dSvgBoxWidth ? dSvgBoxWidth : 500}px`;
@@ -481,6 +489,10 @@ const SvgBox = props =&gt; {
           xSvg = Math.max(Math.abs(bottomLength), Math.abs(topLength));
         } else if (Number(svgType) === 4) {
           xSvg = (boxHeight * 2 + boxLength) / 2;
+        } else if (Number(svgType) === 9) {
+          // const data = calculateCupDimensionsAndStart(boxLength, boxWidth, boxHeight, g)
+          // xSvg = (data?.startX + 150) * scale
+          // ySvg = (data?.startDistance + 100) * scale
         } else {
           xSvg = zbtb?.value;
         }
@@ -492,6 +504,7 @@ const SvgBox = props =&gt; {
           "viewBox",
           `${-xSvg} ${dSvgBoxWidth ? -0 : -ySvg} ${dSvgBoxWidth ? dSvgBoxWidth : 500} ${dSvgBoxHeight ? dSvgBoxHeight : 250}`
         );
+
         svg.setAttribute("width", `${dSvgBoxWidth ? dSvgBoxWidth : 500}px`);
         svg.setAttribute("height", `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`);
         svgContainerRef.current.style.width = `${dSvgBoxWidth ? dSvgBoxWidth : 500}px`;
@@ -567,6 +580,10 @@ const SvgBox = props =&gt; {
         const bottomLength = headLength / 2 - orderLength + -bottomLeft - Number(leftOffect);
         leftSize = Math.max(Math.abs(bottomLength), Math.abs(topLength));
         ySvg = topOffect(boxList, headLength, headWidth, props);
+      } else if (Number(svgType) === 9) {
+        // const data = calculateCupDimensionsAndStart(boxLength, boxWidth, boxHeight, g)
+        // leftSize = -data?.startX
+        // ySvg = (data?.startDistance) * scale
       } else {
         leftSize = zbtb?.value;
         if (zbtb?.type === "8009") {
@@ -658,6 +675,10 @@ const SvgBox = props =&gt; {
         const bottomLength = headLength / 2 - orderLength + -bottomLeft - Number(leftOffect);
         leftSize = Math.max(Math.abs(bottomLength), Math.abs(topLength));
         ySvg = topOffect(boxList, headLength, headWidth, props);
+      } else if (Number(svgType) === 9) {
+        // const data = calculateCupDimensionsAndStart(boxLength, boxWidth, boxHeight, g)
+        // leftSize = -data?.startX
+        // ySvg = (data?.startDistance) * scale
       } else {
         leftSize = zbtb?.value;
       }
@@ -5179,10 +5200,107 @@ const SvgBox = props =&gt; {
       svg.appendChild(g);
     } else if (Number(svgType) === 9) {
-      //  g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height))
-       svg.appendChild(g);
+      svg.appendChild(drawCup(boxLength, boxWidth, boxHeight, g));
+      const result = calculateCupUnfoldDimensions(boxLength, boxWidth, boxHeight)
+      if (props.showNew !== 0) {
+        const w = result.width
+        const h = result.height
+        svg.setAttribute('viewBox', `${result.points.outerLeft.x} ${result.points.topCenter.y} ${w} ${h}`);
+        svg.setAttribute("width", `${dSvgBoxWidth ? dSvgBoxWidth : 500}px`);
+        svg.setAttribute("height", `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`);
+      }
+
     }
+
   };
+  function calculateCupUnfoldDimensions(D, d, h) {
+
+    const R1 = D / 2;  // 上口半径
+    const R2 = d / 2;  // 底部半径
+
+    // 1. 计算母线长 l
+    const deltaR = R1 - R2;
+    const l = Math.sqrt(deltaR * deltaR + h * h);
+
+    // 2. 计算外半径 R 和内半径 r
+    const R = (R1 * l) / deltaR;  // 外半径
+    const r = R - l;              // 内半径
+
+    // 3. 计算圆心角 θ（弧度）
+    const theta_rad = (2 * Math.PI * R1) / R;
+    const halfTheta = theta_rad / 2;
+
+    // 4. 计算弦长（水平宽度）
+    const chord = 2 * R * Math.sin(halfTheta);
+
+    // 5. 展开图垂直高度
+    const y_top = -R;  // 外弧中点（最高点）
+    const y_inner_end = -r * Math.cos(halfTheta);
+    const verticalHeight = y_inner_end - y_top;
+
+    // ✅ 新增：计算关键点坐标（以圆心为原点，y 向上为正）
+    // 注意：数学坐标系中，角度从 x 轴开始逆时针，但我们希望顶部在 y 轴负方向
+    // 所以我们把角度偏移 -90°（即 -π/2），让 0° 指向正上方
+
+    const angleOffset = -Math.PI / 2; // 使 0° 指向顶部
+
+    const points = {
+      outerCenter: {
+        x: R * Math.cos(halfTheta + angleOffset),
+        y: R * Math.sin(halfTheta + angleOffset)
+      },
+      outerLeft: {
+        x: R * Math.cos(-halfTheta + angleOffset),
+        y: R * Math.sin(-halfTheta + angleOffset)
+      },
+      outerRight: {
+        x: R * Math.cos(halfTheta + angleOffset),
+        y: R * Math.sin(halfTheta + angleOffset)
+      },
+      innerLeft: {
+        x: r * Math.cos(-halfTheta + angleOffset),
+        y: r * Math.sin(-halfTheta + angleOffset)
+      },
+      innerRight: {
+        x: r * Math.cos(halfTheta + angleOffset),
+        y: r * Math.sin(halfTheta + angleOffset)
+      },
+      // 也可以计算顶部中点（0° 方向）
+      topCenter: {
+        x: 0,
+        y: -R  // 正上方
+      },
+      bottomLeft: {
+        x: -chord / 2,
+        y: -r * Math.cos(halfTheta)
+      },
+      bottomRight: {
+        x: chord / 2,
+        y: -r * Math.cos(halfTheta)
+      }
+    };
+
+    // 如果你需要用于 SVG（y 向下为正），可以转换
+    const pointsForSVG = Object.keys(points).reduce((acc, key) => {
+      acc[key] = {
+        x: points[key].x,
+        y: -points[key].y  // 反转 y 轴
+      };
+      return acc;
+    }, {});
+
+    return {
+      width: chord,
+      height: verticalHeight,
+      R, r, l,
+      theta_deg: (theta_rad * 180) / Math.PI,
+      points,           // 数学坐标系（y 向上）
+      pointsForSVG,     // SVG 坐标系（y 向下）
+      chord,
+      verticalHeight
+    };
+  }
+
   // 计算头部偏移
   const topOffect = (list, length, width, height, props) => {
     const val = list.filter(x => x.type);
@@ -5369,6 +5487,119 @@ const SvgBox = props =&gt; {
     // if (svg === 4) top = Number(top) + Number(height);
     return isNaN(top) ? 0 : top;
   };
+  // 将角度转换为弧度
+  const degToRad = (degrees) => {
+    return degrees * (Math.PI / 180);
+  }
+
+  // 将弧度转换为角度
+  const radToDeg = (radians) => {
+    return radians * (180 / Math.PI);
+  }
+  const drawCup = (w, h, d, g) => {
+    const R1 = w / 2;
+    const R2 = h / 2;
+    const H = d;
+
+    // 1. 计算基础参数
+    const l = Math.sqrt(Math.pow(R1 - R2, 2) + Math.pow(H, 2)); // 斜高
+    const R = (R1 * l) / (R1 - R2); // 扇形外弧半径
+    const r = R - l; // 扇形内弧半径
+    const theta_rad = (2 * Math.PI * R1) / R; // 圆心角（弧度）
+    const theta_deg = radToDeg(theta_rad); // 圆心角（度）
+
+    // 2. 计算SVG路径关键点坐标
+    // 外弧起点和终点 (相对于新的坐标系)
+    const x1_outer = R * Math.sin(-theta_rad / 2); // 使用 sin 对应 x
+    const y1_outer = -R * Math.cos(-theta_rad / 2); // 使用 -cos 对应 y，使其开口向上
+    const x2_outer = R * Math.sin(theta_rad / 2);
+    const y2_outer = -R * Math.cos(theta_rad / 2);
+
+    // 内弧起点和终点 (现在与外弧圆心角相同)
+    const x1_inner = r * Math.sin(-theta_rad / 2);
+    const y1_inner = -r * Math.cos(-theta_rad / 2);
+    const x2_inner = r * Math.sin(theta_rad / 2);
+    const y2_inner = -r * Math.cos(theta_rad / 2);
+
+    // 3. 计算主展开形状SVG路径
+    // 大扇形外弧路径 (逆时针)
+    const isLargeArcOuter = theta_deg > 180 ? 1 : 0;
+    const outerArcPath = `M ${x1_outer} ${y1_outer} A ${R} ${R} 0 ${isLargeArcOuter} 1 ${x2_outer} ${y2_outer}`;
+
+    // 连接到内弧终点的直线
+    const lineToInnerEnd = `L ${x2_inner} ${y2_inner}`;
+
+    // 内弧路径 (顺时针)
+    const isLargeArcInner = theta_deg > 180 ? 1 : 0; // 内弧圆心角与外弧相同
+    const innerArcPath = `A ${r} ${r} 0 ${isLargeArcInner} 0 ${x1_inner} ${y1_inner}`;
+
+    // 连接回外弧起点的直线并闭合
+    const lineToOuterStartClose = `L ${x1_outer} ${y1_outer} Z`;
+
+    // 4. 组合路径数据
+    const pathData = `${outerArcPath} ${lineToInnerEnd} ${innerArcPath} ${lineToOuterStartClose}`;
+
+    // 5. 创建SVG Path元素
+    const svgNS = "http://www.w3.org/2000/svg";
+    const pathElement = document.createElementNS(svgNS, 'path');
+    pathElement.setAttribute('d', pathData);
+    pathElement.setAttribute('fill', 'transparent');
+    pathElement.setAttribute('stroke', '#7588B9');
+    pathElement.setAttribute('stroke-width', '1');
+    pathElement.setAttribute('id', 'cupPath');
+    g.appendChild(pathElement);
+    return pathElement;
+  }
+
+  const calculateCupDimensionsAndStart = (w, h, d) => {
+    const R1 = w / 2;
+    const R2 = h / 2;
+    const H = d;
+
+    // 输入验证
+    if (isNaN(R1) || isNaN(R2) || isNaN(H) ||
+      R1 <= R2 || R1 <= 0 || R2 < 0 || H <= 0) {
+      console.error("calculateCupDimensionsAndStart: 请输入有效的参数：R1 > R2 >= 0, H > 0");
+      return null;
+    }
+
+    // 1. 计算基础参数
+    const l = Math.sqrt(Math.pow(R1 - R2, 2) + Math.pow(H, 2)); // 斜高
+    const R = (R1 * l) / (R1 - R2); // 扇形外弧半径
+    const r = R - l; // 扇形内弧半径
+    const theta_rad = (2 * Math.PI * R1) / R; // 圆心角（弧度）
+
+    // 2. 计算SVG路径关键点坐标
+    // 外弧起点和终点 (相对于新的坐标系)
+    // 起始点是路径的第一个点
+    const startX = R * Math.sin(-theta_rad / 2); // 使用 sin 对应 x
+    const startY = -R * Math.cos(-theta_rad / 2); // 使用 -cos 对应 y，使其开口向上
+    const x2_outer = R * Math.sin(theta_rad / 2);
+    const y2_outer = -R * Math.cos(theta_rad / 2);
+
+    // 内弧起点和终点 (现在与外弧圆心角相同)
+    const x1_inner = r * Math.sin(-theta_rad / 2);
+    const y1_inner = -r * Math.cos(-theta_rad / 2);
+    const x2_inner = r * Math.sin(theta_rad / 2);
+    const y2_inner = -r * Math.cos(theta_rad / 2);
+
+    // 3. 计算起始点到原点 (0,0) 的距离
+    const startDistance = Math.sqrt(startX * startX + startY * startY);
+
+    // 4. 确定所有点的边界框 (Bounding Box) 以计算总宽度和高度
+    const allX = [startX, x2_outer, x1_inner, x2_inner];
+    const allY = [startY, y2_outer, y1_inner, y2_inner];
+
+    const minX = Math.min(...allX);
+    const maxX = Math.max(...allX);
+    const minY = Math.min(...allY);
+    const maxY = Math.max(...allY);
+
+    const width = maxX - minX;
+    const height = maxY - minY;
+
+    return { width, height, startX, startY, startDistance };
+  };
   // 上方盒舌左边
   const createUpperBoxTongueLeft = (upperBoxTongueType, width, height, offsetX, offsetY) => {
     if (!height) return createNoneProject();
@@ -5694,7 +5925,6 @@ const SvgBox = props =&gt; {
       style={{
         width: "100%",
         height: "100%",
-        margin: "0 auto",
       }}
     >
       <svg
@@ -1260,7 +1260,7 @@ export default class CommonComponent extends Component {
         </>
       );
     }
-    const removeExtension = (filename) => {
+   const removeExtension = (filename) => {
       const lastDotIndex = filename.lastIndexOf('.');
       if (lastDotIndex === -1) {
         // 如果字符串中没有点，则返回原字符串
@@ -1269,7 +1269,8 @@ export default class CommonComponent extends Component {
       return filename.substring(0, lastDotIndex);
     }
     if (sName === "sPackPath" || sName === "sPackDetailPathUpLoad" || sName === "sSvgPath") {
-     const uploadProps = {
+      let imageUrls = "";
+      const uploadProps = {
         listType: "picture-card",
         className: "avatar-uploader",
         action: `${commonConfig.server_host}file/uploadPrice?sLogoName=logo${sName}${this.props.record.sName}`,
@@ -1304,21 +1305,28 @@ export default class CommonComponent extends Component {
         const imageUrlNew = `${commonConfig.server_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`;
         return imageUrlNew
       }
+      const uploadName = commonFunc.showLocalMessage(this.props, "BtnUpload", "上传");
+
       const imageUrl = sName === "sPackPath" ? (this.props.record.sPackPath ? getImageUrl(this.props.record.sPackPath) : '') : sName === "sPackDetailPathUpLoad" ? (this.props.record.sPackDetailPathUpLoad ? getImageUrl(this.props.record.sPackDetailPathUpLoad) : '') : (this.props.record.sSvgPath ? getImageUrl(this.props.record.sSvgPath) : '');
       return (
         <div>
           <Upload {...uploadProps}>
             {imageUrl ? (
-              <Image key={imageUrl} src={imageUrl} alt="avatar" style={{ width: "100%" }} preview={!this.props.enabled} />
+              <Image
+                key={imageUrl}
+                src={imageUrl}
+                alt="avatar"
+                style={{ width: '100%' }}
+                preview={!this.props.enabled}
+              />
+
             ) : (
               <div>
-                <div style={{ marginTop: 8 }}>上传</div>
+                <div style={{ marginTop: 8 }}>{uploadName}</div>
               </div>
             )}
           </Upload>
-          <Button {...this.getUploadButtonProps()}>
-            <DeleteOutlined />
-          </Button>
+          <Button {...this.getUploadButtonProps()}><DeleteOutlined /></Button>
         </div>
       );
     }
@@ -1343,28 +1351,20 @@ export default class CommonComponent extends Component {
         { name: "右贴边位", value: "dYTBW" },
         { name: "右(下)插位组件", value: "dYXCW" },
       ];
-      const doubleTitlieList1 = [
-        { name: "左上插位组件", value: "dZSCW" },
-        { name: "上插位组件", value: "dSCW" },
-        { name: "右上插位组件", value: "dYSCW" },
-        { name: "左偏移", value: "dZPY" },
-        { name: "左插位组件", value: "dZCW" },
-        { name: "左下插位组件", value: "dZXCW" },
-        { name: "右偏移", value: "dYPY" },
-        { name: "右插位组件", value: "dYCW" },
-        { name: "右下插位组件", value: "dYXCW" },
-        { name: "首盒长", value: "dSHC" },
-        { name: "首盒宽", value: "dSHK" },
-        { name: "次盒长", value: "dCHC" },
-        { name: "次盒宽", value: "dCHK" },
-      ];
-      const boxTypes = this.props.record.sTypes;
-      const srcList = Number(boxTypes) === 8 ? doubleTitlieList1 : titleList1;
-
-      slaveData.forEach(x =>
+      slaveData.forEach(x => {
+        let key = 0;
+        if (x.sTypes && x.sTypes.includes('09')) {
+          if (x.sCode === 'dZTBW' || x.sCode === 'dYTBW') {
+            key = x.iSLength + x.iCLength
+          } else {
+            key = x.iSWidth+ x.iCWidth
+          }
+        } else {
+          key = x.iValue
+        }
         boxList.push({
-          value: x.iValue,
-          sName: srcList.find(item => item.value === x.sCode)?.name || "",
+          value: key,
+          sName: titleList1.find(item => item.value === x.sCode)?.name || "",
           isEditable: true,
           isSelect: false,
           selectValue: null,
@@ -1372,7 +1372,7 @@ export default class CommonComponent extends Component {
           selectImage: null,
           type: x.sTypes || null,
           show: true,
-          showName: x.sName,
+          showName: x.sName, // 参数名称
           sLength: x.iSLength,
           sWidth: x.iSWidth,
           sType: x.iSType,
@@ -1385,9 +1385,8 @@ export default class CommonComponent extends Component {
           cTypeName: Number(x.iCType) === 0 ? "矩形" : "梯形",
           cOffset: x.sCOffset,
           cQuantity: x.iCQuantity,
-        })
-      );
-
+        });
+      });
       tables.forEach(x => {
         boxList.push({
           value: x.value,
@@ -1402,23 +1401,7 @@ export default class CommonComponent extends Component {
           showName: x.name, // 参数名称
         });
       });
-      // if (sDoubleSizeList && sDoubleSizeList.length) {
-      //   const titles = ["首盒长", "首盒宽", "次盒长", "次盒宽"];
-      //   sDoubleSizeList.forEach((x, i) => {
-      //     boxList.push({
-      //       value: x,
-      //       sName: titles[i],
-      //       isEditable: true,
-      //       isSelect: false,
-      //       selectValue: null,
-      //       selectLabel: "",
-      //       selectImage: null,
-      //       type: null,
-      //       show: true,
-      //       showName: titles[i], // 参数名称
-      //     });
-      //   });
-      // }
+
       const svgProps = {
         ...this.props,
         boxList,
@@ -1426,7 +1409,6 @@ export default class CommonComponent extends Component {
         dSvgBoxHeight: 100,
         showNew: 1,
       };
-      
       return (
         <div style={{ width: "100px", height: "100px" }}>
           <SvgBox {...svgProps} />
@@ -31,7 +31,7 @@ import {
 import { Icon as LegacyIcon } from '@ant-design/compatible';
 // import '@ant-design/compatible/assets/index.css';
 import lodash from 'lodash';
-import { Table, Input, Checkbox, Button, Upload, message, Popover, Spin, Space, Form, Tooltip, Row, Progress,Modal, Col, Pagination } from 'antd-v4';
+import { Table, Input, Checkbox, Button, Upload, message, Popover, Spin, Space, Form, Tooltip, Row, Progress, Modal, Col, Pagination } from 'antd-v4';
 import { DndProvider, DropTarget, DragSource } from 'react-dnd';
 import {
   sortableContainer,
@@ -126,10 +126,10 @@ const BodyRow = (props) =&gt; {
 // DragSource 拖拽事件的方法对象
 const rowSource = {
   beginDrag(props) {
-    const dragingKey  = props["data-row-key"]
+    const dragingKey = props["data-row-key"]
     dragingIndex = props.index;
     return {
-      'data-row-key':dragingKey,
+      'data-row-key': dragingKey,
       index: props.index,
     }
     // dragingIndex = props.index;
@@ -148,7 +148,7 @@ const rowTarget = {
     if (dragKey === hoverKey) {
       return;
     }
-    props.moveRow(dragIndex, hoverIndex,dragKey,hoverKey);
+    props.moveRow(dragIndex, hoverIndex, dragKey, hoverKey);
     monitor.getItem().index = hoverIndex;
     monitor.getItem()["data-row-key"] = hoverKey;
   },
@@ -183,11 +183,11 @@ class CommonTableRc extends React.Component {
       totalData1: [], /* 总计数据1 */
       enabled: false, /* 是否为编辑 */
       filteredValue: [], /* 过滤数据值 */
-      expKeys:[], /*   展开数据行(数据格式:数组)   */
+      expKeys: [], /*   展开数据行(数据格式:数组)   */
       showimgs: false, // 必须字段控制弹框显示隐藏
       firstIndex: 0, // 点击时默认下标
-      commonPopupVisible:false,
-      commonFieldPopupVisible:false,
+      commonPopupVisible: false,
+      commonFieldPopupVisible: false,
       openNewTabFlag: false, // 是否因在弹窗中打开新页签离开本页;
       randomId: commonUtils.createSid(),
       realizeHeight: 0,
@@ -195,7 +195,7 @@ class CommonTableRc extends React.Component {
       commonFileDownloadVisible: false, // 多文件下载弹窗
       commonFileDownloadList: [], // 多文件列表
       pdfFileVisible: false, // pdf文件弹窗
-      bOperateMoreVisible : false, /* 复制更多弹窗 */
+      bOperateMoreVisible: false, /* 复制更多弹窗 */
       pdfFileUrl: '',
       currentHoverSid: '',
       simpleModalVisible: false,
@@ -292,20 +292,20 @@ class CommonTableRc extends React.Component {
     }
     document.addEventListener('mouseover', this.handleLastTdMouseOver);
-    
+
     // 监听鼠标右击事件
     this.mydiv.addEventListener('contextmenu', this.handleContextMenu);
   }
   componentDidUpdate() {
-    if(
+    if (
       this.props.app && this.props.app.currentPane && (this.props.app.currentPane.route.indexOf('commonList') !== -1
-      ||
-      this.props.app.currentPane.route.indexOf('productionScheduleTree') !== -1)
+        ||
+        this.props.app.currentPane.route.indexOf('productionScheduleTree') !== -1)
     ) {
       if (this.tableHeight !== '100%' && this.tableHeight !== 0) {
         if (this.props.name !== 'report') {
-          this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = this.tableHeight ? this.tableHeight + 'px': 80 + 'px';
+          this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = this.tableHeight ? this.tableHeight + 'px' : 80 + 'px';
         }
       }
     }
@@ -437,7 +437,7 @@ class CommonTableRc extends React.Component {
         oResizable.style.cursor = 'col-resize';
         const tempDom = document.createElement('div');
         const mask = document.createElement('div');
-        mask.style= "position: absolute; width: 100%; height: 100%; left: 0; top: 0; z-index: 9999;"
+        mask.style = "position: absolute; width: 100%; height: 100%; left: 0; top: 0; z-index: 9999;"
         const resizableMousemove = (e) => {
           const { clientX } = e;
           const left = Math.min(Math.max(minLeft, clientX), maxLeft + 200);
@@ -504,7 +504,7 @@ class CommonTableRc extends React.Component {
           }
         }
         oResizable.onmousedown = () => {
-          const { y, height }  = event.target.getBoundingClientRect();
+          const { y, height } = event.target.getBoundingClientRect();
           minLeft = event.target.parentNode.getBoundingClientRect().x + 50;
           maxLeft = event.target.parentNode.getBoundingClientRect().x + event.target.parentNode.getBoundingClientRect().width;
           Object.assign(tempDom.style, {
@@ -525,7 +525,7 @@ class CommonTableRc extends React.Component {
           document.addEventListener('mousemove', resizableMousemove);
         };
       }
-    } catch (error) {}
+    } catch (error) { }
   }
   /**   列拖动s   */
@@ -553,7 +553,7 @@ class CommonTableRc extends React.Component {
       width: column.width,
       onResize: !bNotResize ? this.handleResize(index, column, isSlaveInfo) : null,
       bnotresize: bNotResize ? 'bNotResize' : null,
-      onClick: () => {},
+      onClick: () => { },
       onMouseDown: () => {
         if (this.lastTdMouseOver) {
           return;
@@ -836,7 +836,7 @@ class CommonTableRc extends React.Component {
       const oDiv = {
         'span': target.parentNode,
         'td': target.childNodes[0].childNodes[0],
-        'div': target.getAttribute('data-name') ?  target : target.childNodes[0],
+        'div': target.getAttribute('data-name') ? target : target.childNodes[0],
       }[tagName.toLowerCase()];
       if (!oDiv) return;
@@ -848,7 +848,7 @@ class CommonTableRc extends React.Component {
   }
-  onRowMouseEnter= (record) => { // recor
+  onRowMouseEnter = (record) => { // recor
     if (this.props.enabled && this.props.tableBelone !== 'list' && commonUtils.isNotEmptyObject(this.props.tableProps) &&
       !this.beSelectDropdownOpen && commonUtils.isEmptyObject(this.props.tableProps.rowSelection) && this.state.currentHoverSid !== record.sId) {
       if (this.timerSelectRowChange) {
@@ -864,7 +864,7 @@ class CommonTableRc extends React.Component {
     }
   }
-  onRowMouseLeave= () => {
+  onRowMouseLeave = () => {
     if (this.timerSelectRowChange) {
       this.setState({
         currentHoverSid: '',
@@ -879,7 +879,7 @@ class CommonTableRc extends React.Component {
   /**   行选择   */
   onRowClick = (record, index, type, name, tabType) => {
     if (this.handleCellClick(record)) return;
-    
+
     if (this.stopRowClick) {
       this.stopRowClick = false;
       return;
@@ -1010,11 +1010,11 @@ class CommonTableRc extends React.Component {
     } else if (e.ctrlKey && e.keyCode === 65) {
       console.log('全选成功！');
     } else if (e.ctrlKey && (e.altKey || e.metaKey) && e.keyCode === 71) { /* CTRL+ALT+G F7 设置界面 */
-       const {name, config, data, configName } = this.props;
-       const { sType } = this.props?.app?.userinfo || {};
-       if (!['sysadmin'].includes(sType)) {
-         return;
-       }
+      const { name, config, data, configName } = this.props;
+      const { sType } = this.props?.app?.userinfo || {};
+      if (!['sysadmin'].includes(sType)) {
+        return;
+      }
       if (commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.config) && commonUtils.isNotEmptyObject(this.props.data)) {
         const bInModal = (el) => {
           if (commonUtils.isEmpty(el) || commonUtils.isEmpty(el.classList)) {
@@ -1110,13 +1110,13 @@ class CommonTableRc extends React.Component {
       allRowClassName = record.sColor;
     } else {
       if (commonUtils.isEmptyObject(allRowClassName) || commonUtils.isEmptyObject(allRowClassName.trim())) { /* 设置奇 偶行背景色 */
-        allRowClassName = (index % 2 === 1) ?  'dark-record-row' : '';
+        allRowClassName = (index % 2 === 1) ? 'dark-record-row' : '';
       }
     }
     /* 如果行字段的sDivRow有值 则做成特殊样式 */
-    if(commonUtils.isNotEmptyObject(record) && commonUtils.isNotEmptyObject(record.sDivRowNew) && record.bInsert) {
+    if (commonUtils.isNotEmptyObject(record) && commonUtils.isNotEmptyObject(record.sDivRowNew) && record.bInsert) {
       allRowClassName = 'split-record-row';
-      if (this.props.skipSlaveInfo){
+      if (this.props.skipSlaveInfo) {
         allRowClassName = 'split-record-row-skip';
       }
     }
@@ -1200,24 +1200,24 @@ class CommonTableRc extends React.Component {
           const fileType = fileName.split('.').pop().toLowerCase();
           const previewFileList = ['jpg', 'png', 'jepg', 'webp', 'svg', 'bmp', 'apng', 'pdf'];
           return <div>
-                   <a style={!previewFileList.includes(fileType) ? { visibility: 'hidden' } : {}} onClick={e => {
-                      if (fileType === 'pdf') {
-                        this.setState({
-                          pdfFileVisible: true,
-                          pdfFileUrl: fileList[0],
-                        });
-                      } else {
-                        this.handlePreviewImage(e, fileList);
-                      }
-                    }} title="预览"><EyeOutlined /></a>
-                   <a target="_blank" key="sDownload" href={picHref} title="下载"><DownloadOutlined /></a>
-                   <span>{fileName}</span>
-                 </div>
+            <a style={!previewFileList.includes(fileType) ? { visibility: 'hidden' } : {}} onClick={e => {
+              if (fileType === 'pdf') {
+                this.setState({
+                  pdfFileVisible: true,
+                  pdfFileUrl: fileList[0],
+                });
+              } else {
+                this.handlePreviewImage(e, fileList);
+              }
+            }} title="预览"><EyeOutlined /></a>
+            <a target="_blank" key="sDownload" href={picHref} title="下载"><DownloadOutlined /></a>
+            <span>{fileName}</span>
+          </div>
         } else {
           return <a target="_blank" key="sDownload" title="附件列表" onClick={() => {
             this.setState({
               commonFileDownloadVisible: true,
-              commonFileDownloadList: fileList.map(item => {return { url: item, checked: false }}),
+              commonFileDownloadList: fileList.map(item => { return { url: item, checked: false } }),
             })
           }}
           >{`附件（${fileList.length}）`}</a>;
@@ -1228,12 +1228,12 @@ class CommonTableRc extends React.Component {
     if (commonUtils.isNotEmptyArr(sMakeUpPath)) {
       sMakeUpPath.forEach(item => {
         item.render = (value = '', record) => {
-          const { formId, name, enabled } = this.props;
-           const { token } = this.props.app;
+          const { formId, name, enabled, config } = this.props;
+          const { token } = this.props.app;
           const divProps = {
             action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}`,
             onChange: (info) => {
-              this.handleUploadChange(info, () => {});
+              this.handleUploadChange(info, () => { });
               const savePathStr = info?.file?.response?.dataset?.rows?.[0]?.savePathStr;
               this.props.onDataChange(name, item.dataIndex, { [item.dataIndex]: savePathStr }, record.sId, []);
             },
@@ -1254,32 +1254,48 @@ class CommonTableRc extends React.Component {
                     })
                   }
                 };
-      
+                const removeExtension = (filename) => {
+                  const lastDotIndex = filename.lastIndexOf('.');
+                  if (lastDotIndex === -1) {
+                    // 如果字符串中没有点，则返回原字符串
+                    return filename;
+                  }
+                  return filename.substring(0, lastDotIndex);
+                }
+                const getImageUrl = (sName) => {
+                  const imageUrlNew = `${commonConfig.server_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`;
+                  return imageUrlNew
+                }
                 const picAddr = commonUtils.isNotEmptyObject(value) ? value.split(',') : '';
-                const dataUrl = picAddr[0].includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */
-      
+                let dataUrl = picAddr[0].includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */
+                if (config.sTbName === "sisboxcomponent") {
+                  dataUrl = getImageUrl(removeExtension(picAddr[0]));
+                }
+                // const picAddr = commonUtils.isNotEmptyObject(value) ? value.split(',') : '';
+                // const dataUrl = picAddr[0].includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */
+
                 const officeFileTypeList = ['PDF', 'DOCX', 'XLSX', 'MP4', 'WEBM', 'OGG'];
                 const imgTypeList = ['PNG', 'SVG', 'JPG', 'JPEG', 'GIF', 'BMP', 'TIFF', 'ICO'];
                 const officeFileType = picAddr[0].split('.').pop().toUpperCase();
-                let fileIcon = <FilePdfOutlined { ...iconProps } />;
-      
+                let fileIcon = <FilePdfOutlined {...iconProps} />;
+
                 if (officeFileType === 'DOCX') {
-                  fileIcon = <FileWordOutlined { ...iconProps } />;
+                  fileIcon = <FileWordOutlined {...iconProps} />;
                 } else if (officeFileType === 'XLSX') {
-                  fileIcon = <FileExcelOutlined { ...iconProps } />;
+                  fileIcon = <FileExcelOutlined {...iconProps} />;
                 } else if (['MP4', 'WEBM', 'OGG'].includes(officeFileType)) {
-                  fileIcon = <PlaySquareOutlined { ...iconProps } />;
+                  fileIcon = <PlaySquareOutlined {...iconProps} />;
                 }
-      
+
                 let imgBox = <FileOutlined />;
-      
+
                 if (officeFileTypeList.includes(officeFileType)) {
                   imgBox = fileIcon;
                 } else if (imgTypeList.includes(officeFileType)) {
                   imgBox = <span style={{ cursor: 'pointer' }}> <img src={dataUrl} alt="img" onFocus={() => 0} onClick={e => this.handlePreviewImage(e, picAddr)} style={{ width: '30px', height: '20px' }} /></span>;
                 }
-                return imgBox; 
+                return imgBox;
               })
             }
             {
@@ -1341,9 +1357,9 @@ class CommonTableRc extends React.Component {
                         }
                       }
                       return (
-                        <div style={{ display: 'inline-block', color:colorValue }} key={i} onClick={this.handlesPartNameStatus.bind(this, 'sPartNameStatus', t.sWorkOrderId)} >
+                        <div style={{ display: 'inline-block', color: colorValue }} key={i} onClick={this.handlesPartNameStatus.bind(this, 'sPartNameStatus', t.sWorkOrderId)} >
                           {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ''}
-                          { i + 1 === sPartItemLength ? '' : <RightOutlined />}
+                          {i + 1 === sPartItemLength ? '' : <RightOutlined />}
                         </div>
                       );
                     })
@@ -1385,9 +1401,9 @@ class CommonTableRc extends React.Component {
                         }
                       }
                       return (
-                        <div style={{ display: 'inline-block', color:colorValue }} key={i} onClick={this.handlesPartNameStatus.bind(this, 'sPartNameStatus', t.sWorkOrderId)} >
+                        <div style={{ display: 'inline-block', color: colorValue }} key={i} onClick={this.handlesPartNameStatus.bind(this, 'sPartNameStatus', t.sWorkOrderId)} >
                           {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ''}
-                          { i + 1 === sPartItemLength ? '' : <RightOutlined />}
+                          {i + 1 === sPartItemLength ? '' : <RightOutlined />}
                         </div>
                       );
                     })
@@ -1415,9 +1431,9 @@ class CommonTableRc extends React.Component {
                     const ArrItemTime = t.split('#')[4]; /* 排单时间 */
                     const ArrItemPCNum = t.split('#')[5]; /* 排程数 */
                     const ArrItemSBNum = t.split('#')[6]; /* 上报数 */
-                    const ArrItem7Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 8 ?  t.split('#')[8] : ''; /* 包数 */
-                    const ArrItem8Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 9 ? t.split('#')[9]: '';  /* 每包数量 */
-                    const ArrItem9Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 10 ? t.split('#')[10]: '';  /* 零头数量 */
+                    const ArrItem7Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 8 ? t.split('#')[8] : ''; /* 包数 */
+                    const ArrItem8Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 9 ? t.split('#')[9] : '';  /* 每包数量 */
+                    const ArrItem9Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 10 ? t.split('#')[10] : '';  /* 零头数量 */
                     let ArrItemNumChange = '';
                     let icon;
                     // eslint-disable-next-line default-case
@@ -1458,13 +1474,13 @@ class CommonTableRc extends React.Component {
                         <div><span style={{ color: '#fbca7b' }}>排程数：</span>{ArrItemPCNum}</div>
                         <div><span style={{ color: '#fbca7b' }}>上报数：</span>{ArrItemSBNum}</div>
                         {
-                          ArrItem7Num ?   <div><span style={{ color: '#fbca7b' }}>包数：</span>{ArrItem7Num}</div> :''
+                          ArrItem7Num ? <div><span style={{ color: '#fbca7b' }}>包数：</span>{ArrItem7Num}</div> : ''
                         }
                         {
-                          ArrItem8Num ?   <div><span style={{ color: '#fbca7b' }}>每包数量：</span>{ArrItem8Num}</div> :''
+                          ArrItem8Num ? <div><span style={{ color: '#fbca7b' }}>每包数量：</span>{ArrItem8Num}</div> : ''
                         }
                         {
-                          ArrItem9Num ?   <div><span style={{ color: '#fbca7b' }}>零头数量：</span>{ArrItem9Num}</div> :''
+                          ArrItem9Num ? <div><span style={{ color: '#fbca7b' }}>零头数量：</span>{ArrItem9Num}</div> : ''
                         }
                       </div>
                     );
@@ -1514,7 +1530,7 @@ class CommonTableRc extends React.Component {
                       }
                     }
                     return (
-                      <Tooltip placement="right"  color="#fff" title={() => {
+                      <Tooltip placement="right" color="#fff" title={() => {
                         return <div style={{ whiteSpace: 'normal' }}>
                           {
                             // eslint-disable-next-line array-callback-return;
@@ -1546,12 +1562,12 @@ class CommonTableRc extends React.Component {
                                 }
                               }
                               return (
-                                <div style={{ display: 'inline-block', width: '100%', color:colorValue }} key={i} >
+                                <div style={{ display: 'inline-block', width: '100%', color: colorValue }} key={i} >
                                   {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
                                     <span className={linkStyle} onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, this.props.name, showConfig.sName, t, i, showConfig) : null}>
-                            {t.sMaterialsName}
-                          </span> : ''}
-                                  { i + 1 === sPartItemLength ? '' : <span style={{ color:'#000000', margin: '0 2px' }}>-</span>}
+                                      {t.sMaterialsName}
+                                    </span> : ''}
+                                  {i + 1 === sPartItemLength ? '' : <span style={{ color: '#000000', margin: '0 2px' }}>-</span>}
                                 </div>
                               );
                             })
@@ -1589,12 +1605,12 @@ class CommonTableRc extends React.Component {
                                 }
                               }
                               return (
-                                <div style={{ display: 'inline-block', width: '100%', color:colorValue }} key={i} >
+                                <div style={{ display: 'inline-block', width: '100%', color: colorValue }} key={i} >
                                   {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
                                     <span className={linkStyle} onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, this.props.name, showConfig.sName, t, i, showConfig) : null}>
-                            {t.sMaterialsName}
-                          </span> : ''}
-                                  { i + 1 === sPartItemLength ? '' : <span style={{ color:'#000000', margin: '0 2px' }}>-</span>}
+                                      {t.sMaterialsName}
+                                    </span> : ''}
+                                  {i + 1 === sPartItemLength ? '' : <span style={{ color: '#000000', margin: '0 2px' }}>-</span>}
                                 </div>
                               );
                             })
@@ -1624,8 +1640,8 @@ class CommonTableRc extends React.Component {
                     }
                   }
                   return (
-                    <Tooltip  color='#f1f2f8' placement='right' overlayInnerStyle ={{ width: dWidth, paddingLeft:'6px'  }} defaultOpen={false}  title={() => {
-                      return <div style={{ whiteSpace: 'normal', backgroundColor:'#f1f2f8', borderRight:'1px solid #f0f0f0', width: dWidth - 8 }}>
+                    <Tooltip color='#f1f2f8' placement='right' overlayInnerStyle={{ width: dWidth, paddingLeft: '6px' }} defaultOpen={false} title={() => {
+                      return <div style={{ whiteSpace: 'normal', backgroundColor: '#f1f2f8', borderRight: '1px solid #f0f0f0', width: dWidth - 8 }}>
                         {
                           // eslint-disable-next-line array-callback-return;
                           sPartItem.map((t, i) => {
@@ -1656,12 +1672,12 @@ class CommonTableRc extends React.Component {
                               }
                             }
                             return (
-                              <div style={{ display: 'inline-block', width: '100%', color:colorValue }} key={i} >
+                              <div style={{ display: 'inline-block', width: '100%', color: colorValue }} key={i} >
                                 {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
                                   <span className={linkStyle} onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, this.props.name, showConfig.sName, t, i, showConfig) : null}>
-                            {t.sMaterialsName}
-                          </span> : ''}
-                                { i + 1 === sPartItemLength ? '' : <span style={{ color:'#000000', margin: '0 2px' }}>-</span>}
+                                    {t.sMaterialsName}
+                                  </span> : ''}
+                                {i + 1 === sPartItemLength ? '' : <span style={{ color: '#000000', margin: '0 2px' }}>-</span>}
                               </div>
                             );
                           })
@@ -1699,12 +1715,12 @@ class CommonTableRc extends React.Component {
                               }
                             }
                             return (
-                              <div style={{ display: 'inline-block', width: '100%', color:colorValue }} key={i} >
+                              <div style={{ display: 'inline-block', width: '100%', color: colorValue }} key={i} >
                                 {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
                                   <span className={linkStyle} onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, this.props.name, showConfig.sName, t, i, showConfig) : null}>
-                            {t.sMaterialsName}
-                          </span> : ''}
-                                { i + 1 === sPartItemLength ? '' : <span style={{ color:'#000000', margin: '0 2px' }}>-</span>}
+                                    {t.sMaterialsName}
+                                  </span> : ''}
+                                {i + 1 === sPartItemLength ? '' : <span style={{ color: '#000000', margin: '0 2px' }}>-</span>}
                               </div>
                             );
                           })
@@ -1713,7 +1729,7 @@ class CommonTableRc extends React.Component {
                     </Tooltip>
                   );
                 } else {
-                  return <div className='noInput readonlySpanStyle' style={{ backgroundColor: sBackGroundColor, height: '29px'  }}> {itemStr} </div>;
+                  return <div className='noInput readonlySpanStyle' style={{ backgroundColor: sBackGroundColor, height: '29px' }}> {itemStr} </div>;
                 }
               };
             }
@@ -1725,13 +1741,13 @@ class CommonTableRc extends React.Component {
     if (commonUtils.isNotEmptyArr(dynamicColumn) && commonUtils.isNotEmptyArr(dataSource)) {
       dynamicColumn.forEach((jsonStatus, index) => {
         if (commonUtils.isNotEmptyArr(jsonStatus.children)) { /* 嵌套列头JSON解析 */
-          const childrenJson = jsonStatus.children.filter(itemChild=> itemChild.dataIndex && itemChild.dataIndex.includes('json'));
+          const childrenJson = jsonStatus.children.filter(itemChild => itemChild.dataIndex && itemChild.dataIndex.includes('json'));
           for (const obj of childrenJson) {
             obj.render = (itemStr) => {
               if (commonUtils.isNotEmptyObject(itemStr) && commonUtils.isJSON(itemStr)) {
                 const sPartItem = JSON.parse(itemStr);
                 return (
-                  <div style={{ whiteSpace: 'normal', position:'absolute', width:'100%', left:0, top:0, bottom:0 }}>
+                  <div style={{ whiteSpace: 'normal', position: 'absolute', width: '100%', left: 0, top: 0, bottom: 0 }}>
                     {
                       // eslint-disable-next-line array-callback-return;
                       sPartItem.map((t, i) => {
@@ -1757,7 +1773,7 @@ class CommonTableRc extends React.Component {
                         return (
                           <div
                             className="dynamicColumnStyle"
-                            style={{ display:'flex', alignItems:'center', padding:'4px', backgroundColor: colorValue, color: '#000', width:'100%', height:'100%' }}
+                            style={{ display: 'flex', alignItems: 'center', padding: '4px', backgroundColor: colorValue, color: '#000', width: '100%', height: '100%' }}
                             key={i}
                           >
                             <div>{t.dSchedulHours}</div>
@@ -1823,7 +1839,7 @@ class CommonTableRc extends React.Component {
           const sPartItem = JSON.parse(itemStr);
           const linkStyle = 'sTimeStatusStyle';/* 弹窗 */
           return (
-            <div style={{ display:'flex' }}>
+            <div style={{ display: 'flex' }}>
               {
                 // eslint-disable-next-line array-callback-return;
                 sPartItem.map((t, i) => {
@@ -1841,7 +1857,7 @@ class CommonTableRc extends React.Component {
                       <div
                         className={linkStyle}
                         style={{
-                          width:dWidth, color:'#000', textAlign: 'center', backgroundColor:sColor, fontSize:'10px', height:'20px', borderRadius:i === 0 ? '10px 0 0 10px' : ( i === sPartItemLength - 1 ? '0 10px 10px 0' : '0px'),
+                          width: dWidth, color: '#000', textAlign: 'center', backgroundColor: sColor, fontSize: '10px', height: '20px', borderRadius: i === 0 ? '10px 0 0 10px' : (i === sPartItemLength - 1 ? '0 10px 10px 0' : '0px'),
                         }}
                         key={i}
                       >
@@ -1869,7 +1885,7 @@ class CommonTableRc extends React.Component {
             const { sState, sColor = '#000000', sName = '' } = t;
             return (
               <div style={{ display: 'inline-block', color: sColor }} key={i} >
-                {sName}{ i + 1 === itemLength ? '' : <RightOutlined />}
+                {sName}{i + 1 === itemLength ? '' : <RightOutlined />}
               </div>
             );
           })
@@ -1884,11 +1900,11 @@ class CommonTableRc extends React.Component {
                 lineHeight: '29px',
                 textOverflow: 'ellipsis'
               }}>
-                <Tooltip color="#fff" title={() => {
-                  return <div>{content}</div>
-                }}>
-                  {content}
-                </Tooltip>
+              <Tooltip color="#fff" title={() => {
+                return <div>{content}</div>
+              }}>
+                {content}
+              </Tooltip>
             </div>
           );
         }
@@ -1903,16 +1919,16 @@ class CommonTableRc extends React.Component {
     }
     let bPagination = true; /* 默认表格分页s  */
     if (commonUtils.isNotEmptyObject(this.props)) {
-      bPagination =  (commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination));
+      bPagination = (commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination));
     }
     let noVlistController = false;
-    if(this.props.config && this.props.config.gdsconfigformslave.filter(item => item.sControlName === 'bNoVlist')[0]) {
+    if (this.props.config && this.props.config.gdsconfigformslave.filter(item => item.sControlName === 'bNoVlist')[0]) {
       noVlistController = true;
     }
     /* 特殊情况的表格 在虚拟列表情况 会无法滑动 */
     let noVlistTable = false;
-    if(this.props.noVlistTable) {
+    if (this.props.noVlistTable) {
       noVlistTable = true;
     }
     // 判断是否有合并单元格, 有的话默认关闭虚拟滚动
@@ -1937,18 +1953,20 @@ class CommonTableRc extends React.Component {
             oBody && (oBody.scrollTop = 0);
           }
           window.vlistNewSearh = null;
-          this.Vcomponents = VListNew({height: this.scrollY, vid: this.uniqueId, onScroll: () => {
-            setTimeout(() => {
-              let divs = document.getElementsByClassName('noInputInsert');
-              if (divs.length) {
-                Array.prototype.forEach.call(divs, item => {
-                  item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
-                });
-              }
-            }, 20);
-          }});
+          this.Vcomponents = VListNew({
+            height: this.scrollY, vid: this.uniqueId, onScroll: () => {
+              setTimeout(() => {
+                let divs = document.getElementsByClassName('noInputInsert');
+                if (divs.length) {
+                  Array.prototype.forEach.call(divs, item => {
+                    item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
+                  });
+                }
+              }, 20);
+            }
+          });
         }
-        components = {...this.Vcomponents, ...components};
+        components = { ...this.Vcomponents, ...components };
       } else {
         // vid是多个列表在同个页面中，同时渲染会促发问题
         // vid不可以为随机数，随机数会导致双击时，点击的两个VList id不同
@@ -1963,23 +1981,25 @@ class CommonTableRc extends React.Component {
             oBody && (oBody.scrollTop = 0);
           }
           window.vlistNewSearh = null;
-          this.Vcomponents1 = VList({ height: this.scrollY, vid: this.uniqueId, rowKey: this.rowKey, onScroll: () => {
-            setTimeout(() => {
-              let divs = document.getElementsByClassName('noInputInsert');
-              if (divs.length) {
-                Array.prototype.forEach.call(divs, item => {
-                  item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
-                });
-              }
-            }, 20);
-          } });
+          this.Vcomponents1 = VList({
+            height: this.scrollY, vid: this.uniqueId, rowKey: this.rowKey, onScroll: () => {
+              setTimeout(() => {
+                let divs = document.getElementsByClassName('noInputInsert');
+                if (divs.length) {
+                  Array.prototype.forEach.call(divs, item => {
+                    item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
+                  });
+                }
+              }, 20);
+            }
+          });
         }
         components = { ...this.Vcomponents1, ...components };
       }
     }
     if (this.props.config && this.props.config.iFreezeColumn) {
       tableColumn.forEach((val, index) => {
-        if(tableColumn[index].fixedHelp) {
+        if (tableColumn[index].fixedHelp) {
           tableColumn[index].fixed = false;
           tableColumn[index].fixedHelp = false;
         }
@@ -1991,14 +2011,14 @@ class CommonTableRc extends React.Component {
     }
     // 处理拖拽排序
     if (this.props.dragHandle) {
-      const handleSortTitle = commonFunc.showMessage(this.props.app.commonConst, 'sort') || '排序' ;
+      const handleSortTitle = commonFunc.showMessage(this.props.app.commonConst, 'sort') || '排序';
       const handleSort = tableColumn.filter(item => item.dataIndex === 'handleSort').length;
       if (tableColumn[0]) {
         function arrayMoveMutable(array, fromIndex, toIndex) {
           const startIndex = fromIndex < 0 ? array.length + fromIndex : fromIndex;
           if (startIndex >= 0 && startIndex < array.length) {
             const endIndex = toIndex < 0 ? array.length + toIndex : toIndex;
-            if(commonUtils.isNotEmptyObject(array[fromIndex].sWorkOrderUsed)) {
+            if (commonUtils.isNotEmptyObject(array[fromIndex].sWorkOrderUsed)) {
               message.error(array[fromIndex].sWorkOrderUsed);
               return;
             }
@@ -2034,11 +2054,11 @@ class CommonTableRc extends React.Component {
           const { dataSource } = this.state;
           // function findIndex base on Table rowKey props and should always be a right array index
           const index = dataSource.findIndex(x => x.index === restProps['data-row-key']);
-          return <SortableItem index={index} className={className} style={{...style}} {...restProps} />;
+          return <SortableItem index={index} className={className} style={{ ...style }} {...restProps} />;
         };
         // 处理渲染后丢失input focus的bug.
         let bDrag = this.props.enabled && !this.props.bForbiddenDrag;/* 是否可以拖动 */
-        if(bDrag) {
+        if (bDrag) {
           if (!this.DraggableContainer) {
             this.DraggableContainer = DraggableContainer;
           }
@@ -2046,10 +2066,10 @@ class CommonTableRc extends React.Component {
             this.DraggableBodyRow = DraggableBodyRow;
           }
         }
-        if(!handleSort) {
-          components = {...components, body: {wrapper: this.DraggableContainer, row: this.DraggableBodyRow}};
+        if (!handleSort) {
+          components = { ...components, body: { wrapper: this.DraggableContainer, row: this.DraggableBodyRow } };
         } else {
-          components = {...components, body: {wrapper: this.DraggableContainer, row: this.DraggableBodyRow}};
+          components = { ...components, body: { wrapper: this.DraggableContainer, row: this.DraggableBodyRow } };
           tableColumn.shift();
         }
         tableColumn.unshift(
@@ -2103,8 +2123,8 @@ class CommonTableRc extends React.Component {
             onMouseEnter: () => { this.onRowMouseEnter(record); },
             onMouseLeave: () => { this.onRowMouseLeave(record); },
             onDoubleClick: () => { this.onDoubleClick(this.props.name, record); },
-            moveRow: (dragIndex, hoverIndex,dragKey,hoverKey) => {
-              this.moveRow(dragIndex, hoverIndex,dragKey,hoverKey);
+            moveRow: (dragIndex, hoverIndex, dragKey, hoverKey) => {
+              this.moveRow(dragIndex, hoverIndex, dragKey, hoverKey);
             },
             onDragClick: (type) => { this.onRowClick(record, index, type, this.props.name, 'slave'); },
           };
@@ -2232,8 +2252,8 @@ class CommonTableRc extends React.Component {
               onDoubleClick: () => {
                 this.onDoubleClick(record, index, undefined, slaveInfoName, 'slaveInfo');
               },
-              moveRow: (dragIndex, hoverIndex,dragKey,hoverKey) => {
-                this.moveRow(dragIndex, hoverIndex,dragKey,hoverKey);
+              moveRow: (dragIndex, hoverIndex, dragKey, hoverKey) => {
+                this.moveRow(dragIndex, hoverIndex, dragKey, hoverKey);
               },
               onDragClick: (type) => {
                 this.onRowClick(record, index, type, slaveInfoName, 'slaveInfo');
@@ -2271,8 +2291,8 @@ class CommonTableRc extends React.Component {
     } else {
       filterData = dataSource.length;
     }
-    if(commonUtils.isNotEmptyObject(masterData) && commonUtils.isNotEmptyObject(masterData.sZczlxShowName)) {
-      if(masterData.sZczlxShowName === '删除' ||  masterData.sZczlxShowName === '恢复'){
+    if (commonUtils.isNotEmptyObject(masterData) && commonUtils.isNotEmptyObject(masterData.sZczlxShowName)) {
+      if (masterData.sZczlxShowName === '删除' || masterData.sZczlxShowName === '恢复') {
         filterData += 1;
       }
     }
@@ -2299,7 +2319,7 @@ class CommonTableRc extends React.Component {
       if (isSlaveInfo && commonUtils.isNotEmptyObject(this.props.slaveInfo) && commonUtils.isNotEmptyObject(this.props.slaveInfo.config)) {
         const showConfigArr = this.props.slaveInfo.config.gdsconfigformslave.filter(item => item.sName === sName && item.bVisible);
         if (commonUtils.isNotEmptyArr(showConfigArr)) {
-          showConfig =  showConfigArr[0];
+          showConfig = showConfigArr[0];
         }
       }
@@ -2377,11 +2397,11 @@ class CommonTableRc extends React.Component {
               }
               if (isRow && isRowShow && !commonUtils.isEmpty(record[column]) && commonUtils.isNotEmptyObject(record[column].toString())) { /* 配置行 */
                 let { conditionValue: conditionValueOld } = item;
-                const conditionValue = record[conditionValueOld] ? record[conditionValueOld]: conditionValueOld;
+                const conditionValue = record[conditionValueOld] ? record[conditionValueOld] : conditionValueOld;
                 if (condition === '=') {
-                  if(commonUtils.isNotEmptyObject(conditionValue) && conditionValue.includes('#')) {
-                    const sXName = conditionValue.replace('#','').replace('#','').trim();
-                    if(sXName && commonUtils.isNotEmptyObject(this.props[sXName])) {
+                  if (commonUtils.isNotEmptyObject(conditionValue) && conditionValue.includes('#')) {
+                    const sXName = conditionValue.replace('#', '').replace('#', '').trim();
+                    if (sXName && commonUtils.isNotEmptyObject(this.props[sXName])) {
                       const sXValue = this.props[sXName];
                       styleColor = record[column] === sXValue ? `SetRow_${color} color${color.replace('#', '-')}` : '';
                     }
@@ -2449,7 +2469,7 @@ class CommonTableRc extends React.Component {
             } = item;
             if (!isRow) { /* 根据配置设置单元格颜色 */
               let { conditionValue: conditionValueOld } = item;
-              const conditionValue = record[conditionValueOld] ? record[conditionValueOld]: conditionValueOld;
+              const conditionValue = record[conditionValueOld] ? record[conditionValueOld] : conditionValueOld;
               if (column === sName && (column === showConfig.sName || showConfig.sControlName?.startsWith('canOtherConfig'))) { /* 只控制该配置的单元格 */
                 if (condition === '=') {
                   styleColor = record[column] === conditionValue ? color : '';
@@ -2478,13 +2498,13 @@ class CommonTableRc extends React.Component {
                   styleColor = record[column] <= conditionValue ? color : '';
                   styleBackground = record[column] <= conditionValue ? background : '';
                 } else if (Array.isArray(condition)) { /* 通过其他列条件控制该字段的颜色显示 */
-                  if(commonUtils.isNotEmptyArr(condition)) {
+                  if (commonUtils.isNotEmptyArr(condition)) {
                     for (const itemConditon of condition) {
                       const {
                         bFilterName, bFilterCondition, color, background,
                       } = itemConditon;
                       let { bFilterValue: bFilterValueOld } = itemConditon;
-                      const bFilterValue = record[bFilterValueOld] ? record[bFilterValueOld]: bFilterValueOld;
+                      const bFilterValue = record[bFilterValueOld] ? record[bFilterValueOld] : bFilterValueOld;
                       if (bFilterCondition === '=') {
                         styleColor = record[bFilterName] === bFilterValue ? color : '';
                         styleBackground = record[bFilterName] === bFilterValue ? background : '';
@@ -2495,7 +2515,7 @@ class CommonTableRc extends React.Component {
                         }
                       } else if (bFilterCondition === '!=') {
                         styleColor = record[bFilterName] !== bFilterValue ? color : '';
-                        styleBackground = record[bFilterName] !==  bFilterValue ? background : '';
+                        styleBackground = record[bFilterName] !== bFilterValue ? background : '';
                       } else if (bFilterCondition === '>') {
                         styleColor = record[bFilterName] > bFilterValue ? color : '';
                         styleBackground = record[bFilterName] > bFilterValue ? background : '';
@@ -2516,10 +2536,10 @@ class CommonTableRc extends React.Component {
             }
             styleColorArr += styleColor;
             styleColorArrB += styleBackground;
-            if(styleColor) {
+            if (styleColor) {
               styleColorArr = styleColor;
             }
-            if(styleBackground) {
+            if (styleBackground) {
               styleColorArrB = styleBackground;
             }
           }
@@ -2593,10 +2613,10 @@ class CommonTableRc extends React.Component {
       result = false;
     }
     /* 若红冲单据 则按钮锁定 不能操作  */
-    if(commonUtils.isNotEmptyObject(masterData) && commonUtils.isNotEmptyObject(masterData.sMinusSrcId) && masterData.sMinusType === '1') {
+    if (commonUtils.isNotEmptyObject(masterData) && commonUtils.isNotEmptyObject(masterData.sMinusSrcId) && masterData.sMinusType === '1') {
       result = false;
     }
-    if(btnName === 'BtnAdd' && bLimitOperate){
+    if (btnName === 'BtnAdd' && bLimitOperate) {
       result = false;
     }
@@ -2699,25 +2719,25 @@ class CommonTableRc extends React.Component {
       }
       /* 工单、工艺卡、报价单 去掉排序 */
-      if (this.props.name === 'sParam' ||  specialRoute.includes('workOrder') || specialRoute.includes('processCard') || specialRoute.includes('quotation')) {
+      if (this.props.name === 'sParam' || specialRoute.includes('workOrder') || specialRoute.includes('processCard') || specialRoute.includes('quotation')) {
         sorter = false;
       }
       /* 默认字段是排序的 通过配置bNotSort来设置字段不排序 */
       if (config && commonUtils.isNotEmptyStr(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex))) {
-        if(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex).length > 0 && config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSort){
+        if (config.gdsconfigformslave.filter(item => item.sName === column.dataIndex).length > 0 && config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSort) {
           sorter = false;
         }
       }
       if (config && commonUtils.isNotEmptyStr(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex))) {
-        if(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSearch){
+        if (config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSearch) {
           search = false;
         }
       }
       if (column.dataIndex === "spicture" || column.dataIndex === "tableLastEmpty") {
         sorter = false;
       }
-      let sTitleBgColor =commonUtils.isNotEmptyObject(column.sTitleBgColor) ? column.sTitleBgColor : ''; /* 标题背景颜色 */
-      let sTitleColor =commonUtils.isNotEmptyObject(column.sTitleColor) ? column.sTitleColor : ''; /* 标题字体颜色 */
+      let sTitleBgColor = commonUtils.isNotEmptyObject(column.sTitleBgColor) ? column.sTitleBgColor : ''; /* 标题背景颜色 */
+      let sTitleColor = commonUtils.isNotEmptyObject(column.sTitleColor) ? column.sTitleColor : ''; /* 标题字体颜色 */
       const styleObj = {};
       if (commonUtils.isNotEmptyObject(sTitleBgColor)) {
         styleObj.background = sTitleBgColor;
@@ -2753,7 +2773,7 @@ class CommonTableRc extends React.Component {
             <button
               class={`table-expAllIcon ant-table-row-expand-icon ${this.tableCollapsed ? 'ant-table-row-expand-icon-collapsed' : ''}`}
               style={{ margin: `1px 4px 0 ${marginLeft}` }}
-              ref={(ref) => {this.expRef = ref}}
+              ref={(ref) => { this.expRef = ref }}
               onClick={(e) => {
                 e.stopPropagation();
                 if (this.tableCollapsed) {
@@ -2785,8 +2805,8 @@ class CommonTableRc extends React.Component {
         } else {
           res = <div className='th-div' style={styleObj}>{expandedAllIcon}{column.title}</div>;
         }
-        if (column.dataIndex ==='bSelfCbx') {
-          res = <div style={{marginLeft:'5px'}}><Checkbox disabled={!props.enabled} checked={column.bCheckAll} onChange={(e) =>this.onParamChange(e)}></Checkbox></div>;
+        if (column.dataIndex === 'bSelfCbx') {
+          res = <div style={{ marginLeft: '5px' }}><Checkbox disabled={!props.enabled} checked={column.bCheckAll} onChange={(e) => this.onParamChange(e)}></Checkbox></div>;
         }
         return res;
@@ -2854,11 +2874,11 @@ class CommonTableRc extends React.Component {
       /*   获取复制全部的props   */
       // const copyAllProps = { ...this.getCopyAllProps(), disabled: false, style: { display: 'block', margin: '0 10px' } };
       const copyAllProps = { ...this.getCopyAllProps(), disabled: false };
-      const uploadProps = { ...this.getUploadProps(), disabled: false, style: { margin: '0 10px', 'caret-color': 'transparent'} };
+      const uploadProps = { ...this.getUploadProps(), disabled: false, style: { margin: '0 10px', 'caret-color': 'transparent' } };
       const downloadProps = { ...this.getDownProps(), disabled: false, style: { display: 'block', margin: '0 5px' } };
-      if(isSlaveInfoM) {
-        addProps.style.display ='block';
-        delProps.style.display ='block';
+      if (isSlaveInfoM) {
+        addProps.style.display = 'block';
+        delProps.style.display = 'block';
       }
       const { formId } = props;
       const { token } = props.app;
@@ -2867,7 +2887,7 @@ class CommonTableRc extends React.Component {
         onChange: this.handleUploadChange,
         accept: '*/*',
         showUploadList: false,
-        multiple:true,
+        multiple: true,
         beforeUpload: this.handleBeforeUpload,
       };
       const addIcon = props.tableProps.setAdd; /* 增加操作 */
@@ -2898,8 +2918,8 @@ class CommonTableRc extends React.Component {
         bShowProductMaterials = props.tableProps.bShowProductMaterials;/* 选择成品工序 */
       }
       /* 操作栏设置上传 */
-      uploadIcon = this.findVisibleControlName(this.props, 'BtnSetUpload') ;
-      downloadIcon = this.findVisibleControlName(this.props, 'BtnSetDownload') ;
+      uploadIcon = this.findVisibleControlName(this.props, 'BtnSetUpload');
+      downloadIcon = this.findVisibleControlName(this.props, 'BtnSetDownload');
       headPopup = this.findVisibleControlName(this.props, 'BtnHeadPopup'); /* 表头放大镜 */
       sAlumitePopup = this.findVisibleControlName(this.props, 'BtnPopupsAlumiteBomBillNo'); /* 表头放大镜 */
       bCopyMore = this.findVisibleControlName(this.props, 'BtnCopyMore'); /* 复制多行 */
@@ -2952,7 +2972,7 @@ class CommonTableRc extends React.Component {
         operateWidth += 40;
       }
-      if (bShowProductProcess ) {
+      if (bShowProductProcess) {
         operateWidth += 40;
       }
       if (bShowTreeAdd) {
@@ -2967,7 +2987,7 @@ class CommonTableRc extends React.Component {
       if (bShowTreeCopyAll) {
         operateWidth += 40;
       }
-      if (bShowProductMaterials ) {
+      if (bShowProductMaterials) {
         operateWidth += 40;
       }
       if (exitIcon) {
@@ -3047,22 +3067,22 @@ class CommonTableRc extends React.Component {
           /** 树节点添加 */
           if (bShowTreeAdd) {
             const enabled = this.getTableBtnState('BtnAdd', record);
-            operateTreeAdd = <a title="添加同级" alt="添加同级" style={{margin: '0 10px'}} onClick={enabled ? this.handleTreeAdd.bind(this, index) : null}>{enabled ?  <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加"></SvgIcon>}</a>
+            operateTreeAdd = <a title="添加同级" alt="添加同级" style={{ margin: '0 10px' }} onClick={enabled ? this.handleTreeAdd.bind(this, index) : null}>{enabled ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加"></SvgIcon>}</a>
           }
           /** 树节点删除 */
           if (bShowTreeDel) {
             const enabled = this.getTableBtnState('BtnDel', record);
-            operateTreeDel = <a title="删除" alt="删除" style={{margin: '0 10px'}} onClick={enabled ? this.handleTreeDel.bind(this, index) : null}>{enabled ?  <SvgIcon iconClass="close" fill="#1296db" size="14" alt="删除"></SvgIcon> : <SvgIcon iconClass="close" fill="rgb(189, 189, 189)" size="14"  alt="删除"></SvgIcon>}</a>
+            operateTreeDel = <a title="删除" alt="删除" style={{ margin: '0 10px' }} onClick={enabled ? this.handleTreeDel.bind(this, index) : null}>{enabled ? <SvgIcon iconClass="close" fill="#1296db" size="14" alt="删除"></SvgIcon> : <SvgIcon iconClass="close" fill="rgb(189, 189, 189)" size="14" alt="删除"></SvgIcon>}</a>
           }
           /** 树节点添加子类 */
           if (bShowTreeAddChild) {
             const enabled = this.getTableBtnState('BtnAddChildNode', record);
-            operateTreeAddChild = <a title="添加子级" alt="添加子级" style={{margin: '0 10px'}} onClick={enabled ? this.handleTreeAddChild.bind(this, index) : null}>{enabled ?  <SvgIcon iconClass="tree" fill="#1296db" size="14"alt="增加"></SvgIcon> : <SvgIcon iconClass="tree" fill="rgb(189, 189, 189)" size="14" alt="增加"></SvgIcon>}</a>
+            operateTreeAddChild = <a title="添加子级" alt="添加子级" style={{ margin: '0 10px' }} onClick={enabled ? this.handleTreeAddChild.bind(this, index) : null}>{enabled ? <SvgIcon iconClass="tree" fill="#1296db" size="14" alt="增加"></SvgIcon> : <SvgIcon iconClass="tree" fill="rgb(189, 189, 189)" size="14" alt="增加"></SvgIcon>}</a>
           }
           /** 树节点复制 */
           if (bShowTreeCopyAll) {
             const enabled = this.getTableBtnState('BtnCopyAll', record);
-            operateTreeCopyAll = <a title="复制全部" alt="复制全部" style={{margin: '0 10px'}} onClick={enabled ? this.handleTreeCopyAll.bind(this, index) : null}>{enabled ?  <SvgIcon iconClass="copyall" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copyall" fill="rgb(189, 189, 189)" size="14" alt="复制"></SvgIcon>}</a>
+            operateTreeCopyAll = <a title="复制全部" alt="复制全部" style={{ margin: '0 10px' }} onClick={enabled ? this.handleTreeCopyAll.bind(this, index) : null}>{enabled ? <SvgIcon iconClass="copyall" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copyall" fill="rgb(189, 189, 189)" size="14" alt="复制"></SvgIcon>}</a>
           }
           /** 放置添加图标 添加为默认显示 */
           if (!commonUtils.isEmpty(addIcon)) {
@@ -3077,44 +3097,44 @@ class CommonTableRc extends React.Component {
           /** 放置复制图标 */
           if (!commonUtils.isEmpty(copyIcon)) {
             const enabled = this.getTableBtnState('BtnCopy', record);
-            operateCopy = <a title={setCopy} {...copyProps} onClick={enabled ? this.copyTbRow.bind(this, index) : null} >{enabled ? <SvgIcon iconClass="copy" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copy" fill="rgb(189, 189, 189)" size="14"alt="复制"></SvgIcon>}</a>;
+            operateCopy = <a title={setCopy} {...copyProps} onClick={enabled ? this.copyTbRow.bind(this, index) : null} >{enabled ? <SvgIcon iconClass="copy" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copy" fill="rgb(189, 189, 189)" size="14" alt="复制"></SvgIcon>}</a>;
           } else if (setNoCommonOperate || this.props.name === 'sWorkOrderParamList') {
             operateCopy = '';
           } else {
             const enabled = this.getTableBtnState('BtnCopy', record);
-            operateCopy = <a title={setCopy}{...copyProps} onClick={enabled ? this.copyTbRow.bind(this, index) : null} > {enabled ? <SvgIcon iconClass="copy" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copy" fill="rgb(189, 189, 189)" size="14"alt="复制"></SvgIcon>}</a>;
+            operateCopy = <a title={setCopy}{...copyProps} onClick={enabled ? this.copyTbRow.bind(this, index) : null} > {enabled ? <SvgIcon iconClass="copy" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copy" fill="rgb(189, 189, 189)" size="14" alt="复制"></SvgIcon>}</a>;
           }
           /** 放置复制部件图标 */
           if (!commonUtils.isEmpty(copyAllIcon)) {
             const enabled = this.getTableBtnState('BtnCopyAll', record);
-            operateCopyAll = <a title={setCopyAll} {...copyAllProps} onClick={enabled ? this.copyAllTbRow.bind(this, index) : this.handleTbRowUsed.bind(this, index, record, 'copyAll')}>{enabled ? <SvgIcon iconClass="copyall" fill="#1296db" size="14" alt="复制全部"></SvgIcon> : <SvgIcon iconClass="copyall" fill="rgb(189, 189, 189)" size="14"alt="复制全部"></SvgIcon>}</a>;
+            operateCopyAll = <a title={setCopyAll} {...copyAllProps} onClick={enabled ? this.copyAllTbRow.bind(this, index) : this.handleTbRowUsed.bind(this, index, record, 'copyAll')}>{enabled ? <SvgIcon iconClass="copyall" fill="#1296db" size="14" alt="复制全部"></SvgIcon> : <SvgIcon iconClass="copyall" fill="rgb(189, 189, 189)" size="14" alt="复制全部"></SvgIcon>}</a>;
           } else if (setNoCommonOperate || this.props.bHideCopyAll || this.props.name === 'sWorkOrderParamList') {
             operateCopyAll = '';
           } else {
             const enabled = this.getTableBtnState('BtnCopyAll', record);
-            operateCopyAll = <a title={setCopyAll} {...copyAllProps} onClick={enabled ? this.copyAllTbRow.bind(this, index) : null}>{enabled || this.findIsUpdByControlName(this.props, 'BtnCopyAll') ? <SvgIcon iconClass="copyall" fill="#1296db" size="14" alt="复制全部"></SvgIcon> : <SvgIcon iconClass="copyall" fill="rgb(189, 189, 189)" size="14"alt="复制全部"></SvgIcon> }</a>;
+            operateCopyAll = <a title={setCopyAll} {...copyAllProps} onClick={enabled ? this.copyAllTbRow.bind(this, index) : null}>{enabled || this.findIsUpdByControlName(this.props, 'BtnCopyAll') ? <SvgIcon iconClass="copyall" fill="#1296db" size="14" alt="复制全部"></SvgIcon> : <SvgIcon iconClass="copyall" fill="rgb(189, 189, 189)" size="14" alt="复制全部"></SvgIcon>}</a>;
           }
           /** 放置删除图标 删除为默认显示 */
           if (!commonUtils.isEmpty(delIcon)) {
             const enabled = this.getTableBtnState('BtnDel', record);
-            operateDel = <a title={setDelete} {...delProps} onClick={props.bDirectDel || (enabled && rowTag !== 1) ? this.delTbRow.bind(this, index, record) : this.handleTbRowUsed.bind(this, index, record, 'del')} >{props.bDirectDel || (enabled && rowTag !== 1)  ? <SvgIcon iconClass="close" fill="#1296db" size="14" alt="删除"></SvgIcon> :<SvgIcon iconClass="close" fill="rgb(189, 189, 189)" size="14" alt="删除"></SvgIcon> }</a>;
+            operateDel = <a title={setDelete} {...delProps} onClick={props.bDirectDel || (enabled && rowTag !== 1) ? this.delTbRow.bind(this, index, record) : this.handleTbRowUsed.bind(this, index, record, 'del')} >{props.bDirectDel || (enabled && rowTag !== 1) ? <SvgIcon iconClass="close" fill="#1296db" size="14" alt="删除"></SvgIcon> : <SvgIcon iconClass="close" fill="rgb(189, 189, 189)" size="14" alt="删除"></SvgIcon>}</a>;
           } else if (setNoCommonOperate) {
             operateDel = '';
           } else {
             const enabled = this.getTableBtnState('BtnDel', record);
-            operateDel = <a title={setDelete} {...delProps} onClick={props.bDirectDel || (enabled || this.findIsUpdByControlName(this.props, 'BtnDel')) ? this.delTbRow.bind(this, index, record) : null} >{props.bDirectDel || (enabled || this.findIsUpdByControlName(this.props, 'BtnDel')) ? <SvgIcon iconClass="close" fill="#1296db" size="14" alt="删除"></SvgIcon> :<SvgIcon iconClass="close" fill="rgb(189, 189, 189)" size="14" alt="删除"></SvgIcon> }</a>;
+            operateDel = <a title={setDelete} {...delProps} onClick={props.bDirectDel || (enabled || this.findIsUpdByControlName(this.props, 'BtnDel')) ? this.delTbRow.bind(this, index, record) : null} >{props.bDirectDel || (enabled || this.findIsUpdByControlName(this.props, 'BtnDel')) ? <SvgIcon iconClass="close" fill="#1296db" size="14" alt="删除"></SvgIcon> : <SvgIcon iconClass="close" fill="rgb(189, 189, 189)" size="14" alt="删除"></SvgIcon>}</a>;
           }
           /* 复制多行 */
           if (bCopyMore) {
             const enabled = this.getTableBtnState('BtnDelMore', record);
-            operateCopyMore = <a title={setCopyMore} {...copyMoreProps} onClick={enabled ? this.copyTbMoreRow.bind(this, index) : null} >{enabled ? <SvgIcon iconClass="copy" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copy" fill="rgb(189, 189, 189)" size="14"alt="复制多行"></SvgIcon>}</a>;
+            operateCopyMore = <a title={setCopyMore} {...copyMoreProps} onClick={enabled ? this.copyTbMoreRow.bind(this, index) : null} >{enabled ? <SvgIcon iconClass="copy" fill="#1296db" size="14" alt="复制"></SvgIcon> : <SvgIcon iconClass="copy" fill="rgb(189, 189, 189)" size="14" alt="复制多行"></SvgIcon>}</a>;
           }
           /* 提取数据 */
           if (bReplace) {
             const enabled = this.getTableBtnState('BtnReplace', record);
-            operateReplace = <a title={setReplace} onClick={enabled ? this.replaceTbRow.bind(this, index, record) : null} >{enabled ?<img src={ReplaceIcon} alt="提取数据" width="18px" height="18px" />:<img src={DisReplaceIcon} alt="查看工艺参数" width="16px" height="16px" />}</a>;
+            operateReplace = <a title={setReplace} onClick={enabled ? this.replaceTbRow.bind(this, index, record) : null} >{enabled ? <img src={ReplaceIcon} alt="提取数据" width="18px" height="18px" /> : <img src={DisReplaceIcon} alt="查看工艺参数" width="16px" height="16px" />}</a>;
           }
@@ -3148,10 +3168,10 @@ class CommonTableRc extends React.Component {
               <a
                 title={setMaterailRemark}
                 {...modalRemarkProps}
-                onClick={enabled ? this.modalRemarkTbRow.bind(this, index) : () => {}}
+                onClick={enabled ? this.modalRemarkTbRow.bind(this, index) : () => { }}
               >
-                <SvgIcon iconClass="material" fill={enabled ? "#1296db": "rgb(189, 189, 189)"} size="14" alt="选择材料">
-              </SvgIcon></a>
+                <SvgIcon iconClass="material" fill={enabled ? "#1296db" : "rgb(189, 189, 189)"} size="14" alt="选择材料">
+                </SvgIcon></a>
             )
           }
           /** 放置选择工序材料图标 */
@@ -3175,7 +3195,7 @@ class CommonTableRc extends React.Component {
           if (downloadIcon) {
             const setDownload = commonFunc.showMessage(props.app.commonConst, 'setDownload');/* 下载 */
-            operateDownload = <a title={setDownload} {...downloadProps} onClick={this.downloadTbRow.bind(this, index, record)}>{ <DownloadOutlined />}</a>;
+            operateDownload = <a title={setDownload} {...downloadProps} onClick={this.downloadTbRow.bind(this, index, record)}>{<DownloadOutlined />}</a>;
           }
           if (this.isPopupShow) {
@@ -3185,18 +3205,18 @@ class CommonTableRc extends React.Component {
           }
           if (this.isParamShow) {
-            const setParam = commonUtils.isNotEmptyObject(commonFunc.showMessage(props.app.commonConst, 'setParam')) ? commonFunc.showMessage(props.app.commonConst, 'setParam') : '查看参数' ;/* 参数 */
+            const setParam = commonUtils.isNotEmptyObject(commonFunc.showMessage(props.app.commonConst, 'setParam')) ? commonFunc.showMessage(props.app.commonConst, 'setParam') : '查看参数';/* 参数 */
             operateParamModal = <a title={setParam} {...chooseParamProps} onClick={this.paramModalTbRow.bind(this, index, record)}>{<img src={ParamIcon} alt="查看工艺参数" width="16px" height="16px" />}</a>;
           }
           if (exitIcon) {
             const setExit = '退出';
-            operateExit = <a title={setExit} onClick={this.exitTbRow.bind(this, index, record)}>{ <ExportOutlined style={{color: '#8e1f13'}}/>}</a>;
+            operateExit = <a title={setExit} onClick={this.exitTbRow.bind(this, index, record)}>{<ExportOutlined style={{ color: '#8e1f13' }} />}</a>;
           }
           if (sAlumitePopup) {
             const setAlumitePopup = '电化铝';
             const enabled = this.getTableBtnState('BtnPopupsAlumiteBomBillNo', record);
-            operatesAlumitePopup = <a title={setAlumitePopup} onClick={enabled ? this.popupModalTbRow.bind(this, index, record, 'BtnPopupsAlumiteBomBillNo') : null}>{ enabled ? <img src={sAlumiteIcon} alt="电化铝" width="18px" height="18px" /> : <img src={DisAlumiteIcon} alt="电化铝" width="18px" height="18px" />}</a>;
+            operatesAlumitePopup = <a title={setAlumitePopup} onClick={enabled ? this.popupModalTbRow.bind(this, index, record, 'BtnPopupsAlumiteBomBillNo') : null}>{enabled ? <img src={sAlumiteIcon} alt="电化铝" width="18px" height="18px" /> : <img src={DisAlumiteIcon} alt="电化铝" width="18px" height="18px" />}</a>;
           }
           return (<div
@@ -3208,51 +3228,51 @@ class CommonTableRc extends React.Component {
           </div>);
         },
         title: () => (this.props.setOpterationColumn === 'Y' && this.getTableFilterData() === 0 ? <span
-            style={{
-              width: '100%', height: '100%', display: 'flex', justifyContent: 'left', textDecoration: 'none',
+          style={{
+            width: '100%', height: '100%', display: 'flex', justifyContent: 'left', textDecoration: 'none',
+          }}
+        >{setOperation} {uploadIcon ? <Upload {...divProps} disabled={!this.props.enabled}>
+          <a {...uploadProps}
+            contenteditable="true"
+            ref={(ref) => { this.uploadRef1 = ref; }}
+            onPaste={this.handleUploadByClipboard}
+            onMouseOver={() => {
+              this.uploadRef1.setAttribute('contenteditable', "true");
             }}
-          >{setOperation} {uploadIcon ? <Upload {...divProps} disabled={!this.props.enabled}>
-            <a {...uploadProps}
-               contenteditable="true"
-               ref={(ref) => {this.uploadRef1 = ref;}}
-               onPaste={this.handleUploadByClipboard}
-               onMouseOver={() => {
-                 this.uploadRef1.setAttribute('contenteditable', "true");
-               }}
-               onKeyDown={() => {
-                 this.uploadRef1.setAttribute('contenteditable', "false");
-               }}
-               onKeyUp={() => {
-                 this.uploadRef1.setAttribute('contenteditable', "true");
-               }}
-            >
-              {
-                this.props.enabled ?   <UploadOutlined /> :  <UploadOutlined style={{color:'rgb(189, 189, 189)'}} />
-              }
-            </a>
-          </Upload> : <span><a {...addProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnAdd')) ? this.addTbRowInHeader : null}>{!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnAdd')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a>
-            { headPopup ?   <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : '' }</span>}
+            onKeyDown={() => {
+              this.uploadRef1.setAttribute('contenteditable', "false");
+            }}
+            onKeyUp={() => {
+              this.uploadRef1.setAttribute('contenteditable', "true");
+            }}
+          >
+            {
+              this.props.enabled ? <UploadOutlined /> : <UploadOutlined style={{ color: 'rgb(189, 189, 189)' }} />
+            }
+          </a>
+        </Upload> : <span><a {...addProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnAdd')) ? this.addTbRowInHeader : null}>{!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnAdd')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a>
+          {headPopup ? <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : ''}</span>}
         </span> :
-          uploadIcon ? <span> <Upload {...divProps}  disabled={!this.props.enabled}>
+          uploadIcon ? <span> <Upload {...divProps} disabled={!this.props.enabled}>
             <a {...uploadProps}
-               contenteditable="true"
-               ref={(ref) => {this.uploadRef1 = ref;}}
-               onPaste={this.handleUploadByClipboard}
-               onMouseOver={() => {
-                 this.uploadRef1.setAttribute('contenteditable', "true");
-               }}
-               onKeyDown={() => {
-                 this.uploadRef1.setAttribute('contenteditable', "false");
-               }}
-               onKeyUp={() => {
-                 this.uploadRef1.setAttribute('contenteditable', "true");
-               }}
+              contenteditable="true"
+              ref={(ref) => { this.uploadRef1 = ref; }}
+              onPaste={this.handleUploadByClipboard}
+              onMouseOver={() => {
+                this.uploadRef1.setAttribute('contenteditable', "true");
+              }}
+              onKeyDown={() => {
+                this.uploadRef1.setAttribute('contenteditable', "false");
+              }}
+              onKeyUp={() => {
+                this.uploadRef1.setAttribute('contenteditable', "true");
+              }}
             >
               {
-                this.props.enabled ?   <UploadOutlined /> :  <UploadOutlined style={{color:'rgb(189, 189, 189)'}} />
+                this.props.enabled ? <UploadOutlined /> : <UploadOutlined style={{ color: 'rgb(189, 189, 189)' }} />
               }
-                </a>
-          </Upload></span> : <span> {setOperation}  { headPopup ?  <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && ( props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : '' } </span>),
+            </a>
+          </Upload></span> : <span> {setOperation}  {headPopup ? <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : ''} </span>),
         width: operateWidth + 'px',
         // fixed: commonUtils.isNotEmptyObject(this.props.tableProps.AutoTableHeight) ? 'right' : false,
         fixed: 'right',
@@ -3280,8 +3300,8 @@ class CommonTableRc extends React.Component {
         return false;
       }
       returnProps.filterDropdown = ({
-                                      setSelectedKeys, selectedKeys, confirm, clearFilters,
-                                    }) => {
+        setSelectedKeys, selectedKeys, confirm, clearFilters,
+      }) => {
         return (
           <div style={{ padding: 8 }}>
             <Input
@@ -3381,7 +3401,7 @@ class CommonTableRc extends React.Component {
     const { enabled, sUseInfo, app, masterData } = props;
     /*   待用数据   */
     const showConfig = this.getShowConfig(props, sName); /*   配置信息    */
-    if(commonUtils.isEmptyObject(showConfig)) {
+    if (commonUtils.isEmptyObject(showConfig)) {
       console.log('渲染失败：', showConfig, sName);
     }
     /*   返回值   */
@@ -3389,7 +3409,7 @@ class CommonTableRc extends React.Component {
     if (showConfig.iTag === 1) {
       enabledNew = false;
     } else if (showConfig.iTag === 3) {
-      if(commonUtils.isNotEmptyObject(masterData) && !masterData.bCheck) {
+      if (commonUtils.isNotEmptyObject(masterData) && !masterData.bCheck) {
         enabledNew = true;
       }
     } else if (record.rowTag === 1) { /* 当rowTag为1时，锁定该行不可编辑 */
@@ -3398,7 +3418,7 @@ class CommonTableRc extends React.Component {
       enabledNew = false;
     }
     /* 红冲中的单据 不可修改 */
-    if (commonUtils.isNotEmptyObject(masterData) && ((commonUtils.isNotEmptyObject(masterData.sMinusSrcId)) || commonUtils.isNotEmptyObject(masterData.sMinusUsed)) ) {
+    if (commonUtils.isNotEmptyObject(masterData) && ((commonUtils.isNotEmptyObject(masterData.sMinusSrcId)) || commonUtils.isNotEmptyObject(masterData.sMinusUsed))) {
       enabledNew = false;
       if (app?.currentPane?.copyTo?.name && app.currentPane.copyTo.name.toLowerCase().includes('portion')) {
         // 部分红冲中可修改的字段
@@ -3407,9 +3427,9 @@ class CommonTableRc extends React.Component {
       }
     }
-    enabledNew= this.getSelectRowEditState(sName, record, enabledNew);
+    enabledNew = this.getSelectRowEditState(sName, record, enabledNew);
-    typeof props.otherlimitDisabled === 'function' && (enabledNew = props.otherlimitDisabled({enabledNew, record, sName}));
+    typeof props.otherlimitDisabled === 'function' && (enabledNew = props.otherlimitDisabled({ enabledNew, record, sName }));
     const showConfigAll = this.getColorConfig(); /* 拿到颜色配置json */
     const showConfigArr = commonUtils.isNotEmptyArr(showConfigAll) ? showConfigAll.filter(item => item.sName === sName) : []; /* 找到该字段颜色配置 */
@@ -3430,7 +3450,7 @@ class CommonTableRc extends React.Component {
         } = item;
         if (!isRow) { /* 根据配置设置单元格颜色 */
           let { conditionValue: conditionValueOld } = item;
-          const conditionValue = record[conditionValueOld] ? record[conditionValueOld]: conditionValueOld;
+          const conditionValue = record[conditionValueOld] ? record[conditionValueOld] : conditionValueOld;
           if (column === sName && !commonUtils.isEmpty(record[column])) {
             if (condition === '=') {
               styleColor = record[column] === conditionValue ? `SetCell_${background}` : '';
@@ -3484,7 +3504,7 @@ class CommonTableRc extends React.Component {
       onPreviewOffice: this.handlePreviewOffice,
       onDropdownVisibleChange: this.handleDropdownVisibleChange,
       onFilterDropDownData: props.onFilterDropDownData,
-      onFieldPopupModal:this.handleFieldPopupModal, /* 字段选择弹窗 */
+      onFieldPopupModal: this.handleFieldPopupModal, /* 字段选择弹窗 */
       onFieldDoubleClick: this.props.onFieldDoubleClick,
       onDropDownBlur: props.onDropDownBlur, /* 下拉框多选离开事件 */
       className: styleColorArr,
@@ -3500,7 +3520,7 @@ class CommonTableRc extends React.Component {
   /**   获取上传控件的props   */
   getUploadProps = () => {
     return {
-      disabled:this.props.name === 'picFile' ? !this.findIsUpdByControlName(this.props, 'BtnUpload') : !this.props.enabled, /*   是否可用   */
+      disabled: this.props.name === 'picFile' ? !this.findIsUpdByControlName(this.props, 'BtnUpload') : !this.props.enabled, /*   是否可用   */
       style: { display: commonUtils.convertBooleanToDisplayBlock(this.isUploadShow) }, /*   是否显示   */
     };
   };
@@ -3661,7 +3681,7 @@ class CommonTableRc extends React.Component {
     let bPagination = true; /* 默认表格分页s  */
     let pagination = {};
     if (commonUtils.isNotEmptyObject(this.props)) {
-      bPagination =  (commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination));
+      bPagination = (commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination));
       pagination = this.props.tableProps.pagination;
     }
@@ -3690,7 +3710,7 @@ class CommonTableRc extends React.Component {
       return;
     }
     /* 如果是树形 则返回 */
-    if(this.props.sTableType && this.props.sTableType !='zero') {
+    if (this.props.sTableType && this.props.sTableType != 'zero') {
       return;
     }
     const obj = {};
@@ -3715,7 +3735,7 @@ class CommonTableRc extends React.Component {
         let flag = false;
         for (const key in item) {
           // 判断是否与上一个值相同
-          if (item[key] !== '' && item[key] === prevData[key] && (commonUtils.isNotEmptyObject(sMergeCellFiled) ? item[sMergeCellFiled] === prevData[sMergeCellFiled] : true) ) {
+          if (item[key] !== '' && item[key] === prevData[key] && (commonUtils.isNotEmptyObject(sMergeCellFiled) ? item[sMergeCellFiled] === prevData[sMergeCellFiled] : true)) {
             if (!obj[key]) {
               obj[key] = [];
             }
@@ -3761,7 +3781,7 @@ class CommonTableRc extends React.Component {
         const prevData = this.curSlaveInfoData[index - 1];
         for (const key in item) {
           // 判断是否与上一个值相同
-          if (item[key] !== '' && item[key] === prevData[key] && (commonUtils.isNotEmptyObject(sMergeCellFiled) ? item[sMergeCellFiled] === prevData[sMergeCellFiled] : true) ) {
+          if (item[key] !== '' && item[key] === prevData[key] && (commonUtils.isNotEmptyObject(sMergeCellFiled) ? item[sMergeCellFiled] === prevData[sMergeCellFiled] : true)) {
             if (!obj[key]) {
               obj[key] = [];
             }
@@ -3837,18 +3857,18 @@ class CommonTableRc extends React.Component {
   };
   handleSelectCancel = (modelVisible) => {
     this.setState({
-      [modelVisible]:false,
+      [modelVisible]: false,
     });
   };
   handleSelectCommonPopup = (name, selectConfig, selectData) => {
     const { commonPopupTbName, commonPopupShowConfig, commonFieldPopupVisible, commonPopupVisible, commonFieldPopupTbName, commonFieldPopupShowConfig,
       commonModalVisible, commonModalShowConfig, commonModalTbName } = this.state;
     /* 若是产品名称弹窗 并且配置了调用产品工艺卡标识copyFromTechnology 则走自己的逻辑 */
-    if(selectConfig.sCompareColor === 'copyFromTechnology') {
+    if (selectConfig.sCompareColor === 'copyFromTechnology') {
       this.props.onSelectCommonPopupProduct(name, selectConfig, selectData, commonPopupTbName, commonPopupShowConfig);
     } else {
-      let tb =  commonPopupVisible ? { name: commonPopupTbName, config: commonPopupShowConfig } : commonFieldPopupVisible ? { name: commonFieldPopupTbName, config: commonFieldPopupShowConfig }  : undefined;
-      tb = commonModalVisible ? { name: commonModalTbName, config: commonModalShowConfig }: tb;
+      let tb = commonPopupVisible ? { name: commonPopupTbName, config: commonPopupShowConfig } : commonFieldPopupVisible ? { name: commonFieldPopupTbName, config: commonFieldPopupShowConfig } : undefined;
+      tb = commonModalVisible ? { name: commonModalTbName, config: commonModalShowConfig } : tb;
       if (selectConfig.sControlName?.startsWith('BtnPopupEdit')) {
         this.props.onSelectCommonPopup(name, selectConfig, selectData, tb?.name, tb?.config, { index: this.rowClickRef.current });
         return;
@@ -3945,7 +3965,7 @@ class CommonTableRc extends React.Component {
   }
   /* 快捷键跳转 */
-  handleQuickViewClick = async (name, sName, record, index , myConfigArr) => {
+  handleQuickViewClick = async (name, sName, record, index, myConfigArr) => {
     const {
       slaveConfig,
       slaveData,
@@ -3964,10 +3984,10 @@ class CommonTableRc extends React.Component {
       // employeeConfig,
     } = this.props;
     let picArr = ''
-    if(commonUtils.isNotEmptyArr(slaveConfig)){
-       picArr = slaveConfig.gdsconfigformslave.filter(item => (item.sName === sName));
+    if (commonUtils.isNotEmptyArr(slaveConfig)) {
+      picArr = slaveConfig.gdsconfigformslave.filter(item => (item.sName === sName));
     }
-    if(commonUtils.isNotEmptyArr(myConfigArr)) {
+    if (commonUtils.isNotEmptyArr(myConfigArr)) {
       picArr = myConfigArr;
     }
     if (picArr.length > 0) {
@@ -4074,14 +4094,14 @@ class CommonTableRc extends React.Component {
         }
       };
     })
- 	};
+  };
   /* 所有备注非编辑状态下点击链接可以弹出备注窗体 */
   handleMemoShow = (name, sName, record, index, showConfig) => {
     if (commonUtils.isNotEmptyObject(record)) {
       const sMemo = showConfig.sName;
       const title = showConfig.showName;
-      if (sName.includes(['sTemplateFullMemo','sContentMemo'])) {
+      if (sName.includes(['sTemplateFullMemo', 'sContentMemo'])) {
         return this.setState({ simpleModalVisible: true, simpleModalWord: record[sName] });
       }
       const sCurrMemoProps = {
@@ -4097,30 +4117,30 @@ class CommonTableRc extends React.Component {
       this.props.onSaveState({ sCurrMemoProps });
     }
   }
-  handleViewChoose= (name, sName, record, index) => {
+  handleViewChoose = (name, sName, record, index) => {
     this.props.onViewChoose(name, sName, record, index);
   }
   /* 弹出通用窗体 */
-  handlePopupModal= (showConfig, name) => {
+  handlePopupModal = (showConfig, name) => {
     this.setState({
-      commonPopupVisible:true,
-      commonPopupTbName:name,
-      commonPopupShowConfig:showConfig,
+      commonPopupVisible: true,
+      commonPopupTbName: name,
+      commonPopupShowConfig: showConfig,
     });
   }
   /* 字段弹窗 */
-  handleFieldPopupModal= (showConfig, name, record) => {
+  handleFieldPopupModal = (showConfig, name, record) => {
     this.setState({
-      commonFieldPopupVisible:true,
-      commonFieldPopupTbName:name,
-      commonFieldPopupShowConfig:showConfig,
+      commonFieldPopupVisible: true,
+      commonFieldPopupTbName: name,
+      commonFieldPopupShowConfig: showConfig,
       commonFieldPopupShowRecord: record,
     });
   }
   /* 蓝色链接弹出通用窗体 */
-  handleTabModalClick= (name, sName, record, index, showConfig, configName) => {
+  handleTabModalClick = (name, sName, record, index, showConfig, configName) => {
     // const { sourceAllData:data } = this.props;
     // let commonModalData = [];
     // if(sName === 'dSumCompleteAvailableStockQty' &&  commonUtils.isNotEmptyArr(data)) {
@@ -4129,11 +4149,11 @@ class CommonTableRc extends React.Component {
     //     item.bSecondMainMaterials);
     // }
     this.setState({
-      commonModalVisible:true,
-      commonModalTbName:name,
-      commonModalShowConfig:showConfig,
-      commonModalRecord:record,
-      commonModalConfigName:configName,
+      commonModalVisible: true,
+      commonModalTbName: name,
+      commonModalShowConfig: showConfig,
+      commonModalRecord: record,
+      commonModalConfigName: configName,
       // commonModalData,
     });
   }
@@ -4147,7 +4167,7 @@ class CommonTableRc extends React.Component {
     const oDiv = {
       'span': target.parentNode,
       'td': target.childNodes[0].childNodes[0],
-      'div': target.getAttribute('data-name') ?  target : target.childNodes[0],
+      'div': target.getAttribute('data-name') ? target : target.childNodes[0],
     }[tagName.toLowerCase()];
     if (!oDiv || window.getSelection().toString()) return false;
@@ -4199,7 +4219,7 @@ class CommonTableRc extends React.Component {
   }
   /* 点击图片预览 */
-  handlePreviewImage= (e, dataUrlArr) => {
+  handlePreviewImage = (e, dataUrlArr) => {
     e.stopPropagation();  /* 阻止父级穿透 */
     if (commonUtils.isNotEmptyObject(dataUrlArr)) {
       const { token } = this.props.app;
@@ -4209,7 +4229,7 @@ class CommonTableRc extends React.Component {
         previewImageArr.push(dataPreviewUrl);
       });
       this.setState({
-        previewImage:previewImageArr,
+        previewImage: previewImageArr,
         previewVisible: true,
         showimgs: true,
         firstIndex: 0,
@@ -4244,16 +4264,16 @@ class CommonTableRc extends React.Component {
     const sBtnName = sName;
     const sBtnContent = record[sName];
     const sFormId = commonUtils.isNotEmptyObject(record.sId) ? record.sId : '';
-    const sBtnControlName = commonUtils.isNotEmptyObject(showConfig.sControlName) ? showConfig.sControlName : '' ;
+    const sBtnControlName = commonUtils.isNotEmptyObject(showConfig.sControlName) ? showConfig.sControlName : '';
     console.log('sFormId:', sFormId);
-    if(commonUtils.isNotEmptyObject(sBtnContent)) {
+    if (commonUtils.isNotEmptyObject(sBtnContent)) {
       const urlPrint = `${commonConfig.server_host}template/getSql/${sBtnName}/?sBtnContent=${sBtnContent}&sBtnControlName=${sBtnControlName}&sFormId=${sFormId}`;
-      const w=window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-      const h=window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+      const w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+      const h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
       //const newWin = window.open('','_blank');
-      const features = "width="+(w+350)+",height="+(h+300)+", top=0, left=0, toolbar=no, menubar=no,scrollbars=no,resizable=no, location =no, status=no";
+      const features = "width=" + (w + 350) + ",height=" + (h + 300) + ", top=0, left=0, toolbar=no, menubar=no,scrollbars=no,resizable=no, location =no, status=no";
       const newWin = window.open("", "SQL查看器", features);
-      newWin.document.write('<body scroll="no" style="margin: 0px;padding: 0px;border:0px;overflow:hidden;"><iframe style="margin: 0px;padding: 0px;border: 0px;width:100%;height:100%" src="'+urlPrint+'"></iframe></body>');
+      newWin.document.write('<body scroll="no" style="margin: 0px;padding: 0px;border:0px;overflow:hidden;"><iframe style="margin: 0px;padding: 0px;border: 0px;width:100%;height:100%" src="' + urlPrint + '"></iframe></body>');
       // window.open(urlPrint);
     } else {
       message.error('未找到对应过程名');
@@ -4262,7 +4282,7 @@ class CommonTableRc extends React.Component {
   /* 右箭头点击 */
   handleRightArrow = (name, sName, record, index, showConfig) => {
-    if(this.props.onRightArrow) {
+    if (this.props.onRightArrow) {
       this.props.onRightArrow(name, sName, record, index, showConfig);
     }
@@ -4272,9 +4292,9 @@ class CommonTableRc extends React.Component {
   handleOperateMoreOk = () => {
     const sNumber = document.getElementById('iNumber').value;
     console.log('sNumber', sNumber);
-    if(commonUtils.isNotEmptyObject(iNumber) && Number(sNumber) > 0 ) {
-     const iNumber = Number(sNumber);
-      for(let i = 0; i< iNumber ; i++) {
+    if (commonUtils.isNotEmptyObject(iNumber) && Number(sNumber) > 0) {
+      const iNumber = Number(sNumber);
+      for (let i = 0; i < iNumber; i++) {
         this.handleCopyRow(0);
       }
     }
@@ -4426,10 +4446,10 @@ class CommonTableRc extends React.Component {
     };
   }
-  genFooter= () => {
+  genFooter = () => {
     const { tableColumn, totalData: totalData0, totalDataNew, sumGroup = {}, totalData1 } = this.state;
     const totalData = Object.keys(sumGroup).some(key => sumGroup[key]?.length) ? totalDataNew : totalData0;
-    const {  dNetMoney, dNetPrice } = this.props.app.decimals;
+    const { dNetMoney, dNetPrice } = this.props.app.decimals;
     const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
     const sumset = commonFunc.showMessage(this.props.app.commonConst, 'sumSet') || '合计';
@@ -4437,13 +4457,13 @@ class CommonTableRc extends React.Component {
     if ((!totalData.length && !totalData1.length) || this.props.footer !== undefined) {
       return (<></>);
     }
-    if(this.props.tableProps.rowSelection !== null && !(this.props.config && !this.props.config.bisMutiSelect)) {
+    if (this.props.tableProps.rowSelection !== null && !(this.props.config && !this.props.config.bisMutiSelect)) {
       colSpan = colSpan + 1;
     }
-    if(this.props.slaveInfo) {
+    if (this.props.slaveInfo) {
       colSpan = colSpan + 1;
     }
-    if(this.props.dragHandle) {
+    if (this.props.dragHandle) {
       // colSpan = colSpan + 1; // 临时处理标准精准报价单据工序信息表合计错位问题
     }
     const cells = [];
@@ -4451,7 +4471,7 @@ class CommonTableRc extends React.Component {
     if (totalData.length) {
       let summaryCellTotal = '';
       summaryCellTotal = (
-        <Table.Summary.Cell key={0} colSpan={colSpan ? colSpan: 1} index={0}>
+        <Table.Summary.Cell key={0} colSpan={colSpan ? colSpan : 1} index={0}>
           <span className={styles.summaryCellTotal}>{sumset}</span>
         </Table.Summary.Cell>
       );
@@ -4471,7 +4491,7 @@ class CommonTableRc extends React.Component {
       cells.push(summaryCellTotal);
       tableColumn.forEach((item, index) => {
-        if(colSpan === 0 && index === 0) {
+        if (colSpan === 0 && index === 0) {
           return;
         }
         let iTag = index + colSpan;
@@ -4483,39 +4503,39 @@ class CommonTableRc extends React.Component {
             if (commonUtils.isNotEmptyObject(itemChild.dataIndex) && itemChild.dataIndex.substring(0, 1) === 'd' && columnConfig?.sDateFormat === 'decimalPoint' && columnConfig?.sFieldValidation) {
               /* 取小数点位数 */
               const point = columnConfig.sFieldValidation.split(',')[1] || 2;
-              if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+              if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
                 const dConfigResult = commonUtils.convertFixNum(Number(sValue), point).toFixed(point);
-                if(!isNaN(dConfigResult)) {
+                if (!isNaN(dConfigResult)) {
                   sValue = dConfigResult;
                 }
               }
-            } else if( commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('commonList') || (sModelsType && sModelsType.indexOf('commonMultiList') > -1)) {
+            } else if (commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('commonList') || (sModelsType && sModelsType.indexOf('commonMultiList') > -1)) {
               /* 有配置以配置为主 否则以系统设定为主 */
-              if(commonUtils.isNotEmptyObject(itemChild.dataIndex) && itemChild.dataIndex.substring(0, 1) === 'd' && commonUtils.isNotEmptyObject(itemChild.sDateFormat)) {
+              if (commonUtils.isNotEmptyObject(itemChild.dataIndex) && itemChild.dataIndex.substring(0, 1) === 'd' && commonUtils.isNotEmptyObject(itemChild.sDateFormat)) {
                 /* 取小数点位数 */
                 let point = 0;
                 let strIndex = itemChild.sDateFormat.indexOf('.');
-                if(strIndex > -1 && itemChild.sDateFormat.length > 1) {
+                if (strIndex > -1 && itemChild.sDateFormat.length > 1) {
                   point = itemChild.sDateFormat.substring(strIndex + 1, itemChild.sDateFormat.length).length;
-                  if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+                  if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
                     const dConfigResult = commonUtils.convertFixNum(Number(sValue), point).toFixed(point);
-                    if(!isNaN(dConfigResult)) {
+                    if (!isNaN(dConfigResult)) {
                       sValue = dConfigResult;
                     }
                   }
                 }
               } else {
-                if ( commonUtils.isNotEmptyObject(itemChild.dataIndex) && itemChild.dataIndex.toLowerCase().endsWith('price')) {  /* 列表单价格式化显示1 */
-                  if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+                if (commonUtils.isNotEmptyObject(itemChild.dataIndex) && itemChild.dataIndex.toLowerCase().endsWith('price')) {  /* 列表单价格式化显示1 */
+                  if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
                     const dResult = commonUtils.convertFixNum(Number(sValue), dNetPrice).toFixed(dNetPrice);
-                    if(!isNaN(dResult)) {
+                    if (!isNaN(dResult)) {
                       sValue = dResult;
                     }
                   }
                 } else if (commonUtils.isNotEmptyObject(itemChild.dataIndex) && itemChild.dataIndex.toLowerCase().endsWith('money')) {  /* 列表金额格式化显示 */
-                  if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+                  if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
                     const dResult = commonUtils.convertFixNum(Number(sValue), dNetMoney).toFixed(dNetMoney);
-                    if(!isNaN(dResult)) {
+                    if (!isNaN(dResult)) {
                       sValue = dResult;
                     }
                   }
@@ -4535,19 +4555,19 @@ class CommonTableRc extends React.Component {
           let cell = '';
           /* commonList 格式化单价、金额 */
           let sValue = totalData[0][item.dataIndex];
-          if( commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('commonList') || (sModelsType && sModelsType.indexOf('commonMultiList') > -1)) {
+          if (commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('commonList') || (sModelsType && sModelsType.indexOf('commonMultiList') > -1)) {
             /* 有配置以配置为主 否则以系统设定为主 */
             const columnConfig = this.props.config.gdsconfigformslave.find(item1 => item1.sName === item.dataIndex);
             if (commonUtils.isNotEmptyObject(item.dataIndex) && item.dataIndex.substring(0, 1) === 'd' && columnConfig?.sDateFormat === 'decimalPoint' && columnConfig?.sFieldValidation) {
               /* 取小数点位数 */
               const point = columnConfig.sFieldValidation.split(',')[1] || 2;
-              if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+              if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
                 const dConfigResult = commonUtils.convertFixNum(Number(sValue), point).toFixed(point);
-                if(!isNaN(dConfigResult)) {
+                if (!isNaN(dConfigResult)) {
                   sValue = dConfigResult;
                 }
               }
-            } else if ( commonUtils.isNotEmptyObject(item.sDateFormat)) {
+            } else if (commonUtils.isNotEmptyObject(item.sDateFormat)) {
               /* 取小数点位数 */
               let point = 0;
               let strIndex = item.sDateFormat.indexOf('.');
@@ -4593,13 +4613,13 @@ class CommonTableRc extends React.Component {
     if (totalData1.length) {
       let summaryCellTotal1 = '';
       summaryCellTotal1 = (
-        <Table.Summary.Cell key={0} colSpan={colSpan ? colSpan: 1} index={0}>
+        <Table.Summary.Cell key={0} colSpan={colSpan ? colSpan : 1} index={0}>
           <span className={styles.summaryCellTotal}>总计</span>
         </Table.Summary.Cell>
       );
       cells1.push(summaryCellTotal1);
       tableColumn.forEach((item, index) => {
-        if(colSpan === 0 && index === 0) {
+        if (colSpan === 0 && index === 0) {
           return;
         }
         let iTag = index + colSpan;
@@ -4690,15 +4710,15 @@ class CommonTableRc extends React.Component {
               } else {
                 /* 如果设置格式 按照设置格式来，否则按照系统设定 */
                 const sFieldConfigArr = config.gdsconfigformslave.filter(item => item.sName === sumItem.sName && item.bVisible);
-                if(commonUtils.isNotEmptyArr(sFieldConfigArr)) {
+                if (commonUtils.isNotEmptyArr(sFieldConfigArr)) {
                   const { sFieldValidation: sFieldValidationOld, sName } = sFieldConfigArr[0];
-                  if(commonUtils.isNotEmptyObject(sFieldValidationOld)) {
+                  if (commonUtils.isNotEmptyObject(sFieldValidationOld)) {
                     const [length1, length2] = sFieldValidationOld.split(',');
-                    if(commonUtils.isNotEmptyNumber(length2)) {
+                    if (commonUtils.isNotEmptyNumber(length2)) {
                       tableDataTotal[sumItem.sName] = commonUtils.convertFixNum(commonUtils.convertToNum(tableDataTotal[sumItem.sName]) +
                         commonUtils.convertToNum(tableDataRow[sumItem.sName]), this.props.getFloatNum(length2));
                     }
-                  }else {
+                  } else {
                     tableDataTotal[sumItem.sName] = commonUtils.convertFixNum(commonUtils.convertToNum(tableDataTotal[sumItem.sName]) +
                       commonUtils.convertToNum(tableDataRow[sumItem.sName]), this.props.getFloatNum(sumItem.sName));
                   }
@@ -4727,11 +4747,11 @@ class CommonTableRc extends React.Component {
     const sumConfig = config.gdsconfigformslave.filter(item => item.sName !== '' && item.bVisible && item.bSum);
     if (commonUtils.isNotEmptyArr(sumConfig)) {
       if (commonUtils.isNotEmptyObject(config) && commonUtils.isNotEmptyArr(dataSource)) {
-        const { selectedRowKeys } =this.state;
+        const { selectedRowKeys } = this.state;
         /* 生产排程对选中行进行汇总 */
-        if(commonUtils.isNotEmptyArr(selectedRowKeys)) {
+        if (commonUtils.isNotEmptyArr(selectedRowKeys)) {
           const selectedData = dataSource.filter(item => selectedRowKeys.includes(item.sSlaveId));
-          if(commonUtils.isNotEmptyArr(selectedData)) {
+          if (commonUtils.isNotEmptyArr(selectedData)) {
             selectedData.forEach((tableDataRow) => {
               sumConfig.forEach((sumItem) => {
                 if (tableDataRow.handleType !== 'del') {
@@ -4776,10 +4796,10 @@ class CommonTableRc extends React.Component {
   handleSumChildColumn = (config, dataSource) => {
     const tableDataTotal = {};
-    const { filteredValue } =this.state;
+    const { filteredValue } = this.state;
     const sumConfig = config.gdsconfigformslave.filter(item => item.sName !== '' && item.bVisible && item.bSum);
     if (commonUtils.isNotEmptyArr(sumConfig)) {
-      if (commonUtils.isNotEmptyObject(config) && commonUtils.isNotEmptyArr(dataSource)  && commonUtils.isNotEmptyArr(filteredValue)) {
+      if (commonUtils.isNotEmptyObject(config) && commonUtils.isNotEmptyArr(dataSource) && commonUtils.isNotEmptyArr(filteredValue)) {
         /* 序号根据sSqlConditonId分组 序号重排 */
         const groupedData = commonUtils.groupBy(dataSource, item => item.sSqlConditionId);
         let selectedData = [];
@@ -4789,14 +4809,14 @@ class CommonTableRc extends React.Component {
             if (commonUtils.isNotEmptyArr(eachData)) {
               /* 看当前选中在哪个组里 */
               const iIndex = eachData.findIndex(item => filteredValue.includes(item.sSqlConditionId));
-              if(iIndex > -1){
+              if (iIndex > -1) {
                 selectedData = eachData;
               }
             }
           }
         }
-        if(commonUtils.isNotEmptyArr(selectedData)) {
+        if (commonUtils.isNotEmptyArr(selectedData)) {
           selectedData.forEach((tableDataRow) => {
             sumConfig.forEach((sumItem) => {
               if (tableDataRow.handleType !== 'del') {
@@ -4825,7 +4845,7 @@ class CommonTableRc extends React.Component {
   }
   // 表格按钮点击后调用指令集
   handleInstruct = (btnName, callback) => {
-    const { sInstruct:sInstructStr } = this.props.config;
+    const { sInstruct: sInstructStr } = this.props.config;
     const sInstruct = commonUtils.convertStrToObj(sInstructStr, {});
     const { data = [] } = sInstruct;
@@ -4871,19 +4891,19 @@ class CommonTableRc extends React.Component {
     if (commonUtils.isNotEmptyObject(this.props.tableProps.chooseProcessConfigRow)) {
       this.handleInstruct('BtnChooseProcess', () => {
         const iIndex = this.props.tableProps.chooseProcessConfigRow;
-         if(this.props.name === 'slave0Child1') {
-           const { name } = this.props;
-           let btnPupopConfig = this.props.tableProps.chooseProcessConfigRow;
-           this.setState({
-             commonPopupVisible: true,
-             commonPopupTbName: name,
-             commonPopupShowConfig: btnPupopConfig,
-             commonPopupRecord: record,
-           });
-
-         } else {
-           this.props.onBtnChoose('process', 'BtnChooseProcess', iIndex);
-         }
+        if (this.props.name === 'slave0Child1') {
+          const { name } = this.props;
+          let btnPupopConfig = this.props.tableProps.chooseProcessConfigRow;
+          this.setState({
+            commonPopupVisible: true,
+            commonPopupTbName: name,
+            commonPopupShowConfig: btnPupopConfig,
+            commonPopupRecord: record,
+          });
+
+        } else {
+          this.props.onBtnChoose('process', 'BtnChooseProcess', iIndex);
+        }
       });
     }
   };
@@ -4910,7 +4930,7 @@ class CommonTableRc extends React.Component {
   handleAddRow = (index, bModalAdd) => {
     this.stopRowClick = true;
     /* 多表树形删除 */
-    if(this.props && this.props.slaveInfo && this.props.slaveInfo.tableProps && this.props.slaveInfo.tableProps.bSlaveInfo) {
+    if (this.props && this.props.slaveInfo && this.props.slaveInfo.tableProps && this.props.slaveInfo.tableProps.bSlaveInfo) {
       this.handleAddInfoRow(index);
       return;
     }
@@ -4961,10 +4981,10 @@ class CommonTableRc extends React.Component {
     }, 0)
   };
   handleTreeDel = (index, record) => {
-    if(this.props.name === 'control') {
-      const sureDel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'SureDel') : '确认要删除吗？' ;
-      const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定？' ;
-      const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定？' ;
+    if (this.props.name === 'control') {
+      const sureDel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'SureDel') : '确认要删除吗？';
+      const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定？';
+      const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定？';
       const _this = this;
       confirm({
         title: sureDel,
@@ -4988,7 +5008,7 @@ class CommonTableRc extends React.Component {
           this.props.onTreeDel(this.props.name, true, '');
         }
       });
-    },0);
+    }, 0);
   };
   /**   复制   */
   handleCopyRow = (index) => {
@@ -4998,7 +5018,7 @@ class CommonTableRc extends React.Component {
           this.props.onCopyRow(this.props.name, undefined, undefined, index);
         }
       });
-    },0)
+    }, 0)
   };
   /**   复制全部   */
   handleCopyAllRow = () => {
@@ -5012,10 +5032,10 @@ class CommonTableRc extends React.Component {
   };
   /**   删除行   */
   handleDelRow = (index, record) => {
-    if(this.props.name !== 'slaveFilter') {
-      const sureDel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'SureDel') : '确认要删除吗？' ;
-      const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定？' ;
-      const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定？' ;
+    if (this.props.name !== 'slaveFilter') {
+      const sureDel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'SureDel') : '确认要删除吗？';
+      const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定？';
+      const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定？';
       const _this = this;
       confirm({
         title: sureDel,
@@ -5036,13 +5056,13 @@ class CommonTableRc extends React.Component {
   /**   删除行   */
   handleDelOkRow = (index, record) => {
     const tableSelectedRowKeys = [];
-    if(this.props?.formId === '12710101117043535363530') {
+    if (this.props?.formId === '12710101117043535363530') {
       tableSelectedRowKeys.push(record[this.rowKey]);
     } else {
       tableSelectedRowKeys.push(record.sId);
     }
     /* 多表树形删除 */
-    if(this.props && this.props.slaveInfo && this.props.slaveInfo.tableProps && this.props.slaveInfo.tableProps.bSlaveInfo) {
+    if (this.props && this.props.slaveInfo && this.props.slaveInfo.tableProps && this.props.slaveInfo.tableProps.bSlaveInfo) {
       this.handleDelInfoRow(index, record);
       return;
     }
@@ -5074,7 +5094,7 @@ class CommonTableRc extends React.Component {
   /**   复制   */
   handleCopyMoreRow = (index) => {
-    this.setState({ bOperateMoreVisible : true});
+    this.setState({ bOperateMoreVisible: true });
   };
   /**   提取数据   */
@@ -5098,24 +5118,24 @@ class CommonTableRc extends React.Component {
     let btnPupopConfig = {};
     if (commonUtils.isNotEmptyArr(config) && commonUtils.isNotEmptyArr(config.gdsconfigformslave)) {
       let controlConfig = config.gdsconfigformslave.filter(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup')));
-      if(btnName && typeof btnName === 'string') {
-       controlConfig = config.gdsconfigformslave.filter(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName === btnName);
+      if (btnName && typeof btnName === 'string') {
+        controlConfig = config.gdsconfigformslave.filter(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName === btnName);
       }
       if (commonUtils.isNotEmptyArr(controlConfig)) {
         if (controlConfig[0].bVisible && controlConfig[0].sDropDownType === 'popup') {
           btnPupopConfig = controlConfig[0];
           const conditionValue = this.props.getSqlCondition(btnPupopConfig);
-          if(commonUtils.isNotEmptyObject(conditionValue)) {
-            if(commonUtils.isNotEmptyObject(conditionValue.warning)) {
+          if (commonUtils.isNotEmptyObject(conditionValue)) {
+            if (commonUtils.isNotEmptyObject(conditionValue.warning)) {
               message.warn(conditionValue.warning);
               return;
             }
           }
           this.setState({
-            commonPopupVisible:true,
-            commonPopupTbName:name,
-            commonPopupShowConfig:btnPupopConfig,
-            commonPopupRecord:record,
+            commonPopupVisible: true,
+            commonPopupTbName: name,
+            commonPopupShowConfig: btnPupopConfig,
+            commonPopupRecord: record,
           });
         }
       }
@@ -5223,7 +5243,7 @@ class CommonTableRc extends React.Component {
     /*   查询控件名是否存在   */
     if (commonUtils.isNotEmptyArr(props.config) && commonUtils.isNotEmptyArr(props.config.gdsconfigformslave) && commonUtils.isNotEmptyStr(controlName)) {
       const controlConfig = props.config.gdsconfigformslave.filter(item => item.sControlName === controlName);
-      ret = commonUtils.isEmptyArr(controlConfig) ? ( propsIcon ? true : false ) : commonUtils.converStrToBoolean(controlConfig[0].bVisible);
+      ret = commonUtils.isEmptyArr(controlConfig) ? (propsIcon ? true : false) : commonUtils.converStrToBoolean(controlConfig[0].bVisible);
     }
     /*   返回值   */
     return ret;
@@ -5239,7 +5259,7 @@ class CommonTableRc extends React.Component {
     if (commonUtils.isNotEmptyArr(props.config) && commonUtils.isNotEmptyArr(props.config.gdsconfigformslave) && commonUtils.isNotEmptyStr(controlName)) {
       const controlConfig = props.config.gdsconfigformslave.filter(item => item.sControlName === controlName);
       ret = commonUtils.isNotEmptyArr(controlConfig) && commonUtils.converStrToBoolean(controlConfig[0].iTag === 3);
-      if(ret && controlName === 'BtnUpload' && Array.isArray(controlConfig)) {
+      if (ret && controlName === 'BtnUpload' && Array.isArray(controlConfig)) {
         this.BtnUploadDivPropsAttr.current = controlConfig[0];
       }
     }
@@ -5283,41 +5303,41 @@ class CommonTableRc extends React.Component {
         <>
           {res}
           <Button
-              type="link"
-              icon={<CaretUpOutlined style={{ fontSize: 16 }} />}
-              size="large"
-              style={{
-                position: "absolute",
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-                top: 0,
-                right: 0,
-                height: 15
-              }}
-              onClick={this.props.onMoveLine.bind(this, {
-                index,
-                direction: "up"
-              })}
-            />
-            <Button
-              type="link"
-              icon={<CaretDownOutlined style={{ fontSize: 16 }} />}
-              size="large"
-              style={{
-                position: "absolute",
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-                bottom: 0,
-                right: 0,
-                height: 15
-              }}
-              onClick={this.props.onMoveLine.bind(this, {
-                index,
-                direction: "down"
-              })}
-            />
+            type="link"
+            icon={<CaretUpOutlined style={{ fontSize: 16 }} />}
+            size="large"
+            style={{
+              position: "absolute",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              top: 0,
+              right: 0,
+              height: 15
+            }}
+            onClick={this.props.onMoveLine.bind(this, {
+              index,
+              direction: "up"
+            })}
+          />
+          <Button
+            type="link"
+            icon={<CaretDownOutlined style={{ fontSize: 16 }} />}
+            size="large"
+            style={{
+              position: "absolute",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              bottom: 0,
+              right: 0,
+              height: 15
+            }}
+            onClick={this.props.onMoveLine.bind(this, {
+              index,
+              direction: "down"
+            })}
+          />
         </>);
     } else {
       return res;
@@ -5338,7 +5358,7 @@ class CommonTableRc extends React.Component {
       return '';
     }
     const showConfigObj = this.getShowConfig(props, sName, isSlaveInfo);
-    const {  dNetMoney, dNetPrice } = props.app.decimals;
+    const { dNetMoney, dNetPrice } = props.app.decimals;
     let bShow = '';
     /* 如果是布尔类型 ，加checkbox */
     if (commonUtils.isNotEmptyObject(sName) && sName.substring(0, 1) === 'b') {
@@ -5358,7 +5378,7 @@ class CommonTableRc extends React.Component {
         const officeFileTypeList = ['PDF', 'DOCX', 'XLSX', 'MP4', 'WEBM', 'OGG'];
         const imgTypeList = ['PNG', 'SVG', 'JPG', 'JPEG', 'GIF', 'BMP', 'TIFF', 'ICO'];
         const officeFileType = picAddr[0].split('.').pop().toUpperCase();
-        let fileIcon = <FilePdfOutlined/>;
+        let fileIcon = <FilePdfOutlined />;
         if (officeFileType === 'DOCX') {
           fileIcon = <FileWordOutlined />;
         } else if (officeFileType === 'XLSX') {
@@ -5370,11 +5390,11 @@ class CommonTableRc extends React.Component {
           imgBox = <span
             style={{ cursor: 'pointer' }}
             onClick={() => {
-            this.setState({
-              officePreviewVisible: true,
-              officeFileUrl: picAddr[0]
-            })
-          }}>{fileIcon}</span>
+              this.setState({
+                officePreviewVisible: true,
+                officeFileUrl: picAddr[0]
+              })
+            }}>{fileIcon}</span>
         } else if (imgTypeList.includes(officeFileType)) {
           imgBox = <span style={{ cursor: 'pointer' }}> <img src={dataUrl} alt="img" onFocus={() => 0} onClick={e => this.handlePreviewImage(e, picAddr)} style={{ width: '30px', height: '20px' }} /></span>;
         } else {
@@ -5383,13 +5403,13 @@ class CommonTableRc extends React.Component {
       }
     }
     /* 变量设置 显示字段名 */
-    let specialTitle ='';
+    let specialTitle = '';
     let bSpecialTitle = false;
-    if(sName!=='' && sName.includes('sValue')){
-      specialTitle =`R${idx}_${sName}`;
-    }else if(location.pathname?.includes('production') && (sName === 'sStateName' || sName==='sProcessState')) {
-      if(commonUtils.isNotEmptyObject(record?.sState) || commonUtils.isNotEmptyObject(record?.sStateName)) {
-        specialTitle = commonUtils.isNotEmptyObject(record.sWorkOrderChangeMemo)? record.sWorkOrderChangeMemo : '';
+    if (sName !== '' && sName.includes('sValue')) {
+      specialTitle = `R${idx}_${sName}`;
+    } else if (location.pathname?.includes('production') && (sName === 'sStateName' || sName === 'sProcessState')) {
+      if (commonUtils.isNotEmptyObject(record?.sState) || commonUtils.isNotEmptyObject(record?.sStateName)) {
+        specialTitle = commonUtils.isNotEmptyObject(record.sWorkOrderChangeMemo) ? record.sWorkOrderChangeMemo : '';
         bSpecialTitle = true;
       }
     }
@@ -5449,27 +5469,27 @@ class CommonTableRc extends React.Component {
           /* 取小数点位数 */
           let point = 0;
           let strIndex = sDateFormat.indexOf('.');
-          if(strIndex > -1 && sDateFormat.length > 1) {
+          if (strIndex > -1 && sDateFormat.length > 1) {
             point = sDateFormat.substring(strIndex + 1, sDateFormat.length).length;
-            if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+            if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
               const dConfigResult = commonUtils.convertFixNum(Number(sValue), point).toFixed(point);
-              if(!isNaN(dConfigResult)) {
+              if (!isNaN(dConfigResult)) {
                 sValue = dConfigResult;
               }
             }
           }
         } else {
           if (firstDataIndex === 'd' && sName.toLowerCase().endsWith('price')) {  /* 列表单价格式化显示 */
-            if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+            if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
               const dResult = commonUtils.convertFixNum(Number(sValue), dNetPrice).toFixed(dNetPrice);
-              if(!isNaN(dResult)) {
+              if (!isNaN(dResult)) {
                 sValue = dResult;
               }
             }
           } else if (firstDataIndex === 'd' && sName.toLowerCase().endsWith('money')) {  /* 列表金额格式化显示 */
-            if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+            if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
               const dResult = commonUtils.convertFixNum(Number(sValue), dNetMoney).toFixed(dNetMoney);
-              if(!isNaN(dResult)) {
+              if (!isNaN(dResult)) {
                 sValue = dResult;
               }
             }
@@ -5478,9 +5498,9 @@ class CommonTableRc extends React.Component {
       }
       /* 如果列表行包含sDivRow并且sDivRow有值 则代表该行行不渲染数据 只做分割作用 */
-      if(commonUtils.isNotEmptyObject(record.sDivRow) && record.bInsert) {
+      if (commonUtils.isNotEmptyObject(record.sDivRow) && record.bInsert) {
         bShow = '';
-        if(sName !=='sDivRow') {
+        if (sName !== 'sDivRow') {
           sValue = '';
         }
       }
@@ -5506,32 +5526,32 @@ class CommonTableRc extends React.Component {
         }
       }
-      if (cellColor && sName !=='sState') {
+      if (cellColor && sName !== 'sState') {
         res = (<div
           className='listDiv'
           style={{
-            position: 'absolute', width:'100%', left: 0, top:0, bottom:0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', textAlign:`${displayAlign}`, backgroundColor: `${backgroundColor}`, color: `${cellColor}`
+            position: 'absolute', width: '100%', left: 0, top: 0, bottom: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', textAlign: `${displayAlign}`, backgroundColor: `${backgroundColor}`, color: `${cellColor}`
           }}
         >
           {(commonUtils.isNotEmptyObject(sName) && sName.substring(0, 1) === 'b') || (imgBox !== '') ? '' :
             <div
               className={linkStyle}
               title={sValue}
-              style={{ padding: '4px', paddingTop:'6px', backgroundColor: `${backgroundColor}`, color: `${cellColor}`, width: '100%', height: '100%' }}
+              style={{ padding: '4px', paddingTop: '6px', backgroundColor: `${backgroundColor}`, color: `${cellColor}`, width: '100%', height: '100%' }}
               onKeyDown={e => this.onKeyDownDiv(e, sName)}
               onCut={e => e.preventDefault()}
               onPaste={e => e.preventDefault()}
               suppressContentEditableWarning
               contentEditable="true"
               onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, isSlaveInfo ? 'slaveInfo' : this.props.name, showConfig.sName, record, index, showConfig) : null}
-            > { sValue}</div>}
+            > {sValue}</div>}
           {bShow}{imgBox}
         </div>);
       } else {
         res = (<div
           className={`${styles.tdCell} listDiv`}
           style={{
-            position: 'relative', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', color: `${cellColor}`, backgroundColor: `${backgroundColor}`, textAlign:`${displayAlign}`,
+            position: 'relative', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', color: `${cellColor}`, backgroundColor: `${backgroundColor}`, textAlign: `${displayAlign}`,
           }}
           data-name={showConfig.sName}
           data-control-name={showConfig.sControlName}
@@ -5546,25 +5566,25 @@ class CommonTableRc extends React.Component {
             >
               <span
                 className={linkStyle}
-                style={{border: 'none', outline: 'none'}}
+                style={{ border: 'none', outline: 'none' }}
                 onKeyDown={e => this.onKeyDownDiv(e, sName)}
                 onCut={e => e.preventDefault()}
                 onPaste={e => e.preventDefault()}
                 suppressContentEditableWarning
                 contentEditable="true"
                 onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, isSlaveInfo ? 'slaveInfo' : this.props.name, showConfig.sName, record, index, showConfig) : null}
-             > {sValue}</span>
+              > {sValue}</span>
             </Tooltip>
           }
-          {bShow}{imgBox}{this.handleGetFastSearchBtn({record, sName, isSlaveInfo})}
+          {bShow}{imgBox}{this.handleGetFastSearchBtn({ record, sName, isSlaveInfo })}
         </div>);
       }
       const cell = this.mergeTableCell(res, idx, sName, isSlaveInfo);
       return cell;
-    } else if ( commonUtils.isNotEmptyObject(showConfigObj) && !showConfigObj.bReadonly && (props.enabled || showConfigObj.iTag === 3 )
+    } else if (commonUtils.isNotEmptyObject(showConfigObj) && !showConfigObj.bReadonly && (props.enabled || showConfigObj.iTag === 3)
       && commonUtils.isEmptyObject(record.sDivRowNew) && (commonUtils.isNotEmptyArr(props.selectedRowKeys)
         && props.selectedRowKeys.toString().includes(record.sId) || props.name === 'sParam'
-     || ( props.name ==='slaveInfo' &&  commonUtils.isNotEmptyArr(props.selectedRowKeys) && props.selectedRowKeys.toString().includes(record.sSlaveId) && showConfigObj.iTag === 3 ))
+        || (props.name === 'slaveInfo' && commonUtils.isNotEmptyArr(props.selectedRowKeys) && props.selectedRowKeys.toString().includes(record.sSlaveId) && showConfigObj.iTag === 3))
       || (this.getShowTypeProps(props, text, record, sName)?.enabled && record.sId === this.state.currentHoverSid)
       || (false && location.pathname.includes('productionScheduleTree') && this.getShowTypeProps(props, text, record, sName)?.enabled && record.sId === props.rowHoverSid)
       || (props.rootType === 'list' && props.selectedRowKeys.toString().includes(record.sSlaveId))) {
@@ -5594,7 +5614,7 @@ class CommonTableRc extends React.Component {
       let backgroundColor = '';
       if (commonUtils.isNotEmptyArr(showConfig)) {
         const cellStyle = this.getCellColorConfig(text, record, sName);
-        if (commonUtils.isNotEmptyObject(cellStyle.styleColorArrTotal) || commonUtils.isNotEmptyObject(cellStyle.styleColorArrTotalB) ) {
+        if (commonUtils.isNotEmptyObject(cellStyle.styleColorArrTotal) || commonUtils.isNotEmptyObject(cellStyle.styleColorArrTotalB)) {
           cellColor = cellStyle.styleColorArrTotal;
           backgroundColor = cellStyle.styleColorArrTotalB;
         }
@@ -5619,27 +5639,27 @@ class CommonTableRc extends React.Component {
           /* 取小数点位数 */
           let point = 0;
           let strIndex = sDateFormat.indexOf('.');
-          if(strIndex > -1 && sDateFormat.length > 1) {
+          if (strIndex > -1 && sDateFormat.length > 1) {
             point = sDateFormat.substring(strIndex + 1, sDateFormat.length).length;
-            if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+            if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
               const dConfigResult = commonUtils.convertFixNum(Number(sValue), point).toFixed(point);
-              if(!isNaN(dConfigResult)) {
+              if (!isNaN(dConfigResult)) {
                 sValue = dConfigResult;
               }
             }
           }
         } else {
           if (firstDataIndex === 'd' && sName.toLowerCase().endsWith('price')) {  /* 列表单价格式化显示 */
-            if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+            if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
               const dResult = commonUtils.convertFixNum(Number(sValue), dNetPrice).toFixed(dNetPrice);
-              if(!isNaN(dResult)) {
+              if (!isNaN(dResult)) {
                 sValue = dResult;
               }
             }
           } else if (firstDataIndex === 'd' && sName.toLowerCase().endsWith('money')) {  /* 列表金额格式化显示 */
-            if(commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
+            if (commonUtils.isNotEmptyNumber(sValue) && sValue !== null) {
               const dResult = commonUtils.convertFixNum(Number(sValue), dNetMoney).toFixed(dNetMoney);
-              if(!isNaN(dResult)) {
+              if (!isNaN(dResult)) {
                 sValue = dResult;
               }
             }
@@ -5656,7 +5676,7 @@ class CommonTableRc extends React.Component {
         if (typeof showConfig.showDropDown === 'object') {
           showDropDown = showConfig.showDropDown;
         } else {
-          if(commonUtils.isJSON(showConfig.showDropDown)) {
+          if (commonUtils.isJSON(showConfig.showDropDown)) {
             showDropDown = commonUtils.objectToArr(commonUtils.convertStrToObj(showConfig.showDropDown));
           }
         }
@@ -5669,11 +5689,11 @@ class CommonTableRc extends React.Component {
       let clickEvent = '';
       /* 选择合版产品弹窗 */
       const sModelsType = commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ? props.app.currentPane.sModelsType : '';
-      const combinedInfo =  commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ?  commonFunc.showMessage(props.app.commonConst, 'CombinedInfo') : '合版信息' ;
+      const combinedInfo = commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'CombinedInfo') : '合版信息';
-      const pleaseSelect =  commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ?  commonFunc.showMessage(this.props.app.commonConst, 'pleaseSelect') : '请选择' ;
+      const pleaseSelect = commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'pleaseSelect') : '请选择';
-      if (commonUtils.isNotEmptyObject(sName) && ( sName === 'sCombinedMemo' || sName ==='sCombineProductNameNew' || sName === 'sColorSerialMemo' || sName === 'sPositiveColor' || sName === 'sOppositeColor' || sName === 'sParams' || sName === 'sParamsNew'|| sName === 'sQuoParams' || (commonUtils.isNotEmptyObject(sModelsType) && !sModelsType.includes('Set') && sName === 'sCombinePartsNameNew'))) {
+      if (commonUtils.isNotEmptyObject(sName) && (sName === 'sCombinedMemo' || sName === 'sCombineProductNameNew' || sName === 'sColorSerialMemo' || sName === 'sPositiveColor' || sName === 'sOppositeColor' || sName === 'sParams' || sName === 'sParamsNew' || sName === 'sQuoParams' || (commonUtils.isNotEmptyObject(sModelsType) && !sModelsType.includes('Set') && sName === 'sCombinePartsNameNew'))) {
         linkStyle = 'linksActiveIdStyle';
         clickEvent = 'onViewChoose';
         if (sName === 'sCombinedMemo') {
@@ -5716,7 +5736,7 @@ class CommonTableRc extends React.Component {
             sMemo = commonUtils.isNotEmptyObject(sMemo) ? sMemo.substr(0, sMemo.length - 1) : '';
             sValue = sMemo;
           }
-        } else if (sName === 'sParams' || sName === 'sQuoParams' || sName === 'sParamsNew' ) {
+        } else if (sName === 'sParams' || sName === 'sQuoParams' || sName === 'sParamsNew') {
           if (props.onGetParamsValue) {
             // 页面自行处理sparams的sValue
             sValue = props.onGetParamsValue({ sName, sValue, record });
@@ -5737,7 +5757,7 @@ class CommonTableRc extends React.Component {
             let sParamStr = '';
             if (commonUtils.isNotEmptyArr(JsonData)) {
               JsonData.forEach((item) => {
-                if(item.bSelfCbx) {
+                if (item.bSelfCbx) {
                   const strValue = commonUtils.isNotEmptyObject(item.sParamValue) ? item.sParamValue : '';
                   sParamStr += `${item.sParamName}:${strValue},`;
                 }
@@ -5750,13 +5770,13 @@ class CommonTableRc extends React.Component {
           }
         }
         sValue = commonUtils.isEmpty(sValue) ? sName === 'sCombinedMemo' ? combinedInfo : pleaseSelect : sValue;
-      } else if ((!props.enabled) && sName.indexOf('Memo') > -1 && showConfigObj.iTag !== 3 ) {
+      } else if ((!props.enabled) && sName.indexOf('Memo') > -1 && showConfigObj.iTag !== 3) {
         linkStyle = 'linksActiveIdStyle';
         clickEvent = 'onMemoShow';
         sValue = commonUtils.isEmpty(sValue) ? '' : sValue;
         const regex = /<[^>]*>/g;
         sValue = sValue.replace(regex, '');
-      } else if ((!props.enabled) && showConfigObj.sControlName && showConfigObj.sControlName.toLowerCase().indexOf('memo') > -1 && showConfigObj.iTag !== 3 ) {
+      } else if ((!props.enabled) && showConfigObj.sControlName && showConfigObj.sControlName.toLowerCase().indexOf('memo') > -1 && showConfigObj.iTag !== 3) {
         linkStyle = 'linksActiveIdStyle';
         clickEvent = 'onMemoShow';
         sValue = commonUtils.isEmpty(sValue) ? '' : sValue;
@@ -5767,43 +5787,43 @@ class CommonTableRc extends React.Component {
         clickEvent = 'onOpenPopupModal';
       }
       /* 如果列表行包含sDivRow并且sDivRow有值 则代表该行行不渲染数据 只做分割作用 */
-      if(commonUtils.isNotEmptyObject(record.sDivRowNew) && record.bInsert) {
+      if (commonUtils.isNotEmptyObject(record.sDivRowNew) && record.bInsert) {
         bShow = '';
         // linkStyle = 'linksActiveIdStyle';
-        if(sValue) {
+        if (sValue) {
           const splitArr = sValue ? sValue.toString().split('F') : [];
-          if(commonUtils.isNotEmptyArr(splitArr) && splitArr.length > 1) {
+          if (commonUtils.isNotEmptyArr(splitArr) && splitArr.length > 1) {
             sValue = <span className="noInputInsert">{splitArr[0]} <span style={{ color: '#ff0000' }}> {splitArr[1]}</span> </span>;
           }
         }
       }
-      let showQty='';
-      if(!this.props.enabled && location.pathname.includes('quotationPackTableTree') &&  this.props.name === 'control' && sName === 'dSinglePQty') {
+      let showQty = '';
+      if (!this.props.enabled && location.pathname.includes('quotationPackTableTree') && this.props.name === 'control' && sName === 'dSinglePQty') {
         showQty = <span onClick={this.handleViewClick.bind(this, this.props.name, showConfig.sName, record, index, showConfig)} style={{ position: 'absolute', right: '2px' }}><EyeOutlined /></span>
-      } else if(sName === 'sSaveProName' || sName === 'sDeleteProName' || sName === 'sSaveProNameBefore' || sName === 'sProcName') {
+      } else if (sName === 'sSaveProName' || sName === 'sDeleteProName' || sName === 'sSaveProNameBefore' || sName === 'sProcName') {
         /* 增删改存业务处理 加查看眼睛 */
-        sValue =<span> {sValue}<span onClick={this.handleOpenWin.bind(this, this.props.name, showConfig.sName, record, index, showConfig)} style={{ position: 'absolute', right: '2px' }}><EyeOutlined /></span> </span>
-      }else if(sName === 'dNeedAuxiliaryQty' && showConfig.sControlName && showConfig.sControlName !=='slaveInfo' ) { /* 净需求 */
+        sValue = <span> {sValue}<span onClick={this.handleOpenWin.bind(this, this.props.name, showConfig.sName, record, index, showConfig)} style={{ position: 'absolute', right: '2px' }}><EyeOutlined /></span> </span>
+      } else if (sName === 'dNeedAuxiliaryQty' && showConfig.sControlName && showConfig.sControlName !== 'slaveInfo') { /* 净需求 */
         /* 增删改存业务处理 加查看眼睛 */
-        sValue =<span> {sValue}<span onClick={this.handleRightArrow.bind(this, this.props.name, showConfig.sName, record, index, showConfig)} style={{ position: 'absolute', right: '2px' }}><RightOutlined /></span> </span>
+        sValue = <span> {sValue}<span onClick={this.handleRightArrow.bind(this, this.props.name, showConfig.sName, record, index, showConfig)} style={{ position: 'absolute', right: '2px' }}><RightOutlined /></span> </span>
       }
       /* 只读字段置灰 */
       const isColorInclude = this.rowColorData.current?.find(i => i && i?.key === record?.[this.rowKey]);
       let bReadonlyField = false;
-      if((showConfig.bReadonly || showConfig.iTag ===1) && commonUtils.isEmptyStr(backgroundColor) && !isColorInclude) {
+      if ((showConfig.bReadonly || showConfig.iTag === 1) && commonUtils.isEmptyStr(backgroundColor) && !isColorInclude) {
         backgroundColor = '#f1f2f8';
         bReadonlyField = true;
       }
-      if (backgroundColor  && !this.props.slaveInfo) {
+      if (backgroundColor && !this.props.slaveInfo) {
         this.hasSpanBgColor = true;
       }
       res = (<span className={`noInput readonlySpanStyle ${bReadonlyField ? "readonlyField" : ""}`} style={{ color: `${cellColor}`, backgroundColor: `${backgroundColor}` }} > {(commonUtils.isNotEmptyObject(sName) && sName.substring(0, 1) === 'b') || (imgBox !== '') ? '' :
         <Tooltip
-          placement={ bSpecialTitle ? 'right' : 'bottomLeft'}
-          overlayClassName={ bSpecialTitle ? 'commonSpecialTitle' : 'commonTitle'}
+          placement={bSpecialTitle ? 'right' : 'bottomLeft'}
+          overlayClassName={bSpecialTitle ? 'commonSpecialTitle' : 'commonTitle'}
           mouseEnterDelay={0.8}
-          title={<span style={{ fontSize: 16 }}>{commonUtils.isNotEmptyObject(specialTitle) ? specialTitle :sValue}</span>}
+          title={<span style={{ fontSize: 16 }}>{commonUtils.isNotEmptyObject(specialTitle) ? specialTitle : sValue}</span>}
         >
           <span
             className={linkStyle}
@@ -5814,14 +5834,24 @@ class CommonTableRc extends React.Component {
               commonUtils.isNotEmptyObject(linkStyle)
                 ? clickEvent === "onViewChoose"
                   ? this.handleViewChoose.bind(
+                    this,
+                    this.props.name,
+                    showConfig.sName,
+                    record,
+                    index
+                  )
+                  : clickEvent === "onMemoShow"
+                    ? this.handleMemoShow.bind(
                       this,
                       this.props.name,
                       showConfig.sName,
                       record,
-                      index
+                      index,
+                      showConfig
                     )
-                  : clickEvent === "onMemoShow"
-                    ? this.handleMemoShow.bind(
+                    : clickEvent === "onOpenPopupModal"
+                      ? this.handleFieldPopupModal.bind(this, showConfig, sName, record)
+                      : this.handleViewClick.bind(
                         this,
                         this.props.name,
                         showConfig.sName,
@@ -5829,19 +5859,9 @@ class CommonTableRc extends React.Component {
                         index,
                         showConfig
                       )
-                    : clickEvent === "onOpenPopupModal"
-                      ? this.handleFieldPopupModal.bind(this, showConfig, sName, record)
-                        : this.handleViewClick.bind(
-                            this,
-                            this.props.name,
-                            showConfig.sName,
-                            record,
-                            index,
-                            showConfig
-                          )
                 : null
             }
-          > { sValue}</span>
+          > {sValue}</span>
         </Tooltip>
       }{bShow}{imgBox}{showQty}</span>
       );
@@ -6074,13 +6094,13 @@ class CommonTableRc extends React.Component {
         const productionRoute = (commonUtils.isNotEmptyObject(props.app.currentPane) && commonUtils.isNotEmptyObject(props.app.currentPane.route) && props.app.currentPane.route.includes('productionSchedule'));
         if (productionRoute) {  /* 生产排程对选中行进行汇总 */
           this.handleSumOtherColumn(props.config, props.data);
-        } else if(rootType === 'list') {
-          if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyArr(props.totalData)) {
-            const addState ={};
+        } else if (rootType === 'list') {
+          if (commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyArr(props.totalData)) {
+            const addState = {};
             addState.totalData = props.totalData;
             this.setState({ ...addState })
           }
-        } else if(name ==='slaveChild'){
+        } else if (name === 'slaveChild') {
           this.handleSumChildColumn(props.config, props.data);
         } else {
           this.handleSumAllColumn(props.config, props.data);
@@ -6108,7 +6128,7 @@ class CommonTableRc extends React.Component {
           if (stateValue.tableColumn[index].children && stateValue.tableColumn[index].children.length) {
             const childrenSortArr = [];
             const childrenDataIndexArr = [];
-            item.children = item.children.map(child => { return {...child, ...{ sortIndex: sortArr.indexOf(child.dataIndex) }}}).sort(compare('sortIndex'));
+            item.children = item.children.map(child => { return { ...child, ...{ sortIndex: sortArr.indexOf(child.dataIndex) } } }).sort(compare('sortIndex'));
             item.children.forEach((child, childIndex) => {
               const currentSort = sortArr.indexOf(child.dataIndex);
               if (childIndex === 0) {
@@ -6144,7 +6164,7 @@ class CommonTableRc extends React.Component {
           }
         });
         stateValue.tableColumn = stateValue.tableColumn.filter(item => !item.delete); // 删除需要分割的双层表头
-        stateValue.tableColumn = [ ...stateValue.tableColumn, ...addTableColumn ]; // 将分割后的双层表头加回去
+        stateValue.tableColumn = [...stateValue.tableColumn, ...addTableColumn]; // 将分割后的双层表头加回去
         stateValue.tableColumn = stateValue.tableColumn.sort(compare('sortIndex'));
         // 合并一级表头相同的相邻的column
         stateValue.tableColumn = stateValue.tableColumn.reduce((prev, cur) => {
@@ -6197,7 +6217,7 @@ class CommonTableRc extends React.Component {
     const footerHeight = commonUtils.isNotEmptyArr(this.state.totalData1) ? 58 : 29;
     if (this.props.tableProps.AutoTableHeight) {
       this.scrollY = this.props.tableProps.AutoTableHeight;
-      this.tableHeight = this.props.tableProps.AutoTableHeight == '100%' ?  '100%' : this.props.tableProps.AutoTableHeight + tableHeaderHeight + footerHeight;
+      this.tableHeight = this.props.tableProps.AutoTableHeight == '100%' ? '100%' : this.props.tableProps.AutoTableHeight + tableHeaderHeight + footerHeight;
       return;
     }
@@ -6221,19 +6241,19 @@ class CommonTableRc extends React.Component {
     const tabHeight = 89;
     const paginationHeight = this.props.tableProps.pagination ? 60 : 0;
     let extraHeight = 0; /* 额外的区域 */
-    if(commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes('commonListTab')) {     /* 带Tab页签的列表 */
+    if (commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes('commonListTab')) {     /* 带Tab页签的列表 */
       /* 有从表高度100，没有高度20 */
       const hasSlave = document.getElementsByClassName('hasSlave');
-      if(commonUtils.isNotEmptyArr(hasSlave)) {
-        extraHeight =  220;
-      }else {
-        extraHeight =  20;
+      if (commonUtils.isNotEmptyArr(hasSlave)) {
+        extraHeight = 220;
+      } else {
+        extraHeight = 20;
       }
     }
     if (this.props?.masterConfig?.sTableColorTs) {
       extraHeight += this.colorInfo?.getBoundingClientRect()?.height || 80;
-      if(location.pathname?.includes('productionScheduleTree')) {
+      if (location.pathname?.includes('productionScheduleTree')) {
         extraHeight -= 34;
       }
     } else {
@@ -6563,7 +6583,7 @@ class CommonTableRc extends React.Component {
       message.warning('请确认复制的内容是文件类型！');
     }
   };
-  handleGetFastSearchBtn = ({record, sName, isSlaveInfo}) => {
+  handleGetFastSearchBtn = ({ record, sName, isSlaveInfo }) => {
     if (isSlaveInfo || !sName.startsWith('s') || this.props.name !== 'slave') {
       return '';
     }
@@ -6705,9 +6725,9 @@ class CommonTableRc extends React.Component {
     }
   }
   /* 拖拽改变对应层级 */
-  moveRow = (dragIndex, hoverIndex,dragKey,hoverKey) => {
-    if(this.props.onMoveRow) {
-      this.props.onMoveRow(dragIndex, hoverIndex,dragKey,hoverKey);
+  moveRow = (dragIndex, hoverIndex, dragKey, hoverKey) => {
+    if (this.props.onMoveRow) {
+      this.props.onMoveRow(dragIndex, hoverIndex, dragKey, hoverKey);
     }
   };
@@ -6762,7 +6782,7 @@ class CommonTableRc extends React.Component {
     if (commonUtils.isNotEmptyObject(previewImage)) {
       if (commonUtils.isNotEmptyArr(this.props.data)) {
         if (this.props.data[0].sPicturePath) {
-          for(const item of this.props.data) {
+          for (const item of this.props.data) {
             const dataUrl = `${commonConfig.file_host}file/download?savePathStr=${item.sPicturePath}&sModelsId=100&token=${token}`; /* 缩略图 */
             data.push(dataUrl);
           }
@@ -6779,7 +6799,7 @@ class CommonTableRc extends React.Component {
       onChange: this.handleUploadChange,
       accept: '*/*',
       showUploadList: false,
-      multiple:true,
+      multiple: true,
       beforeUpload: this.handleBeforeUpload,
     };
     /*   获取look的props   */
@@ -6825,15 +6845,15 @@ class CommonTableRc extends React.Component {
         const iIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup')) && item.bVisible && item.sDropDownType === 'popup');
         if (iIndex > -1) {
           commonPopupConfig = config.gdsconfigformslave[iIndex];
-          if(commonPopupShowConfig?.sControlName === 'BtnPopupsAlumiteBomBillNo' || commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
+          if (commonPopupShowConfig?.sControlName === 'BtnPopupsAlumiteBomBillNo' || commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
             commonPopupConfig = commonPopupShowConfig;
-            if(commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
+            if (commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
               bCommonPopupProcess = true;
             }
           }
           commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupConfig) && commonUtils.isNotEmptyObject(commonPopupConfig.sActiveName) ? commonPopupConfig.sActiveName : commonPopupTitle;
-          commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupRecord) ? ( commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sSrcFormName) ? commonPopupTitle : commonPopupRecord.sSrcFormName : commonPopupTitle ) : commonPopupTitle;
-          const sFormId = commonUtils.isNotEmptyObject(commonPopupRecord) ? ( commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sFormId) ? commonPopupRecord.sSrcFormId : commonPopupRecord.sFormId : commonPopupConfig.sActiveId ) : commonPopupConfig.sActiveId;
+          commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupRecord) ? (commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sSrcFormName) ? commonPopupTitle : commonPopupRecord.sSrcFormName : commonPopupTitle) : commonPopupTitle;
+          const sFormId = commonUtils.isNotEmptyObject(commonPopupRecord) ? (commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sFormId) ? commonPopupRecord.sSrcFormId : commonPopupRecord.sFormId : commonPopupConfig.sActiveId) : commonPopupConfig.sActiveId;
           commonPopupProps = {
             app: {
@@ -6843,13 +6863,13 @@ class CommonTableRc extends React.Component {
                 bEdit: (commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.route) && app.currentPane.route.includes('commonBillDeliver')),
                 config: commonPopupConfig,
                 conditonValues: this.props.getSqlCondition(commonPopupConfig),
-                title:commonPopupTitle,
+                title: commonPopupTitle,
                 route: '/indexPage/commonList',
                 formRoute: '/indexPage/commonList',
                 formId: sFormId,
                 key: sModelsId + commonPopupConfig.sId,
                 sModelsType: bCommonPopupProcess ? 'search/commonProcess' : 'search/commonPopup',
-                select:this.handleSelectCommonPopup,
+                select: this.handleSelectCommonPopup,
                 selectCancel: this.handleSelectCancel.bind(this, 'commonPopupVisible'),
               },
             },
@@ -6863,13 +6883,13 @@ class CommonTableRc extends React.Component {
         }
         /* 多列弹出窗 */
-        const commonPopupIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup') ) && !['BtnPopup1'].includes(item.sControlName) && !item.sControlName.startsWith('BtnPopupEdit') && item.bVisible && item.sDropDownType === 'popup');
+        const commonPopupIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup')) && !['BtnPopup1'].includes(item.sControlName) && !item.sControlName.startsWith('BtnPopupEdit') && item.bVisible && item.sDropDownType === 'popup');
         if (commonPopupIndex > -1) {
           bCommonPopup = true;
         }
         /* 单列弹出窗 */
-        const commonPopupIndex1 = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.includes('BtnPopup1')  && item.bVisible && item.sDropDownType === 'popup');
+        const commonPopupIndex1 = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.includes('BtnPopup1') && item.bVisible && item.sDropDownType === 'popup');
         if (commonPopupIndex1 > -1) {
           bCommonPopup1 = true;
           bCommonPopup = false;
@@ -6906,7 +6926,7 @@ class CommonTableRc extends React.Component {
         }
         if (iIndex > -1) {
-          if(commonFieldPopupConfig.sDropDownType === 'popupSingle') { /* 如果下拉类型是单列弹出窗 则为单列 */
+          if (commonFieldPopupConfig.sDropDownType === 'popupSingle') { /* 如果下拉类型是单列弹出窗 则为单列 */
             bFieldPopup = false;
           }
           commonFieldPopupTitle = commonUtils.isNotEmptyObject(commonFieldPopupConfig) && commonUtils.isNotEmptyObject(commonFieldPopupConfig.sActiveName) ? commonFieldPopupConfig.sActiveName : commonFieldPopupTitle;
@@ -6916,13 +6936,13 @@ class CommonTableRc extends React.Component {
               currentPane: {
                 name: 'commonPopup',
                 config: commonFieldPopupConfig,
-                title:commonFieldPopupTitle,
+                title: commonFieldPopupTitle,
                 route: '/indexPage/commonList',
                 formRoute: '/indexPage/commonList',
                 formId: commonFieldPopupConfig.sActiveId,
                 key: sModelsId + commonFieldPopupConfig.sId,
                 sModelsType: 'search/commonPopup',
-                select:this.handleSelectCommonFieldPopup,
+                select: this.handleSelectCommonFieldPopup,
                 selectCancel: this.handleSelectCancel.bind(this, 'commonFieldPopupVisible'),
               },
             },
@@ -6958,25 +6978,25 @@ class CommonTableRc extends React.Component {
       const { config, sModelsId, app, selectedRowKeys, enabled } = this.props;
       if (commonUtils.isNotEmptyObject(config)) {
         commonModalTitle = commonUtils.isNotEmptyObject(commonModalShowConfig) && commonUtils.isNotEmptyObject(commonModalShowConfig.sActiveName) ? commonModalShowConfig.sActiveName : commonModalTitle;
-        const sFormId = commonUtils.isNotEmptyObject(commonModalRecord) && commonUtils.isNotEmptyObject(commonModalShowConfig) ? ( commonModalShowConfig.sActiveId === '1' ? commonUtils.isEmpty(commonModalRecord.sFormId) ? commonModalRecord.sSrcFormId : commonModalRecord.sFormId : commonModalShowConfig.sActiveId ) : commonModalShowConfig?.sActiveId;
+        const sFormId = commonUtils.isNotEmptyObject(commonModalRecord) && commonUtils.isNotEmptyObject(commonModalShowConfig) ? (commonModalShowConfig.sActiveId === '1' ? commonUtils.isEmpty(commonModalRecord.sFormId) ? commonModalRecord.sSrcFormId : commonModalRecord.sFormId : commonModalShowConfig.sActiveId) : commonModalShowConfig?.sActiveId;
         commonModalProps = {
           app: {
             ...this.props.app,
             currentPane: {
               name: 'commonModal',
-              bEdit: commonModalShowConfig?.sName === 'dStockAuxiliaryQty'? enabled:false,
+              bEdit: commonModalShowConfig?.sName === 'dStockAuxiliaryQty' ? enabled : false,
               config: commonModalShowConfig,
-              conditonValues: commonModalShowConfig ? this.props.getSqlCondition(commonModalShowConfig, this.props.name, commonModalRecord) :{},
-              title:commonModalTitle,
+              conditonValues: commonModalShowConfig ? this.props.getSqlCondition(commonModalShowConfig, this.props.name, commonModalRecord) : {},
+              title: commonModalTitle,
               route: '/indexPage/commonList',
               formRoute: '/indexPage/commonList',
               formId: sFormId,
               key: sModelsId + commonModalShowConfig?.sId,
               sModelsType: 'search/commonPopup',
-              select:this.handleSelectCommonPopup,
+              select: this.handleSelectCommonPopup,
               selectCancel: this.handleSelectCancel.bind(this, 'commonModalVisible'),
-              slaveDataSource :commonModalShowConfig?.sName === 'dStockAuxiliaryQty'? [commonModalRecord]: [],
+              slaveDataSource: commonModalShowConfig?.sName === 'dStockAuxiliaryQty' ? [commonModalRecord] : [],
             },
           },
           dispatch: this.props.dispatch,
@@ -6985,7 +7005,7 @@ class CommonTableRc extends React.Component {
           onOpenNewTab: this.onOpenNewTab,
           outerMasterData: this.props.masterData,
           realizeHeight: this.props.realizeHeight, /* 拖动偏移高度 */
-          bEdit:commonModalShowConfig?.sName === 'dAvailableAuxiliaryQty'? enabled:false
+          bEdit: commonModalShowConfig?.sName === 'dAvailableAuxiliaryQty' ? enabled : false
         };
         // if(commonModalShowConfig?.sName === 'dSumCompleteAvailableStockQty' ){
         //   commonModalProps.data = commonModalData;
@@ -7073,7 +7093,7 @@ class CommonTableRc extends React.Component {
       layoutScrollY = this.props.fixedHeight;
     }
     let bShowBtnUpload = true;
-    if(commonUtils.isNotEmptyObject(this.props.masterData) && commonUtils.isNotEmptyObject(this.props.masterData.sZczlxShowName)) {
+    if (commonUtils.isNotEmptyObject(this.props.masterData) && commonUtils.isNotEmptyObject(this.props.masterData.sZczlxShowName)) {
       bShowBtnUpload = this.props.masterData.sZczlxShowName !== '删除' && this.props.masterData.sZczlxShowName !== '恢复';
     }
@@ -7085,11 +7105,11 @@ class CommonTableRc extends React.Component {
         <div className={styles.extraAction} onselectstart="return false">
           {
             this.props.name === 'picFile' || (commonUtils.isNotEmptyObject(this.props.name) && this.props.name.indexOf('file') > -1) ||
-            (this.props.name.startsWith('slave') && this.findIsUpdByControlName(this.props, 'BtnUpload') && bShowBtnUpload ) ?
+              (this.props.name.startsWith('slave') && this.findIsUpdByControlName(this.props, 'BtnUpload') && bShowBtnUpload) ?
               <Upload {...divProps} {...this.BtnUploadDivProps()}>
                 <Button {...uploadProps}
                   style={{ 'caret-color': 'transparent' }}
-                  contenteditable="true" ref={(ref) => {this.uploadRef = ref;}}
+                  contenteditable="true" ref={(ref) => { this.uploadRef = ref; }}
                   onPaste={this.handleUploadByClipboard}
                   onMouseOver={() => {
                     this.uploadRef.setAttribute('contenteditable', "true");
@@ -7104,16 +7124,16 @@ class CommonTableRc extends React.Component {
                   <UploadOutlined /> {BtnUpload}
                 </Button>
               </Upload>
-              : null }
+              : null}
         </div>
         <div
-          className={`xlyCommonTable ${tableClassName} ${this.hasSpanBgColor ? 'tableNoPadding' : ''} ${this.props.enabled ? 'tableEnabled' : ''}` }
+          className={`xlyCommonTable ${tableClassName} ${this.hasSpanBgColor ? 'tableNoPadding' : ''} ${this.props.enabled ? 'tableEnabled' : ''}`}
           style={{ height: isSmall ? 'calc(100% - 44px)' : '' }} ref={(ref) => {
             this.mydiv = ref;
             if (this.mydiv) {
               this.computedTdWidth();
               if (false && commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes('commonListTab')) {
-                this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = this.tableHeight ? this.tableHeight + 'px': 80 + 'px';
+                this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = this.tableHeight ? this.tableHeight + 'px' : 80 + 'px';
               }
               if (layoutScrollY) {
                 this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = typeof layoutScrollY === 'number' ? layoutScrollY + 'px' : layoutScrollY;
@@ -7127,7 +7147,7 @@ class CommonTableRc extends React.Component {
               <DndProvider backend={HTML5Backend} >
                 <Table
                   {...tableProps}
-                  pagination={ !hasColorInfo && tableProps.pagination }
+                  pagination={!hasColorInfo && tableProps.pagination}
                   addRow={addProps}
                   delProps={delProps}
                   tableLayout="fixed"
@@ -7141,11 +7161,11 @@ class CommonTableRc extends React.Component {
                   sticky={this.sticky}
                   showSorterTooltip={false}
                 />
-              </DndProvider>  :
+              </DndProvider> :
               <div>
                 <Table
                   {...tableProps}
-                  pagination={ !hasColorInfo && tableProps.pagination }
+                  pagination={!hasColorInfo && tableProps.pagination}
                   addRow={addProps}
                   delProps={delProps}
                   tableLayout="fixed"
@@ -7153,7 +7173,7 @@ class CommonTableRc extends React.Component {
                     expandedRowRender: this.props.setExpandedRowRender === 'Y' ? expandedRow : null,
                     defaultExpandAllRows: this.props.defaultExpandAllRows || null,
                   }}
-                  scroll={{ x: this.scrollX, y: !layoutScrollY ? this.scrollY : layoutScrollY}}
+                  scroll={{ x: this.scrollX, y: !layoutScrollY ? this.scrollY : layoutScrollY }}
                   summary={this.genFooter}
                   size="small"
                   sticky={this.sticky}
@@ -7162,16 +7182,16 @@ class CommonTableRc extends React.Component {
               </div>
           }
-          { hasColorInfo &&
+          {hasColorInfo &&
             <Row style={{ paddingTop: 10, paddingBottom: 10 }} wrap={false} ref={e => this.colorInfo = e}>
-              <Col span={14}><ColorInfo { ...this.props } /></Col>
+              <Col span={14}><ColorInfo {...this.props} /></Col>
               <Col span={10}>
-                { tableProps.pagination && <Pagination
-                  { ...tableProps.pagination }
+                {tableProps.pagination && <Pagination
+                  {...tableProps.pagination}
                   showLessItems
                   size='small'
-                  onChange={(page, pageSize) => {this.onChange({ current: page, pageSize })}}
-                /> }
+                  onChange={(page, pageSize) => { this.onChange({ current: page, pageSize }) }}
+                />}
               </Col>
             </Row>
           }
@@ -7207,27 +7227,27 @@ class CommonTableRc extends React.Component {
             </AntdDraggableDiv>
             : ''
         }{
-        commonPopupVisible ?
-          <AntdDraggableModal
-            width={1300}
-            zIndex={1000}
-            title={commonPopupTitle}
-            visible={commonPopupVisible}
-            onCancel={this.handleSelectCancel.bind(this, 'commonPopupVisible')}
-            footer={null}
-            onSaveState={this.props.onSaveState}
-            className={`${randomId}-CommonListSelectTree`}
-          >
-            {bCommonPopup ?
-              <CommonListSelectTree {...commonPopupProps} />
-              : bCommonPopup1 ?
-                <CommonListSelect {...commonPopupProps} />
-                : bCommonPopupTree ?
-                  <CommonListTreeSelect {...commonPopupProps} /> : ''
-            }
-          </AntdDraggableModal>
-          : ''
-      }
+          commonPopupVisible ?
+            <AntdDraggableModal
+              width={1300}
+              zIndex={1000}
+              title={commonPopupTitle}
+              visible={commonPopupVisible}
+              onCancel={this.handleSelectCancel.bind(this, 'commonPopupVisible')}
+              footer={null}
+              onSaveState={this.props.onSaveState}
+              className={`${randomId}-CommonListSelectTree`}
+            >
+              {bCommonPopup ?
+                <CommonListSelectTree {...commonPopupProps} />
+                : bCommonPopup1 ?
+                  <CommonListSelect {...commonPopupProps} />
+                  : bCommonPopupTree ?
+                    <CommonListTreeSelect {...commonPopupProps} /> : ''
+              }
+            </AntdDraggableModal>
+            : ''
+        }
         {
           commonFieldPopupVisible ?
             <AntdDraggableModal
@@ -7281,7 +7301,7 @@ class CommonTableRc extends React.Component {
               onCancel={this.handleSelectCancel.bind(this, 'commonFileDownloadVisible')}
               footer={[
                 <Button key="selectedAll" type="primary" ghost onClick={
-                  ()=>{
+                  () => {
                     const newList = [...commonFileDownloadList];
                     const checkState = newList.find(item => !item.checked);
                     newList.forEach(item => item.checked = checkState);
@@ -7347,27 +7367,27 @@ class CommonTableRc extends React.Component {
         }
         {
           pdfFileVisible ?
-              <AntdDraggableModal
-                title={pdfFileUrl.split('/').pop().split('_').pop()}
-                visible={pdfFileVisible}
-                width="100%"
-                height="calc(100% - 50px)"
-                style={{ top: 0 }}
-                footer={null}
-                onCancel={() => {
-                  this.setState({
-                    pdfFileVisible: false
-                  });
-                }}
-              >
-                <div style={{ width: '100%', height: 'calc(100vh - 67px)', overflow: 'auto' }}>
-                  <PrintPdf
-                    style={{ height: '100%' }}
-                    bFitWidth={true}
-                    previewUrl={pdfFileUrl.includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${encodeURIComponent(pdfFileUrl)}&sModelsId=100&token=${this.props.app.token}` : pdfFileUrl}
-                  />
-                </div>
-              </AntdDraggableModal> : ''
+            <AntdDraggableModal
+              title={pdfFileUrl.split('/').pop().split('_').pop()}
+              visible={pdfFileVisible}
+              width="100%"
+              height="calc(100% - 50px)"
+              style={{ top: 0 }}
+              footer={null}
+              onCancel={() => {
+                this.setState({
+                  pdfFileVisible: false
+                });
+              }}
+            >
+              <div style={{ width: '100%', height: 'calc(100vh - 67px)', overflow: 'auto' }}>
+                <PrintPdf
+                  style={{ height: '100%' }}
+                  bFitWidth={true}
+                  previewUrl={pdfFileUrl.includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${encodeURIComponent(pdfFileUrl)}&sModelsId=100&token=${this.props.app.token}` : pdfFileUrl}
+                />
+              </div>
+            </AntdDraggableModal> : ''
         }
         {
           bOperateMoreVisible ?
@@ -7389,15 +7409,15 @@ class CommonTableRc extends React.Component {
         <SlaveMemo {...this.props} />
         {officePreviewVisible && <OfficePreview {...officePreviewProps} />}
         {/* 简单对话框 */}
-        { this.state.simpleModalVisible && <Modal
+        {this.state.simpleModalVisible && <Modal
           title='详细'
           footer={null}
           focusTriggerAfterClose={false}
           visible={this.state.simpleModalVisible}
-          onCancel={()=>this.setState({ simpleModalVisible: false, simpleModalWord: ''  })}
+          onCancel={() => this.setState({ simpleModalVisible: false, simpleModalWord: '' })}
         >
           <div ref={this.simpleModalRef} style={{ maxHeight: '50vh', overflowY: 'auto' }} />
-        </Modal> }
+        </Modal>}
       </FormItem>
     );
   }
@@ -7447,8 +7467,8 @@ const CommonTable = (props) =&gt; {
     data[indexNew].iOrder = iOrder1;
     const tempItem = data[index];
-    data[index] = {...data[indexNew], handleType: data[indexNew].handleType || "update"};
-    data[indexNew] = {...tempItem, handleType: tempItem.handleType || "update"};
+    data[index] = { ...data[indexNew], handleType: data[indexNew].handleType || "update" };
+    data[indexNew] = { ...tempItem, handleType: tempItem.handleType || "update" };
     props.onSaveState({
       [`${props.name}Data`]: data
@@ -7495,10 +7515,10 @@ const handleSetIRowNum = (data, props) =&gt; {
           if (commonUtils.isNotEmptyArr(eachData)) {
             eachData.forEach((item, index) => {
               /* 采购 */
-              item.iRowNum = index +1;
+              item.iRowNum = index + 1;
               const iIndex = data.findIndex(row => row.sId === item.sId);
-              if(iIndex > -1) {
-                data[iIndex] ={...data[iIndex], iRowNum: index +1}
+              if (iIndex > -1) {
+                data[iIndex] = { ...data[iIndex], iRowNum: index + 1 }
               }
             });
@@ -7506,7 +7526,7 @@ const handleSetIRowNum = (data, props) =&gt; {
         }
       }
     }
-    if(location.pathname !== '/indexPage/commonClassify'){
+    if (location.pathname !== '/indexPage/commonClassify') {
       if (commonUtils.isNotEmptyArr(item.children)) {
         handleSetIRowNum(item.children, props);
       }
 /* eslint-disable */
 import * as commonFunc from "@/components/Common/commonFunc";
 import { DownOutlined, LeftOutlined, RightOutlined, UpOutlined, VerticalLeftOutlined, VerticalRightOutlined } from "@ant-design/icons";
-import { message, Modal } from "antd-v4";
+import { message, Modal } from "antd";
 import React, { useEffect, useRef, useState } from "react";
 import { ArrowRightOutlined } from "@ant-design/icons";
 import DynamicSVG from "../../Common/BoxDesignCompontent/svg";
@@ -65,6 +65,8 @@ const Typesetting = props =&gt; {
   const [newDHorizontalType, setNewDHorizontalType] = useState(0);
   const [newDPortraitType, setNewDPortraitType] = useState(0);
   const [oldVariables, setOldVariables] = useState("");
+  const [innerWidth, setInnerWidth] = useState(0);
+  const [innerHeight, setInnerHeight] = useState(0);
   // 横板
   let { dHorizontal, dPortrait, dHorizontalType, dPortraitType } = slaveRowData;
   // 使用 useRef 获取 DOM 元素
@@ -125,6 +127,7 @@ const Typesetting = props =&gt; {
   let boxList = [];
   if (sColumnNameConfig) {
     const slaveNewData = slaveRowData.upAbleConfigsExtra || JSON.parse(slaveRowData.sColumnNameConfig);
+    // 处理为双盒的部件
     const tables = [
       { name: "盒型类别", value: slaveRowData.sBoxType, type: null },
       { name: "盒身", value: slaveRowData.sBoxBody, type: slaveRowData.sTypes },
@@ -143,22 +146,6 @@ const Typesetting = props =&gt; {
       { name: "右贴边位", value: "dYTBW" },
       { name: "右(下)插位组件", value: "dYXCW" },
     ];
-    const doubleTitlieList1 = [
-      { name: "左上插位组件", value: "dZSCW" },
-      { name: "上插位组件", value: "dSCW" },
-      { name: "右上插位组件", value: "dYSCW" },
-      { name: "左偏移", value: "dZPY" },
-      { name: "左插位组件", value: "dZCW" },
-      { name: "左下插位组件", value: "dZXCW" },
-      { name: "右偏移", value: "dYPY" },
-      { name: "右插位组件", value: "dYCW" },
-      { name: "右下插位组件", value: "dYXCW" },
-      { name: "首盒长", value: "dSHC" },
-      { name: "首盒宽", value: "dSHK" },
-      { name: "次盒长", value: "dCHC" },
-      { name: "次盒宽", value: "dCHK" },
-    ];
-    const srcList = Number(slaveRowData.sTypes) === 8 ? doubleTitlieList1 : titleList1;
     slaveNewData.forEach(x => {
       let key = 0;
       if (x.sAssignFormula) {
@@ -168,7 +155,7 @@ const Typesetting = props =&gt; {
       }
       boxList.push({
         value: key,
-        sName: srcList.find(item => item.value === x.sName)?.name || "",
+        sName: titleList1.find(item => item.value === x.sName)?.name || "",
         isEditable: true,
         isSelect: false,
         selectValue: null,
@@ -176,8 +163,20 @@ const Typesetting = props =&gt; {
         selectImage: null,
         type: x.sTypes || null,
         show: true,
-        sCode: srcList.find(item => item.value === x.sName)?.value || "",
+        sCode: titleList1.find(item => item.value === x.sName)?.value || "",
         showName: x.showName, // 参数名称
+        sLength: x.iSLength,
+        sWidth: x.iSWidth,
+        sType: x.iSType,
+        sTypeName: Number(x.iSType) === 0 ? "矩形" : "梯形",
+        sOffset: x.sSOffset,
+        sQuantity: x.iSQuantity,
+        cLength: x.iCLength,
+        cWidth: x.iCWidth,
+        cType: x.iCType,
+        cTypeName: Number(x.iCType) === 0 ? "矩形" : "梯形",
+        cOffset: x.sCOffset,
+        cQuantity: x.iCQuantity,
       });
     });
     tables.forEach(x => {
@@ -209,9 +208,121 @@ const Typesetting = props =&gt; {
     }
   });
   let DisableMateriallIcon = L ? sPackDetailPath : null;
+  function calculateCupUnfoldDimensions(D, d, h) {
+
+    const R1 = D / 2;  // 上口半径
+    const R2 = d / 2;  // 底部半径
+    if (D === d) {
+      const paperCup = commonFunc.showLocalMessage(props, "paperCup", "L不能小于等于W!");
+      message.error(paperCup);
+      return {
+        width: 0,
+        height: 0
+      }
+    }
+    // 1. 计算母线长 l
+    const deltaR = R1 - R2;
+    const l = Math.sqrt(deltaR * deltaR + h * h);
+
+    // 2. 计算外半径 R 和内半径 r
+    const R = (R1 * l) / deltaR;  // 外半径
+    const r = R - l;              // 内半径
+
+    // 3. 计算圆心角 θ（弧度）
+    const theta_rad = (2 * Math.PI * R1) / R;
+    const halfTheta = theta_rad / 2;
+
+    // 4. 计算弦长（水平宽度）
+    const chord = 2 * R * Math.sin(halfTheta);
+
+    // 5. 展开图垂直高度
+    const y_top = -R;  // 外弧中点（最高点）
+    const y_inner_end = -r * Math.cos(halfTheta);
+    const verticalHeight = y_inner_end - y_top;
+
+    // ✅ 新增：计算关键点坐标（以圆心为原点，y 向上为正）
+    // 注意：数学坐标系中，角度从 x 轴开始逆时针，但我们希望顶部在 y 轴负方向
+    // 所以我们把角度偏移 -90°（即 -π/2），让 0° 指向正上方
+
+    const angleOffset = -Math.PI / 2; // 使 0° 指向顶部
+
+    const points = {
+      outerCenter: {
+        x: R * Math.cos(halfTheta + angleOffset),
+        y: R * Math.sin(halfTheta + angleOffset)
+      },
+      outerLeft: {
+        x: R * Math.cos(-halfTheta + angleOffset),
+        y: R * Math.sin(-halfTheta + angleOffset)
+      },
+      outerRight: {
+        x: R * Math.cos(halfTheta + angleOffset),
+        y: R * Math.sin(halfTheta + angleOffset)
+      },
+      innerLeft: {
+        x: r * Math.cos(-halfTheta + angleOffset),
+        y: r * Math.sin(-halfTheta + angleOffset)
+      },
+      innerRight: {
+        x: r * Math.cos(halfTheta + angleOffset),
+        y: r * Math.sin(halfTheta + angleOffset)
+      },
+      // 也可以计算顶部中点（0° 方向）
+      topCenter: {
+        x: 0,
+        y: -R  // 正上方
+      },
+      bottomLeft: {
+        x: -chord / 2,
+        y: -r * Math.cos(halfTheta)
+      },
+      bottomRight: {
+        x: chord / 2,
+        y: -r * Math.cos(halfTheta)
+      }
+    };
+
+    // 如果你需要用于 SVG（y 向下为正），可以转换
+    const pointsForSVG = Object.keys(points).reduce((acc, key) => {
+      acc[key] = {
+        x: points[key].x,
+        y: -points[key].y  // 反转 y 轴
+      };
+      return acc;
+    }, {});
+
+    return {
+      width: chord,
+      height: verticalHeight,
+      R, r, l,
+      theta_deg: (theta_rad * 180) / Math.PI,
+      points,           // 数学坐标系（y 向上）
+      pointsForSVG,     // SVG 坐标系（y 向下）
+      chord,
+      verticalHeight
+    };
+  }
   // 盒子展长展开公式计算
-  const innerWidth = slaveRowData.sTypes === "6" ? evaluateFormula(sWidthFormula, variabless) : evaluateFormula(sLengthFormula, variabless);
-  const innerHeight = slaveRowData.sTypes === "6" ? evaluateFormula(sLengthFormula, variabless) : evaluateFormula(sWidthFormula, variabless);
+  // 在 useEffect 内部
+  useEffect(() => {
+    if (Number(slaveRowData.sTypes) === 9) {
+      if (L > 0 && W > 0 && H > 0) {
+        const { width, height } = calculateCupUnfoldDimensions(L, W, D);
+        // 确保新值与旧值不同时才更新
+        if (width && height) {
+          setInnerWidth(Number(width.toFixed(2)));
+          setInnerHeight(Number(height.toFixed(2)));
+        }
+      }
+    } else {
+      // 计算其他类型的盒子尺寸
+      let newWidth = slaveRowData.sTypes === "6" ? evaluateFormula(sWidthFormula, variabless) : evaluateFormula(sLengthFormula, variabless);
+      let newHeight = slaveRowData.sTypes === "6" ? evaluateFormula(sLengthFormula, variabless) : evaluateFormula(sWidthFormula, variabless);
+      setInnerWidth(newWidth);
+      setInnerHeight(newHeight);
+    }
+  }, [slaveRowData.sTypes, L, W, H, D, sLengthFormula, sWidthFormula, variabless]);
+
   const { sSettingMethod, sSGroupOffset, iFAngle, iSAngle, sSecondorizontalOffset, sSecondLongitudinalOffset } = radioValue ? radioValue : {};
   const dFWidthOffset = evaluateFormula(radioValue?.sFWidthOffset, variabless); // 首盒纵向偏移
   const dFLengthOffset = evaluateFormula(radioValue?.sFLengthOffset, variabless); // 首盒横向偏移
@@ -272,20 +383,11 @@ const Typesetting = props =&gt; {
   // 计算剩余空间 每组都算上偏移量 那么剩余需要加上后面偏移的总量
   const remainingWidth = outerWidth - colsMaxLength + (boxLengthOffset + (reference ? 0 : dSLengthOffset));
   const remainingHeight = outerHeight - rowsMaxLength + (boxWidthOffset + (reference ? 0 : dSWidthOffset));
-  //   const remainingWidth =
-  //   outerWidth -
-  //   (cols * (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset)) - boxLengthOffset - (reference ? 0 : dSLengthOffset));
-  // const remainingHeight =
-  //   outerHeight -
-  //   (rows * (innerHeightCombined + boxWidthOffset + (reference ? 0 : dSWidthOffset)) - boxWidthOffset - (reference ? 0 : dSWidthOffset));
   //剩余量能不能放一下单独一个
   const commonHeightCheck = remainingHeight > jInnerHeight + dXBJJ;
   const commonWidthCheck = remainingWidth > jInnerWidth + dYBJJ;
   const isCustomized = bAdvancedSetting;
   let remaining = isVertical ? commonHeightCheck : commonWidthCheck;
-  console.log(dSLengthOffset, "次盒横向偏移量");
-  console.log(dSWidthOffset, "次盒纵向偏移量");
-
   // 判断
   // const remaining = false;
   const isOdd = num => {
@@ -312,6 +414,11 @@ const Typesetting = props =&gt; {
       }
     }
   }
+  const handleSaveState = (data) => {
+    setInnerWidth(Number(data.width.toFixed(2)))
+    setInnerHeight(Number(data.height.toFixed(2)))
+
+  }
   const svgProps = {
     ...props,
     boxList,
@@ -341,7 +448,7 @@ const Typesetting = props =&gt; {
       }}
     >
       <div style={{ transform: `rotateZ(${offsetZ}deg)` }}>
-        {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width={jInnerWidth} height={jInnerHeight} />}
+        {!sSvgPath ? <DynamicSVG {...svgProps} onSaveStates={handleSaveState} /> : <img src={sSvgPath} width={jInnerWidth} height={jInnerHeight} />}
         {/* <DynamicSVG {...svgProps} /> */}
       </div>
     </div>
@@ -381,7 +488,7 @@ const Typesetting = props =&gt; {
       >
         <div style={{ transform: `rotateZ(${iFAngle}deg)` }}>
           {!sSvgPath ? (
-            <DynamicSVG {...svgProps} />
+            <DynamicSVG {...svgProps} onSaveStates={handleSaveState} />
           ) : (
             <img
               src={sSvgPath}
@@ -401,21 +508,19 @@ const Typesetting = props =&gt; {
           justifyContent: "center",
           alignItems: "center",
           position: "absolute",
-          left: `${
-            isVertical
-              ? dSLengthOffset
-              : iSAngle === 90 || iSAngle === 270
+          left: `${isVertical
+            ? dSLengthOffset
+            : iSAngle === 90 || iSAngle === 270
               ? innerHeight + dFLengthOffset + dSLengthOffset + dYBJJ
               : innerWidth + dFLengthOffset + dSLengthOffset + dYBJJ
-          }px`,
-          top: `${
-            isVertical ? jInnerHeight + dFWidthOffset + dSWidthOffset + dXBJJ : iSAngle === 90 || iSAngle === 270 ? dSWidthOffset : dSWidthOffset
-          }px`,
+            }px`,
+          top: `${isVertical ? jInnerHeight + dFWidthOffset + dSWidthOffset + dXBJJ : iSAngle === 90 || iSAngle === 270 ? dSWidthOffset : dSWidthOffset
+            }px`,
         }}
       >
         <div style={{ transform: `rotateZ(${iSAngle}deg)` }}>
           {!sSvgPath ? (
-            <DynamicSVG {...svgProps} />
+            <DynamicSVG {...svgProps} onSaveStates={handleSaveState} />
           ) : (
             <img
               src={sSvgPath}
@@ -462,7 +567,7 @@ const Typesetting = props =&gt; {
         {/* <img src={icon} width="100%" height="100%" /> */}
         {/* {isSvg ? <DynamicSVG {...props} /> : <img src={icon} width="100%" height="100%" />} */}
         <div style={{ transform: `rotateZ(${iFAngle}deg)` }}>
-          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width={`${innerWidth}px`} height={`${innerHeight}px`} />}
+          {!sSvgPath ? <DynamicSVG {...svgProps} onSaveStates={handleSaveState} /> : <img src={sSvgPath} width={`${innerWidth}px`} height={`${innerHeight}px`} />}
         </div>
       </div>
     </div>
@@ -471,12 +576,12 @@ const Typesetting = props =&gt; {
   const calculateLeftPosition = (col, reference, isVertical, leftPosition, dYBJJ, dSLengthOffset) => {
     if (isVertical) {
       if (reference) {
-        return col === 0 ? leftPosition : leftPosition + dYBJJ * col;
+        return col === 0 ? leftPosition : leftPosition + (dYBJJ * col);
       }
       return col === 0 ? leftPosition : leftPosition + (boxLengthOffset + dYBJJ) * col;
     } else {
       if (reference) {
-        return col === 0 ? leftPosition : leftPosition + dYBJJ * col;
+        return col === 0 ? leftPosition : leftPosition + (dYBJJ * col);
       }
       return col === 0 ? leftPosition : leftPosition + (boxLengthOffset + dYBJJ) * col + dSLengthOffset * col;
     }
@@ -519,15 +624,15 @@ const Typesetting = props =&gt; {
   if (cols === 0 || rows === 0) {
     if (cols > 0) {
       for (let col = 0; col < cols; col++) {
-        const leftPosition = col * innerWidthCombined;
-        const topPosition = 0 * innerHeightCombined;
+        const leftPosition = col * (innerWidthCombined + boxLengthOffset);
+        const topPosition = 0 * (innerHeightCombined + boxWidthOffset);
         innerDivs.push(createBoxOne(col, 0, 3, leftPosition, topPosition, iFAngle, DisableMateriallIcon));
       }
     }
     if (rows > 0) {
       for (let row = 0; row < rows; row++) {
-        const leftPosition = 0 * innerWidthCombined;
-        const topPosition = row * innerHeightCombined;
+        const leftPosition = 0 * (innerWidthCombined + boxLengthOffset);
+        const topPosition = row * (innerHeightCombined + boxWidthOffset);
         innerDivs.push(createBoxOne(0, row, 3, leftPosition, topPosition, iFAngle, DisableMateriallIcon));
       }
     }
@@ -535,8 +640,8 @@ const Typesetting = props =&gt; {
     let hasPushed = false; // 标志变量
     for (let col = 0; col < cols; col++) {
       for (let row = 0; row < rows; row++) {
-        const leftPosition = col * innerWidthCombined;
-        const topPosition = row * innerHeightCombined;
+        const leftPosition = col * (innerWidthCombined + boxLengthOffset);
+        const topPosition = row * (innerHeightCombined + boxWidthOffset + dXBJJ);
         innerDivs.push(createBox(col, row, 1, leftPosition, topPosition, iFAngle, DisableMateriallIcon));
       }
       // 如果可以放下首盒\
@@ -546,11 +651,11 @@ const Typesetting = props =&gt; {
         if (reference) {
           // 是否首盒
           // 首盒的上边距下边距 末尾盒子的上下边距 添加那一行的上边距
-          leftPosition = col * innerWidthCombined + dFLengthOffset;
-          topPosition = rows * innerHeightCombined + dFWidthOffset;
+          leftPosition = col * (innerWidthCombined + boxLengthOffset) + dFLengthOffset;
+          topPosition = rows * (innerHeightCombined + boxWidthOffset) + dFWidthOffset;
         } else {
-          leftPosition = col * innerWidthCombined;
-          topPosition = rows * innerHeightCombined;
+          leftPosition = col * (innerWidthCombined + boxLengthOffset);
+          topPosition = rows * (innerHeightCombined + boxWidthOffset);
         }
         innerDivs.push(createBoxOne(col, rows, 3, leftPosition, topPosition + dXBJJ, iFAngle, DisableMateriallIcon));
       }
@@ -561,11 +666,10 @@ const Typesetting = props =&gt; {
         let topPosition = 0;
         let leftPosition = 0;
         if (reference) {
-          topPosition = index * (innerHeightCombined + boxWidthOffset);
+          topPosition = index * (innerHeightCombined + boxWidthOffset) + dFWidthOffset;
           leftPosition = cols * (innerWidthCombined + boxLengthOffset);
         } else {
-          topPosition = index * (innerHeightCombined + boxWidthOffset + dSWidthOffset);
-
+          topPosition = index * (innerHeightCombined + boxWidthOffset + dSWidthOffset) + dFWidthOffset;
           leftPosition = cols * (innerWidthCombined + boxLengthOffset + dSLengthOffset + dYBJJ);
         }
         innerDivs.push(createDiv(cols - 1, index, 3, leftPosition, topPosition, iFAngle, DisableMateriallIcon));
@@ -578,6 +682,7 @@ const Typesetting = props =&gt; {
     onSaveDPartsLength(innerWidth, innerHeight, slaveData);
   }
   const propsData = innerDivs[innerDivs.length - 1];
+  const propsDataFirst = innerDivs[0];
   let openEdition = 0;
   if (propsData && L) {
     const { dWlcd, sBillNo } = slaveRowData;
@@ -590,19 +695,20 @@ const Typesetting = props =&gt; {
     const propsDataTop = Number(propsData.props.style.top.slice(0, -2));
     // 判断列是否是单独的
-    const newMaterialLength = parseFloat(propsDataLeft + (remaining ? jInnerWidth : innerWidthCombined) + dZBLB + dYBLB).toFixed(2); // 原纸长
-    const newMaterialWidth = parseFloat(
-      propsDataTop + propsDataHeight + dSBLB + dXBLB - (isVertical ? 0 : rows >= 1 ? (remaining ? 0 : dXBJJ) : 0)
-    ).toFixed(2);
-
+    let newMaterialLength = parseFloat(propsDataLeft + (remaining ? jInnerWidth : innerWidthCombined) + dZBLB + dYBLB).toFixed(2); // 原纸长
+    const newMaterialWidth = parseFloat(propsDataTop + propsDataHeight + dSBLB + dXBLB - (isVertical ? 0 : rows >= 1 ? (remaining ? 0 : dXBJJ) : 0)).toFixed(2);
+    // 如果只有一列的时候去除右边刀位
+    if (cols === 1) {
+      newMaterialLength = newMaterialLength - dYBJJ
+    }
     // 计算开数
     let dSinglePQty = isVertical
       ? remaining
         ? cols + cols * (rows * 2)
         : cols * (rows * 2)
       : remaining
-      ? rows + rows * (cols * 2)
-      : rows * (cols * 2);
+        ? rows + rows * (cols * 2)
+        : rows * (cols * 2);
     let dHorizontalType = isVertical ? cols : remaining ? cols * 2 + 1 : cols * 2;
     let dPortraitType = isVertical ? (remaining ? rows * 2 + 1 : rows * 2) : remaining ? rows : rows;
@@ -717,6 +823,8 @@ const Typesetting = props =&gt; {
   const confirmParam = commonFunc.showLocalMessage(props, "confirmParam", "排版尺寸大于上机尺寸，请确认参数!");
   const isJuantong = selectedNode.sTypeKey === "juantong";
+  const OpenVersion = commonFunc.showLocalMessage(props, "OpenVersion", "开版利用率");
+  const DoorWidthDirection = commonFunc.showLocalMessage(props, "DoorWidthDirections", "门幅方向");
   if (isCustomized && !isShow) {
     if (isMobile) return;
     message.error(confirmParam);
@@ -744,6 +852,7 @@ const Typesetting = props =&gt; {
   const handleCancel = () => {
     setIsModalOpen(false);
   };
+
   return (
     <>
       {isShow ? (
@@ -860,7 +969,7 @@ const Typesetting = props =&gt; {
                         textOrientation: "upright",
                       }}
                     >
-                      {"门幅方向"}
+                      {DoorWidthDirection}
                     </span>
                   ) : (
                     ""
@@ -953,7 +1062,7 @@ const Typesetting = props =&gt; {
                   <span style={{ color: "red" }}>{maxWidth}</span>
                   {openEdition ? (
                     <span>
-                      <span>开版利用率：</span>
+                      <span>{OpenVersion}：</span>
                       <span style={{ color: "red" }}>{openEdition} %</span>
                     </span>
                   ) : null}
@@ -1232,7 +1341,7 @@ const Typesetting = props =&gt; {
                         textOrientation: "upright",
                       }}
                     >
-                      {"门幅方向"}
+                      {DoorWidthDirection}
                     </span>
                   ) : (
                     ""
@@ -1329,7 +1438,7 @@ const Typesetting = props =&gt; {
                   <span style={{ color: "red" }}>{maxWidth}</span>
                   {openEdition ? (
                     <span>
-                      <span>开版利用率：</span>
+                      <span>{OpenVersion}：</span>
                       <span style={{ color: "red" }}>{openEdition} %</span>
                     </span>
                   ) : null}
@@ -1463,6 +1572,8 @@ const Typesetting = props =&gt; {
           </div>
         </div>
       </Modal>
+
+
     </>
   );
 };
@@ -2452,6 +2452,7 @@ const BoxComponent = props =&gt; {
   let boxList = [];
   const { sStripType = 0 } = selectedNode;
+  
   if (
     (slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth && masterData.dHeight) ||
     (Number(sStripType) === 1 && slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth) ||
@@ -2598,12 +2599,16 @@ const BoxComponent = props =&gt; {
   }
   const getImageUrl = (sName) => {
     const imageUrlNew = `${commonConfig.server_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`;
-    return imageUrlNew
-  }
-  let imagesData = [
-    { src: getImageUrl(removeExtension(slaveRowData.sPackDetailPathUpLoad)), alt: "展开图" },
-    { src: getImageUrl(removeExtension(slaveRowData.sPackPath)), alt: "立体图" },
-  ];
+    return imageUrlNew;
+  };
+  
+  let imagesData = useMemo(() => {
+    if (!slaveRowData) return [];
+    return [
+      { src: getImageUrl(removeExtension(slaveRowData.sPackDetailPathUpLoad)), alt: "展开图" },
+      { src: getImageUrl(removeExtension(slaveRowData.sPackPath)), alt: "立体图" },
+    ];
+  }, [slaveRowData?.sPackDetailPathUpLoad, slaveRowData?.sPackPath]);
   if (!slaveRowData.sPackDetailPathUpLoad) {
     imagesData = [{ src: getImageUrl(removeExtension(slaveRowData.sPackPath)), alt: "立体图" }];
   } else if (!slaveRowData.sPackPath) {
@@ -2713,6 +2718,7 @@ const BoxComponent = props =&gt; {
                                       transform: " translate(-50%, -50%)",
                                       width: "100%",
                                       height: "200px",
+                                      margin:0
                                     }}
                                   >
                                     <DynamicSVG {...svgProps} />