Skip to content

W
WebPublic
提交 d624611c authored 作者: wtj's avatar wtj
浏览文件
操作

修改表单排版问题

上级 dcaeba18
隐藏空白字符变更
内嵌 并排
正在显示 包含 58 行增加 和 57 行删除
one_stop_public/libs/formList/index.js
浏览文件 @ d624611c
......@@ -731,7 +731,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }],
})(<Input readOnly={!isAdd} placeholder="请输入"/>)}
})(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入"/>)}
</FormItem>
);
}
......@@ -771,7 +771,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }],
})(<Input placeholder="请输入"/>)}
})(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
</FormItem>
);
} else if (number.indexOf(item.type) > -1) {
......@@ -818,7 +818,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }],
})(<Input placeholder="请输入"/>)}
})(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
</FormItem>
);
}
......@@ -832,11 +832,12 @@ class FormList extends React.Component {
if (querys.length == 0) {
return '';
}
return (
<Form layout="inline">
<Row >
{querys.map((item) =>
<Col span={8} key={item.id}>
<Col style={{height:58}} span={8} key={item.id}>
{this.getItem(true,form, {
...item,
isNull: true
......
one_stop_public/tableCompon/index.jsx
浏览文件 @ d624611c
......@@ -505,15 +505,15 @@ export default class tableCom extends Component {
}
} */
if (!this.props.isEdit&&this.props.fatherCode) {
if(bindObj!=null){
dataColumn.base52 = bindObj.base52
}else{
dataColumn.base52 = this.props.uuid
}
}
if (this.dataFilter.includes(json.comName) || json.comName == "TableSelect") {
const obj2 = { ...obj, ...props.form.getFieldsValue(), ...props.defaultValues[this.props.formKey] }
this.getData(json, dataColumn, obj2)
......@@ -676,71 +676,71 @@ export default class tableCom extends Component {
}
break;
case "func":
if (json.funcs != null && json.funcs != "") {
let enu;
try {
this.getFunctionValue(json.funcs, { base52: this.props.uuid }, json,()=>{
if (init != null && Object.keys(init).length > 0) {
let base52 = dataColumn.base52
let vlu=this.props.form.getFieldValue(base52)
if(vlu instanceof Array){
for(var i=0;i<this.state.options.length;i++){
if(vlu.includes(this.state.options[i].value)){
labs.push(this.state.options[i].label)
}
}
}else{
for(var i=0;i<this.state.options.length;i++){
if(vlu==this.state.options[i].value){
labs.push(this.state.options[i].label)
break;
}
}
}
this.setState({labels:labs})
}else if (!this.props.isEdit && Object.keys(obj).length > 0) {
let base52 = dataColumn.base52
const vlu=obj[base52]
const labs=[]
if(vlu instanceof Array){
for(var i=0;i<this.state.options.length;i++){
if(vlu.includes(this.state.options[i].value)){
labs.push(this.state.options[i].label)
}
}
}else{
for(var i=0;i<this.state.options.length;i++){
if(vlu==this.state.options[i].value){
labs.push(this.state.options[i].label)
break;
}
}
}
this.setState({labels:labs})
}
}) ;
} catch (e) {
message.error("公式选项配置存在问题")
}
}
......@@ -940,7 +940,7 @@ export default class tableCom extends Component {
}
sqlUtil = (base52, json,orgCallback, sqlKey, params, callback, options = {}) => {
//查缓存
var isChange = false;
const { sqlKeys } = this.state
......@@ -1115,27 +1115,27 @@ export default class tableCom extends Component {
return
} */
const base52 = column.base52
try {
var fun1 = new Function("obj","init", "defaultValues", "env", "index", "fatherCode", "utils", fun);
let obj
let obj
if(!this.props.isEdit&&this.props.fatherCode){
obj = { ...this.props.fatherObj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
}else{
obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
}
const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get,formCode:this.props.formCode,formId:this.props.formId }, this.props.index, this.props.fatherCode,
{
{
moment: moment,
sql: this.sqlUtil.bind(this, base52, json,callback),
message: message,router:router,
setValues: this.setValues.bind(this, base52, json),
req: this.reqUtil.bind(this, base52, json,callback),
req: this.reqUtil.bind(this, base52, json,callback),
md5: md5,
render:this.getRender,base64:getBase64
},
......@@ -1205,13 +1205,13 @@ export default class tableCom extends Component {
}
})
}
const bindObj=this.getColumn('c1');
let dataColumn = this.props.fatherCode != null ? (bindObj?{...bindObj,base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`}:
{ base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` })
: bindObj;
if (this.props.fatherCode == null&&dataColumn == null) dataColumn = { base52: this.props.uuid }
/* if (this.props.fatherCode != null) {
......@@ -1230,15 +1230,15 @@ export default class tableCom extends Component {
}
} */
if (!this.props.isEdit&&this.props.fatherCode) {
if(bindObj!=null){
dataColumn.base52 = bindObj.base52
}else{
dataColumn.base52 = this.props.uuid
}
}
this.getData(json, dataColumn, obj)
if (json.formula != null && json.formula != "") {
this.getFunctionValue(json.formula, dataColumn, json)
......@@ -1277,7 +1277,7 @@ export default class tableCom extends Component {
});
} else if (!this.props.isEdit && Object.keys(obj).length > 0) {
let base52 = dataColumn.base52
if (this.props.fatherCode) {
const x = base52.split(".")
......@@ -1704,7 +1704,7 @@ export default class tableCom extends Component {
if (this.props.fatherCode == null&&dataColumn == null) {
dataColumn = { base52: this.props.uuid }
}
if (!dataColumn.isNull) {
if (dataColumn.isNull!=null&&!dataColumn.isNull) {
required = true;
}
......@@ -1730,15 +1730,15 @@ export default class tableCom extends Component {
}
}
if (!isEdit) {
if (this.props.fatherCode) {
if(bindObj!=null){
dataColumn.base52 = bindObj.base52
}else{
dataColumn.base52 = this.props.uuid
}
}
......@@ -1970,14 +1970,14 @@ export default class tableCom extends Component {
if (json.objCode == null || json.objCode == "") {
cm = <></>
}
cm = <TableList
loading={this.props.loading}
showHeader={json.showHeader}
isHiddenPage={json.isHiddenPage}
pageSize={json.pageSize}
value={obj[dataColumn.base52 || this.props.uuid] || {}}
objCode={json.objCode}
sql={json.filterSql}
cm = <TableList
loading={this.props.loading}
showHeader={json.showHeader}
isHiddenPage={json.isHiddenPage}
pageSize={json.pageSize}
value={obj[dataColumn.base52 || this.props.uuid] || {}}
objCode={json.objCode}
sql={json.filterSql}
rights={json.rights} />
break;
default:
......@@ -2147,7 +2147,7 @@ export default class tableCom extends Component {
disabled={disabled}
placeholder={json.placeholder ? json.placeholder : '请输入' + (title ? title : '')}
>
</MobileInputItem>
</div>
</Brief>
......@@ -2646,13 +2646,13 @@ export default class tableCom extends Component {
</Form.Item>
);
} else {
return cm
}
} else {
return (
<Form.Item
>
{cm}
</Form.Item>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论