协议
+ + +IP地址
+ +端口号
+ +
+
+
+
+
+
+ +
+
+
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..a2e3aa0
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/favicons.ico b/public/favicons.ico
deleted file mode 100644
index a783c3e..0000000
Binary files a/public/favicons.ico and /dev/null differ
diff --git a/public/index.html b/public/index.html
new file mode 100644
index 0000000..ffab51c
--- /dev/null
+++ b/public/index.html
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+ 用户协议与隐私政策
+感谢您选择小羚羊EBC！
+ 我们非常重视您的个人信息和隐私保护。为了更好地保障您的个人权益，在您使用我们的产品前，请务必审慎阅读
+ 《小羚羊EBC服务协议》与
+ 《小羚羊EBC隐私政策》内的所有条款，尤其是:
+ 1.我们对您的个人信息的收集/保存/使用/对外提供/保护等规则条款，以及您的用户权利等条款;
+ 2.约定我们的限制责任、免责条款。
+ 3.其他以颜色或加粗进行标识的重要条款。
+ 如您对以上协议有任何疑问，可通过人工客服或发邮件至yanghl@xlyerp.com与我们联系。
+ +
+ + + diff --git a/public/serviceAgreement.html b/public/serviceAgreement.html new file mode 100644 index 0000000..862b246 --- /dev/null +++ b/public/serviceAgreement.html @@ -0,0 +1,133 @@ + + + + + +
+ + + diff --git a/src/assets/disProcessSolution.svg b/src/assets/disProcessSolution.svg new file mode 100644 index 0000000..40b3770 --- /dev/null +++ b/src/assets/disProcessSolution.svg @@ -0,0 +1 @@ + diff --git a/src/assets/disablereflesh.svg b/src/assets/disablereflesh.svg new file mode 100644 index 0000000..56e2c14 --- /dev/null +++ b/src/assets/disablereflesh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/foot_logo.png b/src/assets/foot_logo.png index e0cee18..df876f3 100644 Binary files a/src/assets/foot_logo.png and b/src/assets/foot_logo.png differ diff --git a/src/assets/hasCancel_english.png b/src/assets/hasCancel_english.png deleted file mode 100644 index d2cb85b..0000000 Binary files a/src/assets/hasCancel_english.png and /dev/null differ diff --git a/src/assets/hasChecked.png b/src/assets/hasChecked.png deleted file mode 100644 index 65a5324..0000000 Binary files a/src/assets/hasChecked.png and /dev/null differ diff --git a/src/assets/hasChecked_big5.png b/src/assets/hasChecked_big5.png deleted file mode 100644 index 94a005a..0000000 Binary files a/src/assets/hasChecked_big5.png and /dev/null differ diff --git a/src/assets/hasChecked_english.png b/src/assets/hasChecked_english.png deleted file mode 100644 index cce3cca..0000000 Binary files a/src/assets/hasChecked_english.png and /dev/null differ diff --git a/src/assets/hasChecking_big5.png b/src/assets/hasChecking_big5.png deleted file mode 100644 index 8f84ff6..0000000 Binary files a/src/assets/hasChecking_big5.png and /dev/null differ diff --git a/src/assets/hasChecking_english.png b/src/assets/hasChecking_english.png deleted file mode 100644 index 7cc03d4..0000000 Binary files a/src/assets/hasChecking_english.png and /dev/null differ diff --git a/src/assets/haveCancel_big5.png b/src/assets/haveCancel_big5.png deleted file mode 100644 index ea00c99..0000000 Binary files a/src/assets/haveCancel_big5.png and /dev/null differ diff --git a/src/assets/haveCancel_english.png b/src/assets/haveCancel_english.png deleted file mode 100644 index 3602850..0000000 Binary files a/src/assets/haveCancel_english.png and /dev/null differ diff --git a/src/assets/haveSubmit_english.png b/src/assets/haveSubmit_english.png deleted file mode 100644 index b1cebe3..0000000 Binary files a/src/assets/haveSubmit_english.png and /dev/null differ diff --git a/src/assets/haveSubmit_english1.png b/src/assets/haveSubmit_english1.png deleted file mode 100644 index 023df72..0000000 Binary files a/src/assets/haveSubmit_english1.png and /dev/null differ diff --git a/src/assets/haveSubmit_sBig5.png b/src/assets/haveSubmit_sBig5.png deleted file mode 100644 index afd4e2d..0000000 Binary files a/src/assets/haveSubmit_sBig5.png and /dev/null differ diff --git a/src/assets/logo.png b/src/assets/logo.png index fbaf489..090bd6d 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/logo_pic.png b/src/assets/logo_pic.png index 6c13f56..ce17ec5 100644 Binary files a/src/assets/logo_pic.png and b/src/assets/logo_pic.png differ diff --git a/src/assets/mobile/6.png b/src/assets/mobile/6.png deleted file mode 100644 index e58a53a..0000000 Binary files a/src/assets/mobile/6.png and /dev/null differ diff --git a/src/assets/mobile/61.png b/src/assets/mobile/61.png deleted file mode 100644 index 5f12f7a..0000000 Binary files a/src/assets/mobile/61.png and /dev/null differ diff --git a/src/assets/paiban1.png b/src/assets/paiban1.png new file mode 100644 index 0000000..5fa8b9a Binary files /dev/null and b/src/assets/paiban1.png differ diff --git a/src/assets/paiban2.png b/src/assets/paiban2.png new file mode 100644 index 0000000..82a5ad5 Binary files /dev/null and b/src/assets/paiban2.png differ diff --git a/src/assets/panban.png b/src/assets/panban.png new file mode 100644 index 0000000..4d55a48 Binary files /dev/null and b/src/assets/panban.png differ diff --git a/src/assets/processSolution.svg b/src/assets/processSolution.svg new file mode 100644 index 0000000..9b3f01d --- /dev/null +++ b/src/assets/processSolution.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/reflesh.svg b/src/assets/reflesh.svg new file mode 100644 index 0000000..ad40a67 --- /dev/null +++ b/src/assets/reflesh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/AuditInformation/AuditInformation.js b/src/components/AuditInformation/AuditInformation.js index fa5495e..f5d6554 100644 --- a/src/components/AuditInformation/AuditInformation.js +++ b/src/components/AuditInformation/AuditInformation.js @@ -5,8 +5,8 @@ // , Switch, Icon import React, { Component } from 'react'; import { Form } from '@ant-design/compatible'; -// import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Tabs, Avatar, message, Select, Input, Button } from 'antd-v4'; +import '@ant-design/compatible/assets/index.css'; +import { Layout, Spin, Tabs, Avatar, message, Select, Input, Button } from 'antd'; import * as commonFunc from './../Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */ import styles from './../../index.less'; @@ -14,7 +14,7 @@ import CommonView from './../Common/CommonView'; import CommonBase from './../Common/CommonBase';/* 获取配置及数据 */ import * as commonUtils from './../../utils/utils';/* 通用方法 */ import * as commonBusiness from './../Common/commonBusiness';/* 单据业务功能 */ -import commonConfig from './../../utils/config'; +import * as commonConfig from './../../utils/config'; import * as commonServices from './../../services/services';/* 服务类 */ const { TabPane } = Tabs; @@ -33,7 +33,7 @@ class AuditInformation extends Component { let { masterConfig, canSendMsg } = nextProps; const { userinfo } = app; if (commonUtils.isEmptyArr(masterConfig) && formData.length > 0) { - const sId = currentId || nextProps.masterData?.sId || ''; + const sId = currentId !== undefined ? currentId : ''; /* 数据Id */ masterConfig = formData.filter(item => !item.bGrd)[0]; const checkConfig = formData.filter(item => item.bGrd && item.sTbName === 'sysbillcheckresult')[0]; @@ -58,7 +58,7 @@ class AuditInformation extends Component { /** 获取主表数据 */ handleGetData = async (masterConfig, checkConfig) => { const { currentId } = this.props; /* 当前页签数据 */ - const sId = currentId || this.props.masterData?.sId || ''; + const sId = currentId !== undefined ? currentId : ''; await this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' } }); const { masterData } = this.props; if (!commonUtils.isEmptyObject(checkConfig) && !commonUtils.isEmptyObject(masterData)) { @@ -112,8 +112,8 @@ class AuditInformation extends Component { } }; render() { - const { masterData, sModelsType, app } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); + const { pageLoading, masterData } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData); return (
${value}%
`,
- });
-
- chart.render();
+ chart.changeData(data);
+ }
this.chart = chart;
- };
-
- handleRef = (node) => {
- this.node = node;
- };
+ }
render() {
- return ;
+ return (
+
+ );
}
}
-export default Gauge;
\ No newline at end of file
+export default Gauge;
diff --git a/src/components/Charts/Pie/index.js b/src/components/Charts/Pie/index.js
index fc56053..fd92735 100644
--- a/src/components/Charts/Pie/index.js
+++ b/src/components/Charts/Pie/index.js
@@ -1,7 +1,7 @@
/* eslint-disable no-undef, jsx-a11y/no-noninteractive-element-interactions */
import React, { Component } from 'react';
import G2 from 'g2';
-import { Divider } from 'antd-v4';
+import { Divider } from 'antd';
import classNames from 'classnames';
import ReactFitText from 'react-fittext';
import Debounce from 'lodash-decorators/debounce';
@@ -182,7 +182,7 @@ class Pie extends Component {
});
// chart.changeSize(180, 216);// 设置图标的高度
chart
- .interval()
+ .intervalStack()
.position(Stat.summary.percent('y'))
.style({ lineWidth, stroke: '#fff' })
.color('x', percent ? formatColor : defaultColors)
diff --git a/src/components/Charts/Pie/index.less b/src/components/Charts/Pie/index.less
index 47da292..70796d9 100644
--- a/src/components/Charts/Pie/index.less
+++ b/src/components/Charts/Pie/index.less
@@ -1,4 +1,4 @@
-@import "~antd-v4/lib/style/themes/default.less";
+@import "~antd/lib/style/themes/default.less";
.pie {
position: relative;
diff --git a/src/components/Charts/PieGroup/index.js b/src/components/Charts/PieGroup/index.js
index cdbe243..2d6cb73 100644
--- a/src/components/Charts/PieGroup/index.js
+++ b/src/components/Charts/PieGroup/index.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import { Row, Col } from 'antd-v4';
+import { Row, Col } from 'antd';
import { getTheme } from '@antv/g2';
import Pie from '../Pie';
diff --git a/src/components/Charts/TimeLineGroup/index.js b/src/components/Charts/TimeLineGroup/index.js
index 6d82488..1f147b9 100644
--- a/src/components/Charts/TimeLineGroup/index.js
+++ b/src/components/Charts/TimeLineGroup/index.js
@@ -1,6 +1,6 @@
/* eslint-disable object-curly-newline */
import React, { Component } from 'react';
-import { Row, Col, Tabs } from 'antd-v4';
+import { Row, Col, Tabs } from 'antd';
import TimeLineChart from '../TimelineChart';
import NumberInfo from '../../NumberInfo';
import Pie from '../Pie';
diff --git a/src/components/Charts/WaterWave/index.less b/src/components/Charts/WaterWave/index.less
index be35c21..4ded14d 100644
--- a/src/components/Charts/WaterWave/index.less
+++ b/src/components/Charts/WaterWave/index.less
@@ -1,4 +1,4 @@
-@import "~antd-v4/lib/style/themes/default.less";
+@import "~antd/lib/style/themes/default.less";
.waterWave {
display: block;
diff --git a/src/components/Charts/index.less b/src/components/Charts/index.less
index 95f7056..b2646b8 100644
--- a/src/components/Charts/index.less
+++ b/src/components/Charts/index.less
@@ -1,4 +1,4 @@
-@import "~antd-v4/lib/style/themes/default.less";
+@import "~antd/lib/style/themes/default.less";
.char {
margin: 24px;
}
diff --git a/src/components/Common/AffixMenu.js b/src/components/Common/AffixMenu.js
index a61f588..094c703 100644
--- a/src/components/Common/AffixMenu.js
+++ b/src/components/Common/AffixMenu.js
@@ -1,10 +1,11 @@
/* eslint-disable */
import React, { Component } from 'react';
-import { Affix, Table, Checkbox, Input, Select, message, Tabs, Alert } from 'antd-v4';
+import fetch from 'dva/fetch';
+import { Affix, Table, Checkbox, Input, Select, message, Tabs, Alert } from 'antd';
import styles from '@/index.less';
import lodash from 'lodash';
import * as commonUtils from '@/utils/utils';
-import config from '@/utils/config';
+import * as config from '@/utils/config';
import * as commonFunc from '@/components/Common/commonFunc';
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
import SvgIcon from '../SvgIcon';
@@ -349,12 +350,7 @@ class AffixMenuComponent extends Component {
const columniFitWidth = commonFunc.showMessage(app.commonConst, 'columniFitWidth');/* 宽度 */
const columnbVisible = commonFunc.showMessage(app.commonConst, 'columnbVisible');/* 是否显示 */
const columnsName = commonFunc.showMessage(app.commonConst, 'columnsName');/* 字段名 */
- const columnsReadOnly = commonFunc.showMessage(app.commonConst, 'columnsReadOnly') || '是否只读';/* 是否自读 */
- const columnsFontColor = commonFunc.showMessage(app.commonConst, 'columnsFontColor') || '字体颜色';/* 字体颜色 */
const isDefault = commonFunc.showMessage(app.commonConst, 'isDefault');/* 是否设置默认 */
- const BtnSure = commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';/* 按钮确认 */
- const BtnCancel = commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';/* 按钮取消 */
- const selectAll = commonFunc.showMessage(app.commonConst, 'selectAll') || '全选';/* 全选 */
// eslint-disable-next-line no-unused-vars
Object.keys(modalData).forEach((child, i) => {
const splitArr = commonUtils.isNotEmptyObject(child) && commonUtils.isNotEmptyArr(child.split('_')) ? child.split('_') : [];
@@ -409,11 +405,11 @@ class AffixMenuComponent extends Component {
visible += 1;
}
}
- checkAll = {selectAll}
{
diff --git a/src/components/Common/AntdDraggableModal.js b/src/components/Common/AntdDraggableModal.js
index 0b4cdc9..0d0cc4b 100644
--- a/src/components/Common/AntdDraggableModal.js
+++ b/src/components/Common/AntdDraggableModal.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { Modal } from 'antd-v4';
+import { Modal } from 'antd';
import './AntdDraggableModal/antDraggle.less';
diff --git a/src/components/Common/AssignmentField.js b/src/components/Common/AssignmentField.js
index 757e0e5..2cf0aef 100644
--- a/src/components/Common/AssignmentField.js
+++ b/src/components/Common/AssignmentField.js
@@ -3,7 +3,7 @@
*/
/* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
import React, { Component } from 'react';
-import { Modal } from 'antd-v4';
+import { Modal } from 'antd';
import styles from '@/index.less';
import * as commonUtils from '@/utils/utils';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
diff --git a/src/components/Common/BoxDesign/createAirplaneBox.js b/src/components/Common/BoxDesign/createAirplaneBox.js
index e833fc5..1176104 100644
--- a/src/components/Common/BoxDesign/createAirplaneBox.js
+++ b/src/components/Common/BoxDesign/createAirplaneBox.js
@@ -2,9 +2,8 @@
// 创建飞机盒盒身
const boxContent = (width, height, offsetX, offsetY) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} L ${offsetX + width} ${offsetY + height} L ${
- offsetX + width
- } ${offsetY} L ${offsetX} ${offsetY} Z`;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} L ${offsetX + width} ${offsetY + height} L ${offsetX +
+ width} ${offsetY} L ${offsetX} ${offsetY} Z`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
svg.setAttribute("stroke", "#333");
@@ -15,9 +14,8 @@ const boxContent = (width, height, offsetX, offsetY) => {
// 创建飞机盒上盒部件
const createBoxTop = (width, height, offsetX, offsetY, outerWidth) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${width} ${offsetY} A ${height} ${height} 0 0 1 ${width + outerWidth} ${offsetX} L ${offsetX - outerWidth} ${
- offsetY + height
- } A ${height} ${height} 0 0 1 ${offsetX} ${offsetY}`;
+ const d = `M ${offsetX} ${offsetY} L ${width} ${offsetY} A ${height} ${height} 0 0 1 ${width + outerWidth} ${offsetX} L ${offsetX -
+ outerWidth} ${offsetY + height} A ${height} ${height} 0 0 1 ${offsetX} ${offsetY}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
svg.setAttribute("stroke", "#333");
@@ -27,9 +25,8 @@ const createBoxTop = (width, height, offsetX, offsetY, outerWidth) => {
// 创建飞机左上部件
const createBoxLeftTop = (width, height, offsetX, offsetY, isLeft) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX - width + (isLeft ? 5 : -5)} ${offsetY + 5} A 10 10 0 0 ${isLeft ? 0 : 1} ${offsetX - width} ${
- offsetY + 15
- } L ${offsetX - width} ${offsetY + height - 15}
+ const d = `M ${offsetX} ${offsetY} L ${offsetX - width + (isLeft ? 5 : -5)} ${offsetY + 5} A 10 10 0 0 ${isLeft ? 0 : 1} ${offsetX -
+ width} ${offsetY + 15} L ${offsetX - width} ${offsetY + height - 15}
A 10 10 0 0 ${isLeft ? 0 : 1} ${offsetX - width + (isLeft ? 5 : -5)} ${offsetY + height - 5} L ${offsetX} ${offsetY + height}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
@@ -96,16 +93,7 @@ export const createPathElement = (x, y, width, height, id, wrapperId) => {
svg.setAttribute("stroke-dasharray", "4"); // 添加虚线效果
return svg;
};
-export const createPathElements = (x, y, width, height, id, wrapperId) => {
- const d = `M ${x} ${y} L ${x} ${y + height} L ${x + width} ${y + height} L ${x + width} ${y} L ${x} ${y} Z`;
- const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- svg.setAttribute("d", d);
- svg.setAttribute("fill", "transparent");
- svg.setAttribute("stroke", "#7588B9");
- svg.setAttribute("stroke-width", "1");
- // svg.setAttribute("stroke-dasharray", "4"); // 添加虚线效果
- return svg;
-};
+
//
// 左边斜线贴边
export const createTrapezoid = (height, offsetX, offsetY, size) => {
@@ -120,9 +108,9 @@ export const createTrapezoid = (height, offsetX, offsetY, size) => {
// 左上盒舌 盒舌 x轴原点 y轴原点 高度 x轴方向偏移 y轴方向偏移 是否瞬时针 是否镜像 type0
export const createTopTongue = (width, offsetX, offsetY, size, xz, yz, clockwise, isMirror, az, jxY) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX + xz} ${offsetY + az} L ${offsetX + xz} ${offsetY - size} L ${
- offsetX + width - (isMirror ? -(yz * 2) : yz * 2)
- } ${offsetY - size}
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + xz} ${offsetY + az} L ${offsetX + xz} ${offsetY - size} L ${offsetX +
+ width -
+ (isMirror ? -(yz * 2) : yz * 2)} ${offsetY - size}
A ${yz} ${yz} 0 0 ${clockwise} ${offsetX + width - (isMirror ? -yz : yz)} ${offsetY - size + jxY} L ${offsetX + width} ${offsetY}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
@@ -133,9 +121,9 @@ export const createTopTongue = (width, offsetX, offsetY, size, xz, yz, clockwise
// 下边
export const createBottomTongue = (width, offsetX, offsetY, size, xz, yz, clockwise, isMirror, az, jxY) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX + xz} ${offsetY + az} L ${offsetX + xz} ${offsetY - size} L ${
- offsetX + width - (isMirror ? -(yz * 2) : yz * 2)
- } ${offsetY - size}
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + xz} ${offsetY + az} L ${offsetX + xz} ${offsetY - size} L ${offsetX +
+ width -
+ (isMirror ? -(yz * 2) : yz * 2)} ${offsetY - size}
A ${yz} ${yz} 0 0 ${clockwise} ${offsetX + width - (isMirror ? -yz : yz)} ${offsetY - size + jxY} L ${offsetX + width} ${offsetY}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
@@ -146,9 +134,8 @@ export const createBottomTongue = (width, offsetX, offsetY, size, xz, yz, clockw
// 上盒舌类型1
export const createTopTongueType1 = (width, offsetX, offsetY, size, xz, yz) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX + xz} ${offsetY + size} L ${offsetX + width - xz + yz} ${offsetY + size} L${
- offsetX + width
- } ${offsetY} `;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + xz} ${offsetY + size} L ${offsetX + width - xz + yz} ${offsetY + size} L${offsetX +
+ width} ${offsetY} `;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
svg.setAttribute("stroke", "#333");
@@ -160,9 +147,8 @@ export const createDynamicTop = (width, height, deep, offsetX, offsetY, size) =>
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
// 动态生成路径，基于输入参数
const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY - deep - size + isSignNum} A 2 2 0 0 1 ${offsetX + 2} ${offsetY - deep - size}
- L ${offsetX + width - 2} ${offsetY - deep - size} A 2 2 0 0 1 ${offsetX + width} ${offsetY - deep - size + isSignNum} L ${offsetX + width} ${
- offsetY - deep
- }
+ L ${offsetX + width - 2} ${offsetY - deep - size} A 2 2 0 0 1 ${offsetX + width} ${offsetY - deep - size + isSignNum} L ${offsetX +
+ width} ${offsetY - deep}
L ${offsetX} ${offsetY - deep} L ${offsetX + width} ${offsetY - deep} L ${offsetX + width} ${offsetY} `;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
@@ -201,20 +187,19 @@ export const createText = (offsetX, offsetY, size, textContent) => {
text.setAttribute("dominant-baseline", "middle"); // 文字垂直居中
text.setAttribute("fill", "#333"); // 文字颜色
text.setAttribute("font-size", size); // 文字大小
- text.textContent = textContent || ""; // 默认文字内容
+ text.textContent = textContent || "Text"; // 默认文字内容
return text;
};
// 竖向双箭头
-export const createDoubleArrow = (height, offsetX, offsetY, scale) => {
- const Y = -3 * (scale ? scale : 1);
+export const createDoubleArrow = (height, offsetX, offsetY,scale) => {
+ const Y = -3 * (scale?scale:1)
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY - height / 2 - Y} L ${offsetX + Y} ${offsetY - height / 2 - Y} L ${offsetX} ${
- offsetY - height / 2
- }
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY - height / 2 - Y} L ${offsetX + Y} ${offsetY - height / 2 - Y} L ${offsetX} ${offsetY -
+ height / 2}
L ${offsetX - Y} ${offsetY - height / 2 - Y} L ${offsetX} ${offsetY - height / 2 - Y} L ${offsetX} ${offsetY + height / 2 + Y} L
- ${offsetX - Y} ${offsetY + height / 2 + Y} L ${offsetX} ${offsetY + height / 2} L ${offsetX + Y} ${offsetY + height / 2 + Y} L ${offsetX} ${
- offsetY + height / 2 + Y
- }`;
+ ${offsetX - Y} ${offsetY + height / 2 + Y} L ${offsetX} ${offsetY + height / 2} L ${offsetX + Y} ${offsetY +
+ height / 2 +
+ Y} L ${offsetX} ${offsetY + height / 2 + Y}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "#F5AD6C");
svg.setAttribute("stroke", "#F5AD6C");
@@ -223,15 +208,14 @@ export const createDoubleArrow = (height, offsetX, offsetY, scale) => {
return svg;
};
// 横向双箭头
-export const createHorizontalDoubleArrow = (width, offsetX, offsetY, scale) => {
- const Y = 3 * (scale ? scale : 1);
+export const createHorizontalDoubleArrow = (width, offsetX, offsetY,scale) => {
+ const Y = 3 * (scale?scale:1)
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX - width / 2 + Y} ${offsetY} L ${offsetX - width / 2 + Y} ${offsetY - Y} L ${
- offsetX - width / 2
- } ${offsetY}
- L ${offsetX - width / 2 + Y} ${offsetY + Y} L ${offsetX - width / 2 + Y} ${offsetY} L ${offsetX + width / 2 - Y} ${offsetY} L ${
- offsetX + width / 2 - Y
- } ${offsetY + Y} L ${offsetX + width / 2} ${offsetY}
+ const d = `M ${offsetX} ${offsetY} L ${offsetX - width / 2 + Y} ${offsetY} L ${offsetX - width / 2 + Y} ${offsetY - Y} L ${offsetX -
+ width / 2} ${offsetY}
+ L ${offsetX - width / 2 + Y} ${offsetY + Y} L ${offsetX - width / 2 + Y} ${offsetY} L ${offsetX + width / 2 - Y} ${offsetY} L ${offsetX +
+ width / 2 -
+ Y} ${offsetY + Y} L ${offsetX + width / 2} ${offsetY}
L ${offsetX + width / 2 - Y} ${offsetY - Y} L ${offsetX + width / 2 - Y} ${offsetY}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "#F5AD6C");
@@ -444,10 +428,7 @@ export function createBoxs(slaveRowData) {
export function createHeavenBox(slaveRowData) {
const pathList = [];
const { W, L, D, dF, dF1, dD1, dZBJJ } = slaveRowData;
- const rectangles = [
- { x: 0, y: 0, width: L, height: W },
- { x: L + D + dZBJJ + dD1, y: -2, width: L + 4, height: W + 4 },
- ];
+ const rectangles = [{ x: 0, y: 0, width: L, height: W }, { x: L + D + dZBJJ + dD1, y: -2, width: L + 4, height: W + 4 }];
rectangles.forEach(x => {
pathList.push(boxContent(x.width, x.height, x.x, x.y));
});
@@ -523,9 +504,8 @@ export function createDiscBox(slaveRowData) {
// 展示盒f1
const createShowBoxF1 = (width, height, offsetX, offsetY, size) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + size} L ${offsetX - width} ${offsetY + size + 1} L ${offsetX - width} ${
- offsetY + height
- } L ${offsetX} ${offsetY + height} Z`;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + size} L ${offsetX - width} ${offsetY + size + 1} L ${offsetX - width} ${offsetY +
+ height} L ${offsetX} ${offsetY + height} Z`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
svg.setAttribute("stroke", "#333");
@@ -557,11 +537,7 @@ const createShowBoxF2 = (width, height, offsetX, offsetY, size) => {
export function createShowBox(slaveRowData) {
const pathList = [];
const { L, W, D, dD2, dF1, dF2 } = slaveRowData;
- const rectangles = [
- { x: 0, y: 0, width: D, height: W },
- { x: D, y: 0, width: L, height: W },
- { x: D + L, y: 0, width: dD2, height: W },
- ];
+ const rectangles = [{ x: 0, y: 0, width: D, height: W }, { x: D, y: 0, width: L, height: W }, { x: D + L, y: 0, width: dD2, height: W }];
rectangles.forEach(x => {
pathList.push(boxContent(x.width, x.height, x.x, x.y));
});
@@ -593,9 +569,8 @@ export function createShowBox(slaveRowData) {
// 内衬槽
const createInnerLiningGroove = (width, height, offsetX, offsetY) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height - width / 2} A ${width / 2} ${width / 2} 0 0 0 ${offsetX - width} ${
- offsetY + height
- } L ${offsetX - width} ${offsetY}`;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height - width / 2} A ${width / 2} ${width / 2} 0 0 0 ${offsetX - width} ${offsetY +
+ height} L ${offsetX - width} ${offsetY}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
svg.setAttribute("stroke", "#333");
@@ -626,9 +601,8 @@ export function createLiningBox(slaveRowData) {
}
const createDiagonalEdging = (width, height, offsetX, offsetY) => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
- const d = `M ${offsetX} ${offsetY} L ${offsetX + 5} ${offsetY + height} L ${offsetX + width - 5} ${offsetY + height} L${
- offsetX + width
- } ${offsetY}`;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + 5} ${offsetY + height} L ${offsetX + width - 5} ${offsetY + height} L${offsetX +
+ width} ${offsetY}`;
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
svg.setAttribute("stroke", "#333");
@@ -666,8 +640,8 @@ const createSvg = d => {
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
- svg.setAttribute("stroke", "#333");
- svg.setAttribute("stroke-width", "0.5");
+ svg.setAttribute("stroke", "#7588B9");
+ svg.setAttribute("stroke-width", "1");
return svg;
};
const createDasharraySvg = d => {
@@ -688,16 +662,14 @@ export const createLineWeltTop = (width, height, offsetX, offsetY) => {
// 上方盒舌等腰梯形
export const createIsoscelesTrapezoidWeltTop = (width, height, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.1} ${offsetY + height} L ${offsetX + width * 0.9} ${offsetY + height} L ${
- offsetX + width
- } ${offsetY}`;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.1} ${offsetY + height} L ${offsetX + width * 0.9} ${offsetY + height} L ${offsetX +
+ width} ${offsetY}`;
return createSvg(d);
};
// 盒舌梯形
export const createTrapezoidWeltTop = (width, height, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.5} ${offsetY + height} L ${offsetX + width * 0.9} ${offsetY + height} L ${
- offsetX + width
- } ${offsetY}`;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.5} ${offsetY + height} L ${offsetX + width * 0.9} ${offsetY + height} L ${offsetX +
+ width} ${offsetY}`;
return createSvg(d);
};
// 盒舌折叠
@@ -717,260 +689,152 @@ export const createFoldWeltTopLine = (width, height, offsetX, offsetY) => {
export const createRoundedCornersWeltTop = (width, height, offsetX, offsetY) => {
const isNegative = (width > 0 && height > 0) || (width < 0 && height < 0);
- const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.1} ${offsetY + height * 0.9} L ${offsetX + width} ${offsetY + height} L ${
- offsetX + width
- } ${offsetY}`;
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.1} ${offsetY + height * 0.9} L ${offsetX + width} ${offsetY + height} L ${offsetX + width} ${offsetY}`
return createSvg(d);
};
// 盒底组件 直角
-export const createRightAngleBoxBottomComponent = (width, deep, size, offsetX, offsetY) => {
+export const createRightAngleBoxBottomComponent = (width, deep,size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + size} L ${offsetX + width} ${offsetY + size} L ${offsetX + width} ${offsetY}
L ${offsetX + width} ${offsetY + size} L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep} ${offsetY}
L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep + width} ${offsetY + size} L ${offsetX + width + deep + width} ${offsetY}
- L ${offsetX + width + deep + width} ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY + size} L ${
- offsetX + width + deep + width + deep
- } ${offsetY}`;
+ L ${offsetX + width + deep + width} ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY}`;
return createSvg(d);
};
// 盒底组件 5002
export const createBoxBottomComponent1 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.2} ${offsetY + size * 0.5} L ${offsetX + width * 0.2} ${offsetY + size} L ${
- offsetX + width * 0.8
- } ${offsetY + size} L ${offsetX + width * 0.8} ${offsetY + size * 0.5} L ${offsetX + width} ${offsetY}
- L ${offsetX + width} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${
- offsetY + size * 0.5
- } L ${offsetX + width + deep} ${offsetY}
- L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep + width * 0.2} ${offsetY + size} L ${
- offsetX + width + deep + width * 0.2
- } ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${
- offsetY + size
- }
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.2} ${offsetY + size * 0.5} L ${offsetX + width * 0.2} ${offsetY + size} L ${offsetX + width * 0.8} ${offsetY + size} L ${offsetX + width * 0.8} ${offsetY + size *0.5} L ${offsetX + width} ${offsetY}
+ L ${offsetX + width} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size * 0.5} L ${offsetX + width + deep} ${offsetY}
+ L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep + width * 0.2} ${offsetY + size} L ${offsetX + width + deep + width * 0.2} ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${offsetY + size}
L ${offsetX + width + deep + width} ${offsetY + size} L ${offsetX + width + deep + width} ${offsetY}
- L ${offsetX + width + deep + width + deep * 0.5} ${offsetY + size * 0.5} L ${offsetX + width + deep + width + deep * 0.5} ${offsetY + size} L ${
- offsetX + width + deep + width + deep
- } ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY}
- `;
+ L ${offsetX + width + deep + width + deep *0.5} ${offsetY + size * 0.5} L ${offsetX + width + deep + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY}
+ `
return createSvg(d);
-};
+}
// 盒底组件 5003
export const createBoxBottomComponent2 = (width, deep, size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY}
L ${offsetX + width * 0.2} ${offsetY + size} L ${offsetX + width * 0.8} ${offsetY + size} L ${offsetX + width} ${offsetY}
- L ${offsetX + width} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${
- offsetY + size * 0.5
- } L ${offsetX + width + deep} ${offsetY}
- L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep + width * 0.2} ${offsetY + size} L ${
- offsetX + width + deep + width * 0.2
- } ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${
- offsetY + size
- } ${offsetX + width + deep + width} ${offsetY + size} L ${offsetX + width + deep + width} ${offsetY}
- L ${offsetX + width + deep + width + deep * 0.5} ${offsetY + size * 0.5} L ${offsetX + width + deep + width + deep * 0.5} ${offsetY + size} L ${
- offsetX + width + deep + width + deep
- } ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY}
+ L ${offsetX + width} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size * 0.5} L ${offsetX + width + deep} ${offsetY}
+ L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep + width * 0.2} ${offsetY + size} L ${offsetX + width + deep + width * 0.2} ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.8} ${offsetY + size} ${offsetX + width + deep + width} ${offsetY + size} L ${offsetX + width + deep + width} ${offsetY}
+ L ${offsetX + width + deep + width + deep *0.5} ${offsetY + size * 0.5} L ${offsetX + width + deep + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY + size} L ${offsetX + width + deep + width + deep} ${offsetY}
- `;
+ `
return createSvg(d);
-};
+}
// 盒底组件 5004
export const createBoxBottomComponent3 = (width, deep, size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY}
- L ${offsetX + width * 0.05} ${offsetY + size} L ${offsetX + width * 0.25} ${offsetY + size} L ${offsetX + width * 0.5} ${offsetY + size * 0.5} L ${
- offsetX + width * 0.75
- } ${offsetY + size} L ${offsetX + width * 0.95} ${offsetY + size} L ${offsetX + width} ${offsetY}
- L ${offsetX + width + deep * 0.1} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep} ${offsetY}
- L ${offsetX + width + deep + width * 0.05} ${offsetY + size} L ${offsetX + width + deep + width * 0.25} ${offsetY + size} L ${
- offsetX + width + deep + width * 0.5
- } ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.75} ${offsetY + size} L ${offsetX + width + deep + width * 0.95} ${
- offsetY + size
- } L ${offsetX + width + deep + width} ${offsetY}
- L ${offsetX + width * 2 + deep + deep * 0.5} ${offsetY + size} L ${offsetX + width * 2 + deep + deep * 0.9} ${offsetY + size} L ${
- offsetX + width * 2 + deep + deep
- } ${offsetY + size} L ${offsetX + width * 2 + deep * 2} ${offsetY}
- `;
+ L ${offsetX + width * 0.05} ${offsetY + size} L ${offsetX + width * 0.25} ${offsetY + size} L ${offsetX + width * 0.5} ${offsetY + size * 0.5} L ${offsetX + width * 0.75} ${offsetY + size} L ${offsetX + width *0.95} ${offsetY + size} L ${offsetX + width} ${offsetY}
+ L ${offsetX + width + deep * 0.1} ${offsetY + size} L ${offsetX + width + deep * 0.5} ${offsetY + size} L ${offsetX + width + deep} ${offsetY }
+ L ${offsetX + width + deep + width * 0.05} ${offsetY + size} L ${offsetX + width + deep + width * 0.25} ${offsetY + size} L ${offsetX + width + deep + width * 0.5} ${offsetY + size * 0.5} L ${offsetX + width + deep + width * 0.75} ${offsetY + size} L ${offsetX + width + deep + width *0.95} ${offsetY + size} L ${offsetX + width + deep + width} ${offsetY}
+ L ${offsetX + width * 2 +deep + deep *0.5} ${offsetY + size} L ${offsetX + width * 2 +deep + deep*0.9} ${offsetY + size} L ${offsetX + width * 2 +deep + deep} ${offsetY + size} L ${offsetX + width * 2 +deep * 2} ${offsetY}
+ `
return createSvg(d);
-};
+}
// 盒底组件 5005
export const createBoxBottomComponent4 = (width, deep, size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY}
- L ${offsetX} ${offsetY + size} L ${offsetX + width * 0.3} ${offsetY + size} L ${offsetX + width} ${offsetY}
- L ${offsetX + width} ${offsetY + size} L ${offsetX + width + deep * 0.3} ${offsetY + size} L ${offsetX + width + deep} ${offsetY}
- L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep + width * 0.3} ${offsetY + size} L ${offsetX + width * 2 + deep} ${offsetY}
- L ${offsetX + width * 2 + deep} ${offsetY + size} L ${offsetX + width * 2 + deep + deep * 0.3} ${offsetY + size} L ${
- offsetX + width * 2 + deep * 2
- } ${offsetY}
- `;
+ L ${offsetX } ${offsetY + size} L ${offsetX + width * 0.3} ${offsetY + size} L ${offsetX + width} ${offsetY}
+ L ${offsetX + width } ${offsetY + size} L ${offsetX + width + deep * 0.3} ${offsetY + size} L ${offsetX + width + deep} ${offsetY}
+ L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + deep + width * 0.3} ${offsetY + size} L ${offsetX + width * 2+ deep} ${offsetY}
+ L ${offsetX + width * 2 + deep } ${offsetY + size} L ${offsetX + width * 2 + deep + deep * 0.3} ${offsetY + size} L ${offsetX + width * 2+ deep * 2} ${offsetY}
+ `
return createSvg(d);
-}; // 盒底组件 5006
+}// 盒底组件 5006
export const createBoxBottomComponent5 = (width, deep, size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY}
- A ${width * 0.5} ${width * 0.5} 0 0 0 ${offsetX + width} ${offsetY}
- A ${deep * 0.5} ${deep * 0.5} 0 0 0 ${offsetX + width + deep} ${offsetY}
- A ${width * 0.5} ${width * 0.5} 0 0 0 ${offsetX + width * 2 + deep} ${offsetY}
- A ${deep * 0.5} ${deep * 0.5} 0 0 0 ${offsetX + width * 2 + deep * 2} ${offsetY}
- `;
+ A ${width * 0.5} ${width * 0.5 } 0 0 0 ${offsetX + width} ${offsetY }
+ A ${deep * 0.5} ${deep * 0.5 } 0 0 0 ${offsetX + width + deep} ${offsetY }
+ A ${width * 0.5} ${width * 0.5 } 0 0 0 ${offsetX + width * 2 + deep} ${offsetY }
+ A ${deep * 0.5} ${deep * 0.5 } 0 0 0 ${offsetX + width * 2 + deep * 2} ${offsetY }
+ `
return createSvg(d);
-};
+}
// 盒底组件 5007
export const createBoxBottomComponent6 = (width, deep, size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY}
- L ${offsetX} ${offsetY + size} L ${offsetX + width} ${offsetY + size} L ${offsetX + width} ${offsetY}
+ L ${offsetX } ${offsetY + size} L ${offsetX + width } ${offsetY + size} L ${offsetX + width} ${offsetY}
L ${offsetX + width + deep * 0.2} ${offsetY + size * 0.7} A ${size * 0.1} ${size * 0.1} 0 0 0 ${offsetX + width + deep * 0.2} ${offsetY + size}
L ${offsetX + width + deep * 0.8} ${offsetY + size} A ${size * 0.1} ${size * 0.1} 0 0 0 ${offsetX + width + deep * 0.8} ${offsetY + size * 0.7}
L ${offsetX + width + deep} ${offsetY}
- L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + width + deep} ${offsetY + size} L ${offsetX + width + deep + width} ${offsetY}
- L ${offsetX + width + deep + width + deep * 0.2} ${offsetY + size * 0.7} A ${size * 0.1} ${size * 0.1} 0 0 0 ${
- offsetX + width + deep + width + deep * 0.2
- } ${offsetY + size}
- L ${offsetX + width + deep + width + deep * 0.8} ${offsetY + size} A ${size * 0.1} ${size * 0.1} 0 0 0 ${
- offsetX + width + deep + width + deep * 0.8
- } ${offsetY + size * 0.7}
+ L ${offsetX + width + deep} ${offsetY + size} L ${offsetX + width + width + deep } ${offsetY + size} L ${offsetX + width + deep+ width} ${offsetY}
+ L ${offsetX + width + deep + width + deep * 0.2} ${offsetY + size * 0.7} A ${size * 0.1} ${size * 0.1} 0 0 0 ${offsetX + width + deep + width + deep * 0.2} ${offsetY + size}
+ L ${offsetX + width + deep+ width + deep * 0.8} ${offsetY + size} A ${size * 0.1} ${size * 0.1} 0 0 0 ${offsetX + width + deep + width + deep * 0.8} ${offsetY + size * 0.7}
L ${offsetX + width + deep + width + deep} ${offsetY}
- `;
+ `
return createSvg(d);
-};
+}
// 部件
-export const createBoxComponentNew = (width, deep, size, offsetX, offsetY) => {
+export const createBoxComponentNew = (width, deep,size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + deep} L ${offsetX + width} ${offsetY + deep} L ${offsetX + width} ${offsetY}
- L ${offsetX + width} ${offsetY + deep + size} L ${offsetX} ${offsetY + deep + size} L ${offsetX} ${offsetY}`;
+ L ${offsetX + width} ${offsetY + deep + size} L ${offsetX} ${offsetY + deep + size} L ${offsetX} ${offsetY}`
return createSvg(d);
-};
+}
// 部件1
-export const createBoxComponentNew1 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + size} L ${offsetX + width} ${offsetY + size} L ${offsetX + width} ${offsetY}`;
+export const createBoxComponentNew1 = (width, deep,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + size} L ${offsetX + width} ${offsetY + size} L ${offsetX + width} ${offsetY}`
return createSvg(d);
-};
+}
// 部件2
-export const createBoxComponentNew2 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.4} ${offsetY} L ${offsetX + width * 0.4} ${offsetY + size} L ${offsetX + width * 0.6} ${
- offsetY + size
- } L ${offsetX + width * 0.6} ${offsetY} L ${offsetX + width} ${offsetY}`;
+export const createBoxComponentNew2 = (width, deep,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + width * 0.4} ${offsetY} L ${offsetX + width * 0.4} ${offsetY + size} L ${offsetX + width * 0.6} ${offsetY + size} L ${offsetX + width * 0.6} ${offsetY} L ${offsetX + width} ${offsetY}`
return createSvg(d);
-};
+}
// 部件3
-export const createBoxComponentNew3 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + deep * 2} L ${offsetX + width * 0.2} ${offsetY + deep * 2} L ${offsetX + width * 0.2} ${
- offsetY + deep * 2 + size
- } L ${offsetX + width * 0.4} ${offsetY + deep * 2 + size}
- L ${offsetX + width * 0.4} ${offsetY + deep * 2} L ${offsetX + width * 0.6} ${offsetY + deep * 2} L${offsetX + width * 0.6} ${
- offsetY + deep * 2 + size
- } L ${offsetX + width * 0.8} ${offsetY + deep * 2 + size} L ${offsetX + width * 0.8} ${offsetY + deep * 2}
- L ${offsetX + width} ${offsetY + deep * 2} L ${offsetX + width} ${offsetY + deep} L ${offsetX} ${offsetY + deep} L ${offsetX + width} ${
- offsetY + deep
- } ${offsetX + width} ${offsetY}`;
+export const createBoxComponentNew3 = (width, deep,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + deep * 2} L ${offsetX + width * 0.2} ${offsetY + deep * 2} L ${offsetX + width * 0.2} ${offsetY + deep * 2 + size} L ${offsetX + width * 0.4} ${offsetY + deep * 2 + size}
+ L ${offsetX + width * 0.4} ${offsetY + deep * 2} L ${offsetX + width * 0.6} ${offsetY + deep * 2} L${offsetX + width * 0.6} ${offsetY + deep * 2 + size} L ${offsetX + width * 0.8} ${offsetY + deep * 2 + size} L ${offsetX + width * 0.8} ${offsetY + deep * 2}
+ L ${offsetX + width} ${offsetY + deep * 2} L ${offsetX + width} ${offsetY + deep} L ${offsetX} ${offsetY+deep} L ${offsetX + width} ${offsetY+deep} ${offsetX+width} ${offsetY}`
return createSvg(d);
-};
+}
// 部件4
-export const createBoxComponentNew4 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + deep * 2} L ${offsetX + width} ${offsetY + deep * 2} L ${offsetX + width} ${
- offsetY + deep
- } L ${offsetX} ${offsetY + deep} L ${offsetX + width} ${offsetY + deep} L ${offsetX + width} ${offsetY}
- M ${offsetX + width * 0.3} ${offsetY + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY + deep * 0.6} L ${offsetX + width * 0.7} ${
- offsetY + deep * 0.6
- } L ${offsetX + width * 0.7} ${offsetY + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY + deep * 0.8}
- M ${offsetX + width * 0.3} ${offsetY + deep + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY + deep + deep * 0.6} L ${offsetX + width * 0.7} ${
- offsetY + deep + deep * 0.6
- } L ${offsetX + width * 0.7} ${offsetY + deep + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY + deep + deep * 0.8}
- `;
+export const createBoxComponentNew4 = (width, deep,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + deep * 2} L ${offsetX + width} ${offsetY + deep * 2} L ${offsetX + width} ${offsetY + deep} L ${offsetX} ${offsetY + deep} L ${offsetX + width} ${offsetY + deep} L ${offsetX + width} ${offsetY}
+ M ${offsetX + width * 0.3} ${offsetY + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY + deep * 0.6} L ${offsetX + width * 0.7} ${offsetY + deep * 0.6} L ${offsetX + width * 0.7} ${offsetY + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY + deep * 0.8}
+ M ${offsetX + width * 0.3} ${offsetY+ deep + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY + deep + deep * 0.6} L ${offsetX + width * 0.7} ${offsetY+ deep + deep * 0.6} L ${offsetX + width * 0.7} ${offsetY+ deep + deep * 0.8} L ${offsetX + width * 0.3} ${offsetY+ deep + deep * 0.8}
+ `
return createSvg(d);
-};
+}
// 部件4的小组件
-export const createBoxComponentNew4_1 = (width, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + size} L ${offsetX + width} ${offsetY + size} L ${offsetX + width} ${offsetY}Z`;
+export const createBoxComponentNew4_1 = (width,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + size} L ${offsetX + width} ${offsetY + size} L ${offsetX + width} ${offsetY}Z`
return createSvg(d);
-};
-
-// 部件5
-export const createBoxComponentNew5 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + deep} L ${offsetX + width} ${offsetY + deep}
- L ${offsetX + width} ${offsetY} L ${offsetX + width} ${offsetY + deep} L ${offsetX + width * 0.9} ${offsetY + deep + size}
- L ${offsetX + width * 0.1} ${offsetY + deep + size} L ${offsetX} ${offsetY + deep}
- `;
- return createSvg(d);
-};
-// 手提盒部件
-export const createBoxComponentNew6 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + deep} L ${offsetX + width * 0.3} ${offsetY + deep}
- L ${offsetX + width * 0.3} ${offsetY + deep + size * 0.5} L ${offsetX + width * 0.7} ${offsetY + deep + size * 0.5}
- L ${offsetX + width * 0.7} ${offsetY + deep} L ${offsetX + width} ${offsetY + deep} L ${offsetX} ${offsetY + deep}
- L ${offsetX} ${offsetY + deep + size} L ${offsetX + width * 0.1} ${offsetY + deep + size}
- L ${offsetX + width * 0.1} ${offsetY + deep + size * 0.8} L ${offsetX + width * 0.2} ${offsetY + deep + size}
- L ${offsetX + width * 0.8} ${offsetY + deep + size} L ${offsetX + width * 0.9} ${offsetY + deep + size * 0.8}
- L ${offsetX + width * 0.9} ${offsetY + deep + size}L ${offsetX + width} ${offsetY + deep + size}L ${offsetX + width} ${offsetY}
- `;
- return createSvg(d);
-};
+}
// 贴边1
-export const createWelt = (height, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + size * 0.6} ${offsetY} L ${offsetX + size * 0.6} ${offsetY + height} L ${
- offsetX + size * 0.6
- } ${offsetY} L ${offsetX + size} ${offsetY + height * 0.1} L ${offsetX + size} ${offsetY + height * 0.9} L ${offsetX + size * 0.6} ${
- offsetY + height
- } L ${offsetX} ${offsetY + height}`;
+export const createWelt = (height,size,offsetX,offsetY) =>{
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + size * 0.6} ${offsetY} L ${offsetX + size * 0.6} ${offsetY + height} L ${offsetX + size * 0.6} ${offsetY} L ${offsetX + size} ${offsetY + height * 0.1} L ${offsetX + size} ${offsetY + height * 0.9} L ${offsetX + size * 0.6} ${offsetY + height} L ${offsetX} ${offsetY + height}`
return createSvg(d);
-};
+}
// 贴边1
-export const createWelt1 = (height, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY + height * 0.1} L ${offsetX + size} ${offsetY + height * 0.9} L ${offsetX} ${
- offsetY + height
- }`;
+export const createWelt1 = (height,size,offsetX,offsetY) =>{
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY + height * 0.1} L ${offsetX + size} ${offsetY + height * 0.9} L ${offsetX} ${offsetY + height}`
return createSvg(d);
-};
+}
// 贴边2
-export const createWelt2 = (height, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size *0.3} ${size * 0.3} 0 0 1 ${offsetX } ${offsetY } L ${offsetX} ${offsetY + height} L
- ${offsetX + size} ${offsetY + height} A ${size *0.3} ${size * 0.3} 0 0 0 ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY}
- `
- // A ${ size * 0.5 } ${size} 0 0 1 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 1 ${offsetX + size * 0.5} ${
- // offsetY + height + Math.abs(size)
- // } A ${size * 0.5} ${size} 0 0 1 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${
- // offsetY + height
- // } L ${offsetX} ${offsetY + height}`;
- return createSvg(d);
-};
-export const createWelt2Right = (height, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size * 0.3} ${size * 0.3} 0 0 0 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height}
- L ${offsetX + size} ${offsetY + height} A ${size *0.3} ${size * 0.3} 0 0 1 ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} `
- // A ${
- // size * 0.5
- // } ${size} 0 0 0 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 0 ${offsetX + size * 0.5} ${
- // offsetY + height + Math.abs(size)
- // } A ${size * 0.5} ${size} 0 0 0 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${
- // offsetY + height
- // } L ${offsetX} ${offsetY + height}`;
+export const createWelt2 = (height,size,offsetX,offsetY) =>{
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size * 0.5} ${size} 0 0 1 ${offsetX + size * 0.5} ${offsetY + size} A ${size * 0.5} ${size} 0 0 1 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 1 ${offsetX + size * 0.5} ${offsetY + height + Math.abs(size)} A ${size * 0.5} ${size} 0 0 1 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${offsetY + height} L ${offsetX} ${offsetY + height}`
return createSvg(d);
-};
-export const createWelt3 = (height, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${
- offsetY + size * 0.3
- } L ${offsetX} ${offsetY + size * 0.3} L ${offsetX} ${offsetY}`;
- return createSvg(d);
-};
-export const createWelt4 = (height, size, offsetX, offsetY, dSFHS, dXFHS) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY - dSFHS} L ${offsetX + size} ${offsetY - dSFHS} L ${offsetX + size} ${offsetY + height+dXFHS}
- L ${offsetX} ${offsetY + height+dXFHS} L ${offsetX} ${offsetY + height}`;
+}
+export const createWelt2Right = (height,size,offsetX,offsetY) =>{
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size * 0.5} ${size} 0 0 0 ${offsetX + size * 0.5} ${offsetY - size} A ${size * 0.5} ${size} 0 0 0 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 0 ${offsetX + size * 0.5} ${offsetY + height + Math.abs(size)} A ${size * 0.5} ${size} 0 0 0 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${offsetY + height} L ${offsetX} ${offsetY + height}`
return createSvg(d);
-};
-export const createWelt3Right = (height, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${
- offsetY - size * 0.3
- } L ${offsetX} ${offsetY - size * 0.3} L ${offsetX} ${offsetY}`;
+}
+export const createWelt3 = (height,size,offsetX,offsetY) =>{
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY + size * 0.3} L ${offsetX} ${offsetY + size * 0.3} L ${offsetX} ${offsetY}`
return createSvg(d);
-};
-export const createWelt4Right = (height, size, offsetX, offsetY, dSFHS, dXFHS) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY - dSFHS} L ${offsetX + size} ${offsetY - dSFHS}
- L ${offsetX + size} ${offsetY + height + dXFHS} L ${offsetX } ${offsetY + height + dXFHS} L ${offsetX} ${offsetY + height}`;
+}
+export const createWelt3Right = (height,size,offsetX,offsetY) =>{
+ const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY - size * 0.3} L ${offsetX} ${offsetY - size * 0.3} L ${offsetX} ${offsetY}`
return createSvg(d);
-};
+}
// 天地盒
-export const createFullTelescope = (width, height, deep, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + width} ${offsetY} L ${offsetX + width} ${offsetY + height} L ${offsetX} ${
- offsetY + height
- } L ${offsetX} ${offsetY}
+export const createFullTelescope = (width,height,deep,offsetX,offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + width} ${offsetY} L ${offsetX + width} ${offsetY + height} L ${offsetX} ${offsetY + height} L ${offsetX} ${offsetY}
L ${offsetX - deep} ${offsetY} L ${offsetX - deep} ${offsetY + height} L ${offsetX} ${offsetY + height}
L ${offsetX} ${offsetY + height + deep} L ${offsetX + width} ${offsetY + height + deep} L ${offsetX + width} ${offsetY + height}
L ${offsetX + width + deep} ${offsetY + height} L ${offsetX + width + deep} ${offsetY} L ${offsetX + width} ${offsetY}
L ${offsetX + width} ${offsetY - deep} L ${offsetX} ${offsetY - deep} L ${offsetX} ${offsetY}
- `;
+ `
const svg = document.createElementNS("http://www.w3.org/2000/svg", "path");
svg.setAttribute("d", d);
svg.setAttribute("fill", "transparent");
@@ -978,67 +842,41 @@ export const createFullTelescope = (width, height, deep, offsetX, offsetY) => {
svg.setAttribute("stroke-width", "1");
svg.setAttribute("stroke-dasharray", "4"); // 添加虚线效果
return svg;
-};
+}
// 天地部件1
-export const createBoxComponentNewFull = (width, deep, size, offsetX, offsetY) => {
+export const createBoxComponentNewFull = (width, deep,size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY} L ${offsetX + deep} ${offsetY} L ${offsetX + deep} ${offsetY + width} L ${offsetX + deep} ${offsetY}
- L ${offsetX + deep + size} ${offsetY} L ${offsetX + deep + size} ${offsetY + width} L ${offsetX} ${offsetY + width}`;
+ L ${offsetX + deep + size} ${offsetY} L ${offsetX+ deep + size} ${offsetY + width} L ${offsetX} ${offsetY + width}`
return createSvg(d);
-};
+}
// 天地部件2
-export const createBoxComponentNewFull1 = (width, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${offsetY + width} L ${offsetX} ${offsetY + width}`;
+export const createBoxComponentNewFull1 = (width,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${offsetY + width} L ${offsetX } ${offsetY + width}`
return createSvg(d);
-};
+}
// 天地部件3
-export const createBoxComponentNewFull2 = (width, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX} ${offsetY + width * 0.4} L ${offsetX + size} ${offsetY + width * 0.4}
+export const createBoxComponentNewFull2 = (width,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX } ${offsetY + width * 0.4} L ${offsetX + size} ${offsetY + width * 0.4}
L ${offsetX + size} ${offsetY + width * 0.6} L ${offsetX} ${offsetY + width * 0.6} L ${offsetX} ${offsetY + width}
- `;
+ `
return createSvg(d);
-};
+}
// 天地部件4
-export const createBoxComponentNewFul3 = (width, deep, size, offsetX, offsetY) => {
+export const createBoxComponentNewFul3 = (width, deep,size, offsetX, offsetY) => {
const d = `M ${offsetX} ${offsetY} L ${offsetX + deep} ${offsetY} L ${offsetX + deep} ${offsetY + width} L ${offsetX} ${offsetY + width}
- L ${offsetX + deep * 2} ${offsetY + width} L ${offsetX + deep * 2} ${offsetY + width * 0.8} L ${offsetX + deep * 2 + size} ${offsetY + width * 0.8}
- L ${offsetX + deep * 2 + size} ${offsetY + width * 0.6} L ${offsetX + deep * 2} ${offsetY + width * 0.6}
- L ${offsetX + deep * 2} ${offsetY + width * 0.4} L ${offsetX + deep * 2 + size} ${offsetY + width * 0.4}
- L ${offsetX + deep * 2 + size} ${offsetY + width * 0.2} L ${offsetX + deep * 2} ${offsetY + width * 0.2}
- L ${offsetX + deep * 2} ${offsetY} L ${offsetX} ${offsetY}
- `;
+ L ${offsetX + deep * 2} ${offsetY + width} L ${offsetX + deep * 2} ${offsetY + width * 0.8} L ${offsetX + deep * 2+size} ${offsetY + width * 0.8}
+ L ${offsetX + deep * 2 + size} ${offsetY + width*0.6} L ${offsetX + deep * 2} ${offsetY + width*0.6}
+ L ${offsetX + deep * 2} ${offsetY + width*0.4} L ${offsetX + deep * 2 + size} ${offsetY + width*0.4}
+ L ${offsetX + deep * 2 + size} ${offsetY + width*0.2} L ${offsetX + deep * 2} ${offsetY + width*0.2}
+ L ${offsetX + deep * 2 } ${offsetY} L ${offsetX} ${offsetY}
+ `
return createSvg(d);
-};
+}
// 天地部件4
-export const createBoxComponentNewFul4 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + deep * 2} ${offsetY} L ${offsetX + deep * 2} ${offsetY + width} L ${offsetX + deep} ${
- offsetY + width
- } L ${offsetX + deep} ${offsetY} L ${offsetX + deep} ${offsetY + width} L ${offsetX} ${offsetY + width}
- M ${offsetX + deep * 0.8} ${offsetY + width * 0.3} L ${offsetX + deep * 0.6} ${offsetY + width * 0.3} L ${offsetX + deep * 0.6} ${
- offsetY + width * 0.7
- } L ${offsetX + deep * 0.8} ${offsetY + width * 0.7} L ${offsetX + deep * 0.8} ${offsetY + width * 0.3}
- M ${offsetX + deep + deep * 0.8} ${offsetY + width * 0.3} L ${offsetX + deep + deep * 0.6} ${offsetY + width * 0.3} L ${
- offsetX + deep + deep * 0.6
- } ${offsetY + width * 0.7} L ${offsetX + deep + deep * 0.8} ${offsetY + width * 0.7} L ${offsetX + deep + deep * 0.8} ${offsetY + width * 0.3}
- `;
+export const createBoxComponentNewFul4 = (width, deep,size, offsetX, offsetY) => {
+ const d = `M ${offsetX} ${offsetY} L ${offsetX + deep * 2} ${offsetY} L ${offsetX + deep * 2} ${offsetY + width} L ${offsetX + deep} ${offsetY + width} L ${offsetX + deep} ${offsetY} L ${offsetX + deep} ${offsetY + width} L ${offsetX } ${offsetY+ width}
+ M ${offsetX + deep * 0.8} ${offsetY + width * 0.3} L ${offsetX + deep * 0.6} ${offsetY + width * 0.3} L ${offsetX+ deep * 0.6} ${offsetY + width * 0.7} L ${offsetX+ deep * 0.8} ${offsetY + width * 0.7} L ${offsetX+ deep * 0.8} ${offsetY + width * 0.3}
+ M ${offsetX + deep + deep * 0.8} ${offsetY+ width * 0.3} L ${offsetX + deep + deep * 0.6} ${offsetY+ width * 0.3} L ${offsetX+ deep + deep * 0.6} ${offsetY + width * 0.7} L ${offsetX+ deep + deep * 0.8} ${offsetY + width * 0.7} L ${offsetX+ deep + deep * 0.8 } ${offsetY + width * 0.3}
+ `
return createSvg(d);
-};
-// 部件5
-export const createBoxComponentNewFul5 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + deep} ${offsetY} L ${offsetX + deep} ${offsetY + width}
- L ${offsetX + deep} ${offsetY} L ${offsetX + deep + size} ${offsetY + width * 0.1} L${offsetX + deep + size} ${offsetY + width * 0.9}
- L ${offsetX + deep} ${offsetY + width} L ${offsetX} ${offsetY + width}
- `;
- return createSvg(d);
-};
-// 手提盒部件
-export const createBoxComponentNewFul6 = (width, deep, size, offsetX, offsetY) => {
- const d = `M ${offsetX} ${offsetY} L ${offsetX + deep} ${offsetY} L ${offsetX + deep} ${offsetY + width * 0.3}
- L ${offsetX + deep + size * 0.5} ${offsetY + width * 0.3} L ${offsetX + deep + size * 0.5} ${offsetY + width * 0.7}
- L ${offsetX + deep} ${offsetY + width * 0.7} L ${offsetX + deep} ${offsetY + width} L ${offsetX + deep} ${offsetY}
- L ${offsetX + deep + size} ${offsetY} L ${offsetX + deep + size} ${offsetY + width * 0.1}
- L ${offsetX + deep + size * 0.8} ${offsetY + width * 0.1} L ${offsetX + deep + size} ${offsetY + width * 0.2}
- L ${offsetX + deep + size} ${offsetY + width * 0.8} L ${offsetX + deep + size * 0.8} ${offsetY + width * 0.9}
- L ${offsetX + deep + size} ${offsetY + width * 0.9}L ${offsetX + deep + size} ${offsetY + width}L ${offsetX} ${offsetY + width}
- `;
- return createSvg(d);
-};
+}
\ No newline at end of file
diff --git a/src/components/Common/BoxDesignCompontent/compontents/doubleLayer.js b/src/components/Common/BoxDesignCompontent/compontents/doubleLayer.js
deleted file mode 100644
index db1da9a..0000000
--- a/src/components/Common/BoxDesignCompontent/compontents/doubleLayer.js
+++ /dev/null
@@ -1,415 +0,0 @@
-/* eslint-disable */
-import React, { useRef, useState, useEffect } from "react";
-import styles from "../index.less";
-import SvgBox from "../svg";
-import { Select, Button, message, Input, Spin } from "antd-v4";
-import { CompressOutlined, ExpandOutlined } from "@ant-design/icons";
-import * as commonUtils from "@/utils/utils";
-import * as commonFunc from "@/components/Common/commonFunc";
-import * as commonBusiness from "@/components/Common/commonBusiness";
-import * as commonServices from "@/services/services";
-import CommonBase from "@/components/Common/CommonBase";
-import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
-import CommonViewTable from "@/components/Common/CommonViewTable";
-import StaticEditTable from "@/components/Common/CommonTable";
-import jsPreviewPdf from "@js-preview/pdf";
-import commonConfig from "@/utils/config";
-const DoubleLayerBox = props => {
- const { onCancel, onOk, title, loading, masterConfig, bFullScreen, tableData, options = [] } = props;
- const { slaveData = {}, masterData = {} } = props.state;
- const [boxList, setBoxList] = useState([]);
- const [tableColum, setTableColum] = useState([]); // 盒身类型
- const [tableDataList, setTableDataList] = useState([]); // 盒长
- const [boxBodyList, setBoxBodyList] = useState([]); // 盒身信息
- const [isDefaultValue, setIsDefaultValue] = useState(true); // 是否默认值
- const [topBoxList, setTopBoxList] = useState([]); // 盒身信息
- const [leftBoxList, setLeftBoxList] = useState([]); // 左边
- const [rightBoxList, setRightBoxList] = useState([]);
- // useEffect(() => {
- // if (tableData && tableData.length) {
- // const newTableColum = tableData.map(item => {
- // return {
- // ...item,
- // isEditable: true,
- // isSelect: false,
- // selectImage: null,
- // value: "",
- // };
- // });
- // const newList = newTableColum.filter(
- // item => item.showName.includes("盒长") || item.showName.includes("盒高") || item.showName.includes("盒宽")
- // );
- // const newLists = newTableColum.filter(
- // item =>
- // !(item.showName.includes("盒长") || item.showName.includes("盒高") || item.showName.includes("盒宽") || item.showName.includes("盒身"))
- // );
- // const bodyList = newTableColum.filter(item => item.showName.includes("盒身"));
- // newLists.forEach(x => {
- // if (x.showName === "盒型类别") {
- // x.showName = "盒型名称";
- // }
- // });
- // setTableColum(newLists);
- // setBoxBodyList(bodyList);
- // newList.forEach(item => {
- // let name = "";
- // if (item.showName === "盒长") {
- // name = item.showName + "(L)";
- // } else if (item.showName === "盒宽") {
- // name = item.showName + "(W)";
- // } else if (item.showName === "盒高") {
- // name = item.showName + "(D)";
- // }
- // item.sName = name;
- // });
- // setTableDataList(newList);
- // }
- // }, [tableData]);
- const titleList = [
- "左(上)插位组件",
- "上插位组件",
- "右(上)插位组件",
- "左偏移",
- "左插位组件",
- "左(下)插位组件",
- "右偏移",
- "右插位组件",
- "右(下)插位组件",
- "盒型名称",
- "盒身",
- "个数",
- "首盒长(L)",
- "首盒宽(W)",
- "次盒长(L)",
- "次盒宽(W)",
- ];
- const titleList1 = [
- { 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" },
- ];
- // tableColum.forEach(item => {
- // titleList.push(item.showName);
- // });
- // boxBodyList.forEach(item => {
- // titleList.push(item.showName);
- // });
- // tableDataList.forEach(item => {
- // titleList.push(item.showName);
- // });
- const newBoxList = [];
- // 盒身信息
- titleList.forEach((item, index) => {
- newBoxList.push({
- value: "",
- sName: item,
- isEditable: true,
- isSelect: false,
- selectValue: null,
- selectLabel: "",
- selectImage: null,
- type: null,
- show: true,
- showName: item, // 参数名称
- sAssignFormula: null,
- });
- });
- if (slaveData && slaveData.length) {
- slaveData.forEach((item, index) => {
- const i = titleList1.findIndex(i => {
- return i.value === item.sCode;
- });
- if (i !== -1) {
- const x = newBoxList.findIndex(z => z.sName === titleList1[i].name);
- newBoxList[x].value = item.iValue;
- newBoxList[x].type = item.sTypes;
- newBoxList[x].showName = item.sName;
- newBoxList[x].selectImage = item.sMakeUpPath;
- newBoxList[x].sName = titleList1[i].name;
- newBoxList[x].sAssignFormula = item.sAssignFormula;
- newBoxList[x].bVisible = item.bVisible;
- }
- });
- }
- // 盒身信息
- if (masterData) {
- newBoxList.forEach((item, index) => {
- if (item.sName === "盒身") {
- newBoxList[index].value = masterData.sBoxBody;
- newBoxList[index].selectImage = masterData.sMakeUpPath;
- newBoxList[index].type = masterData.sTypes;
- } else if (item.sName === "盒长") {
- newBoxList[index].value = masterData.dBoxLength;
- } else if (item.sName === "盒宽") {
- newBoxList[index].value = masterData.dBoxWidth;
- } else if (item.sName === "盒高") {
- newBoxList[index].value = masterData.dBoxHeight;
- } else if (item.sName === "盒型名称") {
- newBoxList[index].value = masterData.sName;
- }
- });
- }
- const arraysAreEqual = (arr1, arr2) => {
- if (arr1.length !== arr2.length) return false;
- return arr1.every((item, index) => item.sName === arr2[index].sName);
- };
- // 有数据的时候 盒型设计需要赋值
- useEffect(() => {
- if (newBoxList.length > 0 && !arraysAreEqual(boxList, newBoxList)) {
- setBoxList(newBoxList);
- }
- }, [newBoxList]);
- 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 renderOptionWithImage = option => {
- return (
-
-
- );
- };
- const svgBoxProps = {
- ...props,
- boxList,
- showNew: 0,
- };
-
- useEffect(() => {
- if (!boxList.length) return;
- const slicedArray = boxList.slice(9, 12);
- // 处理盒型部分
- setBoxBodyList(slicedArray);
- }, [boxList]);
- console.log(tableDataList, "boxList");
-
- return (
-
@@ -480,11 +352,6 @@ const BoxDesignCompontent = baseProps => {
const svgBoxProps = {
...props,
boxList,
- showNew: 0,
- };
- const dobuleProps = {
- ...props,
- renderOptionWithImage,
};
// 计算展长展宽
// 创建盒型
@@ -493,26 +360,24 @@ const BoxDesignCompontent = baseProps => {
// 判断是新增还是修改
// 存储子表数据
- const boxTypes = boxList.find(item => item.sName === "盒身")?.type;
- const findList = boxTypes === "8" ? doubleTitlieList1 : titleList1;
boxList.forEach((item, index) => {
- const i = findList.findIndex(i => i.name === item.sName);
- const slave = slaveData.find(z => z.sCode === findList[i]?.value);
+ const i = titleList1.findIndex(i => i.name === item.sName);
+ const slave = slaveData.find(z => z.sCode === titleList1[i]?.value);
if (i !== -1) {
const data = {
...slaveData[0],
handleType: slave ? "update" : "add",
sName: item.showName,
- sCode: findList[i].value,
+ sCode: titleList1[i].value,
iValue: item.value,
iOrder: index + 1,
iRowNum: index + 1,
sId: slave ? slave.sId : commonUtils.createSid(),
sMakeUpPath: item.selectImage,
sTypes: item.type,
- bVisible: item.value ? true : false,
+ bVisible: (item.value ? true : false),
sParentId: masterData.sId,
- sAssignFormula: item.sAssignFormula,
+ sAssignFormula:item.sAssignFormula
};
// if (item.value !== "") {
newSlaveData.push(data);
@@ -527,337 +392,6 @@ const BoxDesignCompontent = baseProps => {
}
});
submitSlaveData.concat(newSlaveData);
-
- // 处理计算公式
- // 计算展长公式 sLengthFormula
- let sLengthFormula = "";
- let sWidthFormula = "";
- const boxType = boxList.find(item => item.sName === "盒身")?.type;
- if (boxType === "8") {
-
- } else {
- const boxLength = Number(boxList.find(item => item.sName === "盒长")?.value);
- const boxWidth = Number(boxList.find(item => item.sName === "盒宽")?.value);
- const boxHeight = Number(boxList.find(item => item.sName === "盒高")?.value);
- const zxcw = boxList.find(x => x.sName === "左(下)插位组件");
- const zscw = boxList.find(x => x.sName === "左(上)插位组件");
- const yscw = boxList.find(x => x.sName === "右(上)插位组件");
- const yxcw = boxList.find(x => x.sName === "右(下)插位组件");
- const hdzj = boxList.find(x => x.sName === "盒底组件");
- const zxcwType = zxcw?.type;
- const zxcwValue = zxcw?.value;
- const zscwType = zscw?.type;
- const zscwValue = zscw?.value;
- const yscwType = yscw?.type;
- const yscwValue = yscw?.value;
- const yxcwType = yxcw?.type;
- const yxcwValue = yxcw?.value;
- let leftTopValue = 0;
- let leftTop = "";
- let rightTopValue = 0;
- let rightTop = "";
- let leftBottomValue = 0;
- let leftBottom = "";
- let rightBottomValue = 0;
- let rightBottom = "";
- if (boxType && boxType === "1") {
- // 四面盒
- const ztbw = boxList.find(x => x.sName === "左贴边位")?.type && boxList.find(x => x.sName === "左贴边位")?.value;
- const ytbw = boxList.find(x => x.sName === "右贴边位")?.type && boxList.find(x => x.sName === "右贴边位")?.value;
- sLengthFormula = (ztbw ? "dZTBW+ " : "") + "L * 2 + W * 2" + (ytbw ? " +dYTBW" : "");
-
- if (zxcwType === "4001" || zxcwType === "4006" || zxcwType === "4007") {
- leftBottomValue = Number(zxcwValue) + boxHeight;
- leftBottom = " + dZXCW + W";
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftBottomValue = Number(zxcwValue);
- leftBottom = " + dZXCW";
- } else if (zxcwType === "4004") {
- leftBottomValue = Number(zxcwValue) + boxHeight * 2;
- leftBottom = " + dZXCW + W * 2";
- } else if (zxcwType === "4005") {
- leftBottomValue = boxHeight * 2;
- leftBottom = "+ W * 2";
- }
- if (yscwType === "6001" || yscwType === "6006" || yscwType === "6007") {
- rightTopValue = Number(yscwValue) + boxHeight;
- rightTop = "dYSCW + W + ";
- } else if (yscwType === "6002" || yscwType === "6003") {
- rightTopValue = Number(yscwValue);
- rightTop = "dYSCW + ";
- } else if (yscwType === "6004") {
- rightTopValue = Number(yscwValue) + boxHeight * 2;
- rightTop = "dYSCW + W * 2+ ";
- } else if (yscwType === "6005") {
- rightTopValue = boxHeight * 2;
- rightTop = "W * 2+ ";
- }
- if (zscwType === "3001" || zscwType === "3006" || zscwType === "3007") {
- leftTopValue = Number(zscwValue) + boxHeight;
- leftTop = "dZSCW + W +";
- } else if (zscwType === "3002" || zscwType === "3003") {
- leftTopValue = Number(zscwValue);
- leftTop = "dZSCW +";
- } else if (zscwType === "3004") {
- leftTopValue = Number(zscwValue) + boxHeight * 2;
- leftTop = "dZSCW + W * 2 +";
- } else if (zscwType === "3005") {
- leftTopValue = boxHeight * 2;
- leftTop = "W * 2 +";
- }
- if (yxcwType === "7001" || yxcwType === "7006" || yxcwType === "7007") {
- rightBottomValue = Number(yxcwValue) + boxHeight;
- rightBottom = "+ dYXCW + W";
- } else if (yxcwType === "7002" || yxcwType === "7003") {
- rightBottomValue = Number(yxcwValue);
- rightBottom = "+ dYXCW ";
- } else if (yxcwType === "7004") {
- rightBottomValue = Number(yxcwValue) + boxHeight * 2;
- rightBottom = "+ dYXCW + W * 2";
- } else if (yxcwType === "7005") {
- rightBottomValue = boxHeight * 2;
- rightBottom = "+ W * 2";
- }
- sWidthFormula =
- (leftTopValue > rightTopValue ? leftTop : rightTop) +
- "D" +
- (hdzj ? " + dHDC" : leftBottomValue > rightBottomValue ? leftBottom : rightBottom);
- } else if (boxType && boxType === "2") {
- // 单折
- const ztbw = boxList.find(x => x.sName === "左贴边位")?.type && boxList.find(x => x.sName === "左贴边位")?.value;
- const ytbw = boxList.find(x => x.sName === "右贴边位")?.type && boxList.find(x => x.sName === "右贴边位")?.value;
- sLengthFormula = (ztbw ? "dZTBW+ " : "") + "L * 2 + W" + (ytbw ? " +dYTBW" : "");
- if (zxcwType === "4001" || zxcwType === "4006" || zxcwType === "4007") {
- leftBottomValue = Number(zxcwValue) + boxHeight;
- leftBottom = " + dZXCW + W";
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftBottomValue = Number(zxcwValue);
- leftBottom = " + dZXCW";
- } else if (zxcwType === "4004") {
- leftBottomValue = Number(zxcwValue) + boxHeight * 2;
- leftBottom = " + dZXCW + W * 2";
- } else if (zxcwType === "4005") {
- leftBottomValue = boxHeight * 2;
- leftBottom = "+ W * 2";
- }
- if (yscwType === "6001" || yscwType === "6006" || yscwType === "6007") {
- rightTopValue = Number(yscwValue) + boxHeight;
- rightTop = "dYSCW + W + ";
- } else if (yscwType === "6002" || yscwType === "6003") {
- rightTopValue = Number(yscwValue);
- rightTop = "dYSCW + ";
- } else if (yscwType === "6004") {
- rightTopValue = Number(yscwValue) + boxHeight * 2;
- rightTop = "dYSCW + W * 2+ ";
- } else if (yscwType === "6005") {
- rightTopValue = boxHeight * 2;
- rightTop = "W * 2+ ";
- }
- if (zscwType === "3001" || zscwType === "3006" || zscwType === "3007") {
- leftTopValue = Number(zscwValue) + boxHeight;
- leftTop = "dZSCW + W +";
- } else if (zscwType === "3002" || zscwType === "3003") {
- leftTopValue = Number(zscwValue);
- leftTop = "dZSCW +";
- } else if (zscwType === "3004") {
- leftTopValue = Number(zscwValue) + boxHeight * 2;
- leftTop = "dZSCW + W * 2 +";
- } else if (zscwType === "3005") {
- leftTopValue = boxHeight * 2;
- leftTop = "W * 2 +";
- }
- if (yxcwType === "7001" || yxcwType === "7006" || yxcwType === "7007") {
- rightBottomValue = Number(yxcwValue) + boxHeight;
- rightBottom = "+ dYXCW + W";
- } else if (yxcwType === "7002" || yxcwType === "7003") {
- rightBottomValue = Number(yxcwValue);
- rightBottom = "+ dYXCW ";
- } else if (yxcwType === "7004") {
- rightBottomValue = Number(yxcwValue) + boxHeight * 2;
- rightBottom = "+ dYXCW + W * 2";
- } else if (yxcwType === "7005") {
- rightBottomValue = boxHeight * 2;
- rightBottom = "+ W * 2";
- }
- sWidthFormula = (leftTopValue > rightTopValue ? leftTop : rightTop) + "D" + (leftBottomValue > rightBottomValue ? leftBottom : rightBottom);
- } else if (boxType && boxType === "3") {
- const ztbw = boxList.find(x => x.sName === "左贴边位")?.type && boxList.find(x => x.sName === "左贴边位")?.value;
- const ytbw = boxList.find(x => x.sName === "右贴边位")?.type && boxList.find(x => x.sName === "右贴边位")?.value;
- sLengthFormula = (ztbw ? "dZTBW+ " : "") + "L + W * 2" + (ytbw ? " +dYTBW" : "");
- if (zxcwType === "4001" || zxcwType === "4006" || zxcwType === "4007") {
- leftBottomValue = Number(zxcwValue) + boxHeight;
- leftBottom = " + dZXCW + W";
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftBottomValue = Number(zxcwValue);
- leftBottom = " + dZXCW";
- } else if (zxcwType === "4004") {
- leftBottomValue = Number(zxcwValue) + boxHeight * 2;
- leftBottom = " + dZXCW + W * 2";
- } else if (zxcwType === "4005") {
- leftBottomValue = boxHeight * 2;
- leftBottom = "+ W * 2";
- }
- if (yscwType === "6001" || yscwType === "6006" || yscwType === "6007") {
- rightTopValue = Number(yscwValue) + boxHeight;
- rightTop = "dYSCW + W + ";
- } else if (yscwType === "6002" || yscwType === "6003") {
- rightTopValue = Number(yscwValue);
- rightTop = "dYSCW + ";
- } else if (yscwType === "6004") {
- rightTopValue = Number(yscwValue) + boxHeight * 2;
- rightTop = "dYSCW + W * 2+ ";
- } else if (yscwType === "6005") {
- rightTopValue = boxHeight * 2;
- rightTop = "W * 2+ ";
- }
- if (zscwType === "3001" || zscwType === "3006" || zscwType === "3007") {
- leftTopValue = Number(zscwValue) + boxHeight;
- leftTop = "dZSCW + W +";
- } else if (zscwType === "3002" || zscwType === "3003") {
- leftTopValue = Number(zscwValue);
- leftTop = "dZSCW +";
- } else if (zscwType === "3004") {
- leftTopValue = Number(zscwValue) + boxHeight * 2;
- leftTop = "dZSCW + W * 2 +";
- } else if (zscwType === "3005") {
- leftTopValue = boxHeight * 2;
- leftTop = "W * 2 +";
- }
- if (yxcwType === "7001" || yxcwType === "7006" || yxcwType === "7007") {
- rightBottomValue = Number(yxcwValue) + boxHeight;
- rightBottom = "+ dYXCW + W";
- } else if (yxcwType === "7002" || yxcwType === "7003") {
- rightBottomValue = Number(yxcwValue);
- rightBottom = "+ dYXCW ";
- } else if (yxcwType === "7004") {
- rightBottomValue = Number(yxcwValue) + boxHeight * 2;
- rightBottom = "+ dYXCW + W * 2";
- } else if (yxcwType === "7005") {
- rightBottomValue = boxHeight * 2;
- rightBottom = "+ W * 2";
- }
- sWidthFormula = (leftTopValue > rightTopValue ? leftTop : rightTop) + "D" + (leftBottomValue > rightBottomValue ? leftBottom : rightBottom);
- } else if (boxType && boxType === "4") {
- // 天地盒
- const zxcw = boxList.find(x => x.sName === "左(下)插位组件");
- const zscw = boxList.find(x => x.sName === "左(上)插位组件");
- const yscw = boxList.find(x => x.sName === "右(上)插位组件");
- const yxcw = boxList.find(x => x.sName === "右(下)插位组件");
- const zxcwType = zxcw?.type;
- const zxcwValue = zxcw?.value;
- const zscwType = zscw?.type;
- const zscwValue = zscw?.value;
- const yscwType = yscw?.type;
- const yscwValue = yscw?.value;
- const yxcwType = yxcw?.type;
- const yxcwValue = yxcw?.value;
- let leftValue = "";
- let rightValue = "";
- let topValue = "";
- let bottomValue = "";
- if (zxcwType === "4001" || zxcwType === "4006" || zxcwType === "4007") {
- // leftValue = leftValue + Number(zxcwValue) + boxHeight * 2;
- leftValue = "dZXCW + D * 2 +";
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftValue = "dZXCW + D +";
- } else if (zxcwType === "4004") {
- leftValue = "dZXCW + D * 3 +";
- } else if (zxcwType === "4005") {
- leftValue = "D * 3 +";
- }
- if (yscwType === "6001" || yscwType === "6006" || yscwType === "6007") {
- rightValue = "+ dYSCW + D * 2";
- } else if (yscwType === "6002" || yscwType === "6003") {
- rightValue = "+ dYSCW + D";
- } else if (yscwType === "6004") {
- rightValue = "+ dYSCW + D * 3";
- } else if (yscwType === "6005") {
- rightValue = " + D * 3";
- }
- if (zscwType === "3001" || zscwType === "3006" || zscwType === "3007") {
- topValue = "dZSCW + D * 2 +";
- } else if (zscwType === "3002" || zscwType === "3003") {
- topValue = "dZSCW + D +";
- } else if (zscwType === "3004") {
- topValue = "dZSCW + D * 3 +";
- } else if (zscwType === "3005") {
- topValue = "D * 3+";
- }
- if (yxcwType === "7001" || yxcwType === "7006" || yxcwType === "7007") {
- bottomValue = "+ dYXCW + D * 2";
- } else if (yxcwType === "7002" || yxcwType === "7003") {
- bottomValue = "+ dYXCW + D ";
- } else if (yxcwType === "7004") {
- bottomValue = "+ dYXCW + D * 3";
- } else if (yxcwType === "7005") {
- bottomValue = "+ D * 3";
- }
- // viewBoxWidth = Number(boxLength) + leftValue + rightValue;
- // viewBoxHeight = Number(boxWidth) + topValue + bottomValue;
- sLengthFormula = leftValue + "L" + rightValue;
- sWidthFormula = topValue + "W" + bottomValue;
- } else if (boxType && boxType === "5") {
- // 飞机盒
- const ztbw = boxList.find(x => x.sName === "左贴边位")?.type && boxList.find(x => x.sName === "左贴边位")?.value;
- const ytbw = boxList.find(x => x.sName === "右贴边位")?.type && boxList.find(x => x.sName === "右贴边位")?.value;
- sLengthFormula = (ztbw ? "dZTBW+ " : "") + "D * 2 + W * 2" + (ytbw ? " +dYTBW" : "");
- if (zxcwType === "4001" || zxcwType === "4006" || zxcwType === "4007") {
- leftBottomValue = Number(zxcwValue) + boxHeight;
- leftBottom = " + dZXCW + D";
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftBottomValue = Number(zxcwValue);
- leftBottom = " + dZXCW";
- } else if (zxcwType === "4004") {
- leftBottomValue = Number(zxcwValue) + boxHeight * 2;
- leftBottom = " + dZXCW + D * 2";
- } else if (zxcwType === "4005") {
- leftBottomValue = boxHeight * 2;
- leftBottom = "+ D * 2";
- }
- if (yscwType === "6001" || yscwType === "6006" || yscwType === "6007") {
- rightTopValue = Number(yscwValue) + boxHeight;
- rightTop = "dYSCW + D + ";
- } else if (yscwType === "6002" || yscwType === "6003") {
- rightTopValue = Number(yscwValue);
- rightTop = "dYSCW + ";
- } else if (yscwType === "6004") {
- rightTopValue = Number(yscwValue) + boxHeight * 2;
- rightTop = "dYSCW + D * 2+ ";
- } else if (yscwType === "6005") {
- rightTopValue = boxHeight * 2;
- rightTop = "D * 2+ ";
- }
- if (zscwType === "3001" || zscwType === "3006" || zscwType === "3007") {
- leftTopValue = Number(zscwValue) + boxHeight;
- leftTop = "dZSCW + D +";
- } else if (zscwType === "3002" || zscwType === "3003") {
- leftTopValue = Number(zscwValue);
- leftTop = "dZSCW +";
- } else if (zscwType === "3004") {
- leftTopValue = Number(zscwValue) + boxHeight * 2;
- leftTop = "dZSCW + D * 2 +";
- } else if (zscwType === "3005") {
- leftTopValue = boxHeight * 2;
- leftTop = "D * 2 +";
- }
- if (yxcwType === "7001" || yxcwType === "7006" || yxcwType === "7007") {
- rightBottomValue = Number(yxcwValue) + boxHeight;
- rightBottom = "+ dYXCW + D";
- } else if (yxcwType === "7002" || yxcwType === "7003") {
- rightBottomValue = Number(yxcwValue);
- rightBottom = "+ dYXCW ";
- } else if (yxcwType === "7004") {
- rightBottomValue = Number(yxcwValue) + boxHeight * 2;
- rightBottom = "+ dYXCW + D * 2";
- } else if (yxcwType === "7005") {
- rightBottomValue = boxHeight * 2;
- rightBottom = "+ D * 2";
- }
- sWidthFormula = (leftTopValue > rightTopValue ? leftTop : rightTop) + "L" + (leftBottomValue > rightBottomValue ? leftBottom : rightBottom);
- }
- }
-
- // const sDoubleSize = JSON.stringify([headLength,headWidth,orderLength,orderWidth])
// 存储盒身数据 主表
const newMasterData = {
...masterData,
@@ -868,17 +402,13 @@ const BoxDesignCompontent = baseProps => {
sName: boxList.find(item => item.sName === "盒型名称")?.value || "",
sMakeUpPath: boxList.find(item => item.sName === "盒身")?.selectImage || "",
sTypes: boxList.find(item => item.sName === "盒身")?.type || "",
- sLengthFormula: masterData.sLengthFormula || sLengthFormula,
- sWidthFormula: masterData.sWidthFormula || sWidthFormula,
};
-
onOk({ slaveData: newSlaveData, masterData: newMasterData }); // 提交数据
};
const findIndexBySname = name => {
const i = boxList.findIndex(x => x.sName === name);
return i || 0;
};
-
return (
{
}}
>
{/* 盒身信息 */}
-
- {option.sMakeUpPath ? })
: ""}
- {option.sName}
-
-
-
- );
-};
-export default DoubleLayerBox;
diff --git a/src/components/Common/BoxDesignCompontent/index.js b/src/components/Common/BoxDesignCompontent/index.js
index 7def463..2dad824 100644
--- a/src/components/Common/BoxDesignCompontent/index.js
+++ b/src/components/Common/BoxDesignCompontent/index.js
@@ -1,6 +1,6 @@
/* eslint-disable */
import React, { useRef, useState, useEffect } from "react";
-import { Select, Button, message, Input, Spin } from "antd-v4";
+import { Select, Button, message, Input, Spin } from "antd";
import { CompressOutlined, ExpandOutlined } from "@ant-design/icons";
import * as commonUtils from "@/utils/utils";
import * as commonFunc from "@/components/Common/commonFunc";
@@ -11,7 +11,7 @@ import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
import CommonViewTable from "@/components/Common/CommonViewTable";
import StaticEditTable from "@/components/Common/CommonTable";
import jsPreviewPdf from "@js-preview/pdf";
-import commonConfig from "@/utils/config";
+import * as commonConfig from "@/utils/config";
import SvgBox from "./svg";
import styles from "./index.less";
const BoxDesignEvent = props => {
@@ -53,13 +53,16 @@ const BoxDesignEvent = props => {
setLoading(false);
};
- useEffect(() => {
- if (!formData.length) return;
+ useEffect(
+ () => {
+ if (!formData.length) return;
- const data = formData[0].gdsconfigformslave.filter(Item => Item.bVisible);
- setTableData(data);
- props.onSaveState(pre => ({ ...pre, data }));
- }, [formData.length]);
+ const data = formData[0].gdsconfigformslave.filter(Item => Item.bVisible);
+ setTableData(data);
+ props.onSaveState(pre => ({ ...pre, data }));
+ },
+ [formData.length]
+ );
return {
...props,
@@ -77,83 +80,58 @@ const BoxDesignCompontent = baseProps => {
const [boxList, setBoxList] = useState([]);
const [tableColum, setTableColum] = useState([]); // 盒身类型
const [tableDataList, setTableDataList] = useState([]); // 盒长
- const [tableDataLists, setTableDataLists] = useState([]); // 盒长
const [boxBodyList, setBoxBodyList] = useState([]); // 盒身信息
const [isDefaultValue, setIsDefaultValue] = useState(true); // 是否默认值
const [topBoxList, setTopBoxList] = useState([]); // 盒身信息
- const [topDoubleBoxList, setTopDoubleBoxList] = useState([]); // 盒身信息
const [leftBoxList, setLeftBoxList] = useState([]); // 左边
- const [leftDoubleBoxList, setLeftDoubleBoxList] = useState([]); // 左边
const [rightBoxList, setRightBoxList] = useState([]);
- const [rightDoubleBoxList, setRightDoubleBoxList] = useState([]);
const [boxKey, setBoxKey] = useState(new Date().getTime());
- const [doubleLayerList, setDoubleLayerList] = useState([]);
if (!boxVisible) return "";
- // 1️⃣ 只负责 tableColum
- useEffect(() => {
- if (!tableData?.length) return;
-
- const newTableColum = tableData
- .filter(item => item.bVisible) // 先过滤可见
- .map(item => ({
- ...item,
- isEditable: true,
- isSelect: false,
- selectImage: null,
- value: "",
- }))
- .filter(
- item =>
- !(item.showName.includes("盒长") || item.showName.includes("盒高") || item.showName.includes("盒宽") || item.showName.includes("盒身"))
- )
- .map(item => (item.showName === "盒型类别" ? { ...item, showName: "盒型名称" } : item));
-
- setTableColum(newTableColum);
- }, [tableData]);
-
- // 2️⃣ 只负责 boxBodyList
- useEffect(() => {
- if (!tableData?.length) return;
-
- const bodyList = tableData
- .filter(item => item.bVisible)
- .map(item => ({
- ...item,
- isEditable: true,
- isSelect: false,
- selectImage: null,
- value: "",
- }))
- .filter(item => item.showName.includes("盒身"));
-
- setBoxBodyList(bodyList);
- }, [tableData]);
-
- // 3️⃣ 只负责 tableDataList 和 tableDataLists
- useEffect(() => {
- if (!tableData?.length) return;
-
- const newList = tableData
- .filter(item => item.bVisible)
- .map(item => ({
- ...item,
- isEditable: true,
- isSelect: false,
- selectImage: null,
- value: "",
- }))
- .filter(item => item.showName.includes("盒长") || item.showName.includes("盒高") || item.showName.includes("盒宽"))
- .map(item => {
- let name = "";
- if (item.showName === "盒长") name = "盒长(L)";
- if (item.showName === "盒宽") name = "盒宽(W)";
- if (item.showName === "盒高") name = "盒高(D)";
- return { ...item, sName: name };
- });
-
- setTableDataList(newList);
- setTableDataLists(newList);
- }, [tableData]);
+ useEffect(
+ () => {
+ if (tableData && tableData.length) {
+ const newTableColum = tableData.map(item => {
+ return {
+ ...item,
+ isEditable: true,
+ isSelect: false,
+ selectImage: null,
+ value: "",
+ };
+ });
+ // const last = newTableColum.pop();
+ // const newList = [last, ...newTableColum];
+ const newList = newTableColum.filter(
+ item => item.showName.includes("盒长") || item.showName.includes("盒高") || item.showName.includes("盒宽")
+ );
+ const newLists = newTableColum.filter(
+ item =>
+ !(item.showName.includes("盒长") || item.showName.includes("盒高") || item.showName.includes("盒宽") || item.showName.includes("盒身"))
+ );
+ const bodyList = newTableColum.filter(item => item.showName.includes("盒身"));
+ newLists.forEach(x => {
+ if (x.showName === "盒型类别") {
+ x.showName = "盒型名称";
+ }
+ });
+ setTableColum(newLists);
+ setBoxBodyList(bodyList);
+ newList.forEach(item => {
+ let name = "";
+ if (item.showName === "盒长") {
+ name = item.showName + "(L)";
+ } else if (item.showName === "盒宽") {
+ name = item.showName + "(W)";
+ } else if (item.showName === "盒高") {
+ name = item.showName + "(D)";
+ }
+ item.sName = name;
+ });
+ setTableDataList(newList);
+ }
+ },
+ [tableData]
+ );
const titleList = [
"上方盒舌",
"盒底组件",
@@ -176,46 +154,19 @@ const BoxDesignCompontent = baseProps => {
{ name: "右贴边位", value: "dYTBW" },
{ name: "右(下)插位组件", value: "dYXCW" },
];
- const doubleTitlieList = [
- "左上插位组件",
- "上插位组件",
- "右上插位组件",
- "左偏移",
- "左插位组件",
- "左下插位组件",
- "右偏移",
- "右插位组件",
- "右下插位组件",
- ];
- 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 newBoxList = [];
// const boxs = titleList.length + tableData.length;
tableColum.forEach(item => {
titleList.push(item.showName);
});
+ console.log("🚀 ~ tableColum:", tableColum);
boxBodyList.forEach(item => {
titleList.push(item.showName);
});
tableDataList.forEach(item => {
titleList.push(item.showName);
});
- // 这里处理双盒的初始数据
- titleList.push(...["首盒长", "首盒宽", "次盒长", "次盒宽"], ...doubleTitlieList);
// 盒身信息
titleList.forEach((item, index) => {
newBoxList.push({
@@ -229,54 +180,29 @@ const BoxDesignCompontent = baseProps => {
type: null,
show: true,
showName: item, // 参数名称
- sAssignFormula: null,
+ sAssignFormula:null
});
});
// 部件信息
-
- const boxTypes = masterData.sTypes;
if (slaveData && slaveData.length) {
- if (boxTypes !== "8") {
- slaveData.forEach((item, index) => {
- const i = titleList1.findIndex(i => {
- return i.value === item.sCode;
- });
- if (i !== -1) {
- const x = newBoxList.findIndex(z => z.sName === titleList1[i].name);
- newBoxList[x].value = item.iValue;
- newBoxList[x].type = item.sTypes;
- newBoxList[x].showName = item.sName;
- newBoxList[x].selectImage = item.sMakeUpPath;
- newBoxList[x].sName = titleList1[i].name;
- newBoxList[x].sAssignFormula = item.sAssignFormula;
- newBoxList[x].bVisible = item.bVisible;
- }
- });
- } else {
- slaveData.forEach((item, index) => {
- const i = doubleTitlieList1.findIndex(i => {
- return i.value === item.sCode;
- });
- if (i !== -1) {
- const x = newBoxList.findIndex(z => z.sName === doubleTitlieList1[i].name);
- newBoxList[x].value = item.iValue;
- newBoxList[x].type = item.sTypes;
- newBoxList[x].showName = item.sName;
- newBoxList[x].selectImage = item.sMakeUpPath;
- newBoxList[x].sName = doubleTitlieList1[i].name;
- newBoxList[x].sAssignFormula = item.sAssignFormula;
- newBoxList[x].bVisible = item.bVisible;
- }
+ slaveData.forEach((item, index) => {
+ const i = titleList1.findIndex(i => {
+ return i.value === item.sCode;
});
- // 双盒盒型单独处理
- }
+ if (i !== -1) {
+ const x = newBoxList.findIndex(z => z.sName === titleList1[i].name);
+ newBoxList[x].value = item.iValue;
+ newBoxList[x].type = item.sTypes;
+ newBoxList[x].showName = item.sName;
+ newBoxList[x].selectImage = item.sMakeUpPath;
+ newBoxList[x].sName = titleList1[i].name;
+ newBoxList[x].sAssignFormula = item.sAssignFormula
+ newBoxList[x].bVisible = item.bVisible
+ }
+ });
}
// 盒身信息
if (masterData) {
- const headLength = slaveData.find(item => item.sCode === "dSHC")?.iValue
- const headWidth = slaveData.find(item => item.sCode === "dSHK")?.iValue
- const orderLength = slaveData.find(item => item.sCode === "dCHC")?.iValue
- const orderWidth = slaveData.find(item => item.sCode === "dCHK")?.iValue
newBoxList.forEach((item, index) => {
if (item.sName === "盒身") {
newBoxList[index].value = masterData.sBoxBody;
@@ -290,121 +216,69 @@ const BoxDesignCompontent = baseProps => {
newBoxList[index].value = masterData.dBoxHeight;
} else if (item.sName === "盒型名称") {
newBoxList[index].value = masterData.sName;
- } else if (item.sName === "首盒长") {
- newBoxList[index].value = headLength;
- } else if (item.sName === "首盒宽") {
- newBoxList[index].value = headWidth;
- } else if (item.sName === "次盒长") {
- newBoxList[index].value = orderLength;
- } else if (item.sName === "次盒宽") {
- newBoxList[index].value = orderWidth;
- }
+ }
});
}
// 有数据的时候 盒型设计需要赋值
- useEffect(() => {
- if (newBoxList.length > 0 && !arraysAreEqual(boxList, newBoxList)) {
- setBoxList(newBoxList);
- }
- }, [newBoxList]);
+ useEffect(
+ () => {
+ if (newBoxList.length > 0 && !arraysAreEqual(boxList, newBoxList)) {
+ setBoxList(newBoxList);
+ }
+ },
+ [newBoxList]
+ );
const arraysAreEqual = (arr1, arr2) => {
if (arr1.length !== arr2.length) return false;
return arr1.every((item, index) => item.sName === arr2[index].sName);
};
- useEffect(() => {
- const type = boxList.find(item => item.sName === "盒身")?.type;
- const updateLists = () => {
- const topBoxFilter = item => item.sName === "上方盒舌" || item.sName === "盒底组件" || item.sName === "下方盒舌";
-
- const leftBoxFilter = item => item.sName === "左(上)插位组件" || item.sName === "左贴边位" || item.sName === "左(下)插位组件";
-
- const rightBoxFilter = item => item.sName === "右(上)插位组件" || item.sName === "右贴边位" || item.sName === "右(下)插位组件";
-
- if (type === "2" || type === 2 || type === "4" || type === 4 || type === 3 || type === "3" || type === 5 || type === "5") {
- const box = [...boxList];
- box.forEach(x => {
- x.show = true;
- });
- if (type === "2" || type === 2) {
- box.forEach(x => x.sName === "盒底组件" && (x.show = false));
- } else if (type === "4" || type === 4) {
- const title = ["盒底组件", "左贴边位", "右贴边位"];
- box.forEach(x => title.includes(x.sName) && (x.show = false));
- } else if (type === "3" || type === 3) {
- const title = ["左(上)插位组件", "右(下)插位组件", "盒底组件"];
- box.forEach(x => title.includes(x.sName) && (x.show = false));
- } else if (type === "5" || type === 5) {
- const title = ["盒底组件"];
- box.forEach(x => title.includes(x.sName) && (x.show = false));
- }
- setTopBoxList(box.filter(topBoxFilter));
- setLeftBoxList(box.filter(leftBoxFilter));
- if (type === 3 || type === "3") {
- setRightBoxList(box.filter(rightBoxFilter).reverse());
+ useEffect(
+ () => {
+ const type = boxList.find(item => item.sName === "盒身")?.type;
+ const updateLists = () => {
+ const topBoxFilter = item => item.sName === "上方盒舌" || item.sName === "盒底组件" || item.sName === "下方盒舌";
+
+ const leftBoxFilter = item => item.sName === "左(上)插位组件" || item.sName === "左贴边位" || item.sName === "左(下)插位组件";
+
+ const rightBoxFilter = item => item.sName === "右(上)插位组件" || item.sName === "右贴边位" || item.sName === "右(下)插位组件";
+
+ if (type === "2" || type === 2 || type === "4" || type === 4 || type === 3 || type === "3") {
+ const box = [...boxList];
+ box.forEach(x => {
+ x.show = true;
+ });
+ if (type === "2" || type === 2) {
+ box.forEach(x => x.sName === "盒底组件" && (x.show = false));
+ } else if (type === "4" || type === 4) {
+ const title = ["盒底组件", "左贴边位", "右贴边位"];
+ box.forEach(x => title.includes(x.sName) && (x.show = false));
+ } else if (type === "3" || type === 3) {
+ const title = ["左(上)插位组件", "右(下)插位组件", "盒底组件"];
+ box.forEach(x => title.includes(x.sName) && (x.show = false));
+ }
+ setTopBoxList(box.filter(topBoxFilter));
+ setLeftBoxList(box.filter(leftBoxFilter));
+ if (type === 3 || type === "3") {
+ setRightBoxList(box.filter(rightBoxFilter).reverse());
+ } else {
+ setRightBoxList(box.filter(rightBoxFilter));
+ }
} else {
+ const box = [...boxList];
+ box.forEach(x => {
+ x.show = true;
+ });
+ setTopBoxList(box.filter(topBoxFilter));
+ setLeftBoxList(box.filter(leftBoxFilter));
setRightBoxList(box.filter(rightBoxFilter));
}
- } else if (type === "7" || type === 7) {
- const box = [...boxList];
- box.forEach(x => {
- x.show = true;
- });
- const title = ["盒底组件", "左贴边位", "右贴边位", "上方盒舌", "下方盒舌"];
- box.forEach(x => title.includes(x.sName) && (x.show = false));
- setTopBoxList(box.filter(topBoxFilter));
- setLeftBoxList(box.filter(leftBoxFilter));
- setRightBoxList(box.filter(rightBoxFilter));
- } else if (type === "8" || type === 8) {
- const box = [...boxList];
- box.forEach(x => {
- x.show = true;
- });
- const topBoxFilter = item => item.sName === "左上插位组件" || item.sName === "上插位组件" || item.sName === "右上插位组件";
- const leftBoxFilter = item => item.sName === "左偏移" || item.sName === "左插位组件" || item.sName === "左下插位组件";
- const rightBoxFilter = item => item.sName === "右偏移" || item.sName === "右插位组件" || item.sName === "右下插位组件";
- setTopDoubleBoxList(box.filter(topBoxFilter));
- setLeftDoubleBoxList(box.filter(leftBoxFilter));
- setRightDoubleBoxList(box.filter(rightBoxFilter));
- } else {
- const box = [...boxList];
- box.forEach(x => {
- x.show = true;
- });
- setTopBoxList(box.filter(topBoxFilter));
- setLeftBoxList(box.filter(leftBoxFilter));
- setRightBoxList(box.filter(rightBoxFilter));
- }
- };
+ };
- updateLists();
- }, [boxList]);
- const boxType = boxList.find(item => item.sName === "盒身")?.type;
- // 监听盒身类型
- useEffect(() => {
- if (!boxType) return;
- if (boxType === "8") {
- const createBox = names =>
- names.map(sName => ({
- value: "",
- sName,
- isEditable: true,
- isSelect: false,
- selectValue: null,
- selectLabel: "",
- selectImage: null,
- type: null,
- show: true,
- showName: sName,
- sAssignFormula: null,
- }));
- setDoubleLayerList(createBox(["首盒长", "首盒宽", "次盒长", "次盒宽"]));
- // setTopDoubleBoxList(createBox(["左上插位组件", "上插位组件", "右上插位组件"]));
- // setLeftDoubleBoxList(createBox(["左偏移", "左插位组件", "左下插位组件"]));
- // setRightDoubleBoxList(createBox(["右偏移", "右插位组件", "右下插位组件"]));
- } else {
- }
- }, [boxType]);
+ updateLists();
+ },
+ [boxList]
+ );
const handleFocus = (e, index) => {
if (boxList && boxList.length) {
@@ -461,17 +335,15 @@ const BoxDesignCompontent = baseProps => {
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}`;
+ const imageUrl = `${commonConfig.file_host}file/download?savePathStr=${fileName}&sModelsId=100&token=${props.token}`;
return imageUrl;
};
-
// 下来框
const renderOptionWithImage = option => {
return (
- {topBoxList.map((topItem, index) => (
-
-
- 
- ) : (
- ""
- )}
-
-
-
- ))}
- {topItem.sName}
- {topItem?.selectImage ? (
-
- {/*
- 参数：
*/}
- handleChangeName(e, index)}
- onFocus={e => handleFocus(e, index)}
- onBlur={e => handleBlur(e, index)}
- readOnly={!topItem?.isEditable}
- className={styles.text}
- />
- handleChange(e, index)}
- onFocus={e => handleFocus(e, index)}
- onBlur={e => handleBlur(e, index)}
- readOnly={!topItem?.isEditable}
- style={{ width: " 80%" }}
- />
-
- {leftBoxList.map((item, index) => (
-
-
-
- ))}
- {titleList[index + 3]}
-
-
-
- {item?.selectImage ? (
- 
- ) : (
- ""
- )}
- handleChangeName(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- className={styles.text}
- />
- handleChange(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- style={{ width: " 80%" }}
- />
-
-
- {rightBoxList.map((item, index) => (
-
-
-
- ))}
- {titleList[findIndexBySname(item.sName)]}
-
-
-
- {item?.selectImage ? (
-
- ) : (
- ""
- )}
-
- handleChangeName(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- className={styles.text}
- />
- handleChange(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- style={{ width: " 80%" }}
- />
-
-
-
-
-
-
-
-
- {boxBodyList && boxBodyList.length
- ? boxBodyList.map((item, index) => {
- const uniqueIndex = index + 9;
- return (
-
-
-
- );
- })
- : ""}
-
- ![{boxList[uniqueIndex].value}]({boxList[uniqueIndex]?.selectImage})
- ) : (
- ""
- )}
- {isDefaultValue ?
-
- {item.showName}
-
- {boxList[uniqueIndex]?.selectImage ? (
- {boxList[uniqueIndex]?.value}
: ""}
-
-
- {option.sMakeUpPath ? : ""}
+ {option.sMakeUpPath ? : ""}
{option.sName}
- {boxType !== "8" &&
- topBoxList.map((topItem, index) => (
-
-
- ) : (
- ""
- )}
-
-
-
-
svg.innerHTML = "";
- if (!(boxList && boxList.length)) return;
+
// 获取盒型类型
const svgTypes = boxList.find(x => x.sName === "盒身")?.type || 1;
setSvgType(svgTypes);
@@ -84,21 +75,11 @@ const SvgBox = props => {
// 获取盒长、盒宽、盒高
const boxLength = Number(boxList.find(x => x.sName === "盒长")?.value) || 0;
const boxWidth = Number(boxList.find(x => x.sName === "盒宽")?.value) || 0;
- let boxHeight = Number(boxList.find(x => x.sName === "盒高")?.value) || 0;
+ const boxHeight = Number(boxList.find(x => x.sName === "盒高")?.value) || 0;
setWidth(boxLength);
setHeight(boxWidth);
setDeep(boxHeight);
- let headLength = 0;
- let headWidth = 0;
- let orderLength = 0;
- let orderWidth = 0;
- if (svgTypes === "8") {
- headLength = Number(boxList.find(x => x.sName === "首盒长")?.value) || 0;
- headWidth = Number(boxList.find(x => x.sName === "首盒宽")?.value) || 0;
- orderLength = Number(boxList.find(x => x.sName === "次盒长")?.value) || 0;
- orderWidth = Number(boxList.find(x => x.sName === "次盒宽")?.value) || 0;
- }
// 计算视口宽度和高度
const zbtb = boxList.find(x => x.sName === "左贴边位");
@@ -127,431 +108,63 @@ const SvgBox = props => {
// 展宽
if (boxList && boxList.length) {
// 如果存在部件和盒舌 取最大的
-
const top = topOffect(boxList, boxLength, boxWidth, boxHeight);
const bottom = bottomOffect(boxList, boxLength, boxWidth, boxHeight);
- max = Number(top) + Number(bottom);
- if (Number(svgType) === 8) {
- const top = topOffect(boxList, headLength, headWidth);
- const bottom = bottomOffect(boxList, orderLength, orderWidth);
- max = Number(top) + Number(bottom);
- }
+ max = top + bottom;
}
let viewBoxHeight = Number(boxHeight) + max;
if (Number(svgType) === 1) {
// 四面盒身
- viewBoxWidth = Number(boxLength) * 2 + Number(boxWidth) * 2 + dZTBW + dYTBW;
+ viewBoxWidth = dZTBW + Number(boxLength) * 2 + Number(boxWidth) * 2;
} else if (Number(svgType) === 2) {
viewBoxWidth = boxLength * 2 + boxWidth + dYTBW + dZTBW;
} else if (Number(svgType) === 3) {
viewBoxWidth = boxLength + boxWidth * 2 + dYTBW + dZTBW;
- } else if (Number(svgType) === 4) {
- // 天地盒
-
- const zxcw = boxList.find(x => x.sName === "左(下)插位组件");
- const zscw = boxList.find(x => x.sName === "左(上)插位组件");
- const yscw = boxList.find(x => x.sName === "右(上)插位组件");
- const yxcw = boxList.find(x => x.sName === "右(下)插位组件");
- const zxcwType = zxcw?.type;
- const zxcwValue = zxcw?.value;
- const zscwType = zscw?.type;
- const zscwValue = zscw?.value;
- const yscwType = yscw?.type;
- const yscwValue = yscw?.value;
- const yxcwType = yxcw?.type;
- const yxcwValue = yxcw?.value;
- let leftValue = 0;
- let rightValue = 0;
- let topValue = 0;
- let bottomValue = 0;
- if (zxcwType === "4001" || zxcwType === "4006" || zxcwType === "4007") {
- leftValue = leftValue + Number(zxcwValue) + boxHeight * 2;
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftValue = leftValue + Number(zxcwValue) + boxHeight;
- } else if (zxcwType === "4004") {
- leftValue = leftValue + Number(zxcwValue) + boxHeight * 3;
- } else if (zxcwType === "4005") {
- leftValue = boxHeight * 3;
- }
- if (yscwType === "6001" || yscwType === "6006" || yscwType === "6007") {
- rightValue = rightValue + Number(yscwValue) + boxHeight * 2;
- } else if (yscwType === "6002" || yscwType === "6003") {
- rightValue = rightValue + Number(yscwValue) + boxHeight;
- } else if (yscwType === "6004") {
- rightValue = rightValue + Number(yscwValue) + boxHeight * 3;
- } else if (yscwType === "6005") {
- rightValue = boxHeight * 3;
- }
- if (zscwType === "3001" || zscwType === "3006" || zscwType === "3007") {
- topValue = topValue + Number(zscwValue) + boxHeight * 2;
- } else if (zscwType === "3002" || zscwType === "3003") {
- topValue = topValue + Number(zscwValue) + boxHeight;
- } else if (zscwType === "3004") {
- topValue = topValue + Number(zscwValue) + boxHeight * 3;
- } else if (zscwType === "3005") {
- topValue = boxHeight * 3;
- }
- if (yxcwType === "7001" || yxcwType === "7006" || yxcwType === "7007") {
- bottomValue = bottomValue + Number(yxcwValue) + boxHeight * 2;
- } else if (yxcwType === "7002" || yxcwType === "7003") {
- bottomValue = bottomValue + Number(yxcwValue) + boxHeight;
- } else if (yxcwType === "7004") {
- bottomValue = bottomValue + Number(yxcwValue) + boxHeight * 3;
- } else if (yxcwType === "7005") {
- bottomValue = boxHeight * 3;
- }
- viewBoxWidth = Number(boxLength) + leftValue + rightValue;
- viewBoxHeight = Number(boxWidth) + topValue + bottomValue;
- } else if (Number(svgType) === 5) {
- viewBoxWidth = (boxHeight + boxWidth) * 2 + dYTBW + dZTBW;
- viewBoxHeight = boxLength + max;
- } else if (Number(svgType) === 6) {
- viewBoxWidth = boxWidth + 2;
- viewBoxHeight = boxLength + 2;
- } else if (Number(svgType) === 7) {
- boxHeight = boxWidth;
- const zxcw = boxList.find(x => x.sName === "左(下)插位组件");
- const zscw = boxList.find(x => x.sName === "左(上)插位组件");
- const yscw = boxList.find(x => x.sName === "右(上)插位组件");
- const yxcw = boxList.find(x => x.sName === "右(下)插位组件");
- const zxcwType = zxcw?.type;
- const zxcwValue = zxcw?.value;
- const zscwType = zscw?.type;
- const zscwValue = zscw?.value;
- const yscwType = yscw?.type;
- const yscwValue = yscw?.value;
- const yxcwType = yxcw?.type;
- const yxcwValue = yxcw?.value;
- let leftValue = 0;
- let rightValue = 0;
- let topValue = 0;
- let bottomValue = 0;
- if (zxcwType === "4001" || zxcwType === "4006" || zxcwType === "4007") {
- leftValue = leftValue + Number(zxcwValue) + boxHeight * 2;
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftValue = leftValue + Number(zxcwValue) + boxHeight;
- } else if (zxcwType === "4004") {
- leftValue = leftValue + Number(zxcwValue) + boxHeight * 3;
- } else if (zxcwType === "4005") {
- leftValue = boxHeight * 3;
- }
- if (yscwType === "6001" || yscwType === "6006" || yscwType === "6007") {
- rightValue = rightValue + Number(yscwValue) + boxHeight * 2;
- } else if (yscwType === "6002" || yscwType === "6003") {
- rightValue = rightValue + Number(yscwValue) + boxHeight;
- } else if (yscwType === "6004") {
- rightValue = rightValue + Number(yscwValue) + boxHeight * 3;
- } else if (yscwType === "6005") {
- rightValue = boxHeight * 3;
- }
- if (zscwType === "3001" || zscwType === "3006" || zscwType === "3007") {
- topValue = topValue + Number(zscwValue) + boxHeight * 2;
- } else if (zscwType === "3002" || zscwType === "3003") {
- topValue = topValue + Number(zscwValue) + boxHeight;
- } else if (zscwType === "3004") {
- topValue = topValue + Number(zscwValue) + boxHeight * 3;
- } else if (zscwType === "3005") {
- topValue = boxHeight * 3;
- }
- if (yxcwType === "7001" || yxcwType === "7006" || yxcwType === "7007") {
- bottomValue = bottomValue + Number(yxcwValue) + boxHeight * 2;
- } else if (yxcwType === "7002" || yxcwType === "7003") {
- bottomValue = bottomValue + Number(yxcwValue) + boxHeight;
- } else if (yxcwType === "7004") {
- bottomValue = bottomValue + Number(yxcwValue) + boxHeight * 3;
- } else if (yxcwType === "7005") {
- bottomValue = boxHeight * 3;
- }
- viewBoxWidth = Number(boxLength) + leftValue + rightValue;
- viewBoxHeight = Number(boxWidth) + topValue + bottomValue;
- // viewBoxWidth = boxWidth + leftValue + rightValue;
- // viewBoxHeight = boxLength + dZSCW + dYXCW;
- } else if (Number(svgType) === 8) {
- const getTop = (item, offset = 0) => {
- const map = {
- 10001: headWidth + Number(item?.value),
- 10002: Number(item?.value),
- 10003: Number(item?.value),
- 10004: Number(item?.value) + headWidth * 2,
- 10005: headWidth * 2,
- 10006: Number(item?.value) + headWidth,
- 10007: Number(item?.value) + headWidth,
- };
- return map[item?.type - offset] ?? 0; // 根据偏移量统一处理
- };
-
- const topLeft = getTop(boxList.find(x => x.sName === "左上插位组件"));
- const topRight = getTop(
- boxList.find(x => x.sName === "右上插位组件"),
- 2000
- );
- const topLength = headLength + topLeft + topRight;
- const bottomLeft = getTop(
- boxList.find(x => x.sName === "左插位组件"),
- 3000
- );
- const bottomRight = getTop(
- boxList.find(x => x.sName === "右插位组件"),
- 5000
- );
- const bottomLength = orderLength * 2 + bottomLeft + bottomRight;
- const leftOffect = boxList.find(x => x.sName === "左偏移")?.value || 0;
- 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 {
+ viewBoxWidth = boxLength + boxHeight + dYTBW + dZTBW;
+ viewBoxHeight = Number(boxWidth) + Number(boxHeight) * 2 + max;
}
-
// 计算缩放比例
let scale = 1;
- if (props.showNew === 0) {
- if (viewBoxWidth > (dSvgBoxWidth ? dSvgBoxWidth : 500) || viewBoxHeight > (dSvgBoxHeight ? dSvgBoxHeight : 250)) {
- const widthScale = (dSvgBoxWidth ? dSvgBoxWidth : 500) / viewBoxWidth;
- const heightScale = (dSvgBoxHeight ? dSvgBoxHeight : 250) / viewBoxHeight;
- scale = Math.min(widthScale, heightScale);
- let ySvg = dSvgBoxHeight
- ? topOffect(boxList, boxLength, boxWidth, boxHeight) * scale
- : topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
- let bottom = 0;
- if (Number(svgType) !== 8) {
- bottom = bottomOffect(boxList, boxLength, boxWidth, boxHeight);
- } else {
- bottom = bottomOffect(boxList, orderLength, orderWidth);
- }
- if (Number(svgType) === 4) {
- ySvg = ySvg + boxHeight * scale;
- } else if (Number(svgType) === 8) {
- ySvg = topOffect(boxList, headLength, headWidth) * scale;
- }
- ySvg = ySvg + 50 * scale;
- let xSvg = 0;
- if (Number(svgType) === 7) {
- xSvg = scaledWidth + dZXCW * scale;
- } else if (Number(svgType) === 8) {
- const leftOffect = boxList.find(x => x.sName === "左偏移")?.value || 0;
- // 计算首盒部件与次盒部件尺寸
- const getTop = (item, offset = 0) => {
- const map = {
- 10001: headWidth + Number(item?.value),
- 10002: Number(item?.value),
- 10003: Number(item?.value),
- 10004: Number(item?.value) + headWidth * 2,
- 10005: headWidth * 2,
- 10006: Number(item?.value) + headWidth,
- 10007: Number(item?.value) + headWidth,
- };
- return map[item?.type - offset] ?? 0; // 根据偏移量统一处理
- };
- const topLeft = getTop(boxList.find(x => x.sName === "左上插位组件"));
- const topLength = headLength + topLeft;
- const bottomLeft = getTop(
- boxList.find(x => x.sName === "左插位组件"),
- 3000
- );
- const bottomLength = headLength / 2 - orderLength + -bottomLeft - Number(leftOffect);
- xSvg = Math.max(Math.abs(bottomLength), Math.abs(topLength));
- } else {
- xSvg = zbtb?.value;
- }
- svg.setAttribute(
- "viewBox",
- `${-(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`;
- svgContainerRef.current.style.height = `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`;
- } else {
- scale = 0.5;
- let ySvg = topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
- if (Number(svgType) === 4) {
- ySvg = ySvg + boxHeight;
- } else if (Number(svgType) === 8) {
- ySvg = topOffect(boxList, headLength, headWidth) * scale;
- }
- ySvg = ySvg + 50 * scale;
- let xSvg = 0;
- if (Number(svgType) === 7) {
- xSvg = scaledWidth + dZXCW * scale;
- } else if (Number(svgType) === 8) {
- const leftOffect = boxList.find(x => x.sName === "左偏移")?.value || 0;
- // 计算首盒部件与次盒部件尺寸
- const getTop = (item, offset = 0) => {
- const map = {
- 10001: headWidth + Number(item?.value),
- 10002: Number(item?.value),
- 10003: Number(item?.value),
- 10004: Number(item?.value) + headWidth * 2,
- 10005: headWidth * 2,
- 10006: Number(item?.value) + headWidth,
- 10007: Number(item?.value) + headWidth,
- };
- return map[item?.type - offset] ?? 0; // 根据偏移量统一处理
- };
- const topLeft = getTop(boxList.find(x => x.sName === "左上插位组件"));
- const topLength = headLength + topLeft;
- const bottomLeft = getTop(
- boxList.find(x => x.sName === "左插位组件"),
- 3000
- );
- const bottomLength = headLength / 2 - orderLength + -bottomLeft - Number(leftOffect);
- xSvg = Math.max(Math.abs(bottomLength), Math.abs(topLength));
- } else {
- xSvg = zbtb?.value;
- }
- svg.setAttribute(
- "viewBox",
- `${-(dSvgBoxWidth ? xSvg : viewBoxWidth / 2)} ${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`;
- svgContainerRef.current.style.height = `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`;
- }
- } else if (props.showNew === 1) {
- let ySvg = topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
- let leftSize = 0;
- let topSize = 0;
+ if (viewBoxWidth > (dSvgBoxWidth ? dSvgBoxWidth : 500) || viewBoxHeight > (dSvgBoxHeight ? dSvgBoxHeight : 250)) {
+ const widthScale = (dSvgBoxWidth ? dSvgBoxWidth : 500) / viewBoxWidth;
+ const heightScale = (dSvgBoxHeight ? dSvgBoxHeight : 250) / viewBoxHeight;
+ scale = Math.min(widthScale, heightScale);
+ let ySvg = dSvgBoxHeight
+ ? topOffect(boxList, boxLength, boxWidth, boxHeight) * scale
+ : topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
+ const bottom = bottomOffect(boxList, boxLength, boxWidth, boxHeight);
if (Number(svgType) === 4) {
- const zxcw = boxList.find(x => x.sName === "左(下)插位组件");
- const zxcwType = zxcw?.type;
- const zxcwValue = zxcw?.value;
- if (zxcwType === "4001" || zxcwType === "4006") {
- leftSize = Number(zxcwValue) + boxHeight * 2;
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftSize = Number(zxcwValue) + boxHeight;
- } else if (zxcwType === "4004") {
- leftSize = Number(zxcwValue) + boxHeight * 3;
- } else if (zxcwType === "4005") {
- leftSize = Number(zxcwValue) + boxHeight * 3;
- }
- const zscw = boxList.find(x => x.sName === "左(上)插位组件");
- const zscwType = zscw?.type;
- const zscwValue = zscw?.value;
- if (zscwType === "3001" || zscwType === "3006") {
- topSize = Number(zscwValue) + boxHeight * 2;
- } else if (zscwType === "3002" || zscwType === "3003") {
- topSize = Number(zscwValue) + boxHeight;
- } else if (zscwType === "3004") {
- topSize = Number(zscwValue) + boxHeight * 3;
- } else if (zscwType === "3005") {
- topSize = Number(zscwValue) + boxHeight * 3;
- }
- ySvg = topSize;
- } else if (Number(svgType) === 6) {
- leftSize = 0;
- } else if (Number(svgType) === 8) {
- const leftOffect = boxList.find(x => x.sName === "左偏移")?.value || 0;
- // 计算首盒部件与次盒部件尺寸
- const getTop = (item, offset = 0) => {
- const map = {
- 10001: headWidth + Number(item?.value),
- 10002: Number(item?.value),
- 10003: Number(item?.value),
- 10004: Number(item?.value) + headWidth * 2,
- 10005: headWidth * 2,
- 10006: Number(item?.value) + headWidth,
- 10007: Number(item?.value) + headWidth,
- };
- return map[item?.type - offset] ?? 0; // 根据偏移量统一处理
- };
- const topLeft = getTop(boxList.find(x => x.sName === "左上插位组件"));
- const topLength = topLeft;
- const bottomLeft = getTop(
- boxList.find(x => x.sName === "左插位组件"),
- 3000
- );
- const bottomLength = headLength / 2 - orderLength + -bottomLeft - Number(leftOffect);
- leftSize = Math.max(Math.abs(bottomLength), Math.abs(topLength));
- ySvg = topOffect(boxList, headLength, headWidth);
- } else {
- leftSize = zbtb?.value;
+ ySvg = ySvg + boxHeight * scale;
}
-
- svg.setAttribute("viewBox", `${-(leftSize * scale) || 0} ${-ySvg} ${viewBoxWidth + 2} ${viewBoxHeight + 2}`);
- svg.setAttribute("width", `${viewBoxWidth}px`);
- svg.setAttribute("height", `${viewBoxHeight}px`);
- svgContainerRef.current.style.width = `${viewBoxWidth}px`;
- svgContainerRef.current.style.height = `${viewBoxHeight}px`;
- const scaleX = (dSvgBoxWidth ? dSvgBoxWidth : 450) / viewBoxWidth;
- const scaleY = (dSvgBoxHeight ? dSvgBoxHeight : 200) / viewBoxHeight;
- svgContainerRef.current.style.transform = `scale(${scaleX >= 1 ? 1 : scaleX}, ${scaleY >= 1 ? 1 : scaleY})`;
- svgContainerRef.current.style.transformOrigin = "top left";
- svgContainerRef.current.style.paddingTop = dSvgBoxWidth ? "0" : "25px";
- svgContainerRef.current.style.backgroundColor = props.isMobile ? "#EDF4FF" : "";
- // svgContainerRef.current.style.position = 'absolute';
- // svgContainerRef.current.style.left = '50%';
- // svgContainerRef.current.style.top = '50%';
- // svgContainerRef.current.style.transform = 'translate(-50%, -50%)';
- } else if (props.showNew === 2) {
- // g.setAttribute("transform", `rotate(${iFAngle, dSvgBoxWidth/2,dSvgBoxHeight*2})`);
+ ySvg = ySvg + 50 * scale;
+ svg.setAttribute(
+ "viewBox",
+ `${-(zbtb?.value * 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`;
+ svgContainerRef.current.style.height = `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`;
+ } else {
+ scale = 0.6;
let ySvg = topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
- let leftSize = 0;
- let topSize = 0;
if (Number(svgType) === 4) {
- const zxcw = boxList.find(x => x.sName === "左(下)插位组件");
- const zxcwType = zxcw?.type;
- const zxcwValue = zxcw?.value;
- if (zxcwType === "4001" || zxcwType === "4006") {
- leftSize = Number(zxcwValue) + boxHeight * 2;
- } else if (zxcwType === "4002" || zxcwType === "4003") {
- leftSize = Number(zxcwValue) + boxHeight;
- } else if (zxcwType === "4004") {
- leftSize = Number(zxcwValue) + boxHeight * 3;
- } else if (zxcwType === "4005") {
- leftSize = Number(zxcwValue) + boxHeight * 3;
- }
- const zscw = boxList.find(x => x.sName === "左(上)插位组件");
- const zscwType = zscw?.type;
- const zscwValue = zscw?.value;
- if (zscwType === "3001" || zscwType === "3006") {
- topSize = Number(zscwValue) + boxHeight * 2;
- } else if (zscwType === "3002" || zscwType === "3003") {
- topSize = Number(zscwValue) + boxHeight;
- } else if (zscwType === "3004") {
- topSize = Number(zscwValue) + boxHeight * 3;
- } else if (zscwType === "3005") {
- topSize = Number(zscwValue) + boxHeight * 3;
- }
- ySvg = topSize;
- } else if (Number(svgType) === 6) {
- leftSize = 0;
- } else if (Number(svgType) === 8) {
- const leftOffect = boxList.find(x => x.sName === "左偏移")?.value || 0;
- // 计算首盒部件与次盒部件尺寸
- const getTop = (item, offset = 0) => {
- const map = {
- 10001: headWidth + Number(item?.value),
- 10002: Number(item?.value),
- 10003: Number(item?.value),
- 10004: Number(item?.value) + headWidth * 2,
- 10005: headWidth * 2,
- 10006: Number(item?.value) + headWidth,
- 10007: Number(item?.value) + headWidth,
- };
- return map[item?.type - offset] ?? 0; // 根据偏移量统一处理
- };
- const topLeft = getTop(boxList.find(x => x.sName === "左上插位组件"));
- const topLength = topLeft;
- const bottomLeft = getTop(
- boxList.find(x => x.sName === "左插位组件"),
- 3000
- );
- const bottomLength = headLength / 2 - orderLength + -bottomLeft - Number(leftOffect);
- leftSize = Math.max(Math.abs(bottomLength), Math.abs(topLength));
- ySvg = topOffect(boxList, headLength, headWidth);
- } else {
- leftSize = zbtb?.value;
+ ySvg = ySvg + boxHeight;
}
- svg.setAttribute("viewBox", `${-(leftSize * scale || 0)} ${-ySvg} ${dSvgBoxWidth} ${dSvgBoxHeight}`);
- svg.setAttribute("width", `${dSvgBoxWidth}px`);
- svg.setAttribute("height", `${dSvgBoxHeight}px`);
- svgContainerRef.current.style.width = `${dSvgBoxWidth}px`;
- svgContainerRef.current.style.height = `${dSvgBoxHeight}px`;
+ svg.setAttribute(
+ "viewBox",
+ `${-(dSvgBoxWidth ? zbtb?.value : viewBoxWidth / 2)} ${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`;
+ svgContainerRef.current.style.height = `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`;
}
const scaledWidth = boxLength * scale;
const scaledHeight = boxWidth * scale;
@@ -566,9 +179,8 @@ const SvgBox = props => {
{ x: 0 + scaledWidth * 2 + scaledHeight, y: 0, width: scaledHeight, height: scaledDeep },
];
rectangles.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
+ svg.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
});
- svg.appendChild(g);
let pathList = [];
// 上方盒舌
@@ -578,11 +190,20 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth + scaledHeight / 2, -(dSFHS / 2 - 5) * scales, 10 * scales, dSFHS));
pathList.push(createText(scaledWidth * 2 + scaledHeight + scaledHeight / 2, -(dSFHS / 2 - 5) * scales, 10 * scales, dSFHS));
}
+ // if (sfhs?.type === "1004") {
+ // pathList.push(createFoldWeltTopLine(scaledHeight * 0.5, -dSFHS * scale * 0.5, scaledWidth, 0));
+ // pathList.push(createFoldWeltTopLine(-scaledHeight * 0.5, -dSFHS * scale * 0.5, scaledWidth * 2 + scaledHeight * 2, 0));
+ // }
+ // if (sfhs?.type === "1005") {
+ // pathList.push(createFoldWeltTopLine(scaledHeight * 0.85, -dSFHS * scale * 0.9, scaledWidth, 0));
+ // pathList.push(createFoldWeltTopLine(-scaledHeight * 0.85, -dSFHS * scale * 0.9, scaledWidth * 2 + scaledHeight * 2, 0));
+ // }
// 盒底组件
if (hdzj && hdzj.type) {
// 盒底组件
pathList.push(createBoxBottomComponent(hdzj?.type, scaledWidth, scaledHeight, Number(hdzj?.value) * scale, 0, scaledDeep));
- pathList.push(createText(scaledWidth / 2, scaledDeep + (Number(hdzj?.value) / 2) * scales, 10 * scales, Number(hdzj?.value)));
+ pathList.push(createText(scaledWidth / 2, scaledDeep + Number(hdzj?.value) / 2 * scales, 10 * scales, Number(hdzj?.value)));
+
} else {
// 下方盒舌
@@ -595,19 +216,18 @@ const SvgBox = props => {
}
// 左边贴边
- pathList.push(createTrapezoidLeft(zbtb?.type, scaledDeep, -dZTBW * scale, 0, 0, dSFHS * scale, dXFHS * scale));
+ pathList.push(createTrapezoidLeft(zbtb?.type, scaledDeep, -dZTBW * scale, 0, 0));
if (zbtb?.type && dZTBW) {
pathList.push(createText(-dZTBW * 0.4, scaledDeep / 2, 10 * scales, dZTBW));
}
// 右边贴边
-
- pathList.push(createTrapezoidRight(ybtb?.type, scaledDeep, dYTBW * scale, scaledWidth * 2 + scaledHeight * 2, 0, dSFHS * scale, dXFHS * scale));
+ pathList.push(createTrapezoidRight(ybtb?.type, scaledDeep, dYTBW * scale, scaledWidth * 2 + scaledHeight * 2, 0));
if (ybtb?.type && dYTBW) {
pathList.push(createText(scaledWidth * 2 + scaledHeight * 2 + dYTBW * 0.4, scaledDeep / 2, 10 * scales, dYTBW));
}
// 左上部件
pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledHeight, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value) || (zsbj?.type === "3006" && zsbj?.value) || (zsbj?.type === "3007" && zsbj?.value)) {
+ if (zsbj?.type === "3001" && zsbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
// 插位值
@@ -627,15 +247,13 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth * 0.1 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.8, -(scaledHeight + scaledHeight / 2), scales));
pathList.push(createText(scaledWidth * 0.8 + 10 * scales, -(scaledHeight + scaledHeight / 2), 10 * scales, "W"));
- } else if (zsbj?.type && dZSCW) {
- pathList.push(createText(scaledWidth / 2, -dZSCW / 2 + 4, 10 * scales, dZSCW));
}
// 右上部件
pathList.push(createDynamicTopLeft(ysbj?.type, scaledWidth, -scaledHeight, -dYSCW * scale, scaledWidth + scaledHeight, 0));
- if ((ysbj?.type === "6001" && ysbj?.value) || (ysbj?.type === "6006" && ysbj?.value) || (ysbj?.type === "6007" && ysbj?.value)) {
+ if (ysbj?.type === "6001" && ysbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth + scaledHeight + scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, -scaledHeight - dYSCW / 2, 10 * scales, dYSCW));
+ pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, -scaledHeight - dYSCW / 2 + 4, 10 * scales, dYSCW));
} else if (ysbj?.type === "6002" && dYSCW) {
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, -dYSCW / 2 + 4, 10 * scales, dYSCW));
} else if (ysbj?.type === "6003" && dYSCW) {
@@ -653,14 +271,12 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.1 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
pathList.push(createDoubleArrow(scaledHeight, scaledWidth + scaledHeight + scaledWidth * 0.8, -(scaledHeight + scaledHeight / 2), scales));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.8 + 10 * scales, -(scaledHeight + scaledHeight / 2), 10 * scales, "W"));
- } else if (ysbj?.type && dYSCW) {
- pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, -dYSCW / 2 + 4, 10 * scales, dYSCW));
}
// 左下部件-
if (!(hdzj && hdzj.type)) {
pathList.push(createDynamicTopLeft(zxbj?.type, scaledWidth, scaledHeight, dZXCW * scale, 0, scaledDeep));
- if ((zxbj?.type === "4001" && zxbj?.value) || (zxbj?.type === "4006" && zxbj?.value) || (zxbj?.type === "4007" && zxbj?.value)) {
+ if (zxbj?.type === "4001" && zxbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, scaledDeep + scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
pathList.push(createText(scaledWidth / 2, scaledDeep + scaledHeight + dZXCW / 2 - 4, 10 * scales, dZXCW));
@@ -679,16 +295,14 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth * 0.1 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.8, scaledDeep + (scaledHeight + scaledHeight / 2), scales));
pathList.push(createText(scaledWidth * 0.8 + 10 * scales, scaledDeep + (scaledHeight + scaledHeight / 2), 10 * scales, "W"));
- } else if (zxbj?.type && dZXCW) {
- pathList.push(createText(scaledWidth / 2, scaledDeep + dZXCW / 2 - 4, 10 * scales, dZXCW));
}
}
if (!(hdzj && hdzj.type)) {
pathList.push(createDynamicTopLeft(yxbj?.type, scaledWidth, scaledHeight, dYXCW * scale, scaledWidth + scaledHeight, scaledDeep));
- if ((yxbj?.type === "7001" && yxbj?.value) || (yxbj?.type === "7006" && yxbj?.value) || (yxbj?.type === "7007" && yxbj?.value)) {
+ if (yxbj?.type === "7001" && yxbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth + scaledHeight + scaledWidth * 0.2, scaledDeep + scaledHeight / 2, scales));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.2 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, scaledDeep + scaledHeight + dYXCW / 2, 10 * scales, dYXCW));
+ pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, scaledDeep + scaledHeight + dYXCW / 2 - 4, 10 * scales, dYXCW));
} else if (yxbj?.type === "7004" && yxbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth + scaledHeight + scaledWidth * 0.2, scaledDeep + scaledHeight / 2, scales));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.2 - 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
@@ -734,9 +348,8 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth + scaledHeight / 2, scaledDeep * 0.3 + 10 * scales, 10 * scales, "W"));
}
pathList.forEach(x => {
- g.appendChild(x);
+ svg.appendChild(x);
});
- svg.appendChild(g);
} else if (Number(svgType) === 2) {
// 单折盒身
const rectangles = [
@@ -745,9 +358,8 @@ const SvgBox = props => {
{ x: 0 + scaledWidth + scaledHeight, y: 0, width: scaledWidth, height: scaledDeep },
];
rectangles.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
+ svg.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
});
- svg.appendChild(g);
let pathList = [];
// 上方盒舌
pathList.push(createUpperBoxTongueLeft(sfhs?.type, scaledHeight, -dSFHS * scale, scaledWidth, 0));
@@ -760,18 +372,18 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth + scaledHeight / 2, scaledDeep + (dXFHS / 2 - 5) * scales, 10 * scales, dSFHS));
}
// 左边贴边
- pathList.push(createTrapezoidLeft(zbtb?.type, scaledDeep, -dZTBW * scale, 0, 0, dSFHS * scale, dXFHS * scale));
+ pathList.push(createTrapezoidLeft(zbtb?.type, scaledDeep, -dZTBW * scale, 0, 0));
if (zbtb?.type && dZTBW) {
pathList.push(createText(-dZTBW / 2, scaledDeep / 2, 10 * scales, dZTBW));
}
// 右边贴边
- pathList.push(createTrapezoidRight(ybtb?.type, scaledDeep, dYTBW * scale, scaledWidth * 2 + scaledHeight, 0, dSFHS * scale, dXFHS * scale));
+ pathList.push(createTrapezoidRight(ybtb?.type, scaledDeep, dYTBW * scale, scaledWidth * 2 + scaledHeight, 0));
if (zbtb?.type && dYTBW) {
pathList.push(createText(scaledWidth * 2 + scaledHeight + dYTBW / 2, scaledDeep / 2, 10 * scales, dYTBW));
}
// 左上部件
pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledHeight, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value) || (zsbj?.type === "3006" && zsbj?.value) || (zsbj?.type === "3007" && zsbj?.value)) {
+ if (zsbj?.type === "3001" && zsbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
pathList.push(createText(scaledWidth / 2, -scaledHeight - dZSCW / 2 + 4, 10 * scales, dZSCW));
@@ -792,10 +404,10 @@ const SvgBox = props => {
}
// 右上部件
pathList.push(createDynamicTopLeft(ysbj?.type, scaledWidth, -scaledHeight, -dYSCW * scale, scaledWidth + scaledHeight, 0));
- if ((ysbj?.type === "6001" && ysbj?.value) || (ysbj?.type === "6006" && ysbj?.value) || (ysbj?.type === "6007" && ysbj?.value)) {
+ if (ysbj?.type === "6001" && ysbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth + scaledHeight + scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, -scaledHeight - dYSCW / 2, 10 * scales, dYSCW));
+ pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, -scaledHeight - dYSCW / 2 + 4, 10 * scales, dYSCW));
} else if (ysbj?.type === "6004" && ysbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth + scaledHeight + scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
@@ -815,10 +427,10 @@ const SvgBox = props => {
}
// 左下部件-
pathList.push(createDynamicTopLeft(zxbj?.type, scaledWidth, scaledHeight, dZXCW * scale, 0, scaledDeep));
- if ((zxbj?.type === "4001" && zxbj?.value) || (zxbj?.type === "4006" && zxbj?.value) || (zxbj?.type === "4007" && zxbj?.value)) {
+ if (zxbj?.type === "4001" && zxbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, scaledDeep + scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createText(scaledWidth / 2, scaledDeep + scaledHeight + dZXCW / 2, 10 * scales, dZXCW));
+ pathList.push(createText(scaledWidth / 2, scaledDeep + scaledHeight + dZXCW / 2 - 4, 10 * scales, dZXCW));
} else if (zxbj?.type === "4004" && zxbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, scaledDeep + scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
@@ -835,7 +447,7 @@ const SvgBox = props => {
}
// 右下部件
pathList.push(createDynamicTopLeft(yxbj?.type, scaledWidth, scaledHeight, dYXCW, scaledWidth + scaledHeight, scaledDeep));
- if ((yxbj?.type === "7001" && yxbj?.value) || (yxbj?.type === "7006" && yxbj?.value) || (yxbj?.type === "7007" && yxbj?.value)) {
+ if (yxbj?.type === "7001" && yxbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth + scaledHeight + scaledWidth * 0.2, scaledDeep + scaledHeight / 2, scales));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.2 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
pathList.push(createText(scaledWidth + scaledHeight + scaledWidth * 0.5, scaledDeep + scaledHeight + dYXCW / 2 - 4, 10 * scales, dYXCW));
@@ -875,9 +487,8 @@ const SvgBox = props => {
}
pathList.forEach(x => {
- g.appendChild(x);
+ svg.appendChild(x);
});
- svg.appendChild(g);
} else if (Number(svgType) === 3) {
// 双折盒
const rectangles = [
@@ -886,9 +497,8 @@ const SvgBox = props => {
{ x: 0 + scaledWidth + scaledHeight, y: 0, width: scaledHeight, height: scaledDeep },
];
rectangles.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
+ svg.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
});
- svg.appendChild(g);
let pathList = [];
// 上方盒舌
pathList.push(createUpperBoxTongueLeft(sfhs?.type, scaledHeight, -dSFHS * scale, 0, 0));
@@ -905,18 +515,18 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth + scaledHeight + scaledHeight / 2, scaledDeep + (dXFHS / 2 - 5) * scales, 10 * scales, dXFHS));
}
// 左边贴边
- pathList.push(createTrapezoidLeft(zbtb?.type, scaledDeep, -dZTBW * scale, 0, 0, dSFHS * scale, dXFHS * scale));
+ pathList.push(createTrapezoidLeft(zbtb?.type, scaledDeep, -dZTBW * scale, 0, 0));
if (zbtb?.type && dZTBW) {
pathList.push(createText(-dZTBW / 2, scaledDeep / 2, 10 * scales, dZTBW));
}
// 右边贴边
- pathList.push(createTrapezoidRight(ybtb?.type, scaledDeep, dYTBW * scale, scaledWidth + scaledHeight * 2, 0, dSFHS * scale, dXFHS * scale));
+ pathList.push(createTrapezoidRight(ybtb?.type, scaledDeep, dYTBW * scale, scaledWidth + scaledHeight * 2, 0));
if (zbtb?.type && dYTBW) {
pathList.push(createText(scaledWidth + scaledHeight * 2 + dYTBW / 2, scaledDeep / 2, 10 * scales, dYTBW));
}
// 左下部件-
pathList.push(createDynamicTopLeft(zxbj?.type, scaledWidth, scaledHeight, dZXCW * scale, scaledHeight, scaledDeep));
- if ((zxbj?.type === "4001" && zxbj?.value) || (zxbj?.type === "4006" && zxbj?.value) || (zxbj?.type === "4007" && zxbj?.value)) {
+ if (zxbj?.type === "4001" && zxbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledHeight + scaledWidth * 0.2, scaledDeep + scaledHeight / 2, scales));
pathList.push(createText(scaledHeight + scaledWidth * 0.2 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
pathList.push(createText(scaledHeight + scaledWidth * 0.2 + 10 * scales, scaledDeep + scaledHeight / 2, 10 * scales, "W"));
@@ -937,10 +547,10 @@ const SvgBox = props => {
}
// 右上部件
pathList.push(createDynamicTopLeft(ysbj?.type, scaledWidth, -scaledHeight, -dYSCW * scale, scaledHeight, 0));
- if ((ysbj?.type === "6001" && ysbj?.value) || (ysbj?.type === "6006" && ysbj?.value) || (ysbj?.type === "6007" && ysbj?.value)) {
+ if (ysbj?.type === "6001" && ysbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledHeight + scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledHeight + scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createText(scaledHeight + scaledWidth * 0.5, -scaledHeight - dYSCW / 2, 10 * scales, dYSCW));
+ pathList.push(createText(scaledHeight + scaledWidth * 0.5, -scaledHeight - dYSCW / 2 + 4, 10 * scales, dYSCW));
} else if (ysbj?.type === "6004" && ysbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledHeight + scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledHeight + scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
@@ -970,12 +580,10 @@ const SvgBox = props => {
}
pathList.forEach(x => {
- g.appendChild(x);
+ svg.appendChild(x);
});
- svg.appendChild(g);
- } else if (Number(svgType) === 4) {
- g.appendChild(createFullTelescope(scaledWidth, scaledHeight, scaledDeep, 0, 0));
- svg.appendChild(g);
+ } else {
+ svg.appendChild(createFullTelescope(scaledWidth, scaledHeight, scaledDeep, 0, 0));
// createFullTelescope
let pathList = [];
// 上方盒舌
@@ -994,7 +602,7 @@ const SvgBox = props => {
}
// 上方部件
pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledDeep, -dZSCW * scale, 0, -scaledDeep));
- if ((zsbj?.type === "3001" && zsbj?.value) || (zsbj?.type === "3006" && zsbj?.value) || (zsbj?.type === "3007" && zsbj?.value)) {
+ if (zsbj?.type === "3001" && zsbj?.value) {
pathList.push(createDoubleArrow(scaledDeep, scaledWidth * 0.2, -scaledDeep - scaledDeep / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledDeep - scaledDeep / 2, 10 * scales, "D"));
// 插位值
@@ -1016,12 +624,10 @@ const SvgBox = props => {
pathList.push(createText(scaledWidth * 0.1 + 10 * scales, -scaledDeep - scaledDeep / 2, 10 * scales, "D"));
pathList.push(createDoubleArrow(scaledDeep, scaledWidth * 0.8, -(scaledDeep * 2 + scaledDeep / 2), scales));
pathList.push(createText(scaledWidth * 0.8 + 10 * scales, -(scaledDeep * 2 + scaledDeep / 2), 10 * scales, "D"));
- } else if (zsbj?.type && dZSCW) {
- pathList.push(createText(scaledWidth / 2, -scaledDeep - dZSCW / 2 + 4, 10 * scales, dZSCW));
}
// 左边部件
pathList.push(createFull(zxbj?.type, scaledHeight, -scaledDeep, -dZXCW, -scaledDeep, 0));
- if ((zxbj?.type === "4001" && dZXCW) || (zxbj?.type === "4006" && dZXCW) || (zxbj?.type === "4007" && dZXCW)) {
+ if (zxbj?.type === "4001" && dZXCW) {
pathList.push(createHorizontalDoubleArrow(scaledDeep, -scaledDeep - scaledDeep / 2, scaledHeight * 0.8, scales));
pathList.push(createText(-scaledDeep - scaledDeep / 2, scaledHeight * 0.8 + 5, 10 * scales, "D"));
pathList.push(createText(-scaledDeep - scaledDeep - dZXCW / 2, scaledHeight * 0.5, 10 * scales, dZXCW));
@@ -1042,7 +648,7 @@ const SvgBox = props => {
}
// 右边
pathList.push(createFull(ysbj?.type, scaledHeight, scaledDeep, dYSCW, scaledWidth + scaledDeep, 0));
- if ((ysbj?.type === "6001" && dYSCW) || (ysbj?.type === "6006" && dYSCW) || (ysbj?.type === "6007" && dYSCW)) {
+ if (ysbj?.type === "6001" && dYSCW) {
pathList.push(createHorizontalDoubleArrow(scaledDeep, scaledWidth + scaledDeep + scaledDeep / 2, scaledHeight * 0.8, scales));
pathList.push(createText(scaledWidth + scaledDeep + scaledDeep / 2, scaledHeight * 0.8 + 5, 10 * scales, "D"));
pathList.push(createText(scaledWidth + scaledDeep + scaledDeep + dYSCW / 2, scaledHeight * 0.5, 10 * scales, dYSCW));
@@ -1062,7 +668,7 @@ const SvgBox = props => {
}
// 下方部件
pathList.push(createDynamicTopLeft(yxbj?.type, scaledWidth, scaledDeep, dYXCW * scale, 0, scaledHeight + scaledDeep));
- if ((yxbj?.type === "7001" && yxbj?.value) || (yxbj?.type === "7006" && yxbj?.value) || (yxbj?.type === "7007" && yxbj?.value)) {
+ if (yxbj?.type === "7001" && yxbj?.value) {
pathList.push(createDoubleArrow(scaledDeep, scaledWidth * 0.2, scaledHeight + scaledDeep + scaledDeep / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, scaledHeight + scaledDeep + scaledDeep / 2, 10 * scales, "D"));
// 插位值
@@ -1099,574 +705,452 @@ const SvgBox = props => {
pathList.push(createText(-scaledDeep / 2, scaledHeight * 0.3 + 10, 10 * scales, "D"));
}
pathList.forEach(x => {
- g.appendChild(x);
- });
- svg.appendChild(g);
- } else if (Number(svgType) === 5) {
- const rectangles = [
- { x: 0, y: 0, width: scaledHeight, height: scaledWidth },
- { x: 0 + scaledHeight, y: 0, width: scaledDeep, height: scaledWidth },
- { x: 0 + scaledHeight + scaledDeep, y: 0, width: scaledHeight, height: scaledWidth },
- { x: 0 + scaledHeight * 2 + scaledDeep, y: 0, width: scaledDeep, height: scaledWidth },
- ];
- rectangles.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
- });
- svg.appendChild(g);
- let pathList = [];
- // 上方盒舌
- pathList.push(createUpperBoxTongueLeft(sfhs?.type, scaledDeep, -dSFHS * scale, scaledHeight, 0));
- pathList.push(createUpperBoxTongueLeft(sfhs?.type, -scaledDeep, -dSFHS * scale, scaledHeight * 2 + scaledDeep * 2, 0));
- if (sfhs?.type && dSFHS) {
- pathList.push(createText(scaledHeight + scaledDeep / 2, -(dSFHS / 2 - 5) * scales, 10 * scales, dSFHS));
- pathList.push(createText(scaledHeight * 2 + scaledDeep + scaledDeep / 2, -(dSFHS / 2 - 5) * scales, 10 * scales, dSFHS));
- }
- // 下方盒舌
-
- pathList.push(createUpperBoxTongueLeft(xfhs?.type, scaledDeep, dXFHS * scale, scaledHeight, scaledWidth));
- pathList.push(createUpperBoxTongueLeft(xfhs?.type, -scaledDeep, dXFHS * scale, scaledHeight * 2 + scaledDeep * 2, scaledWidth));
- if (xfhs?.type && dXFHS) {
- pathList.push(createText(scaledHeight + scaledDeep / 2, scaledWidth + (dXFHS / 2) * scales, 10 * scales, dXFHS));
- pathList.push(createText(scaledHeight * 2 + scaledDeep + scaledDeep / 2, scaledWidth + (dXFHS / 2) * scales, 10 * scales, dXFHS));
- }
-
- // 左边贴边
- pathList.push(createTrapezoidLeft(zbtb?.type, scaledWidth, -dZTBW * scale, 0, 0, dSFHS * scale, dXFHS * scale));
- if (zbtb?.type && dZTBW) {
- pathList.push(createText(-dZTBW * 0.4, scaledWidth / 2, 10 * scales, dZTBW));
- }
- // 右边贴边
- pathList.push(createTrapezoidRight(ybtb?.type, scaledWidth, dYTBW * scale, scaledHeight * 2 + scaledDeep * 2, 0, dSFHS * scale, dXFHS * scale));
- if (ybtb?.type && dYTBW) {
- pathList.push(createText(scaledHeight * 2 + scaledDeep * 2 + dYTBW * 0.4, scaledWidth / 2, 10 * scales, dYTBW));
- }
- // 左上部件
- pathList.push(createDynamicTopLeft(zsbj?.type, scaledHeight, -scaledDeep, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value) || (zsbj?.type === "3006" && zsbj?.value) || (zsbj?.type === "3007" && zsbj?.value)) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.2, -scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight * 0.2 + 10 * scales, -scaledDeep / 2, 10 * scales, "D"));
- // 插位值
- pathList.push(createText(scaledHeight / 2, -scaledDeep - dZSCW / 2 + 4, 10 * scales, dZSCW));
- } else if (zsbj?.type === "3002" && dZSCW) {
- pathList.push(createText(scaledHeight / 2, -dZSCW / 2 + 4, 10 * scales, dZSCW));
- } else if (zsbj?.type === "3003" && dZSCW) {
- pathList.push(createText(scaledHeight / 2, -dZSCW / 2 + 4, 10 * scales, dZSCW));
- } else if (zsbj?.type === "3004" && zsbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.2, -scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight * 0.2 + 10 * scales, -scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.85, -(scaledDeep + scaledDeep / 2), scales));
- pathList.push(createText(scaledHeight * 0.85 + 10 * scales, -(scaledDeep + scaledDeep / 2), 10 * scales, "D"));
- pathList.push(createText(scaledHeight * 0.3, -(scaledDeep * 2) - dZSCW / 2 + 4, 10 * scales, dZSCW));
- } else if (zsbj?.type === "3005" && zsbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.1, -scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight * 0.1 + 10 * scales, -scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.8, -(scaledDeep + scaledDeep / 2), scales));
- pathList.push(createText(scaledHeight * 0.8 + 10 * scales, -(scaledDeep + scaledHeight / 2), 10 * scales, "D"));
- } else if (zsbj?.type && dZSCW) {
- pathList.push(createText(scaledHeight / 2, -dZSCW / 2 + 4, 10 * scales, dZSCW));
- }
- // 右上部件
- pathList.push(createDynamicTopLeft(ysbj?.type, scaledHeight, -scaledDeep, -dYSCW * scale, scaledHeight + scaledDeep, 0));
- if ((ysbj?.type === "6001" && ysbj?.value) || (ysbj?.type === "6006" && ysbj?.value) || (ysbj?.type === "6007" && ysbj?.value)) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.2, -scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.2 + 10 * scales, -scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.5, -scaledDeep - dYSCW / 2, 10 * scales, dYSCW));
- } else if (ysbj?.type === "6002" && dYSCW) {
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.5, -dYSCW / 2 + 4, 10 * scales, dYSCW));
- } else if (ysbj?.type === "6003" && dYSCW) {
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.5, -dYSCW / 2 + 4, 10 * scales, dYSCW));
- } else if (ysbj?.type === "6004" && ysbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.2, -scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.2 + 10 * scales, -scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.85, -(scaledDeep + scaledDeep / 2), scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.85 + 10 * scales, -(scaledDeep + scaledDeep / 2), 10 * scales, "D"));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.3, -(scaledDeep * 2) - dYSCW / 2 + 4, 10 * scales, dYSCW));
- } else if (ysbj?.type === "6005" && ysbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.1, -scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.1 + 10 * scales, -scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.8, -(scaledDeep + scaledDeep / 2), scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.8 + 10 * scales, -(scaledDeep + scaledDeep / 2), 10 * scales, "D"));
- } else if (ysbj?.type && dYSCW) {
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.5, -dYSCW / 2 + 4, 10 * scales, dYSCW));
- }
- // 左下部件-
-
- if (!(hdzj && hdzj.type)) {
- pathList.push(createDynamicTopLeft(zxbj?.type, scaledHeight, scaledDeep, dZXCW * scale, 0, scaledWidth));
- if ((zxbj?.type === "4001" && zxbj?.value) || (zxbj?.type === "4006" && zxbj?.value) || (zxbj?.type === "4007" && zxbj?.value)) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.2, scaledWidth + scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight * 0.2 + 10 * scales, scaledWidth + scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createText(scaledHeight / 2, scaledWidth + scaledDeep + dZXCW / 2 - 4, 10 * scales, dZXCW));
- } else if (zxbj?.type === "4002" && dZXCW) {
- pathList.push(createText(scaledHeight / 2, scaledWidth + dZXCW / 2 - 4, 10 * scales, dZXCW));
- } else if (zxbj?.type === "4003" && dZXCW) {
- pathList.push(createText(scaledHeight / 2, scaledWidth + dZXCW / 2 - 4, 10 * scales, dZXCW));
- } else if (zxbj?.type === "4004" && zxbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.2, scaledWidth + scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight * 0.2 + 10 * scales, scaledWidth + scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.85, scaledWidth + (scaledDeep + scaledDeep / 2), scales));
- pathList.push(createText(scaledHeight * 0.85 + 10 * scales, scaledHeight + (scaledWidth + scaledWidth / 2), 10 * scales, "D"));
- pathList.push(createText(scaledHeight * 0.3, scaledWidth + scaledDeep * 2 + dZXCW / 2 - 4, 10 * scales, dZXCW));
- } else if (zxbj?.type === "4005" && zxbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.1, scaledWidth + scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight * 0.1 + 10 * scales, scaledWidth + scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight * 0.8, scaledWidth + (scaledDeep + scaledDeep / 2), scales));
- pathList.push(createText(scaledHeight * 0.8 + 10 * scales, scaledWidth + (scaledDeep + scaledDeep / 2), 10 * scales, "D"));
- } else if (zxbj?.type && dZXCW) {
- pathList.push(createText(scaledHeight / 2, scaledWidth + dZXCW / 2 - 4, 10 * scales, dZXCW));
- }
- }
- if (!(hdzj && hdzj.type)) {
- pathList.push(createDynamicTopLeft(yxbj?.type, scaledHeight, scaledDeep, dYXCW * scale, scaledHeight + scaledDeep, scaledWidth));
- if ((yxbj?.type === "7001" && yxbj?.value) || (yxbj?.type === "7006" && yxbj?.value) || (yxbj?.type === "7007" && yxbj?.value)) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.2, scaledWidth + scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.2 + 10 * scales, scaledWidth + scaledDeep / 2, 10 * scales, "D"));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.5, scaledWidth + scaledDeep + dYXCW / 2, 10 * scales, dYXCW));
- } else if (yxbj?.type === "7004" && yxbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledDeep * 0.2, scaledWidth + scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.2 - 10 * scales, scaledWidth + scaledDeep / 2, 10 * scales, "D"));
- pathList.push(
- createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.85, scaledWidth + (scaledDeep + scaledDeep / 2), scales)
- );
- pathList.push(
- createText(scaledHeight + scaledDeep + scaledHeight * 0.85 + 10 * scales, scaledWidth + (scaledDeep + scaledDeep / 2), 10 * scales, "D")
- );
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.3, scaledWidth + scaledDeep * 2 + dYXCW / 2 - 4, 10 * scales, dYXCW));
- } else if (yxbj?.type === "7005" && yxbj?.value) {
- pathList.push(createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.1, scaledWidth + scaledDeep / 2, scales));
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.1 + 10 * scales, scaledWidth + scaledDeep / 2, 10 * scales, "D"));
- pathList.push(
- createDoubleArrow(scaledDeep, scaledHeight + scaledDeep + scaledHeight * 0.8, scaledWidth + (scaledDeep + scaledDeep / 2), scales)
- );
- pathList.push(
- createText(scaledHeight + scaledDeep + scaledHeight * 0.8 + 10 * scales, scaledWidth + (scaledDeep + scaledDeep / 2), 10 * scales, "D")
- );
- } else if (dYXCW && yxbj?.type) {
- pathList.push(createText(scaledHeight + scaledDeep + scaledHeight * 0.5, scaledWidth + dYXCW / 2 - 4, 10 * scales, dYXCW));
- }
- }
- // 右下部件
-
- // 纵向 L
- if (scaledDeep && scaledWidth && scaledHeight) {
- pathList.push(createDoubleArrow(scaledWidth, scaledHeight * 0.8, scaledWidth / 2, scales));
- pathList.push(createText(scaledHeight * 0.8 - 10 * scales, scaledWidth / 2, 10 * scales, "L"));
-
- // 横向 L
- pathList.push(createHorizontalDoubleArrow(scaledHeight, scaledHeight / 2, scaledWidth * 0.3, scales));
- pathList.push(createText(scaledHeight / 2, scaledWidth * 0.3 + 10 * scales, 10 * scales, "W"));
- // W
- pathList.push(createHorizontalDoubleArrow(scaledDeep, scaledHeight + scaledDeep / 2, scaledWidth * 0.5, scale));
- pathList.push(createText(scaledHeight + scaledDeep / 2, scaledWidth * 0.5 + 10 * scales, 10 * scales, "D"));
- }
- pathList.forEach(x => {
- g.appendChild(x);
- });
- svg.appendChild(g);
- // g.setAttribute('transform', `rotate(90, ${viewBoxWidth/2}, ${viewBoxHeight/2})`);
- } else if (Number(svgType) === 6) {
- const rectangles = [{ x: 0, y: 0, width: scaledHeight, height: scaledWidth }];
- rectangles.forEach(rect => {
- g.appendChild(createPathElements(rect.x, rect.y, rect.width, rect.height));
+ svg.appendChild(x);
});
- svg.appendChild(g);
- } else if (Number(svgType) === 7) {
- const rectangles = [{ x: 0, y: 0, width: scaledWidth, height: scaledHeight }];
- rectangles.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
- });
- // svg.appendChild(g);
- let pathList = [];
- // 左上部件
- pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledHeight, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value) || (zsbj?.type === "3006" && zsbj?.value) || (zsbj?.type === "3007" && zsbj?.value)) {
- pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
- pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createText(scaledWidth / 2, -scaledHeight - dZSCW / 2 + 4, 10 * scales, dZSCW));
- } else if (zsbj?.type === "3004" && zsbj?.value) {
- pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
- pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.85, -(scaledHeight + scaledHeight / 2), scales));
- pathList.push(createText(scaledWidth * 0.85 + 10 * scales, -(scaledHeight + scaledHeight / 2), 10 * scales, "W"));
- pathList.push(createText(scaledWidth * 0.3, -(scaledHeight * 2) - dZSCW / 2 + 4, 10 * scales, dZSCW));
- } else if (zsbj?.type === "3005" && zsbj?.value) {
- pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.1, -scaledHeight / 2, scales));
- pathList.push(createText(scaledWidth * 0.1 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
- pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.8, -(scaledHeight + scaledHeight / 2), scales));
- pathList.push(createText(scaledWidth * 0.8 + 10 * scales, -(scaledHeight + scaledHeight / 2), 10 * scales, "W"));
- pathList.push(createText(scaledWidth * 0.8 + 10 * scales, -(scaledHeight + scaledHeight / 2), 10 * scales, "W"));
- } else if (zsbj?.type && dZSCW) {
- pathList.push(createText(scaledWidth / 2, -(dZSCW / 2 - 5), 10 * scales, dZSCW));
- }
- // 右下部件
- pathList.push(createDynamicTopLeft(yxbj?.type, scaledWidth, scaledHeight, dYXCW * scale, 0, scaledHeight));
-
- // 右边
- pathList.push(createFull(ysbj?.type, scaledWidth, scaledHeight, dYSCW * scale, scaledWidth, 0));
- pathList.push(createFull(zxbj?.type, scaledWidth, -scaledHeight, -dZXCW * scale, 0, 0));
-
- pathList.forEach(x => {
- g.appendChild(x);
- });
- svg.appendChild(g);
- } else if (Number(svgType) === 8) {
- const scaleHeadLength = headLength * scale;
- const scaleHeadWidth = headWidth * scale;
- const scaleOrderLength = orderLength * scale;
- const scaleOrderWidth = orderWidth * scale;
- // 获取他的偏移距离
- const leftOffect = boxList.find(x => x.sName === "左偏移")?.value || 0;
- const rightOffect = boxList.find(x => x.sName === "右偏移")?.value || 0;
- const rectangles = [{ x: 0, y: 0, width: scaleHeadLength, height: scaleHeadWidth }];
- rectangles.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
- });
- const rectanglesLeft = [
- { x: scaleHeadLength / 2 - scaleOrderLength - Number(leftOffect), y: scaleHeadWidth, width: scaleOrderLength, height: scaleOrderWidth },
- ];
- rectanglesLeft.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
- });
- const rectanglesRight = [{ x: scaleHeadLength / 2 + Number(rightOffect), y: scaleHeadWidth, width: scaleOrderLength, height: scaleOrderWidth }];
- rectanglesRight.forEach(rect => {
- g.appendChild(createPathElement(rect.x, rect.y, rect.width, rect.height));
- });
-
- // 处理双盒的插位组件
- let pathList = [];
- // 获取左上
- const scw = boxList.find(x => x.sName === "上插位组件");
- const zscw = boxList.find(x => x.sName === "左上插位组件");
- const yscw = boxList.find(x => x.sName === "右上插位组件");
- const zcw = boxList.find(x => x.sName === "左插位组件");
- const ycw = boxList.find(x => x.sName === "右插位组件");
- const zxcw = boxList.find(x => x.sName === "左下插位组件");
- const yxcw = boxList.find(x => x.sName === "右下插位组件");
- const dSCW = scw?.value;
- const dZSCW = zscw?.value;
- const dYSCW = yscw?.value;
- const dZCW = zcw?.value;
- const dYCW = ycw?.value;
- const dZXCW = zxcw?.value;
- const dYXCW = yxcw?.value;
- // 上插位
- pathList.push(createDynamicTopLeft(scw?.type, scaleHeadLength, -scaleHeadWidth, -dSCW * scale, 0, 0));
- if ((scw?.type === "11001" && scw?.value) || (scw?.type === "11006" && scw?.value) || (scw?.type === "11007" && scw?.value)) {
- pathList.push(createDoubleArrow(scaleHeadWidth, scaleHeadWidth * 0.2, -scaleHeadWidth / 2, scales));
- pathList.push(createText(scaleHeadWidth * 0.2 + 10 * scales, -scaleHeadWidth / 2, 10 * scales, "dSHK"));
- pathList.push(createText(scaleHeadLength / 2, -scaleHeadWidth - dSCW / 2 + 4, 10 * scales, dSCW));
- } else if (scw?.type === "11004" && scw?.value) {
- pathList.push(createDoubleArrow(scaleHeadWidth, scaleHeadLength * 0.2, -scaleHeadWidth / 2, scales));
- pathList.push(createText(scaleHeadLength * 0.2 + 10 * scales, -scaleHeadWidth / 2, 10 * scales, "dSHK"));
- pathList.push(createDoubleArrow(scaleHeadWidth, scaleHeadLength * 0.85, -(scaleHeadWidth + scaleHeadWidth / 2), scales));
- pathList.push(createText(scaleHeadLength * 0.5 + 10 * scales, -(scaleHeadWidth + scaleHeadWidth / 2), 10 * scales, "dSHK"));
- pathList.push(createText(scaleHeadLength * 0.3, -(scaleHeadWidth * 2), 10 * scales, dSCW));
- } else if (scw?.type === "11005" && scw?.value) {
- pathList.push(createDoubleArrow(scaleHeadWidth, scaleHeadLength * 0.1, -scaleHeadWidth / 2, scales));
- pathList.push(createText(scaleHeadLength * 0.1 + 10 * scales, -scaleHeadWidth / 2, 10 * scales, "dSHK"));
- pathList.push(createDoubleArrow(scaleHeadWidth, scaleHeadLength * 0.8, -(scaleHeadWidth + scaleHeadWidth / 2), scales));
- pathList.push(createText(scaleHeadLength * 0.8 + 10 * scales, -(scaleHeadWidth + scaleHeadWidth / 2), 10 * scales, "dSHK"));
- pathList.push(createText(scaleHeadLength * 0.8 + 10 * scales, -(scaleHeadWidth + scaleHeadWidth / 2), 10 * scales, "dSHK"));
- } else if (scw?.type && dSCW) {
- pathList.push(createText(scaleHeadLength / 2, -(dSCW / 2 - 5), 10 * scales, dSCW));
- }
- // 左上插位
- pathList.push(createFull(zscw?.type, scaleHeadWidth, -scaleHeadWidth, -dZSCW * scale, 0, 0));
- // 左插位
- pathList.push(
- createFull(
- zcw?.type,
- scaleOrderWidth,
- -scaleOrderWidth,
- -dZCW * scale,
- scaleHeadLength / 2 - scaleOrderLength - Number(leftOffect),
- scaleHeadWidth
- )
- );
- // 左下
- pathList.push(
- createDynamicTopLeft(
- zxcw?.type,
- scaleOrderLength,
- scaleOrderWidth,
- dZXCW * scale,
- scaleHeadLength / 2 - scaleOrderLength - Number(leftOffect),
- scaleHeadWidth + scaleOrderWidth
- )
- );
- // 右上
- pathList.push(createFull(yscw?.type, scaleHeadWidth, scaleHeadWidth, dYSCW * scale, scaleHeadLength, 0));
- // 右插位
- pathList.push(
- createFull(
- ycw?.type,
- scaleOrderWidth,
- scaleOrderWidth,
- dYCW * scale,
- scaleHeadLength / 2 + Number(rightOffect) + scaleOrderLength,
- scaleHeadWidth
- )
- );
- // 右下
- pathList.push(
- createDynamicTopLeft(
- yxcw?.type,
- scaleOrderLength,
- scaleOrderWidth,
- dYXCW * scale,
- scaleHeadLength / 2 + Number(rightOffect),
- scaleHeadWidth + scaleOrderWidth
- )
- );
- if (scaleHeadLength && scaleHeadWidth) {
- pathList.push(createDoubleArrow(scaleHeadWidth, scaleHeadLength * 0.8, scaleHeadWidth / 2, scales));
- pathList.push(createText(scaleHeadLength * 0.8 - 10 * scales, scaleHeadWidth / 2, 10 * scales, "dSHK"));
- pathList.push(createHorizontalDoubleArrow(scaleHeadLength, scaleHeadLength / 2, scaleHeadWidth * 0.7, scales));
- pathList.push(createText(scaleHeadWidth / 2, scaleHeadLength * 0.3 + 10 * scales, 10 * scales, "dSHC"));
- }
- if (scaleOrderLength && scaleOrderWidth) {
- pathList.push(createDoubleArrow(scaleOrderWidth, scaleOrderLength * 0.6 - (leftOffect ), scaleHeadWidth + scaleOrderWidth / 2, scales));
- pathList.push(createText(scaleOrderLength * 0.8 - 10 * scales - (leftOffect ), scaleHeadWidth + scaleOrderWidth / 2, 10 * scales, "dCHK"));
- pathList.push(createHorizontalDoubleArrow(scaleOrderLength, scaleOrderLength / 2 - (leftOffect ), scaleHeadWidth + scaleOrderWidth * 0.7, scales));
- pathList.push(createText(scaleOrderWidth / 2 - (leftOffect ), scaleHeadWidth + scaleOrderLength * 0.8 * scales, 10 * scales, "dCHC"));
- }
-
- pathList.forEach(x => {
- g.appendChild(x);
- });
-
- svg.appendChild(g);
}
};
// 计算头部偏移
const topOffect = (list, length, width, height) => {
- const val = list.filter(x => x.type);
- const sfhs = val.find(x => x.sName === "上方盒舌");
- const zscw = val.find(x => x.sName === "左(上)插位组件");
- const yscw = val.find(x => x.sName === "右(上)插位组件");
- const box = val.find(x => x.sName === "盒身");
- const svg = Number(box?.type);
- if (svg === 6) return 0;
-
- const dZ = Number(zscw?.value) || 0;
- const dY = Number(yscw?.value) || 0;
-
- if (svg === 8) {
- const scw = val.find(x => x.sName === "上插位组件");
- const topsMap = {
- 11001: width + Number(scw?.value),
- 11002: Number(scw?.value),
- 11003: Number(scw?.value),
- 11004: Number(scw?.value) + width * 2,
- 11005: width * 2,
- 11006: Number(scw?.value) + width,
- 11007: Number(scw?.value) + width,
- };
- return topsMap[scw?.type] ?? 0;
- }
- const one = ["6001", "3001", "4001", "7001", "3006", "4006", "6006", "7006", "3007", "4007", "6007", "7007"];
+ // 判断code
+ const valueList = list.filter(x => x.type !== ("" || null));
+ // const titleList = ['上方盒舌','左(上)插位组件','右(上)插位组件']
+ const sfhs = valueList.find(x => x.sName === "上方盒舌");
+ const zscw = valueList.find(x => x.sName === "左(上)插位组件");
+ const yscw = valueList.find(x => x.sName === "右(上)插位组件");
+ let top = 0;
+ const one = ["6001", "3001", "4001", "7001"];
const four = ["6004", "3004", "4004", "7004"];
const five = ["6005", "3005", "4005", "7005"];
-
- const coef = box?.type === "5" ? height : width;
-
- const pick = (cw, d) => {
- const t = cw?.type;
- if (five.includes(t)) return 2 * coef;
- if (four.includes(t)) return 2 * coef + d;
- if (one.includes(t)) return coef + d;
- return d;
- };
-
- let top = 0;
+ const dYSCW = Number(yscw?.value) || 0;
+ const dZSCW = Number(zscw?.value) || 0;
+ // 如果存在插位就不计算盒舌
if (zscw?.type && yscw?.type) {
- const z = pick(zscw, dZ);
- const y = pick(yscw, dY);
- top = Math.max(z, y, sfhs?.value || 0);
+ const max = Math.max(dZSCW, dYSCW);
+ if (five.includes(zscw?.type) || five.includes(yscw?.type)) {
+ top = width * 2;
+ } else if (four.includes(zscw?.type) || four.includes(yscw?.type)) {
+ top = width * 2 + max;
+ } else if (one.includes(zscw?.type) || one.includes(yscw?.type)) {
+ top = width + max;
+ } else {
+ top = max;
+ }
} else if (yscw?.type) {
- top = Math.max(pick(yscw, dY), sfhs?.value || 0);
+ const max = dYSCW;
+ if (five.includes(zscw?.type) || five.includes(yscw?.type)) {
+ top = width * 2;
+ } else if (four.includes(zscw?.type) || four.includes(yscw?.type)) {
+ top = width * 2 + max;
+ } else if (one.includes(zscw?.type) || one.includes(yscw?.type)) {
+ top = width + max;
+ } else {
+ top = max;
+ }
} else if (zscw?.type) {
- top = Math.max(pick(zscw, dZ), sfhs?.value || 0);
+ const max = dZSCW;
+ if (five.includes(zscw?.type) || five.includes(yscw?.type)) {
+ top = width * 2;
+ } else if (four.includes(zscw?.type) || four.includes(yscw?.type)) {
+ top = width * 2 + max;
+ } else if (one.includes(zscw?.type) || one.includes(yscw?.type)) {
+ top = width + max;
+ } else {
+ top = max;
+ }
} else {
- top = sfhs?.value || 0;
+ top = sfhs?.value;
}
-
- if (svg === 4) top += height;
return isNaN(top) ? 0 : top;
};
const bottomOffect = (list, length, width, height) => {
- const val = list.filter(x => x.type);
- const sfhs = val.find(x => x.sName === "下方盒舌");
- const zscw = val.find(x => x.sName === "左(下)插位组件");
- const yscw = val.find(x => x.sName === "右(下)插位组件");
- const hdzj = val.find(x => x.sName === "盒底组件");
- const box = val.find(x => x.sName === "盒身");
- const svg = Number(box?.type);
-
- if (svg === 6) return 0;
- if (hdzj?.type) return Number(hdzj.value);
-
- const dZ = Number(zscw?.value) || 0;
- const dY = Number(yscw?.value) || 0;
- if (svg === 8) {
- const zxcw = val.find(x => x.sName === "左下插位组件");
- const yxcw = val.find(x => x.sName === "右下插位组件");
- const topsMap = {
- 14001: width + Number(zxcw?.value),
- 14002: Number(zxcw?.value),
- 14003: Number(zxcw?.value),
- 14004: Number(zxcw?.value) + width * 2,
- 14005: width * 2,
- 14006: Number(zxcw?.value) + width,
- 14007: Number(zxcw?.value) + width,
- };
- const topsMapRight = {
- 16001: width + Number(yxcw?.value),
- 16002: Number(yxcw?.value),
- 16003: Number(yxcw?.value),
- 16004: Number(yxcw?.value) + width * 2,
- 16005: width * 2,
- 16006: Number(yxcw?.value) + width,
- 16007: Number(yxcw?.value) + width,
- };
- return Math.max(topsMap[zxcw?.type], topsMapRight[yxcw?.type]) ?? 0;
- }
- const one = ["6001", "3001", "4001", "7001", "3006", "4006", "6006", "7006", "3007", "4007", "6007", "7007"];
+ // 判断code
+ const valueList = list.filter(x => x.type !== ("" || null));
+ // const titleList = ['上方盒舌','左(上)插位组件','右(上)插位组件']
+ const sfhs = valueList.find(x => x.sName === "下方盒舌");
+ const zscw = valueList.find(x => x.sName === "左(下)插位组件");
+ const yscw = valueList.find(x => x.sName === "右(下)插位组件");
+ const hdzj = valueList.find(x => x.sName === "盒底组件");
+ // 将找到的对象放入数组中，并过滤掉 undefined 值
+ // 使用 reduce 方法比较 value 属性，找出最大的对象
+ let top = 0;
+ const one = ["6001", "3001", "4001", "7001"];
const four = ["6004", "3004", "4004", "7004"];
const five = ["6005", "3005", "4005", "7005"];
-
- const coef = box?.type === "5" ? height : width;
-
- const pick = (cw, d) => {
- const t = cw?.type;
- if (five.includes(t)) return 2 * coef;
- if (four.includes(t)) return 2 * coef + d;
- if (one.includes(t)) return coef + d;
- return d;
- };
-
- let top = 0;
+ const dYSCW = Number(yscw?.value) || 0;
+ const dZSCW = Number(zscw?.value) || 0;
+ if (hdzj?.type) {
+ return Number(hdzj?.value);
+ }
if (zscw?.type && yscw?.type) {
- const z = pick(zscw, dZ);
- const y = pick(yscw, dY);
- top = Math.max(z, y, sfhs?.value || 0);
+ const max = Math.max(dZSCW, dYSCW);
+ if (five.includes(zscw?.type) || five.includes(yscw?.type)) {
+ top = width * 2;
+ } else if (four.includes(zscw?.type) || four.includes(yscw?.type)) {
+ top = width * 2 + max;
+ } else if (one.includes(zscw?.type) || one.includes(yscw?.type)) {
+ top = width + max;
+ } else {
+ top = max;
+ }
} else if (yscw?.type) {
- top = Math.max(pick(yscw, dY), sfhs?.value || 0);
+ const max = dYSCW;
+ if (five.includes(zscw?.type) || five.includes(yscw?.type)) {
+ top = width * 2;
+ } else if (four.includes(zscw?.type) || four.includes(yscw?.type)) {
+ top = width * 2 + max;
+ } else if (one.includes(zscw?.type) || one.includes(yscw?.type)) {
+ top = width + max;
+ } else {
+ top = max;
+ }
} else if (zscw?.type) {
- top = Math.max(pick(zscw, dZ), sfhs?.value || 0);
+ const max = dZSCW;
+ if (five.includes(zscw?.type) || five.includes(yscw?.type)) {
+ top = width * 2;
+ } else if (four.includes(zscw?.type) || four.includes(yscw?.type)) {
+ top = width * 2 + max;
+ } else if (one.includes(zscw?.type) || one.includes(yscw?.type)) {
+ top = width + max;
+ } else {
+ top = max;
+ }
} else {
- top = sfhs?.value || 0;
+ top = sfhs?.value;
}
+ // if (five.includes(zscw?.type) || five.includes(yscw?.type)) {
+ // top = width * 2;
+ // } else if (four.includes(zscw?.type) || four.includes(yscw?.type)) {
+ // if (dZSCW && dYSCW) {
+ // const max = Math.max(dZSCW, dYSCW);
+ // top = width * 2 + max;
+ // } else if (dZSCW && !dYSCW) {
+ // top = width * 2 + dZSCW;
+ // } else if (!dZSCW && dYSCW) {
+ // top = width * 2 + dYSCW;
+ // }
+ // } else if (one.includes(zscw?.type) || one.includes(yscw?.type)) {
+ // if (dZSCW && dYSCW) {
+ // const max = Math.max(dZSCW, dYSCW);
+ // top = width + max;
+ // } else if (dZSCW && !dYSCW) {
+ // top = width + dZSCW;
+ // } else if (!dZSCW && dYSCW) {
+ // top = width + dYSCW;
+ // }
+ // } else {
+ // if (dZSCW && !dYSCW) {
+ // top = Number(dZSCW);
+ // } else if (!dZSCW && dYSCW) {
+ // top = Number(dYSCW);
+ // } else {
+ // top = Number(sfhs?.value);
+ // }
+ // }
- if (svg === 4) top += height;
return isNaN(top) ? 0 : top;
};
// 上方盒舌左边
- const createUpperBoxTongueLeft = (type, w, h, ox, oy) => {
- if (!h) return createNoneProject();
- const fnMap = {
- 1001: createLineWeltTop,
- 1002: createIsoscelesTrapezoidWeltTop,
- 1003: createTrapezoidWeltTop,
- 1004: createFoldWeltTop,
- 1005: createRoundedCornersWeltTop,
- 2001: createLineWeltTop,
- 2002: createIsoscelesTrapezoidWeltTop,
- 2003: createTrapezoidWeltTop,
- 2004: createFoldWeltTop,
- 2005: createRoundedCornersWeltTop,
- };
- return (fnMap[type] || createNoneProject)(w, h, ox, oy);
+ const createUpperBoxTongueLeft = (upperBoxTongueType, width, height, offsetX, offsetY) => {
+ if (!height) return createNoneProject();
+ // 根据不同类型创建不同形状的盒舌 upperBoxTongueType 如果null则返回
+ let data = {};
+ switch (upperBoxTongueType) {
+ case "1001":
+ data = createLineWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "1002":
+ data = createIsoscelesTrapezoidWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "1003":
+ data = createTrapezoidWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "1004":
+ data = createFoldWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "1005":
+ data = createRoundedCornersWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "2001":
+ data = createLineWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "2002":
+ data = createIsoscelesTrapezoidWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "2003":
+ data = createTrapezoidWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "2004":
+ data = createFoldWeltTop(width, height, offsetX, offsetY);
+ break;
+ case "2005":
+ data = createRoundedCornersWeltTop(width, height, offsetX, offsetY);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
+ };
+ // 右上方盒舌
+ const createUpperBoxTongueRight = (upperBoxTongueType, width, height, deep, size, offsetX, offsetY) => {
+ if (!size) return createNoneProject();
+ // 根据不同类型创建不同形状的盒舌 upperBoxTongueType 如果null则返回
+ let data = {};
+ switch (upperBoxTongueType) {
+ case "1001":
+ data = createTopTongueType1(-deep, offsetX, offsetY, -size, -3, -2);
+ break;
+ case 1:
+ data = createTopTongueType1(-deep, offsetX, offsetY, -size, -3, -2);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
};
-
// 右上方盒舌
+ const createBottomBoxTongueRight = (upperBoxTongueType, width, height, deep, size, offsetX, offsetY) => {
+ if (!size) return createNoneProject();
+ // 根据不同类型创建不同形状的盒舌 upperBoxTongueType 如果null则返回
+ let data = {};
+ switch (upperBoxTongueType) {
+ case 0:
+ data = createTopTongue(-deep, offsetX, offsetY, size, -2, 5, 0, true);
+ break;
+ case 1:
+ data = createTopTongueType1(-deep, offsetX, offsetY, -size, -3, -2);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
+ };
+ const createBottomBoxTongueLeft = (upperBoxTongueType, width, height, deep, size, offsetX, offsetY) => {
+ if (!size) return createNoneProject();
+ // 根据不同类型创建不同形状的盒舌 upperBoxTongueType 如果null则返回
+ let data = {};
+ switch (upperBoxTongueType) {
+ case 0:
+ data = createTopTongue(deep, offsetX, offsetY, size, 2, 5, 1, false);
+ break;
+ case 1:
+ data = createTopTongueType1(deep, offsetX, offsetY, -size, 3, 2);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
+ };
// 左边贴位
- const createTrapezoidLeft = (trapezoidLeftType, height, size, offsetX, offsetY, dSFHS, dXFHS) => {
+ const createTrapezoidLeft = (trapezoidLeftType, height, size, offsetX, offsetY) => {
if (!size) return createNoneProject();
- const fnMap = {
- 8001: createWelt,
- 8002: createWelt1,
- 8003: createWelt2,
- 8004: createWelt3,
- 8005: createWelt4,
- };
- const fn = fnMap[trapezoidLeftType];
- return fn
- ? trapezoidLeftType === "8005"
- ? fn(height, size, offsetX, offsetY, dSFHS, dXFHS)
- : fn(height, size, offsetX, offsetY)
- : createNoneProject();
+ let data = {};
+ switch (trapezoidLeftType) {
+ case "8001":
+ data = createWelt(height, size, offsetX, offsetY);
+ break;
+ case "8002":
+ data = createWelt1(height, size, offsetX, offsetY);
+ break;
+ case "8003":
+ data = createWelt2(height, size, offsetX, offsetY);
+ break;
+ case "8004":
+ data = createWelt3(height, size, offsetX, offsetY);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
};
// 右边贴位
- const createTrapezoidRight = (trapezoidLeftType, height, size, offsetX, offsetY, dSFHS, dXFHS) => {
- const suffix = trapezoidLeftType;
- const fnMap = {
- 9001: createWelt,
- 9002: createWelt1,
- 9003: createWelt2Right,
- 9004: createWelt3Right,
- 9005: createWelt4Right,
- };
- const fn = fnMap[suffix];
- return fn ? (suffix === "9005" ? fn(height, size, offsetX, offsetY, dSFHS, dXFHS) : fn(height, size, offsetX, offsetY)) : createNoneProject();
+ const createTrapezoidRight = (trapezoidLeftType, height, size, offsetX, offsetY) => {
+ if (!size) return createNoneProject();
+ let data = {};
+ switch (trapezoidLeftType) {
+ case "9001":
+ data = createWelt(height, size, offsetX, offsetY);
+ break;
+ case "9002":
+ data = createWelt1(height, size, offsetX, offsetY);
+ break;
+ case "9003":
+ data = createWelt2Right(height, size, offsetX, offsetY);
+ break;
+ case "9004":
+ data = createWelt3Right(height, size, offsetX, offsetY);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
};
// 左上部件
const createDynamicTopLeft = (trapezoidLeftType, width, height, size, offsetX, offsetY) => {
if (!size) return createNoneProject();
-
- const suffix = trapezoidLeftType?.slice(-2);
- const fnMap = {
- "01": createBoxComponentNew,
- "02": createBoxComponentNew1,
- "03": createBoxComponentNew2,
- "04": createBoxComponentNew3,
- "05": createBoxComponentNew4,
- "06": createBoxComponentNew5,
- "07": createBoxComponentNew6,
- };
-
- const fn = fnMap[suffix];
- return fn ? fn(width, height, size, offsetX, offsetY) : createNoneProject();
+ let data = {};
+ switch (trapezoidLeftType) {
+ case "3001":
+ data = createBoxComponentNew(width, height, size, offsetX, offsetY);
+ break;
+ case "3002":
+ data = createBoxComponentNew1(width, height, size, offsetX, offsetY);
+ break;
+ case "3003":
+ data = createBoxComponentNew2(width, height, size, offsetX, offsetY);
+ break;
+ case "3004":
+ data = createBoxComponentNew3(width, height, size, offsetX, offsetY);
+ break;
+ case "3005":
+ data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
+ break;
+ case "4001":
+ data = createBoxComponentNew(width, height, size, offsetX, offsetY);
+ break;
+ case "4002":
+ data = createBoxComponentNew1(width, height, size, offsetX, offsetY);
+ break;
+ case "4003":
+ data = createBoxComponentNew2(width, height, size, offsetX, offsetY);
+ break;
+ case "4004":
+ data = createBoxComponentNew3(width, height, size, offsetX, offsetY);
+ break;
+ case "4005":
+ data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
+ break;
+ case "6001":
+ data = createBoxComponentNew(width, height, size, offsetX, offsetY);
+ break;
+ case "6002":
+ data = createBoxComponentNew1(width, height, size, offsetX, offsetY);
+ break;
+ case "6003":
+ data = createBoxComponentNew2(width, height, size, offsetX, offsetY);
+ break;
+ case "6004":
+ data = createBoxComponentNew3(width, height, size, offsetX, offsetY);
+ break;
+ case "6005":
+ data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
+ break;
+ case "7001":
+ data = createBoxComponentNew(width, height, size, offsetX, offsetY);
+ break;
+ case "7002":
+ data = createBoxComponentNew1(width, height, size, offsetX, offsetY);
+ break;
+ case "7003":
+ data = createBoxComponentNew2(width, height, size, offsetX, offsetY);
+ break;
+ case "7004":
+ data = createBoxComponentNew3(width, height, size, offsetX, offsetY);
+ break;
+ case "7005":
+ data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
+ };
+ // 右上部件
+ const createDynamicTopRight = (trapezoidLeftType, width, height, size, offsetX, offsetY) => {
+ if (!size) return createNoneProject();
+ let data = {};
+ switch (trapezoidLeftType) {
+ case "6001":
+ data = createBoxComponentNew(width, height, size, offsetX, offsetY);
+ break;
+ case 1:
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
};
-
// 盒底组件 特殊的盒底组件
const createBoxBottomComponent = (trapezoidLeftType, width, deep, size, offsetX, offsetY) => {
- const suffix = trapezoidLeftType?.slice(-2);
- const fnMap = {
- "01": createRightAngleBoxBottomComponent,
- "02": createBoxBottomComponent1,
- "03": createBoxBottomComponent2,
- "04": createBoxBottomComponent3,
- "05": createBoxBottomComponent4,
- "06": createBoxBottomComponent5,
- "07": createBoxBottomComponent6,
- };
- return (fnMap[suffix] || createNoneProject)(width, deep, size, offsetX, offsetY);
+ let data = {};
+ switch (trapezoidLeftType) {
+ case "5001":
+ data = createRightAngleBoxBottomComponent(width, deep, size, offsetX, offsetY);
+ break;
+ case "5002":
+ data = createBoxBottomComponent1(width, deep, size, offsetX, offsetY);
+ break;
+ case "5003":
+ data = createBoxBottomComponent2(width, deep, size, offsetX, offsetY);
+ break;
+ case "5004":
+ data = createBoxBottomComponent3(width, deep, size, offsetX, offsetY);
+ break;
+ case "5005":
+ data = createBoxBottomComponent4(width, deep, size, offsetX, offsetY);
+ break;
+ case "5006":
+ data = createBoxBottomComponent5(width, deep, size, offsetX, offsetY);
+ break;
+ case "5007":
+ data = createBoxBottomComponent6(width, deep, size, offsetX, offsetY);
+ break;
+ default:
+ data = createNoneProject();
+ break;
+ }
+ return data;
};
+
// 天地盒部件
const createFull = (trapezoidLeftType, width, deep, size, offsetX, offsetY) => {
+ let data = {};
if (!size) return createNoneProject();
+ switch (trapezoidLeftType) {
+ case "4001":
+ data = createBoxComponentNewFull(width, deep, size, offsetX, offsetY);
+ break;
+ case "4002":
+ data = createBoxComponentNewFull1(width, size, offsetX, offsetY);
+ break;
+ case "4003":
+ data = createBoxComponentNewFull2(width, size, offsetX, offsetY);
+ break;
+ case "4004":
+ data = createBoxComponentNewFul3(width, deep, size, offsetX, offsetY);
+ break;
+ case "4005":
+ data = createBoxComponentNewFul4(width, deep, size, offsetX, offsetY);
+ break;
- const suffix = trapezoidLeftType?.slice(-2);
- switch (suffix) {
- case "01": // 4001,10001,12001,13001,15001,6001
- return createBoxComponentNewFull(width, deep, size, offsetX, offsetY);
- case "02": // 4002,10002,11002,12002,13002,15002,6002
- return createBoxComponentNewFull1(width, size, offsetX, offsetY);
- case "03": // 4003,6003
- return createBoxComponentNewFull2(width, size, offsetX, offsetY);
- case "04": // 4004,6004
- return createBoxComponentNewFul3(width, deep, size, offsetX, offsetY);
- case "05": // 4005,6005
- return createBoxComponentNewFul4(width, deep, size, offsetX, offsetY);
- case "06": // 4006,6006
- return createBoxComponentNewFul5(width, deep, size, offsetX, offsetY);
- case "07": // 4007,6007
- return createBoxComponentNewFul6(width, deep, size, offsetX, offsetY);
+ case "6001":
+ data = createBoxComponentNewFull(width, deep, size, offsetX, offsetY);
+ break;
+ case "6002":
+ data = createBoxComponentNewFull1(width, size, offsetX, offsetY);
+ break;
+ case "6003":
+ data = createBoxComponentNewFull2(width, size, offsetX, offsetY);
+ break;
+ case "6004":
+ data = createBoxComponentNewFul3(width, deep, size, offsetX, offsetY);
+ break;
+ case "6005":
+ data = createBoxComponentNewFul4(width, deep, size, offsetX, offsetY);
+ break;
default:
- return createNoneProject();
+ data = createNoneProject();
+ break;
}
+ return data;
};
return (
{topItem.sName}
- {topItem?.selectImage ? (
-
- {/*
+ {topBoxList.map((topItem, index) => (
+ 参数：
*/}
- handleChangeName(e, index)}
- onFocus={e => handleFocus(e, index)}
- onBlur={e => handleBlur(e, index)}
- readOnly={!topItem?.isEditable}
- className={styles.text}
- />
- handleChange(e, index)}
- onFocus={e => handleFocus(e, index)}
- onBlur={e => handleBlur(e, index)}
- readOnly={!topItem?.isEditable}
- style={{ width: " 80%" }}
- />
-
+
+ ) : (
+ ""
+ )}
+
+
+
+ {topItem.sName}
+ {topItem?.selectImage ? (
+
+ {/*
- ))}
- {boxType === "8" &&
- topDoubleBoxList.map((item, index) => (
- 参数：
*/}
+ handleChangeName(e, index)}
+ onFocus={e => handleFocus(e, index)}
+ onBlur={e => handleBlur(e, index)}
+ readOnly={!topItem?.isEditable}
+ className={styles.text}
+ />
+ handleChange(e, index)}
+ onFocus={e => handleFocus(e, index)}
+ onBlur={e => handleBlur(e, index)}
+ readOnly={!topItem?.isEditable}
+ style={{ width: " 80%" }}
+ />
-
+ ))}
+ {doubleTitlieList[index]}
+
+ {leftBoxList.map((item, index) => (
+
+
- {titleList[index + 3]}
+
+
+
{item?.selectImage ? (
- ) : (
- ""
- )}
-
-
-
- ))}
-
- handleChangeName(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- className={styles.text}
- />
- handleChange(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- style={{ width: " 80%" }}
- />
-
-
- {boxType !== "8" &&
- leftBoxList.map((item, index) => (
-
+ ))}
-
- ))}
- {boxType === "8" &&
- leftDoubleBoxList.map((item, index) => (
- {titleList[index + 3]}
-
-
-
- {item?.selectImage ? (
-
- ) : (
- ""
- )}
- handleChangeName(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- className={styles.text}
- />
- handleChange(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- style={{ width: " 80%" }}
- />
-
-
-
- ))}
+ {doubleTitlieList[index + 3]}
-
- {index !== 0 ? (
-
+ />
) : (
""
)}
-
- {item?.selectImage ? (
-
- ) : (
- ""
- )}
- handleChangeName(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- className={styles.text}
- />
- handleChange(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- style={{ width: " 80%" }}
- />
-
+ handleChangeName(e, findIndexBySname(item.sName))}
+ onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
+ onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
+ readOnly={!item?.isEditable}
+ className={styles.text}
+ />
+ handleChange(e, findIndexBySname(item.sName))}
+ onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
+ onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
+ readOnly={!item?.isEditable}
+ style={{ width: " 80%" }}
+ />
- {boxType !== "8" &&
- rightBoxList.map((item, index) => (
-
diff --git a/src/components/Common/BoxDesignCompontent/showSvg.js b/src/components/Common/BoxDesignCompontent/showSvg.js
index ddcefc9..b5f30f5 100644
--- a/src/components/Common/BoxDesignCompontent/showSvg.js
+++ b/src/components/Common/BoxDesignCompontent/showSvg.js
@@ -26,7 +26,6 @@ import {
createBoxComponentNew2,
createBoxComponentNew3,
createBoxComponentNew4,
- createBoxComponentNew5,
createBoxComponentNew4_1,
createWelt,
createWelt1,
@@ -195,7 +194,7 @@ const SvgBox = props => {
}
// 左上部件
pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledHeight, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value )|| (zsbj?.type === "3006" && zsbj?.value)) {
+ if (zsbj?.type === "3001" && zsbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
// 插位值
@@ -350,7 +349,7 @@ const SvgBox = props => {
}
// 左上部件
pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledHeight, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value )|| (zsbj?.type === "3006" && zsbj?.value)) {
+ if (zsbj?.type === "3001" && zsbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
pathList.push(createText(scaledWidth / 2, -scaledHeight - dZSCW / 2 + 4, 10 * scales, dZSCW));
@@ -579,7 +578,7 @@ const SvgBox = props => {
const zscw = valueList.find(x => x.sName === "左(上)插位组件");
const yscw = valueList.find(x => x.sName === "右(上)插位组件");
let top = 0;
- const one = ["6001", "3001", "4001", "7001", "3006", "4006", "6006", "7006"];
+ const one = ["6001", "3001", "4001", "7001"];
const four = ["6004", "3004", "4004", "7004"];
const five = ["6005", "3005", "4005", "7005"];
const dYSCW = Number(yscw?.value) || 0;
@@ -634,7 +633,7 @@ const SvgBox = props => {
// 将找到的对象放入数组中，并过滤掉 undefined 值
// 使用 reduce 方法比较 value 属性，找出最大的对象
let top = 0;
- const one = ["6001", "3001", "4001", "7001", "3006", "4006", "6006", "7006"];
+ const one = ["6001", "3001", "4001", "7001"];
const four = ["6004", "3004", "4004", "7004"];
const five = ["6005", "3005", "4005", "7005"];
const dYSCW = Number(yscw?.value) || 0;
@@ -872,9 +871,6 @@ const SvgBox = props => {
case "3005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "3006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
case "4001":
data = createBoxComponentNew(width, height, size, offsetX, offsetY);
break;
@@ -890,9 +886,6 @@ const SvgBox = props => {
case "4005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "4006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
case "6001":
data = createBoxComponentNew(width, height, size, offsetX, offsetY);
break;
@@ -908,9 +901,6 @@ const SvgBox = props => {
case "6005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "6006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
case "7001":
data = createBoxComponentNew(width, height, size, offsetX, offsetY);
break;
@@ -926,9 +916,6 @@ const SvgBox = props => {
case "7005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "7006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
default:
data = createNoneProject();
break;
diff --git a/src/components/Common/BoxDesignCompontent/svg.js b/src/components/Common/BoxDesignCompontent/svg.js
index 3608b31..5e2c821 100644
--- a/src/components/Common/BoxDesignCompontent/svg.js
+++ b/src/components/Common/BoxDesignCompontent/svg.js
@@ -13,7 +13,6 @@ import {
createTrapezoidWeltTop,
createFoldWeltTop,
createFoldWeltTopLine,
- createPathElements,
createRoundedCornersWeltTop,
createRightAngleBoxBottomComponent,
createBoxBottomComponent1,
@@ -27,17 +26,13 @@ import {
createBoxComponentNew2,
createBoxComponentNew3,
createBoxComponentNew4,
- createBoxComponentNew5,
- createBoxComponentNew6,
createBoxComponentNew4_1,
createWelt,
createWelt1,
createWelt2,
createWelt2Right,
createWelt3,
- createWelt4,
createWelt3Right,
- createWelt4Right,
createText,
createDoubleArrow,
createHorizontalDoubleArrow,
@@ -47,36 +42,32 @@ import {
createBoxComponentNewFull2,
createBoxComponentNewFul3,
createBoxComponentNewFul4,
- createBoxComponentNewFul5,
- createBoxComponentNewFul6,
} from "../BoxDesign/createAirplaneBox";
const SvgBox = props => {
const svgContainerRef = useRef(null);
const svgRef = useRef(null);
const [boxKey, setBoxKey] = useState(new Date().getTime());
- const { boxList, dSvgBoxWidth, dSvgBoxHeight, iFAngle } = props;
+ const { boxList, dSvgBoxWidth, dSvgBoxHeight } = props;
const [width, setWidth] = useState(0);
const [height, setHeight] = useState(0);
const [deep, setDeep] = useState(0);
const [svgType, setSvgType] = useState(1);
// 盒身
- useEffect(() => {
- setTimeout(() => {
- const svg = svgRef.current;
- if (svg) {
+ useEffect(
+ () => {
+ setTimeout(() => {
initSVG();
- }
- }, 0);
- }, [boxList, svgType]);
+ }, 0);
+ },
+ [boxList, svgType]
+ );
// 初始化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"); // 创建
-
- ))}
- {boxType === "8" &&
- rightDoubleBoxList.map((item, index) => (
- {titleList[findIndexBySname(item.sName)]}
-
-
-
- {item?.selectImage ? (
-
- ) : (
- ""
- )}
-
- handleChangeName(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- className={styles.text}
- />
- handleChange(e, findIndexBySname(item.sName))}
- onFocus={e => handleFocus(e, findIndexBySname(item.sName))}
- onBlur={e => handleBlur(e, findIndexBySname(item.sName))}
- readOnly={!item?.isEditable}
- style={{ width: " 80%" }}
- />
-
-
-
{doubleTitlieList[index + 6]}
-
- {index !== 0 ? (
-
@@ -1305,7 +662,7 @@ const BoxDesignCompontent = baseProps => {
})
: ""}
- {tableDataList && tableDataList.length && boxType !== "8"
+ {tableDataList && tableDataList.length
? tableDataList.map((item, index) => {
const uniqueIndex = index + 9 + tableColum.length + boxBodyList.length;
@@ -1325,28 +682,6 @@ const BoxDesignCompontent = baseProps => {
})
: ""}
-
-
- {doubleLayerList && doubleLayerList.length && boxType === "8"
- ? doubleLayerList.map((item, index) => {
- const uniqueIndex = index + 9 + tableColum.length + boxBodyList.length + tableDataList.length;
-
- return (
-
-
- );
- })
- : ""}
- {item.sName}
- handleChange(e, uniqueIndex)}
- onFocus={e => handleFocus(e, uniqueIndex)}
- onBlur={e => handleBlur(e, uniqueIndex)}
- readOnly={!boxList[uniqueIndex]?.isEditable}
- style={{ width: " 60%" }}
- />
- {
}
// 左上部件
pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledHeight, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value )|| (zsbj?.type === "3006" && zsbj?.value)) {
+ if (zsbj?.type === "3001" && zsbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
// 插位值
@@ -348,7 +347,7 @@ const SvgBox = props => {
}
// 左上部件
pathList.push(createDynamicTopLeft(zsbj?.type, scaledWidth, -scaledHeight, -dZSCW * scale, 0, 0));
- if ((zsbj?.type === "3001" && zsbj?.value )|| (zsbj?.type === "3006" && zsbj?.value)) {
+ if (zsbj?.type === "3001" && zsbj?.value) {
pathList.push(createDoubleArrow(scaledHeight, scaledWidth * 0.2, -scaledHeight / 2, scales));
pathList.push(createText(scaledWidth * 0.2 + 10 * scales, -scaledHeight / 2, 10 * scales, "W"));
pathList.push(createText(scaledWidth / 2, -scaledHeight - dZSCW / 2 + 4, 10 * scales, dZSCW));
@@ -577,7 +576,7 @@ const SvgBox = props => {
const zscw = valueList.find(x => x.sName === "左(上)插位组件");
const yscw = valueList.find(x => x.sName === "右(上)插位组件");
let top = 0;
- const one = ["6001", "3001", "4001", "7001", "3006", "4006", "6006", "7006"];
+ const one = ["6001", "3001", "4001", "7001"];
const four = ["6004", "3004", "4004", "7004"];
const five = ["6005", "3005", "4005", "7005"];
const dYSCW = Number(yscw?.value) || 0;
@@ -632,7 +631,7 @@ const SvgBox = props => {
// 将找到的对象放入数组中，并过滤掉 undefined 值
// 使用 reduce 方法比较 value 属性，找出最大的对象
let top = 0;
- const one = ["6001", "3001", "4001", "7001", "3006", "4006", "6006", "7006"];
+ const one = ["6001", "3001", "4001", "7001"];
const four = ["6004", "3004", "4004", "7004"];
const five = ["6005", "3005", "4005", "7005"];
const dYSCW = Number(yscw?.value) || 0;
@@ -870,9 +869,6 @@ const SvgBox = props => {
case "3005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "3006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
case "4001":
data = createBoxComponentNew(width, height, size, offsetX, offsetY);
break;
@@ -888,9 +884,6 @@ const SvgBox = props => {
case "4005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "4006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
case "6001":
data = createBoxComponentNew(width, height, size, offsetX, offsetY);
break;
@@ -906,9 +899,6 @@ const SvgBox = props => {
case "6005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "6006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
case "7001":
data = createBoxComponentNew(width, height, size, offsetX, offsetY);
break;
@@ -924,9 +914,6 @@ const SvgBox = props => {
case "7005":
data = createBoxComponentNew4(width, height, size, offsetX, offsetY);
break;
- case "7006":
- data = createBoxComponentNew5(width, height, size, offsetX, offsetY);
- break;
default:
data = createNoneProject();
break;
diff --git a/src/components/Common/BoxProject/index.js b/src/components/Common/BoxProject/index.js
index bf79f4d..87058d7 100644
--- a/src/components/Common/BoxProject/index.js
+++ b/src/components/Common/BoxProject/index.js
@@ -4,7 +4,7 @@ import CommonBase from "../../Common/CommonBase"; /* 获取配置及数据 */
import CommonSales from "../../Common/CommonBillEvent"; /* 继承销售模块业务功能 */
import * as commonFunc from "../../Common/commonFunc"; /* 通用单据方法 */ /* 通用单据方法 */
import { Form } from "@ant-design/compatible";
-import { Spin, Tree, Select, Input } from "antd-v4";
+import { Spin, Tree, Select, Input } from "antd";
import styles from "./index.less";
import { ArrowLeftOutlined, FolderFilled, FolderOpenFilled, FileTextFilled, PlusOutlined, MinusOutlined } from "@ant-design/icons";
import SvgBox from "./svg";
@@ -37,6 +37,7 @@ const BoxProjectContent = Form.create({
return obj;
},
})(props => {
+ console.log("🚀 ~ props:", props);
const { updateBoxList, boxList } = props; // 获取父组件传递的更新方法
// 获取树形节点
const treeData = [
@@ -80,6 +81,7 @@ const BoxProjectContent = Form.create({
},
[updateBoxList]
);
+ console.log("🚀 ~ boxList:", boxList);
const handleFocus = (e, index) => {
if (boxList && boxList.length) {
@@ -122,7 +124,6 @@ const BoxProjectContent = Form.create({
const svgProps = {
...props,
boxList,
- showNew:0
};
// const renderTreeNodes = data => {
// return data.map(item => {
diff --git a/src/components/Common/BoxProject/svg.js b/src/components/Common/BoxProject/svg.js
index 9352674..4ec6e66 100644
--- a/src/components/Common/BoxProject/svg.js
+++ b/src/components/Common/BoxProject/svg.js
@@ -10,6 +10,7 @@ import {
createNoneProject,
} from "../BoxDesign/createAirplaneBox";
const SvgBox = props => {
+ console.log("🚀 ~ propsprops:", props);
const svgContainerRef = useRef(null);
const svgRef = useRef(null);
const [boxKey, setBoxKey] = useState(new Date().getTime());
diff --git a/src/components/Common/BoxShowImgMaterial/index.css b/src/components/Common/BoxShowImgMaterial/index.css
index 7f23e10..14cc0c2 100644
--- a/src/components/Common/BoxShowImgMaterial/index.css
+++ b/src/components/Common/BoxShowImgMaterial/index.css
@@ -4,5 +4,4 @@
}
.box .materialBox {
background-color: '#b7e0ff';
- border: 2px solid #333;
}
diff --git a/src/components/Common/BoxShowImgMaterial/index.js b/src/components/Common/BoxShowImgMaterial/index.js
index ebe9413..00d2ee0 100644
--- a/src/components/Common/BoxShowImgMaterial/index.js
+++ b/src/components/Common/BoxShowImgMaterial/index.js
@@ -3,6 +3,7 @@ import React, { useEffect, useState, useRef } from "react";
import { VerticalLeftOutlined, VerticalRightOutlined } from "@ant-design/icons";
import styles from "./index.less";
import { bottom } from "react-grid-layout/build/utils";
+import { transform } from "@antv/g2/lib/util/transform";
const BoxShowImgMaterial = props => {
const boxRef = useRef(null);
@@ -168,7 +169,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/BoxShowImgMaterial/index.less b/src/components/Common/BoxShowImgMaterial/index.less
index 2d916dd..59b7ba2 100644
--- a/src/components/Common/BoxShowImgMaterial/index.less
+++ b/src/components/Common/BoxShowImgMaterial/index.less
@@ -4,6 +4,5 @@
.materialBox{
// position: absolute;
background-color: '#b7e0ff';
- border: 2px solid #333;
}
}
\ No newline at end of file
diff --git a/src/components/Common/BoxShowImgMaterial/indexNew.js b/src/components/Common/BoxShowImgMaterial/indexNew.js
deleted file mode 100644
index 9b55f54..0000000
--- a/src/components/Common/BoxShowImgMaterial/indexNew.js
+++ /dev/null
@@ -1,383 +0,0 @@
-/* eslint-disable */
-import React, { useEffect, useState, useRef } from "react";
-import { VerticalLeftOutlined, VerticalRightOutlined, ArrowRightOutlined } from "@ant-design/icons";
-import styles from "./index.less";
-import { bottom } from "react-grid-layout/build/utils";
-import { transform } from "@antv/g2/lib/util/transform";
-const BoxShowImgMaterial = props => {
- const boxRef = useRef(null);
- const textRef = useRef(null);
- const textRefs = useRef(null);
- const nTextRefs = useRef(null);
- const nTextRef = useRef(null);
- const [boxKey, setBoxKey] = useState(new Date().getTime());
- const { width, height, size } = props;
- const clientWidth = width || 300;
- const clientHeight = height || 250;
- // 找出盒型信息
- const { slaveData, selectedNode } = props.state;
- const { boxModel } = props;
- const slaveDataDetail = slaveData?.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel);
- if (slaveDataDetail) {
- // 最大上机长 上机宽 排版长 排版宽 材料长 材料宽
- var { dMaxLength, dMaxWidth, dMachineLength, dMachineWidth, dWlcd, dWlkd, dSBLB, dXBLB, dZBLB, dYBLB, scale } = slaveDataDetail;
- }
- // 计算可以放置的盒子数量
- const isJuantong = selectedNode.sTypeKey === "juantong";
- const horizontalBoxes = Math.floor(dWlcd / dMachineLength);
- const verticalBoxes = Math.floor(dWlkd / dMachineWidth);
- const scaleX = (clientWidth - 100) / Number(dWlcd);
- const scaleY = (clientHeight - 70) / Number(dWlkd);
- // 动态生成多个 materialBox
- const generateMaterialBoxes = () => {
- const boxes = [];
- for (let i = 0; i < horizontalBoxes * verticalBoxes; i++) {
- boxes.push(
- {
slaveInfoList: slaveInfoListOld,
} = nextProps;
if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsId === '12710101117024321284220' || (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && (formRoute.indexOf('indexOee') === -1 || formRoute === '/indexOee/commonOeeBill')))) {
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {};
@@ -488,13 +488,16 @@ export default (ChildComponent) => {
}
}
}
+ if( sModelsId === '101801153119616631455287620' || sModelsType?.includes('commonOeeBillMaster')){
+ addState.onlyMaster = true;
+ }
this.props.onSaveState({
masterConfig, slaveConfig, slaveColumn, checkConfig, checkColumn, importConfig, importColumn, sId, pageLoading: false, ...addState,
addStateMap, slaveInfoList, slaveChildInfoList, ...addOtherState
});
} else if (commonUtils.isEmptyObject(masterConfigOld) && formData.length === 1 && (sModelsType === 'cashier/financialTransfer' || sModelsType === 'purchase/purchaseEnquiry' || sModelsType === 'cashier/financialAdjustment' || sModelsType === 'print/printLabel' || sModelsType === 'complaint/complaint' || sModelsType === 'commonBill/onlyMaster') && formRoute.indexOf('indexOee') === -1) {
const config = {};
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
let addState = {};
@@ -516,7 +519,7 @@ export default (ChildComponent) => {
masterConfig, sId, pageLoading: false, ...addState,
});
} else if (commonUtils.isEmptyObject(slaveConfigOld) && commonUtils.isEmptyObject(masterConfigOld) && formData.length === 2 && (sModelsType === 'quality/accident') && formRoute.indexOf('indexOee') === -1) {
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'mftqualityaccidentSlave')[0];
@@ -551,7 +554,7 @@ export default (ChildComponent) => {
// employeeConfig, employeeColumn, masterConfig, ...addState,
// });
if (formRoute === '/indexOee/labelPrint' && commonUtils.isEmpty(slaveConfigOld)) { /* 入库标签打印 */
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData[0];
const slaveConfig = formData[0];
@@ -726,6 +729,13 @@ export default (ChildComponent) => {
}
}
};
+
+ getMenuStatus = (menu) => {
+ if (menu.sControlName === 'BtnCalculation' || menu.sControlName === 'BtnCombine' || menu.sControlName === 'BtnChooseProcess' ||
+ menu.sControlName === 'BtnChooseMaterials' || menu.sControlName === 'BtnBsOperation.BtnDraft') {
+ return !this.props.enabled;
+ }
+ };
handlePackDataAdd= (item, index, sControlId) => {
const tableDataRow = {};
tableDataRow.sId = commonUtils.createSid();
@@ -764,8 +774,8 @@ export default (ChildComponent) => {
/** 获取主表、从表、审核表数据 */
handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
- const { currentId, masterData = {} } = this.props; /* 当前页签数据 */
- const sId = currentId || masterData.sId || '';
+ const { currentId } = this.props; /* 当前页签数据 */
+ const sId = currentId !== undefined ? currentId : '';
this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick, slaveConfig });
// commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductId', []);
// commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductNo', []);
@@ -801,7 +811,7 @@ export default (ChildComponent) => {
/* 获取表数据 */
handleGetMemoData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig) => {
const { currentId, sModelsType } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
+ const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
const addStateControl = await this.props.handleGetDataSet({
name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
});
@@ -860,7 +870,7 @@ export default (ChildComponent) => {
/* 获取单张表数据 */
handleGetOneMemoData = (memoName, memoConfig) => {
const { currentId } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
+ const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
this.props.handleGetDataSet({
name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -2116,7 +2126,6 @@ export default (ChildComponent) => {
const {
sModelsId, masterData, app, masterConfig, slaveConfig, checkConfig, token, sModelsType, controlConfig, materialsConfig, processConfig, colorConfig, packConfig, slaveData, orderDetailConfig,
} = this.props;
- const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
const sSlaveIdArray = [];
if (commonUtils.isNotEmptyArr(slaveData)) {
slaveData.forEach((item) => {
@@ -2161,7 +2170,7 @@ export default (ChildComponent) => {
/* 接收返回值 */
const check = commonFunc.showMessage(app.commonConst, 'BtnExamine');/* 审核 */
const BtnCancelExamine = commonFunc.showMessage(app.commonConst, 'BtnCancelExamine');/* 销审 */
- if (returnData.code === 1) { /* 成功 */
+ if (returnData.code === 1 || returnData.code === 2) { /* 成功 */
this.props.onSaveState({
loading: false,
});
@@ -2176,7 +2185,7 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyObject(returnData.dataset)) {
outData = returnData.dataset.rows[0].dataSet.outData;
}
- if (commonUtils.isNotEmptyStr(outData[0].sReturn)) {
+ if (false && commonUtils.isNotEmptyStr(outData[0].sReturn)) {
const sReturnArray = outData[0].sReturn.split('|');
if (outData[0].sReturn.split('-').length < 2) {
// 正常业务提示，非审核模板
@@ -2216,7 +2225,20 @@ export default (ChildComponent) => {
}
}
} else {
- message.success(check + returnData.msg);
+ if ( returnData.code === 2) {
+ Modal.info({
+ title: '温馨提示:',
+ content: (
+ {
isSColorSerialMemo={this.isSColorSerialMemo}
onBtnParamPage ={this.handleBtnParamPage}
onFilterData ={this.handleFilterData}
+ onSelectProcessSolution={this.handleSelectProcessSolution}
+ onProcessSolutionRow ={this.handleProcessSolutionRow}
+ onCancelProcessSolutionModal ={this.handleCloseProcessSolutionModal}
+ onSelectProductProcessNew={this.handleSelectFinalProcessNew}
+ onSelectProductMaterialsNew={this.handleSelectFinalMaterialsNew}
+ getMenuStatus={this.getMenuStatus}
+ onDataRowReflesh = {this.handleTableReflesh}
/>
);
}
diff --git a/src/components/Common/CommonCalculator.js b/src/components/Common/CommonCalculator.js
index 999fe2c..be22ffc 100644
--- a/src/components/Common/CommonCalculator.js
+++ b/src/components/Common/CommonCalculator.js
@@ -1,10 +1,10 @@
/* eslint-disable function-paren-newline */
import React, { Component } from 'react';
import { Form } from '@ant-design/compatible';
-// import '@ant-design/compatible/assets/index.css';
-import { Row, Col, Button } from 'antd-v4';
+import '@ant-design/compatible/assets/index.css';
+import { Row, Col, Button } from 'antd';
import * as commonUtils from '../../utils/utils';
-import commonConfig from '../../utils/config';
+import * as commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc';
import styles from '../../index.less';
diff --git a/src/components/Common/CommonCheckBill/index.css b/src/components/Common/CommonCheckBill/index.css
deleted file mode 100644
index 09a0410..0000000
--- a/src/components/Common/CommonCheckBill/index.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.pdfContainer {
- width: 100%;
- height: 300px;
-}
-/* 处理分隔符间距 */
-:global {
- /* 主表分隔符间距 */
-}
-:global .commonCheckBillContainer .ant-divider-horizontal.ant-divider-with-text {
- margin: 5px 0 10px 0!important;
-}
-:global .commonCheckBillContainer .flexArea .ant-divider-horizontal.ant-divider-with-text {
- margin: -8px 0 !important;
-}
diff --git a/src/components/Common/CommonCheckBill/index.js b/src/components/Common/CommonCheckBill/index.js
index a8bcace..b71f3ff 100644
--- a/src/components/Common/CommonCheckBill/index.js
+++ b/src/components/Common/CommonCheckBill/index.js
@@ -2,7 +2,7 @@
import React, { Component } from 'react';
import { UploadOutlined } from '@ant-design/icons';
import { Form } from '@ant-design/compatible';
-// import '@ant-design/compatible/assets/index.css';
+import '@ant-design/compatible/assets/index.css';
import {
Row,
Col,
@@ -16,7 +16,7 @@ import {
Input,
Divider,
Collapse,
-} from 'antd-v4';
+} from 'antd';
import { message } from '@/utils/common/message';
import CommonSales from '@/components/Common/CommonCheckBillEvent';/* 继承销售模块业务功能 */
import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
@@ -28,7 +28,7 @@ import CommonViewFlex from '@/components/Common/CommonViewFlex';
import CommonViewTable from '@/components/Common/CommonViewTable';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
-import commonConfig from '@/utils/config';
+import * as commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
import CommonListSelect from '@/components/Common/CommonListSelect';
@@ -1985,12 +1985,6 @@ const BillComponent = Form.create({
// 匹配数字
// eslint-disable-next-line no-unused-vars
const num = item.replace(/[^\d]/g, ' ');
- let tabName = item.replace(/\d+/g,'');
- /* 从主表配置 找到控件名=tabName,否则取他的showName */
- const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName=tableConfigArr[0].showName;
- }
return (
{item}
@@ -1998,7 +1992,7 @@ const BillComponent = Form.create({
{...props}
// 使高度和从表高度一直
isAutoHeight="ture"
- tableConfigType={tabName}
+ tableConfigType={item}
tableConfigTypeArr={diliverConfigTypeArr}
/>
diff --git a/src/components/Common/CommonCheckBill/index.less b/src/components/Common/CommonCheckBill/index.less
index 78e7803..7d3507f 100644
--- a/src/components/Common/CommonCheckBill/index.less
+++ b/src/components/Common/CommonCheckBill/index.less
@@ -1,3 +1,4 @@
+@import "~antd/lib/style/themes/default.less";
.pdfContainer{
width: 100%;
height: 300px;
diff --git a/src/components/Common/CommonCheckBillEvent.js b/src/components/Common/CommonCheckBillEvent.js
index d1ca1ed..f40f99e 100644
--- a/src/components/Common/CommonCheckBillEvent.js
+++ b/src/components/Common/CommonCheckBillEvent.js
@@ -1,12 +1,12 @@
/* eslint-disable */
import React, { Component } from 'react';
-import { Modal, Progress } from 'antd-v4';
+import { Modal, Progress } from 'antd';
import { message } from '@/utils/common/message';
import moment from 'moment';
import * as commonUtils from '@/utils/utils'; /* 通用方法 */
import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
import * as commonServices from '@/services/services'; /* 服务类 */
-import commonConfig from '@/utils/config';
+import * as commonConfig from '@/utils/config';
import * as commonFunc from '@/components/Common/commonFunc';
import styles from '@/components/Common/ToolBar/index.less';
@@ -72,7 +72,7 @@ export default (ChildComponent) => {
employeeConfig: employeeConfigOld,
} = nextProps;
if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && (formRoute.indexOf('indexOee') === -1 || formRoute === '/indexOee/commonOeeBill'))) {
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {};
@@ -373,7 +373,7 @@ export default (ChildComponent) => {
});
} else if (commonUtils.isEmptyObject(masterConfigOld) && formData.length === 1 && (sModelsType === 'cashier/financialTransfer' || sModelsType === 'purchase/purchaseEnquiry' || sModelsType === 'cashier/financialAdjustment' || sModelsType === 'print/printLabel' || sModelsType === 'complaint/complaint' || sModelsType === 'commonBill/onlyMaster') && formRoute.indexOf('indexOee') === -1) {
const config = {};
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
let addState = {};
@@ -395,7 +395,7 @@ export default (ChildComponent) => {
masterConfig, sId, pageLoading: false, ...addState,
});
} else if (commonUtils.isEmptyObject(slaveConfigOld) && commonUtils.isEmptyObject(masterConfigOld) && formData.length === 2 && (sModelsType === 'quality/accident') && formRoute.indexOf('indexOee') === -1) {
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'mftqualityaccidentSlave')[0];
@@ -430,7 +430,7 @@ export default (ChildComponent) => {
// employeeConfig, employeeColumn, masterConfig, ...addState,
// });
if (formRoute === '/indexOee/labelPrint' && commonUtils.isEmpty(slaveConfigOld)) { /* 入库标签打印 */
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData[0];
const slaveConfig = formData[0];
@@ -618,7 +618,7 @@ export default (ChildComponent) => {
/** 获取主表、从表、审核表数据 */
handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
const { currentId } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
const addStateMaster = await this.props.handleGetDataOne({
name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, isWait: true, bEditClick,
});
@@ -669,7 +669,7 @@ export default (ChildComponent) => {
/* 获取表数据 */
handleGetMemoData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig) => {
const { currentId, sModelsType } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
+ const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
let addStateControl = {};
if (commonUtils.isNotEmptyObject(controlConfig)) {
addStateControl = await this.props.handleGetDataSet({
@@ -732,7 +732,7 @@ export default (ChildComponent) => {
/* 获取单张表数据 */
handleGetOneMemoData = (memoName, memoConfig) => {
const { currentId } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
+ const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
this.props.handleGetDataSet({
name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -5541,8 +5541,8 @@ export default (ChildComponent) => {
}
render() {
- const { masterData, sModelsType, app } = this.props;
- const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
+ const { masterData } = this.props;
+ const imgSrc = commonBusiness.handleAddIcon(masterData);
return (
-1
- ? { labelCol: { span: 7, style: { color: "rgba(0, 0, 0, 0.65)", backgroundColor: "#BFEFFF" } }, wrapperCol: { span: 15 } }
- : {
- labelCol: { span: 7, style: { height: "27.82px", color: "rgba(0, 0, 0, 0.65)", backgroundColor: "#BFEFFF" } },
- wrapperCol: { span: 15 },
- }; /* 表格样式(主要是colspan和rowspan,数据格式:对象) */
+ this.formItemLayout = commonUtils.isNotEmptyObject(props.formItemLayout) ?
+ props.formItemLayout :
+ location.pathname.toLowerCase().indexOf('oee') > -1 ? { labelCol: { span: 7, style: { color: 'rgba(0, 0, 0, 0.65)', backgroundColor: '#BFEFFF' } }, wrapperCol: { span: 15 } } :
+ { labelCol: { span: 7, style: { height: '27.82px', color: 'rgba(0, 0, 0, 0.65)', backgroundColor: '#BFEFFF' } }, wrapperCol: { span: 15 } }; /* 表格样式(主要是colspan和rowspan,数据格式:对象) */
this.isDropdownFilter = false;
this.V = { value: props.dataValue };
this.myRef = createRef();
this.dropDownCount = 0;
- this.bSpecial = location.pathname?.includes("ResearchTableTree") && props.showConfig.sName === "sProductName";
+ this.bSpecial = location.pathname?.includes('ResearchTableTree') && props.showConfig.sName === 'sProductName';
}
/** 渲染前只执行一次 */
componentWillMount() {
this.mounted = true;
- if (this.props.showConfig.sDropDownType === "const") {
- /* 常量下拉 */
+ if (this.props.showConfig.sDropDownType === 'const') { /* 常量下拉 */
/* 常量下拉其实只取一次数据就可以啦,去过数据的会给state中的dropDownData赋值,所以dropDownData有值的情况就不需要再获取了 */
- const showDropDown = commonUtils.isNotEmptyArr(this.props.showConfig.dropDownData)
- ? this.props.showConfig.dropDownData
- : typeof this.props.showConfig.showDropDown === "object"
- ? this.props.showConfig.showDropDown
- : commonUtils.objectToArr(commonUtils.convertStrToObj(this.props.showConfig.showDropDown));
+ const showDropDown = commonUtils.isNotEmptyArr(this.props.showConfig.dropDownData) ? this.props.showConfig.dropDownData :
+ (typeof this.props.showConfig.showDropDown === 'object') ? this.props.showConfig.showDropDown : commonUtils.objectToArr(commonUtils.convertStrToObj(this.props.showConfig.showDropDown));
/* 给state赋值 */
if (this.mounted) {
this.setState({
dropDownData: showDropDown,
});
}
- } else if (this.props.showConfig.sDropDownType === "sql" && !commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
+ } else if (this.props.showConfig.sDropDownType === 'sql' && !commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
if (this.mounted) {
this.setState({
dropDownData: this.props.showConfig.dropDownData,
@@ -138,11 +126,11 @@ export default class CommonComponent extends Component {
const selectInputNode = currentNode.querySelector("input[class*='ant-select-selection-search-input']");
const antInput = currentNode.querySelector("input[class*='ant-input']");
const oInput = selectInputNode || antInput;
- if (oInput && !this.props.noDebounce) {
- oInput.addEventListener("compositionstart", () => {
+ if (oInput) {
+ oInput.addEventListener('compositionstart', () => {
this.chineseInputting = true;
});
- oInput.addEventListener("compositionend", () => {
+ oInput.addEventListener('compositionend', () => {
this.chineseInputting = false;
if (this.handleCompleteInputEventCache) {
this.handleCompleteInputEventCache();
@@ -151,20 +139,20 @@ export default class CommonComponent extends Component {
}
if (currentNode) {
- if (["t", "m", "y"].includes(this.firstDataIndex)) {
+ if (['t', 'm', 'y'].includes(this.firstDataIndex)) {
const oInput = currentNode.querySelector(`input[id*="${this.props.showConfig.sName}"]`);
if (oInput) {
let { sDateFormat } = this.props.showConfig;
if (commonUtils.isEmptyStr(sDateFormat)) {
- if (this.firstDataIndex === "m") {
- sDateFormat = "YYYY-MM";
- } else if (this.firstDataIndex === "y") {
- sDateFormat = "YYYY";
+ if (this.firstDataIndex === 'm') {
+ sDateFormat = 'YYYY-MM';
+ } else if (this.firstDataIndex === 'y') {
+ sDateFormat = 'YYYY';
} else {
sDateFormat = this.props.getDateFormat();
}
}
- oInput.oninput = e => {
+ oInput.oninput = (e) => {
const { value } = e.target;
const isValidDate = moment(value, sDateFormat, true).isValid();
if (isValidDate) {
@@ -174,24 +162,22 @@ export default class CommonComponent extends Component {
}
}
}
- document.addEventListener("mousedown", this.handleSelectClick);
+ document.addEventListener('mousedown', this.handleSelectClick);
}
/** props改变的时候触发 */
componentWillReceiveProps(nextProps) {
/* 如果是下拉控件,则要获取数据(获取下拉数据前要先更新sqlCondition) */
- const { dataValue, enabled, sFieldName, bNotEmpty, showName, sDropDownType } = this.state;
+ const {
+ dataValue, enabled, sFieldName, bNotEmpty, showName, sDropDownType,
+ } = this.state;
if (nextProps.showConfig === undefined || this.props.showConfig === undefined) return;
this.firstDataIndex = nextProps.showConfig.sName.substring(0, 1); /* 控件首字母(数据格式:字符串) */
- if (nextProps.showConfig.sDropDownType === "const") {
- /* 常量下拉 */
+ if (nextProps.showConfig.sDropDownType === 'const') { /* 常量下拉 */
/* 常量下拉其实只取一次数据就可以啦,去过数据的会给state中的dropDownData赋值,所以dropDownData有值的情况就不需要再获取了 */
- const showDropDown = commonUtils.isNotEmptyArr(nextProps.showConfig.dropDownData)
- ? nextProps.showConfig.dropDownData
- : typeof nextProps.showConfig.showDropDown === "object"
- ? nextProps.showConfig.showDropDown
- : commonUtils.objectToArr(commonUtils.convertStrToObj(nextProps.showConfig.showDropDown));
+ const showDropDown = commonUtils.isNotEmptyArr(nextProps.showConfig.dropDownData) ? nextProps.showConfig.dropDownData :
+ (typeof nextProps.showConfig.showDropDown === 'object') ? nextProps.showConfig.showDropDown : commonUtils.objectToArr(commonUtils.convertStrToObj(nextProps.showConfig.showDropDown));
// 对应工序单独处理
// if (this.props.showConfig.showName === '对应工序') {
// showDropDown = nextProps.customDropData;
@@ -202,7 +188,7 @@ export default class CommonComponent extends Component {
dropDownData: showDropDown,
});
}
- } else if (nextProps.showConfig.sDropDownType === "sql" && !commonUtils.isEmptyArr(nextProps.showConfig.dropDownData)) {
+ } else if (nextProps.showConfig.sDropDownType === 'sql' && !commonUtils.isEmptyArr(nextProps.showConfig.dropDownData)) {
if (this.mounted) {
this.setState({
dropDownData: nextProps.showConfig.dropDownData,
@@ -210,16 +196,7 @@ export default class CommonComponent extends Component {
}
}
/* 把需要更新的数据setState */
- if (
- dataValue !== nextProps.dataValue ||
- enabled !== nextProps.enabled ||
- bNotEmpty !== nextProps.showConfig.bNotEmpty ||
- sFieldName !== nextProps.showConfig.sName ||
- showName !== nextProps.showConfig.showName ||
- !showName ||
- sDropDownType !== nextProps.showConfig.sDropDownType ||
- (this.bSpecial && this.props.record.sProductNo !== nextProps.record.sProductNo)
- ) {
+ if (dataValue !== nextProps.dataValue || enabled !== nextProps.enabled || bNotEmpty !== nextProps.showConfig.bNotEmpty || sFieldName !== nextProps.showConfig.sName || (showName !== nextProps.showConfig.showName || !showName) || sDropDownType !== nextProps.showConfig.sDropDownType || (this.bSpecial && this.props.record.sProductNo !== nextProps.record.sProductNo)) {
if (this.mounted) {
if (commonUtils.isEmpty(nextProps.dataValue)) {
this.lastValue = nextProps.dataValue;
@@ -243,40 +220,20 @@ export default class CommonComponent extends Component {
shouldComponentUpdate(nextProps, nextState) {
const {
- dataValue,
- enabled,
- dropDownData,
- searchValue,
- searchDropDownData,
- sFieldName,
- bNotEmpty,
- sActiveDisplay,
- sDropDownType,
- spinState,
- showConfig,
+ dataValue, enabled, dropDownData, searchValue, searchDropDownData, sFieldName, bNotEmpty, sActiveDisplay, sDropDownType, spinState, showConfig,
} = this.state;
- return (
- nextProps.showConfig !== undefined &&
- (dataValue !== nextState.dataValue ||
- enabled !== nextState.enabled ||
- sFieldName !== nextState.sFieldName ||
- sDropDownType !== nextState.sDropDownType ||
- bNotEmpty !== nextState.bNotEmpty ||
- JSON.stringify(dropDownData) !== JSON.stringify(nextState.dropDownData) ||
- searchValue !== nextState.searchValue ||
- JSON.stringify(searchDropDownData) !== JSON.stringify(nextState.searchDropDownData) ||
- JSON.stringify(sActiveDisplay) !== JSON.stringify(nextState.sActiveDisplay) ||
- nextProps.showTime !== this.props.showTime ||
- spinState !== nextState.spinState ||
- JSON.stringify(nextState.selectTableData) !== JSON.stringify(this.state.selectTableData) ||
- JSON.stringify(nextProps.showConfig) !== JSON.stringify(showConfig))
- );
+ return nextProps.showConfig !== undefined && (dataValue !== nextState.dataValue || enabled !== nextState.enabled ||
+ sFieldName !== nextState.sFieldName || sDropDownType !== nextState.sDropDownType || bNotEmpty !== nextState.bNotEmpty || JSON.stringify(dropDownData) !== JSON.stringify(nextState.dropDownData) ||
+ searchValue !== nextState.searchValue || JSON.stringify(searchDropDownData) !== JSON.stringify(nextState.searchDropDownData) ||
+ JSON.stringify(sActiveDisplay) !== JSON.stringify(nextState.sActiveDisplay) || nextProps.showTime !== this.props.showTime ||
+ spinState !== nextState.spinState || JSON.stringify(nextState.selectTableData) !== JSON.stringify(this.state.selectTableData) ||
+ JSON.stringify(nextProps.showConfig) !== JSON.stringify(showConfig));
}
componentWillUnmount() {
this.mounted = false;
- document.removeEventListener("mousedown", this.handleSelectClick);
+ document.removeEventListener('mousedown', this.handleSelectClick);
}
onFocus = () => {
@@ -284,26 +241,13 @@ export default class CommonComponent extends Component {
this.setState({ sActiveDisplay: false });
};
- onBlur = event => {
- if (this.onExecInstructSet("blur")) return;
+ onBlur = (event) => {
+ if (this.onExecInstructSet('blur')) return;
this.isDropdownFilter = false;
- if (commonUtils.isNotEmptyStr(this.props.showConfig.sTableTitleSql) && this.props.showConfig.iVisCount > 1) {
- this.setState({
- searchPageNum: 1,
- searchTotalPageCount: 1,
- searchDropDownData: [],
- searchValue: "",
- spinState: false,
- sActiveDisplay: true,
- });
- } else if (
- this.state.searchValue !== "" &&
- this.props.showConfig.sDropDownType === "sql" &&
- commonUtils.isEmptyArr(this.props.showConfig.dropDownData)
- ) {
+ if (this.state.searchValue !== '' && this.props.showConfig.sDropDownType === 'sql' && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
if (!this.props.showConfig.bCanInput) {
- this.handleSelectOptionEvent("");
+ this.handleSelectOptionEvent('');
}
this.setState({
searchPageNum: 1,
@@ -319,10 +263,7 @@ export default class CommonComponent extends Component {
});
}
/* 若下拉配置了movesql 则离开时 调用下拉sql数据 */
- if (
- this.props.showConfig &&
- (this.props.showConfig.sDropDownType === "movesql" || commonUtils.isNotEmptyObject(this.props.showConfig.sButtonParam))
- ) {
+ if (this.props.showConfig && (this.props.showConfig.sDropDownType === 'movesql' || commonUtils.isNotEmptyObject(this.props.showConfig.sButtonParam))) {
this.props.onDropDownBlur(this.props.name, this.props.showConfig.sName, this.props.record, this.props.showConfig);
}
@@ -331,34 +272,40 @@ export default class CommonComponent extends Component {
};
onBlurText = (event, timeout = 0) => {
- if (this.onExecInstructSet("blur")) return;
+ if (this.onExecInstructSet('blur')) return;
const currentValue = event?.target?.value;
if (currentValue === this.lastValue) return;
setTimeout(() => {
- const { name, record, sBtnSendDialogConfigList, onToolBarBtnClick } = this.props;
- if (name !== "master") return;
+ const {
+ name,
+ record,
+ sBtnSendDialogConfigList,
+ onToolBarBtnClick,
+ } = this.props;
+ if (name !== 'master') return;
if (commonUtils.isEmptyArr(sBtnSendDialogConfigList)) return;
const { sName } = this.props.showConfig;
if (!record[sName]) return;
const { sActiveKey, sControlName } =
- sBtnSendDialogConfigList.find(item => {
- const { sActiveKey = "" } = item;
- return sActiveKey.split(",").includes(`${name}.${sName}`);
- }) || {};
- if (sControlName !== "BtnSendDialog") {
+ sBtnSendDialogConfigList.find((item) => {
+ const { sActiveKey = '' } = item;
+ return sActiveKey.split(',').includes(`${name}.${sName}`);
+ })
+ || {};
+ if (sControlName !== 'BtnSendDialog') {
if (!sActiveKey) return;
this.lastValue = currentValue;
onToolBarBtnClick({ key: sControlName });
}
}, timeout);
- };
+ }
- onExecInstructSet = type => {
+ onExecInstructSet = (type) => {
const { sInstruct: sInstructStr, showName, sOnChangeInstruct } = this.props.showConfig;
const sInstruct = commonUtils.convertStrToObj(sInstructStr, {});
let { [type]: instructType } = sInstruct;
- if (type === "change") {
+ if (type === 'change') {
const onChangeNew = commonUtils.convertStrToObj(sOnChangeInstruct, {});
instructType = onChangeNew[type];
}
@@ -367,46 +314,47 @@ export default class CommonComponent extends Component {
this.props.onExecInstructSet({
type,
sInstruct: instructType,
- showName: `${showName}-${type === "blur" ? "离焦" : "变化"}`,
+ showName: `${showName}-${type === 'blur' ? '离焦' : '变化'}`,
});
} else {
- message.error("未定义调用指令集事件！");
+ message.error('未定义调用指令集事件！');
}
return true;
}
return false;
- };
+ }
onCheckFields = () => {
// 手机号、邮箱校验等校验
// setTimeout(() => {
- const sDateFormatTypeList = ["phone", "mobile", "mail", "postcode"];
+ const sDateFormatTypeList = ['phone', 'mobile', 'mail', 'postcode'];
const { sName, showName, sDateFormat } = this.props.showConfig;
const { record } = this.props;
- const IncorrectFormat = commonFunc.showLocalMessage(this.props, "IncorrectFormat", "格式不正确");
- const value = record[sName];
- if (value !== undefined && value !== "" && sDateFormatTypeList.includes(sDateFormat)) {
+ const value = record?.[sName];
+ if (
+ value !== undefined && value !== '' && sDateFormatTypeList.includes(sDateFormat)
+ ) {
let flag = false;
- if (sDateFormat === "phone") {
+ if (sDateFormat === 'phone') {
const reg = /^0\d{2,3}-\d{7,8}$/;
const reg1 = /^1[0-9]{10}$/;
const reg2 = /^0\d{2,3}-\d{7,8}-\d{1,8}$/;
if (!reg.test(value) && !reg1.test(value) && !reg2.test(value)) {
flag = true;
}
- } else if (sDateFormat === "mobile") {
+ } else if (sDateFormat === 'mobile') {
const reg = /^0\d{2,3}-\d{7,8}$/;
const reg1 = /^1[0-9]{10}$/;
const reg2 = /^0\d{2,3}-\d{7,8}-\d{1,8}$/;
if (!reg.test(value) && !reg1.test(value) && !reg2.test(value)) {
flag = true;
}
- } else if (sDateFormat === "mail") {
+ } else if (sDateFormat === 'mail') {
const reg = /^[a-zA-Z0-9]{1,20}@[a-zA-Z0-9]{1,5}\.[a-zA-Z0-9]{1,5}$/;
if (!reg.test(value)) {
flag = true;
}
- } else if (sDateFormat === "postcode") {
+ } else if (sDateFormat === 'postcode') {
const reg = /^[1-9][0-9]{5}$/;
if (!reg.test(value)) {
flag = true;
@@ -414,30 +362,26 @@ export default class CommonComponent extends Component {
}
if (flag) {
- this.props.onChange(
- this.props.name,
- "verificationFailed",
- { verificationFailed: true, verificationFailedMsg: `【${showName}】【${sName}】${IncorrectFormat}！` },
- this.props.sId,
- []
- );
- message.warning(`【${showName}】【${sName}】${IncorrectFormat}！`);
+ this.props.onChange(this.props.name, 'verificationFailed', { verificationFailed: true, verificationFailedMsg: `【${showName}】【${sName}】格式不正确！` }, this.props.sId, []);
+ message.warning(`【${showName}】【${sName}】格式不正确！`);
} else if (record.verificationFailed) {
record.verificationFailed = undefined;
}
}
// }, timeout);
- };
+ }
/** 下拉时看是否要重新获取数据 */
- onDropdownVisibleChange = open => {
- const { dropDownData, bNewRecord, pageNum: pageNumOld, totalPageCount: totalPageCountOld, searchValue, conditonValues } = this.state;
+ onDropdownVisibleChange = (open) => {
+ const {
+ dropDownData, bNewRecord, pageNum: pageNumOld, totalPageCount: totalPageCountOld, searchValue, conditonValues,
+ } = this.state;
if (this.mounted && open) {
const conditonValuesNew = this.props.getSqlCondition(this.props.showConfig, this.props.name, this.props.record);
const pageNum = JSON.stringify(conditonValuesNew) !== JSON.stringify(conditonValues) ? 1 : pageNumOld === 0 ? 1 : pageNumOld;
const totalPageCount = conditonValuesNew !== conditonValues ? 1 : totalPageCountOld;
- if (pageNum === 1 && this.props.showConfig.sDropDownType === "sql" && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
+ if (pageNum === 1 && this.props.showConfig.sDropDownType === 'sql' && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
this.setState({ spinState: true });
this.getDropDownData(pageNum, totalPageCount, searchValue, this.dropDownCount);
}
@@ -456,17 +400,14 @@ export default class CommonComponent extends Component {
}
this.props.onDropdownVisibleChange(open);
}
- };
+ }
onDoubleClick = () => {
const sMemo = this.props.showConfig.sName;
const title = this.props.showConfig.showName;
- const bSParamValue = sMemo === "sParamValue";
- if (
- (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("Memo") > -1) ||
- (bSParamValue && !this.props.record.sDropDownData) ||
- (this.props.showConfig.sControlName && this.props.showConfig.sControlName.toLowerCase().indexOf("memo") > -1)
- ) {
+ const bSParamValue = sMemo === 'sParamValue';
+ if ((commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('Memo') > -1) || (bSParamValue && !this.props.record.sDropDownData) ||
+ (this.props.showConfig.sControlName && this.props.showConfig.sControlName.toLowerCase().indexOf('memo') > -1)) {
const sCurrMemoProps = {
title,
name: this.props.name,
@@ -482,20 +423,14 @@ export default class CommonComponent extends Component {
} else if (this.props.onSaveState) {
this.props.onSaveState({ sCurrMemoProps });
}
- } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sName") > -1) {
- /* 计算方案 变量设置双击弹出 */
- this.props.onFieldDoubleClick(this.props.record, this.state.dataValue, this.props.showConfig, this.props.name);
- } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sValue") > -1) {
- /* 计算方案 变量设置双击弹出 */
+ } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sValue') > -1) { /* 计算方案 变量设置双击弹出 */
this.props.onFieldDoubleClick(this.props.record, this.state.dataValue, this.props.showConfig, this.props.name);
- } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sAssignField") > -1) {
- /* 赋值字段 变量设置双击弹出 */
+ } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sAssignField') > -1) { /* 赋值字段 变量设置双击弹出 */
this.props.onFieldDoubleClick(this.state.dataValue, this.props.showConfig, this.props.name);
- } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sInstruct") > -1) {
- /* 赋值字段 变量设置双击弹出 */
+ } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sInstruct') > -1) { /* 赋值字段 变量设置双击弹出 */
this.props.onFieldDoubleClick(this.state.dataValue, this.props.showConfig, this.props.name);
}
- };
+ }
onEditorClick = () => {
// if (this.props.enabled) {
@@ -511,44 +446,42 @@ export default class CommonComponent extends Component {
config: this.props.showConfig,
};
this.props.onSaveState({ curEditorProps });
- };
+ }
- onKeyUp = e => {
+ onKeyUp = (e) => {
if (this.props.onKeyUp) {
this.props.onKeyUp(e);
}
- };
+ }
- onKeyDown = e => {
+ onKeyDown = (e) => {
// 如果输入的是字母数字或者中文
if (!this.state.bDropDownOpen && /^[a-zA-Z0-9\u4e00-\u9fa5]+$/.test(e.keyCode)) {
this.setState({ bDropDownOpen: true });
}
- if (e.ctrlKey && e.keyCode === 82) {
- /* CTRL+ALT+R 代替右击事件 */
+ if (e.ctrlKey && e.keyCode === 82) { /* CTRL+ALT+R 代替右击事件 */
this.onContextMenu(e);
- } else if (e.key === "F10") {
+ } else if (e.key === 'F10') {
message.info(this.props.showConfig.sName);
- } else if (e.ctrlKey && (e.altKey || e.metaKey) && e.keyCode === 71) {
- /* CTRL+ALT+G F7 设置界面 */
+ } else if (e.ctrlKey && (e.altKey || e.metaKey) && e.keyCode === 71) { /* CTRL+ALT+G F7 设置界面 */
const { sType } = this.props?.app?.userinfo || {};
- if (!["sysadmin"].includes(sType)) {
+ if (!['sysadmin'].includes(sType)) {
return;
}
if (commonUtils.isNotEmptyObject(this.props)) {
- const { name, tableConfig, record, configName } = this.props;
+ const {
+ name, tableConfig, record, configName,
+ } = this.props;
if (commonUtils.isNotEmptyObject(tableConfig)) {
const myTableConfig = JSON.parse(JSON.stringify(tableConfig));
- myTableConfig.sActiveId = "16411004790004762980820285096000";
+ myTableConfig.sActiveId = '16411004790004762980820285096000';
myTableConfig.sName = this.props.showConfig.sName;
const myTableConfigArr = [];
myTableConfigArr.push(myTableConfig);
- if (this.props.name === "master") {
- /* 主表 */
- this.props.onViewClick(name, "myTableConfig", record, 0, myTableConfigArr, configName);
- } else {
- /* 从表 */
- this.props.onViewClick(name, "myTableConfig", record, 0, myTableConfigArr, configName);
+ if (this.props.name === 'master') { /* 主表 */
+ this.props.onViewClick(name, 'myTableConfig', record, 0, myTableConfigArr, configName);
+ } else { /* 从表 */
+ this.props.onViewClick(name, 'myTableConfig', record, 0, myTableConfigArr, configName);
}
}
}
@@ -556,33 +489,28 @@ export default class CommonComponent extends Component {
const { showConfig, record, name } = this.props;
this.props.onKeyDown(e, record, showConfig.sName, name);
}
- };
+ }
/* CommonList列表onkeydown-F10处理 */
- onKeyDownDiv = e => {
+ onKeyDownDiv = (e) => {
if (this.props.onKeyDown) {
this.props.onKeyDown(e);
}
- if (e.key === "F10") {
+ if (e.key === 'F10') {
message.info(this.props.showConfig.sName);
} else if (e.ctrlKey && e.keyCode === 67) {
- console.log("复制成功！");
+ console.log('复制成功！');
} else if (e.ctrlKey && e.keyCode === 65) {
- console.log("全选成功！");
+ console.log('全选成功！');
} else {
e.preventDefault();
return false;
}
- };
+ }
/* 单击右键全部更新，弹出窗选择后，更新此列所有数据 （只更新非只读字段） */
- onContextMenu = e => {
- if (
- this.state.enabled &&
- commonUtils.isNotEmptyObject(this.props) &&
- this.props.name !== "master" &&
- commonUtils.isNotEmptyObject(this.props.showConfig)
- ) {
+ onContextMenu = (e) => {
+ if (this.state.enabled && commonUtils.isNotEmptyObject(this.props) && this.props.name !== 'master' && commonUtils.isNotEmptyObject(this.props.showConfig)) {
const { showConfig, name } = this.props;
const { bReadonly } = showConfig;
if (bReadonly) {
@@ -594,47 +522,47 @@ export default class CommonComponent extends Component {
this.props.onContextMenu(e, record, showConfig, name);
}
}
- };
+ }
/* 字段选择弹窗 */
onFieldPopupModal = (showConfig, name, open) => {
if (open !== undefined) {
this.props.onFieldPopupModal(showConfig, name);
}
- };
+ }
/** 获取selectprops对象 */
getSelectProps = () => {
/* 返回值声明 */
const obj = {
id: `${this.props.showConfig.sName}${this.props.record ? this.props.record.sId : commonUtils.createSid()}`,
- showSearch: true /* 是否有查找功能 */,
+ showSearch: true, /* 是否有查找功能 */
// disabled: !this.state.enabled /* 修改的时候传过来的数据 */
onSelect: () => {
- if (this.state.mode !== "multiple") {
+ if (this.state.mode !== 'multiple') {
this.setState({ bDropDownOpen: false, bNotFirstEnter: true });
}
},
- onChange: this.handleSelectOptionEvent /* 选择触发事件 */,
- filterOption: this.filterOption /* 搜索时过滤对应的 option 属性 */,
+ onChange: this.handleSelectOptionEvent, /* 选择触发事件 */
+ filterOption: this.filterOption, /* 搜索时过滤对应的 option 属性 */
onDropdownVisibleChange: this.onDropdownVisibleChange,
onPopupScroll: this.handlePopupScroll,
onSearch: this.handleSearch,
- notFoundContent: this.state.spinState ? this.selectTableSearch(e)}/>
@@ -852,9 +758,7 @@ export default class CommonComponent extends Component {
{menu}
- {text}
-
- );
+ render: (text) => {
+ return ({text} );
},
};
});
return (
-
- );
- }
- return boxes;
- };
- // 计算材料利用率
- const availability = (
- ((horizontalBoxes * verticalBoxes * (Number(dMachineLength) * Number(dMachineWidth))) / (Number(dWlcd) * Number(dWlkd))) *
- 100
- ).toFixed(2);
- useEffect(() => {
- setBoxKey(new Date().getTime());
- setTimeout(() => {
- // if (boxRef.current && textRef.current && textRefs.current && nTextRef.current && nTextRefs.current)
- if (boxRef.current && textRef.current && textRefs.current && nTextRef.current && nTextRefs.current) {
- // 计算父元素的缩放因子
- // 对父元素应用缩放
- boxRef.current.style.transform = `scale(${scaleX}, ${scaleY})`;
- boxRef.current.style.transformOrigin = "top left";
- // // 对子元素应用逆缩放
- textRef.current.style.transform = `scale(${1 / scaleX}, ${1 / scaleY})`;
- textRef.current.style.transformOrigin = "top left";
- textRefs.current.style.transform = `scale(${1 / scaleX}, ${1 / scaleY})`;
- textRefs.current.style.transformOrigin = "top left";
- }
- }, 10);
- }, [scaleX, scaleY]);
- const isMax = slaveDataDetail?.dMaxWidth * slaveDataDetail?.dMaxLength > slaveDataDetail?.dMachineLength * slaveDataDetail?.dMachineWidth;
- const isDPartsLength = slaveDataDetail?.dPartsLength < slaveDataDetail?.dMaxLength && slaveDataDetail?.dPartsWidth < slaveDataDetail?.dMaxWidth;
-
- const isShow =
- isDPartsLength && slaveDataDetail && slaveDataDetail.dMachineLength && slaveDataDetail.dMaxWidth && slaveDataDetail.dMaxLength && isMax;
-
- return (
- <>
- {isShow ? (
-
-
-
-
- {/*
- {isJuantong ? "门幅方向" : ""}
-
-
-
*/}
-
-
- ) : (
- ""
- )}
-
- );
-};
-export default BoxShowImgMaterial;
diff --git a/src/components/Common/CheckModel.js b/src/components/Common/CheckModel.js
index fdffd16..efc1061 100644
--- a/src/components/Common/CheckModel.js
+++ b/src/components/Common/CheckModel.js
@@ -1,7 +1,7 @@
/* eslint-disable array-callback-return,no-undef */
import React, { Component } from 'react';
-import { Table, Button, Checkbox, Input, message } from 'antd-v4';
-import config from '@/utils/config';
+import { Table, Button, Checkbox, Input, message } from 'antd';
+import * as config from '@/utils/config';
import styles from '@/index.less';
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
diff --git a/src/components/Common/CommonBase.js b/src/components/Common/CommonBase.js
index d5755aa..1d11210 100644
--- a/src/components/Common/CommonBase.js
+++ b/src/components/Common/CommonBase.js
@@ -8,7 +8,7 @@ import React, { Component } from 'react';
import { message } from '@/utils/common/message';
import moment from 'moment';
import lodash from 'lodash';
-import commonConfig from '../../utils/config';
+import * as commonConfig from '../../utils/config';
import * as commonUtils from '../../utils/utils';
import * as commonServices from '../../services/services';
import * as commonFunc from './commonFunc';
@@ -44,6 +44,7 @@ export default (ChildComponent) => {
window.addEventListener('beforeunload', this.beforeunload);
window.addEventListener('unload', this.unload);
window.addEventListener('keydown', this.handleF9KeyPress);
+ console.log('sSrcModelsId', this.state.sSrcModelsId);
}
async componentWillMount() {
@@ -451,7 +452,7 @@ export default (ChildComponent) => {
}
const url = `${commonConfig.server_host}business/getSelectLimit/${showConfig.sId}?sModelsId=${this.state.sModelsId}&sName=${formSrcRoute}`;
/* 参数 */
- const nameNew = (name.includes('slaveUp') || name.includes('slaveDown')) ? 'slave' : name;
+ const nameNew = name.includes('slaveUp') ? 'slave' : name;
const conditonValues = this.getSqlCondition(showConfig, nameNew, record);
const body = {
@@ -679,6 +680,7 @@ export default (ChildComponent) => {
let sCopyToConfigMaster = {};
if(commonUtils.isNotEmptyArr(sCopyToConfigField) && commonUtils.isNotEmptyArr(tableConfig)) {
sCopyToConfigMaster = tableConfig.gdsconfigformslave.filter(item => item.sControlName === sCopyToConfigField);
+ console.log(sCopyToConfigMaster, sCopyToConfigMaster);
if(commonUtils.isNotEmptyArr(sCopyToConfigMaster)) {
const sCopyToConfigMasterAssignField= sCopyToConfigMaster[0].sAssignField;
const newCopyTo = {};
@@ -981,9 +983,6 @@ export default (ChildComponent) => {
* 原代码：
*/
let billNum = '';
- let footTotalStr = '';
- const footTotal =commonFunc.showMessage(this.props.app.commonConst, 'footTotal') ||
- '当前显示 共${billNum}个单据 共${total}条记录';
if (dataReturn.dataset.billNum) {
billNum = `共${dataReturn.dataset.billNum}个单据 `;
}
@@ -996,9 +995,8 @@ export default (ChildComponent) => {
current: dataReturn.dataset.currentPageNo,
pageSize: pageSize,
showTotal: (total) => {
- footTotalStr = footTotal.replace('${billNum}', dataReturn.dataset.billNum).replace('${total}', total);
return (
- {footTotalStr}
+ {`当前显示 ${billNum}共${total}条记录`}
);
},
};
@@ -1082,9 +1080,13 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyArr(tableDelData)) {
addState[`${name}DelData`] = [];
}
+
if (isWait) {
+ // console.log(addState,'----------');
+
return addState;
} else if (this.mounted) {
+
this.handleSaveState(addState);
}
} else {
@@ -1769,56 +1771,62 @@ export default (ChildComponent) => {
const sFiledConfig = tableConfig.gdsconfigformslave[iConfigIndex];
if (commonUtils.isNotEmptyObject(sFiledConfig)) {
const tableDataRow = { ...tableData[iIndex], ...changeValue, handleType };
- const sRulesJson = sFiledConfig.sButtonEnabled;
+ const sRulesJson = sFiledConfig.sButtonEnabled;
if (commonUtils.isNotEmptyObject(sRulesJson) && commonUtils.isJSON(sRulesJson)) {
- const sRulesObj = JSON.parse(sRulesJson);
- if (commonUtils.isNotEmptyObject(sRulesObj)) {
- const { showColumn, hideColumn, condition } = sRulesObj;
- if (commonUtils.isNotEmptyArr(condition)) {
- let flag = false;
- for (const item of condition) {
- const {
- bFilterName, bFilterCondition, bFilterValue,
- } = item;
- if (bFilterCondition === '>') {
- if (tableDataRow[bFilterName] > bFilterValue) {
- flag = true;
- }
- } else if (bFilterCondition === '=') {
- if (tableDataRow[bFilterName] === bFilterValue) {
- flag = true;
- }
- } else if (bFilterCondition === '<') {
- if (tableDataRow[bFilterName] < bFilterValue) {
- flag = true;
+ const sRulesObjArr = JSON.parse(sRulesJson);
+ if (commonUtils.isNotEmptyArr(sRulesObjArr)) {
+ sRulesObjArr.forEach((sRulesObj) => {
+ const { showColumn, hideColumn, condition } = sRulesObj;
+ if (commonUtils.isNotEmptyArr(condition)) {
+ let flag = false;
+ for (const item of condition) {
+ const {
+ bFilterName, bFilterCondition, bFilterValue,
+ } = item;
+ if (bFilterCondition === '>') {
+ if (Number(tableDataRow[bFilterName]) > Number(bFilterValue)) {
+ flag = true;
+ }
+ } else if (bFilterCondition === '=') {
+ if (tableDataRow[bFilterName].toString() === bFilterValue.toString() ) {
+ flag = true;
+ }
+ } else if (bFilterCondition === '!==') {
+ if (tableDataRow[bFilterName].toString() !== bFilterValue.toString()) {
+ flag = true;
+ }
+ } else if (bFilterCondition === '<') {
+ if (Number(tableDataRow[bFilterName]) < Number(bFilterValue)) {
+ flag = true;
+ }
}
}
- }
- if (flag) {
- if (commonUtils.isNotEmptyArr(showColumn)) {
- for (const column of showColumn) {
- const iShowIndex = tableConfig.gdsconfigformslave.findIndex(item => item.sName === column);
- if (iShowIndex > -1) {
- const sFiledObj = tableConfig.gdsconfigformslave[iShowIndex];
- if (commonUtils.isNotEmptyObject(sFiledObj)) {
- tableConfig.gdsconfigformslave[iShowIndex].bVisible = true;
+ if (flag) {
+ if (commonUtils.isNotEmptyArr(showColumn)) {
+ for (const column of showColumn) {
+ const iShowIndex = tableConfig.gdsconfigformslave.findIndex(item => item.sName === column);
+ if (iShowIndex > -1) {
+ const sFiledObj = tableConfig.gdsconfigformslave[iShowIndex];
+ if (commonUtils.isNotEmptyObject(sFiledObj)) {
+ tableConfig.gdsconfigformslave[iShowIndex] = {...tableConfig.gdsconfigformslave[iShowIndex], bVisible: true };
+ }
}
}
}
- }
- if (commonUtils.isNotEmptyArr(hideColumn)) {
- for (const column of hideColumn) {
- const iHideIndex = tableConfig.gdsconfigformslave.findIndex(item => item.sName === column);
- if (iHideIndex > -1) {
- tableConfig.gdsconfigformslave[iHideIndex].bVisible = false;
+ if (commonUtils.isNotEmptyArr(hideColumn)) {
+ for (const column of hideColumn) {
+ const iHideIndex = tableConfig.gdsconfigformslave.findIndex(item => item.sName === column);
+ if (iHideIndex > -1) {
+ tableConfig.gdsconfigformslave[iHideIndex] = {...tableConfig.gdsconfigformslave[iHideIndex], bVisible: false };
+ }
}
}
- }
- const tableColumn = commonFunc.getHeaderConfig(tableConfig);
- this.handleSaveState({ [`${name}Config`]: tableConfig, [`${name}Column`]: tableColumn });
+ const tableColumn = commonFunc.getHeaderConfig(tableConfig);
+ this.handleSaveState({ [`${name}Config`]: tableConfig, [`${name}Column`]: tableColumn });
+ }
}
- }
+ });
}
}
}
@@ -2938,6 +2946,7 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyObject(sRulesJson) && commonUtils.isJSON(sRulesJson)) {
const sRulesObjArr = JSON.parse(sRulesJson);
if (Array.isArray(sRulesObjArr) && commonUtils.isNotEmptyArr(sRulesObjArr)) {
+ console.log('sRulesObjArr:', sRulesObjArr);
sRulesObjArr.forEach((sRulesObj) => {
const {
showColumn, hideColumn, condition, tbName, sConfigName,
@@ -3140,6 +3149,7 @@ export default (ChildComponent) => {
}
const url = `${commonConfig.server_host}procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
const dataReturn = (await commonServices.postValueService(app.token, value, url)).data;
+ console.log('dataReturn', dataReturn);
if (dataReturn.code === 1) {
if (commonUtils.isNotEmptyArr(slaveDataOld)) {
slaveDataOld.forEach((item) => {
@@ -3290,6 +3300,7 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyArr(allReturnMap.masterData) && Array.isArray(allReturnMap.masterData)) {
allReturnMap.masterData = allReturnMap.masterData[0];
}
+ console.log('allReturnMap:', allReturnMap);
this.setState({ ...allReturnMap });
}
} else {
diff --git a/src/components/Common/CommonBill/index.js b/src/components/Common/CommonBill/index.js
index 3b71b43..0286845 100644
--- a/src/components/Common/CommonBill/index.js
+++ b/src/components/Common/CommonBill/index.js
@@ -3,7 +3,7 @@
import React, { Component } from 'react';
import { UploadOutlined } from '@ant-design/icons';
import { Form } from '@ant-design/compatible';
-// import '@ant-design/compatible/assets/index.css';
+import '@ant-design/compatible/assets/index.css';
import {
Row,
Col,
@@ -17,7 +17,7 @@ import {
Upload,
Input,
Modal
-} from 'antd-v4';
+} from 'antd';
import { message } from '@/utils/common/message';
import CommonSales from '@/components/Common/CommonBillEvent';/* 继承销售模块业务功能 */
import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
@@ -27,7 +27,7 @@ import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
-import commonConfig from '@/utils/config';
+import * as commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
import CommonListSelect from '@/components/Common/CommonListSelect';
@@ -1708,8 +1708,7 @@ class CommonBill extends Component {
if (Type === 'formSlave') { /* 根据从表勾选数据 生成从表数据 */
const { slaveSelectedRowKeys } = this.props;
if (commonUtils.isEmptyObject(slaveSelectedRowKeys)) {
- message.error(commonFunc.showMessage(this.props.app.commonConst, 'pleaseChooseData'));/* 请选择一条数据 */
-
+ message.warn('请选择数据');
return;
}
sId = slaveSelectedRowKeys;
@@ -1823,7 +1822,7 @@ class CommonBill extends Component {
let controlTableData = [];
if(visibleModal) {
if(commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) {
- controlTableData = controlData.filter(item => item.sControlId === slaveSelectedRowKeys[0])
+ controlTableData = controlData.filter(item => item.sSlaveId === slaveSelectedRowKeys[0]);
}else {
controlTableData = controlData;
}
@@ -2530,12 +2529,9 @@ const BillComponent = Form.create({
}
return Object.keys(controlGroup).map((tabNameKey) => {
- let tabName = tabNameKey.replace(/\d+/g, "");
+ const tabName = tabNameKey.replace(/\d+/g, "");
const num = tabNameKey.replace(/[^\d]/g, "").trim();
- const tableConfigArr = config?.gdsconfigformslave.filter(row => row.sControlName === tabNameKey.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName= tableConfigArr[0].showName;
- }
+
const viewProps = {
...props,
viewConfigs: controlGroup[tabNameKey],
diff --git a/src/components/Common/CommonBill/index.less b/src/components/Common/CommonBill/index.less
index 26f8ca4..22322e8 100644
--- a/src/components/Common/CommonBill/index.less
+++ b/src/components/Common/CommonBill/index.less
@@ -1,4 +1,4 @@
-@import "~@/variable.less";
+@import "~antd/lib/style/themes/default.less";
.bShowImg{
position: fixed;
width: 90px;
diff --git a/src/components/Common/CommonBillDeliver.js b/src/components/Common/CommonBillDeliver.js
index 0b64d0d..cd2d554 100644
--- a/src/components/Common/CommonBillDeliver.js
+++ b/src/components/Common/CommonBillDeliver.js
@@ -3,8 +3,8 @@
import React, { Component } from 'react';
import { UploadOutlined } from '@ant-design/icons';
import { Form } from '@ant-design/compatible';
-// import '@ant-design/compatible/assets/index.css';
-import { Row, Col, Checkbox, Layout, Spin, Tabs, Avatar, Button, message, Table, Input, Upload } from 'antd-v4';
+import '@ant-design/compatible/assets/index.css';
+import { Row, Col, Checkbox, Layout, Spin, Tabs, Avatar, Button, message, Table, Input, Upload } from 'antd';
import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
@@ -12,7 +12,7 @@ import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
-import commonConfig from '@/utils/config';
+import * as commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonBillDeliverEvent.js b/src/components/Common/CommonBillDeliverEvent.js
index 3ccafe1..2eea542 100644
--- a/src/components/Common/CommonBillDeliverEvent.js
+++ b/src/components/Common/CommonBillDeliverEvent.js
@@ -3,12 +3,12 @@
* Created by pm on 2021-08-17 用于送货单个性化.
*/
import React, { Component } from 'react';
-import { Modal, message } from 'antd-v4';
+import { Modal, message } from 'antd';
import moment from 'moment';
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonServices from '../../services/services'; /* 服务类 */
-import commonConfig from '../../utils/config';
+import * as commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc';
const { confirm } = Modal;
@@ -47,7 +47,7 @@ export default (ChildComponent) => {
employeeConfig: employeeConfigOld,
} = nextProps;
if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && formRoute.indexOf('indexOee') === -1)) {
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {};
@@ -274,7 +274,7 @@ export default (ChildComponent) => {
});
} else if (commonUtils.isEmptyObject(masterConfigOld) && formData.length === 1 && (sModelsType === 'cashier/financialTransfer' || sModelsType === 'purchase/purchaseEnquiry' || sModelsType === 'cashier/financialAdjustment' || sModelsType === 'print/printLabel' || sModelsType === 'complaint/complaint' || sModelsType === 'commonBill/onlyMaster') && formRoute.indexOf('indexOee') === -1) {
const config = {};
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
let addState = {};
@@ -296,7 +296,7 @@ export default (ChildComponent) => {
masterConfig, sId, pageLoading: false, ...addState,
});
} else if (commonUtils.isEmptyObject(slaveConfigOld) && commonUtils.isEmptyObject(masterConfigOld) && formData.length === 2 && (sModelsType === 'quality/accident') && formRoute.indexOf('indexOee') === -1) {
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'mftqualityaccidentSlave')[0];
@@ -319,7 +319,7 @@ export default (ChildComponent) => {
});
} else if (formRoute.indexOf('indexOee') > -1 && commonUtils.isEmptyObject(employeeConfigOld) && commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0) {
if (formRoute === '/indexOee/labelPrint' && commonUtils.isEmpty(slaveConfigOld)) { /* 入库标签打印 */
- const sId = currentId || nextProps.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData[0];
const slaveConfig = formData[0];
@@ -507,7 +507,7 @@ export default (ChildComponent) => {
/** 获取主表、从表、审核表数据 */
handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
const { currentId } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || '';
+ const sId = currentId !== undefined ? currentId : '';
await this.props.handleGetDataOne({
name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
});
@@ -544,7 +544,7 @@ export default (ChildComponent) => {
/* 获取表数据 */
handleGetMemoData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig) => {
const { currentId, sModelsType } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
+ const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
const addStateControl = await this.props.handleGetDataSet({
name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
});
@@ -597,7 +597,7 @@ export default (ChildComponent) => {
/* 获取单张表数据 */
handleGetOneMemoData = (memoName, memoConfig) => {
const { currentId } = this.props; /* 当前页签数据 */
- const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
+ const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
this.props.handleGetDataSet({
name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -5135,8 +5135,8 @@ export default (ChildComponent) => {
};
render() {
- const { masterData, sModelsType, app } = this.props;
- const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
+ const { masterData } = this.props;
+ const imgSrc = commonBusiness.handleAddIcon(masterData);
return (
-
-
-
- {generateMaterialBoxes()}
-
+ {returnData.msg}
+
+ ),
+ okText: '确认',
+ onOk() {},
+ });
+ } else {
+ message.success(check + returnData.msg);
+ }
}
} else {
/* 消审 */
@@ -2241,12 +2263,13 @@ export default (ChildComponent) => {
}
} else if(returnData.code === -8){
Modal.info({
- title: FriendlyReminder,
+ title: '温馨提示:',
content: (
{this.handleGetMsg(returnData.msg)}
),
+ okText: '确认',
onOk() {},
});
this.props.onSaveState({
@@ -2290,6 +2313,8 @@ export default (ChildComponent) => {
},
onCancel() {
},
+ okText: '保存',
+ cancelText: '不保存',
});
this.props.onSaveState({
loading: false,
@@ -2345,7 +2370,7 @@ export default (ChildComponent) => {
}
}
this.props.onSaveState({
- loading: false, slaveDelData: [], controlDelData: [], materialsDelData: [], processDelData: [], manyqtysDelData: [], colorDelData: [], packDelData: []
+ loading: false,
});
return true;
} else {
@@ -2381,8 +2406,8 @@ export default (ChildComponent) => {
let bCheck = false;
let iIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'BtnCheck' || item.sControlName === 'BtnExamine' || item.sControlName === 'BtnSubmit');
/* 配置了表格允许为空 则不进行校验 */
- if (slaveConfig && slaveConfig.bNotCanEmpty ) {
- message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
+ if (slaveConfig && slaveConfig.bNotCanEmpty && commonUtils.isEmptyArr(slaveData) ) {
+ message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
this.props.onSaveState({
loading: false,
});
@@ -2393,7 +2418,7 @@ export default (ChildComponent) => {
bCheck = true;
}
if(bCheck) {
- message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
+ message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
this.props.onSaveState({
loading: false,
});
@@ -2827,8 +2852,7 @@ export default (ChildComponent) => {
/* 上一条、下一条、首条、末条 */
handleSearchData = async (handleType) => {
const {
- sModelsId, app, currentIndexFlag, currentPageNo, masterData, masterConfig, slaveConfig, checkConfig,
- sSrcModelsId,
+ sModelsId, app, currentIndexFlag, currentPageNo, masterData, masterConfig, slaveConfig, checkConfig
} = this.props;
let { sBillIdsArray = []} = this.props;
let { currentId } = this.props;
@@ -2837,18 +2861,20 @@ export default (ChildComponent) => {
this.handleSearchData1(handleType);
return;
}
- const tipLast = commonFunc.showLocalMessage(this.props, 'tipLast', '当前已经是最后一条');
- const tipFirst = commonFunc.showLocalMessage(this.props, 'tipFirst', '当前已经是第一条');
const { currentPane, token } = app;
const {
pages, sFilterOrderBy, bFilter, sListFormmasterId, currentIndex,
} = currentPane;
- console.log('22page2222s2', pages);
let currentPosition = currentIndexFlag ? currentPageNo : commonUtils.isEmptyObject(pages) ? 1 : (((pages.current - 1) * commonConfig.pageSize) + Number.parseInt(currentIndex, 10)) + 1;
if (currentIndex === undefined) {
currentPosition = 1;
}
+ // if (handleType === 'first') {
+ // currentPosition = 1;
+ // } else if (handleType === 'end') {
+ // currentPosition = pages.total;
+ // }
if (!commonUtils.isNum(currentPosition)) { // 如果是列表直接点增加，就跳到第一条去
currentPosition = 1;
}
@@ -2860,12 +2886,12 @@ export default (ChildComponent) => {
if ("next".includes(handleType)) {
currentPosition = index + 1;
if(currentPosition > sBillIdsArray.length - 1 ){
- message.warn(tipLast);
+ message.warn('当前已经是最后一条');
return ;
}
} else if ("up".includes(handleType)) {
if(index === 0){
- message.warn(tipFirst);
+ message.warn('当前已经是第一条！');
return ;
}
currentPosition = index - 1;
@@ -2883,19 +2909,9 @@ export default (ChildComponent) => {
}
/* 如果是第一次请求 */
if(!bExist) {
- const bFromList = commonUtils.isEmptyObject(pages) ? true: false;
- if(bFromList) {
- if(handleType ==='next' || handleType ==='end') {
- message.warn(tipLast);
- return ;
- }else {
- message.warn(tipFirst);
- return ;
- }
- }
const value = {
- sClientType: '1', sFilterOrderBy, bFilter, sListFormmasterId, currentPosition, handleType, iCountSum: pages?.total,
- sUpId: masterData?.sId, sParentModelId :sSrcModelsId,
+ sClientType: '1', sFilterOrderBy, bFilter, sListFormmasterId, currentPosition, handleType, iCountSum: pages.total,
+ sUpId: masterData?.sId,
};
const url = `${commonConfig.server_host}business/getBusinessDataByIndex?sModelsId=${sModelsId}`;
/* 接收返回值 */
@@ -3904,7 +3920,7 @@ export default (ChildComponent) => {
handleTableChange = async (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
/* 从CommonBase获取默认参数 */
const {
- [`${name}Data`]: tableData, sModelsType, sModelsId, token, app, slaveConfig,
+ [`${name}Data`]: tableData, sModelsType, sModelsId, token, app, slaveConfig, [`${name}Config`]: tableConfig,
} = this.props;
let { [`${name}InfoData`]: tableInfoData } = this.props;
if (name === 'control' && sModelsType.includes('sales/salesOrder')) {
@@ -4117,7 +4133,8 @@ export default (ChildComponent) => {
...controlReturnData,
});
}
- } else if ((sModelsType.includes('cashier/') || sModelsType.includes('sales/salesInvoice') || sModelsType.includes('purchase/purchaseInvoice') || sModelsType.includes('purchase/outsideInvoice')) && (sFieldName === 'dTotalMoney' || sFieldName === 'dRoundingMoney')) { /* 付款单、收款单，从表付款/收款金额改变，会自动汇总到主表付款金额中 */
+ } else if ((sModelsType.includes('cashier/') || sModelsType.includes('sales/salesInvoice') || sModelsType.includes('purchase/purchaseInvoice') || sModelsType.includes('purchase/outsideInvoice')) && (sFieldName === 'dTotalMoney' || sFieldName === 'dTotalForeignMoney'
+ || sFieldName === 'dRoundingMoney' || sFieldName === 'dRoundForeignMoney')) { /* 付款单、收款单，从表付款/收款金额改变，会自动汇总到主表付款金额中 */
const addStata = {};
let { handleType } = masterData;
handleType = commonUtils.isEmpty(handleType) ? 'update' : handleType;
@@ -4163,6 +4180,28 @@ export default (ChildComponent) => {
addStata.dRoundingMoney = commonUtils.convertFixNum(dMoney, 6) + commonUtils.convertFixNum(addStata.dRoundingMoney, 6);
}
});
+
+ /* 主表的外币舍入 */
+ addStata.dRoundingForeignMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? addStata.dRoundingMoney / dCurrencyRate : 0, dNetMoney);
+ /* 从表的外币舍入 */
+ tableDataRow.dRoundForeignMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? tableDataRow.dRoundingMoney / dCurrencyRate : 0, dNetMoney);
+ } else if (sFieldName === 'dRoundForeignMoney') { /* 从表输入外币舍入 */
+ addStata.dRoundingForeignMoney = 0;
+ if (iIndex > -1) { /* 选中行 */
+ let dMoney = commonUtils.isNotEmptyNumber(tableDataRow.dRoundForeignMoney) ? tableDataRow.dRoundForeignMoney : 0;
+ dMoney = commonUtils.convertStrToNumber(dMoney);
+ addStata.dRoundingForeignMoney = dMoney + commonUtils.convertStrToNumber(addStata.dRoundingForeignMoney);
+ }
+ tableData.forEach((item, index) => { /* 非选中行 */
+ if (index !== iIndex) {
+ const dMoney = commonUtils.isNotEmptyNumber(item.dRoundForeignMoney) ? item.dRoundForeignMoney : 0;
+ addStata.dRoundingForeignMoney = commonUtils.convertFixNum(dMoney, 6) + commonUtils.convertFixNum(addStata.dRoundingForeignMoney, 6);
+ }
+ });
+ /* 主表的本位币舍入 */
+ addStata.dRoundingMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? addStata.dRoundingForeignMoney * dCurrencyRate : 0, dNetMoney);
+ /* 从表的本位币舍入 */
+ tableDataRow.dRoundingMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? tableDataRow.dRoundForeignMoney * dCurrencyRate : 0, dNetMoney);
}
masterData = { ...masterData, ...addStata };
this.props.onSaveState({ masterData });
@@ -4591,20 +4630,26 @@ export default (ChildComponent) => {
}
/* 各种金额，税额，价格计算 */
let models = name === 'materials' ? 'Materials' :
- sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('cashier/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials';
-
- if(sModelsType.includes('cashier/receipt') ) { /* 收款单 */
- models = 'Product';
- } else if(sModelsType.includes('cashier/payment') ) { /* 付款单 */
- models = 'Materials';
- }
-
+ sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials';
if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/')
|| sModelsType.includes('outside/') || sModelsType.includes('semigoodsStock/') || sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck') {
if (sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck') {
tableDataRow.dAuxiliaryQty = tableDataRow.dProductQty;
}
- tableDataRow = await this.handleMaterialsChange(tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models);
+ /* 找到sFieldName对应的配置，判断是否是离开调用逻辑，若是离开调用, 则走离开调用逻辑,否则走原来的 */
+ let bMoveSql = false;
+ if(commonUtils.isNotEmptyObject(tableConfig)){
+ const iConfigIndex = tableConfig.gdsconfigformslave.findIndex(item => item.sName === sFieldName);
+ if (iConfigIndex > -1) {
+ const sDropDownType = tableConfig.gdsconfigformslave[iConfigIndex].sDropDownType;
+ if(sDropDownType === 'movesql') {
+ bMoveSql = true;
+ }
+ }
+ }
+ if(!bMoveSql) {
+ tableDataRow = await this.handleMaterialsChange(tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models);
+ }
if (sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck') { /* 如果是材料销售模块/销售对账 如果是材料 则用换算数量*单价 算金额 */
/* 材料逻辑计算 */
@@ -4624,6 +4669,7 @@ export default (ChildComponent) => {
tableDataRow[`dN${modelsNew}Price`] = tableDataRow[`d${models}ForeignPrice`];
tableDataRow[`d${modelsNew}ForeignPrice`] = tableDataRow[`d${models}ForeignPrice`];
+ tableDataRow[`d${modelsNew}NoTaxPrice`] = tableDataRow[`d${models}NoTaxPrice`];
tableDataRow[`d${modelsNew}Price`] = tableDataRow[`d${models}Price`];
tableDataRow[`dN${modelsNew}Money`] = tableDataRow[`dN${models}Price`];
tableDataRow[`dN${modelsNew}Money`] = tableDataRow[`d${models}ForeignMoney`];
@@ -4824,7 +4870,7 @@ export default (ChildComponent) => {
}
const {
sModelsId, sModelsType, masterData: masterDataOld, app, masterConfig, slaveConfig, token,
- controlData, materialsData, processData, slaveData, slaveSelectedRowKeys,controlSelectedRowKeys,
+ controlData, materialsData, processData, slaveData = [], slaveSelectedRowKeys,controlSelectedRowKeys,
processSelectedRowKeys,materialsSelectedRowKeys,slaveInfoSelectedRowKeys, slaveInfoData, enabled,
} = this.props;
const addState = {};
@@ -5029,18 +5075,7 @@ export default (ChildComponent) => {
tableDataRow = commonBusiness.getCalculateAllMoney(app, models, 'sTaxId', returnData.masterData, tableDataRow);
}
} else if (sFieldName === 'sCurrency' || sFieldName === 'dCurrencyRate' || sFieldName ==='sCurrencyName') {
- let controlField =`d${models}ForeignPrice`;
- if(sModelsType?.includes('cashier/')) {
- tableDataRow.bSettleMoney = true;
- tableDataRow[`d${models}ForeignPrice`] = tableDataRow.dTotalForeignPrice;
- tableDataRow[`d${models}Money`] = tableDataRow.dTotalMoney;
-
- }
- if( sModelsType === 'sales/adjust') { /* 财务调整单 */
- // tableDataRow.dProductMoney = tableDataRow.dTotalMoney;
- controlField = 'dProductForeignMoney';
- }
- tableDataRow = commonBusiness.getCalculateAllMoney(app, models, controlField, returnData.masterData, tableDataRow);
+ tableDataRow = commonBusiness.getCalculateAllMoney(app, models, `dN${models}Money`, returnData.masterData, tableDataRow);
tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType;
}
if ((sFieldName === 'sWareHouseId' || sFieldName === 'sWareHouseNo' || sFieldName === 'sWareHouseName' ||
@@ -5137,7 +5172,6 @@ export default (ChildComponent) => {
slaveDataNew.push(tableDataRow);
});
addState.slaveData = slaveDataNew;
- addState.slaveDelData = slaveDelData;
} else {
this.props.getServiceError(dataReturn);
}
@@ -5779,17 +5813,8 @@ export default (ChildComponent) => {
});
}
- let dTotalMoney = masterData.dTotalMoney !== undefined ? masterData.dTotalMoney : 0;
-
- if (dTotalMoney === 0) {
- if (sModelsType === "cashier/payment") {
- /* 付款单1 */
- dTotalMoney = masterData.dMaterialsMoney;
- } else {
- dTotalMoney = masterData.dProductMoney;
- }
- }
- const models = sModelsType.includes("cashier/receipt") ? "Product" : "Materials";
+ const dTotalMoney = masterData.dTotalMoney !== undefined ? masterData.dTotalMoney : 0;
+ const dRoundingMoney = masterData.dRoundingMoney !== undefined ? masterData.dRoundingMoney : 0;
let minusSum = 0; /* 负数求和 */
let minusRoundingSum = 0; /* 负数舍入求和 */
const minusData = []; /* 负数集 */
@@ -5799,8 +5824,6 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyArr(slaveData) && slaveData.length > 0) {
slaveData.forEach((child) => {
child.dTotalMoney = 0;
- child.dProductMoney = 0;
- child.dMaterialsMoney = 0;
child.handleType = commonUtils.isEmpty(child.handleType) ? 'update' : child.handleType;
child.dRoundingMoney = commonUtils.isNum(child.dRoundingMoney) ? child.dRoundingMoney : 0;
child.dBalanceMoney = commonUtils.convertFixNum(child.dBalanceMoney, dNetMoney); /* 根据系统设定位数格式未付款金额*/
@@ -5817,6 +5840,11 @@ export default (ChildComponent) => {
}
});
}
+
+ // 计算外币金额和舍入外币金额
+ const dCurrencyRate = commonUtils.convertIsNotNumToNumber1(masterData.dCurrencyRate); /* 汇率 */
+ const dRoundingForeignMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? dRoundingMoney / dCurrencyRate : 0, dNetMoney); /* 外币舍入金额 */
+
if (commonUtils.convertFixNum(((minusSum - minusRoundingSum) + (positiveSum - positiveRoundingSum)) - dTotalMoney, dNetMoney) <= 0) {
/* 够扣 */
positiveSum -= minusRoundingSum;
@@ -5872,33 +5900,17 @@ export default (ChildComponent) => {
minusData[i].dRoundingMoney = 0;
minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? 'update' : minusData[i].handleType;
}
- masterData.dAdvanceMoney = commonUtils.convertFixNum(Math.abs(positiveSum), dNetMoney);
- masterData.bAdvance = true;
+ const advanceMoney = commonUtils.convertFixNum(Math.abs(positiveSum) - dRoundingMoney, dNetMoney);
+ masterData.dAdvanceMoney = advanceMoney > 0 ? advanceMoney : 0;
+ if(masterData.dAdvanceMoney > 0) {
+ masterData.bAdvance = true;
+ }
}
- const dCurrencyRate = commonUtils.convertIsNotNumToNumber1(masterData.dCurrencyRate); /* 汇率 */
/* 分摊算外币金额 */
if (commonUtils.isNotEmptyArr(slaveData) && slaveData.length > 0) {
slaveData.forEach((item, index) => {
slaveData[index].dTotalForeignMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? item.dTotalMoney / dCurrencyRate : 0, dNetMoney);
- slaveData[index].dProductForeignMoney = slaveData[index].dTotalForeignMoney;
- slaveData[index].dMaterialsForeignMoney = slaveData[index].dTotalForeignMoney;
- slaveData[index].dMaterialsMoney = slaveData[index].dTotalMoney;
- slaveData[index].dProductMoney = slaveData[index].dTotalMoney;
- console.log("111", slaveData[index]);
- console.log("222", models);
- if (models === "Materials" && commonUtils.isNotEmptyNumber(slaveData[index].dMaterialsQty)) {
- const dQty = slaveData[index].dMaterialsQty;
- const dMoney = slaveData[index].dMaterialsMoney;
- slaveData[index].dMaterialsPrice = commonUtils.convertFixNum(dMoney / dQty, 6);
- slaveData[index].dMaterialsForeignPrice = commonUtils.convertFixNum(slaveData[index].dMaterialsForeignMoney / dQty, 6);
- } else if (commonUtils.isNotEmptyNumber(slaveData[index].dProductQty)) {
- const dQty = slaveData[index].dProductQty;
- const dMoney = slaveData[index].dProductMoney;
- slaveData[index].dProductPrice = commonUtils.convertFixNum(dMoney / dQty, 6);
- slaveData[index].dProductForeignPrice = commonUtils.convertFixNum(slaveData[index].dProductForeignMoney / dQty, 6);
- }
-
- console.log("eeeee", slaveData[index]);
+ slaveData[index].dRoundForeignMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? item.dRoundingMoney / dCurrencyRate : 0, dNetMoney);
});
}
masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? 'update' : masterData.handleType;
@@ -5936,28 +5948,11 @@ export default (ChildComponent) => {
positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? 'update' : positiveData[i].handleType;
}
}
- const dCurrencyRate = commonUtils.convertIsNotNumToNumber1(masterData.dCurrencyRate); /* 汇率 */
/* 分摊算外币金额 */
if (commonUtils.isNotEmptyArr(slaveData) && slaveData.length > 0) {
slaveData.forEach((item, index) => {
slaveData[index].dTotalForeignMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? item.dTotalMoney / dCurrencyRate : 0, dNetMoney);
- slaveData[index].dProductForeignMoney = slaveData[index].dTotalForeignMoney;
- slaveData[index].dMaterialsForeignMoney = slaveData[index].dTotalForeignMoney;
- slaveData[index].dMaterialsMoney = slaveData[index].dTotalMoney;
- slaveData[index].dProductMoney = slaveData[index].dTotalMoney;
- console.log("333", slaveData[index].dMaterialsQty);
- console.log("441", models);
- if (models === "Materials" && commonUtils.isNotEmptyNumber(slaveData[index].dMaterialsQty)) {
- const dQty = slaveData[index].dMaterialsQty;
- const dMoney = slaveData[index].dMaterialsMoney;
- slaveData[index].dMaterialsPrice = commonUtils.convertFixNum(dMoney / dQty, 6);
- slaveData[index].dMaterialsForeignPrice = commonUtils.convertFixNum(slaveData[index].dMaterialsForeignMoney / dQty, 6);
- } else if (commonUtils.isNotEmptyNumber(slaveData[index].dProductQty)) {
- const dQty = slaveData[index].dProductQty;
- const dMoney = slaveData[index].dProductMoney;
- slaveData[index].dProductPrice = commonUtils.convertFixNum(dMoney / dQty, 6);
- slaveData[index].dProductForeignPrice = commonUtils.convertFixNum(slaveData[index].dProductForeignMoney / dQty, 6);
- }
+ slaveData[index].dRoundForeignMoney = commonUtils.convertFixNum(dCurrencyRate !== 0 ? item.dRoundingMoney / dCurrencyRate : 0, dNetMoney);
});
}
masterData.dAdvanceMoney = 0;
@@ -5968,17 +5963,6 @@ export default (ChildComponent) => {
}
this.props.onSaveState({ masterData, slaveData });
}
- // let allTotalMoney = 0;
- // let allRoundingMoney = 0;
- // slaveData.forEach((child) => {
- // if (child.dTotalMoney !== undefined) {
- // allTotalMoney += child.dTotalMoney * 1;
- // }
- // if (child.dRoundingMoney !== undefined) {
- // allRoundingMoney += child.dRoundingMoney * 1;
- // }
- // });
- // this.props.onSaveState({ allTotalMoney, allRoundingMoney });
return masterData;
};
@@ -6145,9 +6129,6 @@ export default (ChildComponent) => {
/** 按钮操作事件 */
handleButtonClick = async (name) => {
-
- const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
-
if (name === 'BtnOut') {
this.handleOut();
} else if (name === 'BtnDesignFunction') {
@@ -6406,12 +6387,13 @@ export default (ChildComponent) => {
this.props.onSaveState({ ...allReturnMap, pageLoading:false, });
}else if (dataReturn.code === -8 || dataReturn.code === 2) {
Modal.info({
- title: FriendlyReminder,
+ title: '温馨提示:',
content: (
{this.handleGetMsg(dataReturn.msg)}
),
+ okText: '确认',
onOk() {},
});
this.props.onSaveState({ ...allReturnMap, pageLoading:false, });
@@ -6600,7 +6582,7 @@ export default (ChildComponent) => {
const { token } = this.props;
const { processSelectedRowKeys } = this.props;
/* 如果是材料 则校验必须选择工序 */
- if(name === 'materials') {
+ if(location.pathname?.includes('TableTreeNew') &&name === 'materials') {
if (commonUtils.isEmptyArr(processSelectedRowKeys)) {
message.warning('请选择对应工序');
return;
@@ -6905,7 +6887,6 @@ export default (ChildComponent) => {
});
} else if (name === 'process' && sName === 'sQuoParams') { // 产品工艺卡报价参数
const { processConfig, enabled, sModelsType } = this.props;
- const NoQuoParameters = commonFunc.showLocalMessage(this.props, 'NoQuoParameters', '无报价参数！');
const slaveSelectOneData = record;
let modalVisible = false;
const sProcessParamsSelects = [];
@@ -6915,7 +6896,7 @@ export default (ChildComponent) => {
paramType = slaveSelectOneData.sProcessParam;
}
if(commonUtils.isEmpty(paramType)) {
- message.warn(NoQuoParameters);
+ message.warn('无报价参数！');
return;
}
/* 工序参数以表格形式展示 列 */
@@ -6959,7 +6940,7 @@ export default (ChildComponent) => {
/* 要把数据以表格的形式显示出来 */
const sParamJsonObj = JSON.parse(paramType);
for (const key of Object.keys(sParamJsonObj)) {
- if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default') && !key.includes('FieldName')) {
+ if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default')) {
const obj = {};
obj.sId = commonUtils.createSid();
obj.sParamKey = key;
@@ -7025,8 +7006,7 @@ export default (ChildComponent) => {
paramType = slaveSelectOneData.sWorkOrderParam;
}
if(commonUtils.isEmpty(paramType)) {
- const NoProcessParameters = commonFunc.showLocalMessage(this.props, 'NoProcessParameters', '无工艺参数！');
- message.warn(NoProcessParameters);
+ message.warn('无工艺参数！');
return;
}
/* 工序参数以表格形式展示 列 */
@@ -7390,7 +7370,6 @@ export default (ChildComponent) => {
handleViewChoose= (name, sName, record) => {
const { sId } = record; /* 控制表主键 */
const { enabled, processSelectedRowKeys } = this.props;
- const NoProcessParameters = commonFunc.showLocalMessage(this.props, 'NoProcessParameters', '无工艺参数！');
const sisColorSelectedRowKeys = [];
let jsonData = [];
if (name === 'process' && sName === 'sColorSerialMemo') {
@@ -7456,7 +7435,7 @@ export default (ChildComponent) => {
paramType = slaveSelectOneData.sReportParam; /* 上报参数 */
}
if (commonUtils.isEmpty(paramType)) {
- message.warn(NoProcessParameters);
+ message.warn('无工艺参数！');
return;
}
/* 工序参数以表格形式展示 列 */
@@ -9144,7 +9123,7 @@ export default (ChildComponent) => {
/* 找到放大镜复制到配置 */
/* 材料大类 */
- const copyToConfig = processConfig.gdsconfigformslave.filter(item => item.sControlName.toLowerCase() === `${selectConfig.sControlName}.materials0`.toLowerCase());
+ const copyToConfig = processConfig.gdsconfigformslave.filter(item => item.sControlName.toLowerCase() === `${selectConfig.sControlName}`.toLowerCase());
const copyToAssignField = commonUtils.isNotEmptyArr(copyToConfig) ? copyToConfig[0].sAssignField : ''; /* 材料大类 */
const addState ={};
@@ -9159,7 +9138,7 @@ export default (ChildComponent) => {
if (iIndex > -1) {
newCopyTo.materials0 = item;
}
- let tableDataRowAdd = this.handleTableAdd('materials0', true);
+ let tableDataRowAdd = this.handleTableAdd('materials', true);
item.handleType = 'add';
// tableDataRowAdd = { ...tableDataRowAdd, ...item }; // 取赋值字段
tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(copyToAssignField, item) }; // 取赋值字段
@@ -9270,6 +9249,57 @@ export default (ChildComponent) => {
console.log('放大镜确认数据：',tbName, tableData, materials0Data)
this.props.onSaveState({ materials0Data });
}
+ } else if(location.pathname && location.pathname.includes('quotationPackTableTree') && selectConfig.sControlName && selectConfig.sControlName.includes('BtnPopupMaterials')) { /* 报价单工序表放大镜 选择材料 */
+
+ let { materialsData = [], processData, processSelectedRowKeys } = this.props;
+
+ const copyToConfig = processConfig.gdsconfigformslave.filter(item => item.sControlName.toLowerCase() === `${selectConfig.sControlName}`.toLowerCase());
+ const copyToAssignField = commonUtils.isNotEmptyArr(copyToConfig) ? copyToConfig[0].sAssignField : ''; /* 材料大类 */
+
+ /* 找到放大镜复制到配置 */
+ const iIndex = commonUtils.isNotEmptyArr(tableSelectedRowKeys) ? tableData.findIndex(item => item.sId === tableSelectedRowKeys[0]) : -1;
+ if (commonUtils.isNotEmptyArr(selectData)) {
+ let processRow = {};
+ if(commonUtils.isNotEmptyArr(processData) && commonUtils.isNotEmptyArr(processSelectedRowKeys)) {
+ const iPIndex = processData.findIndex(item => processSelectedRowKeys.includes(item.sId));
+ if(iPIndex > -1) {
+ processRow = processData[iPIndex];
+ }
+ }
+ const selectFilterDataAll = selectData; /* 除了油墨,专色墨,电化铝之外的物料大类 */
+ /* 全部材料 */
+ if(commonUtils.isNotEmptyArr(selectFilterDataAll)) {
+ selectFilterDataAll.forEach((item, index) => {
+ const newCopyTo = {};
+ newCopyTo.master = masterData;
+ if (iIndex > -1) {
+ newCopyTo.materials = item;
+ }
+ let tableDataRowAdd = this.handleTableAdd('materials', true);
+ item.handleType = 'add';
+ tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(copyToAssignField, item) }; // 取赋值字段
+ tableDataRowAdd.sId = commonUtils.createSid();
+ tableDataRowAdd.sParentId = masterData.sId;
+ tableDataRowAdd.sParentSlaveId = tableData[iIndex].sId; /* 选中从表的sId */
+ if(commonUtils.isNotEmptyObject(processRow)) {
+ if(commonUtils.isEmptyObject(tableDataRowAdd.sProcessId) ) {
+ tableDataRowAdd.sProcessId = processRow.sProcessId; /* 选中从表的sId */
+ }
+ if(commonUtils.isEmptyObject(tableDataRowAdd.sProcessTbId) ) {
+ tableDataRowAdd.sProcessTbId = processRow.sId; /* 选中从表的sId */
+ }
+ if(commonUtils.isEmptyObject(tableDataRowAdd.sControlId) ) {
+ tableDataRowAdd.sControlId = processRow.sControlId; /* 选中从表的sId */
+ }
+ }
+ materialsData.push(tableDataRowAdd);
+ });
+ }
+
+ console.log('materialsData:', materialsData);
+
+ this.props.onSaveState({ materialsData });
+ }
} else if(selectConfig.sControlName && selectConfig.sControlName.includes('BtnPopupMaterials')) { /* 报价单工序表放大镜 选择材料 */
/* materials1ChildData:油墨, materials2ChildData：电化铝 */
let { materials1Data, materials1ChildData, materials2Data, materials2ChildData, materials0Data, processData, processSelectedRowKeys } = this.props;
@@ -9320,115 +9350,7 @@ export default (ChildComponent) => {
if (commonUtils.isEmpty(materials2ChildData)) {
materials2ChildData = [];
}
- // const selectFilterData1 = selectData.filter(item => item.sZmldlName === sMaterialsClassfiy.youmo);
- // const selectFilterData1Left = selectData.filter(item => item.sZmldlName === sMaterialsClassfiy.zsm);
- // // const selectFilterData1 = selectData.filter(item => item.sZmldlName === '纸张');
- // const selectFilterData2 = selectData.filter(item => item.sZmldlName === sMaterialsClassfiy.dhl );
- //
- // const selectFilterDataOther = selectData.filter(item => item.sZmldlName !== sMaterialsClassfiy.youmo &&
- // item.sZmldlName !== sMaterialsClassfiy.zsm && item.sZmldlName !== sMaterialsClassfiy.dhl ); /* 除了油墨,专色墨,电化铝之外的物料大类 */
- //
- // /* 自动专色墨 */
- // if(commonUtils.isNotEmptyArr(selectFilterData1Left)) {
- // selectFilterData1Left.forEach((item, index) => {
- // const newCopyTo = {};
- // newCopyTo.master = masterData;
- // if (iIndex > -1) {
- // newCopyTo.materials1Child = item;
- // }
- // let tableDataRowAdd = this.handleTableAdd('materials1', true);
- // item.handleType = 'add';
- // // tableDataRowAdd = { ...tableDataRowAdd, ...item }; // 取赋值字段
- // tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(copyToAssignField1Left, item) }; // 取赋值字段
- // tableDataRowAdd.sId = commonUtils.createSid();
- // tableDataRowAdd.sParentId = masterData.sId;
- // tableDataRowAdd.sParentSlaveId = tableData[iIndex].sId; /* 选中从表的sId */
- // materials1Data.push(tableDataRowAdd);
- // });
- // }
- //
- // /* 油墨 */
- // if(commonUtils.isNotEmptyArr(selectFilterData1)) {
- // selectFilterData1.forEach((item, index) => {
- // const newCopyTo = {};
- // newCopyTo.master = masterData;
- // if (iIndex > -1) {
- // newCopyTo.materials1Child = item;
- // }
- // let tableDataRowAdd = this.handleTableAdd('materials1Child', true);
- // item.handleType = 'add';
- // // tableDataRowAdd = { ...tableDataRowAdd, ...item }; // 取赋值字段
- // tableDataRowAdd = {...tableDataRowAdd, ...commonFunc.getAssignFieldValue(copyToAssignField1, item)}; // 取赋值字段
- // tableDataRowAdd.sId = commonUtils.createSid();
- // tableDataRowAdd.sParentId = masterData.sId;
- // tableDataRowAdd.sParentSlaveId = tableData[iIndex].sId; /* 选中从表的sId */
- // materials1ChildData.push(tableDataRowAdd);
- // });
- // }
- //
- // /* 电化铝 */
- // if(commonUtils.isNotEmptyArr(selectFilterData2)) {
- // selectFilterData2.forEach((item, index) => {
- // const newCopyTo = {};
- // newCopyTo.master = masterData;
- // if (iIndex > -1) {
- // newCopyTo.materials2Child = item;
- // }
- // let tableDataRowAdd = this.handleTableAdd('materials2Child', true);
- // item.handleType = 'add';
- // // tableDataRowAdd = { ...tableDataRowAdd, ...item }; // 取赋值字段
- // tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(copyToAssignField2, item) }; // 取赋值字段
- // tableDataRowAdd.sId = commonUtils.createSid();
- // tableDataRowAdd.sParentId = masterData.sId;
- // tableDataRowAdd.sParentSlaveId = tableData[iIndex].sId; /* 选中从表的sId */
- // materials2ChildData.push(tableDataRowAdd);
- // });
- // }
- //
- // if(commonUtils.isNotEmptyArr(materials2ChildData)) {
- // materials2ChildData.forEach((val) => {
- // const iIndex = materials2Data.findIndex(item => item.sMaterialsId === val.sMaterialsId && item.sControlId === val.sControlId && item.sMaterialsStyle === val.sMaterialsStyle);
- // if(iIndex === -1){
- // materials2Data.push(val);
- // }
- // });
- // }
- //
- // /* 其他材料 */
- // if(commonUtils.isNotEmptyArr(selectFilterDataOther)) {
- // selectFilterDataOther.forEach((item, index) => {
- // const newCopyTo = {};
- // newCopyTo.master = masterData;
- // if (iIndex > -1) {
- // newCopyTo.materials0 = item;
- // }
- // let tableDataRowAdd = this.handleTableAdd('materials0', true);
- // item.handleType = 'add';
- // // tableDataRowAdd = { ...tableDataRowAdd, ...item }; // 取赋值字段
- // tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(copyToAssignField, item) }; // 取赋值字段
- // tableDataRowAdd.sId = commonUtils.createSid();
- // tableDataRowAdd.sParentId = masterData.sId;
- // tableDataRowAdd.sParentSlaveId = tableData[iIndex].sId; /* 选中从表的sId */
- // if(commonUtils.isNotEmptyObject(processRow)) {
- // if(commonUtils.isEmptyObject(tableDataRowAdd.sProcessId) ) {
- // tableDataRowAdd.sProcessId = processRow.sProcessId; /* 选中从表的sId */
- // }
- // if(commonUtils.isEmptyObject(tableDataRowAdd.sProcessTbId) ) {
- // tableDataRowAdd.sProcessTbId = processRow.sId; /* 选中从表的sId */
- // }
- // if(commonUtils.isEmptyObject(tableDataRowAdd.sControlId) ) {
- // tableDataRowAdd.sControlId = processRow.sControlId; /* 选中从表的sId */
- // }
- // }
- //
- // materialsOtherData.push(tableDataRowAdd);
- // });
- // }
- // const temp1Data = materials1Data.concat(materials1ChildData);
- // const temp2Data = temp1Data.concat(materials2Data);
- //
- // materials0Data = temp2Data.concat(materialsOtherData);
let processRow = {};
if(commonUtils.isNotEmptyArr(processData) && commonUtils.isNotEmptyArr(processSelectedRowKeys)) {
const iPIndex = processData.findIndex(item => processSelectedRowKeys.includes(item.sId));
@@ -9461,6 +9383,7 @@ export default (ChildComponent) => {
if(commonUtils.isEmptyObject(tableDataRowAdd.sControlId) ) {
tableDataRowAdd.sControlId = processRow.sControlId; /* 选中从表的sId */
}
+ tableDataRowAdd.sMaterialsProcessNameOrder = processRow.sProcessName; /* 选中从表的sId */
}
materials0Data.push(tableDataRowAdd);
});
@@ -10021,16 +9944,14 @@ export default (ChildComponent) => {
}else if (type === 'before') {
if(iIndex === 0 || iIndex > len -1) {
- const currentFirst = commonFunc.showMessage(props.app.commonConst, 'currentFirst') || '当前是首条';
- message.error(currentFirst);
+ message.error('当前是首条');
return;
}
tableDataRow = filterData[iIndex - 1];
}else if (type === 'next') {
if(iIndex === len-1 || iIndex > len -1) {
- const currentLast = commonFunc.showMessage(props.app.commonConst, 'currentLast') || '当前是末条';
- message.error(currentLast);
+ message.error('当前是末条');
return;
}
tableDataRow = filterData[iIndex + 1];
@@ -10059,9 +9980,531 @@ export default (ChildComponent) => {
(commonUtils.isNotEmptyStr(record.sControlId) && record.sControlId.toString().toLowerCase().includes(value.toLowerCase()));
}
};
+
+ handleProcessSolutionRow = () => {
+ console.log('22222', 1111);
+ this.props.onSaveState({
+ processSolutionVisible:true
+ })
+ }
+ handleCloseProcessSolutionModal = () => {
+ this.props.onSaveState({
+ processSolutionVisible:false
+ })
+ }
+ /* 选择工艺流程 点确定 */
+ handleSelectProcessSolution = async (name, selectConfig, selectData) => {
+ const {
+ [`${name}Data`]: tableData = [], [`${name}Config`]: tableConfig, masterConfig, controlSelectedRowKeys, sModelsId, token, slaveSelectedRowKeys, processSelectedRowKeys,
+ slaveConfig, controlConfig, materialsConfig, processConfig, colorConfig, packConfig, slaveData, controlData, materialsData: materialsDataOld, processData: processDataOld, colorData: colorDataOld,
+ controlDelData: controlDelDataOld, materialsDelData: materialsDelDataOld, processDelData: processDelDataOld, colorDelData: colorDelDataOld,slaveDelData: slaveDelDataOld,
+ } = this.props;
+ const controlDataOld = controlData.slice(0);
+ console.log('选择', selectData, selectConfig);
+ let { masterData } = this.props;
+ if(true){
+ const { controlData } = this.props;
+ const iControlIndex = commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlData.findIndex(item => item.sId === controlSelectedRowKeys[0]) : -1;
+ const bProcessAssort = name === 'process';
+ let returnProcessAssort = [];
+ let processAssignAssort = '';
+ let dropDownDataProcessName;
+ if (bProcessAssort) {
+ // 配套数据 */
+ if (commonUtils.isJSON(localStorage.getItem(`${commonConfig.prefix}processAssort`)) && JSON.parse(localStorage.getItem(`${commonConfig.prefix}processAssort`)).length > 0) {
+ returnProcessAssort = JSON.parse(localStorage.getItem(`${commonConfig.prefix}processAssort`));
+ }
+ if (commonUtils.isJSON(localStorage.getItem(`${commonConfig.prefix}dropDownDataProcess`)) && JSON.parse(localStorage.getItem(`${commonConfig.prefix}dropDownDataProcess`)).length > 0) {
+ dropDownDataProcessName = JSON.parse(localStorage.getItem(`${commonConfig.prefix}dropDownDataProcess`));
+ }
+ if (!this.isProcessAssortApiCalled && commonUtils.isEmptyArr(returnProcessAssort)) {
+ this.isProcessAssortApiCalled = true; // 标记接口已调用
+ const dataUrl = `${commonConfig.server_host}salesorder/getProcessAssort?sModelsId=${sModelsId}`;
+ const dataProcessAssort = (await commonServices.postValueService(token, {}, dataUrl)).data;
+ if (dataProcessAssort.code === 1) {
+ returnProcessAssort = dataProcessAssort.dataset.rows[0].processassort;
+ const iIndex = processConfig.gdsconfigformslave.findIndex(item => item.sName === 'sProcessName');
+ if (iIndex > -1 && commonUtils.isEmptyArr(dropDownDataProcessName)) {
+ const sqlDropDownData = await this.props.getSqlDropDownData(sModelsId, 'slave', processConfig.gdsconfigformslave[iIndex]);
+ dropDownDataProcessName = sqlDropDownData.dropDownData;
+ processAssignAssort = processConfig.gdsconfigformslave[iIndex].sAssignField;
+ localStorage.setItem(`${commonConfig.prefix}dropDownDataProcess`, JSON.stringify(dropDownDataProcessName));
+ }
+ localStorage.setItem(`${commonConfig.prefix}processAssort`, JSON.stringify(returnProcessAssort));
+ }
+ }
+ }
+ if (commonUtils.isNotEmptyArr(selectData)) {
+ for (const item of selectData) {
+ const newCopyTo = {};
+ newCopyTo.master = masterData;
+ if (iControlIndex > -1) {
+ newCopyTo.control = controlData[iControlIndex];
+ }
+ let tableDataRow = commonFunc.getDefaultData(tableConfig, newCopyTo); // 取默认值
+ tableDataRow = { ...tableDataRow, ...commonFunc.getAssignFieldValue(selectConfig.sAssignField, item, newCopyTo) }; // 取赋值字段
+ tableDataRow.handleType = 'add';
+ tableDataRow.sId = commonUtils.createSid();
+ tableDataRow.sParentId = masterData.sId;
+ tableDataRow.key = tableDataRow.sId;
+ tableDataRow.sSlaveId = commonUtils.isNotEmptyObject(slaveSelectedRowKeys) ? slaveSelectedRowKeys[0] :'' ;
+ if (name === 'process') {
+ /* 设置工单参数下拉 */
+ if (commonUtils.isNotEmptyObject(tableDataRow.sProcessParam)) {
+ tableDataRow = { ...tableDataRow, ...commonUtils.convertStrToObj(tableDataRow.sProcessParam) };
+ tableDataRow.sQuoParams = item.sParams;
+ }
+ // 配套工序
+ if (bProcessAssort) {
+ returnProcessAssort.filter(item => item.sParentId === tableDataRow.sProcessId).forEach(((itemProcessAssort) => {
+ const iIndex = dropDownDataProcessName.findIndex(item => item.sId === itemProcessAssort.sProcessId);
+ if (iIndex > -1) {
+ const iProcessIndex = selectData.findIndex(item => item.sId === itemProcessAssort.sProcessId);
+ const iNewProcessIndex = dropDownDataProcessName[iIndex].sType === '3' ?
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId) :
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId && item.sControlId === controlData[iControlIndex].sId);
+ if (iProcessIndex < 0 && iNewProcessIndex < 0) {
+ let processRow = commonFunc.getDefaultData(processConfig, newCopyTo); // 取默认值
+ processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignAssort, dropDownDataProcessName[iIndex], newCopyTo) }; // 取赋值字段
+ processRow.handleType = 'add';
+ processRow.sId = commonUtils.createSid();
+ processRow.sParentId = masterData.sId;
+ processRow.sType = dropDownDataProcessName[iIndex].sType;
+ if (iControlIndex > -1 && processRow.sType !== '3') {
+ processRow.sControlId = controlData[iControlIndex].sId;
+ processRow.sPartsName = controlData[iControlIndex].sPartsName;
+ }
+ // const iSlaveIndex = slaveData.findIndex(item => item.sId === slaveSelectedRowKeys[0]);
+ // if (iSlaveIndex > -1) {
+ // processRow.sSlaveId = slaveData[iSlaveIndex].sId;
+ // }
+ tableData.push(processRow);
+
+ if (itemProcessAssort.sType === 'all') {
+ controlData.filter(item => item.sId !== controlData[iControlIndex].sId).forEach((controlTableRow) => {
+ const iNewProcessIndex = dropDownDataProcessName[iIndex].sType === '3' ?
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId) :
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId && item.sControlId === controlTableRow.sId);
+ if (iNewProcessIndex < 0) {
+ let processRow = commonFunc.getDefaultData(processConfig, newCopyTo); // 取默认值
+ processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignAssort, dropDownDataProcessName[iIndex], newCopyTo) }; // 取赋值字段
+ processRow.handleType = 'add';
+ processRow.sId = commonUtils.createSid();
+ processRow.sParentId = masterData.sId;
+ processRow.sType = dropDownDataProcessName[iIndex].sType;
+ // processRow.sSlaveId = slaveData[iSlaveIndex].sId;
+ if (iControlIndex > -1 && processRow.sType !== '3') {
+ processRow.sControlId = controlTableRow.sId;
+ processRow.sPartsName = controlTableRow.sPartsName;
+ }
+ // if (iSlaveIndex > -1) {
+ // processRow.sSlaveId = slaveData[iSlaveIndex].sId;
+ // }
+ tableData.push(processRow);
+ }
+ });
+ }
+ }
+ }
+ }));
+ }
+ } else if(name ==='materials') {
+ /* 将工序选中行 作为对应工序给材料 */
+ const iProcessIndex = commonUtils.isNotEmptyArr(processSelectedRowKeys) ? processDataOld.findIndex(item => item.sId === processSelectedRowKeys[0]) : -1;
+ let processRow = {};
+ if (iProcessIndex > -1) {
+ processRow = processDataOld[iProcessIndex];
+ tableDataRow.sProcessId = processRow.sProcessId;
+ tableDataRow.sProcessTbId = processRow.sId;
+ tableDataRow.sMaterialsProcessName = processRow.sProcessName;
+ }
+ }
+ if (iControlIndex > -1 && tableDataRow.sType !== '3') {
+ tableDataRow.sControlId = controlData[iControlIndex].sId;
+ tableDataRow.sPartsName = controlData[iControlIndex].sPartsName;
+ tableData.push(tableDataRow);
+ } else if (tableDataRow.sType === '3') {
+ tableData.push(tableDataRow);
+ }
+ }
+ }
+ const tableDataNew = this.sortData(controlData, tableData);
+ console.log('222', tableDataNew);
+ this.props.onSaveState({
+ [`${name}Data`]: tableDataNew, [`${name}ChooseVisible`]: false, materialsConfig, materialsSelectedRowKeys: [],
+ });
+ }
+ };
+
+ /* 选择成品工序 点确定 */
+ handleSelectFinalProcessNew = async (name, selectConfig, selectData, slaveFinalSelectedData) => {
+ const targetname = 'process';
+ const {
+ [`${targetname}Data`]: tableData, [`${targetname}Config`]: tableConfig, controlSelectedRowKeys, sModelsId, token,
+ materialsConfig, processConfig,masterConfig,
+ } = this.props;
+ const { masterData } = this.props;
+ if (name === 'chooseProductProcess') {
+ const { controlData } = this.props;
+ const iControlIndex = commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlData.findIndex(item => item.sId === controlSelectedRowKeys[0]) : -1;
+ /* 取选择工序从表配置 */
+ const slavesControlName = commonUtils.isNotEmptyObject(selectConfig.sControlName) ? `${selectConfig.sControlName}.slave` : '';
+ let slaveSelectConfig = {};
+ let slaveIndex = -1;
+ if (commonUtils.isNotEmptyObject(masterConfig)) {
+ slaveIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === slavesControlName);
+ if (slaveIndex > -1) {
+ slaveSelectConfig = masterConfig.gdsconfigformslave[slaveIndex];
+ }
+ }
+ /* 通过slaveFinalSelectedRowKeys找到slaveData数据 */
+ if (commonUtils.isNotEmptyArr(slaveFinalSelectedData)) {
+ for (const slaveObj of slaveFinalSelectedData) {
+ if (commonUtils.isNotEmptyArr(selectData)) {
+ for (const item of selectData) {
+ const newCopyTo = {};
+ newCopyTo.master = masterData;
+ if (iControlIndex > -1) {
+ newCopyTo.control = controlData[iControlIndex];
+ }
+ let tableDataRow = commonFunc.getDefaultData(tableConfig, newCopyTo); // 取默认值
+ tableDataRow = { ...tableDataRow, ...commonFunc.getAssignFieldValue(selectConfig.sAssignField, item, newCopyTo) }; // 取赋值字段
+ if (commonUtils.isNotEmptyObject(slaveSelectConfig)) {
+ tableDataRow = { ...tableDataRow, ...commonFunc.getAssignFieldValue(slaveSelectConfig.sAssignField, slaveObj, newCopyTo) }; // 取从表赋值字段
+ }
+ tableDataRow.handleType = 'add';
+ tableDataRow.sId = commonUtils.createSid();
+ tableDataRow.sParentId = masterData.sId;
+
+ tableDataRow.sCombinePartsName = slaveObj.sId; /* 成品工序sCombinePartsName 为从表id */
+ tableDataRow.sCombinePartsNameNew = slaveObj.sProductName; /* 成品工序sCombinePartsName 为从表产品名称 */
+ // tableDataRow.sSlaveProductId = slaveObj.sId;
+
+ tableDataRow.sType = '3';
+ if (commonUtils.isNotEmptyObject(tableDataRow.sWorkOrderParam)) {
+ tableDataRow = { ...tableDataRow, ...commonUtils.convertStrToObj(tableDataRow.sWorkOrderParam) };
+ }
+ if (targetname === 'process') {
+ const value = { sSqlCondition: { sParentId: item.sId } };
+ const configDataId = '11811781131121915166093023980';
+ const dataUrl = `${commonConfig.server_host}business/getBusinessDataByFormcustomId/${configDataId}?sModelsId=${sModelsId}`;
+ const returnData = (await commonServices.postValueService(token, value, dataUrl)).data;
+ if (returnData.code === 1) {
+ const eleprocessmachineData = returnData.dataset.rows[0].dataSet;
+ const newData = eleprocessmachineData.filter(item => item.bDefault);
+ if (commonUtils.isNotEmptyArr(newData)) {
+ tableDataRow.sMachineId = newData[0].sMachineId;
+ }
+ }
+ const bProcessAssort = false;
+ let returnProcessAssort = [];
+ let processAssignAssort = '';
+ let dropDownDataProcessName;
+ if (bProcessAssort) {
+ const dataUrl = `${commonConfig.server_host}salesorder/getProcessAssort?sModelsId=${sModelsId}`;
+ const dataProcessAssort = (await commonServices.postValueService(token, {}, dataUrl)).data;
+ if (dataProcessAssort.code === 1) {
+ returnProcessAssort = dataProcessAssort.dataset.rows[0].processassort;
+ const iIndex = processConfig.gdsconfigformslave.findIndex(item => item.sName === 'sProcessName');
+ if (iIndex > -1) {
+ const sqlDropDownData = await this.props.getSqlDropDownData(sModelsId, 'slave', processConfig.gdsconfigformslave[iIndex]);
+ dropDownDataProcessName = sqlDropDownData.dropDownData;
+ processAssignAssort = processConfig.gdsconfigformslave[iIndex].sAssignField;
+ }
+ }
+ }
+ // 配套工序
+ if (bProcessAssort) {
+ returnProcessAssort.filter(item => item.sParentId === tableDataRow.sProcessId).forEach(((itemProcessAssort) => {
+ const iIndex = dropDownDataProcessName.findIndex(item => item.sId === itemProcessAssort.sProcessId);
+ if (iIndex > -1) {
+ const iProcessIndex = selectData.findIndex(item => item.sId === itemProcessAssort.sProcessId);
+ const iNewProcessIndex = tableDataRow.sType === '3' ?
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId) :
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId && item.sControlId === controlData[iControlIndex].sId);
+ if (iProcessIndex < 0 && iNewProcessIndex < 0) {
+ let processRow = commonFunc.getDefaultData(processConfig, newCopyTo); // 取默认值
+ processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignAssort, dropDownDataProcessName[iIndex], newCopyTo) }; // 取赋值字段
+ processRow.handleType = 'add';
+ processRow.sId = commonUtils.createSid();
+ processRow.sParentId = masterData.sId;
+ processRow.sType = dropDownDataProcessName[iIndex].sType;
+
+ // 成品工序的配套工序带入产品名称-开始
+ processRow.sCombinePartsName = slaveObj.sId; /* 成品工序sCombinePartsName 为从表id */
+ processRow.sCombinePartsNameNew = slaveObj.sProductName; /* 成品工序sCombinePartsName 为从表产品名称 */
+ processRow.sCombineProductNameNew = slaveObj.sProductName; /* 成品工序sCombinePartsName 为从表产品名称 */
+ // processRow.sParentProcessId = item.sId;
+ // 成品工序的配套工序带入产品名称-结束
+
+ if (iControlIndex > -1 && processRow.sType !== '3') {
+ processRow.sControlId = controlData[iControlIndex].sId;
+ processRow.sPartsName = controlData[iControlIndex].sPartsName;
+ }
+ tableData.push(processRow);
+
+ if (itemProcessAssort.sType === 'all') {
+ controlData.filter(item => item.sId !== controlData[iControlIndex].sId).forEach((controlTableRow) => {
+ const iNewProcessIndex = dropDownDataProcessName[iIndex].sType === '3' ?
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId) :
+ tableData.findIndex(item => item.sProcessId === itemProcessAssort.sProcessId && item.sControlId === controlTableRow.sId);
+ if (iNewProcessIndex < 0) {
+ let processRow = commonFunc.getDefaultData(processConfig, newCopyTo); // 取默认值
+ processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignAssort, dropDownDataProcessName[iIndex], newCopyTo) }; // 取赋值字段
+ processRow.handleType = 'add';
+ processRow.sId = commonUtils.createSid();
+ processRow.sParentId = masterData.sId;
+ processRow.sType = dropDownDataProcessName[iIndex].sType;
+
+ // 成品工序的配套工序带入产品名称-开始
+ processRow.sCombinePartsName = slaveObj.sId; /* 成品工序sCombinePartsName 为从表id */
+ processRow.sCombinePartsNameNew = slaveObj.sProductName; /* 成品工序sCombinePartsName 为从表产品名称 */
+ processRow.sCombineProductNameNew = slaveObj.sProductName; /* 成品工序sCombinePartsName 为从表产品名称 */
+ // processRow.sParentProcessId = item.sId;
+ // 成品工序的配套工序带入产品名称-结束
+
+ if (iControlIndex > -1 && processRow.sType !== '3') {
+ processRow.sControlId = controlTableRow.sId;
+ processRow.sPartsName = controlTableRow.sPartsName;
+ }
+ tableData.push(processRow);
+ }
+ });
+ }
+ }
+ }
+ }));
+ }
+ }
+ // const processLen = commonBusiness.getTableTypes('process', this.props).data.filter(item => this.state.currentTab.process.split('-').indexOf(item.sType) !== -1).length;
+ // tableDataRow.iOrder = processLen;
+ if (iControlIndex > -1 && tableDataRow.sType !== '3') {
+ tableDataRow.sControlId = controlData[iControlIndex].sId;
+ tableDataRow.sPartsName = controlData[iControlIndex].sPartsName;
+ const processLen = tableData.filter(item => item.sType !== '3').length + 1; /* 工序序号自增 */
+ tableDataRow.iOrder = processLen;
+ tableData.push(tableDataRow);
+ } else if (tableDataRow.sType === '3') {
+ const processLen = tableData.filter(item => item.sType === '3').length + 1; /* 工序序号自增 */
+ tableDataRow.iOrder = processLen;
+ tableData.push(tableDataRow);
+ }
+ }
+ }
+ }
+ } else {
+ message.error('请选择产品！');
+ return;
+ }
+ const tableDataNew = this.sortData(controlData, tableData);
+ this.props.onSaveState({
+ [`${targetname}Data`]: tableDataNew, [`${name}ChooseVisible`]: false, materialsConfig, materialsSelectedRowKeys: [],
+ });
+ }
+ }
+
+ /* 选择成品材料 点确定 */
+ handleSelectFinalMaterialsNew = async (name, selectConfig, selectData, slaveFinalSelectedData) => {
+ // 选择成品材料，将sType改为2
+ if (name === 'productMaterials') {
+ selectData = selectData.map(val => ({ ...val, sType: '2' }));
+ name = 'materials0';
+ }
+ const {
+ [`${name}Data`]: tableData = [], [`${name}Config`]: tableConfig, controlSelectedRowKeys, materialsConfig,masterConfig,
+ } = this.props;
+ const { masterData } = this.props;
+ const { controlData } = this.props;
+ const iControlIndex = commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlData.findIndex(item => item.sId === controlSelectedRowKeys[0]) : -1;
+ /* 取选择工序从表配置 */
+ const slavesControlName = commonUtils.isNotEmptyObject(selectConfig.sControlName) ? `${selectConfig.sControlName}.slave` : '';
+ let slaveSelectConfig = {};
+ let slaveIndex = -1;
+ if (commonUtils.isNotEmptyObject(masterConfig)) {
+ slaveIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === slavesControlName);
+ if (slaveIndex > -1) {
+ slaveSelectConfig = masterConfig.gdsconfigformslave[slaveIndex];
+ }
+ }
+ if (commonUtils.isNotEmptyArr(slaveFinalSelectedData)) {
+ for (const slaveObj of slaveFinalSelectedData) {
+ if (commonUtils.isNotEmptyArr(selectData)) {
+ for (const item of selectData) {
+ const newCopyTo = {};
+ newCopyTo.master = masterData;
+ if (iControlIndex > -1) {
+ newCopyTo.control = controlData[iControlIndex];
+ }
+ let tableDataRow = commonFunc.getDefaultData(tableConfig, newCopyTo); // 取默认值
+ tableDataRow = { ...tableDataRow, ...commonFunc.getAssignFieldValue(selectConfig.sAssignField, item, newCopyTo) }; // 取赋值字段
+ if (commonUtils.isNotEmptyObject(slaveSelectConfig)) {
+ tableDataRow = { ...tableDataRow, ...commonFunc.getAssignFieldValue(slaveSelectConfig.sAssignField, slaveObj, newCopyTo) }; // 取从表赋值字段
+ }
+ tableDataRow.handleType = 'add';
+ tableDataRow.sId = commonUtils.createSid();
+
+ tableDataRow.sParentId = masterData.sId;
+ tableDataRow.sCombinePartsName = slaveObj.sId; /* 成品材料sCombinePartsName 为从表id */
+ tableDataRow.sCombinePartsNameNew = slaveObj.sProductName;
+ // tableDataRow.sSlaveProductId = slaveObj.sId;
+
+ if (iControlIndex > -1 && tableDataRow.sType !== '2') {
+ tableDataRow.sControlId = controlData[iControlIndex].sId;
+ tableDataRow.sPartsName = controlData[iControlIndex].sPartsName;
+ tableData.push(tableDataRow);
+ } else if (tableDataRow.sType === '2') {
+ tableData.push(tableDataRow);
+ }
+ }
+ }
+ }
+ } else {
+ message.error('请选择产品！');
+ return;
+ }
+ this.props.onSaveState({
+ [`${name}Data`]: tableData, [`${name}ChooseVisible`]: false, materialsConfig, materialsSelectedRowKeys: [],
+ });
+ }
+
+ handleGetAllDelData = () => {
+ const {
+ slaveData = [],
+ slaveDelData: slaveDelDataOld = [],
+ controlData = [],
+ controlDelData: controlDelDataOld = [],
+ materialsData = [],
+ materialsDelData: materialsDelDataOld = [],
+ processData = [],
+ processDelData: processDelDataOld = [],
+ manyqtysData = [],
+ manyqtysDelData: manyqtysDelDataOld = [],
+ colorData = [],
+ colorDelData: colorDelDataOld = [],
+ packData = [],
+ packDelData: packDelDataOld = [],
+ } = props;
+ const addState = {
+ slaveDelData: [
+ ...slaveDelDataOld,
+ ...slaveData.filter(item => !slaveDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ controlDelData: [
+ ...controlDelDataOld,
+ ...controlData.filter(item => !controlDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ materialsDelData: [
+ ...materialsDelDataOld,
+ ...materialsData
+ .filter(item => !materialsDelDataOld.map(item1 => item1.sId).includes(item.sId))
+ .map(item => ({ ...item, handleType: "del" })),
+ ],
+ processDelData: [
+ ...processDelDataOld,
+ ...processData.filter(item => !processDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ manyqtysDelData: [
+ ...manyqtysDelDataOld,
+ ...manyqtysData.filter(item => !manyqtysDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ colorDelData: [
+ ...colorDelDataOld,
+ ...colorData.filter(item => !colorDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ packDelData: [
+ ...packDelDataOld,
+ ...packData.filter(item => !packDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ };
+ return addState;
+ }
+
+ /* 多数量段行刷新时 刷新整个数据 */
+ handleTableReflesh = (name,index ,record) => {
+ const { masterData, masterConfig } = this.props;
+ const slaveNameList = [];
+ const allTableMap = {};
+ const allReturnMap = {};
+ console.log('record', record);
+ const sAllDataStr = record.sAllData;
+ if(commonUtils.isEmptyObject(sAllDataStr)) {
+ message.error('当前数据未返回全部数据!');
+ return;
+ }
+ console.log('sAllDataStr', sAllDataStr);
+ const returnData = commonUtils.isJSON(record.sAllData) ? JSON.parse(record.sAllData) : [];
+ console.log('returnData', returnData);
+ /* 从props找到 所有的Config */
+ if(commonUtils.isNotEmptyArr(this.props)) {
+ for (const key of Object.keys(this.props)) {
+ if(key.includes('Config') && !key.includes('onGet') && !key.includes('report') &&
+ !key.includes('master')) {
+ const tablename = key.replace('Config', '').trim();
+ if (this.props.sModelsType === 'manufacture/workOrder3') {
+ if (tablename === 'materials') continue;
+ }
+ slaveNameList.push(tablename);
+ }
+ }
+ }
+ if (commonUtils.isNotEmptyArr(slaveNameList)) {
+ slaveNameList.forEach((name, index) => {
+ const tableConfig = this.props[name +'Config']; /* 动态配置 */
+ if(commonUtils.isNotEmptyObject(tableConfig)) {
+ const tableData = this.props[name +'Data']; /* 动态配置 */
+ const tableSelectedRowKeys = this.props[name + 'SelectedRowKeys']; /* 选中Key */
+ allTableMap[name +'.'+ tableConfig.sTbName] = tableData
+ }
+ })
+ const masterTbName = masterConfig.sTbName;
+ allTableMap['master.'+ masterTbName] = masterData;
+ }
+ console.log('masterData', masterData);
+ slaveNameList.forEach((name, index) => {
+ const tableConfig = this.props[name +'Config']; /* 动态配置 */
+ let tableDelData = this.props[name +'DelData'];
+ let tableAllData = this.props[name +'Data'];
+ if(commonUtils.isEmptyArr(tableDelData)) {
+ tableDelData = [];
+ }
+ let tableDelDataNew = []
+ let tableData = [];
+ if(commonUtils.isNotEmptyObject(tableConfig)) {
+ // tableData = tableAllData; /* 动态配置 */
+ if(commonUtils.isNotEmptyArr(tableAllData) && Array.isArray(tableAllData)) {
+ tableDelDataNew = tableAllData;
+ tableAllData.forEach((delObj) => {
+ const newRow = {...delObj};
+ newRow.handleType = 'del';
+ tableDelData.push(newRow);
+ })
+ }
+
+ const sTbName = `${tableConfig.sTbName.toLowerCase()}_tmp`;
+ tableData = returnData[sTbName]; /* 动态配置 */
+ console.log({ name, sTbName, tableData });
+ if(commonUtils.isNotEmptyArr(tableData)) {
+ tableData.forEach((item, index) => {
+ const newRow = {...item};
+ newRow.sParentId = masterData.sId;
+ tableData[index]= newRow;
+ })
+ allReturnMap[name +'Data'] = tableData;
+ allReturnMap[name +'DelData'] = tableDelData;
+ }
+ }
+
+ });
+ console.log('sAllDatareturnData', returnData);
+ console.log('allReturnMap', allReturnMap);
+
+ this.props.onSaveState({ ...allReturnMap });
+
+ }
+
render() {
- const { masterData, sModelsType, app } = this.props;
- const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
+ const { masterData } = this.props;
+ const imgSrc = commonBusiness.handleAddIcon(masterData);
return (
{
- this.bInPagination = true;
- }}
+ onMouseEnter={() => { this.bInPagination = true; }}
onMouseLeave={() => {
this.bInPagination = false;
if (this.selectTableRef) {
@@ -862,57 +766,50 @@ export default class CommonComponent extends Component {
}
}}
>
- this.selectTableChange(e)}
- showSizeChanger={false}
- current={pageNum}
- pageSize={20}
- size="small"
- total={this.state.totalCount}
- />
+ this.selectTableChange(e)} showSizeChanger={false} current={pageNum} pageSize={20} size="small" total={this.state.totalCount} />
{this.props.showConfig.bFirstEmpty && (
- )}
+ )
+ }
{this.props.showConfig.bNewRecord && (
- )}
+ )
+ }
- );
+ )
/* eslint-enable */
/* 返回值 */
return obj;
@@ -920,40 +817,33 @@ export default class CommonComponent extends Component {
getSelectTableOption = () => {
const { selectTableData, selectTableIndex = 0 } = this.state;
- const { showConfig, app } = this.props;
- const { userinfo } = app;
- let { sTableTitleSql } = showConfig;
- /* 根据用户配置语言 设置表格标题 */
- if (commonUtils.isJSON(sTableTitleSql) && sTableTitleSql.includes("Chinese")) {
- sTableTitleSql = this.getLocalizedString(sTableTitleSql, userinfo.sLanguage);
- }
- const tempColumnArr = sTableTitleSql.split(",");
+ const { showConfig } = this.props;
+ const { sTableTitleSql } = showConfig;
+ const tempColumnArr = sTableTitleSql.split(',');
let scrollX = 0;
const columns = tempColumnArr.map((item, index) => {
- const tempArr = item.split(":");
+ const tempArr = item.split(':');
const [value, title, columnWidth] = tempArr;
let width;
- if (!Number.isNaN(Number(columnWidth))) {
- // 如果配置了列宽
+ if (!Number.isNaN(Number(columnWidth))) { // 如果配置了列宽
width = Number(columnWidth);
- } else {
- // 没有配置列宽，就根据字符数算宽度
+ } else { // 没有配置列宽，就根据字符数算宽度
// 获取中文字数、非中文字数， 中文12px，其它8px
const titleStr = title;
const totalStringLen = titleStr.length;
- const otherStrLen = titleStr.replace(/[^\x00-\xff]/g, "").length; // eslint-disable-line
+ const otherStrLen = titleStr.replace(/[^\x00-\xff]/g, '').length; // eslint-disable-line
const chineseStrLen = totalStringLen - otherStrLen;
- const defaultWidth = chineseStrLen * 12 + otherStrLen * 8;
+ const defaultWidth = (chineseStrLen * 12) + (otherStrLen * 8);
const maxStrLen = selectTableData.reduce((res, pre) => {
- let tempValue = pre[value] !== undefined ? pre[value] : "";
- if (tempValue === "") {
+ let tempValue = pre[value] !== undefined ? pre[value] : '';
+ if (tempValue === '') {
return res;
}
- tempValue = typeof tempValue === "string" ? tempValue : JSON.stringify(tempValue);
+ tempValue = typeof tempValue === 'string' ? tempValue : JSON.stringify(tempValue);
const totalStringLen = tempValue.length;
- const otherStrLen = tempValue.replace(/[^\x00-\xff]/g, "").length; // eslint-disable-line
+ const otherStrLen = tempValue.replace(/[^\x00-\xff]/g, '').length; // eslint-disable-line
const chineseStrLen = totalStringLen - otherStrLen;
- const tempWidth = chineseStrLen * 12 + otherStrLen * 8;
+ const tempWidth = (chineseStrLen * 12) + (otherStrLen * 8);
return Math.max(tempWidth, res);
}, defaultWidth);
width = Math.min(maxStrLen + 8, 300);
@@ -966,29 +856,20 @@ export default class CommonComponent extends Component {
dataIndex: value,
key: value,
width: index !== tempColumnArr.length - 1 ? width : undefined,
- render: text => {
- return (
-