- {
- if (fileType === "pdf") {
- this.setState({
- pdfFileVisible: true,
- pdfFileUrl: fileList[0],
- });
- } else {
- this.handlePreviewImage(e, fileList);
- }
- }}
- title="预览"
- >
-
- );
+ let fileName = fileList[0].substring(fileList[0].lastIndexOf('/') + 1);
+ fileName = fileName.substring(fileName.indexOf('_') + 1);
+ const picHref = `${commonConfig.file_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'];
+ return
+ {
+ if (fileType === 'pdf') {
+ this.setState({
+ pdfFileVisible: true,
+ pdfFileUrl: fileList[0],
+ });
+ } else {
+ this.handlePreviewImage(e, fileList);
+ }
+ }} title="预览">
} else {
- return (
- {
- this.setState({
- commonFileDownloadVisible: true,
- commonFileDownloadList: fileList.map(item => {
- return { url: item, checked: false };
- }),
- });
- }}
- >{`附件（${fileList.length}）`}
- );
+ return {
+ this.setState({
+ commonFileDownloadVisible: true,
+ commonFileDownloadList: fileList.map(item => {return { url: item, checked: false }}),
+ })
+ }}
+ >{`附件（${fileList.length}）`};
}
- };
+ }
}
if (commonUtils.isNotEmptyArr(sMakeUpPath)) {
sMakeUpPath.forEach(item => {
- item.render = (value = "", record) => {
+ item.render = (value = '', record) => {
const { formId, name, enabled } = this.props;
- const { token } = this.props.app;
- let divProps = {
+ const { token } = this.props.app;
+ const divProps = {
action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}`,
- onChange: info => {
+ onChange: (info) => {
this.handleUploadChange(info, () => {});
const savePathStr = info?.file?.response?.dataset?.rows?.[0]?.savePathStr;
this.props.onDataChange(name, item.dataIndex, { [item.dataIndex]: savePathStr }, record.sId, []);
},
- accept: "*/*",
+ accept: '*/*',
showUploadList: false,
multiple: false,
};
- if (config.sTbName === "sisboxcomponent") {
- divProps = {
- // action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}`,
- action: `${commonConfig.server_host}file/uploadPrice?sLogoName=logo${name}${formId}${new Date().getTime()}`,
- onChange: info => {
- this.handleUploadChange(info, () => {});
- const savePathStr = info?.file?.response?.dataset?.rows?.[0]?.savePathStr;
- this.props.onDataChange(name, item.dataIndex, { [item.dataIndex]: savePathStr }, record.sId, []);
- },
- accept: "*/*",
- showUploadList: false,
- multiple: false,
- };
- }
- return (
-
- {value &&
- [""].map(() => {
- const iconProps = {
- className: styles.imgPDf,
- onClick: () => {
- this.setState({
- officePreviewVisible: true,
- officeFileUrl: value,
- });
- },
- };
- const removeExtension = filename => {
- const lastDotIndex = filename.lastIndexOf(".");
- if (lastDotIndex === -1) {
- // 如果字符串中没有点，则返回原字符串
- return filename;
- }
- return filename.substring(0, lastDotIndex);
- };
- const getImageUrl = sName => {
- const imageUrlNew = `${commonConfig.server_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`;
- return imageUrlNew;
- };
- const picAddr = commonUtils.isNotEmptyObject(value) ? value.split(",") : "";
- let dataUrl = picAddr[0].includes("xlyerpfiles")
- ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}`
- : picAddr[0]; /* 缩略图 */
- if (config.sTbName === "sisboxcomponent") {
- dataUrl = getImageUrl(removeExtension(picAddr[0]));
- }
- const officeFileTypeList = ["PDF", "DOCX", "XLSX", "MP4", "WEBM", "OGG"];
- const imgTypeList = ["PNG", "SVG", "JPG", "JPEG", "GIF", "BMP", "TIFF", "ICO"];
- const officeFileType = picAddr[0].split(".").pop().toUpperCase();
- let fileIcon = 
0}
- onClick={e => this.handlePreviewImage(e, picAddr)}
- style={{ width: "30px", height: "20px" }}
- />
-
- );
+ return
;
+ }
+ })
}
- this.props.onCostomColums?.([...tableColumn, ...subTableColumn]);
+ this.props.onCostomColums?.([
+ ...tableColumn,
+ ...subTableColumn
+ ]);
// 判断工序状态
if (commonUtils.isNotEmptyArr(sPartNameStatus) && commonUtils.isNotEmptyArr(dataSource)) {
this.useVListNew = true;
- const sModelsType =
- commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : "";
- if (
- sModelsType === "production/productionPlanInfo" ||
- location.pathname.toLowerCase("commonList") ||
- sModelsType === "productionMainPlan/productionMainPlan" ||
- location.pathname.toLowerCase().indexOf("oee") > -1
- ) {
- sPartNameStatus[0].render = itemStr => {
+ const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
+ if (sModelsType === 'production/productionPlanInfo' || location.pathname.toLowerCase('commonList') || sModelsType === 'productionMainPlan/productionMainPlan' || location.pathname.toLowerCase().indexOf('oee') > -1) {
+ sPartNameStatus[0].render = (itemStr) => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
return (
//
+ {
+ value && [''].map(() => {
+ const iconProps = {
+ className: styles.imgPDf,
+ onClick: () => {
+ this.setState({
+ officePreviewVisible: true,
+ officeFileUrl: value,
+ })
}
+ };
+
+ const picAddr = commonUtils.isNotEmptyObject(value) ? value.split(',') : '';
+ const dataUrl = picAddr[0].includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */
+
+ const officeFileTypeList = ['PDF', 'DOCX', 'XLSX', 'MP4', 'WEBM', 'OGG'];
+ const imgTypeList = ['PNG', 'SVG', 'JPG', 'JPEG', 'GIF', 'BMP', 'TIFF', 'ICO'];
+ const officeFileType = picAddr[0].split('.').pop().toUpperCase();
+ let fileIcon =
-
- )}
-
- );
- };
- });
+ return imgBox;
+ })
+ }
+ {
+ enabled &&
- {
- return (
-
- {
- // eslint-disable-next-line array-callback-return
- sPartItem.map((t, i) => {
- const sPartItemLength = sPartItem.length;
- // const record = dataSource[i]; /* 获取每行数据 */
- let colorValue = "#000000";
- if (t?.background) {
- colorValue = t.background;
- } else {
- const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
- case 0:
- colorValue = "#808080"; /* 0：灰色 */
- break;
- case 1:
- colorValue = "#808080"; /* 1：灰色 */
- break;
- case 2:
- colorValue = "#ff4d4f"; /* 2：红色 */
- break;
- case 3:
- colorValue = "#d4b106"; /* 3：黄色 */
- break;
- case 4:
- colorValue = "#000000"; /* 黑色 */
- break;
- case 5:
- colorValue = "#49aa19"; /* 5：绿色 */
- break;
- default:
- colorValue = "#000000";
- }
- }
- return (
- {
+ return
- {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ""}
- {i + 1 === sPartItemLength ? "" :
- );
- })
+
+ {
+ // eslint-disable-next-line array-callback-return
+ sPartItem.map((t, i) => {
+ const sPartItemLength = sPartItem.length;
+ // const record = dataSource[i]; /* 获取每行数据 */
+ let colorValue = '#000000';
+ if (t?.background) {
+ colorValue = t.background;
+ } else {
+ const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
+ switch (Number(sState)) { // 根据状态显示颜色
+ case 0:
+ colorValue = '#808080'; /* 0：灰色 */
+ break;
+ case 1:
+ colorValue = '#808080'; /* 1：灰色 */
+ break;
+ case 2:
+ colorValue = '#ff4d4f'; /* 2：红色 */
+ break;
+ case 3:
+ colorValue = '#d4b106'; /* 3：黄色 */
+ break;
+ case 4:
+ colorValue = '#000000'; /* 黑色 */
+ break;
+ case 5:
+ colorValue = '#49aa19'; /* 5：绿色 */
+ break;
+ default:
+ colorValue = '#000000';
+ }
}
-
- );
- }}
- >
-
+ return (
+
+ }}>
+
+ {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ''}
+ { i + 1 === sPartItemLength ? '' :
+ );
+ })
+ }
+
{
// eslint-disable-next-line array-callback-return
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
// const record = dataSource[i]; /* 获取每行数据 */
- let colorValue = "#000000";
+ let colorValue = '#000000';
if (t?.background) {
colorValue = t.background;
} else {
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
+ switch (Number(sState)) { // 根据状态显示颜色
case 0:
- colorValue = "#808080"; /* 0：灰色 */
+ colorValue = '#808080'; /* 0：灰色 */
break;
case 1:
- colorValue = "#808080"; /* 1：灰色 */
+ colorValue = '#808080'; /* 1：灰色 */
break;
case 2:
- colorValue = "#ff4d4f"; /* 2：红色 */
+ colorValue = '#ff4d4f'; /* 2：红色 */
break;
case 3:
- colorValue = "#d4b106"; /* 3：黄色 */
+ colorValue = '#d4b106'; /* 3：黄色 */
break;
case 4:
- colorValue = "#000000"; /* 黑色 */
+ colorValue = '#000000'; /* 黑色 */
break;
case 5:
- colorValue = "#49aa19"; /* 5：绿色 */
+ colorValue = '#49aa19'; /* 5：绿色 */
break;
default:
- colorValue = "#000000";
+ colorValue = '#000000';
}
}
return (
-
- {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ""}
- {i + 1 === sPartItemLength ? "" :
+
);
}
};
} else {
- sPartNameStatus[0].render = itemStr => {
+ sPartNameStatus[0].render = (itemStr) => {
if (itemStr) {
- const sPartItem = itemStr.split("->");
+ const sPartItem = itemStr.split('->');
return (
-
+ {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ''}
+ { i + 1 === sPartItemLength ? '' :
);
})
}
+
{
// eslint-disable-next-line array-callback-return
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
- const ArrItemStr = t.split("#")[0]; /* 工序名称 */
- const ArrItemNum = t.split("#")[1]; /* 状态 */
- const ArrItemName = t.split("#")[2]; /* 机台名称 */
- const ArrItemBanZhu = t.split("#")[3]; /* 班组 */
- const ArrItemTime = t.split("#")[4]; /* 排单时间 */
- const ArrItemPCNum = t.split("#")[5]; /* 排程数 */
- const ArrItemSBNum = t.split("#")[6]; /* 上报数 */
- const ArrItem7Num = commonUtils.isNotEmptyArr(t.split("#")) && t.split("#").length > 8 ? t.split("#")[8] : ""; /* 包数 */
- const ArrItem8Num = commonUtils.isNotEmptyArr(t.split("#")) && t.split("#").length > 9 ? t.split("#")[9] : ""; /* 每包数量 */
- const ArrItem9Num = commonUtils.isNotEmptyArr(t.split("#")) && t.split("#").length > 10 ? t.split("#")[10] : ""; /* 零头数量 */
- let ArrItemNumChange = "";
+ const ArrItemStr = t.split('#')[0]; /* 工序名称 */
+ const ArrItemNum = t.split('#')[1]; /* 状态 */
+ const ArrItemName = t.split('#')[2]; /* 机台名称 */
+ const ArrItemBanZhu = t.split('#')[3]; /* 班组 */
+ const ArrItemTime = t.split('#')[4]; /* 排单时间 */
+ const ArrItemPCNum = t.split('#')[5]; /* 排程数 */
+ const ArrItemSBNum = t.split('#')[6]; /* 上报数 */
+ const ArrItem7Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 8 ? t.split('#')[8] : ''; /* 包数 */
+ const ArrItem8Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 9 ? t.split('#')[9]: ''; /* 每包数量 */
+ const ArrItem9Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 10 ? t.split('#')[10]: ''; /* 零头数量 */
+ let ArrItemNumChange = '';
let icon;
// eslint-disable-next-line default-case
switch (Number(ArrItemNum)) {
case 0:
- ArrItemNumChange = "未排程";
- icon = {
- return (
-
-
);
// 数字转换图标
return (
-
- 工序名称：
- {ArrItemStr}
-
-
- 状态：
- {ArrItemNumChange}
-
-
- 机台名称：
- {ArrItemName}
-
-
- 班组：
- {ArrItemBanZhu}
-
-
- 排单时间：
- {ArrItemTime}
-
-
- 排程数：
- {ArrItemPCNum}
-
-
- 上报数：
- {ArrItemSBNum}
-
- {ArrItem7Num ? (
-
- 包数：
- {ArrItem7Num}
-
- ) : (
- ""
- )}
- {ArrItem8Num ? (
-
- 每包数量：
- {ArrItem8Num}
-
- ) : (
- ""
- )}
- {ArrItem9Num ? (
-
- 零头数量：
- {ArrItem9Num}
-
- ) : (
- ""
- )}
+ 工序名称：{ArrItemStr}
+ 状态：{ArrItemNumChange}
+ 机台名称：{ArrItemName}
+ 班组：{ArrItemBanZhu}
+ 排单时间：{ArrItemTime}
+ 排程数：{ArrItemPCNum}
+ 上报数：{ArrItemSBNum}
+ {
+ ArrItem7Num ? 包数：{ArrItem7Num}
:''
+ }
+ {
+ ArrItem8Num ? 每包数量：{ArrItem8Num}
:''
+ }
+ {
+ ArrItem9Num ? 零头数量：{ArrItem9Num}
:''
+ }
+
);
}
@@ -1673,168 +1489,112 @@ class CommonTableRc extends React.Component {
// 判断材料准备状态
if (commonUtils.isNotEmptyArr(sMaterialsStatus) && commonUtils.isNotEmptyArr(dataSource)) {
this.useVListNew = true;
- const sModelsType =
- commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : "";
- if (
- true ||
- sModelsType === "production/productionPlanInfo" ||
- sModelsType === "productionMainPlan/productionMainPlan" ||
- (commonUtils.isNotEmptyObject(sModelsType) && sModelsType.includes("view/")) ||
- location.pathname.toLowerCase().indexOf("oee") > -1
- ) {
+ const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
+ if (true || sModelsType === 'production/productionPlanInfo' || sModelsType === 'productionMainPlan/productionMainPlan' || (commonUtils.isNotEmptyObject(sModelsType) && sModelsType.includes('view/')) || location.pathname.toLowerCase().indexOf('oee') > -1) {
/* 动态列Jsonn解析 */
if (commonUtils.isNotEmptyArr(sMaterialsStatus) && commonUtils.isNotEmptyArr(dataSource)) {
sMaterialsStatus.forEach((jsonStatus, index) => {
const dWidth = jsonStatus.width * 2;
- const sBackGroundColor = jsonStatus.bReadonly ? "#f1f2f8" : "";
- if (commonUtils.isNotEmptyArr(jsonStatus.children)) {
- /* 嵌套列头JSON解析 */
+ const sBackGroundColor = jsonStatus.bReadonly ? '#f1f2f8' : '';
+ if (commonUtils.isNotEmptyArr(jsonStatus.children)) { /* 嵌套列头JSON解析 */
for (const obj of jsonStatus.children) {
- obj.render = itemStr => {
+ obj.render = (itemStr) => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
/* 取箭头弹出的窗体配置 */
let showConfig = {};
- let linkStyle = ""; /* 弹窗 */
- if (
- commonUtils.isNotEmptyArr(this.props.config) &&
- commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) &&
- commonUtils.isNotEmptyStr("sMaterialsStatus")
- ) {
- const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === "sMaterialsStatus" && item.bVisible);
+ let linkStyle = '';/* 弹窗 */
+ if (commonUtils.isNotEmptyArr(this.props.config) && commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) && commonUtils.isNotEmptyStr('sMaterialsStatus')) {
+ const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === 'sMaterialsStatus' && item.bVisible);
if (commonUtils.isNotEmptyArr(showConfigArr)) {
showConfig = showConfigArr[0];
- if (
- commonUtils.isNotEmptyObject(showConfig) &&
- showConfig.sDropDownType === "picArr" &&
- !commonUtils.isEmpty(showConfig.sActiveId) &&
- commonUtils.isEmptyArr(this.props.sGroupByList)
- ) {
- linkStyle = "sMaterialsStatusStyle";
+ if (commonUtils.isNotEmptyObject(showConfig) && showConfig.sDropDownType === 'picArr' && !commonUtils.isEmpty(showConfig.sActiveId) && commonUtils.isEmptyArr(this.props.sGroupByList)) {
+ linkStyle = 'sMaterialsStatusStyle';
}
}
}
return (
-
{icon}
-
- {ArrItemStr}
-
+ {ArrItemStr}
{/*{ i + 1 === sPartItemLength ? '' :
);
})
}
+
+
- {
- // eslint-disable-next-line array-callback-return;
- sPartItem.map((t, i) => {
- const sPartItemLength = sPartItem.length;
- let colorValue = "#000000";
- if (t?.background) {
- colorValue = t.background;
- } else {
- const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
- case 0:
- colorValue = "#000000"; /* 0：黑色 */
- break;
- case 1:
- colorValue = "#ff4d4f"; /* 1：红色 */
- break;
- case 2:
- colorValue = "#49aa19"; /* 2：绿色 */
- break;
- case 3:
- colorValue = "#49aa19"; /* 3：绿色 */
- break;
- case 4:
- colorValue = "#ff4d4f"; /* 4：红色 */
- break;
- default:
- colorValue = "#000000";
- }
- }
- return (
- {
+ return
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
-
- {t.sMaterialsName}
-
- ) : (
- ""
- )}
- {i + 1 === sPartItemLength ? "" : -}
-
- );
- })
+
+ {
+ // eslint-disable-next-line array-callback-return;
+ sPartItem.map((t, i) => {
+ const sPartItemLength = sPartItem.length;
+ let colorValue = '#000000';
+ if (t?.background) {
+ colorValue = t.background;
+ } else {
+ const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
+ switch (Number(sState)) { // 根据状态显示颜色
+ case 0:
+ colorValue = '#000000'; /* 0：黑色 */
+ break;
+ case 1:
+ colorValue = '#ff4d4f'; /* 1：红色 */
+ break;
+ case 2:
+ colorValue = '#49aa19'; /* 2：绿色 */
+ break;
+ case 3:
+ colorValue = '#49aa19'; /* 3：绿色 */
+ break;
+ case 4:
+ colorValue = '#ff4d4f'; /* 4：红色 */
+ break;
+ default:
+ colorValue = '#000000';
+ }
}
-
- );
- }}
- >
-
+ return (
+
+ }}>
+
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
+
+ {t.sMaterialsName}
+ : ''}
+ { i + 1 === sPartItemLength ? '' : -}
+
+ );
+ })
+ }
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
- let colorValue = "#000000";
+ let colorValue = '#000000';
if (t?.background) {
colorValue = t.background;
} else {
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
+ switch (Number(sState)) { // 根据状态显示颜色
case 0:
- colorValue = "#000000"; /* 0：黑色 */
+ colorValue = '#000000'; /* 0：黑色 */
break;
case 1:
- colorValue = "#ff4d4f"; /* 1：红色 */
+ colorValue = '#ff4d4f'; /* 1：红色 */
break;
case 2:
- colorValue = "#49aa19"; /* 2：绿色 */
+ colorValue = '#49aa19'; /* 2：绿色 */
break;
case 3:
- colorValue = "#49aa19"; /* 3：绿色 */
+ colorValue = '#49aa19'; /* 3：绿色 */
break;
case 4:
- colorValue = "#ff4d4f"; /* 4：红色 */
+ colorValue = '#ff4d4f'; /* 4：红色 */
break;
default:
- colorValue = "#000000";
+ colorValue = '#000000';
}
}
return (
-
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
-
- {t.sMaterialsName}
-
- ) : (
- ""
- )}
- {i + 1 === sPartItemLength ? "" : -}
+ {
- return (
-
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
+
+ {t.sMaterialsName}
+ : ''}
+ { i + 1 === sPartItemLength ? '' : -}
);
})
@@ -1846,157 +1606,105 @@ class CommonTableRc extends React.Component {
return itemStr;
}
};
- }
- } else {
- /* 无嵌套列头JSON列解析 */
- sMaterialsStatus[index].render = itemStr => {
+ };
+ } else { /* 无嵌套列头JSON列解析 */
+ sMaterialsStatus[index].render = (itemStr) => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
/* 取箭头弹出的窗体配置 */
let showConfig = {};
- let linkStyle = ""; /* 弹窗 */
- if (
- commonUtils.isNotEmptyArr(this.props.config) &&
- commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) &&
- commonUtils.isNotEmptyStr("sMaterialsStatus")
- ) {
- const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === "sMaterialsStatus" && item.bVisible);
+ let linkStyle = '';/* 弹窗 */
+ if (commonUtils.isNotEmptyArr(this.props.config) && commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) && commonUtils.isNotEmptyStr('sMaterialsStatus')) {
+ const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === 'sMaterialsStatus' && item.bVisible);
if (commonUtils.isNotEmptyArr(showConfigArr)) {
showConfig = showConfigArr[0];
- if (
- commonUtils.isNotEmptyObject(showConfig) &&
- showConfig.sDropDownType === "picArr" &&
- !commonUtils.isEmpty(showConfig.sActiveId) &&
- commonUtils.isEmptyArr(this.props.sGroupByList)
- ) {
- linkStyle = "sMaterialsStatusStyle";
+ if (commonUtils.isNotEmptyObject(showConfig) && showConfig.sDropDownType === 'picArr' && !commonUtils.isEmpty(showConfig.sActiveId) && commonUtils.isEmptyArr(this.props.sGroupByList)) {
+ linkStyle = 'sMaterialsStatusStyle';
}
}
}
return (
-
- {
- // eslint-disable-next-line array-callback-return;
- sPartItem.map((t, i) => {
- const sPartItemLength = sPartItem.length;
- let colorValue = "#000000";
- if (t?.background) {
- colorValue = t.background;
- } else {
- const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
- case 0:
- colorValue = "#000000"; /* 0：黑色 */
- break;
- case 1:
- colorValue = "#ff4d4f"; /* 1：红色 */
- break;
- case 2:
- colorValue = "#49aa19"; /* 2：绿色 */
- break;
- case 3:
- colorValue = "#49aa19"; /* 3：绿色 */
- break;
- case 4:
- colorValue = "#ff4d4f"; /* 4：红色 */
- break;
- default:
- colorValue = "#000000";
- }
- }
- return (
- {
+ return
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
-
- {t.sMaterialsName}
-
- ) : (
- ""
- )}
- {i + 1 === sPartItemLength ? "" : -}
-
- );
- })
+
+ {
+ // eslint-disable-next-line array-callback-return;
+ sPartItem.map((t, i) => {
+ const sPartItemLength = sPartItem.length;
+ let colorValue = '#000000';
+ if (t?.background) {
+ colorValue = t.background;
+ } else {
+ const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
+ switch (Number(sState)) { // 根据状态显示颜色
+ case 0:
+ colorValue = '#000000'; /* 0：黑色 */
+ break;
+ case 1:
+ colorValue = '#ff4d4f'; /* 1：红色 */
+ break;
+ case 2:
+ colorValue = '#49aa19'; /* 2：绿色 */
+ break;
+ case 3:
+ colorValue = '#49aa19'; /* 3：绿色 */
+ break;
+ case 4:
+ colorValue = '#ff4d4f'; /* 4：红色 */
+ break;
+ default:
+ colorValue = '#000000';
+ }
}
-
- );
- }}
- >
-
+ return (
+
+ }}>
+
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
+
+ {t.sMaterialsName}
+ : ''}
+ { i + 1 === sPartItemLength ? '' : -}
+
+ );
+ })
+ }
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
- let colorValue = "#000000";
+ let colorValue = '#000000';
if (t?.background) {
colorValue = t.background;
} else {
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
+ switch (Number(sState)) { // 根据状态显示颜色
case 0:
- colorValue = "#000000"; /* 0：黑色 */
+ colorValue = '#000000'; /* 0：黑色 */
break;
case 1:
- colorValue = "#ff4d4f"; /* 1：红色 */
+ colorValue = '#ff4d4f'; /* 1：红色 */
break;
case 2:
- colorValue = "#49aa19"; /* 2：绿色 */
+ colorValue = '#49aa19'; /* 2：绿色 */
break;
case 3:
- colorValue = "#49aa19"; /* 3：绿色 */
+ colorValue = '#49aa19'; /* 3：绿色 */
break;
case 4:
- colorValue = "#ff4d4f"; /* 4：红色 */
+ colorValue = '#ff4d4f'; /* 4：红色 */
break;
default:
- colorValue = "#000000";
+ colorValue = '#000000';
}
}
return (
-
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
-
- {t.sMaterialsName}
-
- ) : (
- ""
- )}
- {i + 1 === sPartItemLength ? "" : -}
+
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
+
+ {t.sMaterialsName}
+ : ''}
+ { i + 1 === sPartItemLength ? '' : -}
);
})
@@ -2005,12 +1713,7 @@ class CommonTableRc extends React.Component {
);
} else {
- return (
-
- {" "}
- {itemStr}{" "}
-
- );
+ return {itemStr}
;
}
};
}
@@ -2021,51 +1724,40 @@ class CommonTableRc extends React.Component {
/* 动态列Jsonn解析 */
if (commonUtils.isNotEmptyArr(dynamicColumn) && commonUtils.isNotEmptyArr(dataSource)) {
dynamicColumn.forEach((jsonStatus, index) => {
- if (commonUtils.isNotEmptyArr(jsonStatus.children)) {
- /* 嵌套列头JSON解析 */
- const childrenJson = jsonStatus.children.filter(itemChild => itemChild.dataIndex && itemChild.dataIndex.includes("json"));
+ if (commonUtils.isNotEmptyArr(jsonStatus.children)) { /* 嵌套列头JSON解析 */
+ const childrenJson = jsonStatus.children.filter(itemChild=> itemChild.dataIndex && itemChild.dataIndex.includes('json'));
for (const obj of childrenJson) {
- obj.render = itemStr => {
+ obj.render = (itemStr) => {
if (commonUtils.isNotEmptyObject(itemStr) && commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
return (
-
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
// const sPartItemLength = sPartItem.length;
- let colorValue = "#000000";
+ let colorValue = '#000000';
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
+ switch (Number(sState)) { // 根据状态显示颜色
case 1:
- colorValue = "#ff0000"; /* 1：红色 */
+ colorValue = '#ff0000'; /* 1：红色 */
break;
case 2:
- colorValue = "#49aa19"; /* 2：绿色 */
+ colorValue = '#49aa19'; /* 2：绿色 */
break;
case 3:
- colorValue = "#ffff00"; /* 3：黄色 */
+ colorValue = '#ffff00'; /* 3：黄色 */
break;
case 0:
- colorValue = ""; /* 3：不要颜色 */
+ colorValue = ''; /* 3：不要颜色 */
break;
default:
- colorValue = "";
+ colorValue = '';
}
return (
{t.dSchedulHours}
@@ -2077,37 +1769,38 @@ class CommonTableRc extends React.Component {
);
}
};
- }
- } else {
- /* 无嵌套列头JSON列解析 */
- dynamicColumn[index].render = itemStr => {
+ };
+ } else { /* 无嵌套列头JSON列解析 */
+ dynamicColumn[index].render = (itemStr) => {
if (commonUtils.isNotEmptyObject(itemStr) && commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
return (
-
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
// const sPartItemLength = sPartItem.length;
- let colorValue = "#000000";
+ let colorValue = '#000000';
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (
- Number(sState) // 根据状态显示颜色
- ) {
+ switch (Number(sState)) { // 根据状态显示颜色
case 1:
- colorValue = "#ff0000"; /* 1：红色 */
+ colorValue = '#ff0000'; /* 1：红色 */
break;
case 2:
- colorValue = "#49aa19"; /* 2：绿色 */
+ colorValue = '#49aa19'; /* 2：绿色 */
break;
case 3:
- colorValue = "#ffff00"; /* 3：黄色 */
+ colorValue = '#ffff00'; /* 3：黄色 */
break;
default:
- colorValue = "#666";
+ colorValue = '#666';
}
return (
-
+
);
@@ -2125,18 +1818,18 @@ class CommonTableRc extends React.Component {
// 判断时间状态
if (commonUtils.isNotEmptyArr(sTimeStatus) && commonUtils.isNotEmptyArr(dataSource)) {
- sTimeStatus[0].render = itemStr => {
+ sTimeStatus[0].render = (itemStr) => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
- const linkStyle = "sTimeStatusStyle"; /* 弹窗 */
+ const linkStyle = 'sTimeStatusStyle';/* 弹窗 */
return (
-
{t.dSchedulHours}
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
const sColor = t.sColor;
- const dWidth = t.dRate !== undefined && t.dRate !== 0 ? `${t.dRate * 500}px` : "100px";
+ const dWidth = t.dRate !== undefined && t.dRate !== 0 ? `${t.dRate * 500}px` : '100px';
const content = (
{`${t.sName} ：${t.sValue}`}
@@ -2148,13 +1841,7 @@ class CommonTableRc extends React.Component {
@@ -2174,39 +1861,34 @@ class CommonTableRc extends React.Component {
// 判断拼板状态
if (commonUtils.isNotEmptyArr(sScheduleStatusJson) && commonUtils.isNotEmptyArr(dataSource)) {
this.useVListNew = true;
- sScheduleStatusJson[0].render = itemStr => {
+ sScheduleStatusJson[0].render = (itemStr) => {
if (commonUtils.isJSON(itemStr)) {
const itemJson = commonUtils.convertStrToObj(itemStr);
const itemLength = itemJson.length;
const content = itemJson.map((t, i) => {
- const { sState, sColor = "#000000", sName = "" } = t;
+ const { sState, sColor = '#000000', sName = '' } = t;
return (
-
- {sName}
- {i + 1 === itemLength ? "" : {
- const { handleCheckBoxStatus } = this.props;
- typeof handleCheckBoxStatus === "function" && handleCheckBoxStatus(e.target.checked, column?.dataIndex, this.props.name);
- }}
- />
- {column?.title}
-
- );
+ return <>
+ {
+ const { handleCheckBoxStatus } = this.props;
+ typeof handleCheckBoxStatus === 'function' && handleCheckBoxStatus(e.target.checked, column?.dataIndex, this.props.name)
+ }}
+ />
+ {column?.title}
+
}
- };
+ }
/** 获取table的表头信息(主要是table中的表头信息合并,[{title:1-1},{title:1-2}]变成[{title:1,children:[{title:1},{title:2}]}]) type：是否过滤 */
getTableColumn = (headerColumn, type, props) => {
// this.hasMergeHeader = false;
// 判断是否是表单详情
- const isSlaveInfo =
- props.name === "slaveInfo" ||
- (location.pathname === "/indexPage/commonCostomTabBill" &&
+ const isSlaveInfo = props.name === 'slaveInfo' ||
+ (
+ location.pathname === '/indexPage/commonCostomTabBill' &&
props.name &&
- props.name.includes("Info") &&
- commonUtils.isNotEmptyObject(this.props.slaveInfo));
+ props.name.includes('Info') &&
+ commonUtils.isNotEmptyObject(this.props.slaveInfo)
+ );
const config = isSlaveInfo ? this.props.slaveInfo.config : this.props.config;
- const isSlaveInfoM = isSlaveInfo && commonUtils.isNotEmptyObject(config) ? config.showName === "工单物资评审" : false;
+ const isSlaveInfoM = isSlaveInfo && commonUtils.isNotEmptyObject(config) ? config.showName === '工单物资评审' : false;
/* 返回值声明 */
const tableColumn = [];
let iIndex = 0;
- const specialRoute = commonUtils.isNotEmptyObject(this.props.app.currentPane) ? this.props.app.currentPane.route : ""; /* 获取路由名称 */
+ const specialRoute = commonUtils.isNotEmptyObject(this.props.app.currentPane) ? this.props.app.currentPane.route : ''; /* 获取路由名称 */
/* 遍历每一个表头标题 */
for (const column of headerColumn) {
/* 表头标题 */
@@ -3023,65 +2680,44 @@ class CommonTableRc extends React.Component {
const width = column.width;
const bNotEmpty = column.bNotEmpty;
/* 带'-'的表头是需要合并滴 */
- const index = commonUtils.isNotEmptyObject(title) ? title.indexOf("-") : -1;
+ const index = commonUtils.isNotEmptyObject(title) ? title.indexOf('-') : -1;
/* 合并走合并的,不合并就直接push */
let columnNew = {};
let sorter;
let search = true;
- if (
- props.tableProps !== undefined &&
- props.tableProps.rowKey !== undefined &&
- props.tableProps.rowKey !== "sId" &&
- !props.tableProps.sortSelf
- ) {
+ if (props.tableProps !== undefined && props.tableProps.rowKey !== undefined && props.tableProps.rowKey !== 'sId' && !props.tableProps.sortSelf) {
sorter = true;
} else {
const firstDataIndex = column.dataIndex.substring(0, 1);
- if (firstDataIndex === "d" || firstDataIndex === "i") {
- sorter = (a, b) =>
- (commonUtils.isEmpty(a[column.dataIndex]) ? 0 : a[column.dataIndex]) -
- (commonUtils.isEmpty(b[column.dataIndex]) ? 0 : b[column.dataIndex]);
- } else if (firstDataIndex === "t") {
- sorter = (a, b) =>
- moment(commonUtils.isEmpty(a[column.dataIndex]) ? "2000-01-01" : a[column.dataIndex]).diff(
- moment(commonUtils.isEmpty(b[column.dataIndex]) ? "2000-01-01" : b[column.dataIndex])
- );
+ if (firstDataIndex === 'd' || firstDataIndex === 'i') {
+ sorter = (a, b) => ((commonUtils.isEmpty(a[column.dataIndex]) ? 0 : a[column.dataIndex]) - (commonUtils.isEmpty(b[column.dataIndex]) ? 0 : b[column.dataIndex]));
+ } else if (firstDataIndex === 't') {
+ sorter = (a, b) => (moment(commonUtils.isEmpty(a[column.dataIndex]) ? '2000-01-01' : a[column.dataIndex]).diff(moment(commonUtils.isEmpty(b[column.dataIndex]) ? '2000-01-01' : b[column.dataIndex])));
} else {
- sorter = (a, b) =>
- (commonUtils.isEmpty(a[column.dataIndex]) ? "0" : a[column.dataIndex]).localeCompare(
- commonUtils.isEmpty(b[column.dataIndex]) ? "1" : b[column.dataIndex]
- );
+ sorter = (a, b) => ((commonUtils.isEmpty(a[column.dataIndex]) ? '0' : a[column.dataIndex]).localeCompare((commonUtils.isEmpty(b[column.dataIndex]) ? '1' : b[column.dataIndex])));
}
}
/* 工单、工艺卡、报价单 去掉排序 */
- if (
- this.props.name === "sParam" ||
- specialRoute.includes("workOrder") ||
- specialRoute.includes("processCard") ||
- specialRoute.includes("quotation")
- ) {
+ if (this.props.name === 'sParam' || specialRoute.includes('workOrder') || specialRoute.includes('processCard') || specialRoute.includes('quotation')) {
sorter = false;
}
/* 默认字段是排序的 通过配置bNotSort来设置字段不排序 */
if (config && commonUtils.isNotEmptyStr(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex))) {
- if (
- config.gdsconfigformslave.filter(item => item.sName === column.dataIndex).length > 0 &&
- config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSort
- ) {
+ if(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex).length > 0 && config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSort){
sorter = false;
}
}
if (config && commonUtils.isNotEmptyStr(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex))) {
- if (config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSearch) {
+ if(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSearch){
search = false;
}
}
if (column.dataIndex === "spicture" || column.dataIndex === "tableLastEmpty") {
sorter = false;
}
- let sTitleBgColor = commonUtils.isNotEmptyObject(column.sTitleBgColor) ? column.sTitleBgColor : ""; /* 标题背景颜色 */
- let sTitleColor = commonUtils.isNotEmptyObject(column.sTitleColor) ? column.sTitleColor : ""; /* 标题字体颜色 */
+ let sTitleBgColor =commonUtils.isNotEmptyObject(column.sTitleBgColor) ? column.sTitleBgColor : ''; /* 标题背景颜色 */
+ let sTitleColor =commonUtils.isNotEmptyObject(column.sTitleColor) ? column.sTitleColor : ''; /* 标题字体颜色 */
const styleObj = {};
if (commonUtils.isNotEmptyObject(sTitleBgColor)) {
styleObj.background = sTitleBgColor;
@@ -3091,7 +2727,7 @@ class CommonTableRc extends React.Component {
}
const renderTitle = () => {
// 树形表格在第一个column上加上全部展开/收起功能
- let expandedAllIcon = "";
+ let expandedAllIcon = '';
const columnIndex = headerColumn.findIndex(item => column.title === item.title);
let { data } = this.props;
let { expKeys } = this.state;
@@ -3100,45 +2736,41 @@ class CommonTableRc extends React.Component {
data = commonUtils.isNotEmptyArr(data) ? data : [];
const childrenList = [];
- const getChildrenList = data => {
+ const getChildrenList = (data) => {
data.forEach(item => {
- if (item && typeof item.children === "object") {
+ if (item && typeof item.children === 'object') {
childrenList.push(item);
getChildrenList(item.children);
}
});
- };
+ }
getChildrenList(data);
- if (columnIndex === 0 && childrenList.length) {
- // 第一个column并且数据中有children
+ if (columnIndex === 0 && childrenList.length) { // 第一个column并且数据中有children
this.showExpAll = true;
this.tableCollapsed = !expKeys.length;
- const marginLeft = this.props.bMutiSelect ? "6px" : "2px";
+ const marginLeft = this.props.bMutiSelect ? '6px' : '2px';
expandedAllIcon = (
);
- };
- handleFastSearch = params => {
+ }
+ handleFastSearch = (params) => {
const { sName, record, oldKey } = params;
const { config, searchRowKeys = [], onBtnSearch } = this.props;
const newKey = oldKey || commonUtils.createSid();
const sFirstFieldName = `sFirst-${newKey}`;
- const { masterData } = this.props.onChange("master", sFirstFieldName, { [sFirstFieldName]: sName }, null, null, true);
+ const { masterData } = this.props.onChange('master', sFirstFieldName, { [sFirstFieldName]: sName }, null, null, true);
const sFirstValue = masterData[sFirstFieldName];
- const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? "s" : sFirstValue.substring(0, 1);
- const sSecondConditionPro = firstDataIndex === "s" && sFirstValue.endsWith("_pro");
+ const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? 's' : sFirstValue.substring(0, 1);
+ const sSecondConditionPro = firstDataIndex === 's' && sFirstValue.endsWith('_pro');
const iIndex = config.gdsconfigformslave.findIndex(item => item.sName === sFirstValue);
- masterData[`sSecond-${newKey}`] =
- sSecondConditionPro && iIndex > -1 && config.gdsconfigformslave[iIndex].sDropDownType === "sql"
- ? commonConfig.seaJudge.s_proDropDown[0].sId
- : sSecondConditionPro
- ? commonConfig.seaJudge.s_pro[0].sId
- : commonConfig.seaJudge[firstDataIndex][0].sId;
- masterData[`${firstDataIndex}Third-${newKey}`] =
- firstDataIndex === "b" ? false : firstDataIndex === "t" ? moment().format("YYYY-MM-DD") : masterData[`${firstDataIndex}Third-${newKey}`];
+ masterData[`sSecond-${newKey}`] = sSecondConditionPro && iIndex > -1 && config.gdsconfigformslave[iIndex].sDropDownType === 'sql' ?
+ commonConfig.seaJudge.s_proDropDown[0].sId : sSecondConditionPro ?
+ commonConfig.seaJudge.s_pro[0].sId : commonConfig.seaJudge[firstDataIndex][0].sId;
+ masterData[`${firstDataIndex}Third-${newKey}`] = firstDataIndex === 'b' ? false : firstDataIndex === 't' ? moment().format('YYYY-MM-DD') : masterData[`${firstDataIndex}Third-${newKey}`];
const sThirdName = `${firstDataIndex}Third-${newKey}`;
masterData[`${sThirdName}`] = record[sName];
@@ -7707,7 +6654,7 @@ class CommonTableRc extends React.Component {
onBtnSearch();
});
};
- handleClearFastSearch = oldKey => {
+ handleClearFastSearch = (oldKey) => {
const { searchRowKeys = [], onBtnSearch, masterData = {} } = this.props;
if (searchRowKeys.length > 1) {
const searchRowKeysNew = searchRowKeys.filter(item => item !== oldKey);
@@ -7717,22 +6664,22 @@ class CommonTableRc extends React.Component {
} else if (searchRowKeys.length === 1) {
const sThirdName = Object.keys(masterData).find(key => key.indexOf(`Third-${oldKey}`) !== -1);
if (sThirdName) {
- masterData[sThirdName] = "";
+ masterData[sThirdName] = '';
this.props.onSaveState({ masterData }, () => {
onBtnSearch();
});
}
}
- };
+ }
// 进行拖动排序，数据展现必须按照iOrder 进行排序展现，必须进行选择才能拖动（废弃)
moveRowOld = (dragIndex, hoverIndex) => {
const { name } = this.props;
const { selectedRowKeys } = this.state;
if (commonUtils.isEmptyArr(selectedRowKeys)) {
- message.warning("请选择后进行拖动");
+ message.warning('请选择后进行拖动');
} else {
// let mHoverIndex = hoverIndex;
- selectedRowKeys.forEach(item => {
+ selectedRowKeys.forEach((item) => {
const { dataSource } = this.state;
const iIndex = dataSource.findIndex(newItem => item === newItem[this.rowKey]);
const dragRow = dataSource[iIndex];
@@ -7740,10 +6687,7 @@ class CommonTableRc extends React.Component {
const newState = update(this.state, {
dataSource: {
- $splice: [
- [iIndex, 1],
- [hoverIndex, 0, dragRow],
- ],
+ $splice: [[iIndex, 1], [hoverIndex, 0, dragRow]],
},
});
this.setState(newState);
@@ -7752,37 +6696,37 @@ class CommonTableRc extends React.Component {
const { dataSource } = this.state;
dataSource.forEach((item, index) => {
if (commonUtils.isEmpty(item.handleType)) {
- item.handleType = "update";
+ item.handleType = 'update';
}
item.iOrder = index + 1;
});
this.setState(dataSource);
this.props.onRowMove({ [`${name}Data`]: dataSource });
}
- };
+ }
/* 拖拽改变对应层级 */
- moveRow = (dragIndex, hoverIndex, dragKey, hoverKey) => {
- if (this.props.onMoveRow) {
- this.props.onMoveRow(dragIndex, hoverIndex, dragKey, hoverKey, this.props);
+ moveRow = (dragIndex, hoverIndex,dragKey,hoverKey) => {
+ if(this.props.onMoveRow) {
+ this.props.onMoveRow(dragIndex, hoverIndex,dragKey,hoverKey);
}
};
BtnUploadDivProps = () => {
return {
- accept: this.BtnUploadDivPropsAttr.current?.sActiveKey || "*/*",
- beforeUpload: file => {
+ accept: this.BtnUploadDivPropsAttr.current?.sActiveKey || '*/*',
+ beforeUpload: (file) => {
const config = this.BtnUploadDivPropsAttr.current;
- if (config?.sActiveKey && typeof config?.sActiveKey === "string") {
- const isAllow = config?.sActiveKey?.split(",").includes(file.type);
+ if (config?.sActiveKey && typeof config?.sActiveKey === 'string') {
+ const isAllow = config?.sActiveKey?.split(',').includes(file.type);
if (!isAllow) {
- message.error(`请选择正确的文件类型,包含${config?.sActiveKey || ""}`);
+ message.error(`请选择正确的文件类型,包含${config?.sActiveKey || ''}`);
}
return isAllow;
}
return true;
- },
- };
- };
+ }
+ }
+ }
/** 渲染 */
render() {
@@ -7818,7 +6762,7 @@ class CommonTableRc extends React.Component {
if (commonUtils.isNotEmptyObject(previewImage)) {
if (commonUtils.isNotEmptyArr(this.props.data)) {
if (this.props.data[0].sPicturePath) {
- for (const item of this.props.data) {
+ for(const item of this.props.data) {
const dataUrl = `${commonConfig.file_host}file/download?savePathStr=${item.sPicturePath}&sModelsId=100&token=${token}`; /* 缩略图 */
data.push(dataUrl);
}
@@ -7833,9 +6777,9 @@ class CommonTableRc extends React.Component {
const divProps = {
action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}`,
onChange: this.handleUploadChange,
- accept: "*/*",
+ accept: '*/*',
showUploadList: false,
- multiple: true,
+ multiple:true,
beforeUpload: this.handleBeforeUpload,
};
/* 获取look的props */
@@ -7869,7 +6813,7 @@ class CommonTableRc extends React.Component {
/* 通用弹窗功能 */
let commonPopupProps = {};
- let commonPopupTitle = "选择弹窗";
+ let commonPopupTitle = '选择弹窗';
let bCommonPopup = false; /* 多列弹出窗11 */
let bCommonPopup1 = false; /* 单列弹出窗 */
let bCommonPopupTree = false; /* 树形列弹出窗 */
@@ -7878,59 +6822,35 @@ class CommonTableRc extends React.Component {
let commonPopupConfig = {};
const { config, sModelsId, app, selectedRowKeys } = this.props;
if (commonUtils.isNotEmptyObject(config)) {
- const iIndex = config.gdsconfigformslave.findIndex(
- item =>
- commonUtils.isNotEmptyObject(item.sControlName) &&
- (item.sControlName.includes("BtnPopup") || item.sControlName.includes("BtnHeadPopup")) &&
- item.bVisible &&
- item.sDropDownType === "popup"
- );
+ const iIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup')) && item.bVisible && item.sDropDownType === 'popup');
if (iIndex > -1) {
commonPopupConfig = config.gdsconfigformslave[iIndex];
- if (commonPopupShowConfig?.sControlName === "BtnPopupsAlumiteBomBillNo" || commonPopupShowConfig?.sControlName === "BtnChooseProcess") {
+ if(commonPopupShowConfig?.sControlName === 'BtnPopupsAlumiteBomBillNo' || commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
commonPopupConfig = commonPopupShowConfig;
- if (commonPopupShowConfig?.sControlName === "BtnChooseProcess") {
+ if(commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
bCommonPopupProcess = true;
}
}
- commonPopupTitle =
- commonUtils.isNotEmptyObject(commonPopupConfig) && commonUtils.isNotEmptyObject(commonPopupConfig.sActiveName)
- ? commonPopupConfig.sActiveName
- : commonPopupTitle;
- commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupRecord)
- ? commonPopupConfig.sActiveId === "1"
- ? commonUtils.isEmpty(commonPopupRecord.sSrcFormName)
- ? commonPopupTitle
- : commonPopupRecord.sSrcFormName
- : commonPopupTitle
- : commonPopupTitle;
- const sFormId = commonUtils.isNotEmptyObject(commonPopupRecord)
- ? commonPopupConfig.sActiveId === "1"
- ? commonUtils.isEmpty(commonPopupRecord.sFormId)
- ? commonPopupRecord.sSrcFormId
- : commonPopupRecord.sFormId
- : commonPopupConfig.sActiveId
- : commonPopupConfig.sActiveId;
+ commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupConfig) && commonUtils.isNotEmptyObject(commonPopupConfig.sActiveName) ? commonPopupConfig.sActiveName : commonPopupTitle;
+ commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupRecord) ? ( commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sSrcFormName) ? commonPopupTitle : commonPopupRecord.sSrcFormName : commonPopupTitle ) : commonPopupTitle;
+ const sFormId = commonUtils.isNotEmptyObject(commonPopupRecord) ? ( commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sFormId) ? commonPopupRecord.sSrcFormId : commonPopupRecord.sFormId : commonPopupConfig.sActiveId ) : commonPopupConfig.sActiveId;
commonPopupProps = {
app: {
...this.props.app,
currentPane: {
- name: "commonPopup",
- bEdit:
- commonUtils.isNotEmptyObject(app.currentPane) &&
- commonUtils.isNotEmptyObject(app.currentPane.route) &&
- app.currentPane.route.includes("commonBillDeliver"),
+ name: 'commonPopup',
+ bEdit: (commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.route) && app.currentPane.route.includes('commonBillDeliver')),
config: commonPopupConfig,
conditonValues: this.props.getSqlCondition(commonPopupConfig),
- title: commonPopupTitle,
- route: "/indexPage/commonList",
- formRoute: "/indexPage/commonList",
+ title:commonPopupTitle,
+ route: '/indexPage/commonList',
+ formRoute: '/indexPage/commonList',
formId: sFormId,
key: sModelsId + commonPopupConfig.sId,
- sModelsType: bCommonPopupProcess ? "search/commonProcess" : "search/commonPopup",
- select: this.handleSelectCommonPopup,
- selectCancel: this.handleSelectCancel.bind(this, "commonPopupVisible"),
+ sModelsType: bCommonPopupProcess ? 'search/commonProcess' : 'search/commonPopup',
+ select:this.handleSelectCommonPopup,
+ selectCancel: this.handleSelectCancel.bind(this, 'commonPopupVisible'),
},
},
dispatch: this.props.dispatch,
@@ -7938,57 +6858,38 @@ class CommonTableRc extends React.Component {
id: randomId,
onOpenNewTab: this.onOpenNewTab,
outerMasterData: this.props.masterData,
- realizeHeight: this.props.realizeHeight /* 拖动偏移高度 */,
+ realizeHeight: this.props.realizeHeight, /* 拖动偏移高度 */
};
}
/* 多列弹出窗 */
- const commonPopupIndex = config.gdsconfigformslave.findIndex(
- item =>
- commonUtils.isNotEmptyObject(item.sControlName) &&
- (item.sControlName.includes("BtnPopup") || item.sControlName.includes("BtnHeadPopup")) &&
- !["BtnPopup1"].includes(item.sControlName) &&
- !item.sControlName.startsWith("BtnPopupEdit") &&
- item.bVisible &&
- item.sDropDownType === "popup"
- );
+ const commonPopupIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup') ) && !['BtnPopup1'].includes(item.sControlName) && !item.sControlName.startsWith('BtnPopupEdit') && item.bVisible && item.sDropDownType === 'popup');
if (commonPopupIndex > -1) {
bCommonPopup = true;
}
/* 单列弹出窗 */
- const commonPopupIndex1 = config.gdsconfigformslave.findIndex(
- item =>
- commonUtils.isNotEmptyObject(item.sControlName) &&
- item.sControlName.includes("BtnPopup1") &&
- item.bVisible &&
- item.sDropDownType === "popup"
- );
+ const commonPopupIndex1 = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.includes('BtnPopup1') && item.bVisible && item.sDropDownType === 'popup');
if (commonPopupIndex1 > -1) {
bCommonPopup1 = true;
bCommonPopup = false;
}
/* commonListTree弹出窗 */
- const commonPopupIndexTree = config.gdsconfigformslave.findIndex(
- item =>
- commonUtils.isNotEmptyObject(item.sControlName) &&
- item.sControlName === "BtnPopupListTree" &&
- item.bVisible &&
- item.sDropDownType === "popup"
- );
+ const commonPopupIndexTree = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName === 'BtnPopupListTree' && item.bVisible && item.sDropDownType === 'popup');
if (commonPopupIndexTree > -1) {
bCommonPopupTree = true;
}
+
}
}
/* 字段弹窗功能 */
let commonFieldPopupProps = {};
let bFieldPopup = true; /* 多列弹出窗 */
- let commonFieldPopupTitle = "选择弹窗";
- const commonFileDownloadTitle = "附件列表弹窗";
- const isBtnPopupEdit = this.state.commonFieldPopupShowConfig?.sControlName?.startsWith("BtnPopupEdit");
+ let commonFieldPopupTitle = '选择弹窗';
+ const commonFileDownloadTitle = '附件列表弹窗';
+ const isBtnPopupEdit = this.state.commonFieldPopupShowConfig?.sControlName?.startsWith('BtnPopupEdit');
if (commonUtils.isNotEmptyObject(this.props)) {
let commonFieldPopupConfig = {};
const { config, sModelsId } = this.props;
@@ -7998,37 +6899,31 @@ class CommonTableRc extends React.Component {
iIndex = 0;
commonFieldPopupConfig = commonFieldPopupShowConfig;
} else {
- iIndex = config.gdsconfigformslave.findIndex(
- item => commonUtils.isNotEmptyObject(item.sName) && (item.sDropDownType === "popup" || item.sDropDownType === "popupSingle")
- );
+ iIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sName) && (item.sDropDownType === 'popup' || item.sDropDownType === 'popupSingle'));
if (iIndex > -1) {
commonFieldPopupConfig = config.gdsconfigformslave[iIndex];
}
}
if (iIndex > -1) {
- if (commonFieldPopupConfig.sDropDownType === "popupSingle") {
- /* 如果下拉类型是单列弹出窗 则为单列 */
+ if(commonFieldPopupConfig.sDropDownType === 'popupSingle') { /* 如果下拉类型是单列弹出窗 则为单列 */
bFieldPopup = false;
}
- commonFieldPopupTitle =
- commonUtils.isNotEmptyObject(commonFieldPopupConfig) && commonUtils.isNotEmptyObject(commonFieldPopupConfig.sActiveName)
- ? commonFieldPopupConfig.sActiveName
- : commonFieldPopupTitle;
+ commonFieldPopupTitle = commonUtils.isNotEmptyObject(commonFieldPopupConfig) && commonUtils.isNotEmptyObject(commonFieldPopupConfig.sActiveName) ? commonFieldPopupConfig.sActiveName : commonFieldPopupTitle;
commonFieldPopupProps = {
app: {
...this.props.app,
currentPane: {
- name: "commonPopup",
+ name: 'commonPopup',
config: commonFieldPopupConfig,
- title: commonFieldPopupTitle,
- route: "/indexPage/commonList",
- formRoute: "/indexPage/commonList",
+ title:commonFieldPopupTitle,
+ route: '/indexPage/commonList',
+ formRoute: '/indexPage/commonList',
formId: commonFieldPopupConfig.sActiveId,
key: sModelsId + commonFieldPopupConfig.sId,
- sModelsType: "search/commonPopup",
- select: this.handleSelectCommonFieldPopup,
- selectCancel: this.handleSelectCancel.bind(this, "commonFieldPopupVisible"),
+ sModelsType: 'search/commonPopup',
+ select:this.handleSelectCommonFieldPopup,
+ selectCancel: this.handleSelectCancel.bind(this, 'commonFieldPopupVisible'),
},
},
dispatch: this.props.dispatch,
@@ -8036,20 +6931,16 @@ class CommonTableRc extends React.Component {
id: randomId,
onOpenNewTab: this.onOpenNewTab,
outerMasterData: this.props.masterData,
- realizeHeight: this.props.realizeHeight /* 拖动偏移高度 */,
+ realizeHeight: this.props.realizeHeight, /* 拖动偏移高度 */
};
- if (this.props.enabled && commonFieldPopupConfig?.sControlName?.includes("popupSingle_edit")) {
- commonFieldPopupProps.app.currentPane.conditonValues = this.props.getSqlCondition(
- commonFieldPopupConfig,
- this.props.name,
- commonFieldPopupShowRecord
- );
+ if (this.props.enabled && commonFieldPopupConfig?.sControlName?.includes('popupSingle_edit')) {
+ commonFieldPopupProps.app.currentPane.conditonValues = this.props.getSqlCondition(commonFieldPopupConfig, this.props.name, commonFieldPopupShowRecord);
} else {
commonFieldPopupProps.app.currentPane.conditonValues = this.props.getSqlCondition(commonFieldPopupConfig);
}
if (isBtnPopupEdit) {
const selectData = tableProps.dataSource[this.rowClickRef.current] || {};
- const sMemoData = selectData?.[this.state.commonFieldPopupShowConfig?.sActiveKey] || "[]";
+ const sMemoData = selectData?.[this.state.commonFieldPopupShowConfig?.sActiveKey] || '[]';
commonFieldPopupProps.app.sMemoData = JSON.parse(sMemoData);
commonFieldPopupProps.app.originSlaveData = selectData;
commonFieldPopupProps.app.currentPane.bEdit = isBtnPopupEdit;
@@ -8059,42 +6950,33 @@ class CommonTableRc extends React.Component {
}
}
+
/* 蓝色链接弹Modal窗功能 */
let commonModalProps = {};
- let commonModalTitle = "查看";
+ let commonModalTitle = '查看';
if (commonUtils.isNotEmptyObject(this.props)) {
const { config, sModelsId, app, selectedRowKeys, enabled } = this.props;
if (commonUtils.isNotEmptyObject(config)) {
- commonModalTitle =
- commonUtils.isNotEmptyObject(commonModalShowConfig) && commonUtils.isNotEmptyObject(commonModalShowConfig.sActiveName)
- ? commonModalShowConfig.sActiveName
- : commonModalTitle;
- const sFormId =
- commonUtils.isNotEmptyObject(commonModalRecord) && commonUtils.isNotEmptyObject(commonModalShowConfig)
- ? commonModalShowConfig.sActiveId === "1"
- ? commonUtils.isEmpty(commonModalRecord.sFormId)
- ? commonModalRecord.sSrcFormId
- : commonModalRecord.sFormId
- : commonModalShowConfig.sActiveId
- : commonModalShowConfig?.sActiveId;
+ commonModalTitle = commonUtils.isNotEmptyObject(commonModalShowConfig) && commonUtils.isNotEmptyObject(commonModalShowConfig.sActiveName) ? commonModalShowConfig.sActiveName : commonModalTitle;
+ const sFormId = commonUtils.isNotEmptyObject(commonModalRecord) && commonUtils.isNotEmptyObject(commonModalShowConfig) ? ( commonModalShowConfig.sActiveId === '1' ? commonUtils.isEmpty(commonModalRecord.sFormId) ? commonModalRecord.sSrcFormId : commonModalRecord.sFormId : commonModalShowConfig.sActiveId ) : commonModalShowConfig?.sActiveId;
commonModalProps = {
app: {
...this.props.app,
currentPane: {
- name: "commonModal",
- bEdit: commonModalShowConfig?.sName === "dStockAuxiliaryQty" ? enabled : false,
+ name: 'commonModal',
+ bEdit: commonModalShowConfig?.sName === 'dStockAuxiliaryQty'? enabled:false,
config: commonModalShowConfig,
- conditonValues: commonModalShowConfig ? this.props.getSqlCondition(commonModalShowConfig, this.props.name, commonModalRecord) : {},
- title: commonModalTitle,
- route: "/indexPage/commonList",
- formRoute: "/indexPage/commonList",
+ conditonValues: commonModalShowConfig ? this.props.getSqlCondition(commonModalShowConfig, this.props.name, commonModalRecord) :{},
+ title:commonModalTitle,
+ route: '/indexPage/commonList',
+ formRoute: '/indexPage/commonList',
formId: sFormId,
key: sModelsId + commonModalShowConfig?.sId,
- sModelsType: "search/commonPopup",
- select: this.handleSelectCommonPopup,
- selectCancel: this.handleSelectCancel.bind(this, "commonModalVisible"),
- slaveDataSource: commonModalShowConfig?.sName === "dStockAuxiliaryQty" ? [commonModalRecord] : [],
+ sModelsType: 'search/commonPopup',
+ select:this.handleSelectCommonPopup,
+ selectCancel: this.handleSelectCancel.bind(this, 'commonModalVisible'),
+ slaveDataSource :commonModalShowConfig?.sName === 'dStockAuxiliaryQty'? [commonModalRecord]: [],
},
},
dispatch: this.props.dispatch,
@@ -8102,29 +6984,30 @@ class CommonTableRc extends React.Component {
id: randomId,
onOpenNewTab: this.onOpenNewTab,
outerMasterData: this.props.masterData,
- realizeHeight: this.props.realizeHeight /* 拖动偏移高度 */,
- bEdit: commonModalShowConfig?.sName === "dAvailableAuxiliaryQty" ? enabled : false,
+ realizeHeight: this.props.realizeHeight, /* 拖动偏移高度 */
+ bEdit:commonModalShowConfig?.sName === 'dAvailableAuxiliaryQty'? enabled:false
};
// if(commonModalShowConfig?.sName === 'dSumCompleteAvailableStockQty' ){
// commonModalProps.data = commonModalData;
// }
+
}
}
+
/* 表格可展开明细 */
- let slaveTableProps = "";
- let expandedRow = "";
- if (this.props.setExpandedRowRender !== undefined && this.props.setExpandedRowRender.toString() === "Y") {
+ let slaveTableProps = '';
+ let expandedRow = '';
+ if (this.props.setExpandedRowRender !== undefined && this.props.setExpandedRowRender.toString() === 'Y') {
slaveTableProps = this.getSlaveTableProps();
- expandedRow = record => {
+ expandedRow = (record) => {
let filterData = 0;
- let columns = "";
+ let columns = '';
let planLoading = false;
- if (this.props.name === "slave" || location.pathname === "/indexPage/commonCostomTabBill") {
- /* 过滤嵌套表 */
+ if (this.props.name === 'slave' || location.pathname === '/indexPage/commonCostomTabBill') { /* 过滤嵌套表 */
/* 获取loading 加载状态 */
const planLoadingSate = this.props.slaveInfo.tableProps.planLoadingSate;
- const planCurrentId = commonUtils.isNotEmptyObject(planLoadingSate) ? planLoadingSate.sId : "";
+ const planCurrentId = commonUtils.isNotEmptyObject(planLoadingSate) ? planLoadingSate.sId : '';
if (record[this.rowKey] === planCurrentId) {
planLoading = planLoadingSate.planLoading;
}
@@ -8133,32 +7016,26 @@ class CommonTableRc extends React.Component {
columns = this.state.tableInfoColumn;
const GetChildFilterData = this.props.onTableFilterData;
if (GetChildFilterData !== undefined) {
- const slaveInfoData = this.props.onTableFilterData("slave", AllData, record);
+ const slaveInfoData = this.props.onTableFilterData('slave', AllData, record);
if (commonUtils.isNotEmptyArr(slaveInfoData) && slaveInfoData.length > 0) {
filterData = slaveInfoData;
}
}
}
return (
-
+ {sName}{ i + 1 === itemLength ? '' :
);
- });
+ })
return (
- {
- return
+ whiteSpace: 'nowrap',
+ width: 'auto',
+ maxWidth: '100%',
+ height: '29px',
+ overflow: 'hidden',
+ lineHeight: '29px',
+ textOverflow: 'ellipsis'
+ }}>
+ {
+ return
);
}
@@ -2221,16 +1903,16 @@ class CommonTableRc extends React.Component {
}
let bPagination = true; /* 默认表格分页s */
if (commonUtils.isNotEmptyObject(this.props)) {
- bPagination = commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination);
+ bPagination = (commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination));
}
let noVlistController = false;
- if (this.props.config && this.props.config.gdsconfigformslave.filter(item => item.sControlName === "bNoVlist")[0]) {
+ if(this.props.config && this.props.config.gdsconfigformslave.filter(item => item.sControlName === 'bNoVlist')[0]) {
noVlistController = true;
}
/* 特殊情况的表格 在虚拟列表情况 会无法滑动 */
let noVlistTable = false;
- if (this.props.noVlistTable) {
+ if(this.props.noVlistTable) {
noVlistTable = true;
}
// 判断是否有合并单元格, 有的话默认关闭虚拟滚动
@@ -2251,26 +1933,22 @@ class CommonTableRc extends React.Component {
const { tableClassName } = this.state;
const oTable = document.querySelectorAll(`.${tableClassName}`)[0];
if (oTable) {
- const oBody = oTable.querySelector(".ant-table-body");
+ const oBody = oTable.querySelector('.ant-table-body');
oBody && (oBody.scrollTop = 0);
}
window.vlistNewSearh = null;
- this.Vcomponents = VListNew({
- height: this.scrollY,
- vid: this.uniqueId,
- onScroll: () => {
- setTimeout(() => {
- let divs = document.getElementsByClassName("noInputInsert");
- if (divs.length) {
- Array.prototype.forEach.call(divs, item => {
- item.parentNode.parentNode.parentNode.parentNode.classList.add("insertTd");
- });
- }
- }, 20);
- },
- });
+ this.Vcomponents = VListNew({height: this.scrollY, vid: this.uniqueId, onScroll: () => {
+ setTimeout(() => {
+ let divs = document.getElementsByClassName('noInputInsert');
+ if (divs.length) {
+ Array.prototype.forEach.call(divs, item => {
+ item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
+ });
+ }
+ }, 20);
+ }});
}
- components = { ...this.Vcomponents, ...components };
+ components = {...this.Vcomponents, ...components};
} else {
// vid是多个列表在同个页面中，同时渲染会促发问题
// vid不可以为随机数，随机数会导致双击时，点击的两个VList id不同
@@ -2281,51 +1959,46 @@ class CommonTableRc extends React.Component {
const { tableClassName } = this.state;
const oTable = document.querySelectorAll(`.${tableClassName}`)[0];
if (oTable) {
- const oBody = oTable.querySelector(".ant-table-body");
+ const oBody = oTable.querySelector('.ant-table-body');
oBody && (oBody.scrollTop = 0);
}
window.vlistNewSearh = null;
- this.Vcomponents1 = VList({
- height: this.scrollY,
- vid: this.uniqueId,
- rowKey: this.rowKey,
- onScroll: () => {
- setTimeout(() => {
- let divs = document.getElementsByClassName("noInputInsert");
- if (divs.length) {
- Array.prototype.forEach.call(divs, item => {
- item.parentNode.parentNode.parentNode.parentNode.classList.add("insertTd");
- });
- }
- }, 20);
- },
- });
+ this.Vcomponents1 = VList({ height: this.scrollY, vid: this.uniqueId, rowKey: this.rowKey, onScroll: () => {
+ setTimeout(() => {
+ let divs = document.getElementsByClassName('noInputInsert');
+ if (divs.length) {
+ Array.prototype.forEach.call(divs, item => {
+ item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
+ });
+ }
+ }, 20);
+ } });
}
components = { ...this.Vcomponents1, ...components };
}
}
if (this.props.config && this.props.config.iFreezeColumn) {
tableColumn.forEach((val, index) => {
- if (tableColumn[index].fixedHelp) {
+ if(tableColumn[index].fixedHelp) {
tableColumn[index].fixed = false;
tableColumn[index].fixedHelp = false;
}
if (index < this.props.config.iFreezeColumn) {
- tableColumn[index].fixed = "left";
+ tableColumn[index].fixed = 'left';
tableColumn[index].fixedHelp = true;
}
});
}
// 处理拖拽排序
if (this.props.dragHandle) {
- const handleSortTitle = commonFunc.showMessage(this.props.app.commonConst, "sort") || "排序";
- const handleSort = tableColumn.filter(item => item.dataIndex === "handleSort").length;
+ const handleSortTitle = commonFunc.showMessage(this.props.app.commonConst, 'sort') || '排序' ;
+ const handleSort = tableColumn.filter(item => item.dataIndex === 'handleSort').length;
if (tableColumn[0]) {
function arrayMoveMutable(array, fromIndex, toIndex) {
const startIndex = fromIndex < 0 ? array.length + fromIndex : fromIndex;
if (startIndex >= 0 && startIndex < array.length) {
const endIndex = toIndex < 0 ? array.length + toIndex : toIndex;
- if (commonUtils.isNotEmptyObject(array[fromIndex].sWorkOrderUsed)) {
+ if(commonUtils.isNotEmptyObject(array[fromIndex].sWorkOrderUsed)) {
message.error(array[fromIndex].sWorkOrderUsed);
return;
}
@@ -2338,7 +2011,7 @@ class CommonTableRc extends React.Component {
arrayMoveMutable(array, fromIndex, toIndex);
return array;
}
- const DragHandle = sortableHandle(() => {content}
;
- }}
- >
- {content}
- {content}
+ }}>
+ {content}
+
-
-
{
- this.myInfoDiv = ref;
- }}
- >
+
+
+
+
-
{ this.myInfoDiv = ref; }}>
@@ -8170,7 +7047,7 @@ class CommonTableRc extends React.Component {
if (commonUtils.isNotEmptyArr(tableProps.columns)) {
const lastColumn = tableProps.columns[tableProps.columns.length - 1];
- if (lastColumn.title && typeof lastColumn.title === "string" && lastColumn.title.indexOf("-") === -1) {
+ if (lastColumn.title && typeof lastColumn.title === 'string' && lastColumn.title.indexOf('-') === -1) {
lastColumn.width && delete lastColumn.width;
}
}
@@ -8183,7 +7060,7 @@ class CommonTableRc extends React.Component {
bFullUrl: false,
onCancel: () => {
this.setState({ officePreviewVisible: false });
- },
+ }
};
let layoutScrollY;
@@ -8196,335 +7073,260 @@ class CommonTableRc extends React.Component {
layoutScrollY = this.props.fixedHeight;
}
let bShowBtnUpload = true;
- if (commonUtils.isNotEmptyObject(this.props.masterData) && commonUtils.isNotEmptyObject(this.props.masterData.sZczlxShowName)) {
- bShowBtnUpload = this.props.masterData.sZczlxShowName !== "删除" && this.props.masterData.sZczlxShowName !== "恢复";
+ if(commonUtils.isNotEmptyObject(this.props.masterData) && commonUtils.isNotEmptyObject(this.props.masterData.sZczlxShowName)) {
+ bShowBtnUpload = this.props.masterData.sZczlxShowName !== '删除' && this.props.masterData.sZczlxShowName !== '恢复';
}
const hasColorInfo = this.props?.masterConfig?.sTableColorTs;
const BtnUpload = commonFunc.showLocalMessage(this.props, "BtnUpload", "上传");
- // 强制转换iorder
- // tableProps.dataSource = tableProps.dataSource.sort((a, b) => {
- // const hasA = a.hasOwnProperty("sName") && a.sName != null;
- // const hasB = b.hasOwnProperty("sName") && b.sName != null;
- // if (hasA && !hasB) return -1;
- // if (!hasA && hasB) return 1;
-
- // // 2. bVisible 为 true 的在前
- // const visA = a.bVisible === true;
- // const visB = b.bVisible === true;
- // if (visA && !visB) return -1;
- // if (!visA && visB) return 1;
-
- // // 3. 最后按 iOrder 升序
- // return a.iOrder - b.iOrder;
- // });
- const list = tableProps.dataSource?.filter(x => x.sName);
-
- list.forEach((item, index) => {
- if (item.iOrders === undefined || item.iOrders === null) {
- // item.iOrder = (index + 1) * 10;
- item.iOrders = item.iOrder;
- item.isSettingFunctions = true;
- }
- });
- let newTableProps = cloneDeep(tableProps);
- // 强制转换展示iOrder
- if (this.props.isSettingFunctions) {
- newTableProps.dataSource = newTableProps.dataSource.map((item, index) => {
- item.iOrder = (index + 1) * 10;
- item.iOrders = tableProps.dataSource[index].iOrder;
- item.isSettingFunctions = true;
- return item;
- });
- }
- // 排序
return (
-
- {this.props.name === "picFile" ||
- (commonUtils.isNotEmptyObject(this.props.name) && this.props.name.indexOf("file") > -1) ||
- (this.props.name.startsWith("slave") && this.findIsUpdByControlName(this.props, "BtnUpload") && bShowBtnUpload) ? (
-
-
-
- ) : null}
+ {
+ this.props.name === 'picFile' || (commonUtils.isNotEmptyObject(this.props.name) && this.props.name.indexOf('file') > -1) ||
+ (this.props.name.startsWith('slave') && this.findIsUpdByControlName(this.props, 'BtnUpload') && bShowBtnUpload ) ?
+
+
+
+ : null }
{
+ className={`xlyCommonTable ${tableClassName} ${this.hasSpanBgColor ? 'tableNoPadding' : ''} ${this.props.enabled ? 'tableEnabled' : ''}` }
+ style={{ height: isSmall ? 'calc(100% - 44px)' : '' }} ref={(ref) => {
this.mydiv = ref;
if (this.mydiv) {
this.computedTdWidth();
- if (false && commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes("commonListTab")) {
- this.mydiv.getElementsByClassName("ant-table-body")[0].style.height = this.tableHeight ? this.tableHeight + "px" : 80 + "px";
+ if (false && commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes('commonListTab')) {
+ this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = this.tableHeight ? this.tableHeight + 'px': 80 + 'px';
}
if (layoutScrollY) {
- this.mydiv.getElementsByClassName("ant-table-body")[0].style.height =
- typeof layoutScrollY === "number" ? layoutScrollY + "px" : layoutScrollY;
+ this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = typeof layoutScrollY === 'number' ? layoutScrollY + 'px' : layoutScrollY;
}
}
}}
id={`table_${this.props.formId}_${this.props.config?.sId}`}
>
- {this.isDragAndDrop ? (
-
-
-
- ) : (
-
+
+ :
+ (this.colorInfo = e)}>
- this.colorInfo = e}>
+ {
- this.onChange({ current: page, pageSize });
- }}
- />
- )}
+ { tableProps.pagination && {this.onChange({ current: page, pageSize })}}
+ /> }
- )}
+ }
+
- {previewVisible ? (
-
-
-
- )}
+ {
+ this.isDragAndDrop ?
+
+
+
+ }
- {hasColorInfo && (
-
- {/* 图片正常的列表显示 */}
-
- {bCommonPopup ? (
+ {bCommonPopup ?
- ) : (
- ""
- )}
- {commonFieldPopupVisible ? (
-
- {[""].map(() => {
- if (commonFieldPopupShowConfig.sControlName?.includes("popupSingle")) {
- if (this.props.enabled && commonFieldPopupShowConfig.sControlName?.includes("edit")) {
- commonFieldPopupProps.editable = true;
+ : ''
+ }
+ {
+ commonFieldPopupVisible ?
+
+ {[''].map(() => {
+ if (commonFieldPopupShowConfig.sControlName?.includes("popupSingle")) {
+ if (this.props.enabled && commonFieldPopupShowConfig.sControlName?.includes("edit")) {
+ commonFieldPopupProps.editable = true;
+ }
+ return
- ) : (
- ""
- )}
+ })}
+
+ : ''
+ }
- {commonModalVisible ? (
-
-
- ) : (
- ""
- )}
+ {
+ commonModalVisible ?
+
+
+ : ''
+ }
- {commonFileDownloadVisible ? (
- {
- const newList = [...commonFileDownloadList];
- const checkState = newList.find(item => !item.checked);
- newList.forEach(item => (item.checked = checkState));
- this.setState({
- commonFileDownloadList: newList,
- });
- }}
- >
- 全选/取消全选
- ,
- ,
- ,
- ]}
- >
-
+ : ''
+ }
+ {
+ pdfFileVisible ?
+ {
+ this.setState({
+ pdfFileVisible: false
+ });
+ }}
+ >
+ : ''
+ }
+ {
+ bOperateMoreVisible ?
+ {
+ this.setState({
+ bOperateMoreVisible: false
+ });
+ }}
+ >
+ : ''
+ }
this.setState({ simpleModalVisible: false, simpleModalWord: "" })}
- >
-
-
- )}
+ { this.state.simpleModalVisible && this.setState({ simpleModalVisible: false, simpleModalWord: '' })}
+ >
+
+ }
);
}
}
-const CommonTable = props => {
+const CommonTable = (props) => {
const { name, data = [] } = props;
const [headerColumn, setHeaderColumn] = useState([]);
const addState = {};
- if (name !== "master") {
+ if (name !== 'master') {
const config = props.onMergeSlaveConfig && props.onMergeSlaveConfig(props.config);
if (commonUtils.isNotEmptyObject(config)) {
addState.config = config;
@@ -8641,7 +7428,7 @@ const CommonTable = props => {
}, [JSON.stringify(data)]);
if (props.defaultExpandAllRows !== undefined && props.data === undefined) {
- return "";
+ return '';
}
const handleMoveLine = ({ index, direction }) => {
@@ -8660,11 +7447,11 @@ const CommonTable = props => {
data[indexNew].iOrder = iOrder1;
const tempItem = data[index];
- data[index] = { ...data[indexNew], handleType: data[indexNew].handleType || "update" };
- data[indexNew] = { ...tempItem, handleType: tempItem.handleType || "update" };
+ data[index] = {...data[indexNew], handleType: data[indexNew].handleType || "update"};
+ data[indexNew] = {...tempItem, handleType: tempItem.handleType || "update"};
props.onSaveState({
- [`${props.name}Data`]: data,
+ [`${props.name}Data`]: data
});
};
@@ -8676,15 +7463,15 @@ const CommonTable = props => {
delete props.tableProps.AutoTableHeight;
}
}
- const setTempFixedHeight = height => {
+ const setTempFixedHeight = (height) => {
sessionStorage.setItem(`${props.formId}_${props.config.sId}_tableHeight`, height);
window.vlistNewSearh = true;
setUpdateRowNumTime(pre => pre + 1);
- };
+ }
const uniqueTableId = `table_${props.formId}_${props.config?.sId}`;
return (
-
+
@@ -8694,12 +7481,12 @@ const CommonTable = props => {
const handleSetIRowNum = (data, props) => {
data.forEach((item, index) => {
item.iRowNum = index + 1;
- if (["12710101117007068710620"].includes(props?.app?.currentPane?.formId)) {
+ if (['12710101117007068710620'].includes(props?.app?.currentPane?.formId)) {
item.sVersionNum = item.iRowNum.toString().padStart(2, 0);
}
// 排除成品盘点、材料盘点（数据太多，循环页面卡死）
- if (props.name === "slaveChild" && !["192116810113315264733417750", "192116810113315228128521360"].includes(props?.app?.currentPane?.formId)) {
+ if (props.name === 'slaveChild' && !['192116810113315264733417750', '192116810113315228128521360'].includes(props?.app?.currentPane?.formId)) {
/* 序号根据sSqlConditonId分组 序号重排 */
const groupedData = commonUtils.groupBy(data, item => item.sSqlConditionId);
if (commonUtils.isNotEmptyObject(groupedData)) {
@@ -8708,26 +7495,28 @@ const handleSetIRowNum = (data, props) => {
if (commonUtils.isNotEmptyArr(eachData)) {
eachData.forEach((item, index) => {
/* 采购 */
- item.iRowNum = index + 1;
+ item.iRowNum = index +1;
const iIndex = data.findIndex(row => row.sId === item.sId);
- if (iIndex > -1) {
- data[iIndex] = { ...data[iIndex], iRowNum: index + 1 };
+ if(iIndex > -1) {
+ data[iIndex] ={...data[iIndex], iRowNum: index +1}
}
+
});
}
}
}
}
- if (location.pathname !== "/indexPage/commonClassify") {
+ if(location.pathname !== '/indexPage/commonClassify'){
if (commonUtils.isNotEmptyArr(item.children)) {
handleSetIRowNum(item.children, props);
}
}
});
-};
+}
-const MoveLineComponent = props => {
- if (!location.pathname.includes("commonSubBill")) {
+const MoveLineComponent = (props) => {
+
+ if (!location.pathname.includes('commonSubBill')) {
return "";
}
@@ -8742,28 +7531,28 @@ const MoveLineComponent = props => {
const initialBottom = position.bottom;
const initialY = e.clientY;
- const moveHandler = moveEvent => {
+ const moveHandler = (moveEvent) => {
const newY = moveEvent.clientY;
const newBottom = initialBottom - (newY - initialY);
setPosition({ bottom: newBottom });
};
const upHandler = () => {
- const preHeight = document.querySelector(`#${props.uniqueTableId}`).querySelector(".ant-table-body").getBoundingClientRect().height;
+ const preHeight = document.querySelector(`#${props.uniqueTableId}`).querySelector('.ant-table-body').getBoundingClientRect().height;
props.setTempFixedHeight(Math.max(preHeight - positionRef.current.bottom, 37));
setPosition({ bottom: 0 });
document.body.onselectstart = () => true;
- document.removeEventListener("mousemove", moveHandler);
- document.removeEventListener("mouseup", upHandler);
+ document.removeEventListener('mousemove', moveHandler);
+ document.removeEventListener('mouseup', upHandler);
};
document.body.onselectstart = () => false;
- document.addEventListener("mousemove", moveHandler);
- document.addEventListener("mouseup", upHandler);
- },
+ document.addEventListener('mousemove', moveHandler);
+ document.addEventListener('mouseup', upHandler);
+ }
};
return ;
-};
+}
export default CommonTable;
--
libgit2 0.22.2
- {commonUtils.isNotEmptyArr(data)
- ? data.map((item, i) => {
- return (
- // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
- 
this.showimg(i)} key={item} />
- );
- })
- : ""}
+ {
+ previewVisible ?
+
+
-
- ) : (
- ""
- )}
- {commonPopupVisible ? (
+
+ : ''
+ }{
+ commonPopupVisible ?
+ {/* 图片正常的列表显示 */}
+
- {/* 引入的image组件s */}
-
+ {commonUtils.isNotEmptyArr(data) ? data.map((item, i) => {
+ return (
+ // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+ this.showimg(i)}
+ key={item}
+ />
+ );
+ }) : ''}
+
+ {/* 引入的image组件s */}
+
- {commonFileDownloadList.map(item => {
- const { url, checked } = item;
- const fileName = url.split("/").pop().split("_").pop();
- const fileType = fileName.split(".").pop().toLowerCase();
- const previewFileList = ["jpg", "png", "jepg", "webp", "svg", "bmp", "apng", "pdf"];
- return (
-
-
+ )
+ })
+ }
+
- {
- if (sessionStorage.previewFlag) {
- sessionStorage.removeItem("previewFlag");
- } else {
- const newList = [...commonFileDownloadList];
- newList.find(item => item.url === url).checked = e.target.checked;
- this.setState({
- commonFileDownloadList: newList,
- });
- }
- }}
- >
- {
+ }>全选/取消全选,
+ ,
+ ,
+ ]}
+ >
+ {
- this.setState({
- pdfFileVisible: false,
- });
- }}
- >
-
- ) : (
- ""
- )}
- {bOperateMoreVisible ? (
- {
- this.setState({
- bOperateMoreVisible: false,
- });
- }}
- >
-
- ) : (
- ""
- )}
+ }} title="预览">
+
+ {
+ commonFileDownloadList.map(item => {
+ const { url, checked } = item;
+ const fileName = url.split('/').pop().split('_').pop();
+ const fileType = fileName.split('.').pop().toLowerCase();
+ const previewFileList = ['jpg', 'png', 'jepg', 'webp', 'svg', 'bmp', 'apng', 'pdf'];
+ return (
+
+
- );
- })}
-
-
- ) : (
- ""
- )}
- {pdfFileVisible ? (
-
+ {
+ if (sessionStorage.previewFlag) {
+ sessionStorage.removeItem('previewFlag');
+ } else {
+ const newList = [...commonFileDownloadList];
+ newList.find(item => item.url === url).checked = e.target.checked;
+ this.setState({
+ commonFileDownloadList: newList
+ })
+ }
+ }}
+ >
+ {
sessionStorage.previewFlag = 1;
- if (fileType === "pdf") {
+ if (fileType === 'pdf') {
this.setState({
pdfFileVisible: true,
pdfFileUrl: url,
@@ -8532,95 +7334,80 @@ class CommonTableRc extends React.Component {
} else {
this.handlePreviewImage(e, [url]);
}
- }}
- title="预览"
- >
-
-
-
-
-
-
-
-
+
+
+
+
+