Skip to content

W
WebPublic
提交 6fdbede9 authored 作者: 钟是志's avatar 钟是志
浏览文件
操作

28871 评奖评优管理/优秀学生干部管理/优秀学生干部申请，优化排版（20192601007，bdk@2022*$）

上级 17f1a944
显示空白字符变更
内嵌 并排
正在显示 包含 93 行增加 和 162 行删除
one_stop_public/tableCompon/index.jsx
浏览文件 @ 6fdbede9
......@@ -79,15 +79,10 @@ import getOneStopUploadUrl from '@/webPublic/one_stop_public/Base16/getOneStopUp
import SwitchWeb from '@/webPublic/one_stop_public/tableCompon/Split_Index/SwitchWeb';
import CronEditorDiy from '@/webPublic/one_stop_public/tableCompon/Split_Index/CronEditorDiy/index';
import ButtonDiy from '@/webPublic/one_stop_public/tableCompon/Split_Index/ButtonDiy';
import giveVarcharRules
from '@/webPublic/one_stop_public/tableCompon/Split_Index/giveVarcharLength';
import getPopupContainer
from '@/webPublic/one_stop_public/tableCompon/Split_Index/getPopupContainer';
const {
MonthPicker,
WeekPicker
} = DatePicker;
import giveVarcharRules from '@/webPublic/one_stop_public/tableCompon/Split_Index/giveVarcharLength';
import getPopupContainer from '@/webPublic/one_stop_public/tableCompon/Split_Index/getPopupContainer';
const { MonthPicker, WeekPicker } = DatePicker;
/**
* 日期组件antd3.x有bug 详情见禅道 27152 毕业跟踪调查管理 毕业时间改为年级筛选
*/
......@@ -108,12 +103,7 @@ const giveRender = (column = {}) => {
return column;
};
@connect(({
DataColumn,
SqlManageEntity,
formList,
loading
}) => ({
@connect(({ DataColumn, SqlManageEntity, formList, loading }) => ({
DataColumn,
SqlManageEntity,
formList,
......@@ -219,12 +209,7 @@ export default class TableCom extends Component {
};
getColumnSearchProps = (dataIndex, title) => ({
filterDropdown: ({
setSelectedKeys,
selectedKeys,
confirm,
clearFilters
}) => (
filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => (
<div style={{ padding: 8 }}>
<Input
ref={node => {
......@@ -263,7 +248,7 @@ export default class TableCom extends Component {
</Button>
</div>
),
filterIcon: filtered => <Icon type="search" style={{ color: filtered ? '#1890ff' : 'red' }}/>,
filterIcon: filtered => <Icon type="search" style={{ color: filtered ? '#1890ff' : 'red' }} />,
onFilter: (value, record) =>
record[dataIndex]
? record[dataIndex]
......@@ -311,11 +296,7 @@ export default class TableCom extends Component {
};
componentWillReceiveProps(props) {
const {
json,
mapData,
obj
} = props;
const { json, mapData, obj } = props;
if (json == null || this.props.safe) {
return;
}
......@@ -428,10 +409,7 @@ export default class TableCom extends Component {
dataFilter = ['Select', 'Radio', 'Checkbox', 'Cascader'];
getData = (json, dataColumn, obj, init) => {
const {
formKey,
uuid
} = this.props;
const { formKey, uuid } = this.props;
let jsonStatic = json;
json = {
...jsonStatic,
......@@ -442,10 +420,7 @@ export default class TableCom extends Component {
allValues = JSON.stringify(allValues);
if (json.comName === 'TableSelect') {
const { dispatch } = this.props;
const {
sqlKey,
optionType
} = json;
const { sqlKey, optionType } = json;
if (optionType === 'sql') {
dispatch({
type: 'SqlManageEntity/find',
......@@ -467,8 +442,7 @@ export default class TableCom extends Component {
if (
['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)
) {
column.render = val => moment(val)
.format('YYYY-MM-DD HH:mm:ss');
column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
}
column = giveRender(column);
......@@ -505,8 +479,7 @@ export default class TableCom extends Component {
break;
}
column.render = val => moment(parseInt(val))
.format(ff);
column.render = val => moment(parseInt(val)).format(ff);
}
if (cll[k].isQuery) {
column = {
......@@ -552,8 +525,7 @@ export default class TableCom extends Component {
column.title = datas[i].title;
column.dataIndex = datas[i].name;
if (['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)) {
column.render = val => moment(val)
.format('YYYY-MM-DD HH:mm:ss');
column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
}
column = giveRender(column);
columns.push(column);
......@@ -792,8 +764,7 @@ export default class TableCom extends Component {
delete params[i];
}
}
noPrefixRequest(url, params)
.then(data => {
noPrefixRequest(url, params).then(data => {
// if (!data || !Array.isArray(data)) {
// data = [];
// }
......@@ -995,8 +966,7 @@ export default class TableCom extends Component {
if (getToken() != null) {
pp.token = getToken();
}
uaaRequest(url, pp)
.then(data => {
uaaRequest(url, pp).then(data => {
const { sqlKeys } = this.state;
sqlKeys[sqlKey].data = data;
this.setState({ sqlKeys });
......@@ -1101,7 +1071,6 @@ export default class TableCom extends Component {
};
}
let obj = {};
if (!isEdit && fatherCode) {
obj = {
......@@ -1171,8 +1140,7 @@ export default class TableCom extends Component {
messageData,
concealModel,
};
}
};
getFunctionValue = (fun, column, json, callback) => {
if (this.props.safe) return;
......@@ -1270,12 +1238,7 @@ export default class TableCom extends Component {
};
componentDidMount() {
const {
json,
mapData,
obj,
init
} = this.props;
const { json, mapData, obj, init } = this.props;
if (json == null) {
return;
}
......@@ -1320,13 +1283,7 @@ export default class TableCom extends Component {
}
fetchData3 = (obj, dataColumn, init, json, allValues) => {
const {
sqlKey,
labelName,
valueName,
isMeta,
filterSql
} = json;
const { sqlKey, labelName, valueName, isMeta, filterSql } = json;
if (isMeta) {
// 2022年7月5日 2022 姚鑫国说的 如果是元数据 不需要传这个allValues
// 解决禅道bug 28017
......@@ -1566,10 +1523,7 @@ export default class TableCom extends Component {
}
};
getColumn = key => {
let {
mapData,
json
} = this.props;
let { mapData, json } = this.props;
const columnIds = json?.columnIds;
......@@ -1625,20 +1579,8 @@ export default class TableCom extends Component {
// console.log(formKey, json);
// }
const {
options,
labels,
selectDis,
modalCode,
modalTitle,
modalInit,
modalProps
} = this.state;
const {
getFieldDecorator,
getFieldError,
getFieldProps
} = this.props.form;
const { options, labels, selectDis, modalCode, modalTitle, modalInit, modalProps } = this.state;
const { getFieldDecorator, getFieldError, getFieldProps } = this.props.form;
const disabled = json != null ? json.disabled : false;
const permRank = json != null ? (json.permRank != null ? json.permRank : 0) : 0;
if (json?.label === '账号') {
......@@ -1661,7 +1603,7 @@ export default class TableCom extends Component {
) {
return <></>;
}
return <QRCode {...this.state.option} key={uuid}/>;
return <QRCode {...this.state.option} key={uuid} />;
}
if (json.comName == 'Echart') {
return (
......@@ -1677,7 +1619,7 @@ export default class TableCom extends Component {
);
}
if (json.comName == 'Graph') {
return <Neo4jD3Com key={uuid} json={json} option={this.state.option || []}/>;
return <Neo4jD3Com key={uuid} json={json} option={this.state.option || []} />;
}
if (json.comName == 'PartForm') {
......@@ -1692,7 +1634,7 @@ export default class TableCom extends Component {
<>
{this.props.form.getFieldDecorator(uuid, {
initialValue: fk,
})(<Input type="hidden"/>)}{' '}
})(<Input type="hidden" />)}{' '}
<ZdyTable
taskId={this.props.taskId}
importExcel={this.props.importExcel}
......@@ -1727,17 +1669,6 @@ export default class TableCom extends Component {
</>
);
}
// if([
// // 'Select',
// // 'Input',
// 'InputHidden',
// // 'DatePicker',
// // 'TextArea',
// // 'Radio',
// ].includes(json.comName)){
// return null;
// // Select Input InputHidden DatePicker DatePicker TextArea Radio
// }
if (json.comName === 'Excel') {
const value = getCellValue(i, j, currentFormTitle);
......@@ -1768,7 +1699,7 @@ export default class TableCom extends Component {
<>
{this.props.form.getFieldDecorator(uid, {
initialValue: obj[uuid] || json.initialValue,
})(<Input type="hidden"/>)}
})(<Input type="hidden" />)}
<span
style={{
fontWeight: get === 'mobile' ? 'bold' : '',
......@@ -1785,7 +1716,7 @@ export default class TableCom extends Component {
<>
{this.props.form.getFieldDecorator(uid, {
initialValue: this.props.form.getFieldsValue()[uid] || json.initialValue,
})(<Input type="hidden"/>)}
})(<Input type="hidden" />)}
<span
style={{
fontWeight: get === 'mobile' ? 'bold' : '',
......@@ -1834,7 +1765,7 @@ export default class TableCom extends Component {
cm = (
<span style={{ paddingRight: get === 'mobile' ? 8 : '' }}>
{value}
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</span>
);
break;
......@@ -1842,7 +1773,7 @@ export default class TableCom extends Component {
cm = (
<span>
{value}
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</span>
);
......@@ -1860,7 +1791,7 @@ export default class TableCom extends Component {
cm = (
<span style={{ paddingRight: get == 'mobile' ? 8 : '' }}>
{value}
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</span>
);
......@@ -1869,7 +1800,7 @@ export default class TableCom extends Component {
cm = (
<span>
{value}
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</span>
);
......@@ -1877,9 +1808,8 @@ export default class TableCom extends Component {
case 'DatePicker':
cm = value ? (
<span>
{moment(parseInt(value))
.format('YYYY-MM-DD HH:mm:ss')}
{get === 'mobile' ? <br/> : ''}
{moment(parseInt(value)).format('YYYY-MM-DD HH:mm:ss')}
{get === 'mobile' ? <br /> : ''}
</span>
) : (
''
......@@ -1901,7 +1831,7 @@ export default class TableCom extends Component {
);
})}
</ul>
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</>
);
......@@ -1921,7 +1851,7 @@ export default class TableCom extends Component {
);
})}
</ul>
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</>
);
......@@ -1946,7 +1876,7 @@ export default class TableCom extends Component {
height: json.height,
}}
/>
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</>
);
}
......@@ -1972,7 +1902,7 @@ export default class TableCom extends Component {
height: json.height,
}}
/>
{get === 'mobile' ? <br/> : ''}
{get === 'mobile' ? <br /> : ''}
</>
);
}
......@@ -2007,7 +1937,7 @@ export default class TableCom extends Component {
</MobileItem>
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type="hidden"/>)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -2020,7 +1950,7 @@ export default class TableCom extends Component {
{cm}
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type="hidden"/>)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -2114,7 +2044,7 @@ export default class TableCom extends Component {
</Form.Item>
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type="hidden"/>)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -2127,7 +2057,7 @@ export default class TableCom extends Component {
{cm}
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value,
})(<Input type="hidden"/>)}
})(<Input type="hidden" />)}
</>
);
}
......@@ -2206,19 +2136,22 @@ export default class TableCom extends Component {
case 'MobileCard':
let value = obj[dataColumn.base52];
if (!value || value === 'null') {
return <div/>;
return <div />;
}
cm = <MobileCard value={value}
cm = (
<MobileCard
value={value}
json={json}
getArguments={this.functionArguments}
tableComProps={this.props}
dataColumn={dataColumn}
/>;
/>
);
break;
case 'WangEditor':
let textV = obj[dataColumn.base52];
if (!textV || textV === 'null') {
return <div/>;
return <div />;
}
cm = (
<div
......@@ -2354,13 +2287,11 @@ ${obj[dataColumn.base52]}
} else {
cm = (
<span>
{moment(parseInt(obj[begin.base52]))
.format(
{moment(parseInt(obj[begin.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}{' '}
至{' '}
{moment(parseInt(obj[end.base52]))
.format(
{moment(parseInt(obj[end.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}
</span>
......@@ -2376,16 +2307,14 @@ ${obj[dataColumn.base52]}
if (vTime && typeof vTime === 'string' && vTime.indexOf('-') <= -1) {
cm = (
<span>
{moment(parseInt(vTime))
.format(json.format ? json.format : 'YYYY-MM-DD HH:mm:ss')}
{moment(parseInt(vTime)).format(json.format ? json.format : 'YYYY-MM-DD HH:mm:ss')}
</span>
);
} else {
cm = (
<span>
{vTime
? moment(+new Date(vTime))
.format(
? moment(+new Date(vTime)).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)
: ''}
......@@ -2623,14 +2552,14 @@ ${obj[dataColumn.base52]}
marginLeft: 5,
width:
get === 'mobile'
? document.documentElement.clientWidth - 10 || document.body.clientWidth - 10
? document.documentElement.clientWidth - 10 ||
document.body.clientWidth - 10
: json.width,
height: get === 'mobile' ? '' : json.height,
}}
/>
);
}
}
break;
......@@ -2836,7 +2765,7 @@ ${obj[dataColumn.base52]}
message: '请选择' + title,
},
],
})(<SwitchWeb json={json} disabled={disabled}/>);
})(<SwitchWeb json={json} disabled={disabled} />);
break;
case 'TextArea':
......@@ -2915,10 +2844,7 @@ ${obj[dataColumn.base52]}
otherProps = {};
}
}
const {
disabledInputStyle = {},
addonAfter
} = otherProps;
const { disabledInputStyle = {}, addonAfter } = otherProps;
let inputStyle = {
width: json.width,
};
......@@ -2968,7 +2894,7 @@ ${obj[dataColumn.base52]}
case 'InputHidden':
cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue,
})(<Input type="hidden"/>);
})(<Input type="hidden" />);
break;
case 'InputNumber':
if (json?.otherProps) {
......@@ -3037,7 +2963,7 @@ ${obj[dataColumn.base52]}
message: '请选择' + dataColumn.title,
},
],
})(<Radio.Group options={options} disabled={disabled}/>);
})(<Radio.Group options={options} disabled={disabled} />);
if (get == 'mobile') {
cm = <div>{cm}</div>;
if (
......@@ -3077,7 +3003,7 @@ ${obj[dataColumn.base52]}
message: '请选择' + dataColumn.title,
},
],
})(<Checkbox.Group options={options} disabled={disabled}/>)}
})(<Checkbox.Group options={options} disabled={disabled} />)}
</Flex>
);
......@@ -3132,7 +3058,7 @@ ${obj[dataColumn.base52]}
}
console.log(initValue);
cm = getFieldDecorator(dataColumn.base52, {
initialValue: !initValue && otherProps?.mode === 'multiple' ? undefined : initValue ,
initialValue: !initValue && otherProps?.mode === 'multiple' ? undefined : initValue,
rules:
json.vlds && json.vlds.length > 0
? json.vlds
......@@ -3170,8 +3096,7 @@ ${obj[dataColumn.base52]}
}}
filterOption={(input, option) =>
option
? option.props.children.toLowerCase()
.indexOf(input.toLowerCase()) >= 0
? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
: false
}
{...otherProps}
......@@ -3228,8 +3153,7 @@ ${obj[dataColumn.base52]}
}
const filterF = function filter(inputValue, path) {
return path.some(
option => option?.label?.toLowerCase()
?.indexOf(inputValue.toLowerCase()) > -1,
option => option?.label?.toLowerCase()?.indexOf(inputValue.toLowerCase()) > -1,
);
};
// if(this.props.uuid === 'id_32691685234912400529714267d34dc585a2'){
......@@ -3277,7 +3201,7 @@ ${obj[dataColumn.base52]}
message: '请选择' + dataColumn.title,
},
],
})(<MobileCascader options={options} label={title} disabled={disabled} json={json}/>);
})(<MobileCascader options={options} label={title} disabled={disabled} json={json} />);
}
if (
......@@ -3382,13 +3306,11 @@ ${obj[dataColumn.base52]}
if (!isEdit) {
cm = (
<span>
{moment(parseInt(obj[begin.base52]))
.format(
{moment(parseInt(obj[begin.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}{' '}
至{' '}
{moment(parseInt(obj[end.base52]))
.format(
{moment(parseInt(obj[end.base52])).format(
json.format ? json.format : 'YYYY-MM-DD HH:mm:ss',
)}
</span>
......@@ -3447,7 +3369,7 @@ ${obj[dataColumn.base52]}
message: '请选择起止时间',
},
],
})(<RangePickerDiy json={json} disabled={disabled} uuid={uuid}/>);
})(<RangePickerDiy json={json} disabled={disabled} uuid={uuid} />);
}
if (json.label == null) title = '起止时间';
break;
......@@ -3501,8 +3423,7 @@ ${obj[dataColumn.base52]}
}
});
}
: () => {
}
: () => {}
}
format={json.format ? json.format : 'YYYY-MM-DD HH:mm:ss'}
{...otherProps}
......@@ -3633,7 +3554,7 @@ ${obj[dataColumn.base52]}
message: '请输入',
},
],
})(<WangEditor json={json} dataColumn={dataColumn} disabled={disabled} uuid={uuid}/>);
})(<WangEditor json={json} dataColumn={dataColumn} disabled={disabled} uuid={uuid} />);
break;
case 'MobileCard':
cm = getFieldDecorator(dataColumn.base52, {
......@@ -3645,7 +3566,8 @@ ${obj[dataColumn.base52]}
getArguments={this.functionArguments}
tableComProps={this.props}
dataColumn={dataColumn}
/>);
/>,
);
break;
case 'RichText':
cm = getFieldDecorator(dataColumn.base52, {
......@@ -3659,7 +3581,7 @@ ${obj[dataColumn.base52]}
message: '请输入',
},
],
})(<DraftEditorCom placeholder={json.placeholder} disabled={json.disabled}/>);
})(<DraftEditorCom placeholder={json.placeholder} disabled={json.disabled} />);
if (
get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) ||
......@@ -3690,7 +3612,7 @@ ${obj[dataColumn.base52]}
message: '请输入' + title,
},
],
})(<CronEditorDiy/>);
})(<CronEditorDiy />);
break;
case 'LocationCom':
cm = getFieldDecorator(dataColumn.base52, {
......@@ -3706,8 +3628,7 @@ ${obj[dataColumn.base52]}
let errors = [];
console.log(valueThis);
if (
(!valueThis || !JSON.stringify(valueThis)
.includes('address')) &&
(!valueThis || !JSON.stringify(valueThis).includes('address')) &&
required
) {
errors.push(new Error('请获取定位信息', rule.field));
......@@ -3806,7 +3727,7 @@ ${obj[dataColumn.base52]}
message: '请上传图片',
},
],
})(<ImgUploadCom json={json} disabled={disabled}/>);
})(<ImgUploadCom json={json} disabled={disabled} />);
if (
get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) ||
......@@ -3837,7 +3758,7 @@ ${obj[dataColumn.base52]}
message: '请上传视频',
},
],
})(<VideoUploadCom json={json} disabled={disabled}/>);
})(<VideoUploadCom json={json} disabled={disabled} />);
if (
get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) ||
......@@ -3868,7 +3789,7 @@ ${obj[dataColumn.base52]}
message: '请进行签名',
},
],
})(<Signature width={json.width} height={json.height} get={get}/>);
})(<Signature width={json.width} height={json.height} get={get} />);
if (
get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) ||
......@@ -3958,12 +3879,16 @@ ${obj[dataColumn.base52]}
) : (
''
)}
<List.Item extra={cm} multipleLine={true}>
{title}
{json?.mLabelSpan === 24 || json.comName === 'TextArea' ? (
<List.Item multipleLine={true} align={'top'} wrap={true}>
<div data-page-comname={json.comName} className={styles.bigTitle}>{title}</div>
<div>{cm}</div>
</List.Item>
{/*<Card.Header title={<span style={{ fontSize: 14 }}>{title}: {cm}</span>} />*/}
{/*移动端只读模式 组件修改*/}
{/*<Card.Body>{cm}</Card.Body>*/}
) : (
<List.Item extra={cm} multipleLine={true} wrap={true}>
<div data-page-comname={json.comName}>{title}</div>
</List.Item>
)}
</List>
);
}
......@@ -4088,7 +4013,7 @@ ${obj[dataColumn.base52]}
label={title}
data-cell-component-name={json.comName || 'no_com'}
>
<ShowComName json={json}/>
<ShowComName json={json} />
{cm}
</Form.Item>
</>
......@@ -4183,12 +4108,12 @@ ${obj[dataColumn.base52]}
wrapperCol={{ span: json.wrapperSpan }}
label={title}
>
<ShowComName json={json}/>
<ShowComName json={json} />
{cm}
</Form.Item>
) : (
<Form.Item>
<ShowComName json={json}/>
<ShowComName json={json} />
{cm}
</Form.Item>
)
......
one_stop_public/tableCompon/style.less
浏览文件 @ 6fdbede9
......@@ -290,3 +290,9 @@
min-height: 50px;
}
}
.bigTitle{
text-align: center;
font-size: 18px;
margin-bottom: 20px;
font-weight: 600;
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论