Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

FormInsertDiy/AffairPage/ApplyPage/List.js

@@ -230,6 +230,7 @@ export default class List extends Component {
       loading,
       noSelectRow: !listConfig.selectRows,
       onSelectRow: this.handleSelectRows,
+      scroll: {x: true},
     };
     if (!listConfig.paging) {
       tableProps.data = { list: data, pagination: false };

FormInsertDiy/AffairPage/AuditPage/List.js

@@ -282,6 +282,7 @@ export default class List extends Component {
       loading,
       noSelectRow: !listConfig.selectRows,
       onSelectRow: this.handleSelectRows,
+      scroll: {x: true},
     };
     if(!listConfig.paging){
       tableProps.data = {list: data, pagination:false};

FormInsertDiy/AffairPage/destruction.js

@@ -6,7 +6,6 @@ import { Tooltip } from 'antd';
 import moment from 'moment';
 import React from 'react';
 
-
 const handleSqlModels = (sqlModels, defaultValues) => {
 	if (typeof sqlModels === 'undefined' || !Array.isArray(sqlModels)) {
 		return [];
@@ -52,7 +51,6 @@ const handleSqlModels = (sqlModels, defaultValues) => {
 	}
 };
 
-
 const funcHandleFileds = (source, obj, fieldsColumns) => {
 	let fileds = [];
 	for (let item of source) {
@@ -65,14 +63,14 @@ const funcHandleFileds = (source, obj, fieldsColumns) => {
 					comName: content.comName,
 					name: content.label || '',
 				};
-        if(content.comName === 'DatePicker'){
-          if(content.format){
+				if (content.comName === 'DatePicker') {
+					if (content.format) {
 						oneFiled.format = content.format;
 					}
 				}
-        if(content.comName === 'PartForm'){
-          const { childFormKey, columnIds, } = content;
-          if(childFormKey){
+				if (content.comName === 'PartForm') {
+					const { childFormKey, columnIds } = content;
+					if (childFormKey) {
 						let thisSource = obj[childFormKey].items;
 						let thisFields = funcHandleFileds(thisSource, obj, fieldsColumns);
 						for (let i = 0; i < thisFields.length; i++) {
@@ -90,22 +88,23 @@ const funcHandleFileds = (source, obj, fieldsColumns) => {
 						};
 					}
 				}
-        if(content.comName === 'RangePicker'){
-          if(content.format){
+				if (content.comName === 'RangePicker') {
+					if (content.format) {
 						oneFiled.format = content.format;
 					}
 				}
 				if (content.comName === 'Description') {
 					oneFiled.key = content.sqls[1];
 				}
-        if(['Radio', 'Select', 'Checkbox'].indexOf(content.comName)> -1){ // 枚举值
-          if(content.optionType){
+				if (['Radio', 'Select', 'Checkbox'].indexOf(content.comName) > -1) {
+					// 枚举值
+					if (content.optionType) {
 						oneFiled.optionType = content.optionType;
 						switch (oneFiled.optionType) {
 							case 'enum':
-                if(content.enums){
+								if (content.enums) {
 									let options = isJSON(content.enums) ? JSON.parse(content.enums) : [];
-                  options = options.map((x)=>{
+									options = options.map((x) => {
 										return { key: x.value, name: x.label };
 									});
 									oneFiled.options = options;
@@ -120,17 +119,20 @@ const funcHandleFileds = (source, obj, fieldsColumns) => {
 								oneFiled.valueName = content.valueName;
 								break;
 							default:
-                oneFiled.options =[];
+								oneFiled.options = [];
 								break;
 						}
 					}
 				}
-        if(content.comName === 'ChildForm'){
-          const { childFormKey, columnIds, } = content;
+				if (content.comName === 'ChildForm') {
+					const { childFormKey, columnIds } = content;
 					let thisSource = obj[childFormKey].items;
 					let thisFields = funcHandleFileds(thisSource, obj, fieldsColumns);
 					for (let i = 0; i < thisFields.length; i++) {
-            if (typeof thisFields[i].c1 !== 'undefined' && typeof fieldsColumns[thisFields[i].c1] !== 'undefined') {
+						if (
+							typeof thisFields[i].c1 !== 'undefined' &&
+							typeof fieldsColumns[thisFields[i].c1] !== 'undefined'
+						) {
 							thisFields[i] = {
 								...fieldsColumns[thisFields[i].c1],
 								...thisFields[i],
@@ -143,7 +145,7 @@ const funcHandleFileds = (source, obj, fieldsColumns) => {
 						thisFields,
 					};
 				}
-        if(content.comName === 'TableSelect'){
+				if (content.comName === 'TableSelect') {
 					oneFiled.componentProps = {
 						sqlKey: content.sqlKey,
 						labelName: content.labelName,
@@ -151,8 +153,9 @@ const funcHandleFileds = (source, obj, fieldsColumns) => {
 						isMultiple: content.isMultiple,
 					};
 				}
-        if(content.comName === 'Label'){ // 提示信息显示
-          if(info.hidden){
+				if (content.comName === 'Label') {
+					// 提示信息显示
+					if (info.hidden) {
 						continue;
 					}
 					oneFiled.key = content.initialValue ? content.initialValue.slice(0, 10) : ' ';
@@ -169,16 +172,15 @@ const funcHandleFileds = (source, obj, fieldsColumns) => {
 		}
 	}
 
-
 	return fileds;
 };
 
 export async function destructionGetDetail(response) {
-
 	/**
 	 * 如果数据校验不通过直接pass 返回默认值,
 	 * */
-  if (typeof response.unifiedServicePatternModel === 'undefined' ||
+	if (
+		typeof response.unifiedServicePatternModel === 'undefined' ||
 		!isJSON(response.unifiedServicePatternModel.content) ||
 		!Array.isArray(response.unifiedServicePatternModel.dataObjModels) ||
 		!response.unifiedServicePatternModel.dataObjModels.length ||
@@ -192,14 +194,11 @@ export async function destructionGetDetail(response) {
 	}
 	const basicPatternModel = response.unifiedServicePatternModel;
 
-
 	/** 正式开始 **/
 
-
-
 	/*** 字段name, dataType ***/
 	let fieldsColumns = {};
-  for(let dataObjModels of basicPatternModel.dataObjModels){
+	for (let dataObjModels of basicPatternModel.dataObjModels) {
 		let columns = dataObjModels.columnModels;
 		for (let item of columns) {
 			fieldsColumns[item.base52] = {
@@ -224,16 +223,16 @@ export async function destructionGetDetail(response) {
 	let sqlModeData = handleSqlModels(basicPatternModel.sqlModels, basicPatternModel.defaultValues); //Array
 	let defaultBinds = data.datas[key].defaultBinds;
 	let defaultKeys = {};
-  if(defaultBinds){
-    for(let item in defaultBinds){
+	if (defaultBinds) {
+		for (let item in defaultBinds) {
 			let one = defaultBinds[item];
-      if(one && one.columnIds && one.sqls){
+			if (one && one.columnIds && one.sqls) {
 				defaultKeys[one.sqls[1]] = one.columnIds[1];
 			}
 		}
 	}
-  for(let item of sqlModeData){
-    if(defaultKeys[item.key]){
+	for (let item of sqlModeData) {
+		if (defaultKeys[item.key]) {
 			item.defaultKey = defaultKeys[item.key];
 		}
 	}
@@ -244,28 +243,36 @@ export async function destructionGetDetail(response) {
 		name: basicPatternModel.dataObjModels[0].name,
 		defaultValuesId: key,
 	};
-  for(let i = 0; i < fileds.length; i++){
+	for (let i = 0; i < fileds.length; i++) {
 		let item = fileds[i];
-    if(item.comName === 'Description'){
-      if(item.key && !item.defaultValue &&  basicPatternModel.defaultValues && basicPatternModel.defaultValues[item.key]){
+		if (item.comName === 'Description') {
+			if (
+				item.key &&
+				!item.defaultValue &&
+				basicPatternModel.defaultValues &&
+				basicPatternModel.defaultValues[item.key]
+			) {
 				item.defaultValue = basicPatternModel.defaultValues[item.key];
 			}
-      for(let x of sqlModeData){
-        if(x.key === item.key){
+			for (let x of sqlModeData) {
+				if (x.key === item.key) {
 					item.c1 = x.defaultKey;
 					fileds[i] = {
 						...item,
 						...x,
+					};
 				}
 			}
 		}
-
-    }
 	}
 	for (let i = 0; i < fileds.length; i++) {
-
 		if (typeof fileds[i].c1 !== 'undefined') {
-      if(fileds[i].key && fieldsColumns[fileds[i].c1] && fieldsColumns[fileds[i].c1].key && fileds[i].key !== fieldsColumns[fileds[i].c1].key){
+			if (
+				fileds[i].key &&
+				fieldsColumns[fileds[i].c1] &&
+				fieldsColumns[fileds[i].c1].key &&
+				fileds[i].key !== fieldsColumns[fileds[i].c1].key
+			) {
 				fileds[i].onestopDefaultKey = fileds[i].key;
 			}
 			fileds[i] = {
@@ -275,30 +282,26 @@ export async function destructionGetDetail(response) {
 		}
 	}
 
-
-
 	return {
 		addFields: await translateAddFields(fileds, tableInfo),
 		tableInfo,
 		allConfigSetInfo: response,
 	};
-
 }
 
-
-export function getDefaultValues(addFields = [], tableInfo = {}){
+export function getDefaultValues(addFields = [], tableInfo = {}) {
 	const values = {
 		defaultValues: {
 			[tableInfo.defaultValuesId]: {},
-    }
+		},
 	};
 	const defalutValues = {};
-  for(let item of addFields){
-    if(typeof item.defaultValue !== 'undefined'){
+	for (let item of addFields) {
+		if (typeof item.defaultValue !== 'undefined') {
 			values[item.key] = item.defaultValue;
 			// values[item.onestopDefaultKey] = item.defaultValue;l;l
 		}
-    if(typeof item.defaultKey !== 'undefined' && item.defaultKey){
+		if (typeof item.defaultKey !== 'undefined' && item.defaultKey) {
 			values[item.defaultKey] = item.defaultValue; // 表单渲染需要这个值
 			defalutValues[item.key] = item.defaultValue;
 			defalutValues[item.onestopDefaultKey] = item.defaultValue;
@@ -306,27 +309,29 @@ export function getDefaultValues(addFields = [], tableInfo = {}){
 	}
 	values.defaultValues[tableInfo.defaultValuesId] = defalutValues; //传给后台需要这个值
 	return values;
-
 }
 
-
-export function handleColumns(columns){
+export function handleColumns(columns) {
 	const columnsLength = columns.length;
 	for (let item of columns) {
-    if(item.dataIndex.indexOf("process_status")>-1) {
-      item.render = (val) => val ? (val === "0" ? "审核通过" : "审核未通过") : null;
+		if (item.dataIndex.indexOf('process_status') > -1) {
+			item.render = (val) => (val ? (val === '0' ? '审核通过' : '审核未通过') : null);
 		}
 		if (item.dataType) {
-      if (text.indexOf(item.dataType) > -1) { // 文本类型字段
+			if (text.indexOf(item.dataType) > -1) {
+				// 文本类型字段
 				item.render = (text) => {
-          if(isJSON(text)){
+					if (isJSON(text)) {
 						text = JSON.parse(text);
 					}
-          if(item.extendType === 'file' && typeof text === 'string'){
+					if (item.extendType === 'file' && typeof text === 'string') {
 						let url = text.includes('http') ? text : config.sqlFormsServer + text;
-            return <a href={url} target={'_blank'}>点击查看</a>;
-          }
-         else if (typeof text === 'string' && text.length > 50) {
+						return (
+							<a href={url} target={'_blank'}>
+								点击查看
+							</a>
+						);
+					} else if (typeof text === 'string' && text.length > 50) {
 						const oldTitle = text;
 						const newTitle = text.slice(0, 20) + '...';
 						return (
@@ -334,35 +339,37 @@ export function handleColumns(columns){
 								<span key={text}>{newTitle}</span>
 							</Tooltip>
 						);
-          } else if (item.extendType === 'file' && text &&
-            typeof text === 'object' && Array.isArray(text.files) && text.files.length) {
-            return text.files.map((file,index)=>{
-              let url = file.path.includes('http') ?
-                file.path :
-                config.sqlFormsServer + file.path;
-              return <a href={url}
-                        target={'_blank'}
-                        key={file.name}
-                        style={{marginRight: '10px'}}
-              >
+					} else if (
+						item.extendType === 'file' &&
+						text &&
+						typeof text === 'object' &&
+						Array.isArray(text.files) &&
+						text.files.length
+					) {
+						return text.files.map((file, index) => {
+							let url = file.path.includes('http') ? file.path : config.sqlFormsServer + file.path;
+							return (
+								<a href={url} target={'_blank'} key={file.name} style={{ marginRight: '10px' }}>
 									{file.name}
-              </a>;
+								</a>
+							);
 						});
-
 					} else {
 						return text;
 					}
 				};
-      } else if (date.indexOf(item.dataType) > -1) { // 日期类型字段
+			} else if (date.indexOf(item.dataType) > -1) {
+				// 日期类型字段
 				item.render = (text, record) => {
 					if (!isNaN(Number(text)) && Number(text) > 10000000) {
 						text = Number(text);
 						return moment(text).format(format[item.dataType]);
-          }else{
+					} else {
 						return '';
 					}
 				};
-      } else if (taskNode.indexOf(item.dataType) > -1) {  // 流程节点类型
+			} else if (taskNode.indexOf(item.dataType) > -1) {
+				// 流程节点类型
 				item.render = (text, record) => {
 					if (record.isEnd) {
 						return '已完成';
@@ -382,7 +389,7 @@ export function handleColumns(columns){
 				}
 			};
 		}
-    if (columnsLength > 10 && item.title && !item.width) {
+		/*if (columnsLength > 10 && item.title && !item.width) {
 			item.width = item.title.length * 30;
 			if (item.title === '学号') {
 				item.width = 140;
@@ -390,7 +397,7 @@ export function handleColumns(columns){
 			if (item.title.indexOf('时间') > -1) {
 				item.width = 150;
 			}
-    }
+		}*/
 	}
 	return columns;
 }