Skip to content

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

解决冲突

上级 ebe6c000 7b77139d
显示空白字符变更
内嵌 并排
正在显示 包含 454 行增加 和 385 行删除
FormInsertDiy/AffairPage/ApplyPage/List.js
浏览文件 @ 5bfb05b3
...@@ -88,7 +88,6 @@ export default class List extends Component { ...@@ -88,7 +88,6 @@ export default class List extends Component {
list: [], list: [],
loading: true, loading: true,
}); });
search.getPageService({ ...data, appId: workId }).then((response) => { search.getPageService({ ...data, appId: workId }).then((response) => {
this.setState({ this.setState({
loading: false, loading: false,
......
FormInsertDiy/AffairPage/ApplyPage/index.js
浏览文件 @ 5bfb05b3
...@@ -24,12 +24,12 @@ export default class AffairPage extends React.Component { ...@@ -24,12 +24,12 @@ export default class AffairPage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
let pathname = this.props.location.pathname; let pathname = this.props.location.pathname;
const { dataBaseId, workId } = this.props;
this.state = { this.state = {
showIframe: false, showIframe: false,
columns: [], columns: [],
pathname, pathname,
workId: '', workId: workId || '',
searchCondition: [], searchCondition: [],
dataBaseId: '', dataBaseId: '',
addFields: [], // 新增时填写的字段。 addFields: [], // 新增时填写的字段。
...@@ -138,6 +138,15 @@ export default class AffairPage extends React.Component { ...@@ -138,6 +138,15 @@ export default class AffairPage extends React.Component {
return false; return false;
} }
const { pathname } = this.state; const { pathname } = this.state;
const { dataBaseId, workId } = this.props;
if(dataBaseId || workId){
this.setState({
workId,
dataBaseId,
},()=>{
this.getColumns();
});
}else{
service.getId(pathname).then((x)=>{ service.getId(pathname).then((x)=>{
this.setState({ this.setState({
workId: x.workId, workId: x.workId,
...@@ -146,6 +155,8 @@ export default class AffairPage extends React.Component { ...@@ -146,6 +155,8 @@ export default class AffairPage extends React.Component {
this.getColumns(); this.getColumns();
}) })
}); });
}
window.addEventListener('message', (event) => { window.addEventListener('message', (event) => {
if (event.data === 'returnList') { if (event.data === 'returnList') {
...@@ -178,6 +189,7 @@ export default class AffairPage extends React.Component { ...@@ -178,6 +189,7 @@ export default class AffairPage extends React.Component {
const { workId, dataBaseId, addFields, showIframe, renderIframe } = this.state; const { workId, dataBaseId, addFields, showIframe, renderIframe } = this.state;
const url = config.onestopPC.split('/#/'); const url = config.onestopPC.split('/#/');
let iframeUrl = `${url[0]}/#/IFrameForApply?id=${workId}&token=${getToken()}`; let iframeUrl = `${url[0]}/#/IFrameForApply?id=${workId}&token=${getToken()}`;
console.log(iframeUrl);
// iframeUrl = `http://localhost:8000/onestop/IFrameForApply?id=${workId}&token=${getToken()}`; // iframeUrl = `http://localhost:8000/onestop/IFrameForApply?id=${workId}&token=${getToken()}`;
return ( return (
<PageHeaderWrapper title=""> <PageHeaderWrapper title="">
......
FormInsertDiy/AffairPage/AuditPage/index.js
浏览文件 @ 5bfb05b3
...@@ -15,15 +15,16 @@ import { Link } from 'dva/router'; ...@@ -15,15 +15,16 @@ import { Link } from 'dva/router';
export default class Index extends React.Component { export default class Index extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
let pathname = this.props.location.pathname; let pathname = this.props.location.pathname;
this.state = { this.state = {
columns: [], columns: [],
dataList: [], dataList: [],
headerInfo: [], headerInfo: [],
workId: '', workId: this.props.workId || '',
searchCondition: [], searchCondition: [],
pathname, pathname,
dataBaseId: '', dataBaseId: this.props.dataBaseId || '',
addCondition: [], addCondition: [],
addFields: [], // 新增时填写的字段。 addFields: [], // 新增时填写的字段。
tableInfo: {}, // 表格配置属性 tableInfo: {}, // 表格配置属性
...@@ -94,6 +95,10 @@ export default class Index extends React.Component { ...@@ -94,6 +95,10 @@ export default class Index extends React.Component {
componentDidMount() { componentDidMount() {
const { pathname } = this.state; const { pathname } = this.state;
const { workId } = this.state;
if(workId){
this.getColumn();
}else{
service.getId(pathname).then((x)=>{ service.getId(pathname).then((x)=>{
this.setState({ this.setState({
workId: x.workId, workId: x.workId,
...@@ -104,6 +109,8 @@ export default class Index extends React.Component { ...@@ -104,6 +109,8 @@ export default class Index extends React.Component {
}); });
} }
}
render() { render() {
const { workId, dataBaseId, columns, searchCondition, addFields, allConfigSetInfo, tableInfo } = this.state; const { workId, dataBaseId, columns, searchCondition, addFields, allConfigSetInfo, tableInfo } = this.state;
return ( return (
......
FormInsertDiy/AffairPage/destruction.js
浏览文件 @ 5bfb05b3
import { text, number, date, format, taskNode } from '../config/index'; import { text, number, date, format, taskNode } from '../config/index';
import { isJSON } from '@/baseComponent/utils'; import { isJSON } from '@/baseComponent/utils';
import { translateAddFields } from '../config/index'; import { translateAddFields } from '../config/index';
import ColumnsRender from '@/highOrderComponent/ColumnsRender'; import config from '@/config/config';
import { Tooltip } from 'antd'; import { Tooltip } from 'antd';
import moment from 'moment'; import moment from 'moment';
import React from 'react'; import React from 'react';
...@@ -314,7 +314,12 @@ export function handleColumns(columns){ ...@@ -314,7 +314,12 @@ export function handleColumns(columns){
if (item.dataType) { if (item.dataType) {
if (text.indexOf(item.dataType) > -1) { // 文本类型字段 if (text.indexOf(item.dataType) > -1) { // 文本类型字段
item.render = (text) => { item.render = (text) => {
if (typeof text === 'string' && text.length > 20) { if(item.extendType === 'file' && typeof text === 'string'){
let url = text.includes('http') ? text : config.sqlFormsServer + text;
console.log(url);
return <a href={url} target={'_blank'}>点击查看</a>;
}
else if (typeof text === 'string' && text.length > 20) {
const oldTitle = text; const oldTitle = text;
const newTitle = text.slice(0, 7) + '...'; const newTitle = text.slice(0, 7) + '...';
return ( return (
...@@ -322,8 +327,14 @@ export function handleColumns(columns){ ...@@ -322,8 +327,14 @@ export function handleColumns(columns){
<span key={text}>{newTitle}</span> <span key={text}>{newTitle}</span>
</Tooltip> </Tooltip>
); );
} else if (typeof text === 'object' && Array.isArray(text.files) && text.files.length) { } else if (item.extendType === 'file' &&
return <a href={text.files[0].path} target={'_blank'}>点击查看</a>; typeof text === 'object' && Array.isArray(text.files) && text.files.length) {
let url = text.files[0].path.includes('http') ?
text.files[0].path :
config.sqlFormsServer + text.files[0].path;
return <a href={url} target={'_blank'}>
点击查看
</a>;
} else { } else {
return text; return text;
} }
......
one_stop_public/Table/index.jsx
浏览文件 @ 5bfb05b3
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
*/ */
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 './isNewTable'; import IsNewTable from './isNewTable';
export default class ZdyTable extends Component { export default class ZdyTable extends Component {
constructor(props){ constructor(props) {
super(props) super(props)
this.state = { this.state = {
...@@ -19,20 +19,20 @@ export default class ZdyTable extends Component { ...@@ -19,20 +19,20 @@ export default class ZdyTable extends Component {
left: 0, left: 0,
top: 0, top: 0,
max: 4, max: 4,
formId:null, formId: null,
formCode:null, formCode: null,
width: 100, width: 100,
mapData:{}, mapData: {},
defaultBinds:{}, defaultBinds: {},
sqlData:{}, sqlData: {},
defaultValues:{}, defaultValues: {},
currentFormKey:null, currentFormKey: null,
items:[], items: [],
init:this.props.init||{}, init: this.props.init || {},
datas:{}, datas: {},
isEdit:true, isEdit: true,
isReady:false, isReady: false,
formConfig:{}, formConfig: {},
} }
} }
...@@ -43,25 +43,25 @@ export default class ZdyTable extends Component { ...@@ -43,25 +43,25 @@ export default class ZdyTable extends Component {
isForm, isForm,
isPreview, // 是否为预览模式 isPreview, // 是否为预览模式
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];
...@@ -79,26 +79,26 @@ export default class ZdyTable extends Component { ...@@ -79,26 +79,26 @@ export default class ZdyTable extends Component {
const obj = JSON.parse(val.form.content); const obj = JSON.parse(val.form.content);
const xxx = obj.datas[obj.init]; const xxx = obj.datas[obj.init];
this.setState({ this.setState({
datas:obj.datas, datas: obj.datas,
width: this.props.table?obj.datas[val.formKey].width:xxx.width, width: this.props.table ? obj.datas[val.formKey].width : xxx.width,
isBorder:this.props.table?obj.datas[val.formKey].isBorder:xxx.isBorder, isBorder: this.props.table ? obj.datas[val.formKey].isBorder : xxx.isBorder,
mapData, mapData,
currentFormKey:this.props.table?val.formKey:obj.init, currentFormKey: this.props.table ? val.formKey : obj.init,
sqlData, sqlData,
isEdit:this.props.formKey?false:true, isEdit: this.props.formKey ? false : true,
items: this.props.table?obj.datas[val.formKey].items:xxx.items, items: this.props.table ? obj.datas[val.formKey].items : xxx.items,
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 (val.unifiedServicePatternModel.isDefaultError != null && val.unifiedServicePatternModel.isDefaultError) {
if(this.props.get=="web"){ if (this.props.get == "web") {
message.error("当前办理人数较多，服务繁忙，请稍后再试!") message.error("当前办理人数较多，服务繁忙，请稍后再试!")
}else{ } else {
Toast.fail("当前办理人数较多，服务繁忙，请稍后再试!") Toast.fail("当前办理人数较多，服务繁忙，请稍后再试!")
} }
...@@ -106,7 +106,7 @@ export default class ZdyTable extends Component { ...@@ -106,7 +106,7 @@ export default class ZdyTable extends Component {
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;
...@@ -127,26 +127,26 @@ export default class ZdyTable extends Component { ...@@ -127,26 +127,26 @@ export default class ZdyTable extends Component {
const xxx = obj.datas[obj.init]; const xxx = obj.datas[obj.init];
this.setState({ this.setState({
items: xxx.items, items: xxx.items,
init: {...this.state.init,...JSON.parse(val.content)}, init: { ...this.state.init, ...JSON.parse(val.content) },
datas:obj.datas, datas: obj.datas,
isEdit:this.props.formKey?false:true, isEdit: this.props.formKey ? false : true,
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 (val.unifiedServicePatternModel.isDefaultError != null && val.unifiedServicePatternModel.isDefaultError) {
if(this.props.get=="web"){ if (this.props.get == "web") {
message.error("当前办理人数较多，服务繁忙，请稍后再试!") message.error("当前办理人数较多，服务繁忙，请稍后再试!")
}else{ } else {
Toast.fail("当前办理人数较多，服务繁忙，请稍后再试!") Toast.fail("当前办理人数较多，服务繁忙，请稍后再试!")
} }
...@@ -154,7 +154,7 @@ export default class ZdyTable extends Component { ...@@ -154,7 +154,7 @@ export default class ZdyTable extends Component {
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;
...@@ -175,34 +175,34 @@ export default class ZdyTable extends Component { ...@@ -175,34 +175,34 @@ export default class ZdyTable extends Component {
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 ? 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):'':{},// 移动端默认值设置
},()=>{ }, () => {
/** /**
* 为二维码快捷发起时自动设置新默认值 * 为二维码快捷发起时自动设置新默认值
*/ */
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, // 用户点击草稿页面进入
...@@ -210,21 +210,21 @@ export default class ZdyTable extends Component { ...@@ -210,21 +210,21 @@ export default class ZdyTable extends Component {
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];
...@@ -242,24 +242,24 @@ export default class ZdyTable extends Component { ...@@ -242,24 +242,24 @@ export default class ZdyTable extends Component {
const obj = JSON.parse(val.form.content); const obj = JSON.parse(val.form.content);
const xxx = obj.datas[obj.init]; const xxx = obj.datas[obj.init];
this.setState({ this.setState({
datas:obj.datas, datas: obj.datas,
width: this.props.table?obj.datas[val.formKey].width:xxx.width, width: this.props.table ? obj.datas[val.formKey].width : xxx.width,
isBorder:this.props.table?obj.datas[val.formKey].isBorder:xxx.isBorder, isBorder: this.props.table ? obj.datas[val.formKey].isBorder : xxx.isBorder,
mapData, mapData,
currentFormKey:this.props.table?val.formKey:obj.init, currentFormKey: this.props.table ? val.formKey : obj.init,
sqlData, sqlData,
isEdit:this.props.formKey?false:true, isEdit: this.props.formKey ? false : true,
items: this.props.table?obj.datas[val.formKey].items:xxx.items, items: this.props.table ? obj.datas[val.formKey].items : xxx.items,
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;
...@@ -280,23 +280,23 @@ export default class ZdyTable extends Component { ...@@ -280,23 +280,23 @@ export default class ZdyTable extends Component {
const xxx = obj.datas[obj.init]; const xxx = obj.datas[obj.init];
this.setState({ this.setState({
items: xxx.items, items: xxx.items,
init: {...this.state.init,...JSON.parse(val.content)}, init: { ...this.state.init, ...JSON.parse(val.content) },
datas:obj.datas, datas: obj.datas,
isEdit:this.props.formKey?false:true, isEdit: this.props.formKey ? false : true,
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;
...@@ -314,23 +314,23 @@ export default class ZdyTable extends Component { ...@@ -314,23 +314,23 @@ 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,
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)
} }
} }
...@@ -357,16 +357,16 @@ export default class ZdyTable extends Component { ...@@ -357,16 +357,16 @@ export default class ZdyTable extends Component {
} }
render() { render() {
let { width,isBorder,sqlData,mapData,defaultBinds,defaultValues,items, init,currentFormKey ,isEdit ,datas,isReady,formConfig,formCode,formId} = this.state let { width, isBorder, sqlData, mapData, defaultBinds, defaultValues, items, init, currentFormKey, isEdit, datas, isReady, formConfig, formCode, formId } = this.state
let { border, get, obj,index,fatherCode} = this.props let { border, get, obj, index, fatherCode } = this.props
let style={} 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 = {}
} }
} }
...@@ -381,22 +381,21 @@ export default class ZdyTable extends Component { ...@@ -381,22 +381,21 @@ export default class ZdyTable extends Component {
}, },
}; };
const max = this.countMax(items) const max = this.countMax(items)
const borderStyle={ const borderStyle = {
borderRight:"1px solid gray",borderTop:"1px solid gray",borderLeft:"1px solid gray",borderBottom:"1px solid gray" borderRight: "1px solid gray", borderTop: "1px solid gray", borderLeft: "1px solid gray", borderBottom: "1px solid gray"
} }
const borderStyleTwo={ // 处理隐藏组件边框样式问题 const borderStyleTwo = { // 处理隐藏组件边框样式问题
borderRight:"1px solid gray",borderLeft:"1px solid gray" borderRight: "1px solid gray", borderLeft: "1px solid gray"
} }
const styleDiv=this.props.height?{overflow: "auto", width: "100%" ,height:this.props.height}:{overflow: "auto", width: "100%" } const styleDiv = this.props.height ? { overflow: "auto", width: "100%", height: this.props.height } : { overflow: "auto", width: "100%" }
if (!isReady) return <></>
if(!isReady) return<></>
switch (get) { switch (get) {
case 'web': case 'web':
return ( return (
<Form <Form
className="login-form" > className="login-form" >
{isEdit&&defaultBinds ? Object.keys(defaultBinds).map((k) => { {isEdit && defaultBinds ? Object.keys(defaultBinds).map((k) => {
const r = defaultBinds[k] const r = defaultBinds[k]
if (r.columnIds == null || r.columnIds.length < 2 || r.sqls == null || r.sqls.length < 2) { if (r.columnIds == null || r.columnIds.length < 2 || r.sqls == null || r.sqls.length < 2) {
return "" return ""
...@@ -412,7 +411,7 @@ export default class ZdyTable extends Component { ...@@ -412,7 +411,7 @@ export default class ZdyTable extends Component {
return this.props.form.getFieldDecorator(name, { return this.props.form.getFieldDecorator(name, {
initialValue: value initialValue: value
})(<Input type="hidden"/>); })(<Input type="hidden" />);
}) : ""} }) : ""}
...@@ -426,7 +425,8 @@ export default class ZdyTable extends Component { ...@@ -426,7 +425,8 @@ export default class ZdyTable extends Component {
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" >
...@@ -436,11 +436,11 @@ export default class ZdyTable extends Component { ...@@ -436,11 +436,11 @@ export default class ZdyTable extends Component {
return <tr key={i}> return <tr key={i}>
{row.map((cell, j) => { {row.map((cell, j) => {
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}`)
} }
} }
...@@ -448,16 +448,16 @@ export default class ZdyTable extends Component { ...@@ -448,16 +448,16 @@ export default class ZdyTable extends Component {
"" ""
: <td : <td
width={ width={
i==0? i == 0 ?
((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1)) ((cell.content != null && cell.content.cwidth != null ? cell.content.cwidth : width) * (cell.col ? cell.col : 1))
:width * (cell.col ? cell.col : 1)} : width * (cell.col ? cell.col : 1)}
rowSpan={cell.row} rowSpan={cell.row}
colSpan={cell.col} colSpan={cell.col}
key={j} key={j}
style={{ style={{
overflow: "auto", overflow: "auto",
textAlign: cell.content&&cell.content.calign?cell.content.calign:"left", textAlign: cell.content && cell.content.calign ? cell.content.calign : "left",
...isBorder?(cell?.content?.comName=="InputHidden"||!cell?.content?.comName?{}:borderStyle):{}, ...isBorder ? (cell?.content?.comName == "InputHidden" || !cell?.content?.comName ? {} : borderStyle) : {},
...styles ...styles
}} > }} >
...@@ -476,13 +476,14 @@ export default class ZdyTable extends Component { ...@@ -476,13 +476,14 @@ export default class ZdyTable extends Component {
init={init} init={init}
get={get} // 区分移动端或wen端 get={get} // 区分移动端或wen端
json={cell.content} json={cell.content}
obj={ obj||{}} // 是否存在默认值 obj={obj || {}} // 是否存在默认值
mapData={mapData} mapData={mapData}
form={this.props.form} // antd form控件 form={this.props.form} // antd form控件
sqlData={sqlData} sqlData={sqlData}
defaultValues={defaultValues || {}} // 接口中的默认值 defaultValues={defaultValues || {}} // 接口中的默认值
/> />
</td>} </td>
}
) )
...@@ -494,7 +495,7 @@ export default class ZdyTable extends Component { ...@@ -494,7 +495,7 @@ export default class ZdyTable extends Component {
</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>
...@@ -520,7 +521,7 @@ export default class ZdyTable extends Component { ...@@ -520,7 +521,7 @@ export default class ZdyTable extends Component {
return this.props.form.getFieldDecorator(name, { return this.props.form.getFieldDecorator(name, {
initialValue: value initialValue: value
})(<Input type="hidden"/>); })(<Input type="hidden" />);
}) : ""} }) : ""}
{ {
...@@ -531,10 +532,11 @@ export default class ZdyTable extends Component { ...@@ -531,10 +532,11 @@ export default class ZdyTable extends Component {
style={{ style={{
marginTop: 0, marginTop: 0,
background: '#ffffff', background: '#ffffff',
paddingLeft:12, paddingLeft: 12,
width: '100%', width: '100%',
flexWrap:'wrap', flexWrap: 'wrap',
...style }}> ...style
}}>
{ {
item.map((ary, j) => { item.map((ary, j) => {
return !allhidden && ary.hidden ? "" return !allhidden && ary.hidden ? ""
...@@ -553,7 +555,7 @@ export default class ZdyTable extends Component { ...@@ -553,7 +555,7 @@ export default class ZdyTable extends Component {
get={get} get={get}
key={j} key={j}
sqlData={sqlData} sqlData={sqlData}
obj={ obj||{}} obj={obj || {}}
form={this.props.form} form={this.props.form}
mapData={mapData} mapData={mapData}
json={ary.content} json={ary.content}
......
one_stop_public/libs/ChildForm.jsx
浏览文件 @ 5bfb05b3
...@@ -3,7 +3,7 @@ import { Button, Row, Col, message } from 'antd'; ...@@ -3,7 +3,7 @@ import { Button, Row, Col, message } from 'antd';
import ZdyTable from '../Table' import ZdyTable from '../Table'
import UUID from 'react-native-uuid'; import UUID from 'react-native-uuid';
import { Card, WingBlank} from 'antd-mobile'; import { Card, WingBlank } from 'antd-mobile';
export default class ChildForm extends React.Component { export default class ChildForm extends React.Component {
...@@ -142,11 +142,37 @@ export default class ChildForm extends React.Component { ...@@ -142,11 +142,37 @@ export default class ChildForm extends React.Component {
span={span} span={span}
> >
<ZdyTable formConfig={datas} key={r} fatherCode={base52} isEdit={isEdit} index={r} obj={objs[r]} fatherObj={this.props.fatherObj} init={objs} isChild={true} get="web" form={form} mapData={mapData} sqlData={sqlData} {...datas} defaultValues={defaultValues} /> <ZdyTable
formConfig={datas}
key={r}
fatherCode={base52}
isEdit={isEdit}
index={r}
obj={objs[r]}
fatherObj={this.props.fatherObj}
init={objs} isChild={true}
get="web"
form={form}
mapData={mapData}
sqlData={sqlData}
{...datas}
defaultValues={defaultValues} />
{rights.includes("delete") && isEdit ? <Button size="small" {rights.includes("delete") && isEdit ? <Button size="small"
style={{ position: "absolute", right: 10, top: '50%',transform:'translateY(-50%)' }} style={{
type='danger' onClick={this.delete.bind(this, r)}>{deleteName || "删除"}</Button> : ""} position: "absolute",
left: ' 95%',
top: '10px',
transform: 'translateY(-50%)',
borderRadius: '50%',
height: '13px',
width: '13px',
padding: 0,
lineHeight: '10px'
}}
type='danger'
onClick={this.delete.bind(this, r)}>{deleteName || "-"}
</Button> : ""}
</Col> </Col>
......
one_stop_public/libs/TableSelect.js
浏览文件 @ 5bfb05b3
...@@ -16,16 +16,11 @@ export default class TableSelect extends React.Component { ...@@ -16,16 +16,11 @@ export default class TableSelect extends React.Component {
const value = props.value || {}; const value = props.value || {};
this.state = { this.state = {
selects: value.selects||{}, selects: value.selects || {},
visiable: value.visiable , visiable: value.visiable,
isAll:value.isAll!=null?value.isAll:false, isAll: value.isAll != null ? value.isAll : false,
querys: value.querys||[], querys: value.querys || [],
sql: value.sql, sql: value.sql,
} }
} }
...@@ -33,6 +28,7 @@ export default class TableSelect extends React.Component { ...@@ -33,6 +28,7 @@ export default class TableSelect extends React.Component {
// Should provide an event to pass value to Form. // Should provide an event to pass value to Form.
const onChange = this.props.onChange; const onChange = this.props.onChange;
if (onChange) { if (onChange) {
console.log("changedValue", changedValue)
onChange(Object.assign({}, this.state, changedValue)); onChange(Object.assign({}, this.state, changedValue));
} }
} }
...@@ -41,30 +37,30 @@ export default class TableSelect extends React.Component { ...@@ -41,30 +37,30 @@ export default class TableSelect extends React.Component {
if ('value' in nextProps) { if ('value' in nextProps) {
const value = nextProps.value; const value = nextProps.value;
if(value!=null&& value instanceof Object){ if (value != null && value instanceof Object) {
this.setState(value); this.setState(value);
} }
// //
} }
} }
remove = (rowKey) => { remove = (rowKey) => {
console.log(rowKey)
const { selects } = this.state const { selects } = this.state
delete selects[rowKey] delete selects[rowKey]
console.log(selects)
if (!('value' in this.props)) { if (!('value' in this.props)) {
this.setState({ selects }); this.setState({ selects });
} }
this.triggerChange({ selects}); this.triggerChange({ selects });
} }
select = (obj) => { select = (obj) => {
var { selects} = this.state var { selects } = this.state
const { json: { isMultiple ,optionType} } = this.props const { json: { isMultiple, optionType } } = this.props
let valueName = this.props.json.valueName let valueName = this.props.json.valueName
if(optionType == "reference" &&this.props.dataColumn.referenceObjId){ if (optionType == "reference" && this.props.dataColumn.referenceObjId) {
valueName=this.props.dataColumn.referenceCodeName valueName = this.props.dataColumn.referenceCodeName
} }
...@@ -74,16 +70,16 @@ export default class TableSelect extends React.Component { ...@@ -74,16 +70,16 @@ export default class TableSelect extends React.Component {
return return
} }
if (!isMultiple) { if (!isMultiple) {
selects = { [kk]: {...obj,selectKey:kk} } selects = { [kk]: { ...obj, selectKey: kk } }
} else { } else {
selects[kk] = obj; selects[kk] = obj;
selects[kk].selectKey=kk selects[kk].selectKey = kk
} }
if (!('value' in this.props)) { if (!('value' in this.props)) {
this.setState({ selects }); this.setState({ selects });
} }
this.triggerChange({ selects}); this.triggerChange({ selects });
...@@ -96,7 +92,7 @@ export default class TableSelect extends React.Component { ...@@ -96,7 +92,7 @@ export default class TableSelect extends React.Component {
values.splice(i, 1) values.splice(i, 1)
labels.splice(i, 1) labels.splice(i, 1)
if (!('value' in this.props)) { if (!('value' in this.props)) {
this.setState({ values, labels}); this.setState({ values, labels });
} }
this.triggerChange({ values, labels }); this.triggerChange({ values, labels });
...@@ -106,27 +102,25 @@ export default class TableSelect extends React.Component { ...@@ -106,27 +102,25 @@ export default class TableSelect extends React.Component {
open = () => { open = () => {
if (!('value' in this.props)) { if (!('value' in this.props)) {
this.setState({ visiable: true}); this.setState({ visiable: true });
} }
this.triggerChange({ visiable: true }); this.triggerChange({ visiable: true });
} }
closeModal = () => { closeModal = () => {
if (!('value' in this.props)) { if (!('value' in this.props)) {
this.setState({ visiable: false}); this.setState({ visiable: false });
} }
this.triggerChange({ visiable: false }); this.triggerChange({ visiable: false });
} }
render() { render() {
const { json: { isMultiple, sql, optionType, showTable }, dataColumn: { referenceObjId }, sqlModel, columns, dataSource } = this.props
const { json: { isMultiple, sql, optionType, showTable }, dataColumn: { referenceObjId }, sqlModel, columns,dataSource } = this.props let { valueName, labelName } = this.props.json
let { valueName, labelName} =this.props.json if (optionType == "reference" && referenceObjId) {
valueName = this.props.dataColumn.referenceCodeName
if(optionType == "reference" &&referenceObjId){ labelName = this.props.dataColumn.referenceNameName
valueName=this.props.dataColumn.referenceCodeName
labelName=this.props.dataColumn.referenceNameName
} }
...@@ -134,45 +128,44 @@ export default class TableSelect extends React.Component { ...@@ -134,45 +128,44 @@ export default class TableSelect extends React.Component {
if (valueName == null || valueName == "") { if (valueName == null || valueName == "") {
return <>请指定取值的列名</> return <>请指定取值的列名</>
} }
const { selects, visiable, labels} = this.state const { selects, visiable, labels } = this.state
const keys=[] const keys = []
for(let i in selects){ for (let i in selects) {
keys.push(selects[i][valueName]) keys.push(selects[i][valueName])
} }
const columns2=[...columns,{ const columns2 = [...columns, {
title:"操作", title: "操作",
render:(val,record)=><a onClick={this.remove.bind(this,record.selectKey)}>移除</a> render: (val, record) => <a onClick={this.remove.bind(this, record.selectKey)}>移除</a>
}] }]
const columns3=[...columns,{ const columns3 = [...columns, {
title:"操作", title: "操作",
render: (val, record) =>
render:(val,record)=> keys.includes(record[valueName]) ? <span>已选择</span> : <a onClick={this.select.bind(this, record)}>选择</a>
keys.includes(record[valueName])?<span>已选择</span>:<a onClick={this.select.bind(this,record)}>选择</a>
}] }]
const custom={ const custom = {
isAll:this.state.isAll, isAll: this.state.isAll,
querys: this.state.querys, querys: this.state.querys,
sql: this.state.sql, sql: this.state.sql,
} }
console.log(columns3) // console.log(columns3)
let allWidth = 0 let allWidth = 0
if(columns3) { if (columns3) {
columns3.map((item,index) => { columns3.map((item, index) => {
if(index === columns3.length-1){ if (index === columns3.length - 1) {
item.fixed = 'right' item.fixed = 'right'
item.width = 50 item.width = 50
allWidth += 50 allWidth += 50
return item return item
} }
if(index === columns3.length-2){ if (index === columns3.length - 2) {
allWidth += 150 allWidth += 150
} else { } else {
if(item.width){ if (item.width) {
allWidth += item.width allWidth += item.width
} else { } else {
item.width = 180 item.width = 180
...@@ -182,23 +175,20 @@ export default class TableSelect extends React.Component { ...@@ -182,23 +175,20 @@ export default class TableSelect extends React.Component {
return item return item
}) })
} }
console.log(selects, Object.keys(selects).length)
return ( return (
<div> <div>
{Object.keys(selects).length > 0 ?
{Object.keys(selects).length > 0 ? showTable ? <Table rowKey={valueName} size="small" dataSource={Object.values(selects)} columns={columns2} pagination={false} /> : showTable ? <Table rowKey={valueName} size="small" dataSource={Object.values(selects)} columns={columns2} pagination={false} /> :
Object.keys(selects).map((k) => <Tag key={k} closable onClose={this.remove.bind(this, k)}>{selects[k][labelName]}</Tag>) Object.keys(selects).map((k) => <Tag key={k} closable onClose={this.remove.bind(this, k)}>{selects[k][labelName]}</Tag>)
: "" : ""
} }
<Button type="primary" onClick={this.open}>选择</Button> <Button type="primary" onClick={this.open}>选择</Button>
<Modal <Modal
width="1200px" width="60%"
maskClosable={false} maskClosable={false}
title={`请选择`} title={`请选择`}
visible={visiable} visible={visiable}
onOk={this.closeModal} onOk={this.closeModal}
...@@ -206,7 +196,8 @@ export default class TableSelect extends React.Component { ...@@ -206,7 +196,8 @@ export default class TableSelect extends React.Component {
> >
{optionType == "reference" ? referenceObjId ? {optionType == "reference" ? referenceObjId ?
<FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={referenceObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} /> : "未关联数据对象" <FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={referenceObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} />
: "未关联数据对象"
: sqlModel.dataObjId ? : sqlModel.dataObjId ?
<FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={sqlModel.dataObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} /> <FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={sqlModel.dataObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} />
: <Table rowKey={valueName} size="small" dataSource={dataSource.list} columns={columns3} scroll={{ x: allWidth }} />} : <Table rowKey={valueName} size="small" dataSource={dataSource.list} columns={columns3} scroll={{ x: allWidth }} />}
......
one_stop_public/libs/formList/index.js
浏览文件 @ 5bfb05b3
...@@ -731,7 +731,7 @@ class FormList extends React.Component { ...@@ -731,7 +731,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, { {form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name], initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }], rules: [{ required: !item.isNull }],
})(<Input readOnly={!isAdd} placeholder="请输入"/>)} })(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} }
...@@ -771,7 +771,7 @@ class FormList extends React.Component { ...@@ -771,7 +771,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, { {form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name], initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }], rules: [{ required: !item.isNull }],
})(<Input placeholder="请输入"/>)} })(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} else if (number.indexOf(item.type) > -1) { } else if (number.indexOf(item.type) > -1) {
...@@ -818,7 +818,7 @@ class FormList extends React.Component { ...@@ -818,7 +818,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, { {form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name], initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }], rules: [{ required: !item.isNull }],
})(<Input placeholder="请输入"/>)} })(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} }
...@@ -832,11 +832,12 @@ class FormList extends React.Component { ...@@ -832,11 +832,12 @@ class FormList extends React.Component {
if (querys.length == 0) { if (querys.length == 0) {
return ''; return '';
} }
return ( return (
<Form layout="inline"> <Form layout="inline">
<Row > <Row >
{querys.map((item) => {querys.map((item) =>
<Col span={8} key={item.id}> <Col style={{height:58}} span={8} key={item.id}>
{this.getItem(true,form, { {this.getItem(true,form, {
...item, ...item,
isNull: true isNull: true
......
one_stop_public/tableCompon/index.jsx
浏览文件 @ 5bfb05b3
...@@ -62,14 +62,14 @@ import Signature from '../Signature'; ...@@ -62,14 +62,14 @@ import Signature from '../Signature';
import baseX from 'base-x' import baseX from 'base-x'
const Bs64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' const Bs64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
const base64 = baseX(Bs64) const base64 = baseX(Bs64)
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';
const Item = MobileList.Item; const Item = MobileList.Item;
const Brief = Item.Brief; const Brief = Item.Brief;
function getBase64(value){ function getBase64(value) {
return value?base64.encode(new Buffer(value)):null; return value ? base64.encode(new Buffer(value)) : null;
} }
const codeMessage = { const codeMessage = {
...@@ -121,9 +121,9 @@ const normFile = (e) => { ...@@ -121,9 +121,9 @@ const normFile = (e) => {
} }
return e && e.fileList[0]; return e && e.fileList[0];
} }
@connect(({ DataColumn, SqlManageEntity,formList, loading }) => ({ @connect(({ DataColumn, SqlManageEntity, formList, loading }) => ({
DataColumn, SqlManageEntity,formList, DataColumn, SqlManageEntity, formList,
loading: loading.models.DataColumn || loading.models.SqlManageEntity||loading.models.formList loading: loading.models.DataColumn || loading.models.SqlManageEntity || loading.models.formList
})) }))
export default class tableCom extends Component { export default class tableCom extends Component {
state = { state = {
...@@ -212,8 +212,8 @@ export default class tableCom extends Component { ...@@ -212,8 +212,8 @@ export default class tableCom extends Component {
break; break;
} }
if (depth == 1 && ((this.props.json.sqlKey==null&&sqlContent == null && json.formula == null&& json.funcs == null) || (sqlContent != null && sqlContent.indexOf(key) == -1) if (depth == 1 && ((this.props.json.sqlKey == null && sqlContent == null && json.formula == null && json.funcs == null) || (sqlContent != null && sqlContent.indexOf(key) == -1)
|| ((json.formula != null && json.formula.indexOf(key) == -1)&&(json.funcs != null && json.funcs.indexOf(key) == -1)) || ((json.formula != null && json.formula.indexOf(key) == -1) && (json.funcs != null && json.funcs.indexOf(key) == -1))
)) { )) {
this.excludeKeys.push(key) this.excludeKeys.push(key)
...@@ -295,16 +295,16 @@ export default class tableCom extends Component { ...@@ -295,16 +295,16 @@ export default class tableCom extends Component {
return res; return res;
}; };
getRender= (com,props) => { getRender = (com, props) => {
if(com=="span") return <span {...props}/> if (com == "span") return <span {...props} />
if(com=="a") return <a {...props}/> if (com == "a") return <a {...props} />
if(com=="div") return <div {...props}/> if (com == "div") return <div {...props} />
if(com=="canvas") return <canvas {...props}/> if (com == "canvas") return <canvas {...props} />
if(com=="iframe") return <iframe {...props}/> if (com == "iframe") return <iframe {...props} />
if(com=="img") { if (com == "img") {
const src=props.src!=null?(props.src.indexOf("http")>-1?props.src:config.httpServer+props.src):null const src = props.src != null ? (props.src.indexOf("http") > -1 ? props.src : config.httpServer + props.src) : null
const pp={...props,src:src} const pp = { ...props, src: src }
return <img {...pp}/> return <img {...pp} />
} }
} }
...@@ -423,7 +423,7 @@ export default class tableCom extends Component { ...@@ -423,7 +423,7 @@ export default class tableCom extends Component {
if (json == null) { if (json == null) {
return; return;
} }
if(!(this.dataFilter.includes(json.comName) || json.comName == "TableSelect")&&json.isFormulaOnce){ if (!(this.dataFilter.includes(json.comName) || json.comName == "TableSelect") && json.isFormulaOnce) {
return; return;
} }
if (!(this.dataFilter.includes(json.comName) || json.comName == "TableSelect" || (json.formula != null && json.formula != ""))) { if (!(this.dataFilter.includes(json.comName) || json.comName == "TableSelect" || (json.formula != null && json.formula != ""))) {
...@@ -482,15 +482,15 @@ export default class tableCom extends Component { ...@@ -482,15 +482,15 @@ export default class tableCom extends Component {
return return
} }
const bindObj=this.getColumn('c1'); const bindObj = this.getColumn('c1');
let dataColumn = this.props.fatherCode != null ? (bindObj?{...bindObj,base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`}: let dataColumn = this.props.fatherCode != null ? (bindObj ? { ...bindObj, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}` } :
{ base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` }) { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` })
: bindObj; : bindObj;
if (this.props.fatherCode == null&&dataColumn == null) dataColumn = { base52: this.props.uuid } if (this.props.fatherCode == null && dataColumn == null) dataColumn = { base52: this.props.uuid }
/* if (this.props.fatherCode != null) { /* if (this.props.fatherCode != null) {
dataColumn = { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` } dataColumn = { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` }
} else { } else {
dataColumn = { base52: this.props.uuid } dataColumn = { base52: this.props.uuid }
...@@ -504,12 +504,14 @@ export default class tableCom extends Component { ...@@ -504,12 +504,14 @@ export default class tableCom extends Component {
} }
} }
} }
}
}
} */ } */
if (!this.props.isEdit&&this.props.fatherCode) { if (!this.props.isEdit && this.props.fatherCode) {
if(bindObj!=null){ if (bindObj != null) {
dataColumn.base52 = bindObj.base52 dataColumn.base52 = bindObj.base52
}else{ } else {
dataColumn.base52 = this.props.uuid dataColumn.base52 = this.props.uuid
} }
...@@ -519,7 +521,7 @@ export default class tableCom extends Component { ...@@ -519,7 +521,7 @@ export default class tableCom extends Component {
const obj2 = { ...obj, ...props.form.getFieldsValue(), ...props.defaultValues[this.props.formKey] } const obj2 = { ...obj, ...props.form.getFieldsValue(), ...props.defaultValues[this.props.formKey] }
this.getData(json, dataColumn, obj2) this.getData(json, dataColumn, obj2)
} }
if (json.formula != null && json.formula != ""&&!json.isFormulaOnce) { if (json.formula != null && json.formula != "" && !json.isFormulaOnce) {
this.getFunctionValue(json.formula, dataColumn, json) this.getFunctionValue(json.formula, dataColumn, json)
} }
} }
...@@ -528,8 +530,6 @@ export default class tableCom extends Component { ...@@ -528,8 +530,6 @@ 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
...@@ -613,10 +613,10 @@ export default class tableCom extends Component { ...@@ -613,10 +613,10 @@ 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) {
...@@ -682,59 +682,59 @@ export default class tableCom extends Component { ...@@ -682,59 +682,59 @@ export default class tableCom extends Component {
let enu; let enu;
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.getFieldValue(base52) let vlu = this.props.form.getFieldValue(base52)
if(vlu instanceof Array){ if (vlu instanceof Array) {
for(var i=0;i<this.state.options.length;i++){ for (var i = 0; i < this.state.options.length; i++) {
if(vlu.includes(this.state.options[i].value)){ if (vlu.includes(this.state.options[i].value)) {
labs.push(this.state.options[i].label) labs.push(this.state.options[i].label)
} }
} }
}else{ } else {
for(var i=0;i<this.state.options.length;i++){ for (var i = 0; i < this.state.options.length; i++) {
if(vlu==this.state.options[i].value){ if (vlu == this.state.options[i].value) {
labs.push(this.state.options[i].label) labs.push(this.state.options[i].label)
break; break;
} }
} }
} }
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
const vlu=obj[base52] const vlu = obj[base52]
const labs=[] const labs = []
if(vlu instanceof Array){ if (vlu instanceof Array) {
for(var i=0;i<this.state.options.length;i++){ for (var i = 0; i < this.state.options.length; i++) {
if(vlu.includes(this.state.options[i].value)){ if (vlu.includes(this.state.options[i].value)) {
labs.push(this.state.options[i].label) labs.push(this.state.options[i].label)
} }
} }
}else{ } else {
for(var i=0;i<this.state.options.length;i++){ for (var i = 0; i < this.state.options.length; i++) {
if(vlu==this.state.options[i].value){ if (vlu == this.state.options[i].value) {
labs.push(this.state.options[i].label) labs.push(this.state.options[i].label)
break; break;
} }
} }
} }
this.setState({labels:labs}) this.setState({ labels: labs })
} }
}) ; });
} catch (e) { } catch (e) {
message.error("公式选项配置存在问题") message.error("公式选项配置存在问题")
...@@ -760,11 +760,11 @@ export default class tableCom extends Component { ...@@ -760,11 +760,11 @@ export default class tableCom extends Component {
} }
} }
reqUtil = (base52, json,orgCallback, url, method, params, callback, options = {}) => { reqUtil = (base52, json, orgCallback, url, method, params, callback, options = {}) => {
//查缓存 //查缓存
var isChange = false; var isChange = false;
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) {
...@@ -798,17 +798,17 @@ export default class tableCom extends Component { ...@@ -798,17 +798,17 @@ export default class tableCom extends Component {
if (callback) { if (callback) {
const data = reqUrls[url].data const data = reqUrls[url].data
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()
}); });
} }
}else if (json.comName == "Button") { } else if (json.comName == "Button") {
try { try {
callback(data) callback(data)
...@@ -849,13 +849,13 @@ export default class tableCom extends Component { ...@@ -849,13 +849,13 @@ export default class tableCom extends Component {
return "norefeshxxxxxxxxxxxxxxxxxxxx" return "norefeshxxxxxxxxxxxxxxxxxxxx"
} }
this.setState({ reqUrls }, () => { this.setState({ reqUrls }, () => {
for(let i in params){ for (let i in params) {
if(params[i]==null){ if (params[i] == null) {
delete params[i] delete params[i]
} }
} }
if(getToken()!=null){ if (getToken() != null) {
params.token=getToken() params.token = getToken()
} }
const requestParams = params const requestParams = params
...@@ -877,17 +877,17 @@ export default class tableCom extends Component { ...@@ -877,17 +877,17 @@ export default class tableCom extends Component {
reqUrls[url].data = data reqUrls[url].data = data
this.setState({ reqUrls }) this.setState({ 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()
}); });
} }
}else if (json.comName == "Button") { } else if (json.comName == "Button") {
try { try {
callback(data) callback(data)
...@@ -940,7 +940,7 @@ export default class tableCom extends Component { ...@@ -940,7 +940,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;
...@@ -968,14 +968,14 @@ export default class tableCom extends Component { ...@@ -968,14 +968,14 @@ export default class tableCom extends Component {
if (callback) { if (callback) {
const data = sqlKeys[sqlKey].data const data = sqlKeys[sqlKey].data
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()
}); });
} }
}else if (json.comName == "Button") { } else if (json.comName == "Button") {
try { try {
callback(data) callback(data)
...@@ -1023,9 +1023,9 @@ export default class tableCom extends Component { ...@@ -1023,9 +1023,9 @@ export default class tableCom extends Component {
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()
} }
const umiRequest = extend({ const umiRequest = extend({
errorHandler, // 默认错误处理 errorHandler, // 默认错误处理
...@@ -1035,7 +1035,7 @@ export default class tableCom extends Component { ...@@ -1035,7 +1035,7 @@ export default class tableCom extends Component {
}); });
umiRequest(url, { umiRequest(url, {
data: pp , data: pp,
method: 'POST', method: 'POST',
requestType: "form" requestType: "form"
}).then(data => { }).then(data => {
...@@ -1047,17 +1047,17 @@ export default class tableCom extends Component { ...@@ -1047,17 +1047,17 @@ export default class tableCom extends Component {
} }
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()
}); });
} }
}else if (json.comName == "Button") { } else if (json.comName == "Button") {
try { try {
callback(data) callback(data)
...@@ -1110,7 +1110,7 @@ export default class tableCom extends Component { ...@@ -1110,7 +1110,7 @@ export default class tableCom extends Component {
return "norefeshxxxxxxxxxxxxxxxxxxxx" return "norefeshxxxxxxxxxxxxxxxxxxxx"
} }
getFunctionValue = (fun, column, json,callback) => { getFunctionValue = (fun, column, json, callback) => {
/* if (!this.props.isEdit) { /* if (!this.props.isEdit) {
return return
...@@ -1133,19 +1133,19 @@ export default class tableCom extends Component { ...@@ -1133,19 +1133,19 @@ export default class tableCom extends Component {
obj = { ...this.props.fatherObj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] } obj = { ...this.props.fatherObj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
}else{ } else {
obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] } obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
} }
const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get,formCode:this.props.formCode,formId:this.props.formId }, this.props.index, this.props.fatherCode, const value = fun1(obj, this.props.init, this.props.defaultValues, { clientType: this.props.get, formCode: this.props.formCode, formId: this.props.formId }, this.props.index, this.props.fatherCode,
{ {
moment: moment, moment: moment,
sql: this.sqlUtil.bind(this, base52, json,callback), sql: this.sqlUtil.bind(this, base52, json, callback),
message: message,router:router, message: message, router: router,
setValues: this.setValues.bind(this, base52, json), setValues: this.setValues.bind(this, base52, json),
req: this.reqUtil.bind(this, base52, json,callback), req: this.reqUtil.bind(this, base52, json, callback),
md5: md5, md5: md5,
render:this.getRender,base64:getBase64, render:this.getRender,base64:getBase64,
}, },
...@@ -1165,12 +1165,12 @@ export default class tableCom extends Component { ...@@ -1165,12 +1165,12 @@ export default class tableCom extends Component {
if (json.comName == "Button") { if (json.comName == "Button") {
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()
}); });
} }
...@@ -1216,14 +1216,29 @@ export default class tableCom extends Component { ...@@ -1216,14 +1216,29 @@ export default class tableCom extends Component {
}) })
} }
const bindObj=this.getColumn('c1'); const bindObj = this.getColumn('c1');
let dataColumn = this.props.fatherCode != null ? (bindObj ? { ...bindObj, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}` } :
{ base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` })
: bindObj;
if (this.props.fatherCode == null && dataColumn == null) dataColumn = { base52: this.props.uuid }
/* if (this.props.fatherCode != null) {
dataColumn = { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` }
} else {
dataColumn = { base52: this.props.uuid }
if (Object.keys(mapData).length > 0) {
const columnIds = json.columnIds;
const bindObj = this.getColumn('c1');
let dataColumn = this.props.fatherCode != null ? (bindObj?{...bindObj,base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`}: let dataColumn = this.props.fatherCode != null ? (bindObj ? { ...bindObj, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}` } :
{ base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` }) { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` })
: bindObj; : bindObj;
if (this.props.fatherCode == null&&dataColumn == null) dataColumn = { base52: this.props.uuid } if (this.props.fatherCode == null && dataColumn == null) dataColumn = { base52: this.props.uuid }
/* if (this.props.fatherCode != null) { /* if (this.props.fatherCode != null) {
dataColumn = { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` } dataColumn = { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` }
} else { } else {
...@@ -1239,11 +1254,19 @@ export default class tableCom extends Component { ...@@ -1239,11 +1254,19 @@ export default class tableCom extends Component {
} }
} }
} */ } */
if (!this.props.isEdit&&this.props.fatherCode) { // if (!this.props.isEdit && this.props.fatherCode) {
// if (bindObj != null) {
// dataColumn.base52 = bindObj.base52
// } else {
// dataColumn.base52 = this.props.uuid
// }
// }
if (!this.props.isEdit && this.props.fatherCode) {
if(bindObj!=null){ if (bindObj != null) {
dataColumn.base52 = bindObj.base52 dataColumn.base52 = bindObj.base52
}else{ } else {
dataColumn.base52 = this.props.uuid dataColumn.base52 = this.props.uuid
} }
...@@ -1267,11 +1290,11 @@ export default class tableCom extends Component { ...@@ -1267,11 +1290,11 @@ export default class tableCom extends Component {
callback: options => { callback: options => {
const optionsx = []; const optionsx = [];
let base52 = dataColumn.base52 let base52 = dataColumn.base52
let vl=this.props.form.getFieldValue(base52) let vl = this.props.form.getFieldValue(base52)
let isExist=false; let isExist = false;
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
if(vl== options[i][valueName]&&!isExist){ if (vl == options[i][valueName] && !isExist) {
isExist=true; isExist = true;
} }
optionsx.push({ optionsx.push({
label: options[i][labelName], label: options[i][labelName],
...@@ -1279,8 +1302,8 @@ export default class tableCom extends Component { ...@@ -1279,8 +1302,8 @@ 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 });
}, },
...@@ -1307,12 +1330,12 @@ export default class tableCom extends Component { ...@@ -1307,12 +1330,12 @@ export default class tableCom extends Component {
payload: { sqlKey, allValues }, payload: { sqlKey, allValues },
callback: options => { callback: options => {
let base52 = dataColumn.base52 let base52 = dataColumn.base52
let vl=this.props.form.getFieldValue(base52) let vl = this.props.form.getFieldValue(base52)
const optionsx = []; const optionsx = [];
let isExist=false; let isExist = false;
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
if(vl== options[i][valueName]&&!isExist){ if (vl == options[i][valueName] && !isExist) {
isExist=true; isExist = true;
} }
optionsx.push({ optionsx.push({
label: options[i][labelName], label: options[i][labelName],
...@@ -1320,9 +1343,9 @@ export default class tableCom extends Component { ...@@ -1320,9 +1343,9 @@ 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 });
...@@ -1449,7 +1472,6 @@ export default class tableCom extends Component { ...@@ -1449,7 +1472,6 @@ export default class tableCom extends Component {
const { options, labels, selectDis } = this.state; const { options, labels, selectDis } = 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
if (json == null) { if (json == null) {
return <></>; return <></>;
} }
...@@ -1488,9 +1510,9 @@ export default class tableCom extends Component { ...@@ -1488,9 +1510,9 @@ export default class tableCom extends Component {
if (json.comName == 'Label') { if (json.comName == 'Label') {
let uid let uid
if (this.props.fatherCode != null) { if (this.props.fatherCode != null) {
uid=`${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` uid = `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}`
} else { } else {
uid= this.props.uuid uid = this.props.uuid
} }
if (!isEdit) { if (!isEdit) {
...@@ -1499,13 +1521,13 @@ export default class tableCom extends Component { ...@@ -1499,13 +1521,13 @@ export default class tableCom extends Component {
if (this.props.fatherCode != null) { if (this.props.fatherCode != null) {
return <>{this.props.form.getFieldDecorator(uid, { return <>{this.props.form.getFieldDecorator(uid, {
initialValue: obj[this.props.uuid]||json.initialValue initialValue: obj[this.props.uuid] || json.initialValue
})(<Input type="hidden" />)}<span style={{ fontWeight: get == 'mobile' ? 'bold' : '', marginRight: get == 'mobile' ? 12 : '' }} {...json.props}>{obj[this.props.uuid]||json.initialValue}</span></> })(<Input type="hidden" />)}<span style={{ fontWeight: get == 'mobile' ? 'bold' : '', marginRight: get == 'mobile' ? 12 : '' }} {...json.props}>{obj[this.props.uuid] || json.initialValue}</span></>
}else{ } else {
return <>{this.props.form.getFieldDecorator(uid, { return <>{this.props.form.getFieldDecorator(uid, {
initialValue: this.props.form.getFieldValue(uid)||json.initialValue initialValue: this.props.form.getFieldValue(uid) || json.initialValue
})(<Input type="hidden" />)}<span style={{ fontWeight: get == 'mobile' ? 'bold' : '', marginRight: get == 'mobile' ? 12 : '' }} {...json.props}>{this.props.form.getFieldValue(uid)}</span></> })(<Input type="hidden" />)}<span style={{ fontWeight: get == 'mobile' ? 'bold' : '', marginRight: get == 'mobile' ? 12 : '' }} {...json.props}>{this.props.form.getFieldValue(uid)}</span></>
...@@ -1618,9 +1640,9 @@ export default class tableCom extends Component { ...@@ -1618,9 +1640,9 @@ export default class tableCom extends Component {
break; break;
case 'ImgUploadCom': case 'ImgUploadCom':
if(value==null||value==""){ if (value == null || value == "") {
cm=<div style={{ width: json.width, height: json.height }}></div> cm = <div style={{ width: json.width, height: json.height }}></div>
}else{ } else {
cm = <> cm = <>
<img src={config.httpServer + value} style={{ width: json.width, height: json.height }} /> <img src={config.httpServer + value} style={{ width: json.width, height: json.height }} />
{ {
...@@ -1701,9 +1723,9 @@ export default class tableCom extends Component { ...@@ -1701,9 +1723,9 @@ export default class tableCom extends Component {
var cm; var cm;
var required = false; var required = false;
const bindObj=this.getColumn('c1'); const bindObj = this.getColumn('c1');
let dataColumn = this.props.fatherCode != null ? (bindObj?{...bindObj,base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`}: let dataColumn = this.props.fatherCode != null ? (bindObj ? { ...bindObj, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}` } :
{ base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` }) { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` })
...@@ -1711,10 +1733,10 @@ export default class tableCom extends Component { ...@@ -1711,10 +1733,10 @@ export default class tableCom extends Component {
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) { if (dataColumn.isNull != null && !dataColumn.isNull) {
required = true; required = true;
} }
...@@ -1722,7 +1744,7 @@ export default class tableCom extends Component { ...@@ -1722,7 +1744,7 @@ export default class tableCom extends Component {
var initValue; var initValue;
if (init != null) { if (init != null) {
if (this.props.fatherCode != null) { if (this.props.fatherCode != null) {
initValue = init[this.props.index] != null ? init[this.props.index][bindObj?bindObj.base52:this.props.uuid] : null; initValue = init[this.props.index] != null ? init[this.props.index][bindObj ? bindObj.base52 : this.props.uuid] : null;
} else { } else {
initValue = init[dataColumn.base52]; initValue = init[dataColumn.base52];
...@@ -1742,9 +1764,9 @@ export default class tableCom extends Component { ...@@ -1742,9 +1764,9 @@ export default class tableCom extends Component {
if (!isEdit) { if (!isEdit) {
if (this.props.fatherCode) { if (this.props.fatherCode) {
if(bindObj!=null){ if (bindObj != null) {
dataColumn.base52 = bindObj.base52 dataColumn.base52 = bindObj.base52
}else{ } else {
dataColumn.base52 = this.props.uuid dataColumn.base52 = this.props.uuid
} }
...@@ -1802,7 +1824,6 @@ export default class tableCom extends Component { ...@@ -1802,7 +1824,6 @@ export default class tableCom extends Component {
break; break;
case 'TableSelect': case 'TableSelect':
const ds = obj[dataColumn.base52] && obj[dataColumn.base52].selects ? Object.values(obj[dataColumn.base52].selects) : [] const ds = obj[dataColumn.base52] && obj[dataColumn.base52].selects ? Object.values(obj[dataColumn.base52].selects) : []
if (json.showTable) { if (json.showTable) {
cm = <Table columns={this.state.columns} size="small" dataSource={ds} pagination={false} />; cm = <Table columns={this.state.columns} size="small" dataSource={ds} pagination={false} />;
...@@ -1912,7 +1933,7 @@ export default class tableCom extends Component { ...@@ -1912,7 +1933,7 @@ export default class tableCom extends Component {
); );
} }
} else { } else {
cm = <span style={{display:'inline-block',width:'100%',textAlign:'center'}}>暂无附件</span> cm = <span style={{ display: 'inline-block', width: '100%', textAlign: 'center' }}>暂无附件</span>
} }
...@@ -1920,9 +1941,9 @@ export default class tableCom extends Component { ...@@ -1920,9 +1941,9 @@ export default class tableCom extends Component {
case 'ImgUploadCom': case 'ImgUploadCom':
if(obj[dataColumn.base52]==null||obj[dataColumn.base52]==""){ if (obj[dataColumn.base52] == null || obj[dataColumn.base52] == "") {
cm=<div style={{ width: json.width, height: json.height }}></div> cm = <div style={{ width: json.width, height: json.height }}></div>
}else{ } else {
cm = <img src={config.httpServer + obj[dataColumn.base52]} style={{ width: json.width, height: json.height }} />; cm = <img src={config.httpServer + obj[dataColumn.base52]} style={{ width: json.width, height: json.height }} />;
} }
...@@ -1953,17 +1974,17 @@ export default class tableCom extends Component { ...@@ -1953,17 +1974,17 @@ export default class tableCom extends Component {
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
}else{ } else {
const ev = { const ev = {
children:json.initialValue, children: json.initialValue,
...events ...events
} }
if(json.isLink){ if (json.isLink) {
cm = <a {...ev}/> cm = <a {...ev} />
}else{ } else {
cm = <Button loading={this.props.loading} type="primary" {...ev}/> cm = <Button loading={this.props.loading} type="primary" {...ev} />
} }
} }
...@@ -2016,17 +2037,17 @@ export default class tableCom extends Component { ...@@ -2016,17 +2037,17 @@ export default class tableCom extends Component {
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
}else{ } else {
const ev = { const ev = {
children:json.initialValue, children: json.initialValue,
...events ...events
} }
if(json.isLink){ if (json.isLink) {
cm = <a {...ev}/> cm = <a {...ev} />
}else{ } else {
cm = <Button loading={this.props.loading} type="primary" {...ev}/> cm = <Button loading={this.props.loading} type="primary" {...ev} />
} }
} }
...@@ -2129,7 +2150,7 @@ export default class tableCom extends Component { ...@@ -2129,7 +2150,7 @@ export default class tableCom extends Component {
cm = ( cm = (
<MobileList <MobileList
> >
<Item arrow="empty" multipleLine onClick={() => {}}> <Item arrow="empty" multipleLine onClick={() => { }}>
{json.isLabel ? {json.isLabel ?
title ? title ?
<span className={styles.text}> <span className={styles.text}>
...@@ -2313,10 +2334,10 @@ export default class tableCom extends Component { ...@@ -2313,10 +2334,10 @@ export default class tableCom extends Component {
placeholder={json.placeholder} placeholder={json.placeholder}
style={{ width: json.width }} style={{ width: json.width }}
optionFilterProp="children" optionFilterProp="children"
onFocus= {()=>{ onFocus={() => {
get === 'mobile'?// 移动端取消输入键盘弹出 get === 'mobile' ?// 移动端取消输入键盘弹出
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');
...@@ -2329,7 +2350,7 @@ export default class tableCom extends Component { ...@@ -2329,7 +2350,7 @@ export default class tableCom extends Component {
}) })
} }
}) })
:null : null
}} }}
filterOption={(input, option) => filterOption={(input, option) =>
option ? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 : false option ? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 : false
...@@ -2356,13 +2377,12 @@ export default class tableCom extends Component { ...@@ -2356,13 +2377,12 @@ export default class tableCom extends Component {
break; break;
case 'TableSelect': case 'TableSelect':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue || {}, initialValue: initValue || {},
rules: [{ rules: json.vlds && json.vlds.length > 0 ? json.vlds : [{
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if (Object.keys(value).length == 0 && required != null && required) { if ((Object.keys(value).length == 0 || Object.keys(value.selects).length == 0) && required != null && required) {
var errors = [] var errors = []
errors.push(new Error('请选择至少一个', rule.field)) errors.push(new Error('请选择至少一个', rule.field))
} }
...@@ -2470,7 +2490,7 @@ export default class tableCom extends Component { ...@@ -2470,7 +2490,7 @@ export default class tableCom extends Component {
// } // }
var iv = null; var iv = null;
if (initValue != null) { if (initValue != null) {
iv = moment(typeof initValue === 'string'?+initValue:initValue); iv = moment(typeof initValue === 'string' ? +initValue : initValue);
} }
// console.log(iv,json.format) // console.log(iv,json.format)
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
...@@ -2479,16 +2499,16 @@ export default class tableCom extends Component { ...@@ -2479,16 +2499,16 @@ export default class tableCom extends Component {
})(<DatePicker })(<DatePicker
disabled={disabled} disabled={disabled}
showTime showTime
onOpenChange = { get === 'mobile'?() => { // 取消唤起移动端小键盘 onOpenChange={get === 'mobile' ? () => { // 取消唤起移动端小键盘
setTimeout(() => { setTimeout(() => {
if(document.querySelector('.ant-calendar-input ')){ if (document.querySelector('.ant-calendar-input ')) {
document.querySelector('.ant-calendar-input ').setAttribute('readonly', 'readonly'); document.querySelector('.ant-calendar-input ').setAttribute('readonly', 'readonly');
setTimeout(() => { setTimeout(() => {
document.querySelector('.ant-calendar-input ').removeAttribute('readonly'); document.querySelector('.ant-calendar-input ').removeAttribute('readonly');
}); });
} }
}); });
}:()=>{}} } : () => { }}
format={json.format ? json.format : 'YYYY-MM-DD HH:mm:ss'} />); format={json.format ? json.format : 'YYYY-MM-DD HH:mm:ss'} />);
if (get === 'mobile' && json.isLabel && title) { if (get === 'mobile' && json.isLabel && title) {
cm = <Form.Item cm = <Form.Item
...@@ -2605,7 +2625,7 @@ export default class tableCom extends Component { ...@@ -2605,7 +2625,7 @@ export default class tableCom extends Component {
cm = <></> cm = <></>
} else { } else {
cm = <>{getFieldDecorator(dataColumn.base52||this.props.uuid , { cm = <>{getFieldDecorator(dataColumn.base52 || this.props.uuid, {
initialValue: initValue || {} initialValue: initValue || {}
})(<TableList isHiddenPage={json.isHiddenPage} showHeader={json.showHeader} loading={this.props.loading} pageSize={json.pageSize} objCode={json.objCode} sql={json.filterSql} rights={json.rights} />)}</> })(<TableList isHiddenPage={json.isHiddenPage} showHeader={json.showHeader} loading={this.props.loading} pageSize={json.pageSize} objCode={json.objCode} sql={json.filterSql} rights={json.rights} />)}</>
......
zyd_public/LoginFromQrCode/index.js
浏览文件 @ 5bfb05b3
...@@ -8,7 +8,7 @@ import LoginWithQrCode from './LoginWithQrCode'; ...@@ -8,7 +8,7 @@ import LoginWithQrCode from './LoginWithQrCode';
* wxSocketGateWay: websocket链接地址 'ws://scjoyedu.eicp.net:51337/wswx/test106/socket/' * wxSocketGateWay: websocket链接地址 'ws://scjoyedu.eicp.net:51337/wswx/test106/socket/'
* mockServer: 获取sessionId 接口前缀 'http://scjoyedu.eicp.net:51337/test106', * mockServer: 获取sessionId 接口前缀 'http://scjoyedu.eicp.net:51337/test106',
* */ * */
export default function LoginByQrCode({ url, LoginType, wxSocketGateWay, mockServer }) { export default function LoginByQrCode({ hintStyle, url, LoginType, wxSocketGateWay, mockServer }) {
return ( return (
<div> <div>
<div style={{ backgroundColor: 'white', width: 288, padding: 10, margin: 'auto' }}> <div style={{ backgroundColor: 'white', width: 288, padding: 10, margin: 'auto' }}>
...@@ -19,7 +19,7 @@ export default function LoginByQrCode({ url, LoginType, wxSocketGateWay, mockSer ...@@ -19,7 +19,7 @@ export default function LoginByQrCode({ url, LoginType, wxSocketGateWay, mockSer
wxSocketGateWay={wxSocketGateWay} wxSocketGateWay={wxSocketGateWay}
/> />
</div> </div>
<div style={{ marginTop: 20, color: 'white' }}> <div style={{ marginTop: 20, color: 'white', ...hintStyle, }}>
请使用 请使用
<span style={{ color: 'red' }}>微信扫一扫</span> <span style={{ color: 'red' }}>微信扫一扫</span>
扫码登录 扫码登录
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论