diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..5dcaf80 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,21 @@ +{ + "printWidth": 150, + "eslintIntegration": true, + "stylelintIntegration": true, + "tabWidth": 2, + "semi": true, + "singleQuote": false, + "quoteProps": "as-needed", + "jsxSingleQuote": false, + "bracketSpacing": true, + "arrowParens": "avoid", + "htmlWhitespaceSensitivity": "css", + "javascript.format.insertSpaceBeforeFunctionParenthesis": true, + "files.insertFinalNewline": true, + "useTabs": false, + "endOfLine": "lf", + "ignorePath": ".gnore", + "trailingComma": "es5", + "jsxBracketSameLine": false, + "bracketSameLine": false +} \ No newline at end of file diff --git a/package.json b/package.json index cadc844..0353b57 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.5", "private": true, "scripts": { - "start": "set port=8543&roadhog server --progress --watch --colors --profile", + "start": "set port=9005&roadhog server --progress --watch --colors --profile", "build": "roadhog build", "lint": "eslint --ext .js src test", "precommit": "npm run lint" diff --git a/public/favicon.ico b/public/favicon.ico index 090bd6d..e84af23 100644 --- a/public/favicon.ico +++ b/public/favicon.ico diff --git a/public/数字工厂MES系统操作指引.pdf b/public/数字工厂MES系统操作指引.pdf index bc590b1..eeacb3a 100644 --- a/public/数字工厂MES系统操作指引.pdf +++ b/public/数字工厂MES系统操作指引.pdf diff --git a/src/components/Common/CommonBase.js b/src/components/Common/CommonBase.js index 311238d..3713d50 100644 --- a/src/components/Common/CommonBase.js +++ b/src/components/Common/CommonBase.js @@ -592,7 +592,7 @@ export default (ChildComponent) => { const returnFilterData = returnData.filter(item => commonUtils.isNotEmptyObject(item.sDivRow) && item.sDivRow !== ''); if (commonUtils.isNotEmptyArr(returnFilterData)) { returnFilterData.forEach((tableDataRow, index) => { - /* 找到白班与晚班区间的汇总条数与工时 */ + /* 找到早班与晚班区间的汇总条数与工时 */ let startIndex = 0; /* 找到开始下标 */ let endindex = 0; /* 找到结束下标 */ let sliceData = []; diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index e55b4cd..cfdf519 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -310,7 +310,7 @@ export default class CommonComponent extends Component { onBlurText = (event, timeout = 0) => { const currentValue = event?.target?.value; if (currentValue == this.lastValue) { - this.props.app.globalFun?.onSetMask(false); + this.props.app?.globalFun?.onSetMask(false); return; } if (this.onExecInstructSet('blur')) { @@ -1029,6 +1029,8 @@ export default class CommonComponent extends Component { } else if (this.firstDataIndex === 's') { /* 文本输入框(文本s) */ if (this.props.textArea) { /* 大文本输入框 */ return ; + } else if (this.props.bPassWord) { + return } else { /* 普通文本输入框 */ if (this.isReportInfo && this.props.enabled) { innerInputProps.addonAfter = { - let { sDateFormat, iTag } = this.props.showConfig; + let { sDateFormat } = this.props.showConfig; if (commonUtils.isEmptyStr(sDateFormat)) { if (this.firstDataIndex === 'm') { sDateFormat = 'YYYY-MM'; @@ -1472,14 +1474,6 @@ export default class CommonComponent extends Component { if (this.bTbTime) { obj.open = false; } - - if (iTag === 88) { - obj.open = false; - obj.onClick = () => { - this.handleSelectOptionEvent('', moment().format(sDateFormat)) - } - } - /* 值填充 */ obj.value = commonUtils.isEmpty(this.state.dataValue) ? null : moment(this.state.dataValue); /* 返回值 */ @@ -1519,7 +1513,7 @@ export default class CommonComponent extends Component { return value.replace(/\$\s?|(,*)/g, ''); }, formatter: (value) => { - if (value === '' || value === undefined || value === null || location.pathname.includes("indexPad")) { + if (value === '' || value === undefined || value === null) { return value; } // if (this.props.showConfig.iTag === 10000) { @@ -2705,7 +2699,7 @@ export default class CommonComponent extends Component { /** 渲染 */ render() { /* 获取innerinput控件参数 */ - let innerInputProps = this.getInnerInputProps(); + const innerInputProps = this.getInnerInputProps(); const { slaveConfig = { gdsconfigformslave: [] }, bSColorSerialMemo } = this.props; const { gdsconfigformslave } = slaveConfig; @@ -2713,101 +2707,6 @@ export default class CommonComponent extends Component { const btPopIndex = gdsconfigformslave.findIndex(item => item.sControlName === `BtnPopup.${sName}`); const btCostomIndex = gdsconfigformslave.findIndex(item => item.sControlName === `BtnCustom.${sName}`); - - // 登记取样特殊处理 - if(slaveConfig.sId=='12710101117346647176280'){ - - if(innerInputProps.id.includes('bReturn')){ - window.$xlyStorage = this.props.dataValue; - } - - if(innerInputProps.id.includes('sQrcode') && this.myRef.current){ - - this.myRef.current.querySelector('input').addEventListener('keydown',(event)=>{ - if (event.code === 'NumpadEnter' || event.code === 'Enter') { // 或者使用 event.keyCode === 13 - - event.preventDefault(); // 阻止默认行为 - // console.log(this.value) - // const inputValue = this.value; - // document.getElementById('output').innerText = '你输入的内容是: ' + inputValue; - // 在这里添加你想要执行的其他代码 - setTimeout(()=>{ - let takeBtn = gdsconfigformslave.find(e=>e.sId=='17351987980002636428040338706000'); - let returnBtn = gdsconfigformslave.find(e=>e.sId=='17346700000002938271207713181700'); - - if(window.$xlyStorage==0 && takeBtn){ - // 取样 - this.props.onExecInstructSet({ - nextProps: { ...this.props}, - btnConfig: { - showName: "条码取样", - sInstruct: takeBtn.sInstruct, - error:(er)=>{ - this.setState({ dataValue: '' }); - }, - }, - callback: () => {}, - }) - }else if(window.$xlyStorage==1 && returnBtn){ - // 归还 - this.props.onExecInstructSet({ - nextProps: { ...this.props}, - btnConfig: { - showName: "条码归还", - sInstruct: returnBtn.sInstruct, - error:(er)=>{ - this.setState({ dataValue: '' }); - }, - }, - callback: () => {}, - }) - } - },300) - } - }) - - - - // debugger - // innerInputProps.onPressEnter = (event2)=>{ - // setTimeout(()=>{ - // let takeBtn = gdsconfigformslave.find(e=>e.sId=='17351987980002636428040338706000'); - // let returnBtn = gdsconfigformslave.find(e=>e.sId=='17346700000002938271207713181700'); - - // if(window.$xlyStorage==0 && takeBtn){ - // // 取样 - // this.props.onExecInstructSet({ - // nextProps: { ...this.props}, - // btnConfig: { - // showName: "条码取样", - // sInstruct: takeBtn.sInstruct, - // error:(er)=>{ - // this.setState({ dataValue: '' }); - // }, - // }, - // callback: () => {}, - // }) - // }else if(window.$xlyStorage==1 && returnBtn){ - // // 归还 - // this.props.onExecInstructSet({ - // nextProps: { ...this.props}, - // btnConfig: { - // showName: "条码归还", - // sInstruct: returnBtn.sInstruct, - // error:(er)=>{ - // this.setState({ dataValue: '' }); - // }, - // }, - // callback: () => {}, - // }) - // } - // },300) - // } - } - } - - - /* 获取innerinput控件 */ const innerInput = btPopIndex !== -1 ? ( @@ -2821,10 +2720,6 @@ export default class CommonComponent extends Component { {this.getInnerButtonCostom(gdsconfigformslave[btCostomIndex])}
- ) : this.props.showTooltip ? ( - {this.props.dataValue}}> - {this.getInnerInput({ ...innerInputProps, disabled: false, readOnly: true })} - ) : this.getInnerInput(innerInputProps); let viewInfo = ''; @@ -3065,27 +2960,6 @@ export default class CommonComponent extends Component { const fieldDecoratorProps = this.getFieldDecoratorProps(); /* 通用组件(主表存在getFieldDecorator表单验证,而从表则不需要) */ - - // 班组报工,产量上报信息,label文字颜色特殊处理 - if(slaveConfig.sId=='17087428780006438414984564455000'){ - // 计件 - if(innerInputProps.id.includes('dWageHour')){ - outFormItemProps.label = - - {this.props.showConfig.showName} - - } - // 计时 - if(innerInputProps.id.includes('dTimeHour')){ - outFormItemProps.label = - - {this.props.showConfig.showName} - - } - } - - - const commonAssembly = this.props.bNewForm ? innerInput: ( {viewInfo} diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js index 7274af1..b919fc2 100644 --- a/src/components/Common/CommonHooks/useCommonBase.js +++ b/src/components/Common/CommonHooks/useCommonBase.js @@ -113,11 +113,6 @@ const useCommonBase = props => { */ const handleGetModelConfig = async params => { const { sModelsId } = params; - !window.xlyFormDataCache && (window.xlyFormDataCache = {}); - if (window.xlyFormDataCache[sModelsId]) { - return window.xlyFormDataCache[sModelsId]; - } - const { token, formSrcRoute } = state; const configUrl = `${ commonConfig.server_host @@ -128,7 +123,6 @@ const useCommonBase = props => { if (configReturn.code === 1) { const [configData] = configReturn.dataset.rows; formData = configData.formData; - window.xlyFormDataCache[sModelsId] = formData; } else { getServiceError(configReturn); } @@ -2483,27 +2477,13 @@ const useCommonBase = props => { }; // 表格行删除 - const handleMesTableLineDel = ({ - tableName, - record, - index: indexOld, - callback - }) => { + const handleMesTableLineDel = ({ tableName, record, index, callback }) => { const { [`${tableName}Data`]: data = [], [`${tableName}DelData`]: delData = [], [`${tableName}Config`]: config = {} } = state; - let index = indexOld; - if ( - record.sRev && - record.sRev?.startsWith("第") && - record.sRev?.endsWith("转") - ) { - index = data.findIndex(item => item.sId === record.sId); - } - const { gdsconfigformslave = [] } = config; const btnTableDelConfig = gdsconfigformslave.find( @@ -2721,11 +2701,7 @@ const useLoadSubscriptNum = props => { useEffect( async () => { if (sModelsId !== sModelsId1) return; - if ( - currentContent !== "scheduledTasks" && - currentContent !== "productionExec" - ) - return; + if (currentContent !== "scheduledTasks") return; instructSet({ ...props, @@ -2769,10 +2745,10 @@ const useLoadSubscriptNum = props => { inscallback: nextProps => { const { counterData = [] } = nextProps; const [counterRow = {}] = counterData; - const { table0 = 0, table1 = 0, table2 = 0, table3 = 0 } = counterRow; + const { table0 = 0, table1 = 0, table2 = 0 } = counterRow; props.dispatch({ type: "app/setCounter", - payload: { table0, table1, table2, table3 } + payload: { table0, table1, table2 } }); } }); @@ -2813,7 +2789,7 @@ const useGetMonitorFields = props => { props.onSaveState({ monitorFieldsMap }); }, - [!!bFinish] + [bFinish] ); }; diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js index 65d97d1..f17f483 100644 --- a/src/components/Common/CommonInstructSet.js +++ b/src/components/Common/CommonInstructSet.js @@ -59,7 +59,6 @@ const getOprFun = instruct => { calcprocedure: handleCalcprocedure, clearrowkey: handleClearRowKey, - selectfirstline: handleSelectFirstLine, refreshpage: handleRefreshPage, "": () => ({}) }; @@ -199,7 +198,7 @@ const instructSet = async props => { window.instructSetLock = true; await instructSetInit(props); } catch (error) { - window.debugger && console.log("=====", error); + console.log("=====", error); window.instructSetLock = false; props.app.globalFun.onSetMask(false); props.onSaveState({ pageLoading: false, loadingBtnConfig: {} }); @@ -238,27 +237,19 @@ const instructSetInit = async props => { let addState = {}; - try { - for (let i = 0; i < sInstruct.length; i++) { - const instruct = sInstruct[i]; - const operationFun = getOprFun(instruct); - const resultData = await operationFun({ ...props, ...addState }, instruct); - if (resultData.stop) { - throw new Error("人脸识别取消!"); - } - addState = { - ...addState, - ...resultData - }; + for (let i = 0; i < sInstruct.length; i++) { + const instruct = sInstruct[i]; + const operationFun = getOprFun(instruct); + const resultData = await operationFun({ ...props, ...addState }, instruct); + if (resultData.stop) { + throw new Error("人脸识别取消!"); } - - } catch (error) { - props.btnConfig.error? props.btnConfig.error(error) : ''; - throw new Error(error); + addState = { + ...addState, + ...resultData + }; } - - // 是否要关闭弹窗 const bClosePop = addState.closePop; @@ -467,7 +458,7 @@ const handleCopy = (props, instruct) => { let srcData = dataList[0] || []; // 如果数据源是循环的那条数据 - const { fordosetName, fordosetData, datasetList = [] } = props; + const { fordosetName, fordosetData } = props; if (fordosetName && srcDataset === fordosetName && fordosetData) { srcData = [fordosetData]; } @@ -498,14 +489,7 @@ const handleCopy = (props, instruct) => { const resultData = [...srcDataNew]; - const datasetListNew = datasetList.includes(newDataset) - ? datasetList - : [...datasetList, newDataset]; - - const result = { - [`${newDataset}Data`]: resultData, - datasetList: datasetListNew - }; + const result = { [`${newDataset}Data`]: resultData }; outputResult(result); return result; @@ -1559,31 +1543,15 @@ const handleOpenSql = async (props, instruct) => { resultData.forEach((item = {}) => { const itemNew = {}; Object.keys(item).forEach(key => { - const itemName = !key.endsWith("Data") ? `${key}Data` : key; - itemNew[itemName] = item[key]; + if (!key.endsWith("Data")) { + itemNew[`${key}Data`] = item[key]; + } else { + itemNew[key] = item[key]; + } }); result = { ...result, ...itemNew }; }); - - const { handleType, newDataset } = item; - if (handleType) { - const { datasetList = [] } = props; - const datasetListNew = datasetList.includes(newDataset) - ? datasetList - : [...datasetList, newDataset]; - result = { - ...result, - datasetList: datasetListNew - }; - const itemName = !newDataset.endsWith("Data") - ? `${newDataset}Data` - : newDataset; - result[itemName].forEach(item => { - item.sId = commonUtils.createSid(); - item.handleType = "add"; - }); - } } outputResult(result); @@ -1730,15 +1698,6 @@ const handleProcedure = async (props, instruct) => { if (iIndex !== -1) { Object.keys(columnconfig[iIndex]).forEach(key => { item[key] = columnconfig[iIndex][key]; - if (key === "bNotEmpty") { - if ( - (item.sName?.startsWith("i") || - item.sName?.startsWith("d")) && - item.bNotEmpty - ) { - item.bNotZero = true; - } - } }); } }); @@ -2238,22 +2197,6 @@ const handleClearRowKey = async (props, instruct) => { return {}; }; -/************************* 选中第一行 selectfirstline ************************/ -const handleSelectFirstLine = async (props, instruct) => { - const { dataset = "" } = instruct; - const tableList = dataset.split(","); - const addState = {}; - tableList.forEach(tablename => { - const { [`${tablename}Data`]: data = [] } = props; - if (data.length) { - addState[`${tablename}SelectedRowKeys`] = [data[0].sId]; - } - }); - - globalAddState = { ...globalAddState, ...addState }; - return {}; -}; - /************************* 页面重新加载 refreshpage ************************/ const handleRefreshPage = () => { bRefreshPage = true; @@ -2501,7 +2444,7 @@ const utils = { // todo return tableData[0]; } else if (filterType === "last") { - return tableData[tableData.length - 1]; + return [tableData[tableData.length - 1]]; } return tableData; @@ -2635,9 +2578,10 @@ const utils = { // 如果是 赋值字段名称:数据集名称.数据集字段名称 格式 const [assignField, tableValues] = partValue.split(":"); const [tableName, fieldName] = tableValues.split("."); + const tableNewData = Array.isArray(dataOneObj[tableName]) && dataOneObj[tableName].length > 0 ? dataOneObj[tableName][0] : dataOneObj[tableName]; rowData = { ...rowData, - [assignField]: dataOneObj[tableName][fieldName] + [assignField]: tableNewData[fieldName] }; } else if (regex2.test(partValue)) { // 如果是 赋值字段名称:数据集字段名称 格式 @@ -3149,9 +3093,9 @@ const utils = { let result = ""; try { // 调试模式 - if (window.debuggerValue && stringValue.includes(window.debuggerValue)) { - debugger; - } + // if (window.debuggerValue && stringValue.includes(window.debuggerValue)) { + // debugger; + // } // 第一遍运算(将变量转换成对应的值) const evalStr = eval("`" + strNew + "`"); diff --git a/src/components/Common/CommonListSelect/index.js b/src/components/Common/CommonListSelect/index.js index c52e706..07e5344 100644 --- a/src/components/Common/CommonListSelect/index.js +++ b/src/components/Common/CommonListSelect/index.js @@ -96,14 +96,7 @@ class CommonList extends Component { slaveSelectedData, app, slaveSelectedRowKeys, slaveData, } = this.props; let newSlaveSelectedData = []; - if (location.pathname.includes("indexPad") && commonUtils.isEmptyArr(slaveSelectedData) && this.tableRef) { - const dataRowKeys = this.tableRef.querySelectorAll('tr[data-row-key]'); - if (dataRowKeys.length === 1) { - const dataRowKey = dataRowKeys[0].getAttribute('data-row-key'); - const slaveDataOne = slaveData.filter(item => item.sSlaveId === dataRowKey); - newSlaveSelectedData = slaveDataOne; - } - } else if (commonUtils.isNotEmptyArr(slaveSelectedData)) { + if (commonUtils.isNotEmptyArr(slaveSelectedData)) { newSlaveSelectedData = slaveSelectedData; } else if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) { newSlaveSelectedData = slaveData.filter(item => slaveSelectedRowKeys.includes(item.sSlaveId)); @@ -181,7 +174,6 @@ class CommonList extends Component { onEject={this.handleEject.bind(this)} onSelectTree={this.handleTreeSelect} onCopyTo={this.copyTo} - setTableRef={(ref) => { this.tableRef = ref; }} />
@@ -292,7 +284,6 @@ const CommonListComponent = Form.create({ 0 ? `${500 + realizeHeight}px` : 'auto', paddingLeft: '10px' }} - ref={ref => { props.setTableRef(ref); }} > diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index e80de6a..6658a04 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -30,33 +30,15 @@ import { FormOutlined, CaretUpOutlined, CaretDownOutlined, - SaveOutlined + SaveOutlined, + PlaySquareOutlined, } from "@ant-design/icons"; import { Icon as LegacyIcon } from "@ant-design/compatible"; import "@ant-design/compatible/assets/index.css"; import lodash, { cloneDeep } from "lodash"; -import { - Table, - Input, - Checkbox, - Button, - Upload, - message, - Popover, - Spin, - Space, - Form, - Tooltip, - Row, - Progress, - Modal -} from "antd"; +import { Table, Input, Checkbox, Button, Upload, message, Popover, Spin, Space, Form, Tooltip, Row, Progress, Modal } from "antd"; import { DndProvider, DropTarget, DragSource } from "react-dnd"; -import { - sortableContainer, - sortableElement, - sortableHandle -} from "react-sortable-hoc"; +import { sortableContainer, sortableElement, sortableHandle } from "react-sortable-hoc"; import { MenuOutlined } from "@ant-design/icons"; import { HTML5Backend } from "react-dnd-html5-backend"; import { Resizable } from "react-resizable"; @@ -116,13 +98,7 @@ const ResizeableTitle = props => { let dragingIndex = -1; // 用于设置拖拽Row时样式 let moverow = null; // 定义move事件,解决warn const BodyRow = props => { - const { - isOver, - connectDragSource, - connectDropTarget, - move, - ...restProps - } = props; + const { isOver, connectDragSource, connectDropTarget, move, ...restProps } = props; moverow = move; const ref = useRef(null); const style = { ...restProps.style, cursor: "move" }; @@ -145,13 +121,13 @@ const rowSource = { dragingIndex = props.index; return { "data-row-key": dragingKey, - index: props.index + index: props.index, }; // dragingIndex = props.index; // return { // index: props.index, // }; - } + }, }; // DropTarget 拖拽事件的方法对象 const rowTarget = { @@ -166,15 +142,15 @@ const rowTarget = { props.moveRow(dragIndex, hoverIndex, dragKey, hoverKey); monitor.getItem().index = hoverIndex; monitor.getItem()["data-row-key"] = hoverKey; - } + }, }; const DragableBodyRow = DropTarget("row", rowTarget, (connect, monitor) => ({ connectDropTarget: connect.dropTarget(), - isOver: monitor.isOver() + isOver: monitor.isOver(), }))( DragSource("row", rowSource, connect => ({ - connectDragSource: connect.dragSource() + connectDragSource: connect.dragSource(), }))(BodyRow) ); /* ================================================================== */ @@ -211,22 +187,17 @@ class CommonTableRc extends React.Component { commonFileDownloadList: [], // 多文件列表 pdfFileVisible: false, // pdf文件弹窗 pdfFileUrl: "", - currentHoverSid: "" + currentHoverSid: "", }; this.rowKey = - commonUtils.isNotEmptyObject(props.tableProps) && - !commonUtils.isEmpty(props.tableProps.rowKey) + commonUtils.isNotEmptyObject(props.tableProps) && !commonUtils.isEmpty(props.tableProps.rowKey) ? props.tableProps.rowKey : "sId"; /* 表格主键 */ this.config = {}; /* 配置信息(基础)(数据格式:对象) */ this.tableColumn = []; /* table的表头信息(数据类型:数组对象) */ this.tableInfoColumn = []; this.scrollX = 0; /* 表格宽度统计值(数据格式:整形) */ - this.scrollY = this.props.tableProps - ? this.props.tableProps.AutoTableHeight - ? this.props.tableProps.AutoTableHeight - : 0 - : 0; + this.scrollY = this.props.tableProps ? (this.props.tableProps.AutoTableHeight ? this.props.tableProps.AutoTableHeight : 0) : 0; this.scrollInfoX = 0; /* 表格宽度统计值(数据格式:整形) */ this.formId = ""; /* 窗体Id(数据格式:字符串) */ this.sId = ""; /* 表格Id(数据格式:字符串) */ @@ -259,9 +230,7 @@ class CommonTableRc extends React.Component { // this.beSelectDropdownOpen = false; this.uniqueId = null; // 虚拟列表vid this.hasMergeHeader = false; // 判断是否包含合并表头 - this.sticky = this.props.tableProps.sticky - ? this.props.tableProps.sticky - : false; + this.sticky = this.props.tableProps.sticky ? this.props.tableProps.sticky : false; this.sortRendered = false; this.tableHeight = 0; this.DraggableContainer = null; @@ -320,26 +289,18 @@ class CommonTableRc extends React.Component { if ( this.props.app && this.props.app.currentPane && - (this.props.app.currentPane.route.indexOf("commonList") !== -1 || - this.props.app.currentPane.route.indexOf("productionScheduleTree") !== - -1) + (this.props.app.currentPane.route.indexOf("commonList") !== -1 || this.props.app.currentPane.route.indexOf("productionScheduleTree") !== -1) ) { if (this.tableHeight !== "100%" && this.tableHeight !== 0) { if (this.props.name !== "report") { - this.mydiv.getElementsByClassName( - "ant-table-body" - )[0].style.height = this.tableHeight - ? this.tableHeight + "px" - : 80 + "px"; + this.mydiv.getElementsByClassName("ant-table-body")[0].style.height = this.tableHeight ? this.tableHeight + "px" : 80 + "px"; } } } let divs = document.getElementsByClassName("noInputInsert"); if (divs.length) { Array.prototype.forEach.call(divs, item => { - item.parentNode.parentNode.parentNode.parentNode.classList.add( - "insertTd" - ); + item.parentNode.parentNode.parentNode.parentNode.classList.add("insertTd"); }); } @@ -391,12 +352,10 @@ class CommonTableRc extends React.Component { } } if (this.state.openNewTabFlag && this.pathname === location.pathname) { - const dom = document.getElementsByClassName( - `${this.state.randomId}-CommonListSelectTree` - )[0]; + const dom = document.getElementsByClassName(`${this.state.randomId}-CommonListSelectTree`)[0]; dom.parentElement.parentElement.style.display = "block"; this.setState({ - openNewTabFlag: false + openNewTabFlag: false, }); } } @@ -419,7 +378,7 @@ class CommonTableRc extends React.Component { expKeys, commonPopupVisible, commonFieldPopupVisible, - realizeHeight + realizeHeight, } = this.state; // if (this.props.data?.length !== nextProps.data?.length) { @@ -433,30 +392,22 @@ class CommonTableRc extends React.Component { return ( this.props.updateRowNumTime !== nextState.updateRowNumTime || enabled !== nextState.enabled || - JSON.stringify(this.props.isDragAndDrop) !== - JSON.stringify(nextProps.isDragAndDrop) || + JSON.stringify(this.props.isDragAndDrop) !== JSON.stringify(nextProps.isDragAndDrop) || // JSON.stringify(headerColumn) !== JSON.stringify(nextState.headerColumn) || JSON.stringify(this.props.config) !== JSON.stringify(nextProps.config) || JSON.stringify(tableColumn) !== JSON.stringify(nextState.tableColumn) || JSON.stringify(dataSource) !== JSON.stringify(nextState.dataSource) || JSON.stringify(totalData) !== JSON.stringify(nextState.totalData) || JSON.stringify(totalData1) !== JSON.stringify(nextState.totalData1) || - JSON.stringify(selectedRowKeys) !== - JSON.stringify(nextState.selectedRowKeys) || - JSON.stringify(slaveInfoSelectedRowKeys) !== - JSON.stringify(nextState.slaveInfoSelectedRowKeys) || + JSON.stringify(selectedRowKeys) !== JSON.stringify(nextState.selectedRowKeys) || + JSON.stringify(slaveInfoSelectedRowKeys) !== JSON.stringify(nextState.slaveInfoSelectedRowKeys) || JSON.stringify(expKeys) !== JSON.stringify(nextState.expKeys) || - JSON.stringify(previewVisible) !== - JSON.stringify(nextState.previewVisible) || - JSON.stringify(commonPopupVisible) !== - JSON.stringify(nextState.commonPopupVisible) || - JSON.stringify(commonFieldPopupVisible) !== - JSON.stringify(nextState.commonFieldPopupVisible) || + JSON.stringify(previewVisible) !== JSON.stringify(nextState.previewVisible) || + JSON.stringify(commonPopupVisible) !== JSON.stringify(nextState.commonPopupVisible) || + JSON.stringify(commonFieldPopupVisible) !== JSON.stringify(nextState.commonFieldPopupVisible) || JSON.stringify(previewImage) !== JSON.stringify(nextState.previewImage) || - JSON.stringify(filteredValue) !== - JSON.stringify(nextState.filteredValue) || - JSON.stringify(this.props.tableProps.pagination) !== - JSON.stringify(nextProps.tableProps.pagination) || + JSON.stringify(filteredValue) !== JSON.stringify(nextState.filteredValue) || + JSON.stringify(this.props.tableProps.pagination) !== JSON.stringify(nextProps.tableProps.pagination) || // JSON.stringify(this.props.tableProps.AutoTableHeight) !== JSON.stringify(nextProps.tableProps.AutoTableHeight) || JSON.stringify(nextProps.slaveInfo) !== slaveInfo || JSON.stringify(nextProps.realizeHeight) !== realizeHeight || @@ -479,10 +430,7 @@ class CommonTableRc extends React.Component { } handleLastTdMouseOver = event => { - if ( - event.target.classList.contains("react-resizable-handle") && - event.target.parentNode.getAttribute("bnotresize") === "bNotResize" - ) { + if (event.target.classList.contains("react-resizable-handle") && event.target.parentNode.getAttribute("bnotresize") === "bNotResize") { const oBody = this.mydiv.querySelector(".ant-table-body"); const { scrollWidth, clientWidth } = oBody; const oResizable = event.target; @@ -495,8 +443,7 @@ class CommonTableRc extends React.Component { oResizable.style.cursor = "col-resize"; const tempDom = document.createElement("div"); const mask = document.createElement("div"); - mask.style = - "position: absolute; width: 100%; height: 100%; left: 0; top: 0; z-index: 9999;"; + mask.style = "position: absolute; width: 100%; height: 100%; left: 0; top: 0; z-index: 9999;"; const resizableMousemove = e => { const { clientX } = e; const left = Math.min(Math.max(minLeft, clientX), maxLeft + 200); @@ -505,7 +452,7 @@ class CommonTableRc extends React.Component { diffx = Math.max(diffx, clientWidth - scrollWidth); } Object.assign(tempDom.style, { - left: left + "px" + left: left + "px", }); }; const resizableMouseup = () => { @@ -516,12 +463,9 @@ class CommonTableRc extends React.Component { document.removeEventListener("mousemove", resizableMousemove); const { tableColumn, headerColumn } = this.state; - const sessionColumn = sessionStorage.getItem( - `${this.props.formId}_${this.props.config.sId}` - ); + const sessionColumn = sessionStorage.getItem(`${this.props.formId}_${this.props.config.sId}`); const column = sessionColumn ? JSON.parse(sessionColumn) : tableColumn; - const lastIndex = - column.findIndex(item => item.dataIndex === "tableLastEmpty") - 1; + const lastIndex = column.findIndex(item => item.dataIndex === "tableLastEmpty") - 1; if (lastIndex > -1 && diffx !== 0) { const headerColumnNew = [...headerColumn]; const columnNew = [...column]; @@ -536,16 +480,10 @@ class CommonTableRc extends React.Component { if (columnNew[lastIndex].children[lastChildIndex].widthExtra < 0) { columnNew[lastIndex].children[lastChildIndex].widthExtra = 0; } - const headerIndex = headerColumnNew.findIndex( - item => - item.dataIndex === - columnNew[lastIndex].children[lastChildIndex].dataIndex - ); + const headerIndex = headerColumnNew.findIndex(item => item.dataIndex === columnNew[lastIndex].children[lastChildIndex].dataIndex); if (headerIndex !== -1) { - headerColumnNew[headerIndex].width = - columnNew[lastIndex].children[lastChildIndex].width; - headerColumnNew[headerIndex].widthExtra = - columnNew[lastIndex].children[lastChildIndex].widthExtra; + headerColumnNew[headerIndex].width = columnNew[lastIndex].children[lastChildIndex].width; + headerColumnNew[headerIndex].widthExtra = columnNew[lastIndex].children[lastChildIndex].widthExtra; } } else { columnNew[lastIndex].width += diffx; @@ -557,32 +495,24 @@ class CommonTableRc extends React.Component { if (columnNew[lastIndex].widthExtra < 0) { columnNew[lastIndex].widthExtra = 0; } - const headerIndex = headerColumnNew.findIndex( - item => item.dataIndex === columnNew[lastIndex].dataIndex - ); + const headerIndex = headerColumnNew.findIndex(item => item.dataIndex === columnNew[lastIndex].dataIndex); if (headerIndex !== -1) { headerColumnNew[headerIndex].width = columnNew[lastIndex].width; - headerColumnNew[headerIndex].widthExtra = - columnNew[lastIndex].widthExtra; + headerColumnNew[headerIndex].widthExtra = columnNew[lastIndex].widthExtra; } } - sessionStorage.setItem( - `${this.props.formId}_${this.props.config.sId}`, - JSON.stringify(columnNew) - ); + sessionStorage.setItem(`${this.props.formId}_${this.props.config.sId}`, JSON.stringify(columnNew)); this.props.onSaveState({ headerColumn: headerColumnNew, - tableColumn: columnNew + tableColumn: columnNew, }); } }; oResizable.onmousedown = () => { const { y, height } = event.target.getBoundingClientRect(); minLeft = event.target.parentNode.getBoundingClientRect().x + 50; - maxLeft = - event.target.parentNode.getBoundingClientRect().x + - event.target.parentNode.getBoundingClientRect().width; + maxLeft = event.target.parentNode.getBoundingClientRect().x + event.target.parentNode.getBoundingClientRect().width; Object.assign(tempDom.style, { width: "2px", height: height + "px", @@ -591,7 +521,7 @@ class CommonTableRc extends React.Component { left: maxLeft + "px", position: "absolute", zIndex: 9999, - cursor: "col-resize" + cursor: "col-resize", }); document.body.append(mask); document.body.append(tempDom); @@ -604,23 +534,13 @@ class CommonTableRc extends React.Component { }; handleTableKeyDown = event => { - if ( - event.ctrlKey && - (event.altKey || event.metaKey) && - event.keyCode === 83 && - this.bMouseEnter - ) { + if (event.ctrlKey && (event.altKey || event.metaKey) && event.keyCode === 83 && this.bMouseEnter) { // ctrl+alt+s 弹出表格布局 event.preventDefault(); // 阻止默认的保存行为,如果有的话 this.setState({ - affixMenuVisible: true + affixMenuVisible: true, }); - } else if ( - event.ctrlKey && - (event.altKey || event.metaKey) && - event.keyCode === 78 && - this.bMouseEnter - ) { + } else if (event.ctrlKey && (event.altKey || event.metaKey) && event.keyCode === 78 && this.bMouseEnter) { // ctrl+alt+n 显示表格名 event.preventDefault(); // 阻止默认的保存行为,如果有的话 message.info(this.props.name); @@ -637,14 +557,10 @@ class CommonTableRc extends React.Component { } // 最后一列禁止拖动 let bNotResize = false; - const lastIndex = - columns.findIndex(item => item.dataIndex === "tableLastEmpty") - 1; + const lastIndex = columns.findIndex(item => item.dataIndex === "tableLastEmpty") - 1; if (lastIndex > -1) { if (commonUtils.isNotEmptyArr(columns[lastIndex].children)) { - if ( - columns[lastIndex].children[columns[lastIndex].children.length - 1] - .dataIndex === column.dataIndex - ) { + if (columns[lastIndex].children[columns[lastIndex].children.length - 1].dataIndex === column.dataIndex) { bNotResize = true; } } else if (columns[lastIndex].dataIndex === column.dataIndex) { @@ -654,24 +570,18 @@ class CommonTableRc extends React.Component { return { width: column.width, - onResize: !bNotResize - ? this.handleResize(index, column, isSlaveInfo) - : null, + onResize: !bNotResize ? this.handleResize(index, column, isSlaveInfo) : null, bnotresize: bNotResize ? "bNotResize" : null, onClick: () => {}, onMouseDown: () => { if (this.lastTdMouseOver) { return; } - const tableColumn = isSlaveInfo - ? this.state.tableInfoColumn - : this.state.tableColumn; + const tableColumn = isSlaveInfo ? this.state.tableInfoColumn : this.state.tableColumn; for (const m in tableColumn) { if (commonUtils.isNotEmptyArr(columns[m].children)) { // 如果是双层表头 - const initColumnIndex = columns[m].children.findIndex( - item => item.dataIndex === column.dataIndex - ); + const initColumnIndex = columns[m].children.findIndex(item => item.dataIndex === column.dataIndex); if (initColumnIndex !== -1) { this.initColumn = columns[m].children[initColumnIndex]; this.droping = true; @@ -699,24 +609,24 @@ class CommonTableRc extends React.Component { if (columns[i].children[j].dataIndex === column.dataIndex) { columns[i].children[j] = { ...columns[i].children[j], - className: "hover-droping-cell" + className: "hover-droping-cell", }; } else { columns[i].children[j] = { ...columns[i].children[j], - className: "" + className: "", }; } } } else if (columns[i].dataIndex === column.dataIndex) { columns[i] = { ...columns[i], - className: "hover-droping-cell" + className: "hover-droping-cell", }; } else { columns[i] = { ...columns[i], - className: "" + className: "", }; } } @@ -732,18 +642,10 @@ class CommonTableRc extends React.Component { } }); if (isSlaveInfo) { - sessionStorage.setItem( - `${this.props.formId}_${ - this.props.config.sId - }_info_headerColumns`, - JSON.stringify(sortArr) - ); + sessionStorage.setItem(`${this.props.formId}_${this.props.config.sId}_info_headerColumns`, JSON.stringify(sortArr)); return { tableInfoColumn: columns }; } else { - sessionStorage.setItem( - `${this.props.formId}_${this.props.config.sId}_headerColumns`, - JSON.stringify(sortArr) - ); + sessionStorage.setItem(`${this.props.formId}_${this.props.config.sId}_headerColumns`, JSON.stringify(sortArr)); return { tableColumn: columns }; } }); @@ -755,23 +657,15 @@ class CommonTableRc extends React.Component { onMouseUp: () => { let spliceIndex = null; const sortItems = []; - if ( - this.droping && - !commonUtils.isEmpty(this.initColumn) && - this.initColumn.dataIndex !== column.dataIndex - ) { - const bTargetMuti = - columns.findIndex(item => item.dataIndex === column.dataIndex) === - -1; // 移动到的目标是否是多表头 + if (this.droping && !commonUtils.isEmpty(this.initColumn) && this.initColumn.dataIndex !== column.dataIndex) { + const bTargetMuti = columns.findIndex(item => item.dataIndex === column.dataIndex) === -1; // 移动到的目标是否是多表头 if (!this.bInitColumnMuti && !bTargetMuti) { // 拖拽对象【单表头】、移动到的目标【单表头】 for (const i in columns) { columns[i].className = ""; if (columns[i].dataIndex === this.initColumn.dataIndex) { columns.splice(i, 1); - spliceIndex = columns.findIndex( - item => item.dataIndex === column.dataIndex - ); + spliceIndex = columns.findIndex(item => item.dataIndex === column.dataIndex); columns.splice(spliceIndex, 0, this.initColumn); sortItems.push(this.initColumn.dataIndex); sortItems.push(column.dataIndex); @@ -781,16 +675,12 @@ class CommonTableRc extends React.Component { // 拖拽对象【单表头】、移动到的目标【双表头】 let iIndexArr = []; // 获取拖拽对象index - const initColumnIndex = columns.findIndex( - item => item.dataIndex === this.initColumn.dataIndex - ); + const initColumnIndex = columns.findIndex(item => item.dataIndex === this.initColumn.dataIndex); // 获取目标index for (const i in columns) { const children = columns[i].children; if (commonUtils.isNotEmptyArr(children)) { - const iIndex = children.findIndex( - item => item.dataIndex === column.dataIndex - ); + const iIndex = children.findIndex(item => item.dataIndex === column.dataIndex); if (iIndex !== -1) { columns[i].children[iIndex].className = ""; iIndexArr = [i, iIndex]; @@ -816,23 +706,13 @@ class CommonTableRc extends React.Component { const targetColumn = columns.splice(spliceIndex, 1)[0]; const column1 = { ...targetColumn, - children: targetColumn.children.filter( - (item, index) => index < iIndexArr[1] - ) + children: targetColumn.children.filter((item, index) => index < iIndexArr[1]), }; const column2 = { ...targetColumn, - children: targetColumn.children.filter( - (item, index) => index >= iIndexArr[1] - ) + children: targetColumn.children.filter((item, index) => index >= iIndexArr[1]), }; - columns.splice( - spliceIndex, - 0, - column1, - this.initColumn, - column2 - ); + columns.splice(spliceIndex, 0, column1, this.initColumn, column2); } } } else if (this.bInitColumnMuti && !bTargetMuti) { @@ -841,9 +721,7 @@ class CommonTableRc extends React.Component { let initColumnIndexArr = []; for (const i in columns) { if (commonUtils.isNotEmptyArr(columns[i].children)) { - const iIndex = columns[i].children.findIndex( - child => child.dataIndex === this.initColumn.dataIndex - ); + const iIndex = columns[i].children.findIndex(child => child.dataIndex === this.initColumn.dataIndex); if (iIndex !== -1) { initColumnIndexArr = [i, iIndex]; break; @@ -851,28 +729,17 @@ class CommonTableRc extends React.Component { } } if (commonUtils.isNotEmptyArr(initColumnIndexArr)) { - spliceIndex = columns.findIndex( - item => item.dataIndex === column.dataIndex - ); + spliceIndex = columns.findIndex(item => item.dataIndex === column.dataIndex); columns[spliceIndex].className = ""; if (columns[initColumnIndexArr[0]].children.length === 1) { - const initColumnParent = columns.splice( - initColumnIndexArr[0], - 1 - )[0]; + const initColumnParent = columns.splice(initColumnIndexArr[0], 1)[0]; columns.splice(spliceIndex, 0, initColumnParent); } else { const newColumn = { ...columns[initColumnIndexArr[0]], - children: [ - columns[initColumnIndexArr[0]].children[ - initColumnIndexArr[1] - ] - ] + children: [columns[initColumnIndexArr[0]].children[initColumnIndexArr[1]]], }; - columns[initColumnIndexArr[0]].children = columns[ - initColumnIndexArr[0] - ].children.filter( + columns[initColumnIndexArr[0]].children = columns[initColumnIndexArr[0]].children.filter( item => item.dataIndex !== newColumn.children[0].dataIndex ); columns.splice(spliceIndex, 0, newColumn); @@ -884,9 +751,7 @@ class CommonTableRc extends React.Component { let initColumnIndexArr = []; for (const i in columns) { if (commonUtils.isNotEmptyArr(columns[i].children)) { - const iIndex = columns[i].children.findIndex( - child => child.dataIndex === this.initColumn.dataIndex - ); + const iIndex = columns[i].children.findIndex(child => child.dataIndex === this.initColumn.dataIndex); if (iIndex !== -1) { initColumnIndexArr = [i, iIndex]; break; @@ -899,9 +764,7 @@ class CommonTableRc extends React.Component { for (const i in columns) { const children = columns[i].children; if (commonUtils.isNotEmptyArr(children)) { - const iIndex = children.findIndex( - item => item.dataIndex === column.dataIndex - ); + const iIndex = children.findIndex(item => item.dataIndex === column.dataIndex); if (iIndex !== -1) { columns[i].children[iIndex].className = ""; iIndexArr = [i, iIndex]; @@ -910,77 +773,45 @@ class CommonTableRc extends React.Component { } } - if ( - commonUtils.isNotEmptyArr(initColumnIndexArr) && - commonUtils.isNotEmptyArr(iIndexArr) - ) { + if (commonUtils.isNotEmptyArr(initColumnIndexArr) && commonUtils.isNotEmptyArr(iIndexArr)) { if (initColumnIndexArr[0] === iIndexArr[0]) { // 同一个一级表头 - columns[initColumnIndexArr[0]].children.splice( - initColumnIndexArr[1], - 1 - ); - spliceIndex = columns[initColumnIndexArr[0]].children.findIndex( - item => item.dataIndex === column.dataIndex - ); - columns[initColumnIndexArr[0]].children.splice( - spliceIndex, - 0, - this.initColumn - ); + columns[initColumnIndexArr[0]].children.splice(initColumnIndexArr[1], 1); + spliceIndex = columns[initColumnIndexArr[0]].children.findIndex(item => item.dataIndex === column.dataIndex); + columns[initColumnIndexArr[0]].children.splice(spliceIndex, 0, this.initColumn); } else { // 不同的一级表头 const newColumn = { ...columns[initColumnIndexArr[0]], - children: [ - columns[initColumnIndexArr[0]].children[ - initColumnIndexArr[1] - ] - ] + children: [columns[initColumnIndexArr[0]].children[initColumnIndexArr[1]]], }; if (iIndexArr[1] === 0) { // 最前面 - columns[initColumnIndexArr[0]].children.splice( - initColumnIndexArr[1], - 1 - ); + columns[initColumnIndexArr[0]].children.splice(initColumnIndexArr[1], 1); spliceIndex = iIndexArr[0]; if (columns[initColumnIndexArr[0]].children.length === 0) { // 剩下的二层表头为空 columns.splice(initColumnIndexArr[0], 1); - spliceIndex = - initColumnIndexArr[0] < spliceIndex - ? spliceIndex - 1 - : spliceIndex; + spliceIndex = initColumnIndexArr[0] < spliceIndex ? spliceIndex - 1 : spliceIndex; } columns.splice(spliceIndex, 0, newColumn); } else { // 插到其它二级表头中间 - columns[initColumnIndexArr[0]].children.splice( - initColumnIndexArr[1], - 1 - ); + columns[initColumnIndexArr[0]].children.splice(initColumnIndexArr[1], 1); spliceIndex = iIndexArr[0]; if (columns[initColumnIndexArr[0]].children.length === 0) { // 剩下的二层表头为空 columns.splice(initColumnIndexArr[0], 1); - spliceIndex = - initColumnIndexArr[0] < spliceIndex - ? spliceIndex - 1 - : spliceIndex; + spliceIndex = initColumnIndexArr[0] < spliceIndex ? spliceIndex - 1 : spliceIndex; } const targetColumn = columns.splice(spliceIndex, 1)[0]; const column1 = { ...targetColumn, - children: targetColumn.children.filter( - (item, index) => index < iIndexArr[1] - ) + children: targetColumn.children.filter((item, index) => index < iIndexArr[1]), }; const column2 = { ...targetColumn, - children: targetColumn.children.filter( - (item, index) => index >= iIndexArr[1] - ) + children: targetColumn.children.filter((item, index) => index >= iIndexArr[1]), }; columns.splice(spliceIndex, 0, column1, newColumn, column2); } @@ -991,11 +822,7 @@ class CommonTableRc extends React.Component { columns = columns.reduce((prev, cur) => { if (prev.length) { const prevColumn = prev[prev.length - 1]; - if ( - commonUtils.isNotEmptyArr(prevColumn.children) && - commonUtils.isNotEmptyArr(cur.children) && - prevColumn.title === cur.title - ) { + if (commonUtils.isNotEmptyArr(prevColumn.children) && commonUtils.isNotEmptyArr(cur.children) && prevColumn.title === cur.title) { prevColumn.children = [...prevColumn.children, ...cur.children]; prev[prev.length - 1] = prevColumn; return prev; @@ -1021,22 +848,14 @@ class CommonTableRc extends React.Component { }); if (isSlaveInfo) { this.setState({ tableInfoColumn: columns }, () => { - sessionStorage.setItem( - `${this.props.formId}_${ - this.props.config.sId - }_info_headerColumns`, - JSON.stringify(sortArr) - ); + sessionStorage.setItem(`${this.props.formId}_${this.props.config.sId}_info_headerColumns`, JSON.stringify(sortArr)); this.initColumn = null; this.droping = false; }); this.handleSaveOrder(sortItems, isSlaveInfo); } else { this.setState({ tableColumn: columns }, () => { - sessionStorage.setItem( - `${this.props.formId}_${this.props.config.sId}_headerColumns`, - JSON.stringify(sortArr) - ); + sessionStorage.setItem(`${this.props.formId}_${this.props.config.sId}_headerColumns`, JSON.stringify(sortArr)); this.initColumn = null; this.droping = false; }); @@ -1049,7 +868,7 @@ class CommonTableRc extends React.Component { }, onContextMenu: event => { window.event.returnValue = false; - } + }, }; }; @@ -1068,7 +887,7 @@ class CommonTableRc extends React.Component { } this.timerSelectRowChange = setTimeout(() => { this.setState({ - currentHoverSid: record.sId + currentHoverSid: record.sId, }); // console.log('=====record', record); // this.handleSelectRowChange(this.props.name, [record[this.rowKey]]); @@ -1090,23 +909,13 @@ class CommonTableRc extends React.Component { } if (record.checkboxDisabled) return; - const { - bMutiSelect, - tableProps, - bMutiSelect1, - bRowClick, - bContinueClick - } = this.props; + const { bMutiSelect, tableProps, bMutiSelect1, bRowClick, bContinueClick } = this.props; const { rowSelection } = tableProps; // let { selectedRowKeys } = this.props; const rowKey = - tabType === "slaveInfo" && - commonUtils.isNotEmptyObject(this.props.slaveInfo.tableProps) - ? this.props.slaveInfo.tableProps.rowKey - : this.rowKey; + tabType === "slaveInfo" && commonUtils.isNotEmptyObject(this.props.slaveInfo.tableProps) ? this.props.slaveInfo.tableProps.rowKey : this.rowKey; let selectedRowKeys = - tabType === "slaveInfo" && - commonUtils.isNotEmptyObject(this.props.slaveInfo.tableProps) + tabType === "slaveInfo" && commonUtils.isNotEmptyObject(this.props.slaveInfo.tableProps) ? this.props.slaveInfo.selectedRowKeys === undefined ? undefined : [...this.props.slaveInfo.selectedRowKeys] @@ -1114,19 +923,10 @@ class CommonTableRc extends React.Component { ? undefined : [...this.props.selectedRowKeys]; // bMutiSelect1默认都为false,如果想点击整行时勾选框不勾选,props里面设置bMutiSelect1为true即可 - if ( - selectedRowKeys && - selectedRowKeys.indexOf(record[rowKey]) !== -1 && - name !== "slave" - ) { + if (selectedRowKeys && selectedRowKeys.indexOf(record[rowKey]) !== -1 && name !== "slave") { return; } - if ( - selectedRowKeys && - selectedRowKeys.indexOf(record[rowKey]) !== -1 && - name !== "slave" && - !this.props.enabled - ) { + if (selectedRowKeys && selectedRowKeys.indexOf(record[rowKey]) !== -1 && name !== "slave" && !this.props.enabled) { this.handleSelectRowChange(name, []); return; } @@ -1142,10 +942,7 @@ class CommonTableRc extends React.Component { selectedRowKeys.push(record[rowKey]); } else if (indexKey !== -1 && type !== "drag") { if (!bRowClick) { - selectedRowKeys.splice( - indexKey, - 1 - ); /* 可输入行,行内点击时 不去除selectedRowKeys */ + selectedRowKeys.splice(indexKey, 1); /* 可输入行,行内点击时 不去除selectedRowKeys */ } } } @@ -1160,18 +957,12 @@ class CommonTableRc extends React.Component { let res = data.map(item => { return { ...item, - parentRowKeyPath + parentRowKeyPath, }; }); res.forEach(item => { if (commonUtils.isNotEmptyArr(item.children)) { - res = [ - ...res, - ...this.getDataAll(item.children, [ - ...parentRowKeyPath, - item[this.rowKey] - ]) - ]; + res = [...res, ...this.getDataAll(item.children, [...parentRowKeyPath, item[this.rowKey]])]; } }); return res; @@ -1184,15 +975,11 @@ class CommonTableRc extends React.Component { if (bMutiSelect && rowSelection !== null && !bMutiSelect1) { /* 有多选、复选框情况下 */ // 判断是选中还是取消 - const type = - selectedRowKeys.length > this.selectedRowKeysOld.length ? "add" : "del"; + const type = selectedRowKeys.length > this.selectedRowKeysOld.length ? "add" : "del"; // 找出变化的数据 const diffArr = this.selectedRowKeysOld .concat(selectedRowKeys) - .filter( - v => - !this.selectedRowKeysOld.includes(v) || !selectedRowKeys.includes(v) - ); + .filter(v => !this.selectedRowKeysOld.includes(v) || !selectedRowKeys.includes(v)); if (diffArr.length === 1) { // 将数据扁平化 let { data } = this.props; @@ -1206,9 +993,7 @@ class CommonTableRc extends React.Component { }, []); if (type === "add") { // 合并选中行 - selectedRowKeys = Array.from( - new Set([...selectedRowKeys, ...selectedRowKeysExtra]) - ); + selectedRowKeys = Array.from(new Set([...selectedRowKeys, ...selectedRowKeysExtra])); } else { // 删除当前行子数据 selectedRowKeys = selectedRowKeys.reduce((result, cur) => { @@ -1266,14 +1051,7 @@ class CommonTableRc extends React.Component { myTableConfig.sName = sName; const myTableConfigArr = []; myTableConfigArr.push(myTableConfig); - this.props.onViewClick( - name, - "myTableConfig", - data[0], - 0, - myTableConfigArr, - configName - ); + this.props.onViewClick(name, "myTableConfig", data[0], 0, myTableConfigArr, configName); } } else if (e.key !== "F12") { e.preventDefault(); @@ -1288,13 +1066,11 @@ class CommonTableRc extends React.Component { }; onOpenNewTab = () => { - const dom = document.getElementsByClassName( - `${this.state.randomId}-CommonListSelectTree` - )[0]; + const dom = document.getElementsByClassName(`${this.state.randomId}-CommonListSelectTree`)[0]; dom.parentElement.parentElement.style.display = "none"; this.pathname = location.pathname; this.setState({ - openNewTabFlag: true + openNewTabFlag: true, }); }; @@ -1302,15 +1078,12 @@ class CommonTableRc extends React.Component { if (this.showExpAll) { this.showExpAll = false; this.setState({ - expKeys: [] + expKeys: [], }); } if (commonUtils.isNotEmptyObject(filters)) { const filterValueArr = Object.values(filters); - if ( - filterValueArr.join("") !== "" && - commonUtils.isNotEmptyArr(extra.currentDataSource) - ) { + if (filterValueArr.join("") !== "" && commonUtils.isNotEmptyArr(extra.currentDataSource)) { // 过滤了数据 this.tableFilterData = extra.currentDataSource; } else { @@ -1325,17 +1098,8 @@ class CommonTableRc extends React.Component { } else { sorter = {}; } - if ( - this.props.slaveInfo && - this.props.slaveInfo.tableProps && - this.props.slaveInfo.tableProps.onChange - ) { - this.props.slaveInfo.tableProps.onChange( - pagination, - filters, - sorter, - extra - ); + if (this.props.slaveInfo && this.props.slaveInfo.tableProps && this.props.slaveInfo.tableProps.onChange) { + this.props.slaveInfo.tableProps.onChange(pagination, filters, sorter, extra); } if (this.props && this.props.tableProps && this.props.tableProps.onChange) { this.props.tableProps.onChange(pagination, filters, sorter, extra); @@ -1352,53 +1116,34 @@ class CommonTableRc extends React.Component { const styleColor = this.getColorStyle(record, true); /* 消息列表未读的消息,整行文字加粗 */ let newslistStyle = ""; - if ( - commonUtils.isNotEmptyObject(this.props.formId) && - this.props.formId === "15669750700007338351055957774000" - ) { + if (commonUtils.isNotEmptyObject(this.props.formId) && this.props.formId === "15669750700007338351055957774000") { if (record.bIsView === false) { newslistStyle = "newsNoRead"; } } - const selectedRowKeys = - tabType === "slaveInfo" - ? this.state.slaveInfoSelectedRowKeys - : this.props.selectedRowKeys; + const selectedRowKeys = tabType === "slaveInfo" ? this.state.slaveInfoSelectedRowKeys : this.props.selectedRowKeys; const rowKey = - tabType === "slaveInfo" && - commonUtils.isNotEmptyObject(this.props.slaveInfo.tableProps) - ? this.props.slaveInfo.tableProps - : this.rowKey; + tabType === "slaveInfo" && commonUtils.isNotEmptyObject(this.props.slaveInfo.tableProps) ? this.props.slaveInfo.tableProps : this.rowKey; const rowClassName = - commonUtils.isNotEmptyArr(selectedRowKeys) && - selectedRowKeys.indexOf(record[rowKey]) > -1 + commonUtils.isNotEmptyArr(selectedRowKeys) && selectedRowKeys.indexOf(record[rowKey]) > -1 ? `selected-record-row ${styleColor}` : commonUtils.isNotEmptyObject(styleColor) ? styleColor : index % 2 === 1 && this.props.tableBelone === "list" ? "dark-record-row" : ""; - let allRowClassName = commonUtils.isNotEmptyObject(newslistStyle) - ? `${rowClassName} ${newslistStyle}` - : rowClassName; + let allRowClassName = commonUtils.isNotEmptyObject(newslistStyle) ? `${rowClassName} ${newslistStyle}` : rowClassName; if (tabType === "slave" && commonUtils.isNotEmptyArr(this.mergeCellList)) { // 如果有合并单元格 allRowClassName = record.sColor; } else { - if ( - commonUtils.isEmptyObject(allRowClassName) || - commonUtils.isEmptyObject(allRowClassName.trim()) - ) { + if (commonUtils.isEmptyObject(allRowClassName) || commonUtils.isEmptyObject(allRowClassName.trim())) { /* 设置奇 偶行背景色 */ allRowClassName = index % 2 === 1 ? "dark-record-row" : ""; } } /* 如果行字段的sDivRow有值 则做成特殊样式 */ - if ( - commonUtils.isNotEmptyObject(record) && - commonUtils.isNotEmptyObject(record.sDivRowNew) && - record.bInsert - ) { + if (commonUtils.isNotEmptyObject(record) && commonUtils.isNotEmptyObject(record.sDivRowNew) && record.bInsert) { allRowClassName = "split-record-row"; if (this.props.skipSlaveInfo) { allRowClassName = "split-record-row-skip"; @@ -1415,8 +1160,7 @@ class CommonTableRc extends React.Component { // 根据配置高亮显示 const displayHighLightConfig = this.props.config?.gdsconfigformslave?.find( - item => - item.bVisible && item.sControlName?.toLowerCase() === "displayhighlight" + item => item.bVisible && item.sControlName?.toLowerCase() === "displayhighlight" ); // 行车记录合并高亮 @@ -1434,7 +1178,7 @@ class CommonTableRc extends React.Component { str: sDefault, record, defaultValue: true, - noDefaultRow: true + noDefaultRow: true, }); if (result) { allRowClassName = `${allRowClassName} ${styles.lightHighRecordRow}`; @@ -1447,34 +1191,19 @@ class CommonTableRc extends React.Component { /** 获取复选框对象的props */ getRowSelection = (name, type) => { const { bMutiSelect, bisMutiSelect } = this.props; - if ( - name === "control" || - (commonUtils.isNotEmptyObject(location.pathname) && - location.pathname.indexOf("commonAuto") > -1) - ) { + if (name === "control" || (commonUtils.isNotEmptyObject(location.pathname) && location.pathname.indexOf("commonAuto") > -1)) { // 控制表中可以通过bisMutiSelect显示或者隐藏勾选框 if (bisMutiSelect) { return { preserveSelectedRowKeys: true, - selectedRowKeys: - type === "slaveInfo" - ? this.state.slaveInfoSelectedRowKeys - : this.state.selectedRowKeys /* 已选择的数据集 */, - onChange: this.handleSelectRowChange.bind( - this, - name - ) /* 选择行发生改变时调用的函数 */, + selectedRowKeys: type === "slaveInfo" ? this.state.slaveInfoSelectedRowKeys : this.state.selectedRowKeys /* 已选择的数据集 */, + onChange: this.handleSelectRowChange.bind(this, name) /* 选择行发生改变时调用的函数 */, getCheckboxProps: record => ({ disabled: !!record.checkboxDisabled, - style: - record.bSum && commonConfig.hasSum - ? { display: "none" } - : { display: "checkbox" } + style: record.bSum && commonConfig.hasSum ? { display: "none" } : { display: "checkbox" }, }) /* 过滤合计的选择框 */, - type: bMutiSelect - ? this.props.rowSelectionType - : "radio" /* checkbox or radio */, - columnWidth: 37 + type: bMutiSelect ? this.props.rowSelectionType : "radio" /* checkbox or radio */, + columnWidth: 37, }; } else { return null; @@ -1482,25 +1211,14 @@ class CommonTableRc extends React.Component { } else { return { preserveSelectedRowKeys: true, - selectedRowKeys: - type === "slaveInfo" - ? this.state.slaveInfoSelectedRowKeys - : this.state.selectedRowKeys /* 已选择的数据集 */, - onChange: this.handleSelectRowChange.bind( - this, - name - ) /* 选择行发生改变时调用的函数 */, + selectedRowKeys: type === "slaveInfo" ? this.state.slaveInfoSelectedRowKeys : this.state.selectedRowKeys /* 已选择的数据集 */, + onChange: this.handleSelectRowChange.bind(this, name) /* 选择行发生改变时调用的函数 */, getCheckboxProps: record => ({ disabled: !!record.checkboxDisabled || record.bDisplayHighLight, - style: - record.bSum && commonConfig.hasSum - ? { display: "none" } - : { display: "checkbox" } + style: record.bSum && commonConfig.hasSum ? { display: "none" } : { display: "checkbox" }, }) /* 过滤合计的选择框 */, - type: bMutiSelect - ? this.props.rowSelectionType - : "radio" /* checkbox or radio */, - columnWidth: 37 + type: bMutiSelect ? this.props.rowSelectionType : "radio" /* checkbox or radio */, + columnWidth: 37, }; } }; @@ -1510,26 +1228,20 @@ class CommonTableRc extends React.Component { const { selectedRowKeys = [] } = this.props; const oBtns0 = document.querySelectorAll(".rightFormBtn0 .ant-btn"); const oBtns1 = document.querySelectorAll(".slaveWyrj.btnContent .ant-btn"); - const oBtns = oBtns0.length - ? oBtns0 - : oBtns1.length - ? oBtns1 - : document.querySelectorAll(".rightFormBtn .ant-btn"); + const oBtns = oBtns0.length ? oBtns0 : oBtns1.length ? oBtns1 : document.querySelectorAll(".rightFormBtn .ant-btn"); if (selectedRowKeys[0] !== record.sId && oBtns.length) return; const indexMap = { 1: "①", 2: "②", 3: "③", - 4: "④" + 4: "④", }; // 第一步:找class为rightFormBtn下的按钮 let oBtn = null; if (oBtns.length) { - oBtn = Array.from(oBtns).find(item => - item.children?.[0].innerHTML?.includes(indexMap[index]) - ); + oBtn = Array.from(oBtns).find(item => item.children?.[0].innerHTML?.includes(indexMap[index])); } // 第二步:找当前行操作栏中的按钮 @@ -1545,9 +1257,7 @@ class CommonTableRc extends React.Component { if (targetTr) { const oLineBtns = targetTr.querySelectorAll(".operate-bar .ant-btn"); if (oLineBtns.length) { - oBtn = Array.from(oLineBtns).find(item => - item.children?.[0].innerHTML?.includes(indexMap[index]) - ); + oBtn = Array.from(oLineBtns).find(item => item.children?.[0].innerHTML?.includes(indexMap[index])); } } } @@ -1570,48 +1280,29 @@ class CommonTableRc extends React.Component { } return result; }, []); - const sPartNameStatus = [...tableColumn, ...subTableColumn].filter( - item => item.dataIndex === "sPartNameStatus" - ); - const sPicturePath = [...tableColumn, ...subTableColumn].filter( - item => item.dataIndex === "sPicturePath" - ); + const sPartNameStatus = [...tableColumn, ...subTableColumn].filter(item => item.dataIndex === "sPartNameStatus"); + const sPicturePath = [...tableColumn, ...subTableColumn].filter(item => item.dataIndex === "sPicturePath"); const sMaterialsStatus = [...tableColumn, ...subTableColumn].filter( item => item.dataIndex === "sMaterialsStatus" || (commonUtils.isNotEmptyArr(item.children) && - item.children.findIndex( - itemChild => - itemChild.dataIndex && itemChild.dataIndex === "sMaterialsStatus" - ) > -1) + item.children.findIndex(itemChild => itemChild.dataIndex && itemChild.dataIndex === "sMaterialsStatus") > -1) ); const dynamicColumn = [...tableColumn, ...subTableColumn].filter( item => - (commonUtils.isNotEmptyObject(item.dataIndex) && - item.dataIndex.includes("_json")) || + (commonUtils.isNotEmptyObject(item.dataIndex) && item.dataIndex.includes("_json")) || (commonUtils.isNotEmptyArr(item.children) && - item.children.findIndex( - itemChild => - itemChild.dataIndex && itemChild.dataIndex.includes("_json") - ) > -1) + item.children.findIndex(itemChild => itemChild.dataIndex && itemChild.dataIndex.includes("_json")) > -1) ); /* 动态列JSON解析 */ - const sTimeStatus = [...tableColumn, ...subTableColumn].filter( - item => item.dataIndex === "sTimeStatus" - ); /* 时间进度条状态 */ - const sDownload = [...tableColumn, ...subTableColumn].filter( - item => item.dataIndex === "sDownload" - ); - const sScheduleStatusJson = [...tableColumn, ...subTableColumn].filter( - item => item.dataIndex && item.dataIndex.includes("sScheduleStatusJson") - ); // 拼版状态 + const sTimeStatus = [...tableColumn, ...subTableColumn].filter(item => item.dataIndex === "sTimeStatus"); /* 时间进度条状态 */ + const sDownload = [...tableColumn, ...subTableColumn].filter(item => item.dataIndex === "sDownload"); + const sScheduleStatusJson = [...tableColumn, ...subTableColumn].filter(item => item.dataIndex && item.dataIndex.includes("sScheduleStatusJson")); // 拼版状态 if (commonUtils.isNotEmptyArr(sPicturePath)) { sPicturePath[0].render = (value = "") => { const picHref = value.includes("xlyerpfiles") - ? `${ - commonConfig.server_host - }file/download?savePathStr=${encodeURIComponent( - value - )}&sModelsId=100&token=${encodeURIComponent(this.props.app.token)}` + ? `${commonConfig.server_host}file/download?savePathStr=${encodeURIComponent(value)}&sModelsId=100&token=${encodeURIComponent( + this.props.app.token + )}` : value; return ( @@ -1626,42 +1317,25 @@ class CommonTableRc extends React.Component { if (commonUtils.isEmpty(value)) return ""; const fileList = value.split(","); if (fileList.length === 1) { - let fileName = fileList[0].substring( - fileList[0].lastIndexOf("/") + 1 - ); + let fileName = fileList[0].substring(fileList[0].lastIndexOf("/") + 1); fileName = fileName.substring(fileName.indexOf("_") + 1); - const picHref = `${ - commonConfig.server_host - }file/download?savePathStr=${encodeURIComponent( - value - )}&sModelsId=100&token=${encodeURIComponent(this.props.app.token)}`; + const picHref = `${commonConfig.server_host}file/download?savePathStr=${encodeURIComponent(value)}&sModelsId=100&token=${encodeURIComponent( + this.props.app.token + )}`; const fileType = fileName .split(".") .pop() .toLowerCase(); - const previewFileList = [ - "jpg", - "png", - "jepg", - "webp", - "svg", - "bmp", - "apng", - "pdf" - ]; + const previewFileList = ["jpg", "png", "jepg", "webp", "svg", "bmp", "apng", "pdf"]; return (
{ if (fileType === "pdf") { this.setState({ pdfFileVisible: true, - pdfFileUrl: fileList[0] + pdfFileUrl: fileList[0], }); } else { this.handlePreviewImage(e, fileList); @@ -1688,7 +1362,7 @@ class CommonTableRc extends React.Component { commonFileDownloadVisible: true, commonFileDownloadList: fileList.map(item => { return { url: item, checked: false }; - }) + }), }); }} >{`附件(${fileList.length})`} @@ -1698,22 +1372,12 @@ class CommonTableRc extends React.Component { } // 生产顺序号/标条 - const sIndexNo = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === "sIndexNo" - ); + const sIndexNo = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === "sIndexNo"); if ( sIndexNo && - ![ - "slaveWyrj1", - "slaveWytf2", - "slaveWypj1", - "salveWybz1", - "slaveWyfq1" - ].includes(this.props.name) && - !["12710101117087404588200", "12710101117260270570210"].includes( - this.props.parentProps.sModelsId - ) + !["slaveWyrj1", "slaveWytf2", "slaveWypj1", "salveWybz1", "slaveWyfq1"].includes(this.props.name) && + !["12710101117087404588200", "12710101117260270570210"].includes(this.props.parentProps.sModelsId) ) { sIndexNo.render = (value, record) => { const { bClStatus, bCpStatus, bYcStatus, bWlStatus } = record; @@ -1723,27 +1387,16 @@ class CommonTableRc extends React.Component {
1
- {![ - "slaveWydj", - "slaveWytf1", - "salveWydm1", - "salveWybz3" - ].includes(this.props.name) ? ( + {!["slaveWydj", "slaveWytf1", "salveWydm1", "salveWybz3"].includes(this.props.name) ? (
@@ -1752,20 +1405,9 @@ class CommonTableRc extends React.Component { ) : ( "" )} - {![ - "slaveWydj", - "slaveWytf1", - "salveWydm1", - "salveWybz3" - ].includes(this.props.name) ? ( + {!["slaveWydj", "slaveWytf1", "salveWydm1", "salveWybz3"].includes(this.props.name) ? (
3 @@ -1773,19 +1415,8 @@ class CommonTableRc extends React.Component { ) : ( "" )} - {![ - "slaveWyfq2", - "slaveWydj", - "slaveWytf1", - "slaveWyrj2", - "slaveWyrj3", - "salveWydm1", - "salveWybz3" - ].includes(this.props.name) ? ( -
+ {!["slaveWyfq2", "slaveWydj", "slaveWytf1", "slaveWyrj2", "slaveWyrj3", "salveWydm1", "salveWybz3"].includes(this.props.name) ? ( +
4
) : ( @@ -1805,46 +1436,19 @@ class CommonTableRc extends React.Component { printStatusShowFConfigGroup.forEach(printStatusShowFConfig => { const { sDefault } = printStatusShowFConfig; if (sDefault) { - const [ - sFieldName, - sFieldName1, - sFieldName2, - sFieldName3, - sFieldName4 - ] = sDefault.split(","); - const fieldColumn = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === sFieldName - ); + const [sFieldName, sFieldName1, sFieldName2, sFieldName3, sFieldName4] = sDefault.split(","); + const fieldColumn = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === sFieldName); if (fieldColumn) { fieldColumn.render = (value, record) => { - const { - [sFieldName1]: bStatus1, - [sFieldName2]: bStatus2, - [sFieldName3]: bStatus3, - [sFieldName4]: bStatus4 - } = record; + const { [sFieldName1]: bStatus1, [sFieldName2]: bStatus2, [sFieldName3]: bStatus3, [sFieldName4]: bStatus4 } = record; return (
{value}
-
- 1 -
- {sFieldName2 && ( -
- 2 -
- )} - {sFieldName3 && ( -
- 3 -
- )} - {sFieldName4 && ( -
- 4 -
- )} +
1
+ {sFieldName2 &&
2
} + {sFieldName3 &&
3
} + {sFieldName4 &&
4
}
); @@ -1855,9 +1459,7 @@ class CommonTableRc extends React.Component { } // 动态分钟 - const iminutes = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === "iminutes" - ); + const iminutes = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === "iminutes"); if (iminutes && !["table0", "slave0"].includes(this.props.name)) { iminutes.render = (value, record) => { @@ -1906,9 +1508,7 @@ class CommonTableRc extends React.Component { // } // 动态托盘计数 - const dQty = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === "dQty" - ); + const dQty = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === "dQty"); if (dQty) { dQty.render = (value, record) => { @@ -1930,9 +1530,7 @@ class CommonTableRc extends React.Component { } // 动态托盘计数(品检正品数) - const dMesQualifiedQty = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === "dMesQualifiedQty" - ); + const dMesQualifiedQty = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === "dMesQualifiedQty"); if (dMesQualifiedQty) { dMesQualifiedQty.render = (value, record) => { @@ -1954,9 +1552,7 @@ class CommonTableRc extends React.Component { } // 动态托盘计数(品检废品数) - const dMesUnqualifiedQty = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === "dMesUnqualifiedQty" - ); + const dMesUnqualifiedQty = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === "dMesUnqualifiedQty"); if (dMesUnqualifiedQty) { dMesUnqualifiedQty.render = (value, record) => { @@ -1978,9 +1574,7 @@ class CommonTableRc extends React.Component { } // 标牌颜色 - const sLabelColor = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === "sLabelColor" - ); + const sLabelColor = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === "sLabelColor"); if (sLabelColor) { sLabelColor.render = (value = "白", record) => { @@ -1989,16 +1583,14 @@ class CommonTableRc extends React.Component { colorIndex = colorIndex === -1 ? 0 : colorIndex; return ( { const { sModelType } = this.props.parentProps; if (sModelType !== "/indexMes/productionExec") return; this.setState({ labelColorModalVisible: true, - labelColorModalRecord: record + labelColorModalRecord: record, }); }} > @@ -2009,30 +1601,19 @@ class CommonTableRc extends React.Component { } // 废品描述sWasteType - const sWasteType = [...tableColumn, ...subTableColumn].find( - item => item.dataIndex === "sWasteType" - ); + const sWasteType = [...tableColumn, ...subTableColumn].find(item => item.dataIndex === "sWasteType"); if (sWasteType) { sWasteType.render = (value, record, index) => { return (
- + ); })} - {bEmptyTableBtnsConfig ? ( - - ) : ( - "" - )} + {bEmptyTableBtnsConfig ? : ""} {props.mesCopy ? props.mesCopy({ tableName: props.name, record, index, - tableClassName: this.state.tableClassName + tableClassName: this.state.tableClassName, }) : ""} {props.mesSave ? props.mesSave() : ""} - {props.mesDel - ? props.mesDel({ tableName: props.name, record, index }) - : ""} + {props.mesDel ? props.mesDel({ tableName: props.name, record, index }) : ""}
); }, @@ -4828,151 +3938,10 @@ class CommonTableRc extends React.Component {
操作
- {/* 班组报工行车记录 */} - {["12710101117087404588200", "12710101117260270570210"].includes( - props.formId - ) && props.name === "table0" ? ( - // || - // (props.formId === "12710101117087371044360" && - // props.name === "slave0") - - ) : ( - "" - )} {props.mesAdd ? props.mesAdd({ tableName: props.name, - tableClassName: this.state.tableClassName + tableClassName: this.state.tableClassName, }) : ""} {props.choosePlate()} @@ -4980,11 +3949,9 @@ class CommonTableRc extends React.Component {
), width: tableBtnsWidth, - fixed: "right" + fixed: "right", }; - const isReverse = props.config.gdsconfigformslave?.find( - item => item.sControlName?.toLowerCase() === "operation_reverse" - ); + const isReverse = props.config.gdsconfigformslave?.find(item => item.sControlName?.toLowerCase() === "operation_reverse"); if (isReverse) { tableColumn.unshift({ ...operationCol, fixed: "left" }); } else { @@ -4994,7 +3961,7 @@ class CommonTableRc extends React.Component { /* 获取choose的props */ const chooseProcessProps = { ...this.getChooseProcessPropsTableRow(), - disabled: false + disabled: false, }; /* 获取modal的props */ const modalProps = { ...this.getModalPropsTableRow(), disabled: false }; @@ -5002,7 +3969,7 @@ class CommonTableRc extends React.Component { const modalRemarkProps = { ...this.getModalRemarkPropsTableRow(), disabled: false, - style: { display: "block", margin: "0 10px" } + style: { display: "block", margin: "0 10px" }, }; /* 获取add的props */ const addProps = { ...this.getAddPropsTableRow(), disabled: false }; @@ -5014,21 +3981,21 @@ class CommonTableRc extends React.Component { /* 通用弹窗按钮 */ const choosePopupProps = { ...this.getPopupPropsTableRow(), - disabled: false + disabled: false, }; const chooseParamProps = { ...this.getParamPropsTableRow(), - disabled: false + disabled: false, }; /* 通用弹窗按钮 */ const chooseProductProcessProps = { ...this.getChooseProductProcessPropsTableRow(), - disabled: false + disabled: false, }; /* 通用弹窗按钮 */ const chooseProductMaterialsProps = { ...this.getChooseProductMaterialsPropsTableRow(), - disabled: false + disabled: false, }; /* 获取复制全部的props */ // const copyAllProps = { ...this.getCopyAllProps(), disabled: false, style: { display: 'block', margin: '0 10px' } }; @@ -5036,24 +4003,22 @@ class CommonTableRc extends React.Component { const uploadProps = { ...this.getUploadProps(), disabled: false, - style: { margin: "0 10px", "caret-color": "transparent" } + style: { margin: "0 10px", "caret-color": "transparent" }, }; const downloadProps = { ...this.getDownProps(), disabled: false, - style: { display: "block", margin: "0 5px" } + style: { display: "block", margin: "0 5px" }, }; const { formId } = props; const { token } = props.app; const divProps = { - action: `${ - commonConfig.server_host - }file/upload?sModelsId=${formId}&token=${token}`, + action: `${commonConfig.server_host}file/upload?sModelsId=${formId}&token=${token}`, onChange: this.handleUploadChange, accept: "*/*", showUploadList: false, multiple: true, - beforeUpload: this.handleBeforeUpload + beforeUpload: this.handleBeforeUpload, }; const addIcon = props.tableProps.setAdd; /* 增加操作 */ const copyIcon = props.tableProps.setCopy; /* 复制操作 */ @@ -5061,26 +4026,14 @@ class CommonTableRc extends React.Component { const delIcon = props.tableProps.setDelete; /* 删除操作 */ const materialIcon = props.tableProps.setMaterial; /* 材料操作 */ const processIcon = props.tableProps.setProcess; /* 工序操作 */ - const materailremarkIcon = - props.tableProps.setMaterialRemark; /* 材料备注 */ + const materailremarkIcon = props.tableProps.setMaterialRemark; /* 材料备注 */ let uploadIcon = props.tableProps.setUpload; /* 上传 */ let downloadIcon = props.tableProps.setDownload; /* 下载 */ let headPopup = false; /* 表头放大镜 */ - const bShowTreeAdd = - props.tableProps.bShowTreeAdd && - this.findIsExistByControlName(props, "BtnAdd"); /* 添加树节点 */ - const bShowTreeAddChild = - props.tableProps.bShowTreeAddChild && - this.findIsExistByControlName( - props, - "BtnAddChildNode" - ); /* 添加树节点 */ - const bShowTreeDel = - props.tableProps.bShowTreeDel && - this.findIsExistByControlName(props, "BtnDel"); /* 添加树节点 */ - const bShowTreeCopyAll = - props.tableProps.bShowTreeCopyAll && - this.findIsExistByControlName(props, "BtnCopyAll"); /* 添加树节点 */ + const bShowTreeAdd = props.tableProps.bShowTreeAdd && this.findIsExistByControlName(props, "BtnAdd"); /* 添加树节点 */ + const bShowTreeAddChild = props.tableProps.bShowTreeAddChild && this.findIsExistByControlName(props, "BtnAddChildNode"); /* 添加树节点 */ + const bShowTreeDel = props.tableProps.bShowTreeDel && this.findIsExistByControlName(props, "BtnDel"); /* 添加树节点 */ + const bShowTreeCopyAll = props.tableProps.bShowTreeCopyAll && this.findIsExistByControlName(props, "BtnCopyAll"); /* 添加树节点 */ const exitIcon = props.tableProps.setExit; /* 退出操作 */ let bShowProductProcess = false; /* 选择成品工序 */ if ( @@ -5088,8 +4041,7 @@ class CommonTableRc extends React.Component { commonUtils.isNotEmptyObject(props.tableProps) && props.tableProps.bShowProductProcess !== undefined ) { - bShowProductProcess = - props.tableProps.bShowProductProcess; /* 选择成品工序 */ + bShowProductProcess = props.tableProps.bShowProductProcess; /* 选择成品工序 */ } let bShowProductMaterials = false; /* 选择成品材料 */ if ( @@ -5097,19 +4049,14 @@ class CommonTableRc extends React.Component { commonUtils.isNotEmptyObject(props.tableProps) && props.tableProps.bShowProductMaterials !== undefined ) { - bShowProductMaterials = - props.tableProps.bShowProductMaterials; /* 选择成品工序 */ + bShowProductMaterials = props.tableProps.bShowProductMaterials; /* 选择成品工序 */ } /* 操作栏设置上传 */ uploadIcon = this.findVisibleControlName(this.props, "BtnSetUpload"); downloadIcon = this.findVisibleControlName(this.props, "BtnSetDownload"); - headPopup = this.findVisibleControlName( - this.props, - "BtnHeadPopup" - ); /* 表头放大镜 */ + headPopup = this.findVisibleControlName(this.props, "BtnHeadPopup"); /* 表头放大镜 */ - const setNoCommonOperate = - props.tableProps.setNoCommonOperate; /* 没有默认的增加删除按钮 */ + const setNoCommonOperate = props.tableProps.setNoCommonOperate; /* 没有默认的增加删除按钮 */ let operateWidth = 0; if (addProps.style.display === "inline-block") { @@ -5175,18 +4122,13 @@ class CommonTableRc extends React.Component { operateWidth += 20; } let scrollWidth = 18; - if ( - commonUtils.isNotEmptyStr(this.props.tableProps.f) && - this.props.tableProps.AutoTableHeight.indexOf("calc") === -1 - ) { + if (commonUtils.isNotEmptyStr(this.props.tableProps.f) && this.props.tableProps.AutoTableHeight.indexOf("calc") === -1) { /* 固定列计算 */ scrollWidth = 0; } - const tableAllWidth = - tableWidth + CheckBoxWidth + operateWidth + lastRowOld; + const tableAllWidth = tableWidth + CheckBoxWidth + operateWidth + lastRowOld; if (commonUtils.isNotEmptyObject(props.tableProps.CalLastWidth)) { - this.tableContentWidth = - props.tableProps.CalLastWidth; /* 解决材料与工艺Modal最后一行问题 */ + this.tableContentWidth = props.tableProps.CalLastWidth; /* 解决材料与工艺Modal最后一行问题 */ scrollWidth = 18; } let lastRow = 0; @@ -5194,13 +4136,7 @@ class CommonTableRc extends React.Component { /* 取后台配置原始宽度 不进行最后一列计算 */ tableColumn[tableColumn.length - 1].width = lastRowOld; } else if (tableAllWidth < this.tableContentWidth) { - lastRow = - this.tableContentWidth - - tableWidth - - operateWidth - - CheckBoxWidth - - scrollWidth - - 1; // 1像素为border宽度; + lastRow = this.tableContentWidth - tableWidth - operateWidth - CheckBoxWidth - scrollWidth - 1; // 1像素为border宽度; if (lastRow > 0 && tableColumn.length > 0) { delete tableColumn[tableColumn.length - 1].width; // tableColumn[tableColumn.length - 1].width = lastRow;; @@ -5229,26 +4165,12 @@ class CommonTableRc extends React.Component { let operateTreeCopyAll = null; let operateTreeAddChild = null; let operateExit = null; - const setAdd = commonFunc.showMessage( - props.app.commonConst, - "setAdd" - ); /* 新增s */ - const setCopy = commonFunc.showMessage( - props.app.commonConst, - "setCopy" - ); /* 复制 */ - const setDelete = commonFunc.showMessage( - props.app.commonConst, - "setDelete" - ); /* 删除 */ - const setCopyAll = commonFunc.showMessage( - props.app.commonConst, - "setCopyAll" - ); /* 复制部件 */ + const setAdd = commonFunc.showMessage(props.app.commonConst, "setAdd"); /* 新增s */ + const setCopy = commonFunc.showMessage(props.app.commonConst, "setCopy"); /* 复制 */ + const setDelete = commonFunc.showMessage(props.app.commonConst, "setDelete"); /* 删除 */ + const setCopyAll = commonFunc.showMessage(props.app.commonConst, "setCopyAll"); /* 复制部件 */ let { rowTag } = record; /* 锁定行标识 */ - const { - sWorkOrderUsed - } = record; /* 订单被工单占用,则该行不能修改、删除 */ + const { sWorkOrderUsed } = record; /* 订单被工单占用,则该行不能修改、删除 */ if (commonUtils.isNotEmptyObject(sWorkOrderUsed)) { record.rowTag = 1; rowTag = 1; @@ -5259,28 +4181,11 @@ class CommonTableRc extends React.Component { /** 树节点添加 */ if (bShowTreeAdd) { operateTreeAdd = ( - + {props.enabled ? ( - + ) : ( - + )} ); @@ -5288,28 +4193,11 @@ class CommonTableRc extends React.Component { /** 树节点删除 */ if (bShowTreeDel) { operateTreeDel = ( - + {props.enabled ? ( - + ) : ( - + )} ); @@ -5321,26 +4209,12 @@ class CommonTableRc extends React.Component { title="添加子级" alt="添加子级" style={{ margin: "0 10px" }} - onClick={ - props.enabled - ? this.handleTreeAddChild.bind(this, index) - : null - } + onClick={props.enabled ? this.handleTreeAddChild.bind(this, index) : null} > {props.enabled ? ( - + ) : ( - + )} ); @@ -5352,26 +4226,12 @@ class CommonTableRc extends React.Component { title="复制全部" alt="复制全部" style={{ margin: "0 10px" }} - onClick={ - props.enabled - ? this.handleTreeCopyAll.bind(this, index) - : null - } + onClick={props.enabled ? this.handleTreeCopyAll.bind(this, index) : null} > {props.enabled ? ( - + ) : ( - + )} ); @@ -5382,28 +4242,12 @@ class CommonTableRc extends React.Component { - {props.enabled || - this.findIsUpdByControlName(this.props, "BtnAdd") ? ( - + {props.enabled || this.findIsUpdByControlName(this.props, "BtnAdd") ? ( + ) : ( - + )} ); @@ -5412,29 +4256,13 @@ class CommonTableRc extends React.Component { {" "} - {props.enabled || - this.findIsUpdByControlName(this.props, "BtnAdd") ? ( - + {props.enabled || this.findIsUpdByControlName(this.props, "BtnAdd") ? ( + ) : ( - + )} ); @@ -5448,64 +4276,29 @@ class CommonTableRc extends React.Component { /** 放置复制图标 */ if (!commonUtils.isEmpty(copyIcon)) { operateCopy = ( - + {props.enabled ? ( - + ) : ( - + )} ); } else { operateCopy = ( - + {" "} {props.enabled ? ( - + ) : ( - + )} ); // if (uploadIcon) { // operateCopy = '';/* 通用上传不用复制 */ // } - if ( - setNoCommonOperate || - this.props.name === "sWorkOrderParamList" - ) { + if (setNoCommonOperate || this.props.name === "sWorkOrderParamList") { operateCopy = ""; } } @@ -5516,60 +4309,27 @@ class CommonTableRc extends React.Component { title={setCopyAll} {...copyAllProps} onClick={ - props.enabled && rowTag !== 1 - ? this.copyAllTbRow.bind(this, index) - : this.handleTbRowUsed.bind(this, index, record, "copyAll") + props.enabled && rowTag !== 1 ? this.copyAllTbRow.bind(this, index) : this.handleTbRowUsed.bind(this, index, record, "copyAll") } > {props.enabled && rowTag !== 1 ? ( - + ) : ( - + )} ); } else { operateCopyAll = ( - - {props.enabled || - this.findIsUpdByControlName(this.props, "BtnCopyAll") ? ( - + + {props.enabled || this.findIsUpdByControlName(this.props, "BtnCopyAll") ? ( + ) : ( - + )} ); - if ( - setNoCommonOperate || - this.props.bHideCopyAll || - this.props.name === "sWorkOrderParamList" - ) { + if (setNoCommonOperate || this.props.bHideCopyAll || this.props.name === "sWorkOrderParamList") { operateCopyAll = ""; } } @@ -5580,25 +4340,13 @@ class CommonTableRc extends React.Component { title={setDelete} {...delProps} onClick={ - props.enabled && rowTag !== 1 - ? this.delTbRow.bind(this, index, record) - : this.handleTbRowUsed.bind(this, index, record, "del") + props.enabled && rowTag !== 1 ? this.delTbRow.bind(this, index, record) : this.handleTbRowUsed.bind(this, index, record, "del") } > {props.enabled && rowTag !== 1 ? ( - + ) : ( - + )} ); @@ -5607,28 +4355,12 @@ class CommonTableRc extends React.Component { - {props.enabled || - this.findIsUpdByControlName(this.props, "BtnDel") ? ( - + {props.enabled || this.findIsUpdByControlName(this.props, "BtnDel") ? ( + ) : ( - + )} ); @@ -5638,10 +4370,7 @@ class CommonTableRc extends React.Component { } /** 放置选择材料图标 */ if (!commonUtils.isEmpty(materialIcon)) { - const setMaterial = commonFunc.showMessage( - props.app.commonConst, - "setMaterial" - ); /* 选择材料 */ + const setMaterial = commonFunc.showMessage(props.app.commonConst, "setMaterial"); /* 选择材料 */ operateMaterial = ( {props.enabled && rowTag !== 1 ? ( - + ) : ( - + )} ); } /** 放置材料备注图标 */ if (!commonUtils.isEmpty(materailremarkIcon)) { - const setMaterailRemark = commonFunc.showMessage( - props.app.commonConst, - "setMaterailRemark" - ); /* 选择材料工艺 */ + const setMaterailRemark = commonFunc.showMessage(props.app.commonConst, "setMaterailRemark"); /* 选择材料工艺 */ operateMaterailRemark = ( - - + + ); } /** 放置选择工序材料图标 */ if (!commonUtils.isEmpty(processIcon)) { - const setProcess = commonFunc.showMessage( - props.app.commonConst, - "setProcess" - ); /* 选择工序 */ + const setProcess = commonFunc.showMessage(props.app.commonConst, "setProcess"); /* 选择工序 */ operateProcess = ( - + {props.enabled ? ( - + ) : ( - + )} ); } /** 选择成品工序图标 */ if (bShowProductProcess) { - const setProductProcess = commonFunc.showMessage( - props.app.commonConst, - "setProductProcess" - ); /* 选择成品工序 */ + const setProductProcess = commonFunc.showMessage(props.app.commonConst, "setProductProcess"); /* 选择成品工序 */ operateProductProcess = ( {props.enabled ? ( - + ) : ( - + )} ); } /** 选择成品材料图标 */ if (bShowProductMaterials) { - const setProductMaterials = commonFunc.showMessage( - props.app.commonConst, - "setProductMaterials" - ); /* 选择成品材料 */ + const setProductMaterials = commonFunc.showMessage(props.app.commonConst, "setProductMaterials"); /* 选择成品材料 */ operateProductMaterials = ( {props.enabled ? ( - + ) : ( - + )} ); } if (downloadIcon) { - const setDownload = commonFunc.showMessage( - props.app.commonConst, - "setDownload" - ); /* 下载 */ + const setDownload = commonFunc.showMessage(props.app.commonConst, "setDownload"); /* 下载 */ operateDownload = ( - + {} ); } if (this.isPopupShow) { - const setDownload = commonFunc.showMessage( - props.app.commonConst, - "setPopup" - ); /* 弹窗 */ + const setDownload = commonFunc.showMessage(props.app.commonConst, "setPopup"); /* 弹窗 */ operatePopupModal = ( - + {props.enabled ? ( - + ) : ( - + )} ); } if (this.isParamShow) { - const setParam = commonUtils.isNotEmptyObject( - commonFunc.showMessage(props.app.commonConst, "setParam") - ) + const setParam = commonUtils.isNotEmptyObject(commonFunc.showMessage(props.app.commonConst, "setParam")) ? commonFunc.showMessage(props.app.commonConst, "setParam") : "查看参数"; /* 参数 */ operateParamModal = ( - - { - 查看工艺参数 - } + + {查看工艺参数} ); } @@ -5884,10 +4482,7 @@ class CommonTableRc extends React.Component { if (exitIcon) { const setExit = "退出"; operateExit = ( - + {} ); @@ -5899,7 +4494,7 @@ class CommonTableRc extends React.Component { width: "100%", height: "100%", display: "flex", - justifyContent: !exitIcon ? "right" : "center" + justifyContent: !exitIcon ? "right" : "center", }} className="operate-bar" > @@ -5924,15 +4519,14 @@ class CommonTableRc extends React.Component { ); }, title: () => - this.props.setOpterationColumn === "Y" && - this.getTableFilterData() === 0 ? ( + this.props.setOpterationColumn === "Y" && this.getTableFilterData() === 0 ? ( 操作{" "} @@ -5955,73 +4549,27 @@ class CommonTableRc extends React.Component { this.uploadRef1.setAttribute("contenteditable", "true"); }} > - {this.props.enabled ? ( - - ) : ( - - )} + {this.props.enabled ? : } ) : ( - - {props.enabled || - this.findIsUpdByControlName(this.props, "BtnAdd") ? ( - + + {props.enabled || this.findIsUpdByControlName(this.props, "BtnAdd") ? ( + ) : ( - + )} {headPopup ? ( - {props.enabled || - this.findIsUpdByControlName( - this.props, - "BtnHeadPopup" - ) ? ( - + {props.enabled || this.findIsUpdByControlName(this.props, "BtnHeadPopup") ? ( + ) : ( - + )} ) : ( @@ -6051,11 +4599,7 @@ class CommonTableRc extends React.Component { this.uploadRef1.setAttribute("contenteditable", "true"); }} > - {this.props.enabled ? ( - - ) : ( - - )} + {this.props.enabled ? : } @@ -6064,32 +4608,11 @@ class CommonTableRc extends React.Component { {" "} 操作{" "} {headPopup ? ( - - {props.enabled || - this.findIsUpdByControlName(this.props, "BtnHeadPopup") ? ( - + + {props.enabled || this.findIsUpdByControlName(this.props, "BtnHeadPopup") ? ( + ) : ( - + )} ) : ( @@ -6099,16 +4622,12 @@ class CommonTableRc extends React.Component { ), width: operateWidth + "px", // fixed: commonUtils.isNotEmptyObject(this.props.tableProps.AutoTableHeight) ? 'right' : false, - fixed: "right" + fixed: "right", }); } else { const tableAllWidth = tableWidth + lastRowOld + CheckBoxWidth; if (tableAllWidth < this.tableContentWidth) { - const lastRow = - this.tableContentWidth - - tableWidth - - CheckBoxWidth - - 18; /* ant-table-body的div宽度-操作列宽度-选择列宽度36 */ + const lastRow = this.tableContentWidth - tableWidth - CheckBoxWidth - 18; /* ant-table-body的div宽度-操作列宽度-选择列宽度36 */ if (lastRow > 0 && tableColumn.length > 0 && lastRow > lastRowOld) { delete tableColumn[tableColumn.length - 1].width; // tableColumn[tableColumn.length - 1].width = lastRow; @@ -6121,32 +4640,13 @@ class CommonTableRc extends React.Component { getColumnSearchProps = (iIndex, column, type, props, search) => { const returnProps = {}; - if ( - props.onFilterData !== undefined && - iIndex === 0 && - type === "filter" && - !this.resize - ) { - returnProps.onFilter = props.onFilterData.bind( - this, - props.name, - column.dataIndex - ); - } else if ( - column.dataIndex !== undefined && - column.bFind && - type === "filter" && - !this.resize - ) { + if (props.onFilterData !== undefined && iIndex === 0 && type === "filter" && !this.resize) { + returnProps.onFilter = props.onFilterData.bind(this, props.name, column.dataIndex); + } else if (column.dataIndex !== undefined && column.bFind && type === "filter" && !this.resize) { if (!search) { return false; } - returnProps.filterDropdown = ({ - setSelectedKeys, - selectedKeys, - confirm, - clearFilters - }) => { + returnProps.filterDropdown = ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => { return (
- setSelectedKeys(e.target.value ? [e.target.value] : []) - } - onPressEnter={() => - this.handleSearch( - selectedKeys, - confirm, - column.dataIndex, - clearFilters - ) - } + onChange={e => setSelectedKeys(e.target.value ? [e.target.value] : [])} + onPressEnter={() => this.handleSearch(selectedKeys, confirm, column.dataIndex, clearFilters)} style={{ marginBottom: 8 }} /> -
); }; - returnProps.filterIcon = filtered => ( - - ); + returnProps.filterIcon = filtered => ; returnProps.onFilterDropdownVisibleChange = visible => { if (visible) { setTimeout(() => this.searchInput.select()); @@ -6210,37 +4688,23 @@ class CommonTableRc extends React.Component { }; returnProps.onFilter = (value, record) => { let sValue = record[column.dataIndex]; - const dropdownData = commonUtils.getStoreDropDownData( - props.formId, - props.name, - column.dataIndex - ); + const dropdownData = commonUtils.getStoreDropDownData(props.formId, props.name, column.dataIndex); if (commonUtils.isNotEmptyArr(dropdownData)) { - const sId = commonUtils.isEmpty(dropdownData[0].sSlaveId) - ? "sId" - : "sSlaveId"; - const iDropdownIndex = dropdownData.findIndex( - item => item[sId] === record[column.dataIndex] - ); + const sId = commonUtils.isEmpty(dropdownData[0].sSlaveId) ? "sId" : "sSlaveId"; + const iDropdownIndex = dropdownData.findIndex(item => item[sId] === record[column.dataIndex]); if (iDropdownIndex > -1) { const sFieldName = Object.keys(dropdownData[iDropdownIndex])[0]; sValue = dropdownData[iDropdownIndex][sFieldName]; } } else { - const staticDropdownData = commonUtils.getStoreStaticDropDownData( - props.formId, - column.dataIndex - ); + const staticDropdownData = commonUtils.getStoreStaticDropDownData(props.formId, column.dataIndex); if (commonUtils.isNotEmptyObject(staticDropdownData)) { sValue = staticDropdownData[sValue]; } } // 核检废过滤板号特殊处理 - if ( - location.pathname?.startsWith("/indexPad") && - column.dataIndex === "sBoardNo" - ) { + if (location.pathname?.startsWith("/indexPad") && column.dataIndex === "sBoardNo") { return sValue.toString().toLowerCase() === value.toLowerCase(); } @@ -6260,18 +4724,10 @@ class CommonTableRc extends React.Component { returnProps.render = (text, record, index) => { // 此处添加了row的index,原先一次渲染中包含searchProps的行的iIndex会相同,无法对行判断进行单元格合并 let sValue = record[column.dataIndex]; - const dropdownData = commonUtils.getStoreDropDownData( - props.formId, - props.name, - column.dataIndex - ); + const dropdownData = commonUtils.getStoreDropDownData(props.formId, props.name, column.dataIndex); if (commonUtils.isNotEmptyArr(dropdownData)) { - const sId = commonUtils.isEmpty(dropdownData[0].sSlaveId) - ? "sId" - : "sSlaveId"; - const iDropdownIndex = dropdownData.findIndex( - item => item[sId] === record[column.dataIndex] - ); + const sId = commonUtils.isEmpty(dropdownData[0].sSlaveId) ? "sId" : "sSlaveId"; + const iDropdownIndex = dropdownData.findIndex(item => item[sId] === record[column.dataIndex]); if (text !== undefined && iDropdownIndex > -1) { const sFieldName = Object.keys(dropdownData[iDropdownIndex])[0]; @@ -6290,19 +4746,11 @@ class CommonTableRc extends React.Component { highlightStyle={{ backgroundColor: "#ffc069", padding: 0 }} searchWords={[this.state.searchText]} autoEscape - textToHighlight={ - commonUtils.isEmpty(sValue) ? "" : sValue.toString() - } + textToHighlight={commonUtils.isEmpty(sValue) ? "" : sValue.toString()} /> ); } else { - return this.bindShowType( - props, - text, - record, - column.dataIndex, - index - ); + return this.bindShowType(props, text, record, column.dataIndex, index); } }; } @@ -6311,19 +4759,15 @@ class CommonTableRc extends React.Component { }; /** 获取ShowType的props */ - getShowTypeProps = (props, text, record, sName) => { + getShowTypeProps = (props, text, record, sName, showConfigCostom) => { const { enabled, sUseInfo, app, masterData } = props; /* 待用数据 */ - const showConfig = this.getShowConfig(props, sName); /* 配置信息 */ + const showConfig = showConfigCostom || this.getShowConfig(props, sName); /* 配置信息 */ if (commonUtils.isEmptyObject(showConfig)) { console.log("渲染失败:", showConfig, sName); } /* 返回值 */ - let enabledNew = - enabled && - !showConfig.bReadonly && - !record.bInvalid && - commonUtils.isEmpty(sUseInfo); + let enabledNew = enabled && !showConfig.bReadonly && !record.bInvalid && commonUtils.isEmpty(sUseInfo); if (showConfig.iTag === 1) { enabledNew = false; } else if (showConfig.iTag === 3) { @@ -6333,8 +4777,6 @@ class CommonTableRc extends React.Component { } else if (record.rowTag === 1) { /* 当rowTag为1时,锁定该行不可编辑 */ enabledNew = false; - } else if (location.pathname.includes("indexPad") && sName === "sTrayNo" && record.sTrayNo) { - enabledNew = false; } if (sName === "sLabelColor") { @@ -6347,23 +4789,15 @@ class CommonTableRc extends React.Component { /* 红冲中的单据 不可修改 */ if ( commonUtils.isNotEmptyObject(masterData) && - (commonUtils.isNotEmptyObject(masterData.sMinusSrcId) || - commonUtils.isNotEmptyObject(masterData.sMinusUsed)) + (commonUtils.isNotEmptyObject(masterData.sMinusSrcId) || commonUtils.isNotEmptyObject(masterData.sMinusUsed)) ) { // 红冲中可修改的字段 - const iIndex = props.config.gdsconfigformslave.findIndex( - item => - item.sName === sName && item.sControlName.includes("portionField") - ); + const iIndex = props.config.gdsconfigformslave.findIndex(item => item.sName === sName && item.sControlName.includes("portionField")); enabledNew = iIndex !== -1; } const showConfigAll = this.getColorConfig(); /* 拿到颜色配置json */ - const showConfigArr = commonUtils.isNotEmptyArr(showConfigAll) - ? showConfigAll.filter(item => item.sName === sName) - : []; /* 找到该字段颜色配置 */ - const colorConditon = commonUtils.isNotEmptyArr(showConfigArr) - ? showConfigArr[0].sColorTerms - : null; + const showConfigArr = commonUtils.isNotEmptyArr(showConfigAll) ? showConfigAll.filter(item => item.sName === sName) : []; /* 找到该字段颜色配置 */ + const colorConditon = commonUtils.isNotEmptyArr(showConfigArr) ? showConfigArr[0].sColorTerms : null; let styleColorArr = ""; if (commonUtils.isNotEmptyObject(colorConditon)) { let colorConditionArr = ""; @@ -6372,9 +4806,7 @@ class CommonTableRc extends React.Component { } catch (e) { colorConditionArr = ""; } - colorConditionArr = Array.isArray(colorConditionArr) - ? colorConditionArr - : ""; + colorConditionArr = Array.isArray(colorConditionArr) ? colorConditionArr : ""; for (const item of colorConditionArr) { let styleColor = ""; const { column, condition, conditionValue, background, isRow } = item; @@ -6382,29 +4814,19 @@ class CommonTableRc extends React.Component { /* 根据配置设置单元格颜色 */ if (column === sName && !commonUtils.isEmpty(record[column])) { if (condition === "=") { - styleColor = - record[column] === conditionValue - ? `SetCell_${background}` - : ""; + styleColor = record[column] === conditionValue ? `SetCell_${background}` : ""; } else if (condition === "like") { if (sName.substring(0, 1) === "s") { - styleColor = - record[column].indexOf(conditionValue) > -1 - ? `SetCell_${color}` - : ""; + styleColor = record[column].indexOf(conditionValue) > -1 ? `SetCell_${color}` : ""; } } else if (condition === ">") { - styleColor = - record[column] > conditionValue ? `SetCell_${background}` : ""; + styleColor = record[column] > conditionValue ? `SetCell_${background}` : ""; } else if (condition === ">=") { - styleColor = - record[column] >= conditionValue ? `SetCell_${background}` : ""; + styleColor = record[column] >= conditionValue ? `SetCell_${background}` : ""; } else if (condition === "<") { - styleColor = - record[column] < conditionValue ? `SetCell_${background}` : ""; + styleColor = record[column] < conditionValue ? `SetCell_${background}` : ""; } else if (condition === "<=") { - styleColor = - record[column] <= conditionValue ? `SetCell_${background}` : ""; + styleColor = record[column] <= conditionValue ? `SetCell_${background}` : ""; } } } @@ -6428,8 +4850,7 @@ class CommonTableRc extends React.Component { tableConfig: props.config /* 表格的所有配置 */, formId: this.formId /* 窗体Id(数据格式:字符串) */, slaveConfig: this.props.config, - onChange: - props.onDataChange /* 表单数据改变事件方法(数据格式:函数) */, + onChange: props.onDataChange /* 表单数据改变事件方法(数据格式:函数) */, onKeyDown: props.onKeyDown, onContextMenu: props.onContextMenu /* 字段右侧单击事件 */, bTable: true /* 是否为表格数据 */, @@ -6453,20 +4874,17 @@ class CommonTableRc extends React.Component { formRoute: props.formRoute, customDropData: props.customDropData, onExecInstructSet: props.parentProps.onExecInstructSet, - ...addState + ...addState, // handleSum: this.handleSum, }; }; /** 获取上传控件的props */ getUploadProps = () => { return { - disabled: - this.props.name === "picFile" - ? !this.findIsUpdByControlName(this.props, "BtnUpload") - : !this.props.enabled /* 是否可用 */, + disabled: this.props.name === "picFile" ? !this.findIsUpdByControlName(this.props, "BtnUpload") : !this.props.enabled /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock(this.isUploadShow) - } /* 是否显示 */ + display: commonUtils.convertBooleanToDisplayBlock(this.isUploadShow), + } /* 是否显示 */, }; }; /** 获取下载控件的props */ @@ -6474,8 +4892,8 @@ class CommonTableRc extends React.Component { return { disabled: !this.props.enabled /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock(this.isDownloadShow) - } /* 是否显示 */ + display: commonUtils.convertBooleanToDisplayBlock(this.isDownloadShow), + } /* 是否显示 */, }; }; /** 获取查看控件的props */ @@ -6483,21 +4901,19 @@ class CommonTableRc extends React.Component { return { disabled: !this.props.enabled /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock(this.isLookShow) + display: commonUtils.convertBooleanToDisplayBlock(this.isLookShow), } /* 是否显示 */, - onClick: this.handleLookRow /* 点击事件 */ + onClick: this.handleLookRow /* 点击事件 */, }; }; /** 获取添加控件的props */ getAddProps = () => { return { - disabled: - !this.props.enabled || - this.findIsUpdByControlName(this.props, "BtnAdd") /* 是否可用 */, + disabled: !this.props.enabled || this.findIsUpdByControlName(this.props, "BtnAdd") /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock(this.isAddShow) + display: commonUtils.convertBooleanToDisplayBlock(this.isAddShow), } /* 是否显示 */, - onClick: this.handleAddRow /* 点击事件 */ + onClick: this.handleAddRow /* 点击事件 */, }; }; getModalPropsTableRow = () => { @@ -6505,69 +4921,59 @@ class CommonTableRc extends React.Component { disabled: !this.props.enabled /* 是否可用 */, style: { display: commonUtils.convertBooleanToDisplayBlock(this.isModalShow), - margin: "0 10px" - } /* 是否显示 */ + margin: "0 10px", + } /* 是否显示 */, }; }; getModalRemarkPropsTableRow = () => { return { disabled: !this.props.enabled /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock( - this.isModalRemarkShow - ) - } /* 是否显示 */ + display: commonUtils.convertBooleanToDisplayBlock(this.isModalRemarkShow), + } /* 是否显示 */, }; }; getChooseProcessPropsTableRow = () => { return { disabled: !this.props.enabled /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock( - this.isChooseProcessShow - ), - margin: "0 10px" - } /* 是否显示 */ + display: commonUtils.convertBooleanToDisplayBlock(this.isChooseProcessShow), + margin: "0 10px", + } /* 是否显示 */, }; }; getChooseProductProcessPropsTableRow = () => { return { disabled: !this.props.enabled /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock( - this.isChooseProductProcess - ), - margin: "0 10px" - } /* 是否显示 */ + display: commonUtils.convertBooleanToDisplayBlock(this.isChooseProductProcess), + margin: "0 10px", + } /* 是否显示 */, }; }; getChooseProductMaterialsPropsTableRow = () => { return { disabled: !this.props.enabled /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock( - this.isChooseProductMaterials - ), - margin: "0 10px" - } /* 是否显示 */ + display: commonUtils.convertBooleanToDisplayBlock(this.isChooseProductMaterials), + margin: "0 10px", + } /* 是否显示 */, }; }; getAddPropsTableRow = () => { return { - disabled: - !this.props.enabled || - !this.findIsUpdByControlName(this.props, "BtnAdd") /* 是否可用 */, + disabled: !this.props.enabled || !this.findIsUpdByControlName(this.props, "BtnAdd") /* 是否可用 */, style: { display: commonUtils.convertBooleanToDisplayBlock(this.isAddShow), - margin: "0 10px" - } /* 是否显示 */ + margin: "0 10px", + } /* 是否显示 */, }; }; getHeadPropsTableRow = () => { return { disabled: false /* 是否可用 */, - style: { margin: "0 0" } /* 是否显示 */ + style: { margin: "0 0" } /* 是否显示 */, }; }; @@ -6577,9 +4983,9 @@ class CommonTableRc extends React.Component { disabled: !this.props.enabled /* 是否可用 */, style: { display: commonUtils.convertBooleanToDisplayBlock(this.isCopyShow), - margin: "0 10px" + margin: "0 10px", } /* 是否显示 */, - onClick: this.handleCopyRow /* 点击事件 */ + onClick: this.handleCopyRow /* 点击事件 */, }; }; @@ -6589,22 +4995,20 @@ class CommonTableRc extends React.Component { disabled: !this.props.enabled /* 是否可用 */, style: { display: commonUtils.convertBooleanToDisplayBlock(this.isCopyAllShow), - margin: "0 10px" + margin: "0 10px", } /* 是否显示 */, - onClick: this.handleCopyAllRow /* 点击事件 */ + onClick: this.handleCopyAllRow /* 点击事件 */, }; }; /** 获取删除控件的props */ getDelProps = () => { return { - disabled: - !this.props.enabled || - this.findIsUpdByControlName(this.props, "BtnDel") /* 是否可用 */, + disabled: !this.props.enabled || this.findIsUpdByControlName(this.props, "BtnDel") /* 是否可用 */, style: { - display: commonUtils.convertBooleanToDisplayBlock(this.isDelShow) + display: commonUtils.convertBooleanToDisplayBlock(this.isDelShow), } /* 是否显示 */, className: styles.del /* 样式名 */, - onClick: this.handleDelRow /* 点击事件 */ + onClick: this.handleDelRow /* 点击事件 */, }; }; @@ -6613,9 +5017,9 @@ class CommonTableRc extends React.Component { disabled: !this.props.enabled /* 是否可用 */, style: { display: commonUtils.convertBooleanToDisplayBlock(this.isDelShow), - margin: "0 10px" + margin: "0 10px", } /* 是否显示 */, - className: styles.del /* 样式名 */ + className: styles.del /* 样式名 */, }; }; getPopupPropsTableRow = () => { @@ -6623,8 +5027,8 @@ class CommonTableRc extends React.Component { disabled: !this.props.enabled /* 是否可用 */, style: { display: commonUtils.convertBooleanToDisplayBlock(this.isPopupShow), - margin: "0 10px" - } /* 是否显示 */ + margin: "0 10px", + } /* 是否显示 */, }; }; @@ -6632,7 +5036,7 @@ class CommonTableRc extends React.Component { return { disabled: !this.props.enabled /* 是否可用 */, // style: { display: commonUtils.convertBooleanToDisplayBlock(this.isParamShow), margin: '0 10px' }, /* 是否显示 */ - style: { display: "block", margin: "0 10px" } /* 是否显示 */ + style: { display: "block", margin: "0 10px" } /* 是否显示 */, }; }; /** 生成单元格stateMap */ @@ -6672,24 +5076,16 @@ class CommonTableRc extends React.Component { let bPagination = true; /* 默认表格分页s */ let pagination = {}; if (commonUtils.isNotEmptyObject(this.props)) { - bPagination = - commonUtils.isNotEmptyObject(this.props.tableProps) && - commonUtils.isNotEmptyObject(this.props.tableProps.pagination); + bPagination = commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination); pagination = this.props.tableProps.pagination; } let data; if (commonUtils.isNotEmptyArr(this.tableFilterData)) { const sSlaveIdArr = this.tableFilterData.map(item => item.sSlaveId); - data = this.props.data.filter(item => - sSlaveIdArr.includes(item.sSlaveId) - ); + data = this.props.data.filter(item => sSlaveIdArr.includes(item.sSlaveId)); } else if (bPagination) { - const { pageSize, current } = commonUtils.isNotEmptyObject( - this.curPagination - ) - ? this.curPagination - : pagination; + const { pageSize, current } = commonUtils.isNotEmptyObject(this.curPagination) ? this.curPagination : pagination; this.curPagination = {}; // 如果数据条数大于每页条数,说明是假分页,要截取当前页数据 if (this.props.data && pageSize && this.props.data.length > pageSize) { @@ -6723,12 +5119,8 @@ class CommonTableRc extends React.Component { } } data.forEach((item, index) => { - const mergeCellData = config.filter( - item => item.sName === "sMergeCellFiled" - ); /* 查找合并单元格的基准字段 */ - const sMergeCellFiled = commonUtils.isNotEmptyArr(mergeCellData) - ? mergeCellData[0].sActiveKey - : ""; /* 基准字段 */ + const mergeCellData = config.filter(item => item.sName === "sMergeCellFiled"); /* 查找合并单元格的基准字段 */ + const sMergeCellFiled = commonUtils.isNotEmptyArr(mergeCellData) ? mergeCellData[0].sActiveKey : ""; /* 基准字段 */ if (index === 0 && commonUtils.isNotEmptyArr(this.mergeCellList)) { item.sColor = ""; } @@ -6741,9 +5133,7 @@ class CommonTableRc extends React.Component { if ( item[key] !== "" && item[key] === prevData[key] && - (commonUtils.isNotEmptyObject(sMergeCellFiled) - ? item[sMergeCellFiled] === prevData[sMergeCellFiled] - : true) + (commonUtils.isNotEmptyObject(sMergeCellFiled) ? item[sMergeCellFiled] === prevData[sMergeCellFiled] : true) ) { if (!obj[key]) { obj[key] = []; @@ -6788,12 +5178,8 @@ class CommonTableRc extends React.Component { this.curSlaveInfoData.forEach((item, index) => { const mergeCellData = this.props.slaveInfo.config && - this.props.slaveInfo.config.gdsconfigformslave.filter( - item => item.sName === "sMergeCellFiled" - ); /* 查找合并单元格的基准字段 */ - const sMergeCellFiled = commonUtils.isNotEmptyArr(mergeCellData) - ? mergeCellData[0].sActiveKey - : ""; /* 基准字段 */ + this.props.slaveInfo.config.gdsconfigformslave.filter(item => item.sName === "sMergeCellFiled"); /* 查找合并单元格的基准字段 */ + const sMergeCellFiled = commonUtils.isNotEmptyArr(mergeCellData) ? mergeCellData[0].sActiveKey : ""; /* 基准字段 */ // 第一条数据不需要检测 if (index !== 0) { const prevData = this.curSlaveInfoData[index - 1]; @@ -6802,9 +5188,7 @@ class CommonTableRc extends React.Component { if ( item[key] !== "" && item[key] === prevData[key] && - (commonUtils.isNotEmptyObject(sMergeCellFiled) - ? item[sMergeCellFiled] === prevData[sMergeCellFiled] - : true) + (commonUtils.isNotEmptyObject(sMergeCellFiled) ? item[sMergeCellFiled] === prevData[sMergeCellFiled] : true) ) { if (!obj[key]) { obj[key] = []; @@ -6867,10 +5251,7 @@ class CommonTableRc extends React.Component { const { rowTag, sWorkorderNo } = record; const { enabled } = this.props; if (enabled && rowTag === 1) { - const warning = commonFunc.showMessage( - this.props.app.commonConst, - "beUsed" - ); /* 复制部件 */ + const warning = commonFunc.showMessage(this.props.app.commonConst, "beUsed"); /* 复制部件 */ const { sModelsType } = this.props.app.currentPane; if (sModelsType.includes("sales/")) { message.error(warning + sWorkorderNo); @@ -6881,116 +5262,43 @@ class CommonTableRc extends React.Component { }; handleSelectCancel = modelVisible => { this.setState({ - [modelVisible]: false + [modelVisible]: false, }); }; handleSelectCommonPopup = (name, selectConfig, selectData) => { const { commonPopupTbName, commonPopupShowConfig } = this.state; /* 若是产品名称弹窗 并且配置了调用产品工艺卡标识copyFromTechnology 则走自己的逻辑 */ if (selectConfig.sCompareColor === "copyFromTechnology") { - this.props.onSelectCommonPopupProduct( - name, - selectConfig, - selectData, - commonPopupTbName, - commonPopupShowConfig - ); + this.props.onSelectCommonPopupProduct(name, selectConfig, selectData, commonPopupTbName, commonPopupShowConfig); } else { - this.props.onSelectCommonPopup( - name, - selectConfig, - selectData, - commonPopupTbName, - commonPopupShowConfig - ); + this.props.onSelectCommonPopup(name, selectConfig, selectData, commonPopupTbName, commonPopupShowConfig); } }; handleSelectCommonFieldPopup = (name, selectConfig, selectData) => { const { commonFieldPopupTbName, commonFieldPopupShowConfig } = this.state; - this.handleSelectCommonPopupNew( - name, - selectConfig, - selectData, - commonFieldPopupTbName, - commonFieldPopupShowConfig - ); + this.handleSelectCommonPopupNew(name, selectConfig, selectData, commonFieldPopupTbName, commonFieldPopupShowConfig); }; - handleSelectCommonPopupNew = ( - currentPaneName, - selectConfig, - selectData, - tbName - ) => { - const { - [`${tbName}SelectedRowKeys`]: tableSelectedRowKeys, - masterData - } = this.props.parentProps; + handleSelectCommonPopupNew = (currentPaneName, selectConfig, selectData, tbName) => { + const { [`${tbName}SelectedRowKeys`]: tableSelectedRowKeys, masterData } = this.props.parentProps; let { [`${tbName}Data`]: tableData } = this.props.parentProps; - if ( - commonUtils.isNotEmptyArr(tableData) && - commonUtils.isNotEmptyArr(selectData) - ) { + if (commonUtils.isNotEmptyArr(tableData) && commonUtils.isNotEmptyArr(selectData)) { const iIndex = - commonUtils.isNotEmptyArr(tableSelectedRowKeys) && - commonUtils.isNotEmptyObject(tableSelectedRowKeys[0]) + commonUtils.isNotEmptyArr(tableSelectedRowKeys) && commonUtils.isNotEmptyObject(tableSelectedRowKeys[0]) ? tableData.findIndex(item => item.sId === tableSelectedRowKeys[0]) : -1; - - // ipd核检废新增板号多选择特殊处理 - if ( this.props.parentProps.slaveConfig.sId == "12710101117056272345580" && tbName === "slave" ) { - let newTableData = tableData.filter(e => e.sBoardName) || []; - - - // 如果版号已存在则过滤 - // const result = selectData.filter(item1 =>!newTableData.some(item2 => item2.sBoardName === item1.sBoardName)); - let newSelectData = selectData.map((item, index) => { - const newCopyTo = { - master: masterData, - slave: tableData[0] - }; - let tableDataRow = { - sSqlConditionId: commonUtils.createSid(), - ...tableData[0], - ...commonFunc.getAssignFieldValue( - selectConfig.sAssignField, - item, - newCopyTo - ), - sId: commonUtils.createSid() - }; - // tableDataRow.handleType = commonUtils.isEmpty( tableDataRow.handleType ) ? "update" : tableDataRow.handleType; - tableDataRow.handleType = "add"; - return tableDataRow - }); - // newTableData = [...newTableDataList,...newTableData]; - this.props.onSaveState({ - [`${tbName}Data`]: [...newSelectData.reverse(),...newTableData] - }); - - return; - } - - - - - selectData.forEach((item, index) => { const newCopyTo = {}; newCopyTo.master = masterData; - const sName = - selectConfig.sKeyUpFilter; /* 将后台配置筛选字段作为 列字段 */ + const sName = selectConfig.sKeyUpFilter; /* 将后台配置筛选字段作为 列字段 */ let sValue = ""; if (iIndex > -1) { newCopyTo.slave = tableData[iIndex]; sValue = tableData[iIndex][sName]; } /* 第一条数据若字段值为空或者只有一条数据时 则添加到该行 否则新增一行 */ - if ( - selectData.length === 1 || - (index === 0 && commonUtils.isEmptyObject(sValue)) - ) { + if (selectData.length === 1 || (index === 0 && commonUtils.isEmptyObject(sValue))) { let tableDataRow = {}; // 取默认值 tableDataRow = { ...tableData[iIndex] }; if (tbName === "slave") { @@ -6998,25 +5306,16 @@ class CommonTableRc extends React.Component { } tableDataRow = { ...tableDataRow, - ...commonFunc.getAssignFieldValue( - selectConfig.sAssignField, - item, - newCopyTo - ) + ...commonFunc.getAssignFieldValue(selectConfig.sAssignField, item, newCopyTo), }; // 取赋值字段 tableData[iIndex] = tableDataRow; - tableData[iIndex].handleType = commonUtils.isEmpty( - tableData[iIndex].handleType - ) - ? "update" - : tableData[iIndex].handleType; + tableData[iIndex].handleType = commonUtils.isEmpty(tableData[iIndex].handleType) ? "update" : tableData[iIndex].handleType; } const addState = { - [`${tbName}Data`]: tableData + [`${tbName}Data`]: tableData, }; - this.props.onSaveState(addState); }); } @@ -7043,55 +5342,26 @@ class CommonTableRc extends React.Component { this.props.onExitTbRow(index, record); }; handleViewClick = (name, sName, record, index, showConfig, configName) => { - if ( - commonUtils.isNotEmptyObject(showConfig) && - commonUtils.isNotEmptyObject(record) - ) { - const printPdf = - showConfig.sControlName; /* 工单号配置调到打印界面,跳转打印页面 */ + if (commonUtils.isNotEmptyObject(showConfig) && commonUtils.isNotEmptyObject(record)) { + const printPdf = showConfig.sControlName; /* 工单号配置调到打印界面,跳转打印页面 */ const sActiveKey = showConfig.sActiveKey; /* 弹出界面对应数据主字段 */ - if ( - commonUtils.isNotEmptyObject(printPdf) && - printPdf === "printPdf" && - commonUtils.isNotEmptyObject(sActiveKey) - ) { + if (commonUtils.isNotEmptyObject(printPdf) && printPdf === "printPdf" && commonUtils.isNotEmptyObject(sActiveKey)) { const token = this.props.app.token; const sActiveId = - showConfig.sActiveId === "1" - ? commonUtils.isEmpty(record.sFormId) - ? record.sSrcFormId - : record.sFormId - : showConfig.sActiveId; + showConfig.sActiveId === "1" ? (commonUtils.isEmpty(record.sFormId) ? record.sSrcFormId : record.sFormId) : showConfig.sActiveId; const printsId = record[sActiveKey]; const urlPrint = `${ commonConfig.server_host - }printReport/printPdfByFromDataId/${printsId}.pdf?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent( - token - )}`; + }printReport/printPdfByFromDataId/${printsId}.pdf?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`; window.open(urlPrint); } else { if (this.handleHideModal()) { - this.props.onViewClick && - this.props.onViewClick( - name, - sName, - record, - index, - showConfig, - configName - ); + this.props.onViewClick && this.props.onViewClick(name, sName, record, index, showConfig, configName); } } } else { if (this.handleHideModal()) { - this.props.onViewClick( - name, - sName, - record, - index, - showConfig, - configName - ); + this.props.onViewClick(name, sName, record, index, showConfig, configName); } } }; @@ -7110,9 +5380,7 @@ class CommonTableRc extends React.Component { }; if (bInModal(event.target)) { // 如果是在modal里的表格,不允许跳转 - const activeTab = document.querySelector( - '#navTabWrap .ant-tabs-nav-list>div[class*="ant-tabs-tab-active"]' - ); + const activeTab = document.querySelector('#navTabWrap .ant-tabs-nav-list>div[class*="ant-tabs-tab-active"]'); if (activeTab) { const modalId = activeTab.getAttribute("data-node-key"); antModalRootEl.style.display = "none"; @@ -7138,16 +5406,14 @@ class CommonTableRc extends React.Component { treeFilterCondition, app, iPageSize, - sModelsId + sModelsId, // slaveSelectedData, // masterData, // employeeConfig, } = this.props; let picArr = ""; if (commonUtils.isNotEmptyArr(slaveConfig)) { - picArr = slaveConfig.gdsconfigformslave.filter( - item => item.sName === sName - ); + picArr = slaveConfig.gdsconfigformslave.filter(item => item.sName === sName); } if (commonUtils.isNotEmptyArr(myConfigArr)) { picArr = myConfigArr; @@ -7158,52 +5424,30 @@ class CommonTableRc extends React.Component { const iIndex = index; const [{ sActiveId }] = picArr; let [{ sActiveKey }] = picArr; - const sFormId = - sActiveId === "1" - ? commonUtils.isEmpty(tableDataRow.sFormId) - ? tableDataRow.sSrcFormId - : tableDataRow.sFormId - : sActiveId; - if ( - commonUtils.isNotEmptyObject(sActiveKey) && - sActiveKey.includes(".") - ) { + const sFormId = sActiveId === "1" ? (commonUtils.isEmpty(tableDataRow.sFormId) ? tableDataRow.sSrcFormId : tableDataRow.sFormId) : sActiveId; + if (commonUtils.isNotEmptyObject(sActiveKey) && sActiveKey.includes(".")) { /* 接口按钮跳转 如果有slave.对应字段 则需要取出对应字段 */ const index = sActiveKey.lastIndexOf("."); sActiveKey = sActiveKey.substring(index + 1, sActiveKey.length); } - const sNameUrl = `${ - commonConfig.server_host - }gdsmodule/getGdsmoduleById/${sFormId}?sModelsId=${sFormId}&sName=${formRoute}`; + const sNameUrl = `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sFormId}?sModelsId=${sFormId}&sName=${formRoute}`; const filterCondition = []; - const conditionValues = this.props.getSqlCondition( - picArr[0], - name, - tableDataRow - ); + const conditionValues = this.props.getSqlCondition(picArr[0], name, tableDataRow); if (!commonUtils.isEmpty(conditionValues)) { Object.keys(conditionValues).forEach(item => { if (item === "tStartDate_pro" || item.substring(0, 1) === "p") { - if ( - !commonUtils.isEmpty(conditionValues[item]) && - conditionValues[item].length >= 2 - ) { - const tStartDate = moment(conditionValues[item][0]).format( - this.sDateFormat - ); + if (!commonUtils.isEmpty(conditionValues[item]) && conditionValues[item].length >= 2) { + const tStartDate = moment(conditionValues[item][0]).format(this.sDateFormat); const tEndDate = moment(conditionValues[item][1]) .add(1, "days") .format(this.sDateFormat); filterCondition.push({ bFilterName: item, bFilterCondition: "=", - bFilterValue: `${tStartDate},${tEndDate}` + bFilterValue: `${tStartDate},${tEndDate}`, }); } - } else if ( - item === "mStartDate_pro" || - item.substring(0, 1) === "m" - ) { + } else if (item === "mStartDate_pro" || item.substring(0, 1) === "m") { if (!commonUtils.isEmpty(conditionValues[item])) { const tStartDate = moment(conditionValues[item]) .startOf("month") @@ -7215,22 +5459,20 @@ class CommonTableRc extends React.Component { filterCondition.push({ bFilterName: `t${item.substring(1, item.length)}`, bFilterCondition: "=", - bFilterValue: `${tStartDate},${tEndDate}` + bFilterValue: `${tStartDate},${tEndDate}`, }); } } else if (item.substring(0, 1) === "t") { filterCondition.push({ bFilterName: item, bFilterCondition: "=", - bFilterValue: moment(conditionValues[item]).format( - this.sDateFormat - ) + bFilterValue: moment(conditionValues[item]).format(this.sDateFormat), }); } else { filterCondition.push({ bFilterName: item, bFilterCondition: "=", - bFilterValue: conditionValues[item] + bFilterValue: conditionValues[item], }); } }); @@ -7252,8 +5494,8 @@ class CommonTableRc extends React.Component { conditonValues: conditionValues, newKey: tableDataRow[sActiveKey], currentIndex: iIndex, - filterCondition - } + filterCondition, + }, }); } }; @@ -7264,11 +5506,9 @@ class CommonTableRc extends React.Component { fileList.forEach(item => { let fileName = item.substring(item.lastIndexOf("/") + 1); fileName = fileName.substring(fileName.indexOf("_") + 1); - const filepath = `${ - commonConfig.server_host - }file/download?savePathStr=${encodeURIComponent( - item - )}&sModelsId=100&token=${encodeURIComponent(this.props.app.token)}`; + const filepath = `${commonConfig.server_host}file/download?savePathStr=${encodeURIComponent(item)}&sModelsId=100&token=${encodeURIComponent( + this.props.app.token + )}`; const xhr = new XMLHttpRequest(); xhr.open("get", filepath); xhr.responseType = "blob"; @@ -7298,8 +5538,7 @@ class CommonTableRc extends React.Component { handleMemoShow = (name, sName, record, index, showConfig) => { if (commonUtils.isNotEmptyObject(record)) { if (sName.includes("sTemplateFullMemo")) { - this.props.onShowSimpleModal && - this.props.onShowSimpleModal(record[sName]); + this.props.onShowSimpleModal && this.props.onShowSimpleModal(record[sName]); return; } @@ -7313,7 +5552,7 @@ class CommonTableRc extends React.Component { bVisibleMemo: true, sRecord: record, sMemoConfig: showConfig, - bOnlyShow: true + bOnlyShow: true, }; this.setState({ sCurrMemoProps }); } @@ -7326,7 +5565,7 @@ class CommonTableRc extends React.Component { this.setState({ commonPopupVisible: true, commonPopupTbName: name, - commonPopupShowConfig: showConfig + commonPopupShowConfig: showConfig, }); }; @@ -7335,7 +5574,7 @@ class CommonTableRc extends React.Component { this.setState({ commonFieldPopupVisible: true, commonFieldPopupTbName: name, - commonFieldPopupShowConfig: showConfig + commonFieldPopupShowConfig: showConfig, }); }; @@ -7347,9 +5586,7 @@ class CommonTableRc extends React.Component { const previewImageArr = []; dataUrlArr.forEach((item = "") => { const dataPreviewUrl = item.includes("xlyerpfiles") - ? `${ - commonConfig.server_host - }file/download?savePathStr=${item}&width=800&&height=500&sModelsId=100&token=${token}` + ? `${commonConfig.server_host}file/download?savePathStr=${item}&width=800&&height=500&sModelsId=100&token=${token}` : item; /* 预览 */ previewImageArr.push(dataPreviewUrl); }); @@ -7357,7 +5594,7 @@ class CommonTableRc extends React.Component { previewImage: previewImageArr, previewVisible: true, showimgs: true, - firstIndex: 0 + firstIndex: 0, }); } }; @@ -7366,7 +5603,7 @@ class CommonTableRc extends React.Component { handlePreviewOffice = dataUrlArr => { this.setState({ officePreviewVisible: true, - officeFileUrl: dataUrlArr + officeFileUrl: dataUrlArr, }); }; @@ -7375,16 +5612,9 @@ class CommonTableRc extends React.Component { }; /* 生产排程工艺流程字段弹窗 - 生产进度详情 */ handlesPartNameStatus = (sName, sWorkOrderId) => { - if ( - commonUtils.isNotEmptyObject(sName) && - commonUtils.isNotEmptyObject(sWorkOrderId) - ) { - const filterData = this.props.config.gdsconfigformslave.filter( - item => item.sName === sName - ); - const showConfig = commonUtils.isNotEmptyArr(filterData) - ? filterData[0] - : []; + if (commonUtils.isNotEmptyObject(sName) && commonUtils.isNotEmptyObject(sWorkOrderId)) { + const filterData = this.props.config.gdsconfigformslave.filter(item => item.sName === sName); + const showConfig = commonUtils.isNotEmptyArr(filterData) ? filterData[0] : []; const record = {}; record.sWorkOrderId = sWorkOrderId; this.props.onPartNameClick(sName, showConfig, record); @@ -7396,31 +5626,17 @@ class CommonTableRc extends React.Component { const sBtnName = sName; const sBtnContent = record[sName]; const sFormId = commonUtils.isNotEmptyObject(record.sId) ? record.sId : ""; - const sBtnControlName = commonUtils.isNotEmptyObject( - showConfig.sControlName - ) - ? showConfig.sControlName - : ""; + const sBtnControlName = commonUtils.isNotEmptyObject(showConfig.sControlName) ? showConfig.sControlName : ""; console.log("sFormId:", sFormId); if (commonUtils.isNotEmptyObject(sBtnContent)) { const urlPrint = `${ commonConfig.server_host }template/getSql/${sBtnName}/?sBtnContent=${sBtnContent}&sBtnControlName=${sBtnControlName}&sFormId=${sFormId}`; - const w = - window.innerWidth || - document.documentElement.clientWidth || - document.body.clientWidth; - const h = - window.innerHeight || - document.documentElement.clientHeight || - document.body.clientHeight; + const w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth; + const h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //const newWin = window.open('','_blank'); const features = - "width=" + - (w + 350) + - ",height=" + - (h + 300) + - ", top=0, left=0, toolbar=no, menubar=no,scrollbars=no,resizable=no, location =no, status=no"; + "width=" + (w + 350) + ",height=" + (h + 300) + ", top=0, left=0, toolbar=no, menubar=no,scrollbars=no,resizable=no, location =no, status=no"; const newWin = window.open("", "SQL查看器", features); newWin.document.write( '