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