提交 e97216ea authored 作者: 徐立's avatar 徐立

调整与场景设计器兼容

上级 6d9408bf
...@@ -3,22 +3,21 @@ ...@@ -3,22 +3,21 @@
* 2019年9月25日 * 2019年9月25日
* 自定义表单表格 * 自定义表单表格
*/ */
import React, { Component } from 'react' import React, { Component } from 'react';
import { Form } from 'antd'; import { Form } from 'antd';
import { Row, Col, Input, message } from 'antd' import { Row, Col, Input, message } from 'antd';
import TableCom from '../tableCompon' import TableCom from '../tableCompon';
import { Toast } from 'antd-mobile' import { Toast } from 'antd-mobile';
import router from 'umi/router' import router from 'umi/router';
import IsNewTable from './isNewMobileTable'; import IsNewTable from './isNewMobileTable';
import NewWebTable from './isNewWebTable'; import NewWebTable from './isNewWebTable';
import maintain from '../assets/maintain.png' import maintain from '../assets/maintain.png';
import moment from 'moment' import moment from 'moment';
export default class ZdyTable extends Component { export default class ZdyTable extends Component {
constructor(props) { constructor(props) {
super(props) super(props);
this.state = { this.state = {
selects: new Map(), selects: new Map(),
left: 0, left: 0,
top: 0, top: 0,
...@@ -37,8 +36,7 @@ export default class ZdyTable extends Component { ...@@ -37,8 +36,7 @@ export default class ZdyTable extends Component {
isEdit: true, isEdit: true,
isReady: false, isReady: false,
formConfig: {}, formConfig: {},
};
}
} }
componentDidMount() { componentDidMount() {
...@@ -50,23 +48,23 @@ export default class ZdyTable extends Component { ...@@ -50,23 +48,23 @@ export default class ZdyTable extends Component {
isChild, // 是否为子表单 isChild, // 是否为子表单
isQRCode = false, // 是否为二维码快捷发起 isQRCode = false, // 是否为二维码快捷发起
formDeafault = '', // 为二维码快捷发起默认值 formDeafault = '', // 为二维码快捷发起默认值
} = this.props } = this.props;
if (isPreview || isChild) { if (isPreview || isChild) {
this.setState({ ...this.state, ...this.props, isReady: true });
this.setState({ ...this.state, ...this.props, isReady: true }) return;
return
} }
let val = postData let val = postData;
try { try {
/** /**
* 数据源不同进行以下区别处理 * 数据源不同进行以下区别处理
* 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;
for (var i = 0; i < dataObjs.length; i++) { for (var i = 0; i < dataObjs.length; i++) {
const dob = dataObjs[i]; const dob = dataObjs[i];
...@@ -74,7 +72,7 @@ export default class ZdyTable extends Component { ...@@ -74,7 +72,7 @@ export default class ZdyTable extends Component {
mapData[dob.columnModels[j].base52] = dob.columnModels[j]; mapData[dob.columnModels[j].base52] = dob.columnModels[j];
} }
} }
const sqls = val.form.sqlModels const sqls = val.form.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++) {
...@@ -95,24 +93,28 @@ export default class ZdyTable extends Component { ...@@ -95,24 +93,28 @@ export default class ZdyTable extends Component {
defaultValues: val.form.defaultValues, defaultValues: val.form.defaultValues,
appId: val.appId, appId: val.appId,
isReady: true, isReady: true,
formConfig: xxx formConfig: xxx,
}); });
return return;
} }
if (isCg === 'yes') {// 用户从编辑按钮进入 if (isCg === 'yes') {
if (val.unifiedServicePatternModel.isDefaultError != null && val.unifiedServicePatternModel.isDefaultError) { // 用户从编辑按钮进入
if (this.props.get == "web") { if (
message.error("当前办理人数较多,服务繁忙,请稍后再试!") val.unifiedServicePatternModel.isDefaultError != null &&
val.unifiedServicePatternModel.isDefaultError
) {
if (this.props.get == 'web') {
message.error('当前办理人数较多,服务繁忙,请稍后再试!');
} else { } else {
Toast.fail("当前办理人数较多,服务繁忙,请稍后再试!") Toast.fail('当前办理人数较多,服务繁忙,请稍后再试!');
} }
router.goBack() router.goBack();
return; return;
} }
const mapData = {}; const mapData = {};
const sqlData = {}; const sqlData = {};
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;
...@@ -138,29 +140,34 @@ export default class ZdyTable extends Component { ...@@ -138,29 +140,34 @@ export default class ZdyTable extends Component {
currentFormKey: obj.init, currentFormKey: obj.init,
width: xxx.width, width: xxx.width,
isBorder: xxx.isBorder, isBorder: xxx.isBorder,
mapData, sqlData, mapData,
sqlData,
defaultValues: val.unifiedServicePatternModel.defaultValues, defaultValues: val.unifiedServicePatternModel.defaultValues,
appId: val.appId, appId: val.appId,
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;
} }
if (val.unifiedServicePatternModel.isDefaultError != null && val.unifiedServicePatternModel.isDefaultError) { if (
if (this.props.get == "web") { val.unifiedServicePatternModel.isDefaultError != null &&
message.error("当前办理人数较多,服务繁忙,请稍后再试!") val.unifiedServicePatternModel.isDefaultError
) {
if (this.props.get == 'web') {
message.error('当前办理人数较多,服务繁忙,请稍后再试!');
} else { } else {
Toast.fail("当前办理人数较多,服务繁忙,请稍后再试!") Toast.fail('当前办理人数较多,服务繁忙,请稍后再试!');
} }
router.goBack() router.goBack();
return; return;
} }
const mapData = {}; const mapData = {};
const sqlData = {}; const sqlData = {};
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;
...@@ -178,58 +185,68 @@ export default class ZdyTable extends Component { ...@@ -178,58 +185,68 @@ export default class ZdyTable extends Component {
} }
const obj = JSON.parse(val.unifiedServicePatternModel.content); const obj = JSON.parse(val.unifiedServicePatternModel.content);
const xxx = obj.datas[this.props.formKey ? this.props.formKey : obj.init]; // 是否是存在历史表单传入值 const xxx = obj.datas[this.props.formKey ? this.props.formKey : obj.init]; // 是否是存在历史表单传入值
this.setState({ this.setState(
{
appId: val.id, appId: val.id,
formId: val.id, formId: val.id,
formCode: val.code, formCode: val.code,
datas: obj.datas, datas: obj.datas,
mapData, sqlData, mapData,
sqlData,
defaultValues: val.unifiedServicePatternModel.defaultValues, defaultValues: val.unifiedServicePatternModel.defaultValues,
isEdit: this.props.formKey ? false : true, isEdit: this.props.formKey ? false : true,
currentFormKey: this.props.formKey ? this.props.formKey : val.taskFormKey ? val.taskFormKey : obj.init, currentFormKey: this.props.formKey
defaultBinds: this.props.table ? obj.datas[val.taskFormKey].defaultBinds : xxx.defaultBinds, ? this.props.formKey
: val.taskFormKey
? val.taskFormKey
: obj.init,
defaultBinds: this.props.table
? obj.datas[val.taskFormKey].defaultBinds
: xxx.defaultBinds,
width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width, width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width,
isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder, isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder,
items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items, items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items,
isReady: true, isReady: true,
init: { ...this.state.init, ...val.isSecond ? this.props.obj : {} }, init: { ...this.state.init, ...(val.isSecond ? this.props.obj : {}) },
formConfig: xxx formConfig: xxx,
// init:this.props.get==="mobile"?!!val.content?JSON.parse(val.content):'':{},// 移动端默认值设置 // init:this.props.get==="mobile"?!!val.content?JSON.parse(val.content):'':{},// 移动端默认值设置
}, () => { },
() => {
/** /**
* 为二维码快捷发起时自动设置新默认值 * 为二维码快捷发起时自动设置新默认值
*/ */
if (isQRCode) { if (isQRCode) {
this.props.form.setFieldsValue(formDeafault) this.props.form.setFieldsValue(formDeafault);
} }
}); },
);
} catch (e) { } catch (e) {
console.log(`公式配置有误`, e) console.log(`公式配置有误`, e);
} }
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
let { let {
postData,// 数据源 postData, // 数据源
isCg, // 用户点击草稿页面进入 isCg, // 用户点击草稿页面进入
isForm, isForm,
isPreview, // 是否为预览模式 isPreview, // 是否为预览模式
isChild,// 是否为子表单 isChild, // 是否为子表单
} = nextProps } = nextProps;
if (isPreview || isChild) { if (isPreview || isChild) {
this.setState({ ...this.state, ...this.props, isReady: true });
this.setState({ ...this.state, ...this.props, isReady: true }) return;
return
} }
try { try {
let val = postData let val = postData;
/** /**
* 数据源不同进行以下区别处理 * 数据源不同进行以下区别处理
* 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;
for (var i = 0; i < dataObjs.length; i++) { for (var i = 0; i < dataObjs.length; i++) {
const dob = dataObjs[i]; const dob = dataObjs[i];
...@@ -237,7 +254,7 @@ export default class ZdyTable extends Component { ...@@ -237,7 +254,7 @@ export default class ZdyTable extends Component {
mapData[dob.columnModels[j].base52] = dob.columnModels[j]; mapData[dob.columnModels[j].base52] = dob.columnModels[j];
} }
} }
const sqls = val.form.sqlModels const sqls = val.form.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++) {
...@@ -258,14 +275,15 @@ export default class ZdyTable extends Component { ...@@ -258,14 +275,15 @@ export default class ZdyTable extends Component {
defaultValues: val.form.defaultValues, defaultValues: val.form.defaultValues,
appId: val.appId, appId: val.appId,
isReady: true, isReady: true,
formConfig: xxx formConfig: xxx,
}); });
return return;
} }
if (isCg === 'yes') {// 用户从编辑按钮进入 if (isCg === 'yes') {
// 用户从编辑按钮进入
const mapData = {}; const mapData = {};
const sqlData = {}; const sqlData = {};
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;
...@@ -291,18 +309,21 @@ export default class ZdyTable extends Component { ...@@ -291,18 +309,21 @@ export default class ZdyTable extends Component {
currentFormKey: obj.init, currentFormKey: obj.init,
width: xxx.width, width: xxx.width,
isBorder: xxx.isBorder, isBorder: xxx.isBorder,
mapData, sqlData, defaultValues: val.unifiedServicePatternModel.defaultValues, mapData,
sqlData,
defaultValues: val.unifiedServicePatternModel.defaultValues,
appId: val.appId, appId: val.appId,
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;
} }
const mapData = {}; const mapData = {};
const sqlData = {}; const sqlData = {};
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;
...@@ -323,43 +344,48 @@ export default class ZdyTable extends Component { ...@@ -323,43 +344,48 @@ export default class ZdyTable extends Component {
this.setState({ this.setState({
appId: val.id, appId: val.id,
datas: obj.datas, datas: obj.datas,
mapData, sqlData, defaultValues: val.unifiedServicePatternModel.defaultValues, mapData,
sqlData,
defaultValues: val.unifiedServicePatternModel.defaultValues,
isEdit: this.props.formKey ? false : true, isEdit: this.props.formKey ? false : true,
currentFormKey: this.props.formKey ? this.props.formKey : val.taskFormKey ? val.taskFormKey : obj.init, currentFormKey: this.props.formKey
? this.props.formKey
: val.taskFormKey
? val.taskFormKey
: obj.init,
defaultBinds: this.props.table ? obj.datas[val.taskFormKey].defaultBinds : xxx.defaultBinds, defaultBinds: this.props.table ? obj.datas[val.taskFormKey].defaultBinds : xxx.defaultBinds,
width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width, width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width,
isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder, isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder,
items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items, items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items,
isReady: true, isReady: true,
init: { ...this.state.init, ...val.isSecond ? this.props.obj : {} }, init: { ...this.state.init, ...(val.isSecond ? this.props.obj : {}) },
formConfig: xxx formConfig: xxx,
// init:this.props.get==="mobile"?!!val.content?JSON.parse(val.content):'':{},// 移动端默认值设置 // init:this.props.get==="mobile"?!!val.content?JSON.parse(val.content):'':{},// 移动端默认值设置
}); });
} catch (e) { } catch (e) {
console.log(`公式配置有误`, e) console.log(`公式配置有误`, e);
} }
} }
checkAllHidden = (row) => { checkAllHidden = row => {
for (var i = 0; i < row.length; i++) { for (var i = 0; i < row.length; i++) {
if (row[i].hidden == null || !row[i].hidden) { if (row[i].hidden == null || !row[i].hidden) {
return false; return false;
} }
} }
for (var i = 0; i < row.length; i++) { for (var i = 0; i < row.length; i++) {
delete row[i].hidden delete row[i].hidden;
} }
return true return true;
} };
countMax = (items) => { countMax = items => {
var max = 0 var max = 0;
items.forEach((r) => { items.forEach(r => {
if (r.length > max) { if (r.length > max) {
max = r.length max = r.length;
}
})
return max
} }
});
return max;
};
render() { render() {
let { let {
...@@ -378,8 +404,8 @@ export default class ZdyTable extends Component { ...@@ -378,8 +404,8 @@ export default class ZdyTable extends Component {
isReady, isReady,
formConfig, formConfig,
formCode, formCode,
formId formId,
} = this.state } = this.state;
let { let {
border, border,
get, get,
...@@ -390,16 +416,16 @@ export default class ZdyTable extends Component { ...@@ -390,16 +416,16 @@ export default class ZdyTable extends Component {
messageData, // 场景设计器共享变量参数 设计器监听到参数发生变化后会重新渲染组件 messageData, // 场景设计器共享变量参数 设计器监听到参数发生变化后会重新渲染组件
postData, postData,
modalInit, modalInit,
} = this.props concealModel, // 场景设计器内置跳转函数
let style = {} } = this.props;
let style = {};
if (formConfig.style != null) { if (formConfig.style != null) {
try { try {
style = JSON.parse(formConfig.style) style = JSON.parse(formConfig.style);
} catch (e) { } catch (e) {
console.log(e) console.log(e);
style = {} style = {};
} }
} }
const formItemLayout = { const formItemLayout = {
labelCol: { labelCol: {
...@@ -411,88 +437,94 @@ export default class ZdyTable extends Component { ...@@ -411,88 +437,94 @@ export default class ZdyTable extends Component {
sm: { span: 16 }, sm: { span: 16 },
}, },
}; };
const max = this.countMax(items) const max = this.countMax(items);
const borderStyle = { const borderStyle = {
borderRight: "1px solid gray", borderRight: '1px solid gray',
borderTop: "1px solid gray", borderTop: '1px solid gray',
borderLeft: "1px solid gray", borderLeft: '1px solid gray',
borderBottom: "1px solid gray" borderBottom: '1px solid gray',
} };
const borderStyleTwo = { // 处理隐藏组件边框样式问题 const borderStyleTwo = {
borderRight: "1px solid gray", // 处理隐藏组件边框样式问题
borderLeft: "1px solid gray", borderRight: '1px solid gray',
borderTop: "1px solid gray", borderLeft: '1px solid gray',
} borderTop: '1px solid gray',
let updateTime };
const styleDiv = this.props.height ? let updateTime;
{ const styleDiv = this.props.height
overflow: "auto", ? {
width: "100%", overflow: 'auto',
width: '100%',
height: this.props.height, height: this.props.height,
paddingBottom:'10px' paddingBottom: '10px',
} }
: { : {
overflow: "auto", overflow: 'auto',
width: "100%", width: '100%',
paddingBottom:'10px' paddingBottom: '10px',
} };
if (!isReady) return <></> if (!isReady) return <></>;
if (this.props.postData?.isUpdate) { if (this.props.postData?.isUpdate) {
updateTime = moment(+this.props.postData?.updateTime).format('llll') updateTime = moment(+this.props.postData?.updateTime).format('llll');
} }
switch (get) { switch (get) {
case 'web': case 'web':
return (<> return (
{this.props.postData?.isUpdate ? <>
{this.props.postData?.isUpdate ? (
<div style={{ margin: '100px 24px 24px' }}> <div style={{ margin: '100px 24px 24px' }}>
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
<img style={{ marginRight: 30 }} src={maintain}></img> <img style={{ marginRight: 30 }} src={maintain}></img>
</div> </div>
<p style={{ <p
textAlign: "center", style={{
textAlign: 'center',
width: '100%', width: '100%',
fontSize: '16px', fontSize: '16px',
fontWeight: 'bold', fontWeight: 'bold',
color: '#666666', color: '#666666',
}} }}
> >
{updateTime !== 'Invalid date' ? {updateTime !== 'Invalid date'
`升级维护中,预计${updateTime ?? '一万年'}恢复使用,请耐心等待。` : ? `升级维护中,预计${updateTime ?? '一万年'}恢复使用,请耐心等待。`
'请耐心等待'} : '请耐心等待'}
</p> </p>
</div> </div>
:<div ) : (
id='web_table' <div id="web_table">
> <Form className="login-form">
<Form {isEdit && defaultBinds
className="login-form" > ? Object.keys(defaultBinds).map(k => {
{isEdit && defaultBinds ? Object.keys(defaultBinds).map((k) => { const r = defaultBinds[k];
const r = defaultBinds[k] if (
if (r.columnIds == null || r.columnIds.length < 2 || r.sqls == null || r.sqls.length < 2) { r.columnIds == null ||
return "" r.columnIds.length < 2 ||
} r.sqls == null ||
const name = r.columnIds[r.columnIds.length - 1] r.sqls.length < 2
const key = r.sqls[r.sqls.length - 1] ) {
const value = defaultValues[key] return '';
}
const name = r.columnIds[r.columnIds.length - 1];
const key = r.sqls[r.sqls.length - 1];
const value = defaultValues[key];
if (value == null) { if (value == null) {
return "" return '';
} }
return this.props.form.getFieldDecorator(name, { return this.props.form.getFieldDecorator(name, {
initialValue: value initialValue: value,
})(<Input type="hidden" />); })(<Input type="hidden" />);
})
}) : ""} : ''}
<Row> <Row>
<Col span={24}> <Col span={24}>
<div <div
style={styleDiv} style={styleDiv}
ref={ref => { this.root = ref }} ref={ref => {
this.root = ref;
}}
> >
{/* <NewWebTable {/* <NewWebTable
items={items} items={items}
...@@ -523,52 +555,65 @@ export default class ZdyTable extends Component { ...@@ -523,52 +555,65 @@ export default class ZdyTable extends Component {
/> */} /> */}
<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) => {
const allhidden = this.checkAllHidden(row) const allhidden = this.checkAllHidden(row);
return <tr key={i}> return (
<tr key={i}>
{row.map((cell, j) => { {row.map((cell, j) => {
if(!cell.content){ if (!cell.content) {
return return;
} }
let styles = {} let styles = {};
if (cell.content && cell.content.styles) { if (cell.content && cell.content.styles) {
try { try {
styles = JSON.parse(cell.content.styles) styles = JSON.parse(cell.content.styles);
} catch (e) { } catch (e) {
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
: width * (cell.col ? cell.col : 1)} ? cell.content.cwidth
: 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:
...isBorder ? cell.content && cell.content.calign
(cell?.content?.comName == "InputHidden" || !cell?.content?.comName ? ? cell.content.calign
{} :borderStyle : 'left',
) : {}, ...(isBorder
? cell?.content?.comName == 'InputHidden' ||
!cell?.content?.comName
? {}
: borderStyle
: {}),
// position: cell.content&&cell.content.comName ==="InputHidden"&&'absolute', // position: cell.content&&cell.content.comName ==="InputHidden"&&'absolute',
...styles, ...styles,
display:cell.content&&cell.content.comName ==="InputHidden"&&'none', display:
}} > cell.content &&
cell.content.comName === 'InputHidden' &&
'none',
}}
>
<TableCom <TableCom
formCode={formCode} // 当前表单code formCode={formCode} // 当前表单code
modalInit={modalInit} modalInit={modalInit}
...@@ -592,71 +637,78 @@ export default class ZdyTable extends Component { ...@@ -592,71 +637,78 @@ export default class ZdyTable extends Component {
defaultValues={defaultValues || {}} // 接口中的默认值 defaultValues={defaultValues || {}} // 接口中的默认值
routerState={routerState} // 兼容表单设计器路由传参 routerState={routerState} // 兼容表单设计器路由传参
messageData={messageData} // 场景设计器共享变量参数 messageData={messageData} // 场景设计器共享变量参数
concealModel={concealModel || {}} // 场景设计器内置路由跳转函数
/> />
</td> </td>
} );
) })}
}
</tr> </tr>
);
})} })}
</tbody> </tbody>
</table> </table>
{style.pageBreakAfter != null ? <div style={{ pageBreakAfter: style.pageBreakAfter }}></div> : ""} {style.pageBreakAfter != null ? (
<div style={{ pageBreakAfter: style.pageBreakAfter }}></div>
) : (
''
)}
</div> </div>
</Col> </Col>
</Row> </Row>
</Form> </Form>
</div> </div>
)}
}</>) </>
);
case 'mobile': case 'mobile':
return (<> return (
{this.props.postData?.isUpdate ? <>
{this.props.postData?.isUpdate ? (
<div style={{ margin: '100px 24px 24px' }}> <div style={{ margin: '100px 24px 24px' }}>
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
<img style={{ width: '100%' }} src={maintain}></img> <img style={{ width: '100%' }} src={maintain}></img>
</div> </div>
<p style={{ <p
textAlign: "center", style={{
textAlign: 'center',
width: '100%', width: '100%',
fontSize: '16px', fontSize: '16px',
fontWeight: 'bold', fontWeight: 'bold',
color: '#666666', color: '#666666',
}} }}
> >
{updateTime !== 'Invalid date' ? {updateTime !== 'Invalid date'
`升级维护中,预计${updateTime ?? '一万年'}恢复使用,请耐心等待。` : ? `升级维护中,预计${updateTime ?? '一万年'}恢复使用,请耐心等待。`
'请耐心等待'} : '请耐心等待'}
</p> </p>
</div> </div>
: ) : (
<Form {...formItemLayout} id='mobile_table' className="login-form"> <Form {...formItemLayout} id="mobile_table" className="login-form">
{defaultBinds ? Object.keys(defaultBinds).map((k) => { {defaultBinds
const r = defaultBinds[k] ? Object.keys(defaultBinds).map(k => {
if (r.columnIds == null || r.columnIds.length < 2 || r.sqls == null || r.sqls.length < 2) { const r = defaultBinds[k];
return "" if (
} r.columnIds == null ||
const name = r.columnIds[r.columnIds.length - 1] r.columnIds.length < 2 ||
const key = r.sqls[r.sqls.length - 1] r.sqls == null ||
const value = defaultValues[key] r.sqls.length < 2
) {
return '';
}
const name = r.columnIds[r.columnIds.length - 1];
const key = r.sqls[r.sqls.length - 1];
const value = defaultValues[key];
if (value == null) { if (value == null) {
return "" return '';
} }
return this.props.form.getFieldDecorator(name, { return this.props.form.getFieldDecorator(name, {
initialValue: value initialValue: value,
})(<Input type="hidden" />); })(<Input type="hidden" />);
})
}) : ""} : ''}
<IsNewTable <IsNewTable
modalInit={modalInit} modalInit={modalInit}
items={items} items={items}
...@@ -682,6 +734,7 @@ export default class ZdyTable extends Component { ...@@ -682,6 +734,7 @@ export default class ZdyTable extends Component {
messageData={messageData} // 场景设计器共享变量参数 messageData={messageData} // 场景设计器共享变量参数
formId={formId} formId={formId}
fatherObj={this.props.fatherObj} fatherObj={this.props.fatherObj}
concealModel={concealModel || {}} // 场景设计器内置路由跳转函数
/> />
{/* { {/* {
items.map((item, i) => { items.map((item, i) => {
...@@ -729,7 +782,9 @@ export default class ZdyTable extends Component { ...@@ -729,7 +782,9 @@ export default class ZdyTable extends Component {
}) })
} */} } */}
</Form> </Form>
}</>) )}
</>
);
} }
} }
} }
/** /**
* 测试新表格 * 测试新表格
*/ */
import React, { Component } from 'react' import React, { Component } from 'react';
import TableCom from '../tableCompon/index'; import TableCom from '../tableCompon/index';
import { Card, WhiteSpace } from 'antd-mobile'; import { Card, WhiteSpace } from 'antd-mobile';
import { Row, Col } from 'antd'; import { Row, Col } from 'antd';
export default class isNewTable extends Component { export default class isNewTable extends Component {
render() { render() {
const { const {
items, items,
checkAllHidden, checkAllHidden,
isBorder, isBorder,
...@@ -32,14 +31,17 @@ export default class isNewTable extends Component { ...@@ -32,14 +31,17 @@ export default class isNewTable extends Component {
formId, formId,
fatherObj, fatherObj,
style, style,
modalInit modalInit,
} = this.props concealModel,
if(!isEdit ){ // 展示栏 暂不做处理 } = this.props;
return <> if (!isEdit) {
{ // 展示栏 暂不做处理
items.map((item, i) => { return (
const allhidden = checkAllHidden(items) <>
return (<div {items.map((item, i) => {
const allhidden = checkAllHidden(items);
return (
<div
key={i} key={i}
style={{ style={{
marginTop: 0, marginTop: 0,
...@@ -47,12 +49,15 @@ export default class isNewTable extends Component { ...@@ -47,12 +49,15 @@ export default class isNewTable extends Component {
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
modalInit={modalInit} modalInit={modalInit}
formCode={formCode} formCode={formCode}
formId={formId} formId={formId}
...@@ -76,13 +81,16 @@ export default class isNewTable extends Component { ...@@ -76,13 +81,16 @@ export default class isNewTable extends Component {
routerState={routerState} // 兼容表单设计器路由传参 routerState={routerState} // 兼容表单设计器路由传参
defaultValues={defaultValues || {}} defaultValues={defaultValues || {}}
messageData={messageData} // 场景设计器共享变量参数 messageData={messageData} // 场景设计器共享变量参数
/></> concealModel={concealModel} // 场景设计器路由跳转参数
}) />
} </>
</div>) );
}) })}
} </div>
);
})}
</> </>
);
} }
return ( return (
<> <>
...@@ -163,22 +171,26 @@ export default class isNewTable extends Component { ...@@ -163,22 +171,26 @@ export default class isNewTable extends Component {
</> </>
}) })
} */} } */}
{ // 卡片模式 {// 卡片模式
items.map((item, i) => { items.map((item, i) => {
const allhidden = checkAllHidden(items) const allhidden = checkAllHidden(items);
return <> <Card full> return (
<>
{' '}
{ <Card full>
item.map((ary, j) => { {item.map((ary, j) => {
if(!ary.content){ if (!ary.content) {
return return;
} }
if(ary.content&&ary.content.comName==="Label"){ if (ary.content && ary.content.comName === 'Label') {
return <Card.Header return (
<Card.Header
title={ title={
!allhidden && ary.hidden ? "" !allhidden && ary.hidden ? (
:<><TableCom ''
) : (
<>
<TableCom
modalInit={modalInit} modalInit={modalInit}
formCode={formCode} formCode={formCode}
formId={formId} formId={formId}
...@@ -202,16 +214,26 @@ export default class isNewTable extends Component { ...@@ -202,16 +214,26 @@ export default class isNewTable extends Component {
routerState={routerState} // 兼容表单设计器路由传参 routerState={routerState} // 兼容表单设计器路由传参
defaultValues={defaultValues || {}} defaultValues={defaultValues || {}}
messageData={messageData} // 场景设计器共享变量参数 messageData={messageData} // 场景设计器共享变量参数
/></> />
</>
)
} }
/> />
);
} }
return !allhidden && ary.hidden ? "" return !allhidden && ary.hidden ? (
:<Card.Body ''
style={{ ) : (
<Card.Body
style={
{
// textAlign:ary.content&&ary.content.comName === 'Table'?"left":'right' // textAlign:ary.content&&ary.content.comName === 'Table'?"left":'right'
}} }
> <><TableCom }
>
{' '}
<>
<TableCom
modalInit={modalInit} modalInit={modalInit}
formCode={formCode} formCode={formCode}
formId={formId} formId={formId}
...@@ -235,17 +257,17 @@ export default class isNewTable extends Component { ...@@ -235,17 +257,17 @@ export default class isNewTable extends Component {
routerState={routerState} // 兼容表单设计器路由传参 routerState={routerState} // 兼容表单设计器路由传参
defaultValues={defaultValues || {}} defaultValues={defaultValues || {}}
messageData={messageData} // 场景设计器共享变量参数 messageData={messageData} // 场景设计器共享变量参数
/></> />
</>
</Card.Body> </Card.Body>
}) );
} })}
</Card> </Card>
<WhiteSpace /> <WhiteSpace />
</> </>
}) );
} })}
</> </>
) );
} }
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论