Skip to content

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

21843 宿舍管理/宿舍维修审核。20210111 维修师排期之后 在进行排期 时间显示错误

上级 8ef90099
显示空白字符变更
内嵌 并排
正在显示 包含 390 行增加 和 322 行删除
one_stop_public/Table/index.jsx
浏览文件 @ b573a359
...@@ -228,6 +228,7 @@ export default class ZdyTable extends Component { ...@@ -228,6 +228,7 @@ export default class ZdyTable extends Component {
: val.taskFormKey : val.taskFormKey
? val.taskFormKey ? val.taskFormKey
: obj.init; : obj.init;
console.log('231--------');
this.initExcel(obj, () => this.initExcel(obj, () =>
this.setState( this.setState(
{ {
...@@ -251,7 +252,7 @@ export default class ZdyTable extends Component { ...@@ -251,7 +252,7 @@ export default class ZdyTable extends Component {
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 : {}) }, // 重新发起就拿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):'':{},// 移动端默认值设置
}, },
...@@ -573,7 +574,9 @@ export default class ZdyTable extends Component { ...@@ -573,7 +574,9 @@ export default class ZdyTable extends Component {
isRowCol: this.props.table ? obj.datas[val.taskFormKey].isRowCol : xxx.isRowCol, isRowCol: this.props.table ? obj.datas[val.taskFormKey].isRowCol : xxx.isRowCol,
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):'':{},// 移动端默认值设置
}); });
......
one_stop_public/filePreview/index.jsx
浏览文件 @ b573a359
...@@ -35,7 +35,6 @@ export default class index extends Component { ...@@ -35,7 +35,6 @@ export default class index extends Component {
}; };
render() { render() {
let { path, pathName, width, height } = this.props; let { path, pathName, width, height } = this.props;
console.log(path, '????');
const { visible } = this.state; const { visible } = this.state;
let isShow = let isShow =
pathName?.indexOf('.pdf') !== -1 || pathName?.indexOf('.pdf') !== -1 ||
......
one_stop_public/tableCompon/index.jsx
浏览文件 @ b573a359
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* 2019年9月22日 * 2019年9月22日
* 动态表格组件返回对应的组件 * 动态表格组件返回对应的组件
*/ */
import React, { Component } from 'react'; import React, {Component} from 'react';
import md5 from 'js-md5'; import md5 from 'js-md5';
import FormModal from './FormModal'; import FormModal from './FormModal';
import { import {
...@@ -25,13 +25,13 @@ import { ...@@ -25,13 +25,13 @@ import {
} from 'antd'; } from 'antd';
import UUID from 'react-native-uuid'; import UUID from 'react-native-uuid';
import QRCode from 'qrcode.react'; import QRCode from 'qrcode.react';
import { Editor } from 'draft-js'; import {Editor} from 'draft-js';
import MyBlockRenderer from '../App/MyBlockRender'; import MyBlockRenderer from '../App/MyBlockRender';
import CronEditor from 'antd-cron-editor'; import CronEditor from 'antd-cron-editor';
import { Card, Flex, List as MobileList, Switch as MobileSwitch } from 'antd-mobile'; import {Card, Flex, List as MobileList, Switch as MobileSwitch} from 'antd-mobile';
import ReactEcharts from 'echarts-for-react'; import ReactEcharts from 'echarts-for-react';
import ZdyTable from '../Table/index'; import ZdyTable from '../Table/index';
import { connect } from 'dva'; import {connect} from 'dva';
import UploadCom from '../libs/UploadCom'; import UploadCom from '../libs/UploadCom';
import TableSelect from '../libs/TableSelect'; import TableSelect from '../libs/TableSelect';
import LocationCom from '../libs/LocationCom'; import LocationCom from '../libs/LocationCom';
...@@ -45,27 +45,26 @@ import router from 'umi/router'; ...@@ -45,27 +45,26 @@ import router from 'umi/router';
import TableList from '../libs/TableList'; import TableList from '../libs/TableList';
import styles from './style.less'; import styles from './style.less';
import config from '@/webPublic/one_stop_public/config'; import config from '@/webPublic/one_stop_public/config';
import { cloneDeep, isEmpty, isNaN } from 'lodash'; import {cloneDeep, isEmpty, isNaN} from 'lodash';
import { queryApiActionPath } from '../utils/queryConfig'; import {queryApiActionPath} from '../utils/queryConfig';
import { extend } from 'umi-request'; import {extend} from 'umi-request';
import Highlighter from 'react-highlight-words'; import Highlighter from 'react-highlight-words';
import Signature from '../Signature'; import Signature from '../Signature';
import { changeToDraftState } from '../utils/myutils'; import {changeToDraftState} from '../utils/myutils';
import { Base16Encode } from '../Base16/index'; import {Base16Encode} from '../Base16/index';
import { getToken } from '../utils/token'; import {getToken} from '../utils/token';
import { formulaList } from '../excelInitFuc/functionList'; import {formulaList} from '../excelInitFuc/functionList';
import FilePreview from '../filePreview'; import FilePreview from '../filePreview';
import DraftEditorCom from '../App/DraftEditorCom'; import DraftEditorCom from '../App/DraftEditorCom';
import MobileItem from './MobileItem'; import MobileItem from './MobileItem';
import MobileCascader from "./CascaderDiy/MobileCascader"; import MobileCascader from "./CascaderDiy/MobileCascader";
import { errorHandler, getBase64, equal, getRender, isJSON } from './Split_Index/staticInfo'; import {equal, errorHandler, getBase64, getRender, isJSON} from './Split_Index/staticInfo';
const { TextArea } = Input; const {TextArea} = Input;
const { Option } = Select; const {Option} = Select;
const { RangePicker } = DatePicker; const {RangePicker} = DatePicker;
@connect(({DataColumn, SqlManageEntity, formList, loading}) => ({
@connect(({ DataColumn, SqlManageEntity, formList, loading }) => ({
DataColumn, DataColumn,
SqlManageEntity, SqlManageEntity,
formList, formList,
...@@ -101,22 +100,22 @@ export default class tableCom extends Component { ...@@ -101,22 +100,22 @@ export default class tableCom extends Component {
} }
closeModal = (fk, callback) => { closeModal = (fk, callback) => {
const { dispatch } = this.props; const {dispatch} = this.props;
const x = this.props.DataColumn.isShowModal; const x = this.props.DataColumn.isShowModal;
x[fk] = false; x[fk] = false;
dispatch({ dispatch({
type: 'DataColumn/showModal', type: 'DataColumn/showModal',
payload: { isShowModal: x }, payload: {isShowModal: x},
callback: callback, callback: callback,
}); });
}; };
showModal = (fk, title, data, modalProps) => { showModal = (fk, title, data, modalProps) => {
const { dispatch } = this.props; const {dispatch} = this.props;
const x = this.props.DataColumn.isShowModal; const x = this.props.DataColumn.isShowModal;
x[fk] = true; x[fk] = true;
dispatch({ dispatch({
type: 'DataColumn/showModal', type: 'DataColumn/showModal',
payload: { isShowModal: x }, payload: {isShowModal: x},
callback: () => { callback: () => {
this.setState({ this.setState({
modalInit: data, modalInit: data,
...@@ -135,7 +134,7 @@ export default class tableCom extends Component { ...@@ -135,7 +134,7 @@ export default class tableCom extends Component {
file = { file = {
name: 'file', name: 'file',
action: queryApiActionPath() + '/upload', action: queryApiActionPath() + '/upload',
onChange: (info) => { onChange: info => {
if (info.file.status !== 'uploading') { if (info.file.status !== 'uploading') {
this.setState({ this.setState({
img: info.file.response, img: info.file.response,
...@@ -153,10 +152,10 @@ export default class tableCom extends Component { ...@@ -153,10 +152,10 @@ export default class tableCom extends Component {
count = []; count = [];
handleSearch = (selectedKeys, confirm) => { handleSearch = (selectedKeys, confirm) => {
confirm(); confirm();
this.setState({ searchText: selectedKeys[0] }); this.setState({searchText: selectedKeys[0]});
}; };
handleReset = (clearFilters) => { handleReset = clearFilters => {
clearFilters(); clearFilters();
this.resetSearchText(); this.resetSearchText();
}; };
...@@ -168,17 +167,17 @@ export default class tableCom extends Component { ...@@ -168,17 +167,17 @@ export default class tableCom extends Component {
}; };
getColumnSearchProps = (dataIndex, title) => ({ getColumnSearchProps = (dataIndex, title) => ({
filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => ( filterDropdown: ({setSelectedKeys, selectedKeys, confirm, clearFilters}) => (
<div style={{ padding: 8 }}> <div style={{padding: 8}}>
<Input <Input
ref={(node) => { ref={node => {
this.searchInput = node; this.searchInput = node;
}} }}
placeholder={`请输入${title}`} placeholder={`请输入${title}`}
value={selectedKeys[0]} value={selectedKeys[0]}
onChange={(e) => setSelectedKeys(e.target.value ? [e.target.value] : [])} onChange={e => setSelectedKeys(e.target.value ? [e.target.value] : [])}
onPressEnter={() => this.handleSearch(selectedKeys, confirm)} onPressEnter={() => this.handleSearch(selectedKeys, confirm)}
style={{ width: 188, marginBottom: 8, display: 'block' }} style={{width: 188, marginBottom: 8, display: 'block'}}
/> />
<Button <Button
type="primary" type="primary"
...@@ -186,21 +185,21 @@ export default class tableCom extends Component { ...@@ -186,21 +185,21 @@ export default class tableCom extends Component {
icon="search" icon="search"
loading={this.props.loading} loading={this.props.loading}
size="small" size="small"
style={{ width: 90, marginRight: 8 }}> style={{width: 90, marginRight: 8}}
>
搜索 搜索
</Button> </Button>
<Button <Button
loading={this.props.loading} loading={this.props.loading}
onClick={() => this.handleReset(clearFilters)} onClick={() => this.handleReset(clearFilters)}
size="small" size="small"
style={{ width: 90 }}> style={{width: 90}}
>
重置 重置
</Button> </Button>
</div> </div>
), ),
filterIcon: (filtered) => ( filterIcon: filtered => <Icon type="search" style={{color: filtered ? '#1890ff' : 'red'}}/>,
<Icon type="search" style={{ color: filtered ? '#1890ff' : 'red' }} />
),
onFilter: (value, record) => onFilter: (value, record) =>
record[dataIndex] record[dataIndex]
? record[dataIndex] ? record[dataIndex]
...@@ -208,16 +207,16 @@ export default class tableCom extends Component { ...@@ -208,16 +207,16 @@ export default class tableCom extends Component {
.toLowerCase() .toLowerCase()
.includes(value.toLowerCase()) .includes(value.toLowerCase())
: '', : '',
onFilterDropdownVisibleChange: (visible) => { onFilterDropdownVisibleChange: visible => {
if (visible) { if (visible) {
setTimeout(() => this.searchInput.select()); setTimeout(() => this.searchInput.select());
} }
}, },
render: (text) => { render: text => {
if (text != null) { if (text != null) {
return ( return (
<Highlighter <Highlighter
highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }} highlightStyle={{backgroundColor: '#ffc069', padding: 0}}
searchWords={[this.state.searchText]} searchWords={[this.state.searchText]}
autoEscape autoEscape
textToHighlight={text.toString()} textToHighlight={text.toString()}
...@@ -241,7 +240,7 @@ export default class tableCom extends Component { ...@@ -241,7 +240,7 @@ export default class tableCom extends Component {
}; };
componentWillReceiveProps(props) { componentWillReceiveProps(props) {
const { json, mapData, obj } = props; const {json, mapData, obj} = props;
if (json == null || this.props.safe) { if (json == null || this.props.safe) {
return; return;
} }
...@@ -268,7 +267,15 @@ export default class tableCom extends Component { ...@@ -268,7 +267,15 @@ export default class tableCom extends Component {
if (obj2 != null && obj2[props.fatherCode]) { if (obj2 != null && obj2[props.fatherCode]) {
childObj2 = obj2[props.fatherCode][props.index]; childObj2 = obj2[props.fatherCode][props.index];
bb2 = equal(this.childObj, childObj2, json, this.state.sqlContent, 1, this.props, this.excludeKeys); bb2 = equal(
this.childObj,
childObj2,
json,
this.state.sqlContent,
1,
this.props,
this.excludeKeys,
);
} }
} }
...@@ -316,10 +323,10 @@ export default class tableCom extends Component { ...@@ -316,10 +323,10 @@ export default class tableCom extends Component {
...bindObj, ...bindObj,
base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`,
} }
: { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` } : {base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}`}
: bindObj; : bindObj;
if (this.props.fatherCode == null && dataColumn == null) if (this.props.fatherCode == null && dataColumn == null)
dataColumn = { base52: this.props.uuid }; dataColumn = {base52: this.props.uuid};
if (!this.props.isEdit && this.props.fatherCode) { if (!this.props.isEdit && this.props.fatherCode) {
if (bindObj != null) { if (bindObj != null) {
...@@ -347,19 +354,19 @@ export default class tableCom extends Component { ...@@ -347,19 +354,19 @@ export default class tableCom extends Component {
getData = (json, dataColumn, obj, init) => { getData = (json, dataColumn, obj, init) => {
const allValues = JSON.stringify(obj); const allValues = JSON.stringify(obj);
if (json.comName == 'TableSelect') { if (json.comName == 'TableSelect') {
const { dispatch } = this.props; const {dispatch} = this.props;
const { sqlKey, optionType } = json; const {sqlKey, optionType} = json;
if (optionType == 'sql') { if (optionType == 'sql') {
dispatch({ dispatch({
type: 'SqlManageEntity/find', type: 'SqlManageEntity/find',
payload: { sqlKey: sqlKey }, payload: {sqlKey: sqlKey},
callback: (sqlModel) => { callback: sqlModel => {
this.setState({ sqlModel }); this.setState({sqlModel});
if (sqlModel.dataObjId) { if (sqlModel.dataObjId) {
dispatch({ dispatch({
type: 'formList/getHead', type: 'formList/getHead',
payload: { dataObjId: sqlModel.dataObjId }, payload: {dataObjId: sqlModel.dataObjId},
callback: (datas) => { callback: datas => {
if (datas) { if (datas) {
const columns = []; const columns = [];
for (var i = 0; i < datas.length; i++) { for (var i = 0; i < datas.length; i++) {
...@@ -370,14 +377,14 @@ export default class tableCom extends Component { ...@@ -370,14 +377,14 @@ export default class tableCom extends Component {
if ( if (
['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type) ['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');
} }
columns.push(column); columns.push(column);
} else { } else {
break; break;
} }
} }
this.setState({ columns }); this.setState({columns});
} }
}, },
}); });
...@@ -404,7 +411,7 @@ export default class tableCom extends Component { ...@@ -404,7 +411,7 @@ export default class tableCom extends Component {
break; break;
} }
column.render = (val) => moment(parseInt(val)).format(ff); column.render = val => moment(parseInt(val)).format(ff);
} }
if (cll[k].isQuery) { if (cll[k].isQuery) {
column = { column = {
...@@ -415,18 +422,18 @@ export default class tableCom extends Component { ...@@ -415,18 +422,18 @@ export default class tableCom extends Component {
columns.push(column); columns.push(column);
} }
this.setState({ columns }); this.setState({columns});
} }
dispatch({ dispatch({
type: 'DataColumn/getSqlData', type: 'DataColumn/getSqlData',
payload: { sqlKey, allValues }, payload: {sqlKey, allValues},
callback: (list) => { callback: list => {
const x = { const x = {
list: list, list: list,
pagination: false, pagination: false,
}; };
this.setState({ dataSource: x }); this.setState({dataSource: x});
}, },
}); });
} }
...@@ -435,8 +442,8 @@ export default class tableCom extends Component { ...@@ -435,8 +442,8 @@ export default class tableCom extends Component {
} else if (optionType == 'reference' && dataColumn.referenceObjId) { } else if (optionType == 'reference' && dataColumn.referenceObjId) {
dispatch({ dispatch({
type: 'formList/getHead', type: 'formList/getHead',
payload: { dataObjId: dataColumn.referenceObjId }, payload: {dataObjId: dataColumn.referenceObjId},
callback: (datas) => { callback: datas => {
if (datas) { if (datas) {
const columns = []; const columns = [];
for (var i = 0; i < datas.length; i++) { for (var i = 0; i < datas.length; i++) {
...@@ -445,14 +452,14 @@ export default class tableCom extends Component { ...@@ -445,14 +452,14 @@ export default class tableCom extends Component {
column.title = datas[i].title; column.title = datas[i].title;
column.dataIndex = datas[i].name; column.dataIndex = datas[i].name;
if (['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)) { 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');
} }
columns.push(column); columns.push(column);
} else { } else {
break; break;
} }
} }
this.setState({ columns }); this.setState({columns});
} }
}, },
}); });
...@@ -496,14 +503,14 @@ export default class tableCom extends Component { ...@@ -496,14 +503,14 @@ export default class tableCom extends Component {
if (json.funcs != null && json.funcs != '') { if (json.funcs != null && json.funcs != '') {
if (json.comName == 'Cascader') { if (json.comName == 'Cascader') {
try { try {
this.getFunctionValue(json.funcs, { base52: this.props.uuid }, json, () => { this.getFunctionValue(json.funcs, {base52: this.props.uuid}, json, () => {
if (init != null && Object.keys(init).length > 0) { if (init != null && Object.keys(init).length > 0) {
let base52 = dataColumn.base52; let base52 = dataColumn.base52;
let vlu = this.props.form.getFieldsValue()[base52]; let vlu = this.props.form.getFieldsValue()[base52];
const labs = []; const labs = [];
this.searchJson(vlu, this.state.options, 0, labs); this.searchJson(vlu, this.state.options, 0, labs);
this.setState({ labels: labs }); this.setState({labels: labs});
} else if (!this.props.isEdit && Object.keys(obj).length > 0) { } else if (!this.props.isEdit && Object.keys(obj).length > 0) {
let base52 = dataColumn.base52; let base52 = dataColumn.base52;
...@@ -511,7 +518,7 @@ export default class tableCom extends Component { ...@@ -511,7 +518,7 @@ export default class tableCom extends Component {
const labs = []; const labs = [];
this.searchJson(vlu, this.state.options, 0, labs); this.searchJson(vlu, this.state.options, 0, labs);
this.setState({ labels: labs }); this.setState({labels: labs});
} }
}); });
} catch (e) { } catch (e) {
...@@ -519,7 +526,7 @@ export default class tableCom extends Component { ...@@ -519,7 +526,7 @@ export default class tableCom extends Component {
} }
} else { } else {
try { try {
this.getFunctionValue(json.funcs, { base52: this.props.uuid }, json, () => { this.getFunctionValue(json.funcs, {base52: this.props.uuid}, json, () => {
if (init != null && Object.keys(init).length > 0) { if (init != null && Object.keys(init).length > 0) {
let base52 = dataColumn.base52; let base52 = dataColumn.base52;
let vlu = this.props.form.getFieldsValue()[base52]; let vlu = this.props.form.getFieldsValue()[base52];
...@@ -539,7 +546,7 @@ export default class tableCom extends Component { ...@@ -539,7 +546,7 @@ export default class tableCom extends Component {
} }
} }
this.setState({ labels: labs }); this.setState({labels: labs});
} else if (!this.props.isEdit && Object.keys(obj).length > 0) { } else if (!this.props.isEdit && Object.keys(obj).length > 0) {
let base52 = dataColumn.base52; let base52 = dataColumn.base52;
...@@ -561,7 +568,7 @@ export default class tableCom extends Component { ...@@ -561,7 +568,7 @@ export default class tableCom extends Component {
} }
} }
this.setState({ labels: labs }); this.setState({labels: labs});
} }
}); });
} catch (e) { } catch (e) {
...@@ -596,7 +603,7 @@ export default class tableCom extends Component { ...@@ -596,7 +603,7 @@ export default class tableCom extends Component {
if (url.indexOf('http') === -1) { if (url.indexOf('http') === -1) {
url = config.httpServer + url; url = config.httpServer + url;
} }
const { reqUrls } = this.state; const {reqUrls} = this.state;
if (reqUrls[url] != null) { if (reqUrls[url] != null) {
const ps = reqUrls[url].params; const ps = reqUrls[url].params;
...@@ -619,7 +626,7 @@ export default class tableCom extends Component { ...@@ -619,7 +626,7 @@ export default class tableCom extends Component {
} }
} }
} else { } else {
reqUrls[url] = { params: params }; reqUrls[url] = {params: params};
isChange = true; isChange = true;
} }
...@@ -631,7 +638,7 @@ export default class tableCom extends Component { ...@@ -631,7 +638,7 @@ export default class tableCom extends Component {
const res = callback(data); const res = callback(data);
if (res != null && !(typeof res === 'function')) { if (res != null && !(typeof res === 'function')) {
this.setState({ options: res, selectDis: false }, () => { this.setState({options: res, selectDis: false}, () => {
if (orgCallback) orgCallback(); if (orgCallback) orgCallback();
}); });
} }
...@@ -654,7 +661,7 @@ export default class tableCom extends Component { ...@@ -654,7 +661,7 @@ export default class tableCom extends Component {
try { try {
const x = callback(data); const x = callback(data);
if (x != null) { if (x != null) {
this.setState({ option: x }); this.setState({option: x});
} }
} catch (e) { } catch (e) {
console.log( console.log(
...@@ -667,7 +674,7 @@ export default class tableCom extends Component { ...@@ -667,7 +674,7 @@ export default class tableCom extends Component {
if (base52) { if (base52) {
try { try {
const x = callback(data); const x = callback(data);
if (x == null || x != 'NaN') this.props.form.setFieldsValue({ [base52]: x }); if (x == null || x != 'NaN') this.props.form.setFieldsValue({[base52]: x});
} catch (e) { } catch (e) {
console.log( console.log(
`页面${this.props.formKey} ${json.comName}第${this.props.i + 1}行,第${this.props.j + `页面${this.props.formKey} ${json.comName}第${this.props.i + 1}行,第${this.props.j +
...@@ -705,20 +712,20 @@ export default class tableCom extends Component { ...@@ -705,20 +712,20 @@ export default class tableCom extends Component {
data: requestParams, data: requestParams,
method: method, method: method,
requestType: 'form', requestType: 'form',
}).then((data) => { }).then(data => {
// if (!data || !Array.isArray(data)) { // if (!data || !Array.isArray(data)) {
// data = []; // data = [];
// } // }
const { reqUrls } = this.state; const {reqUrls} = this.state;
if(reqUrls && reqUrls[url]){ if (reqUrls && reqUrls[url]) {
reqUrls[url].data = data; reqUrls[url].data = data;
} }
this.setState({ res: data, reqUrls }, () => { this.setState({res: data, reqUrls}, () => {
if (callback) { if (callback) {
if (json.optionType && json.optionType == 'func') { if (json.optionType && json.optionType == 'func') {
const res = callback(data); const res = callback(data);
if (res != null && !(typeof res === 'function')) { if (res != null && !(typeof res === 'function')) {
this.setState({ options: res, selectDis: false }, () => { this.setState({options: res, selectDis: false}, () => {
if (orgCallback) orgCallback(); if (orgCallback) orgCallback();
}); });
} }
...@@ -740,7 +747,7 @@ export default class tableCom extends Component { ...@@ -740,7 +747,7 @@ export default class tableCom extends Component {
try { try {
const x = callback(data); const x = callback(data);
if (x != null) { if (x != null) {
this.setState({ option: x }); this.setState({option: x});
} }
} catch (e) { } catch (e) {
console.log( console.log(
...@@ -753,7 +760,7 @@ export default class tableCom extends Component { ...@@ -753,7 +760,7 @@ export default class tableCom extends Component {
if (base52) { if (base52) {
try { try {
const x = callback(data); const x = callback(data);
if (x == null || x != 'NaN') this.props.form.setFieldsValue({ [base52]: x }); if (x == null || x != 'NaN') this.props.form.setFieldsValue({[base52]: x});
} catch (e) { } catch (e) {
console.log( console.log(
`页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this `页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this
...@@ -772,7 +779,7 @@ export default class tableCom extends Component { ...@@ -772,7 +779,7 @@ export default class tableCom extends Component {
sqlUtil = (base52, json, orgCallback, sqlKey, params, callback, options = {}) => { sqlUtil = (base52, json, orgCallback, sqlKey, params, callback, options = {}) => {
//查缓存 //查缓存
var isChange = false; var isChange = false;
const { sqlKeys } = this.state; const {sqlKeys} = this.state;
if (sqlKeys[sqlKey] != null) { if (sqlKeys[sqlKey] != null) {
const ps = sqlKeys[sqlKey].params; const ps = sqlKeys[sqlKey].params;
...@@ -801,7 +808,7 @@ export default class tableCom extends Component { ...@@ -801,7 +808,7 @@ export default class tableCom extends Component {
} }
} }
} else { } else {
sqlKeys[sqlKey] = { params: params, options: options }; sqlKeys[sqlKey] = {params: params, options: options};
isChange = true; isChange = true;
} }
if (!isChange) { if (!isChange) {
...@@ -810,7 +817,7 @@ export default class tableCom extends Component { ...@@ -810,7 +817,7 @@ export default class tableCom extends Component {
if (json.optionType && json.optionType == 'func') { if (json.optionType && json.optionType == 'func') {
const res = callback(data); const res = callback(data);
if (res != null && !(typeof res === 'function')) { if (res != null && !(typeof res === 'function')) {
this.setState({ options: res, selectDis: false }, () => { this.setState({options: res, selectDis: false}, () => {
if (orgCallback) orgCallback(); if (orgCallback) orgCallback();
}); });
} }
...@@ -832,7 +839,7 @@ export default class tableCom extends Component { ...@@ -832,7 +839,7 @@ export default class tableCom extends Component {
try { try {
const x = callback(data); const x = callback(data);
if (x != null) { if (x != null) {
this.setState({ option: x }); this.setState({option: x});
} }
} catch (e) { } catch (e) {
console.log( console.log(
...@@ -845,7 +852,7 @@ export default class tableCom extends Component { ...@@ -845,7 +852,7 @@ export default class tableCom extends Component {
if (base52) { if (base52) {
try { try {
const x = callback(data); const x = callback(data);
if (x == null || x != 'NaN') this.props.form.setFieldsValue({ [base52]: x }); if (x == null || x != 'NaN') this.props.form.setFieldsValue({[base52]: x});
} catch (e) { } catch (e) {
console.log( console.log(
`页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this `页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this
...@@ -860,7 +867,7 @@ export default class tableCom extends Component { ...@@ -860,7 +867,7 @@ export default class tableCom extends Component {
} }
const url = queryApiActionPath() + '/DataColumnApi/getSqlData'; const url = queryApiActionPath() + '/DataColumnApi/getSqlData';
this.setState({ sqlKeys }, () => { this.setState({sqlKeys}, () => {
const umiRequest = extend({ const umiRequest = extend({
errorHandler, // 默认错误处理 errorHandler, // 默认错误处理
credentials: options.credentials || 'omit', // 默认请求是否带上cookie credentials: options.credentials || 'omit', // 默认请求是否带上cookie
...@@ -872,7 +879,7 @@ export default class tableCom extends Component { ...@@ -872,7 +879,7 @@ export default class tableCom extends Component {
...this.props.defaultValues[this.props.formKey], ...this.props.defaultValues[this.props.formKey],
...options, ...options,
}); });
const pp = { sqlKey: Base16Encode(sqlKey), params, allValues: Base16Encode(allValues) }; const pp = {sqlKey: Base16Encode(sqlKey), params, allValues: Base16Encode(allValues)};
if (getToken() != null) { if (getToken() != null) {
pp.token = getToken(); pp.token = getToken();
} }
...@@ -881,10 +888,10 @@ export default class tableCom extends Component { ...@@ -881,10 +888,10 @@ export default class tableCom extends Component {
data: pp, data: pp,
method: 'POST', method: 'POST',
requestType: 'form', requestType: 'form',
}).then((data) => { }).then(data => {
const { sqlKeys } = this.state; const {sqlKeys} = this.state;
sqlKeys[sqlKey].data = data; sqlKeys[sqlKey].data = data;
this.setState({ sqlKeys }); this.setState({sqlKeys});
if (data == null) { if (data == null) {
return; return;
} }
...@@ -894,7 +901,7 @@ export default class tableCom extends Component { ...@@ -894,7 +901,7 @@ export default class tableCom extends Component {
const res = callback(data); const res = callback(data);
if (res != null && !(typeof res === 'function')) { if (res != null && !(typeof res === 'function')) {
this.setState({ options: res, selectDis: false }, () => { this.setState({options: res, selectDis: false}, () => {
if (orgCallback) orgCallback(); if (orgCallback) orgCallback();
}); });
} }
...@@ -916,7 +923,7 @@ export default class tableCom extends Component { ...@@ -916,7 +923,7 @@ export default class tableCom extends Component {
try { try {
const x = callback(data); const x = callback(data);
if (x != null) { if (x != null) {
this.setState({ option: x }); this.setState({option: x});
} }
} catch (e) { } catch (e) {
console.log( console.log(
...@@ -929,7 +936,7 @@ export default class tableCom extends Component { ...@@ -929,7 +936,7 @@ export default class tableCom extends Component {
if (base52) { if (base52) {
try { try {
const x = callback(data); const x = callback(data);
if (x == null || x != 'NaN') this.props.form.setFieldsValue({ [base52]: x }); if (x == null || x != 'NaN') this.props.form.setFieldsValue({[base52]: x});
} catch (e) { } catch (e) {
console.log( console.log(
`页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this `页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this
...@@ -955,8 +962,8 @@ export default class tableCom extends Component { ...@@ -955,8 +962,8 @@ export default class tableCom extends Component {
* 动态生成表单配置函数所使用 * 动态生成表单配置函数所使用
*/ */
let functionObj = {}; let functionObj = {};
formulaList.map((item) => { formulaList.map(item => {
item.children.map((arr) => { item.children.map(arr => {
functionObj[arr.callKey] = arr.function; functionObj[arr.callKey] = arr.function;
}); });
}); });
...@@ -1042,7 +1049,7 @@ export default class tableCom extends Component { ...@@ -1042,7 +1049,7 @@ export default class tableCom extends Component {
return value; return value;
} else if (json.optionType && json.optionType == 'func') { } else if (json.optionType && json.optionType == 'func') {
if (value != null && !(typeof value === 'function')) { if (value != null && !(typeof value === 'function')) {
this.setState({ options: value, selectDis: false }, () => { this.setState({options: value, selectDis: false}, () => {
if (callback) callback(); if (callback) callback();
}); });
} }
...@@ -1051,10 +1058,10 @@ export default class tableCom extends Component { ...@@ -1051,10 +1058,10 @@ export default class tableCom extends Component {
json.comName == 'QRCode' || json.comName == 'QRCode' ||
json.comName == 'Graph' json.comName == 'Graph'
) { ) {
this.setState({ option: value }); this.setState({option: value});
} else { } else {
try { try {
this.props.form.setFieldsValue({ [base52]: value }); this.props.form.setFieldsValue({[base52]: value});
} catch { } catch {
console.log( console.log(
`页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this `页面${this.props.currentFormTitle} ${this.props.formKey} ${json.comName}第${this
...@@ -1075,17 +1082,17 @@ export default class tableCom extends Component { ...@@ -1075,17 +1082,17 @@ export default class tableCom extends Component {
}; };
componentDidMount() { componentDidMount() {
const { json, mapData, obj, init } = this.props; const {json, mapData, obj, init} = this.props;
if (json == null) { if (json == null) {
return; return;
} }
if (json.sqlKey != null && json.sqlKey != '') { if (json.sqlKey != null && json.sqlKey != '') {
const { dispatch } = this.props; const {dispatch} = this.props;
dispatch({ dispatch({
type: 'SqlManageEntity/find', type: 'SqlManageEntity/find',
payload: { sqlKey: json.sqlKey }, payload: {sqlKey: json.sqlKey},
callback: (res) => { callback: res => {
this.setState({ sqlContent: res.sql }); this.setState({sqlContent: res.sql});
}, },
}); });
} }
...@@ -1099,10 +1106,10 @@ export default class tableCom extends Component { ...@@ -1099,10 +1106,10 @@ export default class tableCom extends Component {
...bindObj, ...bindObj,
base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`,
} }
: { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` } : {base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}`}
: bindObj; : bindObj;
if (this.props.fatherCode == null && dataColumn == null) if (this.props.fatherCode == null && dataColumn == null)
dataColumn = { base52: this.props.uuid }; dataColumn = {base52: this.props.uuid};
if (!this.props.isEdit && this.props.fatherCode) { if (!this.props.isEdit && this.props.fatherCode) {
if (bindObj != null) { if (bindObj != null) {
...@@ -1119,13 +1126,13 @@ export default class tableCom extends Component { ...@@ -1119,13 +1126,13 @@ export default class tableCom extends Component {
} }
fetchData3 = (obj, dataColumn, init, sqlKey, labelName, valueName, allValues) => { fetchData3 = (obj, dataColumn, init, sqlKey, labelName, valueName, allValues) => {
const { dispatch } = this.props; const {dispatch} = this.props;
if (init != null && Object.keys(init).length > 0) { if (init != null && Object.keys(init).length > 0) {
dispatch({ dispatch({
type: 'DataColumn/getSqlOptions', type: 'DataColumn/getSqlOptions',
payload: { sqlKey, allValues }, payload: {sqlKey, allValues},
callback: (options) => { callback: options => {
const optionsx = []; const optionsx = [];
let base52 = dataColumn.base52; let base52 = dataColumn.base52;
let vl = this.props.form.getFieldsValue()[base52]; let vl = this.props.form.getFieldsValue()[base52];
...@@ -1141,9 +1148,9 @@ export default class tableCom extends Component { ...@@ -1141,9 +1148,9 @@ export default class tableCom extends Component {
} }
if (!isExist && vl != null && options.length > 0) { if (!isExist && vl != null && options.length > 0) {
this.props.form.setFieldsValue({ [base52]: null }); this.props.form.setFieldsValue({[base52]: null});
} }
this.setState({ options: optionsx, selectDis: false }); this.setState({options: optionsx, selectDis: false});
}, },
}); });
} else if (!this.props.isEdit && Object.keys(obj).length > 0) { } else if (!this.props.isEdit && Object.keys(obj).length > 0) {
...@@ -1155,17 +1162,17 @@ export default class tableCom extends Component { ...@@ -1155,17 +1162,17 @@ export default class tableCom extends Component {
if (obj[base52]) { if (obj[base52]) {
dispatch({ dispatch({
type: 'DataColumn/getSqlLabels', type: 'DataColumn/getSqlLabels',
payload: { sqlKey, values: obj[base52], labelName, valueName, allValues }, payload: {sqlKey, values: obj[base52], labelName, valueName, allValues},
callback: (labels) => { callback: labels => {
this.setState({ labels, selectDis: false }); this.setState({labels, selectDis: false});
}, },
}); });
} }
} else { } else {
dispatch({ dispatch({
type: 'DataColumn/getSqlOptions', type: 'DataColumn/getSqlOptions',
payload: { sqlKey, allValues }, payload: {sqlKey, allValues},
callback: (options) => { callback: options => {
let base52 = dataColumn.base52; let base52 = dataColumn.base52;
let vl = this.props.form.getFieldsValue()[base52]; let vl = this.props.form.getFieldsValue()[base52];
const optionsx = []; const optionsx = [];
...@@ -1182,10 +1189,10 @@ export default class tableCom extends Component { ...@@ -1182,10 +1189,10 @@ export default class tableCom extends Component {
if (!isExist && vl != null && options.length > 0) { if (!isExist && vl != null && options.length > 0) {
//console.log("isExist",optionsx,vl,isExist) //console.log("isExist",optionsx,vl,isExist)
this.props.form.setFieldsValue({ [base52]: null }); this.props.form.setFieldsValue({[base52]: null});
} }
this.setState({ options: optionsx, selectDis: false }); this.setState({options: optionsx, selectDis: false});
}, },
}); });
} }
...@@ -1212,19 +1219,19 @@ export default class tableCom extends Component { ...@@ -1212,19 +1219,19 @@ export default class tableCom extends Component {
} }
} }
this.setState({ labels: labels, selectDis: false }); this.setState({labels: labels, selectDis: false});
} else { } else {
this.setState({ options: options, selectDis: false }); this.setState({options: options, selectDis: false});
} }
}; };
fetchData = (obj, dataColumn, init, filterSql, allValues) => { fetchData = (obj, dataColumn, init, filterSql, allValues) => {
const { dispatch } = this.props; const {dispatch} = this.props;
if (init != null && Object.keys(init).length > 0) { if (init != null && Object.keys(init).length > 0) {
dispatch({ dispatch({
type: 'DataColumn/getOptions', type: 'DataColumn/getOptions',
payload: { id: dataColumn.id, filterSql, allValues }, payload: {id: dataColumn.id, filterSql, allValues},
callback: (options) => { callback: options => {
const optionsx = []; const optionsx = [];
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
optionsx.push({ optionsx.push({
...@@ -1232,24 +1239,24 @@ export default class tableCom extends Component { ...@@ -1232,24 +1239,24 @@ export default class tableCom extends Component {
value: options[i][dataColumn.referenceCodeName], value: options[i][dataColumn.referenceCodeName],
}); });
} }
this.setState({ options: optionsx, selectDis: false }); this.setState({options: optionsx, selectDis: false});
}, },
}); });
} else if (!this.props.isEdit && Object.keys(obj).length > 0) { } else if (!this.props.isEdit && Object.keys(obj).length > 0) {
if (obj[dataColumn.base52]) { if (obj[dataColumn.base52]) {
dispatch({ dispatch({
type: 'DataColumn/getLabels', type: 'DataColumn/getLabels',
payload: { id: dataColumn.id, values: obj[dataColumn.base52], filterSql, allValues }, payload: {id: dataColumn.id, values: obj[dataColumn.base52], filterSql, allValues},
callback: (labels) => { callback: labels => {
this.setState({ labels, selectDis: false }); this.setState({labels, selectDis: false});
}, },
}); });
} }
} else { } else {
dispatch({ dispatch({
type: 'DataColumn/getOptions', type: 'DataColumn/getOptions',
payload: { id: dataColumn.id, filterSql, allValues }, payload: {id: dataColumn.id, filterSql, allValues},
callback: (options) => { callback: options => {
const optionsx = []; const optionsx = [];
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
optionsx.push({ optionsx.push({
...@@ -1257,13 +1264,13 @@ export default class tableCom extends Component { ...@@ -1257,13 +1264,13 @@ export default class tableCom extends Component {
value: options[i][dataColumn.referenceCodeName], value: options[i][dataColumn.referenceCodeName],
}); });
} }
this.setState({ options: optionsx, selectDis: false }); this.setState({options: optionsx, selectDis: false});
}, },
}); });
} }
}; };
getColumn = (key) => { getColumn = key => {
let { mapData, json } = this.props; let {mapData, json} = this.props;
const columnIds = json.columnIds; const columnIds = json.columnIds;
...@@ -1282,6 +1289,7 @@ export default class tableCom extends Component { ...@@ -1282,6 +1289,7 @@ export default class tableCom extends Component {
}; };
render() { render() {
/** /**
* json为申请表单 * json为申请表单
* obj为查看详情用户输入值 * obj为查看详情用户输入值
...@@ -1305,8 +1313,8 @@ export default class tableCom extends Component { ...@@ -1305,8 +1313,8 @@ export default class tableCom extends Component {
currentFormTitle, currentFormTitle,
getCellValue, getCellValue,
} = this.props; } = this.props;
const { options, labels, selectDis, modalCode, modalTitle, modalInit, modalProps } = this.state; const {options, labels, selectDis, modalCode, modalTitle, modalInit, modalProps} = this.state;
const { getFieldDecorator, getFieldError, getFieldProps } = this.props.form; const {getFieldDecorator, getFieldError, getFieldProps} = this.props.form;
const disabled = json != null ? json.disabled : false; const disabled = json != null ? json.disabled : false;
const permRank = json != null ? (json.permRank != null ? json.permRank : 0) : 0; const permRank = json != null ? (json.permRank != null ? json.permRank : 0) : 0;
if (json == null) { if (json == null) {
...@@ -1323,12 +1331,12 @@ export default class tableCom extends Component { ...@@ -1323,12 +1331,12 @@ export default class tableCom extends Component {
this.state.option.value == null this.state.option.value == null
) )
return <></>; return <></>;
return <QRCode {...this.state.option} key={this.props.uuid} />; return <QRCode {...this.state.option} key={this.props.uuid}/>;
} }
if (json.comName == 'Echart') { if (json.comName == 'Echart') {
return ( return (
<ReactEcharts <ReactEcharts
style={{ height: json.height || 500 }} style={{height: json.height || 500}}
key={this.props.uuid} key={this.props.uuid}
option={this.state.option || {}} option={this.state.option || {}}
notMerge={true} notMerge={true}
...@@ -1339,7 +1347,7 @@ export default class tableCom extends Component { ...@@ -1339,7 +1347,7 @@ export default class tableCom extends Component {
); );
} }
if (json.comName == 'Graph') { if (json.comName == 'Graph') {
return <Neo4jD3Com key={this.props.uuid} json={json} option={this.state.option || []} />; return <Neo4jD3Com key={this.props.uuid} json={json} option={this.state.option || []}/>;
} }
if (json.comName == 'PartForm') { if (json.comName == 'PartForm') {
...@@ -1354,7 +1362,7 @@ export default class tableCom extends Component { ...@@ -1354,7 +1362,7 @@ export default class tableCom extends Component {
<> <>
{this.props.form.getFieldDecorator(this.props.uuid, { {this.props.form.getFieldDecorator(this.props.uuid, {
initialValue: fk, initialValue: fk,
})(<Input type="hidden" />)}{' '} })(<Input type="hidden"/>)}{' '}
<ZdyTable <ZdyTable
taskId={this.props.taskId} taskId={this.props.taskId}
setRealTimeValues={this.props.setRealTimeValues} setRealTimeValues={this.props.setRealTimeValues}
...@@ -1391,7 +1399,7 @@ export default class tableCom extends Component { ...@@ -1391,7 +1399,7 @@ export default class tableCom extends Component {
if (json.comName == 'Excel') { if (json.comName == 'Excel') {
const value = getCellValue(i, j, currentFormTitle); const value = getCellValue(i, j, currentFormTitle);
const xx = ( const xx = (
<div style={{ textAlign: 'center', height: value == null ? 20 : null }}>{value}</div> <div style={{textAlign: 'center', height: value == null ? 20 : null}}>{value}</div>
); );
return xx; return xx;
} }
...@@ -1410,13 +1418,14 @@ export default class tableCom extends Component { ...@@ -1410,13 +1418,14 @@ export default class tableCom extends Component {
<> <>
{this.props.form.getFieldDecorator(uid, { {this.props.form.getFieldDecorator(uid, {
initialValue: obj[this.props.uuid] || json.initialValue, initialValue: obj[this.props.uuid] || json.initialValue,
})(<Input type="hidden" />)} })(<Input type="hidden"/>)}
<span <span
style={{ style={{
fontWeight: get == 'mobile' ? 'bold' : '', fontWeight: get == 'mobile' ? 'bold' : '',
marginRight: get == 'mobile' ? 12 : '', marginRight: get == 'mobile' ? 12 : '',
}} }}
{...json.props}> {...json.props}
>
{obj[this.props.uuid] || json.initialValue} {obj[this.props.uuid] || json.initialValue}
</span> </span>
</> </>
...@@ -1426,13 +1435,14 @@ export default class tableCom extends Component { ...@@ -1426,13 +1435,14 @@ export default class tableCom extends Component {
<> <>
{this.props.form.getFieldDecorator(uid, { {this.props.form.getFieldDecorator(uid, {
initialValue: this.props.form.getFieldsValue()[uid] || json.initialValue, initialValue: this.props.form.getFieldsValue()[uid] || json.initialValue,
})(<Input type="hidden" />)} })(<Input type="hidden"/>)}
<span <span
style={{ style={{
fontWeight: get == 'mobile' ? 'bold' : '', fontWeight: get == 'mobile' ? 'bold' : '',
marginRight: get == 'mobile' ? 12 : '', marginRight: get == 'mobile' ? 12 : '',
}} }}
{...json.props}> {...json.props}
>
{this.props.form.getFieldsValue()[uid]} {this.props.form.getFieldsValue()[uid]}
</span> </span>
</> </>
...@@ -1460,7 +1470,7 @@ export default class tableCom extends Component { ...@@ -1460,7 +1470,7 @@ export default class tableCom extends Component {
cm = ( cm = (
<span> <span>
{value} {value}
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</span> </span>
); );
break; break;
...@@ -1468,25 +1478,25 @@ export default class tableCom extends Component { ...@@ -1468,25 +1478,25 @@ export default class tableCom extends Component {
cm = ( cm = (
<span> <span>
{value} {value}
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</span> </span>
); );
break; break;
case 'Input': case 'Input':
cm = ( cm = (
<span style={{ paddingRight: get == 'mobile' ? 8 : '' }}> <span style={{paddingRight: get == 'mobile' ? 8 : ''}}>
{value} {value}
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</span> </span>
); );
break; break;
case 'Cron': case 'Cron':
cm = ( cm = (
<span style={{ paddingRight: get == 'mobile' ? 8 : '' }}> <span style={{paddingRight: get == 'mobile' ? 8 : ''}}>
{value} {value}
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</span> </span>
); );
...@@ -1495,7 +1505,7 @@ export default class tableCom extends Component { ...@@ -1495,7 +1505,7 @@ export default class tableCom extends Component {
cm = ( cm = (
<span> <span>
{value} {value}
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</span> </span>
); );
...@@ -1504,7 +1514,7 @@ export default class tableCom extends Component { ...@@ -1504,7 +1514,7 @@ export default class tableCom extends Component {
cm = value ? ( cm = value ? (
<span> <span>
{moment(parseInt(value)).format('YYYY-MM-DD HH:mm:ss')} {moment(parseInt(value)).format('YYYY-MM-DD HH:mm:ss')}
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</span> </span>
) : ( ) : (
'' ''
...@@ -1524,7 +1534,7 @@ export default class tableCom extends Component { ...@@ -1524,7 +1534,7 @@ export default class tableCom extends Component {
return ( return (
<img <img
key={index2} key={index2}
style={{ width: 100, height: 100 }} style={{width: 100, height: 100}}
src={queryApiActionPath() + f.path} src={queryApiActionPath() + f.path}
/> />
); );
...@@ -1538,22 +1548,22 @@ export default class tableCom extends Component { ...@@ -1538,22 +1548,22 @@ export default class tableCom extends Component {
); );
})} })}
</ul> </ul>
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</> </>
); );
break; break;
case 'ImgUploadCom': case 'ImgUploadCom':
if (value == null || value == '') { if (value == null || value == '') {
cm = <div style={{ width: json.width, height: json.height }} />; cm = <div style={{width: json.width, height: json.height}}/>;
} else { } else {
cm = ( cm = (
<> <>
<img <img
src={config.httpServer + value} src={config.httpServer + value}
style={{ width: json.width, height: json.height }} style={{width: json.width, height: json.height}}
/> />
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</> </>
); );
} }
...@@ -1561,15 +1571,15 @@ export default class tableCom extends Component { ...@@ -1561,15 +1571,15 @@ export default class tableCom extends Component {
break; break;
case 'VideoUploadCom': case 'VideoUploadCom':
if (value == null || value == '') { if (value == null || value == '') {
cm = <div style={{ width: json.width, height: json.height }} />; cm = <div style={{width: json.width, height: json.height}}/>;
} else { } else {
cm = ( cm = (
<> <>
<img <img
src={config.httpServer + value} src={config.httpServer + value}
style={{ width: json.width, height: json.height }} style={{width: json.width, height: json.height}}
/> />
{get === 'mobile' ? <br /> : ''} {get === 'mobile' ? <br/> : ''}
</> </>
); );
} }
...@@ -1584,9 +1594,10 @@ export default class tableCom extends Component { ...@@ -1584,9 +1594,10 @@ export default class tableCom extends Component {
return ( return (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}> label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -1595,14 +1606,15 @@ export default class tableCom extends Component { ...@@ -1595,14 +1606,15 @@ export default class tableCom extends Component {
<> <>
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}> label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}
>
{cm} {cm}
</MobileItem> </MobileItem>
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, { {this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value, initialValue: value,
})(<Input type="hidden" />)} })(<Input type="hidden"/>)}
</> </>
); );
} }
...@@ -1615,7 +1627,7 @@ export default class tableCom extends Component { ...@@ -1615,7 +1627,7 @@ export default class tableCom extends Component {
{cm} {cm}
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, { {this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value, initialValue: value,
})(<Input type="hidden" />)} })(<Input type="hidden"/>)}
</> </>
); );
} }
...@@ -1629,7 +1641,8 @@ export default class tableCom extends Component { ...@@ -1629,7 +1641,8 @@ export default class tableCom extends Component {
style={{ style={{
minHeight: 40, minHeight: 40,
lineHeight: '40px', lineHeight: '40px',
}}> }}
>
<Col <Col
className={json.label ? json.label : sqlData[key] ? styles.row_col_div : ''} className={json.label ? json.label : sqlData[key] ? styles.row_col_div : ''}
span={json.labelSpan} span={json.labelSpan}
...@@ -1640,7 +1653,8 @@ export default class tableCom extends Component { ...@@ -1640,7 +1653,8 @@ export default class tableCom extends Component {
overflow: 'hidden', overflow: 'hidden',
fontSize: 14, fontSize: 14,
color: 'rgba(0,0,0,0.85)', color: 'rgba(0,0,0,0.85)',
}}> }}
>
{json.label ? ( {json.label ? (
<> <>
{json.label} {json.label}
...@@ -1649,7 +1663,8 @@ export default class tableCom extends Component { ...@@ -1649,7 +1663,8 @@ export default class tableCom extends Component {
position: 'relative', position: 'relative',
top: '-0.5px', top: '-0.5px',
margin: '0 8px 0 2px', margin: '0 8px 0 2px',
}}> }}
>
: :
</span> </span>
</> </>
...@@ -1661,7 +1676,8 @@ export default class tableCom extends Component { ...@@ -1661,7 +1676,8 @@ export default class tableCom extends Component {
position: 'relative', position: 'relative',
top: '-0.5px', top: '-0.5px',
margin: '0 8px 0 2px', margin: '0 8px 0 2px',
}}> }}
>
: :
</span> </span>
</> </>
...@@ -1676,7 +1692,8 @@ export default class tableCom extends Component { ...@@ -1676,7 +1692,8 @@ export default class tableCom extends Component {
lineHeight: '40px', lineHeight: '40px',
zoom: 1, zoom: 1,
fontSize: 14, fontSize: 14,
}}> }}
>
{cm} {cm}
</Col> </Col>
</Row> </Row>
...@@ -1684,9 +1701,10 @@ export default class tableCom extends Component { ...@@ -1684,9 +1701,10 @@ export default class tableCom extends Component {
} else { } else {
return ( return (
<Form.Item <Form.Item
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}> label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}
>
{cm} {cm}
</Form.Item> </Form.Item>
); );
...@@ -1695,14 +1713,15 @@ export default class tableCom extends Component { ...@@ -1695,14 +1713,15 @@ export default class tableCom extends Component {
return ( return (
<> <>
<Form.Item <Form.Item
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}> label={json.label ? json.label : sqlData[key] ? sqlData[key].title : ''}
>
{cm} {cm}
</Form.Item> </Form.Item>
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, { {this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value, initialValue: value,
})(<Input type="hidden" />)} })(<Input type="hidden"/>)}
</> </>
); );
} }
...@@ -1715,7 +1734,7 @@ export default class tableCom extends Component { ...@@ -1715,7 +1734,7 @@ export default class tableCom extends Component {
{cm} {cm}
{this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, { {this.props.form.getFieldDecorator(`defaultValues.${formKey}.${key}`, {
initialValue: value, initialValue: value,
})(<Input type="hidden" />)} })(<Input type="hidden"/>)}
</> </>
); );
} }
...@@ -1734,11 +1753,11 @@ export default class tableCom extends Component { ...@@ -1734,11 +1753,11 @@ export default class tableCom extends Component {
...bindObj, ...bindObj,
base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`,
} }
: { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` } : {base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}`}
: bindObj; : bindObj;
if (this.props.fatherCode == null && dataColumn == null) { if (this.props.fatherCode == null && dataColumn == null) {
dataColumn = { base52: this.props.uuid }; dataColumn = {base52: this.props.uuid};
} }
if (dataColumn.isNull != null && !dataColumn.isNull) { if (dataColumn.isNull != null && !dataColumn.isNull) {
required = true; required = true;
...@@ -1746,7 +1765,7 @@ export default class tableCom extends Component { ...@@ -1746,7 +1765,7 @@ export default class tableCom extends Component {
var title = json.label || (dataColumn && dataColumn.title); var title = json.label || (dataColumn && dataColumn.title);
var initValue; var initValue;
const objinit = { ...init, ...obj }; const objinit = {...init, ...obj};
if (objinit != null && Object.keys(objinit).length > 0) { if (objinit != null && Object.keys(objinit).length > 0) {
if (this.props.fatherCode != null) { if (this.props.fatherCode != null) {
...@@ -1800,7 +1819,8 @@ export default class tableCom extends Component { ...@@ -1800,7 +1819,8 @@ export default class tableCom extends Component {
<span <span
style={{ style={{
wordBreak: 'break-all', wordBreak: 'break-all',
}}> }}
>
{obj[dataColumn.base52]} {obj[dataColumn.base52]}
</span> </span>
); );
...@@ -1814,7 +1834,8 @@ export default class tableCom extends Component { ...@@ -1814,7 +1834,8 @@ export default class tableCom extends Component {
<span <span
style={{ style={{
wordBreak: 'break-all', wordBreak: 'break-all',
}}> }}
>
{obj[dataColumn.base52]} {obj[dataColumn.base52]}
</span> </span>
); );
...@@ -1843,8 +1864,7 @@ export default class tableCom extends Component { ...@@ -1843,8 +1864,7 @@ export default class tableCom extends Component {
cm = ( cm = (
<span> <span>
{labels != null {labels != null
? labels.map( ? labels.map((r, i) =>
(r, i) =>
i == 0 ? ( i == 0 ? (
typeof r == 'string' ? ( typeof r == 'string' ? (
<span>{r}</span> <span>{r}</span>
...@@ -1852,7 +1872,7 @@ export default class tableCom extends Component { ...@@ -1852,7 +1872,7 @@ export default class tableCom extends Component {
Object.values(r) Object.values(r)
) )
) : typeof r == 'string' ? ( ) : typeof r == 'string' ? (
<span style={{ marginLeft: 12 }}>{r}</span> <span style={{marginLeft: 12}}>{r}</span>
) : ( ) : (
',' + Object.values(r) ',' + Object.values(r)
), ),
...@@ -1900,7 +1920,11 @@ export default class tableCom extends Component { ...@@ -1900,7 +1920,11 @@ export default class tableCom extends Component {
if (initValue != null && init != null) { if (initValue != null && init != null) {
ivs.push(moment(parseInt(initValue))); ivs.push(moment(parseInt(initValue)));
if (end != null) ivs.push(moment(parseInt(init[end.base52]))); if (end != null && init[end.base52]) {
ivs.push(moment(parseInt(init[end.base52])));
}else{
ivs.push(moment());
}
} }
if (begin != null && end != null) { if (begin != null && end != null) {
if (!obj[begin.base52]) { if (!obj[begin.base52]) {
...@@ -1980,7 +2004,7 @@ export default class tableCom extends Component { ...@@ -1980,7 +2004,7 @@ export default class tableCom extends Component {
if (get === 'web' && !this.props.isPrint) { if (get === 'web' && !this.props.isPrint) {
return ( return (
<li key={index2}> <li key={index2}>
<FilePreview path={queryApiActionPath() + f.path} pathName={f.name} /> <FilePreview path={queryApiActionPath() + f.path} pathName={f.name}/>
</li> </li>
); );
} }
...@@ -2012,7 +2036,7 @@ export default class tableCom extends Component { ...@@ -2012,7 +2036,7 @@ export default class tableCom extends Component {
if (get === 'web' || !this.props.isPrint) { if (get === 'web' || !this.props.isPrint) {
return ( return (
<li key={index2}> <li key={index2}>
<FilePreview path={queryApiActionPath() + f.path} pathName={f.name} /> <FilePreview path={queryApiActionPath() + f.path} pathName={f.name}/>
</li> </li>
); );
} }
...@@ -2021,7 +2045,8 @@ export default class tableCom extends Component { ...@@ -2021,7 +2045,8 @@ export default class tableCom extends Component {
<a <a
target="_blank" target="_blank"
key={f.filePath} key={f.filePath}
href={queryApiActionPath() + f.filePath}> href={queryApiActionPath() + f.filePath}
>
{f.fileName} {f.fileName}
</a> </a>
</li> </li>
...@@ -2032,7 +2057,7 @@ export default class tableCom extends Component { ...@@ -2032,7 +2057,7 @@ export default class tableCom extends Component {
} }
} else { } else {
cm = ( cm = (
<span style={{ display: 'inline-block', width: '100%', textAlign: 'center' }}> <span style={{display: 'inline-block', width: '100%', textAlign: 'center'}}>
暂无附件 暂无附件
</span> </span>
); );
...@@ -2060,7 +2085,7 @@ export default class tableCom extends Component { ...@@ -2060,7 +2085,7 @@ export default class tableCom extends Component {
) : ( ) : (
<img <img
src={config.httpServer + obj[dataColumn.base52]} src={config.httpServer + obj[dataColumn.base52]}
style={{ width: json.width, height: json.height }} style={{width: json.width, height: json.height}}
/> />
); );
} }
...@@ -2087,7 +2112,7 @@ export default class tableCom extends Component { ...@@ -2087,7 +2112,7 @@ export default class tableCom extends Component {
) : ( ) : (
<img <img
src={config.httpServer + obj[dataColumn.base52]} src={config.httpServer + obj[dataColumn.base52]}
style={{ width: json.width, height: json.height }} style={{width: json.width, height: json.height}}
/> />
); );
} }
...@@ -2153,7 +2178,7 @@ export default class tableCom extends Component { ...@@ -2153,7 +2178,7 @@ export default class tableCom extends Component {
let events = {}; let events = {};
if (json.events != null) { if (json.events != null) {
events = this.getFunctionValue(json.events, { base52: this.props.uuid }, json); events = this.getFunctionValue(json.events, {base52: this.props.uuid}, json);
} }
if (events && events.dom) { if (events && events.dom) {
cm = events.dom; cm = events.dom;
...@@ -2234,7 +2259,7 @@ export default class tableCom extends Component { ...@@ -2234,7 +2259,7 @@ export default class tableCom extends Component {
let events = {}; let events = {};
if (json.events != null) { if (json.events != null) {
events = this.getFunctionValue(json.events, { base52: this.props.uuid }, json); events = this.getFunctionValue(json.events, {base52: this.props.uuid}, json);
} }
if (events && events.dom) { if (events && events.dom) {
cm = events.dom; cm = events.dom;
...@@ -2258,10 +2283,10 @@ export default class tableCom extends Component { ...@@ -2258,10 +2283,10 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请输入' + title }], : [{required: required, message: '请输入' + title}],
})( })(
<TextArea <TextArea
autoSize={{ minRows: 4 }} autoSize={{minRows: 4}}
disabled={disabled} disabled={disabled}
placeholder={json.placeholder} placeholder={json.placeholder}
/>, />,
...@@ -2290,9 +2315,10 @@ export default class tableCom extends Component { ...@@ -2290,9 +2315,10 @@ export default class tableCom extends Component {
) { ) {
cm = ( cm = (
<Form.Item <Form.Item
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</Form.Item> </Form.Item>
); );
...@@ -2304,10 +2330,10 @@ export default class tableCom extends Component { ...@@ -2304,10 +2330,10 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请输入' + title }], : [{required: required, message: '请输入' + title}],
})( })(
<TextArea <TextArea
autoSize={{ minRows: 4 }} autoSize={{minRows: 4}}
disabled={disabled} disabled={disabled}
rows={4} rows={4}
placeholder={json.placeholder} placeholder={json.placeholder}
...@@ -2330,17 +2356,18 @@ export default class tableCom extends Component { ...@@ -2330,17 +2356,18 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + title }], : [{required: required, message: '请选择' + title}],
})} })}
disabled={disabled} disabled={disabled}
onClick={(checked) => { onClick={checked => {
// set new value // set new value
this.props.form.setFieldsValue({ this.props.form.setFieldsValue({
[dataColumn.base52]: checked, [dataColumn.base52]: checked,
}); });
}} }}
/> />
}> }
>
{(json.isMobileLabel != null && json.isMobileLabel) || {(json.isMobileLabel != null && json.isMobileLabel) ||
(json.isMobileLabel == null && json.isLabel) (json.isMobileLabel == null && json.isLabel)
? title ? title
...@@ -2360,7 +2387,7 @@ export default class tableCom extends Component { ...@@ -2360,7 +2387,7 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + title }], : [{required: required, message: '请选择' + title}],
})( })(
<Switch <Switch
disabled={disabled} disabled={disabled}
...@@ -2377,11 +2404,11 @@ export default class tableCom extends Component { ...@@ -2377,11 +2404,11 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请输入' + title }], : [{required: required, message: '请输入' + title}],
})( })(
<Input <Input
disabled={disabled} disabled={disabled}
style={{ width: json.width }} style={{width: json.width}}
placeholder={json.placeholder} placeholder={json.placeholder}
/>, />,
); );
...@@ -2395,9 +2422,10 @@ export default class tableCom extends Component { ...@@ -2395,9 +2422,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2407,7 +2435,7 @@ export default class tableCom extends Component { ...@@ -2407,7 +2435,7 @@ export default class tableCom extends Component {
case 'InputHidden': case 'InputHidden':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue, initialValue: initValue,
})(<Input type="hidden" />); })(<Input type="hidden"/>);
break; break;
case 'InputNumber': case 'InputNumber':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
...@@ -2415,7 +2443,7 @@ export default class tableCom extends Component { ...@@ -2415,7 +2443,7 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请输入' + title }], : [{required: required, message: '请输入' + title}],
})( })(
<InputNumber <InputNumber
disabled={disabled} disabled={disabled}
...@@ -2436,9 +2464,10 @@ export default class tableCom extends Component { ...@@ -2436,9 +2464,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2455,8 +2484,8 @@ export default class tableCom extends Component { ...@@ -2455,8 +2484,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + dataColumn.title }], : [{required: required, message: '请选择' + dataColumn.title}],
})(<Radio.Group options={options} disabled={disabled} />); })(<Radio.Group options={options} disabled={disabled}/>);
if (get == 'mobile') { if (get == 'mobile') {
cm = <div>{cm}</div>; cm = <div>{cm}</div>;
if ( if (
...@@ -2467,9 +2496,10 @@ export default class tableCom extends Component { ...@@ -2467,9 +2496,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2489,8 +2519,8 @@ export default class tableCom extends Component { ...@@ -2489,8 +2519,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + dataColumn.title }], : [{required: required, message: '请选择' + dataColumn.title}],
})(<Checkbox.Group options={options} disabled={disabled} />)} })(<Checkbox.Group options={options} disabled={disabled}/>)}
</Flex> </Flex>
); );
...@@ -2502,9 +2532,10 @@ export default class tableCom extends Component { ...@@ -2502,9 +2532,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2518,8 +2549,8 @@ export default class tableCom extends Component { ...@@ -2518,8 +2549,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + dataColumn.title }], : [{required: required, message: '请选择' + dataColumn.title}],
})(<Checkbox.Group options={options} disabled={disabled} />); })(<Checkbox.Group options={options} disabled={disabled}/>);
break; break;
case 'Select': case 'Select':
...@@ -2528,14 +2559,14 @@ export default class tableCom extends Component { ...@@ -2528,14 +2559,14 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + dataColumn.title }], : [{required: required, message: '请选择' + dataColumn.title}],
})( })(
<Select <Select
allowClear allowClear
showSearch showSearch
disabled={selectDis || disabled} disabled={selectDis || disabled}
placeholder={json.placeholder} placeholder={json.placeholder}
style={{ width: json.width }} style={{width: json.width}}
optionFilterProp="children" optionFilterProp="children"
getPopupContainer={ getPopupContainer={
this.props.isDynamic && document.querySelector('#dynamic_div') this.props.isDynamic && document.querySelector('#dynamic_div')
...@@ -2549,7 +2580,7 @@ export default class tableCom extends Component { ...@@ -2549,7 +2580,7 @@ export default class tableCom extends Component {
? setTimeout(() => { ? setTimeout(() => {
if (document.querySelectorAll(`.ant-select-search__field`).length > 0) { if (document.querySelectorAll(`.ant-select-search__field`).length > 0) {
let ary = [...document.querySelectorAll(`.ant-select-search__field`)]; let ary = [...document.querySelectorAll(`.ant-select-search__field`)];
ary.map((item) => { ary.map(item => {
item.setAttribute('readonly', 'readonly'); item.setAttribute('readonly', 'readonly');
// setTimeout(() => { // setTimeout(() => {
// ary.map(arr => { // ary.map(arr => {
...@@ -2565,9 +2596,10 @@ export default class tableCom extends Component { ...@@ -2565,9 +2596,10 @@ export default class tableCom extends Component {
option option
? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
: false : false
}> }
>
{options && options instanceof Array {options && options instanceof Array
? options.map((r) => ( ? options.map(r => (
<Option key={r.value} value={r.value}> <Option key={r.value} value={r.value}>
{r.label} {r.label}
</Option> </Option>
...@@ -2584,9 +2616,10 @@ export default class tableCom extends Component { ...@@ -2584,9 +2616,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2603,7 +2636,7 @@ export default class tableCom extends Component { ...@@ -2603,7 +2636,7 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + dataColumn.title }], : [{required: required, message: '请选择' + dataColumn.title}],
})( })(
<Cascader <Cascader
options={options} options={options}
...@@ -2618,23 +2651,17 @@ export default class tableCom extends Component { ...@@ -2618,23 +2651,17 @@ export default class tableCom extends Component {
: '' : ''
} }
placeholder={json.placeholder} placeholder={json.placeholder}
style={{ width: json.width }} style={{width: json.width}}
/>, />,
); );
if(get === 'mobile') { if (get === 'mobile') {
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue, initialValue: initValue,
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择' + dataColumn.title }], : [{required: required, message: '请选择' + dataColumn.title}],
})( })(<MobileCascader options={options} label={title} disabled={disabled} json={json}/>);
<MobileCascader options={options}
label={title}
disabled={disabled}
json={json}
/>);
} }
if ( if (
...@@ -2646,9 +2673,10 @@ export default class tableCom extends Component { ...@@ -2646,9 +2673,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2702,9 +2730,10 @@ export default class tableCom extends Component { ...@@ -2702,9 +2730,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2715,13 +2744,28 @@ export default class tableCom extends Component { ...@@ -2715,13 +2744,28 @@ export default class tableCom extends Component {
const begin = dataColumn; const begin = dataColumn;
var end = this.getColumn('c2'); var end = this.getColumn('c2');
if (end == null) { if (end == null) {
end = { base52: this.props.uuid + '_2' }; end = {base52: this.props.uuid + '_2'};
} }
const ivs = []; const ivs = [];
// console.table(begin); // KLBqPJxzefU
// console.table(end); // KLBqPJydVnE
// console.table(ivs); // KLBqPJxzefU$KLBqPJydVnE
// console.table(init); // KLBqPJxzefU$KLBqPJydVnE
// console.log(typeof init);
if (initValue != null && init != null) { if (initValue != null && init != null) {
ivs.push(moment(parseInt(initValue))); ivs.push(moment(parseInt(initValue)));
if(init && init[end.base52]){
ivs.push(moment(parseInt(init[end.base52]))); ivs.push(moment(parseInt(init[end.base52])));
}else if(obj[end.base52]){
ivs.push(moment(parseInt(obj[end.base52])));
// 钟是志 2021年9月28日13:59:48
// 禅道bug http://scjoyedu.eicp.net:88/zentao/bug-view-21843.html
// 不知道怎么改 init 为空对象 暂时处理为从obj里面拿
}else{
ivs.push(moment());
}
} }
if (!isEdit) { if (!isEdit) {
cm = ( cm = (
<span> <span>
...@@ -2741,8 +2785,8 @@ export default class tableCom extends Component { ...@@ -2741,8 +2785,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择起止时间' }], : [{required: required, message: '请选择起止时间'}],
})(<MobileDate disabled={disabled} formate={json.format} />); })(<MobileDate disabled={disabled} formate={json.format}/>);
if ( if (
((json.isMobileLabel != null && json.isMobileLabel) || ((json.isMobileLabel != null && json.isMobileLabel) ||
(json.isMobileLabel == null && json.isLabel)) && (json.isMobileLabel == null && json.isLabel)) &&
...@@ -2751,21 +2795,23 @@ export default class tableCom extends Component { ...@@ -2751,21 +2795,23 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
} }
break; break;
} }
cm = getFieldDecorator(begin.base52 + '$' + end.base52, { cm = getFieldDecorator(begin.base52 + '$' + end.base52, {
initialValue: ivs, initialValue: ivs,
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择起止时间' }], : [{required: required, message: '请选择起止时间'}],
})( })(
<RangePicker <RangePicker
showTime={json.showTime != null ? json.showTime : true} showTime={json.showTime != null ? json.showTime : true}
...@@ -2787,7 +2833,7 @@ export default class tableCom extends Component { ...@@ -2787,7 +2833,7 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请选择起止时间' }], : [{required: required, message: '请选择起止时间'}],
})( })(
<DatePicker <DatePicker
disabled={disabled} disabled={disabled}
...@@ -2809,7 +2855,8 @@ export default class tableCom extends Component { ...@@ -2809,7 +2855,8 @@ export default class tableCom extends Component {
} }
}); });
} }
: () => {} : () => {
}
} }
format={json.format ? json.format : 'YYYY-MM-DD HH:mm:ss'} format={json.format ? json.format : 'YYYY-MM-DD HH:mm:ss'}
/>, />,
...@@ -2823,9 +2870,10 @@ export default class tableCom extends Component { ...@@ -2823,9 +2870,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2839,9 +2887,8 @@ export default class tableCom extends Component { ...@@ -2839,9 +2887,8 @@ export default class tableCom extends Component {
files = initValue.files; files = initValue.files;
} }
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: { files: files }, initialValue: {files: files},
rules: [ rules: [
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
...@@ -2856,7 +2903,8 @@ export default class tableCom extends Component { ...@@ -2856,7 +2903,8 @@ export default class tableCom extends Component {
}, },
], ],
})( })(
<UploadCom isMultiple={json.isMultiple} <UploadCom
isMultiple={json.isMultiple}
accept={json.accept} accept={json.accept}
btnName={json.btnName} btnName={json.btnName}
disabled={disabled || isPreview} disabled={disabled || isPreview}
...@@ -2871,9 +2919,10 @@ export default class tableCom extends Component { ...@@ -2871,9 +2919,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2885,8 +2934,8 @@ export default class tableCom extends Component { ...@@ -2885,8 +2934,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请输入' }], : [{required: required, message: '请输入'}],
})(<DraftEditorCom placeholder={json.placeholder} />); })(<DraftEditorCom placeholder={json.placeholder}/>);
if ( if (
get === 'mobile' && get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) || ((json.isMobileLabel != null && json.isMobileLabel) ||
...@@ -2896,9 +2945,10 @@ export default class tableCom extends Component { ...@@ -2896,9 +2945,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -2910,8 +2960,8 @@ export default class tableCom extends Component { ...@@ -2910,8 +2960,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请输入' + title }], : [{required: required, message: '请输入' + title}],
})(<CronEditor style={{ width: 600 }} />); })(<CronEditor style={{width: 600}}/>);
break; break;
case 'LocationCom': case 'LocationCom':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
...@@ -2919,7 +2969,7 @@ export default class tableCom extends Component { ...@@ -2919,7 +2969,7 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请进行定位' }], : [{required: required, message: '请进行定位'}],
})( })(
<LocationCom <LocationCom
get={get} get={get}
...@@ -2939,17 +2989,17 @@ export default class tableCom extends Component { ...@@ -2939,17 +2989,17 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
} }
break; break;
case 'ChildForm': case 'ChildForm':
cm = getFieldDecorator(dataColumn.base52, {initialValue: initValue || {}})(
cm = getFieldDecorator(dataColumn.base52, { initialValue: initValue || {} })(
<ChildForm <ChildForm
taskId={this.props.taskId} taskId={this.props.taskId}
setRealTimeValues={this.props.setRealTimeValues} setRealTimeValues={this.props.setRealTimeValues}
...@@ -2986,9 +3036,10 @@ export default class tableCom extends Component { ...@@ -2986,9 +3036,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -3000,8 +3051,8 @@ export default class tableCom extends Component { ...@@ -3000,8 +3051,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请上传图片' }], : [{required: required, message: '请上传图片'}],
})(<ImgUploadCom json={json} disabled={disabled} />); })(<ImgUploadCom json={json} disabled={disabled}/>);
if ( if (
get === 'mobile' && get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) || ((json.isMobileLabel != null && json.isMobileLabel) ||
...@@ -3011,9 +3062,10 @@ export default class tableCom extends Component { ...@@ -3011,9 +3062,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -3025,8 +3077,8 @@ export default class tableCom extends Component { ...@@ -3025,8 +3077,8 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请上传视频' }], : [{required: required, message: '请上传视频'}],
})(<VideoUploadCom json={json} disabled={disabled} />); })(<VideoUploadCom json={json} disabled={disabled}/>);
if ( if (
get === 'mobile' && get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) || ((json.isMobileLabel != null && json.isMobileLabel) ||
...@@ -3036,9 +3088,10 @@ export default class tableCom extends Component { ...@@ -3036,9 +3088,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -3050,7 +3103,7 @@ export default class tableCom extends Component { ...@@ -3050,7 +3103,7 @@ export default class tableCom extends Component {
rules: rules:
json.vlds && json.vlds.length > 0 json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请进行签名' }], : [{required: required, message: '请进行签名'}],
})( })(
<Signature <Signature
width={ width={
...@@ -3070,9 +3123,10 @@ export default class tableCom extends Component { ...@@ -3070,9 +3123,10 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
); );
...@@ -3110,13 +3164,14 @@ export default class tableCom extends Component { ...@@ -3110,13 +3164,14 @@ export default class tableCom extends Component {
if (json.isLabel) { if (json.isLabel) {
if (get === 'mobile' && !this.props.isEdit) { if (get === 'mobile' && !this.props.isEdit) {
return ( return (
<Card style={{ margin: 5, border: '1px solid #ccc' }}> <Card style={{margin: 5, border: '1px solid #ccc'}}>
{modalCode ? ( {modalCode ? (
<FormModal <FormModal
{...modalProps} {...modalProps}
visible={this.props.DataColumn.isShowModal[modalCode]} visible={this.props.DataColumn.isShowModal[modalCode]}
handleCancel={this.closeModal.bind(this, modalCode)} handleCancel={this.closeModal.bind(this, modalCode)}
title={modalTitle}> title={modalTitle}
>
<ZdyTable <ZdyTable
taskId={this.props.taskId} taskId={this.props.taskId}
taskAssignee={taskAssignee} taskAssignee={taskAssignee}
...@@ -3141,7 +3196,7 @@ export default class tableCom extends Component { ...@@ -3141,7 +3196,7 @@ export default class tableCom extends Component {
) : ( ) : (
'' ''
)} )}
<Card.Header title={<span style={{ fontSize: 14 }}>{title}:</span>} /> <Card.Header title={<span style={{fontSize: 14}}>{title}:</span>}/>
<Card.Body>{cm}</Card.Body> <Card.Body>{cm}</Card.Body>
</Card> </Card>
); );
...@@ -3153,7 +3208,8 @@ export default class tableCom extends Component { ...@@ -3153,7 +3208,8 @@ export default class tableCom extends Component {
style={{ style={{
minHeight: 40, minHeight: 40,
lineHeight: '40px', lineHeight: '40px',
}}> }}
>
<Col <Col
className={title ? styles.row_col_div : ''} className={title ? styles.row_col_div : ''}
span={json.labelSpan} span={json.labelSpan}
...@@ -3164,7 +3220,8 @@ export default class tableCom extends Component { ...@@ -3164,7 +3220,8 @@ export default class tableCom extends Component {
overflow: 'hidden', overflow: 'hidden',
fontSize: 14, fontSize: 14,
color: 'rgba(0,0,0,0.85)', color: 'rgba(0,0,0,0.85)',
}}> }}
>
{title} {title}
{title && ( {title && (
<span <span
...@@ -3172,7 +3229,8 @@ export default class tableCom extends Component { ...@@ -3172,7 +3229,8 @@ export default class tableCom extends Component {
position: 'relative', position: 'relative',
top: '-0.5px', top: '-0.5px',
margin: '0 8px 0 2px', margin: '0 8px 0 2px',
}}> }}
>
: :
</span> </span>
)} )}
...@@ -3184,7 +3242,8 @@ export default class tableCom extends Component { ...@@ -3184,7 +3242,8 @@ export default class tableCom extends Component {
lineHeight: '40px', lineHeight: '40px',
zoom: 1, zoom: 1,
fontSize: 14, fontSize: 14,
}}> }}
>
{cm} {cm}
</Col> </Col>
{modalCode ? ( {modalCode ? (
...@@ -3192,7 +3251,8 @@ export default class tableCom extends Component { ...@@ -3192,7 +3251,8 @@ export default class tableCom extends Component {
{...modalProps} {...modalProps}
visible={this.props.DataColumn.isShowModal[modalCode]} visible={this.props.DataColumn.isShowModal[modalCode]}
handleCancel={this.closeModal.bind(this, modalCode)} handleCancel={this.closeModal.bind(this, modalCode)}
title={modalTitle}> title={modalTitle}
>
<ZdyTable <ZdyTable
taskId={this.props.taskId} taskId={this.props.taskId}
taskAssignee={taskAssignee} taskAssignee={taskAssignee}
...@@ -3227,7 +3287,8 @@ export default class tableCom extends Component { ...@@ -3227,7 +3287,8 @@ export default class tableCom extends Component {
{...modalProps} {...modalProps}
visible={this.props.DataColumn.isShowModal[modalCode]} visible={this.props.DataColumn.isShowModal[modalCode]}
handleCancel={this.closeModal.bind(this, modalCode)} handleCancel={this.closeModal.bind(this, modalCode)}
title={modalTitle}> title={modalTitle}
>
<ZdyTable <ZdyTable
taskId={this.props.taskId} taskId={this.props.taskId}
taskAssignee={taskAssignee} taskAssignee={taskAssignee}
...@@ -3253,9 +3314,10 @@ export default class tableCom extends Component { ...@@ -3253,9 +3314,10 @@ export default class tableCom extends Component {
'' ''
)} )}
<Form.Item <Form.Item
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</Form.Item> </Form.Item>
</> </>
...@@ -3269,7 +3331,8 @@ export default class tableCom extends Component { ...@@ -3269,7 +3331,8 @@ export default class tableCom extends Component {
{...modalProps} {...modalProps}
visible={this.props.DataColumn.isShowModal[modalCode]} visible={this.props.DataColumn.isShowModal[modalCode]}
handleCancel={this.closeModal.bind(this, modalCode)} handleCancel={this.closeModal.bind(this, modalCode)}
title={modalTitle}> title={modalTitle}
>
<ZdyTable <ZdyTable
taskId={this.props.taskId} taskId={this.props.taskId}
taskAssignee={taskAssignee} taskAssignee={taskAssignee}
...@@ -3306,7 +3369,8 @@ export default class tableCom extends Component { ...@@ -3306,7 +3369,8 @@ export default class tableCom extends Component {
{...modalProps} {...modalProps}
visible={this.props.DataColumn.isShowModal[modalCode]} visible={this.props.DataColumn.isShowModal[modalCode]}
handleCancel={this.closeModal.bind(this, modalCode)} handleCancel={this.closeModal.bind(this, modalCode)}
title={modalTitle}> title={modalTitle}
>
<ZdyTable <ZdyTable
taskId={this.props.taskId} taskId={this.props.taskId}
taskAssignee={taskAssignee} taskAssignee={taskAssignee}
...@@ -3334,17 +3398,19 @@ export default class tableCom extends Component { ...@@ -3334,17 +3398,19 @@ export default class tableCom extends Component {
{json.isMobileLabel && !isEdit && get == 'mobile' ? ( {json.isMobileLabel && !isEdit && get == 'mobile' ? (
<MobileItem <MobileItem
isPreview={isPreview} isPreview={isPreview}
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</MobileItem> </MobileItem>
) : isEdit && get == 'web' ? ( ) : isEdit && get == 'web' ? (
json.isLabel ? ( json.isLabel ? (
<Form.Item <Form.Item
labelCol={{ span: json.labelSpan }} labelCol={{span: json.labelSpan}}
wrapperCol={{ span: json.wrapperSpan }} wrapperCol={{span: json.wrapperSpan}}
label={title}> label={title}
>
{cm} {cm}
</Form.Item> </Form.Item>
) : ( ) : (
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论