From 7b2453fdc97547702076f2f8ee3d76f4fc622adb Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Tue, 20 May 2025 15:04:44 +0800
Subject: [PATCH] 盒型

---
 src/components/Common/BoxDesignCompontent/svg.js  | 3 ++-
 src/components/Common/BoxShowImgMaterial/index.js | 2 +-
 src/components/Common/CommonViewTable/index.js    | 2 +-
 src/components/Common/Typesetting/typesetting.js  | 3 +--
 src/components/Common/commonFunc.js               | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/Common/BoxDesignCompontent/svg.js b/src/components/Common/BoxDesignCompontent/svg.js
index 595c31a..e394bd4 100644
--- a/src/components/Common/BoxDesignCompontent/svg.js
+++ b/src/components/Common/BoxDesignCompontent/svg.js
@@ -46,6 +46,7 @@ import {
   createBoxComponentNewFul5,
 } from "../BoxDesign/createAirplaneBox";
 const SvgBox = props => {
+  console.log("🚀 ~ props:", props)
   const svgContainerRef = useRef(null);
   const svgRef = useRef(null);
   const [boxKey, setBoxKey] = useState(new Date().getTime());
@@ -69,7 +70,7 @@ const SvgBox = props => {
 
   // 初始化svg
   const initSVG = () => {
-    setBoxKey(new Date().getTime());
+    // setBoxKey(new Date().getTime());
     const svg = svgRef.current;
     const g = document.createElementNS("http://www.w3.org/2000/svg", "g"); // 创建 <g>
 
diff --git a/src/components/Common/BoxShowImgMaterial/index.js b/src/components/Common/BoxShowImgMaterial/index.js
index 2691a3c..ebe9413 100644
--- a/src/components/Common/BoxShowImgMaterial/index.js
+++ b/src/components/Common/BoxShowImgMaterial/index.js
@@ -168,7 +168,7 @@ const BoxShowImgMaterial = props => {
   // 计算材料利用率
   const availability = ((((horizontalBoxes * verticalBoxes) * (Number(dMachineLength) * Number(dMachineWidth)) / (Number(dWlcd) * Number(dWlkd)))) * 100).toFixed(2);
   useEffect(() => {
-    setBoxKey(new Date().getTime());
+    // setBoxKey(new Date().getTime());
   setTimeout(() => {
     if (boxRef.current && textRef.current && textRefs.current &&  nTextRef.current && nTextRefs.current) {
       // 计算父元素的缩放因子
diff --git a/src/components/Common/CommonViewTable/index.js b/src/components/Common/CommonViewTable/index.js
index 26de3c3..d2857a5 100644
--- a/src/components/Common/CommonViewTable/index.js
+++ b/src/components/Common/CommonViewTable/index.js
@@ -90,7 +90,7 @@ export default class CommonViewTable extends Component {
     if (tableConfigType) {
       masterShowConfig = commonUtils.isNotEmptyObject(tableConfig) ? tableConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName !== '' && item.sControlName.split('_')[1] === tableConfigType) : [];
     } else {
-      masterShowConfig = commonUtils.isNotEmptyObject(tableConfig) ? tableConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName !== '' && item.sControlName.indexOf('_') === -1) : [];
+      masterShowConfig = commonUtils.isNotEmptyObject(tableConfig) ? tableConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName !== '' && (item.sControlName?.indexOf('_') === -1)) : [];
     }
     const formItemLayout = { labelCol: { span: 7, style: { color: 'rgba(0, 0, 0, 0.65)', backgroundColor: '#BFEFFF' } }, wrapperCol: { span: 17 } };
 
diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js
index 905eed8..e459640 100644
--- a/src/components/Common/Typesetting/typesetting.js
+++ b/src/components/Common/Typesetting/typesetting.js
@@ -416,7 +416,6 @@ const Typesetting = props => {
   useEffect(
     () => {
       // 计算缩放比例
-      setBoxKey(new Date().getTime());
       setTimeout(() => {
         const scaleX = (clientWidth - 50) / (outerWidth + 110);
         const scaleY = (clientHeight - 5) / (outerHeight + 90);
@@ -561,7 +560,7 @@ const Typesetting = props => {
 
   const onClick = () => {
     setIsModalOpen(true);
-    setBoxKeys(new Date().getTime());
+    // setBoxKeys(new Date().getTime());
     setTimeout(() => {
       const scaleX = 1200 / outerWidth;
       const scaleY = 500 / outerHeight;
diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js
index 052c353..86ac1c5 100644
--- a/src/components/Common/commonFunc.js
+++ b/src/components/Common/commonFunc.js
@@ -41,7 +41,6 @@ export function getConfig(type, name, config, gdsformconst, gdsjurisdiction, sDe
    } */
   return returnConfig;
 }
-
 export function getControlConfig() {
   return ''
 }
@@ -180,7 +179,7 @@ export function getDefaultData(config, allTableData = {}, extraData = {}) {
   if (commonUtils.isNotEmptyObject(config) && commonUtils.isNotEmptyObject(config.gdsconfigformslave)) {
     config.gdsconfigformslave.forEach((childConfig) => {
       const { sDefault, sName } = childConfig;
-      if (sDefault !== '' && sName && sDefault !== undefined && sDefault.indexOf(':') > -1 && sDefault.indexOf('.') > -1) {
+            if (typeof sDefault === 'string' && sDefault !== '' && sName && sDefault !== undefined && sDefault.indexOf(':') > -1 && sDefault.indexOf('.') > -1) {
         const oldFieldName = sDefault.split(':')[1];
         const tableName = oldFieldName.split('.')[0];
         if (sDefault && sDefault.includes('Fx')) { /* 默认值支持自定义函数 */
--
libgit2 0.22.2