Skip to content

W
WebPublic
提交 b1ee5caf authored 作者: 徐立's avatar 徐立
浏览文件
操作

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

上级 7e1dffa3 5c647313
隐藏空白字符变更
内嵌 并排
正在显示 包含 103 行增加 和 107 行删除
one_stop_public/Table/index.jsx
浏览文件 @ b1ee5caf
......@@ -73,7 +73,7 @@ export default class ZdyTable extends Component {
* this.props.table有传入值表明需要渲染流程中最新表单
*/
if(isForm){ // 由表格的操作按钮进入
const mapData = {};
const sqlData={}
const dataObjs = val.form.dataObjModels;
......@@ -277,7 +277,7 @@ export default class ZdyTable extends Component {
const sqls = val.unifiedServicePatternModel.sqlModels
for (var i = 0; i < sqls.length; i++) {
const dob = sqls[i].dataObjModel;
for (var j = 0; j < dob.columnModels.length; j++) {
sqlData[dob.columnModels[j].base52] = dob.columnModels[j];
}
......@@ -285,7 +285,7 @@ export default class ZdyTable extends Component {
const dataObjs = val.unifiedServicePatternModel.dataObjModels;
for (var i = 0; i < dataObjs.length; i++) {
const dob = dataObjs[i];
for (var j = 0; j < dob.columnModels.length; j++) {
mapData[dob.columnModels[j].base52] = dob.columnModels[j];
}
......@@ -305,7 +305,7 @@ export default class ZdyTable extends Component {
isReady:true,
formConfig:xxx,
defaultBinds:this.props.table?obj.datas[val.taskFormKey].defaultBinds:xxx.defaultBinds,
});
return
}
......@@ -314,7 +314,7 @@ export default class ZdyTable extends Component {
const sqls = val.unifiedServicePatternModel.sqlModels
for (var i = 0; i < sqls.length; i++) {
const dob = sqls[i].dataObjModel;
for (var j = 0; j < dob.columnModels.length; j++) {
sqlData[dob.columnModels[j].base52] = dob.columnModels[j];
}
......@@ -322,7 +322,7 @@ export default class ZdyTable extends Component {
const dataObjs = val.unifiedServicePatternModel.dataObjModels;
for (var i = 0; i < dataObjs.length; i++) {
const dob = dataObjs[i];
for (var j = 0; j < dob.columnModels.length; j++) {
mapData[dob.columnModels[j].base52] = dob.columnModels[j];
}
......@@ -408,8 +408,7 @@ export default class ZdyTable extends Component {
case 'web':
return (
<Form
{...formItemLayout}
<Form
className="login-form" >
{isEdit&&defaultBinds ? Object.keys(defaultBinds).map((k) => {
const r = defaultBinds[k]
......@@ -433,17 +432,17 @@ export default class ZdyTable extends Component {
<Row>
<Col span={24}>
<div
style={styleDiv}
<div
style={styleDiv}
ref={ref => { this.root = ref }}
>
<table
style={{
overflow: "auto",
<table
style={{
overflow: "auto",
margin: max * width > 550 ? "auto" : '',
...style }}
border={border}
cellSpacing="0"
...style }}
border={border}
cellSpacing="0"
cellPadding="0" >
<tbody>
{items.map((row, i) => {
......@@ -459,16 +458,16 @@ export default class ZdyTable extends Component {
console.log(`第${i}行第${j}列样式配置有误,${e}`)
}
}
return !allhidden && cell.hidden ?
""
: <td
return !allhidden && cell.hidden ?
""
: <td
width={
i==0?
((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1))
:width * (cell.col ? cell.col : 1)}
rowSpan={cell.row}
colSpan={cell.col}
key={j}
((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1))
:width * (cell.col ? cell.col : 1)}
rowSpan={cell.row}
colSpan={cell.col}
key={j}
style={{
overflow: "auto",
textAlign: cell.content&&cell.content.calign?cell.content.calign:"left",
......@@ -476,25 +475,25 @@ export default class ZdyTable extends Component {
...styles
}} >
<TableCom
<TableCom
formCode={formCode} // 当前表单code
formId={formId} // 当前表单Id
i={i} // 当前组件下标
j={j} // 当前行数下班
fatherCode={fatherCode}
index={index}
fatherCode={fatherCode}
index={index}
fatherObj={this.props.fatherObj}
datas={datas}
uuid={cell.uuid}
isEdit={isEdit}
formKey={currentFormKey}
init={init}
datas={datas}
uuid={cell.uuid}
isEdit={isEdit}
formKey={currentFormKey}
init={init}
get={get} // 区分移动端或wen端
json={cell.content}
json={cell.content}
obj={ obj||{}} // 是否存在默认值
mapData={mapData}
mapData={mapData}
form={this.props.form} // antd form控件
sqlData={sqlData}
sqlData={sqlData}
defaultValues={defaultValues || {}} // 接口中的默认值
/>
</td>}
......@@ -541,38 +540,38 @@ export default class ZdyTable extends Component {
{
items.map((item, i) => {
const allhidden = this.checkAllHidden(items)
return (<div
key={i}
style={{
marginTop: 0,
background: '#ffffff',
paddingLeft:12,
return (<div
key={i}
style={{
marginTop: 0,
background: '#ffffff',
paddingLeft:12,
width: '100%',
flexWrap:'wrap',
...style }}>
{
item.map((ary, j) => {
return !allhidden && ary.hidden ? ""
: <><TableCom
formCode={formCode}
formId={formId}
i={i}
j={j}
index={index}
fatherCode={fatherCode}
datas={datas}
isEdit={isEdit}
: <><TableCom
formCode={formCode}
formId={formId}
i={i}
j={j}
index={index}
fatherCode={fatherCode}
datas={datas}
isEdit={isEdit}
fatherObj={this.props.fatherObj}
formKey={currentFormKey}
init={init}
get={get}
key={j}
sqlData={sqlData}
obj={ obj||{}}
form={this.props.form}
mapData={mapData}
json={ary.content}
uuid={ary.uuid}
formKey={currentFormKey}
init={init}
get={get}
key={j}
sqlData={sqlData}
obj={ obj||{}}
form={this.props.form}
mapData={mapData}
json={ary.content}
uuid={ary.uuid}
defaultValues={defaultValues || {}} /></>
})
}
......
one_stop_public/libs/formList/index.js
浏览文件 @ b1ee5caf
......@@ -94,7 +94,7 @@ const CreateForm = Form.create()(props => {
formItem.map((item, index) => {
if (item.type.indexOf('DATE') > -1) {
for (let d in fieldsValue) {
if (item.name == d) {
if (item.name === d&&fieldsValue[d]) {
fieldsValue[d] = fieldsValue[d].format('YYYY-MM-DD HH:mm:ss');
}
}
......@@ -186,7 +186,7 @@ class FormList extends React.Component {
}
}
modify = record => {
if (this.state.formItem.length < 10) {
// if (this.state.formItem.length < 10) {
this.getOptions()
this.setState({
formData: record,
......@@ -194,23 +194,23 @@ class FormList extends React.Component {
isAdd: false,
isView:false
});
} else {
router.push({
pathname: '/admin/ddl/dataObj/formEdit',
state: {
id: this.state.objId,
recordId: record[this.state.primaryKey],
recordKey: this.state.primaryKey,
isAdd: false,
isView:false
},
});
}
// } else {
// router.push({
// pathname: '/admin/ddl/dataObj/formEdit',
// state: {
// id: this.state.objId,
// recordId: record[this.state.primaryKey],
// recordKey: this.state.primaryKey,
// isAdd: false,
// isView:false
// },
// });
// }
};
view = record => {
if (this.state.formItem.length < 10) {
// if (this.state.formItem.length < 10) {
this.getOptions()
this.setState({
formData: record,
......@@ -218,18 +218,18 @@ class FormList extends React.Component {
isAdd: false,
isView:true
});
} else {
router.push({
pathname: '/admin/ddl/dataObj/formEdit',
state: {
id: this.state.objId,
recordId: record[this.state.primaryKey],
recordKey: this.state.primaryKey,
isAdd: false,
isView:true
},
});
}
// } else {
// router.push({
// pathname: '/admin/ddl/dataObj/formEdit',
// state: {
// id: this.state.objId,
// recordId: record[this.state.primaryKey],
// recordKey: this.state.primaryKey,
// isAdd: false,
// isView:true
// },
// });
// }
};
delete = record => {
......@@ -606,7 +606,7 @@ class FormList extends React.Component {
};
add = () => {
if (this.state.formItem.length < 10) {
// if (this.state.formItem.length < 10) {
this.getOptions()
this.setState({
modalVisible: true,
......@@ -614,12 +614,12 @@ class FormList extends React.Component {
isAdd: true,
isView:false
});
} else {
router.push({
pathname: '/admin/ddl/dataObj/formEdit',
state: { id: this.state.objId,isAdd: true,isView:false }
});
}
// } else {
// router.push({
// pathname: '/admin/ddl/dataObj/formEdit',
// state: { id: this.state.objId,isAdd: true,isView:false }
// });
// }
};
handleSelectRows = rows => {
......@@ -678,7 +678,7 @@ class FormList extends React.Component {
formItem.map((item, index) => {
if (item.type.indexOf('DATE') > -1) {
for (let d in fieldsValue) {
if (item.name == d && fieldsValue[d]) {
if (item.name === d && fieldsValue[d]) {
if(fieldsValue[d]!=null&&fieldsValue[d].length>0){
fieldsValue[d]=[fieldsValue[d][0].format('YYYY-MM-DD HH:mm:ss'),fieldsValue[d][1].format('YYYY-MM-DD HH:mm:ss')];
}else {
......@@ -744,7 +744,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }],
})(<Select style={{ width: 200 }} placeholder="请选择" allowClear>
})(<Select style={{ width: '70%' }} placeholder="请选择" allowClear>
{ops.map((r) => <Option value={r[item.referenceCodeName]}
key={r[item.referenceCodeName]}>{r[item.referenceNameName]}</Option>)}
......@@ -759,7 +759,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }],
})(<Select style={{ width: 200 }} placeholder="请选择" allowClear>
})(<Select style={{ width: '70%' }} placeholder="请选择" allowClear>
{ops.map((r) => <Option value={r.value}
key={r.value}>{r.value}</Option>)}
</Select>)}
......@@ -792,15 +792,16 @@ class FormList extends React.Component {
rules: [{ required: !item.isNull }],
})(
<RangePicker format={item.dataFormatStrWeb==null?"YYYY-MM-DD HH:mm:ss":item.dataFormatStrWeb}
style={{ width: '100%' }} />)}
style={{ width: '95%' }} />)}
</FormItem>
);
}else if (data.indexOf(item.type) > -1) {
return (
<FormItem labelCol={labelCol} wrapperCol={wrapperCol} label={item.title} key={item.id}>
{form.getFieldDecorator(item.name, {
initialValue: formData == null ? null : moment(formData[item.name]),
initialValue: formData == null ? moment() :(formData[item.name]?moment(formData[item.name]):null),
rules: [{ required: !item.isNull }],
})(
<DatePicker
......@@ -833,13 +834,9 @@ class FormList extends React.Component {
}
return (
<Form layout="inline">
<Row gutter={{
md: 8,
lg: 24,
xl: 48
}}>
<Row >
{querys.map((item) =>
<Col md={6} sm={24} key={item.id}>
<Col span={8} key={item.id}>
{this.getItem(true,form, {
...item,
isNull: true
......@@ -847,7 +844,7 @@ class FormList extends React.Component {
</Col>
)}
<Col md={6} sm={24}>
<Col span={8} >
<span className={styles.submitButtons}>
<Button type="primary" loading={this.props.loading} onClick={this.handleSearch}>
查询
......@@ -883,7 +880,7 @@ class FormList extends React.Component {
showMobileDiv,
isView
} = this.state
let scrollWidth = document.documentElement.clientWidth || document.body.clientWidth; //可使宽度
let isMobile = scrollWidth < 1200
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论