Skip to content

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

2072 开发需求 1228

上级 6ee393d4
隐藏空白字符变更
内嵌 并排
正在显示 包含 1116 行增加 和 1351 行删除
FormInsertDiy/Export/index.js
浏览文件 @ ba1a5ebc
...@@ -21,6 +21,8 @@ import OrderItem from './OrderItem'; ...@@ -21,6 +21,8 @@ import OrderItem from './OrderItem';
import ButtonDiy from '@/baseComponent/ButtonDiy'; import ButtonDiy from '@/baseComponent/ButtonDiy';
import FormdataWrapper from '@/utils/object-to-formdata-custom'; import FormdataWrapper from '@/utils/object-to-formdata-custom';
import { getServicesNomal } from '@/webPublic/one_stop_public/Services/services';
import { getExportInfoApi } from '@/webPublic/one_stop_public/Services/apiConfig';
const Option = Select.Option; const Option = Select.Option;
let keyX = 1; let keyX = 1;
...@@ -82,44 +84,39 @@ export default class Index extends React.Component { ...@@ -82,44 +84,39 @@ export default class Index extends React.Component {
this.setState({ groups }); this.setState({ groups });
}; };
open = () => { open = () => {
const { dispatch } = this.props; getServicesNomal(getExportInfoApi, {
dispatch({ objId: this.props.objId,
type: 'DataObj/getExportInfo', }).then(infos => {
payload: { const mockData = [];
objId: this.props.objId, const qs = [];
}, const gs = [];
callback: (infos) => { const os = [];
const mockData = []; for (var key in infos) {
const qs = []; const x = infos[key];
const gs = []; mockData.push({
const os = []; key: x.field,
for (var key in infos) { title: x.name,
const x = infos[key]; chosen: false,
mockData.push({ });
key: x.field, if (x.canQuery) {
title: x.name, qs.push(x);
chosen: false, }
}); if (x.canGroup) {
if (x.canQuery) { gs.push(x);
qs.push(x);
}
if (x.canGroup) {
gs.push(x);
}
if (x.canOrder) {
os.push(x);
}
} }
if (x.canOrder) {
os.push(x);
}
}
this.setState({ this.setState({
mockData, mockData,
infos, infos,
visiable: true, visiable: true,
qs, qs,
gs, gs,
os, os,
}); });
},
}); });
}; };
onCancle = () => { onCancle = () => {
......
FormInsertDiy/ImportUtil/ImportUtil.js
浏览文件 @ ba1a5ebc
...@@ -11,6 +11,9 @@ import { ...@@ -11,6 +11,9 @@ import {
getSassApiHeader, getSassApiHeader,
getSysCode getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
import { getServicesNomal, importExecute } from '../../one_stop_public/Services/services';
import { importAnalyseApi } from '../../one_stop_public/Services/apiConfig';
const Step = Steps.Step; const Step = Steps.Step;
const TabPane = Tabs.TabPane; const TabPane = Tabs.TabPane;
...@@ -95,92 +98,80 @@ export default class ImportUtil extends React.PureComponent { ...@@ -95,92 +98,80 @@ export default class ImportUtil extends React.PureComponent {
} }
import() { import() {
const { dispatch, importParams } = this.props; const { importParams } = this.props;
dispatch({ importExecute({
type: 'DataObj/importExecute', ...(importParams || {}),
payload: { cacheKey: this.state.filekey,
...(importParams || {}),
cacheKey: this.state.filekey,
objId: this.props.objId, objId: this.props.objId,
}, }).then(() => {
callback: (res) => { this.next();
this.next(); message.success('导入成功');
message.success('导入成功');
this.setState({ this.setState({
current: 3, current: 3,
isShow: true, isShow: true,
visible: false, visible: false,
}); });
if (this.props.callback) { if (this.props.callback) {
this.props.callback(); this.props.callback();
} }
},
}); });
} }
getCachKey = (filePath) => { getCachKey = (filePath) => {
const { dispatch, importParams } = this.props; const { importParams } = this.props;
dispatch({ getServicesNomal(importAnalyseApi, {
type: 'DataObj/importAnalyse', ...(importParams || {}),
payload: { isLocal: false,
...(importParams || {}), filePath,
isLocal: false, objId: this.props.objId,
filePath, }).then(res => {
objId: this.props.objId, this.setState({
}, filekey: res.cacheKey,
callback: (res) => { });
this.setState({ this.queryFile(res.cacheKey);
filekey: res.cacheKey,
});
this.queryFile(res.cacheKey);
},
}); });
}; };
queryFile = (cacheKey) => { queryFile = (cacheKey) => {
const { dispatch, importParams } = this.props; const { importParams } = this.props;
dispatch({ getServicesNomal(importDataQueryApi, {
type: 'DataObj/importDataQuery', ...(importParams || {}),
payload: { cacheKey,
...(importParams || {}), objId: this.props.objId,
cacheKey, }).then(res => {
objId: this.props.objId, this.setState({
}, current: 1,
callback: (res) => { isShow: false,
this.setState({
current: 1,
isShow: false,
sucData: res.pass, sucData: res.pass,
errData: res.noPass, errData: res.noPass,
column: res.column, column: res.column,
}); });
if (res.noPass && res.noPass.length == 0) { if (res.noPass && res.noPass.length == 0) {
if (res.pass.length == 0) { if (res.pass.length == 0) {
message.error('当前没有验证成功的数据，无法导入。'); message.error('当前没有验证成功的数据，无法导入。');
this.setState({
currentKey: '1',
ch: !this.state.ch,
isNextDisabled: true,
});
} else {
message.success('所有数据验证通过，请确认后点击下一步。');
this.setState({
currentKey: '2',
ch: !this.state.ch,
isNextDisabled: false,
});
}
} else {
message.error('当前存在未验证通过的数据，请按错误提示检测更正导入文件');
this.setState({ this.setState({
currentKey: '1', currentKey: '1',
ch: !this.state.ch, ch: !this.state.ch,
isNextDisabled: true, isNextDisabled: true,
}); });
} else {
message.success('所有数据验证通过，请确认后点击下一步。');
this.setState({
currentKey: '2',
ch: !this.state.ch,
isNextDisabled: false,
});
} }
}, } else {
message.error('当前存在未验证通过的数据，请按错误提示检测更正导入文件');
this.setState({
currentKey: '1',
ch: !this.state.ch,
isNextDisabled: true,
});
}
}); });
}; };
changePane = (activeKey) => { changePane = (activeKey) => {
......
one_stop_public/App/ExportInfo.js
浏览文件 @ ba1a5ebc
...@@ -22,6 +22,8 @@ import OrderItem from './OrderItem'; ...@@ -22,6 +22,8 @@ import OrderItem from './OrderItem';
import FormdataWrapper from '../utils/object-to-formdata-custom'; import FormdataWrapper from '../utils/object-to-formdata-custom';
import ButtonDiy from './ButtonDiy/ButtonDiy'; import ButtonDiy from './ButtonDiy/ButtonDiy';
import { getHeaders } from '@/webPublic/zyd_public/utils/utils'; import { getHeaders } from '@/webPublic/zyd_public/utils/utils';
import { getServicesNomal } from '../Services/services';
import { getExportInfoApi } from '../Services/apiConfig';
const Option = Select.Option; const Option = Select.Option;
var keyX = 1; var keyX = 1;
...@@ -97,14 +99,10 @@ export default class ExportInfo extends React.Component { ...@@ -97,14 +99,10 @@ export default class ExportInfo extends React.Component {
this.setState({ groups }); this.setState({ groups });
}; };
open = () => { open = () => {
const { dispatch } = this.props; getServicesNomal(getExportInfoApi, {
dispatch({ objId: this.props.objId,
type: 'DataObj/getExportInfo', }).then(infos => {
payload: { const mockData = [];
objId: this.props.objId,
},
callback: (infos) => {
const mockData = [];
const qs = []; const qs = [];
const gs = []; const gs = [];
const os = []; const os = [];
...@@ -134,7 +132,6 @@ export default class ExportInfo extends React.Component { ...@@ -134,7 +132,6 @@ export default class ExportInfo extends React.Component {
gs, gs,
os, os,
}); });
},
}); });
}; };
onCancle = () => { onCancle = () => {
......
one_stop_public/App/ImportUtil.js
浏览文件 @ ba1a5ebc
...@@ -14,6 +14,8 @@ import { ...@@ -14,6 +14,8 @@ import {
getSassApiHeader, getSassApiHeader,
getSysCode getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
import { getServicesNomal, importExecute } from '../Services/services';
import { importDataQueryApi, importAnalyseApi } from '../Services/apiConfig';
const Modal = getModal(); const Modal = getModal();
const message = getMessage(); const message = getMessage();
...@@ -126,107 +128,91 @@ export default class ImportUtil extends React.PureComponent { ...@@ -126,107 +128,91 @@ export default class ImportUtil extends React.PureComponent {
import() { import() {
const { const {
dispatch,
importParams, importParams,
} = this.props; } = this.props;
dispatch({ importExecute({
type: 'DataObj/importExecute', ...(importParams || {}),
payload: { cacheKey: this.state.fileCacheKey,
...(importParams || {}), objId: this.props.objId,
cacheKey: this.state.fileCacheKey, }).then(res => {
objId: this.props.objId, if (res && res.sync === false && res.total) {
}, // 23013 学生事务/学生医保管理/学生平安险/保险办理，2001010248 高职界面已购买 导入 报错【接口超时】
callback: (res) => { this.setState({
if (res && res.sync === false && res.total) { openProgress: res,
// 23013 学生事务/学生医保管理/学生平安险/保险办理，2001010248 高职界面已购买 导入 报错【接口超时】 });
this.setState({ return;
openProgress: res, }
});
return; this.next();
}
this.next();
message.success('导入成功', 1); message.success('导入成功', 1);
this.setState({ this.setState({
current: 3, current: 3,
isShow: true, isShow: true,
visible: false, visible: false,
}); });
},
}); });
} }
getCachKey = (filePath) => { getCachKey = (filePath) => {
const { const {
dispatch,
importParams, importParams,
importConfig, importConfig,
} = this.props; } = this.props;
dispatch({ getServicesNomal(importAnalyseApi, {
type: 'DataObj/importAnalyse', ...(importParams || {}),
payload: { isLocal: false,
...(importParams || {}), filePath,
isLocal: false,
filePath,
importConfig: importConfig ? JSON.stringify(importConfig) : null, importConfig: importConfig ? JSON.stringify(importConfig) : null,
objId: this.props.objId, objId: this.props.objId,
}, }).then(res => {
callback: (res) => { this.setState({
this.setState({ fileCacheKey: res.cacheKey,
fileCacheKey: res.cacheKey, });
}); this.queryFile(res.cacheKey);
this.queryFile(res.cacheKey);
},
}); });
}; };
queryFile = (cacheKey) => { queryFile = (cacheKey) => {
const { const {
dispatch,
importParams, importParams,
} = this.props; } = this.props;
dispatch({ getServicesNomal(importDataQueryApi, {
type: 'DataObj/importDataQuery', ...(importParams || {}),
payload: { cacheKey,
...(importParams || {}), objId: this.props.objId,
cacheKey, }).then(res => {
objId: this.props.objId, this.setState({
}, current: 1,
callback: (res) => { isShow: false,
this.setState({
current: 1,
isShow: false,
sucData: res.pass, sucData: res.pass,
errData: res.noPass, errData: res.noPass,
column: res.column, column: res.column,
}); });
if (res.noPass && res.noPass.length === 0) { if (res.noPass && res.noPass.length === 0) {
if (res.pass.length === 0) { if (res.pass.length === 0) {
message.error('当前没有验证成功的数据，无法导入。'); message.error('当前没有验证成功的数据，无法导入。');
this.setState({
currentKey: '1',
ch: !this.state.ch,
isNextDisabled: true,
});
} else {
message.success('所有数据验证通过，请确认后点击下一步。');
this.setState({
currentKey: '2',
ch: !this.state.ch,
isNextDisabled: false,
});
}
} else {
message.error('当前存在未验证通过的数据，请按错误提示检测更正导入文件');
this.setState({ this.setState({
currentKey: '1', currentKey: '1',
ch: !this.state.ch, ch: !this.state.ch,
isNextDisabled: true, isNextDisabled: true,
}); });
} else {
message.success('所有数据验证通过，请确认后点击下一步。');
this.setState({
currentKey: '2',
ch: !this.state.ch,
isNextDisabled: false,
});
} }
}, } else {
message.error('当前存在未验证通过的数据，请按错误提示检测更正导入文件');
this.setState({
currentKey: '1',
ch: !this.state.ch,
isNextDisabled: true,
});
}
}); });
}; };
......
one_stop_public/App/ProgressDiy.js
浏览文件 @ ba1a5ebc
...@@ -2,11 +2,12 @@ import React, { useEffect, useState, useRef, useMemo } from 'react'; ...@@ -2,11 +2,12 @@ import React, { useEffect, useState, useRef, useMemo } from 'react';
import { Progress, message } from 'antd'; import { Progress, message } from 'antd';
import styles from './ImportUtil.less'; import styles from './ImportUtil.less';
import { connect } from 'dva'; import { connect } from 'dva';
import { getServicesNomal } from '../Services/services';
import { importProcessApi } from '../Services/apiConfig';
function ProgressDiy(props) { function ProgressDiy(props) {
const { const {
fileCacheKey, fileCacheKey,
dispatch,
changeOpenProgress = () => { changeOpenProgress = () => {
}, },
} = props; } = props;
...@@ -14,20 +15,15 @@ function ProgressDiy(props) { ...@@ -14,20 +15,15 @@ function ProgressDiy(props) {
const [speedData, setData] = useState({ ...props }); const [speedData, setData] = useState({ ...props });
useEffect(() => { useEffect(() => {
interv.current = setInterval(() => { interv.current = setInterval(() => {
dispatch({ getServicesNomal(importProcessApi, {
type: 'DataObj/importProcess', cacheKey: fileCacheKey,
payload: { }).then(res => {
cacheKey: fileCacheKey, setData(res);
},
callback: res => {
console.log(res);
setData(res);
if (res.finished) { if (res.finished) {
clearInterval(interv.current); clearInterval(interv.current);
// message.success('导入完成'); // message.success('导入完成');
changeOpenProgress(false); // 导入成功 changeOpenProgress(false); // 导入成功
} }
},
}); });
}, 1000); }, 1000);
}, []); }, []);
......
one_stop_public/App/SearchInfo.js
浏览文件 @ ba1a5ebc
...@@ -23,6 +23,7 @@ import OrderItem from './OrderItem'; ...@@ -23,6 +23,7 @@ import OrderItem from './OrderItem';
import FormdataWrapper from '../utils/object-to-formdata-custom'; import FormdataWrapper from '../utils/object-to-formdata-custom';
import ButtonDiy from './ButtonDiy/ButtonDiy'; import ButtonDiy from './ButtonDiy/ButtonDiy';
import { getHeaders } from '@/webPublic/zyd_public/utils/utils'; import { getHeaders } from '@/webPublic/zyd_public/utils/utils';
import { getServicesNomal } from '../Services/services';
const Option = Select.Option; const Option = Select.Option;
var keyX = 1; var keyX = 1;
...@@ -98,45 +99,40 @@ export default class SearchInfo extends React.Component { ...@@ -98,45 +99,40 @@ export default class SearchInfo extends React.Component {
this.setState({ groups }); this.setState({ groups });
}; };
open = () => { open = () => {
const { dispatch } = this.props; getServicesNomal(getExportInfoApi, {
dispatch({ objId: this.props.objId,
type: 'DataObj/getExportInfo', }).then(infos => {
payload: { const mockData = [];
objId: this.props.objId, const qs = [];
}, const gs = [];
callback: (infos) => { const os = [];
const mockData = []; for (var key in infos) {
const qs = []; const x = infos[key];
const gs = []; mockData.push({
const os = []; key: x.field,
for (var key in infos) { title: x.name,
const x = infos[key]; chosen: false,
mockData.push({ });
key: x.field, if (x.canQuery) {
title: x.name, qs.push(x);
chosen: false, }
}); if (x.canGroup) {
if (x.canQuery) { gs.push(x);
qs.push(x); }
} if (x.canOrder) {
if (x.canGroup) { os.push(x);
gs.push(x);
}
if (x.canOrder) {
os.push(x);
}
} }
}
this.setState({ this.setState({
mockData, mockData,
infos, infos,
visiable: true, visiable: true,
qs, qs,
gs, gs,
os, os,
}); });
}, })
});
}; };
onCancle = () => { onCancle = () => {
this.setState({ visiable: false }); this.setState({ visiable: false });
......
one_stop_public/App/StatisticsInfo/index.js
浏览文件 @ ba1a5ebc
...@@ -9,6 +9,8 @@ import FormdataWrapper from '../../utils/object-to-formdata-custom'; ...@@ -9,6 +9,8 @@ import FormdataWrapper from '../../utils/object-to-formdata-custom';
import ButtonDiy from '../ButtonDiy/ButtonDiy'; import ButtonDiy from '../ButtonDiy/ButtonDiy';
import { nameSpan, nameSpan3, nameSpan2 } from './config'; import { nameSpan, nameSpan3, nameSpan2 } from './config';
import { getHeaders } from '@/webPublic/zyd_public/utils/utils'; import { getHeaders } from '@/webPublic/zyd_public/utils/utils';
import { getServicesNomal } from '../../Services/services';
import { getExportInfoApi, getStatisticsApi } from '../../Services/apiConfig';
const Option = Select.Option; const Option = Select.Option;
const FormItem = Form.Item; const FormItem = Form.Item;
...@@ -79,37 +81,25 @@ export default class StatisticsInfo extends React.Component { ...@@ -79,37 +81,25 @@ export default class StatisticsInfo extends React.Component {
); );
}; };
open = () => { open = () => {
const { dispatch } = this.props; getServicesNomal(getExportInfoApi, {
dispatch({ objId: THIS.props.objId,
type: 'DataObj/getExportInfo', }).then(infos => {
payload: { const filterXZKeys = this.props.filterXZKeys;
objId: this.props.objId, const mockData = [];
}, const mockXZData = [];
callback: (infos) => { const qs = [];
const filterXZKeys = this.props.filterXZKeys; const gs = [];
const mockData = []; const os = [];
const mockXZData = []; for (var key in infos) {
const qs = []; const x = infos[key];
const gs = []; mockData.push({
const os = []; key: x.field,
for (var key in infos) { title: x.name,
const x = infos[key]; chosen: false,
mockData.push({ hql: x.hql,
key: x.field, });
title: x.name, if (filterXZKeys != null) {
chosen: false, if (filterXZKeys.includes(key)) {
hql: x.hql,
});
if (filterXZKeys != null) {
if (filterXZKeys.includes(key)) {
mockXZData.push({
key: x.field,
title: x.name,
chosen: false,
hql: x.hql,
});
}
} else {
mockXZData.push({ mockXZData.push({
key: x.field, key: x.field,
title: x.name, title: x.name,
...@@ -117,27 +107,33 @@ export default class StatisticsInfo extends React.Component { ...@@ -117,27 +107,33 @@ export default class StatisticsInfo extends React.Component {
hql: x.hql, hql: x.hql,
}); });
} }
if (x.canQuery) { } else {
qs.push(x); mockXZData.push({
} key: x.field,
if (x.canGroup) { title: x.name,
gs.push(x); chosen: false,
} hql: x.hql,
if (x.canOrder) { });
os.push(x);
}
} }
if (x.canQuery) {
this.setState({ qs.push(x);
mockData, }
mockXZData, if (x.canGroup) {
infos, gs.push(x);
visiable: true, }
qs, if (x.canOrder) {
gs, os.push(x);
os, }
}); }
}, this.setState({
mockData,
mockXZData,
infos,
visiable: true,
qs,
gs,
os,
});
}); });
}; };
onCancle = () => { onCancle = () => {
...@@ -184,7 +180,7 @@ export default class StatisticsInfo extends React.Component { ...@@ -184,7 +180,7 @@ export default class StatisticsInfo extends React.Component {
this.setState({ querys, queryVisiable: false, currentQueryKey: null }); this.setState({ querys, queryVisiable: false, currentQueryKey: null });
}; };
finish = () => { finish = () => {
const { dispatch, objId } = this.props; const { objId } = this.props;
const { x, y, z, infos, XxX, currentKey, groups } = this.state; const { x, y, z, infos, XxX, currentKey, groups } = this.state;
if (x == null) { if (x == null) {
...@@ -254,21 +250,17 @@ export default class StatisticsInfo extends React.Component { ...@@ -254,21 +250,17 @@ export default class StatisticsInfo extends React.Component {
ttz = infos[z].hql; ttz = infos[z].hql;
} }
} }
dispatch({ getServicesNomal(getStatisticsApi, {
type: 'DataObj/getStatistics', x: ttx,
payload: { y: tty,
x: ttx, z: ttz,
y: tty, objId,
z: ttz, xXx: XxX,
objId, hql: currentKey && infos[currentKey] ? infos[currentKey].hql : null,
xXx: XxX, querys: JSON.stringify(qqs),
hql: currentKey && infos[currentKey] ? infos[currentKey].hql : null, groups: JSON.stringify(ggs),
querys: JSON.stringify(qqs), }).then(data => {
groups: JSON.stringify(ggs), this.setState({ dataSource: data.dataSource, columns: data.columns });
},
callback: (data) => {
this.setState({ dataSource: data.dataSource, columns: data.columns });
},
}); });
}); });
}; };
...@@ -316,7 +308,7 @@ export default class StatisticsInfo extends React.Component { ...@@ -316,7 +308,7 @@ export default class StatisticsInfo extends React.Component {
} }
export = () => { export = () => {
const { dispatch, objId } = this.props; const { objId } = this.props;
const { x, y, z, infos, XxX, currentKey, groups } = this.state; const { x, y, z, infos, XxX, currentKey, groups } = this.state;
if (x == null) { if (x == null) {
......
one_stop_public/DetailForAudit/DetailSplit.js
浏览文件 @ ba1a5ebc
...@@ -49,6 +49,8 @@ import { ...@@ -49,6 +49,8 @@ import {
} from '@/webPublic/one_stop_public/utils/queryConfig'; } from '@/webPublic/one_stop_public/utils/queryConfig';
import { getIsGui_Jian, isJSON } from '@/webPublic/zyd_public/utils/utils'; import { getIsGui_Jian, isJSON } from '@/webPublic/zyd_public/utils/utils';
import HistoryFormList from '@/webPublic/one_stop_public/DetailForAudit/HistoryFormList'; import HistoryFormList from '@/webPublic/one_stop_public/DetailForAudit/HistoryFormList';
import { getServicesNomal, getUaaServicesNomal } from '../Services/services';
import { getAllApi, getDetailsApi, queryUserSetApi } from '../Services/apiConfig';
@connect() @connect()
class DetailSplit extends Component { class DetailSplit extends Component {
...@@ -176,7 +178,7 @@ class DetailSplit extends Component { ...@@ -176,7 +178,7 @@ class DetailSplit extends Component {
* @function 默认请求 * @function 默认请求
*/ */
getInit = (handleUser) => { getInit = (handleUser) => {
const { dispatch, formPrepareData } = this.props; const { formPrepareData } = this.props;
const id = this.props.history.location.state && this.props.history.location.state.id; const id = this.props.history.location.state && this.props.history.location.state.id;
const code = this.props.history.location.state && this.props.history.location.state.code; const code = this.props.history.location.state && this.props.history.location.state.code;
const queryId = this.props.history.location.query && this.props.history.location.query.id; const queryId = this.props.history.location.query && this.props.history.location.query.id;
...@@ -232,21 +234,17 @@ class DetailSplit extends Component { ...@@ -232,21 +234,17 @@ class DetailSplit extends Component {
}, },
() => { () => {
if (val.isSecond) { if (val.isSecond) {
this.props.dispatch({ getUaaServicesNomal(getAllApi, {}).then(arr => {
type: 'urge/GetMyBtn', this.setState(
payload: {}, {
callback: (arr) => { btnList: arr,
this.setState( radiovalue: val.formLevelId ? val.formLevelId : arr[arr.length - 1].id,
{ },
btnList: arr, () => {
radiovalue: val.formLevelId ? val.formLevelId : arr[arr.length - 1].id, // this.giveMessageTop();
}, },
() => { );
// this.giveMessageTop(); })
},
);
},
});
} else { } else {
// this.giveMessageTop(); // this.giveMessageTop();
} }
...@@ -255,41 +253,32 @@ class DetailSplit extends Component { ...@@ -255,41 +253,32 @@ class DetailSplit extends Component {
}); });
} }
} }
dispatch({ getUaaServicesNomal(getDetailsApi, {
type: 'emailorphone/GetLogo', configKeys: ['isCloseUserDetail', 'isCloseFlowPath', 'isAllPrint', 'closeAutoSign'],
payload: { }).then(val => {
configKeys: ['isCloseUserDetail', 'isCloseFlowPath', 'isAllPrint', 'closeAutoSign'], const closeAutoSign = !!(val[3] && val[3].configValue === 'true');
}, this.setState({
callback: (val) => { isCloseUserDetail: !!(val[0] && val[0].configValue === 'true'),
const closeAutoSign = !!(val[3] && val[3].configValue === 'true'); isAllPrint: !!(val[2] && val[2].configValue === 'true'),
this.setState({ closeAutoSign,
isCloseUserDetail: !!(val[0] && val[0].configValue === 'true'), });
isAllPrint: !!(val[2] && val[2].configValue === 'true'), if (!closeAutoSign) {
closeAutoSign, /**
}); * 获取设置的数据
*/
if (!closeAutoSign) { getServicesNomal(queryUserSetApi, {}).then(val => {
/** this.setState({
* 获取设置的数据 setData: val,
*/
this.props.dispatch({
type: 'UserSetCenterApi/queryUserSet',
payload: {},
callback: (val) => {
this.setState({
setData: val,
});
},
}); });
} });
}
if (val[1]?.configValue) { if (val[1]?.configValue) {
sessionStorage.setItem( sessionStorage.setItem(
'isCloseFlowPath', 'isCloseFlowPath',
val[1]?.configValue === 'true' ? JSON.stringify(true) : JSON.stringify(false), val[1]?.configValue === 'true' ? JSON.stringify(true) : JSON.stringify(false),
); );
} }
},
}); });
if (getToken()) { if (getToken()) {
const user = localStorage.getItem('user'); const user = localStorage.getItem('user');
......
one_stop_public/DetailForAudit/components/Countersign/index.jsx
浏览文件 @ ba1a5ebc
...@@ -6,6 +6,8 @@ import { Modal, Input, Table, Row, Col, Tooltip, Spin, Tag } from 'antd'; ...@@ -6,6 +6,8 @@ import { Modal, Input, Table, Row, Col, Tooltip, Spin, Tag } from 'antd';
import styles from './style.less'; import styles from './style.less';
import { openToast } from '../Notification'; import { openToast } from '../Notification';
import { connect } from 'dva'; import { connect } from 'dva';
import { getUaaServicesNomal } from '../../../Services/services';
import { addSignsApi } from '../../../Services/apiConfig';
const { Search } = Input; const { Search } = Input;
...@@ -126,13 +128,6 @@ export default class Countersign extends Component { ...@@ -126,13 +128,6 @@ export default class Countersign extends Component {
}); });
}; };
getInit = async () => { getInit = async () => {
const {
dispatch,
data: {
addSignSql,
id,
},
} = this.props;
// 用户名列表 // 用户名列表
this.getData(); this.getData();
await this.setState({ await this.setState({
...@@ -166,7 +161,6 @@ export default class Countersign extends Component { ...@@ -166,7 +161,6 @@ export default class Countersign extends Component {
}; };
userPaginationChange = value => { userPaginationChange = value => {
const { dispatch } = this.props;
const { const {
realname, realname,
username, username,
...@@ -183,7 +177,6 @@ export default class Countersign extends Component { ...@@ -183,7 +177,6 @@ export default class Countersign extends Component {
* @param { string } value 用户输入值 * @param { string } value 用户输入值
*/ */
searchNameChange = value => { searchNameChange = value => {
const { dispatch } = this.props;
this.getData({ this.getData({
realname: value, realname: value,
pageNo: 1, pageNo: 1,
...@@ -206,7 +199,6 @@ export default class Countersign extends Component { ...@@ -206,7 +199,6 @@ export default class Countersign extends Component {
* @param { stirng } value 用户输入值 * @param { stirng } value 用户输入值
*/ */
serachStuNoChange = value => { serachStuNoChange = value => {
const { dispatch } = this.props;
this.setState({ this.setState({
username: value, username: value,
}); });
...@@ -234,7 +226,6 @@ export default class Countersign extends Component { ...@@ -234,7 +226,6 @@ export default class Countersign extends Component {
handleOk = e => { handleOk = e => {
const { selectUserData } = this.state; const { selectUserData } = this.state;
const { dispatch } = this.props;
let ary = []; let ary = [];
selectUserData.map(item => { selectUserData.map(item => {
ary.push(item.id); ary.push(item.id);
...@@ -248,21 +239,32 @@ export default class Countersign extends Component { ...@@ -248,21 +239,32 @@ export default class Countersign extends Component {
btnLoading: true, btnLoading: true,
}, },
() => { () => {
dispatch({ getUaaServicesNomal(addSignsApi, {
type: 'countersign/countersignHandle', taskId: this.props.taskId,
payload: { userIds: ary,
taskId: this.props.taskId, }).then(() => {
userIds: ary, openToast('success', '加签成功');
},
callback: () => {
openToast('success', '加签成功');
this.props.getInit(); this.props.getInit();
this.setState({ this.setState({
visible: false, visible: false,
btnLoading: false, btnLoading: false,
}); });
},
}); });
// dispatch({
// type: 'countersign/countersignHandle',
// payload: {
// taskId: this.props.taskId,
// userIds: ary,
// },
// callback: () => {
// openToast('success', '加签成功');
// this.props.getInit();
// this.setState({
// visible: false,
// btnLoading: false,
// });
// },
// });
}, },
); );
}; };
......
one_stop_public/DetailForAudit/components/FlowExamineModal/Image.js
浏览文件 @ ba1a5ebc
...@@ -3,6 +3,8 @@ import Loading from '../loadThree'; ...@@ -3,6 +3,8 @@ import Loading from '../loadThree';
import { Slider, Row, Col } from 'antd'; import { Slider, Row, Col } from 'antd';
import { connect } from 'dva'; import { connect } from 'dva';
import classNames from 'classnames/bind'; import classNames from 'classnames/bind';
import { getUaaServicesNomal } from '../../../Services/services';
import { getDetailsApi } from '../../../Services/apiConfig';
const names = classNames.bind(require('./style.less')); const names = classNames.bind(require('./style.less'));
...@@ -73,17 +75,13 @@ export default class PortalFlowExamineModalImage extends React.Component { ...@@ -73,17 +75,13 @@ export default class PortalFlowExamineModalImage extends React.Component {
}); });
}, },
}); });
this.props.dispatch({ // 获取配置信息
// 获取配置信息 getUaaServicesNomal(getDetailsApi, {
type: 'emailorphone/GetLogo', configKeys: 'IsOldFlow',
payload: { }).then(val => {
configKeys: 'IsOldFlow', this.setState({
}, configValue: val[0].configValue == 'true',
callback: val => { });
this.setState({
configValue: val[0].configValue == 'true',
});
},
}); });
}; };
......
one_stop_public/DetailForAudit/components/trunToModel/index.jsx
浏览文件 @ ba1a5ebc
...@@ -15,6 +15,8 @@ import Recycle from './recycle'; ...@@ -15,6 +15,8 @@ import Recycle from './recycle';
import styles from './style.less'; import styles from './style.less';
import { confirm,openToast } from '../Notification'; import { confirm,openToast } from '../Notification';
import { connect } from 'dva'; import { connect } from 'dva';
import { getUaaServicesNomal } from '../../../Services/services';
import { refuseProcessApi, resetProcessApi, turnsProcessApi } from '../../../Services/apiConfig';
@connect() @connect()
export default class TurnToModel extends Component { export default class TurnToModel extends Component {
constructor(props){ constructor(props){
...@@ -55,39 +57,31 @@ export default class TurnToModel extends Component { ...@@ -55,39 +57,31 @@ export default class TurnToModel extends Component {
if(status === '转办'){ // 发起转办提交处理 if(status === '转办'){ // 发起转办提交处理
const { user } = this.state const { user } = this.state
if(user){ if(user){
dispatch({ getUaaServicesNomal(turnsProcessApi, {
type:'trunTo/turnsProcess', taskIds:[value.taskId],
payload: { reason,
taskIds:[value.taskId], turnsUserCode: user.stuNo
reason, }).then(() => {
turnsUserCode: user.stuNo openToast('success', '成功','当前流程已成功移交')
}, this.props.init()
callback: (val) => { this.setState({
openToast('success', '成功','当前流程已成功移交') loading: false
this.props.init() })
this.setState({
loading: false
})
}
}) })
} else { } else {
openToast('info','错误','请选择移交人员') openToast('info','错误','请选择移交人员')
} }
} else if(status === '回退') { // 发起回退提交处理 } else if(status === '回退') { // 发起回退提交处理
dispatch({ getUaaServicesNomal(refuseProcessApi, {
type: 'trunTo/refuseProcess', taskIds:[value.taskId],
payload: { reason
taskIds:[value.taskId], }).then(() => {
reason openToast('success', '回退','当前流程已成功回退')
}, this.props.init()
callback: (val) => { this.setState({
openToast('success', '回退','当前流程已成功回退') loading: false
this.props.init()
this.setState({
loading: false
})
}
}) })
});
} else { } else {
console.log('缺乏匹配字段提交方法') console.log('缺乏匹配字段提交方法')
} }
...@@ -96,16 +90,12 @@ export default class TurnToModel extends Component { ...@@ -96,16 +90,12 @@ export default class TurnToModel extends Component {
recallConfim = () => { recallConfim = () => {
const { status,dispatch,value } = this.props const { status,dispatch,value } = this.props
confirm('撤回','是否撤回当前转办流程',()=>{ confirm('撤回','是否撤回当前转办流程',()=>{
dispatch({ getUaaServicesNomal(resetProcessApi, {
type:'trunTo/resetProcess', taskIds:[value.taskId],
payload:{ }).then(() => {
taskIds:[value.taskId], openToast('success','成功','该转办流程已成功撤回')
}, this.props.init()
callback:(val) => { });
openToast('success','成功','该转办流程已成功撤回')
this.props.init()
}
})
this.props.handleCancel() this.props.handleCancel()
},()=>{ },()=>{
this.props.handleCancel() this.props.handleCancel()
......
one_stop_public/DetailForAudit/components/trunToModel/recycle/index.jsx
浏览文件 @ ba1a5ebc
...@@ -8,6 +8,8 @@ import React, { Component } from 'react' ...@@ -8,6 +8,8 @@ import React, { Component } from 'react'
import styles from '../style.less'; import styles from '../style.less';
import { Row, Col,Input,Spin } from 'antd'; import { Row, Col,Input,Spin } from 'antd';
import { connect } from 'dva'; import { connect } from 'dva';
import { getUaaServicesNomal } from '../../../../Services/services';
import { getListApi } from '../../../../Services/services';
const { TextArea } = Input; const { TextArea } = Input;
@connect() @connect()
export default class index extends Component { export default class index extends Component {
...@@ -24,18 +26,14 @@ export default class index extends Component { ...@@ -24,18 +26,14 @@ export default class index extends Component {
this.setState({ this.setState({
isLoading: true isLoading: true
}) })
await dispatch({ await getUaaServicesNomal(getListApi, {
type: 'trunTo/detailProcess', taskId:value.taskId,
payload: { }).then(val => {
taskId:value.taskId, this.setState({
}, data:Array.isArray(val)&&val?.length>0?val[val.length-1]:'',
callback: (val) => { isLoading: false,
this.setState({ })
data:Array.isArray(val)&&val?.length>0?val[val.length-1]:'', });
isLoading: false,
})
}
})
} }
/** /**
* 多行文本输入 * 多行文本输入
......
one_stop_public/DetailForAudit/components/trunToModel/trunTo/index.jsx
浏览文件 @ ba1a5ebc
...@@ -9,6 +9,8 @@ import React, { Component } from 'react'; ...@@ -9,6 +9,8 @@ import React, { Component } from 'react';
import { Input, Table, Row, Col, Tooltip, Spin } from 'antd'; import { Input, Table, Row, Col, Tooltip, Spin } from 'antd';
import styles from '../style.less'; import styles from '../style.less';
import { connect } from 'dva'; import { connect } from 'dva';
import { getUaaServicesNomal } from '../../../../Services/services';
import { getListApi } from '../../../../Services/apiConfig';
const { Search } = Input; const { Search } = Input;
const { TextArea } = Input; const { TextArea } = Input;
@connect() @connect()
...@@ -91,16 +93,12 @@ export default class index extends Component { ...@@ -91,16 +93,12 @@ export default class index extends Component {
}); });
}, },
}); });
await dispatch({ await getUaaServicesNomal(getListApi, {
type: 'trunTo/detailProcess', taskId: value.taskId,
payload: { }).then(val => {
taskId: value.taskId, this.setState({
}, userData: Array.isArray(val) && val?.length > 0 ? val[val.length - 1] : '',
callback: val => { });
this.setState({
userData: Array.isArray(val) && val?.length > 0 ? val[val.length - 1] : '',
});
},
}); });
await this.setState({ await this.setState({
isLoading: false, isLoading: false,
......
one_stop_public/DetailForAudit/trunToDetail.jsx
浏览文件 @ ba1a5ebc
...@@ -11,6 +11,8 @@ import SVG from './components/SVG'; ...@@ -11,6 +11,8 @@ import SVG from './components/SVG';
import { Spin, Timeline,Icon } from 'antd'; import { Spin, Timeline,Icon } from 'antd';
import { connect } from 'dva'; import { connect } from 'dva';
import moment from 'moment'; import moment from 'moment';
import { getUaaServicesNomal } from '../Services/services';
import { getListApi } from '../Services/apiConfig';
@connect() @connect()
export default class trunToDetail extends Component { export default class trunToDetail extends Component {
constructor(props){ constructor(props){
...@@ -35,18 +37,12 @@ export default class trunToDetail extends Component { ...@@ -35,18 +37,12 @@ export default class trunToDetail extends Component {
isLoading: true, isLoading: true,
}) })
// 发起请求获取数据 // 发起请求获取数据
dispatch({ getUaaServicesNomal(getListApi, { taskId: item.id }).then(val => {
type: 'trunTo/detailProcess', this.setState({
payload: { isLoading: false,
taskId: item.id, trunToData: val
}, });
callback: (val) => { });
this.setState({
isLoading: false,
trunToData: val
})
}
})
} else { // 为关闭状态清空数据 } else { // 为关闭状态清空数据
this.setState({ this.setState({
trunToData: '' trunToData: ''
......
one_stop_public/ForZydApply/index.js
浏览文件 @ ba1a5ebc
...@@ -9,10 +9,10 @@ import React from 'react'; ...@@ -9,10 +9,10 @@ import React from 'react';
import classNames from 'classnames/bind'; import classNames from 'classnames/bind';
import { connect } from 'dva'; import { connect } from 'dva';
import SponsorForm from './SponsorForm/index'; import SponsorForm from './SponsorForm/index';
import { isJSON } from '@/webPublic/one_stop_public/copy';
import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils'; import { getUrlInfo } from '@/webPublic/one_stop_public/DetailForAudit/utils';
import { setToken } from '@/webPublic/one_stop_public/utils/token'; import { setToken } from '@/webPublic/one_stop_public/utils/token';
import { Button } from 'antd'; import { getUaaServicesNomal } from '../Services/services';
import { getAllApi } from '../Services/apiConfig';
const names = classNames.bind(require('./style.less')); const names = classNames.bind(require('./style.less'));
...@@ -60,15 +60,11 @@ export default class IframeForApply extends React.Component { ...@@ -60,15 +60,11 @@ export default class IframeForApply extends React.Component {
} }
componentDidMount() { componentDidMount() {
this.props.dispatch({ getUaaServicesNomal(getAllApi, {}).then(val => {
type: 'urge/GetMyBtn', this.setState({
payload: {}, btnList: val,
callback: val => { value: val[val.length - 1].id,
this.setState({ });
btnList: val,
value: val[val.length - 1].id,
});
},
}); });
// document.getElementById('root').style.backgroundColor = '#fff'; // document.getElementById('root').style.backgroundColor = '#fff';
} }
......
one_stop_public/Services/apiConfig.js 0 → 100644
浏览文件 @ ba1a5ebc
// 请求地址
const DataObjApi = '/DataObjApi';
const DataColumnApi = "/DataColumnApi";
const SqlManageEntityApi = '/SqlManageEntityApi';
const UnifiedAppFormApi = '/UnifiedAppFormApi';
// formList model层相关api
export const getFormDataPageApi = DataObjApi + '/getFormDataPage'
export const getHeaderListApi = DataColumnApi + '/getHeaderList';
export const getBatchOptionsApi = DataColumnApi + '/getBatchOptions';
export const getFormDataApi = DataObjApi + '/getFormData';
export const deleteFormDataApi = DataObjApi + '/deleteFormData';
export const getDetailByCodeApi = UnifiedAppFormApi + '/getDetailByCode';
export const getDetailApi = DataObjApi + '/getDetail';
export const addFormDataApi = DataObjApi + '/addFormData';
export const getGroupListApi = DataColumnApi + '/getGroupList';
export const getFormDataListApi = DataObjApi + '/getFormDataList';
// DataColumn model层相关api
export const getSqlDataApi = DataColumnApi + '/getSqlData';
export const getSqlOptionsApi = DataColumnApi + '/getSqlOptions';
export const getSqlLabelsApi = DataColumnApi + '/getSqlLabels';
export const getLabelsApi = DataColumnApi + '/getLabels';
export const getOptionsApi = DataColumnApi + '/getOptions';
// SqlManageEntity model层相关api
export const findApi = SqlManageEntityApi + '/find'
// DataObj model层相关api
export const getExportInfoApi = DataObjApi + '/getExportInfo'
export const importExecuteApi = DataObjApi + '/importExecute'
export const importAnalyseApi = DataObjApi + '/importAnalyse'
export const importDataQueryApi = DataObjApi + '/importDataQuery'
export const importProcessApi = DataObjApi + '/importProcess'
export const getStatisticsApi = DataObjApi + '/getStatistics'
export const findByCodeApi = DataObjApi + '/findByCode';
// countersign model层相关api
export const addSignsApi = UnifiedAppFormApi + "/addSigns"
// emailorphone model层相关api
export const getDetailsApi = '/ConfigApi/getDetails'
// UserSetCenterApi model层相关api
export const queryUserSetApi = '/UserSetCenterApi/queryUserSet'
// trunTo model层相关api
export const turnsProcessApi = '/ActCommentApi/turnsProcess'
export const refuseProcessApi = '/ActCommentApi/refuseProcess'
export const resetProcessApi = '/ActCommentApi/resetProcess'
export const getListApi = '/ActCommentApi/getList'
// urge model层相关api
export const getAllApi = '/UnifiedAppFormLevelApi/getAll'
\ No newline at end of file
one_stop_public/Services/services.js 0 → 100644
浏览文件 @ ba1a5ebc
import { apiRequest, uaaRequest } from '../utils/request';
import { importExecuteApi, getFormDataPageApi } from './apiConfig'
// apiRequest
export const getServicesNomal = (apiAddress, params) => {
return apiRequest(apiAddress, params);
};
// uaaRequest
export const getUaaServicesNomal = (apiAddress, params) => {
return uaaRequest(apiAddress, params);
};
export const getFormDataPage = (params) => {
return apiRequest(getFormDataPageApi, params).then((response) => {
if (response) {
return {
list: response.rows,
pagination: {
current: response.pageNo,
pageSize: response.pageSize,
total: response.total,
},
};
}
});
};
export const importExecute = (params) => {
return apiRequest(importExecuteApi, {
...params,
customErrMsg:
'导入的文件中可能存在字段不一致、字段类型不匹配、唯一性字段冲突,请检查或联系系统管理员',// 自定义errMsg
});
};
one_stop_public/libs/formList/TreeList.js
浏览文件 @ ba1a5ebc
...@@ -33,6 +33,19 @@ import FilePreview from '@/webPublic/one_stop_public/filePreview'; ...@@ -33,6 +33,19 @@ import FilePreview from '@/webPublic/one_stop_public/filePreview';
import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import UploadCom from '@/webPublic/one_stop_public/libs/UploadCom'; import UploadCom from '@/webPublic/one_stop_public/libs/UploadCom';
import { getModal, getPopconfirm } from '@/webPublic/one_stop_public/utils/utils'; import { getModal, getPopconfirm } from '@/webPublic/one_stop_public/utils/utils';
import { getServicesNomal } from '../../Services/services';
import {
getFormDataListApi,
getBatchOptionsApi,
getFormDataApi,
deleteFormDataApi,
getDetailByCodeApi,
findByCodeApi,
getDetailApi,
getHeaderListApi,
getGroupListApi,
addFormDataApi,
} from '../../Services/apiConfig';
const Popconfirm = getPopconfirm(); const Popconfirm = getPopconfirm();
const Modal = getModal(); const Modal = getModal();
...@@ -197,58 +210,42 @@ class TreeList extends React.Component { ...@@ -197,58 +210,42 @@ class TreeList extends React.Component {
} }
if (refIds.length > 0) { if (refIds.length > 0) {
dispatch({ getServicesNomal(getBatchOptionsApi, { ids: refIds }).then(options => {
type: 'formList/getBatchOptions', this.setState({ options: { ...this.state.options, ...options } });
payload: { ids: refIds },
callback: (options) => {
this.setState({ options: { ...this.state.options, ...options } });
},
}); });
} }
}; };
getList = (values, callback, isFirst) => { getList = (values, callback, isFirst) => {
const { const { json: { treeParentIdName, ctgFilterSql } } = this.props;
dispatch,
json: { treeParentIdName, ctgFilterSql },
} = this.props;
if (!values) { if (!values) {
values = this.state.formValues; values = this.state.formValues;
} }
getServicesNomal(getFormDataListApi, {
dispatch({ ...values,
type: 'formList/tree', ctgFilterSql: ctgFilterSql,
payload: { parentIdName: treeParentIdName,
...values, dataObjId: this.state.objId,
ctgFilterSql: ctgFilterSql, }).then(res => {
parentIdName: treeParentIdName, callback()
dataObjId: this.state.objId, })
},
callback: callback,
});
}; };
modify = (record) => { modify = (record) => {
// if (this.state.formItem.length < 10) { // if (this.state.formItem.length < 10) {
this.getOptions(); this.getOptions();
getServicesNomal(getFormDataApi, {
this.props.dispatch({ dataObjId: this.state.objId,
type: 'formList/getDetail', key: this.state.primaryKey,
payload: { value: record[this.state.primaryKey],
dataObjId: this.state.objId, isBase: false,
key: this.state.primaryKey, }).then(record2 => {
value: record[this.state.primaryKey], this.setState({
isBase: false, formData: record2,
}, modalVisible: true,
callback: (record2) => { isAdd: false,
this.setState({ isView: false,
formData: record2, });
modalVisible: true,
isAdd: false,
isView: false,
});
},
}); });
}; };
view = (record) => { view = (record) => {
...@@ -284,34 +281,23 @@ class TreeList extends React.Component { ...@@ -284,34 +281,23 @@ class TreeList extends React.Component {
//找出主键 //找出主键
let Keys = {}; let Keys = {};
Keys[this.state.primaryKey] = record[this.state.primaryKey]; Keys[this.state.primaryKey] = record[this.state.primaryKey];
this.props.dispatch({ getServicesNomal(deleteFormDataApi, {
type: 'formList/delete', keys: JSON.stringify(Keys),
payload: { objId: this.state.objId,
keys: JSON.stringify(Keys), }).then(() => {
objId: this.state.objId, this.getPage({ parentId: this.state.parentId }, null, null, (list) => {
}, const treeData = this.refesh(this.state.parentId, list, this.state.treeData);
callback: () => { this.setState({
this.getPage({ parentId: this.state.parentId }, null, null, (list) => { modalVisible: false,
const treeData = this.refesh(this.state.parentId, list, this.state.treeData); treeData,
this.setState({
modalVisible: false,
treeData,
});
}); });
}, });
}); });
}; };
viewProcess = (record) => { viewProcess = (record) => {
const { dispatch } = this.props; getServicesNomal(getDetailByCodeApi, { code: record.process_biz_key }).then(data => {
dispatch({ router.push({ pathname: '/portal/serviceCentre/getdetail', state: { id: data.id } });
type: 'formList/getAppId',
payload: {
code: record.process_biz_key,
},
callback: (data) => {
router.push({ pathname: '/portal/serviceCentre/getdetail', state: { id: data.id } });
},
}); });
}; };
...@@ -335,77 +321,24 @@ class TreeList extends React.Component { ...@@ -335,77 +321,24 @@ class TreeList extends React.Component {
//渲染值 //渲染值
componentDidMount() { componentDidMount() {
const { dispatch, isFormCom, isSelect, callback, valueName } = this.props;
window.addEventListener('resize', this.resize); window.addEventListener('resize', this.resize);
if (this.props.objCode) { if (this.props.objCode) {
const { dispatch, objCode, sql } = this.props; const { objCode } = this.props;
if (objCode == 1 || objCode == '1') { if (objCode == 1 || objCode == '1') {
this.initColumn(); this.initColumn();
} else { } else {
dispatch({ getServicesNomal(findByCodeApi, { objCode: this.props.objCode }).then(dataObj => {
type: 'DataObj/findByCode', this.setState({ objId: dataObj.id, isTable: data.isTable }, () => {
payload: { objCode: this.props.objCode }, this.initColumn();
callback: (dataObj) => { });
this.setState({ objId: dataObj.id, isTable: data.isTable }, () => {
/**
* 2022年10月27日
* 欢哥说这个权限功能没用了 在一站式后台元数据管理-数据授权里面修改 实际已经废弃了
* 问了姚新国也说没用了. 有问题就还原回来
* */
this.initColumn();
// dispatch({
// type: 'DataRight/getUserRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// if (!this.props.rights) {
// this.setState({ rights: data });
// }
// dispatch({
// type: 'DataRight/getUserColumnRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// this.setState({ columnRights: data });
// this.initColumn();
// },
// });
// },
// });
});
},
}); });
} }
} else { } else {
dispatch({ getServicesNomal(getDetailApi, { id: this.state.objId }).then(data => {
type: 'formList/getObjDetail', this.setState({ isTable: data.isTable });
payload: { id: this.state.objId },
callback: (data) => {
this.setState({ isTable: data.isTable });
},
}); });
/** this.initColumn();
* 2022年10月27日
* 欢哥说这个权限功能没用了 在一站式后台元数据管理-数据授权里面修改 实际已经废弃了
* 问了姚新国也说没用了. 有问题就还原回来
* */
this.initColumn();
// dispatch({
// type: 'DataRight/getUserRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// if (!this.props.rights) {
// this.setState({ rights: data });
// }
// dispatch({
// type: 'DataRight/getUserColumnRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// this.setState({ columnRights: data });
// this.initColumn();
// },
// });
// },
// });
} }
} }
...@@ -447,9 +380,7 @@ class TreeList extends React.Component { ...@@ -447,9 +380,7 @@ class TreeList extends React.Component {
} }
initColumn = () => { initColumn = () => {
const { dispatch, isFormCom, isSelect, callback, valueName } = this.props; const { columnRights } = this.state;
const { rights, columnRights } = this.state;
if (this.props.value && this.props.value.columns) { if (this.props.value && this.props.value.columns) {
this.columns = this.props.value.columns; this.columns = this.props.value.columns;
this.getPage(); this.getPage();
...@@ -457,124 +388,112 @@ class TreeList extends React.Component { ...@@ -457,124 +388,112 @@ class TreeList extends React.Component {
} }
if (this.props.objCode == 1 || this.props.objCode == '1') { if (this.props.objCode == 1 || this.props.objCode == '1') {
} else { } else {
dispatch({ getServicesNomal(getHeaderListApi, { dataObjId: this.state.objId }).then(datas => {
type: 'formList/getHead', const querys = [];
payload: { dataObjId: this.state.objId }, const refIds = [];
callback: (datas) => { const groups = {};
const querys = []; if (datas) {
const refIds = []; this.state.formItem = datas;
const groups = {}; let i = 0;
if (datas) {
this.state.formItem = datas; for (let t in datas) {
let i = 0; if (datas[t].isPrimaryKey) this.state.primaryKey = datas[t].name;
if (datas[t].isHidden) {
for (let t in datas) { continue;
if (datas[t].isPrimaryKey) this.state.primaryKey = datas[t].name; }
if (datas[t].isHidden) { let column = {};
continue; column.title = datas[t].title;
} column.dataIndex = datas[t].name;
let column = {}; column.width = datas[t].width;
column.title = datas[t].title; if (i == 0) column.fixed = 'left';
column.dataIndex = datas[t].name;
column.width = datas[t].width; if (columnRights.length > 0 && !columnRights.includes(datas[t].id)) {
if (i == 0) column.fixed = 'left'; continue;
}
if (columnRights.length > 0 && !columnRights.includes(datas[t].id)) { if (data.includes(datas[t].type)) {
continue; column.render = (val) => {
} if (val == null) {
if (data.includes(datas[t].type)) { return val;
column.render = (val) => { }
if (val == null) { if (datas[t].dataFormatStrWeb != null) {
return val; return moment(val).format(datas[t].dataFormatStrWeb);
} } else {
if (datas[t].dataFormatStrWeb != null) { return moment(val).format('YYYY-MM-DD HH:mm:ss');
return moment(val).format(datas[t].dataFormatStrWeb); }
} else { };
return moment(val).format('YYYY-MM-DD HH:mm:ss'); } else if (datas[t].name.indexOf('process_status') > -1) {
} column.render = (val) => (val ? (val === '0' ? '审核通过' : '审核未通过') : null);
}; } else if (datas[t].extendTypeId && datas[t].extendTypeId.indexOf('file') > -1) {
} else if (datas[t].name.indexOf('process_status') > -1) { //特殊处理附件
column.render = (val) => (val ? (val === '0' ? '审核通过' : '审核未通过') : null); column.render = (val) => {
} else if (datas[t].extendTypeId && datas[t].extendTypeId.indexOf('file') > -1) { if (this.isJSON(val)) {
//特殊处理附件 val = JSON.parse(val);
column.render = (val) => { let files = val.files;
if (this.isJSON(val)) { let xx = (
val = JSON.parse(val); <ul>
let files = val.files; {files.map((f, index2) => {
let xx = ( return (
<ul> <li key={index2}>
{files.map((f, index2) => { <FilePreview path={queryFileUrl(f.path)} pathName={f.name} />
return ( </li>
<li key={index2}> );
<FilePreview path={queryFileUrl(f.path)} pathName={f.name} /> })}
</li> </ul>
);
})}
</ul>
);
return xx;
} else {
return val;
}
};
} else {
column.render = (val) =>
val && val.length > 100 ? (
<Tooltip title={val} overlayStyle={{ width: 1000 }}>
<span
style={{
width: column.width || 200,
display: 'block',
wordBreak: 'keep-all',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
{val}
</span>
</Tooltip>
) : (
val
); );
} return xx;
} else {
return val;
}
};
} else {
column.render = (val) =>
val && val.length > 100 ? (
<Tooltip title={val} overlayStyle={{ width: 1000 }}>
<span
style={{
width: column.width || 200,
display: 'block',
wordBreak: 'keep-all',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
{val}
</span>
</Tooltip>
) : (
val
);
}
this.setState({ tableWidth: (datas.length - 1) * 200 }); this.setState({ tableWidth: (datas.length - 1) * 200 });
this.columns.push(column); this.columns.push(column);
if (datas[t].isShowQuery) { if (datas[t].isShowQuery) {
querys.push(datas[t]); querys.push(datas[t]);
if (datas[t].referenceObjId != null) { if (datas[t].referenceObjId != null) {
refIds.push(datas[t].id); refIds.push(datas[t].id);
}
if (datas[t].isGroupQuery != null) {
dispatch({
type: 'formList/getGroupList',
payload: { columnId: datas[t].id },
callback: (gourp) => {
groups[datas[t].id] = gourp;
this.setState({ groups });
},
});
}
} }
i++; if (datas[t].isGroupQuery != null) {
} getServicesNomal(getGroupListApi, { columnId: datas[t].id }).then(gourp => {
if (querys.length > 0) { groups[datas[t].id] = gourp;
this.setState({ querys }); this.setState({ groups });
if (refIds.length > 0) {
dispatch({
type: 'formList/getBatchOptions',
payload: { ids: refIds },
callback: (options) => {
this.setState({ options });
},
}); });
} }
} }
i++;
this.getPage();
} }
}, if (querys.length > 0) {
this.setState({ querys });
if (refIds.length > 0) {
getServicesNomal(getBatchOptionsApi, { ids: refIds }).then(options => {
this.setState({ options });
})
}
}
this.getPage();
}
}); });
} }
}; };
...@@ -584,7 +503,6 @@ class TreeList extends React.Component { ...@@ -584,7 +503,6 @@ class TreeList extends React.Component {
return; return;
} }
const { const {
dispatch,
json: { treeParentIdName }, json: { treeParentIdName },
} = this.props; } = this.props;
const pagination = this.state.data.pagination; const pagination = this.state.data.pagination;
...@@ -616,31 +534,27 @@ class TreeList extends React.Component { ...@@ -616,31 +534,27 @@ class TreeList extends React.Component {
}); });
} }
} else { } else {
dispatch({ getServicesNomal(getFormDataListApi, {
type: 'formList/tree', custom: this.custom,
payload: { ...params,
custom: this.custom, parentIdName: treeParentIdName,
...params, sql: this.sqlBs16,
parentIdName: treeParentIdName, dataObjId: this.state.objId,
sql: this.sqlBs16, }).then((list) => {
dataObjId: this.state.objId, const data = {
}, list: list,
callback: (list) => { pagination: false,
const data = { };
list: list,
pagination: false, if (!this.state.isReady) {
}; this.setState({ data, parentId: params.parentId, isReady: true }, () => {
if (callback) callback(list);
if (!this.state.isReady) { });
this.setState({ data, parentId: params.parentId, isReady: true }, () => { } else {
if (callback) callback(list); this.setState({ data, parentId: params.parentId }, () => {
}); if (callback) callback(list);
} else { });
this.setState({ data, parentId: params.parentId }, () => { }
if (callback) callback(list);
});
}
},
}); });
} }
}; };
...@@ -672,26 +586,21 @@ class TreeList extends React.Component { ...@@ -672,26 +586,21 @@ class TreeList extends React.Component {
...fields, ...fields,
}; };
params[treeParentIdName] = this.state.parentId; params[treeParentIdName] = this.state.parentId;
this.props.dispatch({ getServicesNomal(addFormDataApi, {
type: 'formList/add', params: params,
payload: { objId: this.state.objId,
params: params, isAdd: isAdd,
objId: this.state.objId, isSelf: true,
isAdd: isAdd, isView: false,
isSelf: true, }).then(() => {
isView: false, message.success('操作成功');
}, this.getPage({ parentId: this.state.parentId }, null, null, (list) => {
callback: () => { const treeData = this.refesh(this.state.parentId, list, this.state.treeData);
message.success('操作成功'); this.setState({
modalVisible: false,
this.getPage({ parentId: this.state.parentId }, null, null, (list) => { treeData,
const treeData = this.refesh(this.state.parentId, list, this.state.treeData);
this.setState({
modalVisible: false,
treeData,
});
}); });
}, });
}); });
}; };
...@@ -723,7 +632,6 @@ class TreeList extends React.Component { ...@@ -723,7 +632,6 @@ class TreeList extends React.Component {
}; };
batchDelete = (e) => { batchDelete = (e) => {
const { dispatch } = this.props;
const { selectedRows } = this.state; const { selectedRows } = this.state;
if (!selectedRows) return; if (!selectedRows) return;
...@@ -737,19 +645,15 @@ class TreeList extends React.Component { ...@@ -737,19 +645,15 @@ class TreeList extends React.Component {
Keys[columns[i].name] = selectedRows.map((row) => row[columns[i].name]).join(','); Keys[columns[i].name] = selectedRows.map((row) => row[columns[i].name]).join(',');
} }
} }
this.props.dispatch({ getServicesNomal(deleteFormDataApi, {
type: 'formList/delete', keys: JSON.stringify(Keys),
payload: { objId: this.state.objId,
keys: JSON.stringify(Keys), isSelf: true,
objId: this.state.objId, }).then(() => {
isSelf: true, this.setState({
}, selectedRows: [],
callback: () => { });
this.setState({ this.getPage();
selectedRows: [],
});
this.getPage();
},
}); });
}; };
...@@ -759,7 +663,7 @@ class TreeList extends React.Component { ...@@ -759,7 +663,7 @@ class TreeList extends React.Component {
handleSearch = (e) => { handleSearch = (e) => {
e.preventDefault(); e.preventDefault();
const { dispatch, form } = this.props; const { form } = this.props;
const { formValues } = this.state; const { formValues } = this.state;
...@@ -806,7 +710,7 @@ class TreeList extends React.Component { ...@@ -806,7 +710,7 @@ class TreeList extends React.Component {
this.getPage(params); this.getPage(params);
}; };
handleFormReset = () => { handleFormReset = () => {
const { form, dispatch } = this.props; const { form } = this.props;
form.resetFields(); form.resetFields();
this.setState( this.setState(
{ {
......
one_stop_public/libs/formList/edit.js
浏览文件 @ ba1a5ebc
import React, { Fragment } from 'react'; import React from 'react';
import { Button, Card, Col, DatePicker, Form, Input, InputNumber, message, Row } from 'antd'; import { Col, Form, message, Row } from 'antd';
import { connect } from 'dva'; import { connect } from 'dva';
import PageHeaderWrapper from './PageHeaderWrapper'; import PageHeaderWrapper from './PageHeaderWrapper';
import router from 'umi/router'; import router from 'umi/router';
...@@ -7,6 +7,13 @@ import { getFormArrayConfig } from './config/index'; ...@@ -7,6 +7,13 @@ import { getFormArrayConfig } from './config/index';
import FormArray from '../../App/ButtonDiy/FormArray'; import FormArray from '../../App/ButtonDiy/FormArray';
import ButtonDiy from '../../App/ButtonDiy/ButtonDiy'; import ButtonDiy from '../../App/ButtonDiy/ButtonDiy';
import Shell from './Shell'; import Shell from './Shell';
import { getServicesNomal } from '../../Services/services';
import {
getBatchOptionsApi,
getFormDataApi,
getHeaderListApi,
addFormDataApi,
} from '../../Services/apiConfig';
@connect(({ formEdit, formList, loading }) => ({ @connect(({ formEdit, formList, loading }) => ({
formEdit, formEdit,
...@@ -29,50 +36,37 @@ class FormEdit extends React.Component { ...@@ -29,50 +36,37 @@ class FormEdit extends React.Component {
//渲染值 //渲染值
componentDidMount() { componentDidMount() {
const { dispatch } = this.props;
const { objId, recordKey, recordId } = this.state; const { objId, recordKey, recordId } = this.state;
dispatch({ getServicesNomal(getHeaderListApi, { dataObjId: objId }).then(dates => {
type: 'formList/getHead', if (dates) {
payload: { dataObjId: objId }, this.state.formItem = dates;
callback: (dates) => { const refIds = [];
if (dates) { for (let t in dates) {
this.state.formItem = dates; if (
const refIds = []; dates[t].referenceObjId != null &&
for (let t in dates) { this.state.options[this.state.formItem[t].id + ''] == null
if ( ) {
dates[t].referenceObjId != null && refIds.push(dates[t].id);
this.state.options[this.state.formItem[t].id + ''] == null
) {
refIds.push(dates[t].id);
}
} }
}
if (refIds.length > 0) { if (refIds.length > 0) {
dispatch({ getServicesNomal(getBatchOptionsApi, { ids: refIds }).then(options => {
type: 'formList/getBatchOptions', this.setState({ options });
payload: { ids: refIds }, });
callback: (options) => {
this.setState({ options });
},
});
}
} }
}, }
}); });
//渲染表单字段 //渲染表单字段
if (recordId != null) { if (recordId != null) {
dispatch({ getServicesNomal(getFormDataApi, {
type: 'formList/getDetail', dataObjId: objId,
payload: { key: recordKey,
dataObjId: objId, value: recordId,
key: recordKey, }).then(date => {
value: recordId, if (date) {
}, this.state.formData = date;
callback: (date) => { }
if (date) {
this.state.formData = date;
}
},
}); });
} }
} }
...@@ -85,13 +79,9 @@ class FormEdit extends React.Component { ...@@ -85,13 +79,9 @@ class FormEdit extends React.Component {
isAdd, isAdd,
isSelf: true, isSelf: true,
}; };
this.props.dispatch({ getServicesNomal(addFormDataApi, payload).then(() => {
type: 'formList/add', message.success('操作成功');
payload, router.goBack();
callback: () => {
message.success('操作成功');
router.goBack();
},
}); });
}; };
......
one_stop_public/libs/formList/index.js
浏览文件 @ ba1a5ebc
...@@ -36,6 +36,18 @@ import { getPopconfirm, getModal } from '@/webPublic/one_stop_public/utils/utils ...@@ -36,6 +36,18 @@ import { getPopconfirm, getModal } from '@/webPublic/one_stop_public/utils/utils
import { text, number, date } from '@/webPublic/one_stop_public/libs/formList/config'; import { text, number, date } from '@/webPublic/one_stop_public/libs/formList/config';
import { FormListButtons } from '@/webPublic/one_stop_public/libs/formList/FormListButtons'; import { FormListButtons } from '@/webPublic/one_stop_public/libs/formList/FormListButtons';
import countWidth from '@/webPublic/one_stop_public/libs/formList/countWidth'; import countWidth from '@/webPublic/one_stop_public/libs/formList/countWidth';
import { getFormDataPage, getServicesNomal } from '../../Services/services';
import {
getHeaderListApi,
getBatchOptionsApi,
getFormDataApi,
deleteFormDataApi,
getDetailByCodeApi,
findByCodeApi,
getDetailApi,
addFormDataApi,
getGroupListApi
} from '../../Services/apiConfig';
const FormItem = Form.Item; const FormItem = Form.Item;
const Popconfirm = getPopconfirm(); const Popconfirm = getPopconfirm();
...@@ -119,19 +131,19 @@ const CreateForm = Form.create()((props) => { ...@@ -119,19 +131,19 @@ const CreateForm = Form.create()((props) => {
); );
}); });
@connect(({ // @connect(({
formList, // formList,
DataColumn, // DataColumn,
DataObj // DataObj
}) => ({ // }) => ({
formList, // formList,
DataColumn, // DataColumn,
DataObj, // DataObj,
// loading: loading.models.formList || loading.models.DataColumn || loading.models.DataObj, // // loading: loading.models.formList || loading.models.DataColumn || loading.models.DataObj,
// loading: loading.models.formList, // // loading: loading.models.formList,
// 解决 禅道 28100 查询下拉选择后界面会刷新一次 // // 解决 禅道 28100 查询下拉选择后界面会刷新一次
// https://blog.csdn.net/m0_37148591/article/details/103685339 dva-loading // // https://blog.csdn.net/m0_37148591/article/details/103685339 dva-loading
})) // }))
@Form.create() @Form.create()
class FormList extends React.Component { class FormList extends React.Component {
state = { state = {
...@@ -177,34 +189,26 @@ class FormList extends React.Component { ...@@ -177,34 +189,26 @@ class FormList extends React.Component {
} }
if (refIds.length > 0) { if (refIds.length > 0) {
this.props.dispatch({ getServicesNomal(getBatchOptionsApi, { ids: refIds }).then(options => {
type: 'formList/getBatchOptions', this.setState({ options: { ...this.state.options, ...options } });
payload: { ids: refIds },
callback: (options) => {
this.setState({ options: { ...this.state.options, ...options } });
},
}); });
} }
}; };
modify = (record) => { modify = (record) => {
// if (this.state.formItem.length < 10) { // if (this.state.formItem.length < 10) {
this.getOptions(); this.getOptions();
this.props.dispatch({ getServicesNomal(getFormDataApi, {
type: 'formList/getDetail', dataObjId: this.state.objId,
payload: { key: this.state.primaryKey,
dataObjId: this.state.objId, value: record[this.state.primaryKey],
key: this.state.primaryKey, isBase: false,
value: record[this.state.primaryKey], }).then(record2 => {
isBase: false, this.setState({
}, formData: record2,
callback: (record2) => { modalVisible: true,
this.setState({ isAdd: false,
formData: record2, isView: false,
modalVisible: true, });
isAdd: false,
isView: false,
});
},
}); });
}; };
...@@ -239,33 +243,22 @@ class FormList extends React.Component { ...@@ -239,33 +243,22 @@ class FormList extends React.Component {
//找出主键 //找出主键
let Keys = {}; let Keys = {};
Keys[this.state.primaryKey] = record[this.state.primaryKey]; Keys[this.state.primaryKey] = record[this.state.primaryKey];
this.props.dispatch({ getServicesNomal(deleteFormDataApi, {
type: 'formList/delete', keys: JSON.stringify(Keys),
payload: { objId: this.state.objId,
keys: JSON.stringify(Keys), }).then(res => {
objId: this.state.objId,
},
callback: () => {
this.getPage(); this.getPage();
},
}); });
}; };
viewProcess = (record) => { viewProcess = (record) => {
const { dispatch } = this.props; getServicesNomal(getDetailByCodeApi, { code: record.process_biz_key }).then(data => {
dispatch({ const domainName = sessionStorage.getItem('domainName')
type: 'formList/getAppId', ? sessionStorage.getItem('domainName')
payload: { : '';
code: record.process_biz_key,
},
callback: (data) => {
const domainName = sessionStorage.getItem('domainName')
? sessionStorage.getItem('domainName')
: '';
window.open(domainName + '/portal/serviceCentre/getdetail?id=' + data.id, '_blank'); window.open(domainName + '/portal/serviceCentre/getdetail?id=' + data.id, '_blank');
//router.push({ pathname: '/portal/serviceCentre/getdetail', state: { id: data.id } }); //router.push({ pathname: '/portal/serviceCentre/getdetail', state: { id: data.id } });
},
}); });
}; };
...@@ -289,12 +282,10 @@ class FormList extends React.Component { ...@@ -289,12 +282,10 @@ class FormList extends React.Component {
//渲染值 //渲染值
componentDidMount() { componentDidMount() {
const { dispatch } = this.props;
window.addEventListener('resize', this.resize); window.addEventListener('resize', this.resize);
if (this.props.objCode) { if (this.props.objCode) {
const { const {
dispatch,
objCode, objCode,
sql sql
} = this.props; } = this.props;
...@@ -302,52 +293,21 @@ class FormList extends React.Component { ...@@ -302,52 +293,21 @@ class FormList extends React.Component {
if (Number(objCode) === 1) { if (Number(objCode) === 1) {
this.initColumn(); this.initColumn();
} else { } else {
// console.log('componentDidMount-296'); // DataObj models层中的数据
dispatch({ getServicesNomal(findByCodeApi, { objCode: this.props.objCode }).then(dataObj => {
type: 'DataObj/findByCode', this.setState(
payload: { objCode: this.props.objCode }, {
callback: (dataObj) => { objId: dataObj.id,
this.setState( isTable: dataObj.isTable,
{ },
objId: dataObj.id, () => {
isTable: dataObj.isTable, this.initColumn();
}, })
() => {
this.initColumn();
/**
* 2022年10月27日
* 欢哥说这个权限功能没用了 在一站式后台元数据管理-数据授权里面修改 实际已经废弃了
* 问了姚新国也说没用了. 有问题就还原回来
* */
// dispatch({
// type: 'DataRight/getUserRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// if (!this.props.rights) {
// this.setState({ rights: data });
// }
// dispatch({
// type: 'DataRight/getUserColumnRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// this.setState({ columnRights: data });
// this.initColumn();
// },
// });
// },
// });
},
);
},
}); });
} }
} else { } else {
dispatch({ getServicesNomal(getDetailApi, { id: this.state.objId }).then(data => {
type: 'formList/getObjDetail', this.setState({ isTable: data.isTable });
payload: { id: this.state.objId },
callback: (data) => {
this.setState({ isTable: data.isTable });
},
}); });
/** /**
* 2022年10月27日 * 2022年10月27日
...@@ -355,23 +315,6 @@ class FormList extends React.Component { ...@@ -355,23 +315,6 @@ class FormList extends React.Component {
* 问了姚新国也说没用了 * 问了姚新国也说没用了
* */ * */
this.initColumn(); this.initColumn();
// dispatch({
// type: 'DataRight/getUserRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// if (!this.props.rights) {
// this.setState({ rights: data });
// }
// dispatch({
// type: 'DataRight/getUserColumnRight',
// payload: { objId: this.state.objId },
// callback: (data) => {
// this.setState({ columnRights: data });
// this.initColumn();
// },
// });
// },
// });
} }
} }
...@@ -424,7 +367,6 @@ class FormList extends React.Component { ...@@ -424,7 +367,6 @@ class FormList extends React.Component {
initColumn = () => { initColumn = () => {
const { const {
dispatch,
value, value,
objCode objCode
} = this.props; } = this.props;
...@@ -462,11 +404,8 @@ class FormList extends React.Component { ...@@ -462,11 +404,8 @@ class FormList extends React.Component {
this.getPage(); this.getPage();
return undefined; return undefined;
} }
dispatch({ getServicesNomal(getHeaderListApi, { dataObjId: this.state.objId }).then(datas => {
type: 'formList/getHead', this.state.formItem = datas;
payload: { dataObjId: this.state.objId },
callback: (datas) => {
this.state.formItem = datas;
const querys = []; const querys = [];
const groups = {}; const groups = {};
const refIds = []; const refIds = [];
...@@ -478,13 +417,9 @@ class FormList extends React.Component { ...@@ -478,13 +417,9 @@ class FormList extends React.Component {
refIds.push(datas[t].id); refIds.push(datas[t].id);
} }
if (datas[t].isGroupQuery != null) { if (datas[t].isGroupQuery != null) {
dispatch({ getServicesNomal(getGroupListApi, { columnId: datas[t].id }).then(gourp => {
type: 'formList/getGroupList', groups[datas[t].id] = gourp;
payload: { columnId: datas[t].id }, this.setState({ groups });
callback: (gourp) => {
groups[datas[t].id] = gourp;
this.setState({ groups });
},
}); });
} }
} }
...@@ -492,17 +427,12 @@ class FormList extends React.Component { ...@@ -492,17 +427,12 @@ class FormList extends React.Component {
if (querys.length > 0) { if (querys.length > 0) {
this.setState({ querys }); this.setState({ querys });
if (refIds.length > 0) { if (refIds.length > 0) {
dispatch({ getServicesNomal(getBatchOptionsApi, { ids: refIds }).then(options => {
type: 'formList/getBatchOptions', this.setState({ options });
payload: { ids: refIds },
callback: (options) => {
this.setState({ options });
},
}); });
} }
} }
this.getPage(); this.getPage();
},
}); });
} }
return; return;
...@@ -517,143 +447,131 @@ class FormList extends React.Component { ...@@ -517,143 +447,131 @@ class FormList extends React.Component {
this.getPage(); this.getPage();
return undefined; return undefined;
} }
dispatch({ getServicesNomal(getHeaderListApi, { dataObjId: this.state.objId }).then(datas => {
type: 'formList/getHead', const querys = [];
payload: { dataObjId: this.state.objId }, const refIds = [];
callback: (datas) => { const groups = {};
const querys = []; if (datas) {
const refIds = []; this.state.formItem = datas;
const groups = {}; let i = 0;
if (datas) { let cacheList = [];
this.state.formItem = datas; let cacheChecked = [];
let i = 0; // 表头筛选逻辑
let cacheList = []; datas.map((item) => {
let cacheChecked = []; if (item.name != null) {
// 表头筛选逻辑 cacheList.push({
datas.map((item) => { label: item.title,
if (item.name != null) { value: item.name,
cacheList.push({
label: item.title,
value: item.name,
});
cacheChecked.push(item.name);
}
});
this.checkList = cacheList;
this.setState({
checkedList: cacheChecked,
});
for (let t in datas) {
if (datas[t].isPrimaryKey) this.state.primaryKey = datas[t].name;
if (datas[t].isHidden) {
continue;
}
let column = {};
column.title = datas[t].title;
column.dataIndex = datas[t].name;
column.width = datas[t].width;
if (i == 0) column.fixed = 'left';
if (columnRights.length > 0 && !columnRights.includes(datas[t].id)) {
continue;
}
if (date.includes(datas[t].type)) {
column.render = (val) => {
if (val == null) {
return val;
}
if (datas[t].dataFormatStrWeb != null) {
return moment(val)
.format(datas[t].dataFormatStrWeb);
} else {
return moment(val)
.format('YYYY-MM-DD HH:mm:ss');
}
};
} else if (datas[t].name.indexOf('process_status') > -1) {
column.render = (val) => (val ? (val === '0' ? '审核通过' : '审核未通过') : null);
} else if (datas[t].extendTypeId && datas[t].extendTypeId.indexOf('file') > -1) {
//特殊处理附件
column.render = (val) => {
if (this.isJSON(val)) {
val = JSON.parse(val);
let files = val.files;
let xx = (
<ul>
{files.map((f, index2) => {
return (
<li key={index2}>
<FilePreview path={queryFileUrl(f.path)} pathName={f.name}/>
</li>
);
})}
</ul>
);
return xx;
} else {
return val;
}
};
} else {
column.render = (val) =>
val && val.length > 100 ? (
<Tooltip title={val} overlayStyle={{ width: 1000 }}>
<span
style={{
width: column.width || 200,
display: 'block',
wordBreak: 'keep-all',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
{val}
</span>
</Tooltip>
) : (
val
);
}
this.setState({ tableWidth: (datas.length - 1) * 200 });
this.columns.push(column);
this.setState({
cacheColumns: cloneDeep(this.columns),
}); });
if (datas[t].isShowQuery) { cacheChecked.push(item.name);
querys.push(datas[t]); }
if (datas[t].referenceObjId != null) { });
refIds.push(datas[t].id); this.checkList = cacheList;
this.setState({
checkedList: cacheChecked,
});
for (let t in datas) {
if (datas[t].isPrimaryKey) this.state.primaryKey = datas[t].name;
if (datas[t].isHidden) {
continue;
}
let column = {};
column.title = datas[t].title;
column.dataIndex = datas[t].name;
column.width = datas[t].width;
if (i == 0) column.fixed = 'left';
if (columnRights.length > 0 && !columnRights.includes(datas[t].id)) {
continue;
}
if (date.includes(datas[t].type)) {
column.render = (val) => {
if (val == null) {
return val;
} }
if (datas[t].isGroupQuery != null) { if (datas[t].dataFormatStrWeb != null) {
dispatch({ return moment(val)
type: 'formList/getGroupList', .format(datas[t].dataFormatStrWeb);
payload: { columnId: datas[t].id }, } else {
callback: (gourp) => { return moment(val)
groups[datas[t].id] = gourp; .format('YYYY-MM-DD HH:mm:ss');
this.setState({ groups });
},
});
} }
} };
i++; } else if (datas[t].name.indexOf('process_status') > -1) {
column.render = (val) => (val ? (val === '0' ? '审核通过' : '审核未通过') : null);
} else if (datas[t].extendTypeId && datas[t].extendTypeId.indexOf('file') > -1) {
//特殊处理附件
column.render = (val) => {
if (this.isJSON(val)) {
val = JSON.parse(val);
let files = val.files;
let xx = (
<ul>
{files.map((f, index2) => {
return (
<li key={index2}>
<FilePreview path={queryFileUrl(f.path)} pathName={f.name}/>
</li>
);
})}
</ul>
);
return xx;
} else {
return val;
}
};
} else {
column.render = (val) =>
val && val.length > 100 ? (
<Tooltip title={val} overlayStyle={{ width: 1000 }}>
<span
style={{
width: column.width || 200,
display: 'block',
wordBreak: 'keep-all',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
{val}
</span>
</Tooltip>
) : (
val
);
} }
if (querys.length > 0) {
this.setState({ querys }); this.setState({ tableWidth: (datas.length - 1) * 200 });
if (refIds.length > 0) { this.columns.push(column);
dispatch({ this.setState({
type: 'formList/getBatchOptions', cacheColumns: cloneDeep(this.columns),
payload: { ids: refIds }, });
callback: (options) => { if (datas[t].isShowQuery) {
this.setState({ options }); querys.push(datas[t]);
}, if (datas[t].referenceObjId != null) {
refIds.push(datas[t].id);
}
if (datas[t].isGroupQuery != null) {
getServicesNomal(getGroupListApi, { columnId: datas[t].id }).then(gourp => {
groups[datas[t].id] = gourp;
this.setState({ groups });
}); });
} }
} }
i++;
this.getPage();
} }
}, if (querys.length > 0) {
this.setState({ querys });
if (refIds.length > 0) {
getServicesNomal(getBatchOptionsApi, { ids: refIds }).then(options => {
this.setState({ options });
})
}
}
this.getPage();
}
}); });
} }
}; };
...@@ -664,7 +582,6 @@ class FormList extends React.Component { ...@@ -664,7 +582,6 @@ class FormList extends React.Component {
if (!this.columns || !Array.isArray(this.columns) || this.columns.length === 0) { if (!this.columns || !Array.isArray(this.columns) || this.columns.length === 0) {
return; return;
} }
const { dispatch } = this.props;
const pagination = this.state.data.pagination; const pagination = this.state.data.pagination;
if (params == null) { if (params == null) {
...@@ -705,32 +622,27 @@ class FormList extends React.Component { ...@@ -705,32 +622,27 @@ class FormList extends React.Component {
this.setState({ this.setState({
loading: true, loading: true,
}); });
dispatch({ getFormDataPage({
type: 'formList/fetch', custom: this.custom,
payload: { ...params,
custom: this.custom, sql: this.sqlBs16,
...params, dataObjId: this.state.objId,
}).then(data => {
sql: this.sqlBs16, this.setState({
dataObjId: this.state.objId, loading: false,
}, });
callback: (data) => { if (!this.state.isReady) {
this.setState({ this.setState({
loading: false, data,
isReady: true,
selectedRows: [], // 姚鑫国说的 调了分页接口以后需要 把这个选择的行数据 清空
}); });
if (!this.state.isReady) { } else {
this.setState({ this.setState({
data, data,
isReady: true, selectedRows: [], // 姚鑫国说的 调了分页接口以后需要 把这个选择的行数据 清空
selectedRows: [], // 姚鑫国说的 调了分页接口以后需要 把这个选择的行数据 清空 });
}); }
} else {
this.setState({
data,
selectedRows: [], // 姚鑫国说的 调了分页接口以后需要 把这个选择的行数据 清空
});
}
},
}); });
} }
}; };
...@@ -759,22 +671,18 @@ class FormList extends React.Component { ...@@ -759,22 +671,18 @@ class FormList extends React.Component {
let params = { let params = {
...fields, ...fields,
}; };
this.props.dispatch({ getServicesNomal(addFormDataApi, {
type: 'formList/add', params: params,
payload: { objId: this.state.objId,
params: params, isAdd: isAdd,
objId: this.state.objId, isSelf: true,
isAdd: isAdd, isView: false,
isSelf: true, }).then(() => {
isView: false, message.success('操作成功');
}, this.setState({
callback: () => { modalVisible: false,
message.success('操作成功'); });
this.setState({ this.getPage();
modalVisible: false,
});
this.getPage();
},
}); });
}; };
...@@ -813,7 +721,6 @@ class FormList extends React.Component { ...@@ -813,7 +721,6 @@ class FormList extends React.Component {
}; };
batchDelete = (e) => { batchDelete = (e) => {
const { dispatch } = this.props;
const { selectedRows } = this.state; const { selectedRows } = this.state;
if (!selectedRows) return; if (!selectedRows) return;
...@@ -828,19 +735,15 @@ class FormList extends React.Component { ...@@ -828,19 +735,15 @@ class FormList extends React.Component {
.join(','); .join(',');
} }
} }
this.props.dispatch({ getServicesNomal(deleteFormDataApi, {
type: 'formList/delete', keys: JSON.stringify(Keys),
payload: { objId: this.state.objId,
keys: JSON.stringify(Keys), // isSelf: true,
objId: this.state.objId, }).then(res => {
// isSelf: true, this.setState({
}, selectedRows: [],
callback: () => { });
this.setState({ this.getPage();
selectedRows: [],
});
this.getPage();
},
}); });
}; };
...@@ -851,7 +754,6 @@ class FormList extends React.Component { ...@@ -851,7 +754,6 @@ class FormList extends React.Component {
e.preventDefault(); e.preventDefault();
const { const {
dispatch,
form form
} = this.props; } = this.props;
...@@ -894,7 +796,7 @@ class FormList extends React.Component { ...@@ -894,7 +796,7 @@ class FormList extends React.Component {
}; };
hanldeHighSearch = (e) => { hanldeHighSearch = (e) => {
const pagination = this.props.formList.data.pagination; const pagination = this.state.data.pagination;
let params = { let params = {
pageNo: pagination.current ? pagination.current : 1, pageNo: pagination.current ? pagination.current : 1,
pageSize: pagination.pageSize ? pagination.pageSize : this.props.pageSize || 10, pageSize: pagination.pageSize ? pagination.pageSize : this.props.pageSize || 10,
...@@ -904,10 +806,7 @@ class FormList extends React.Component { ...@@ -904,10 +806,7 @@ class FormList extends React.Component {
this.getPage(params); this.getPage(params);
}; };
handleFormReset = () => { handleFormReset = () => {
const { const { form } = this.props;
form,
dispatch
} = this.props;
form.resetFields(); form.resetFields();
this.setState( this.setState(
{ {
......
one_stop_public/tableCompon/index.jsx
浏览文件 @ ba1a5ebc
...@@ -84,7 +84,16 @@ import giveVarcharRules from '@/webPublic/one_stop_public/tableCompon/Split_Inde ...@@ -84,7 +84,16 @@ import giveVarcharRules from '@/webPublic/one_stop_public/tableCompon/Split_Inde
import getPopupContainer from '@/webPublic/one_stop_public/tableCompon/Split_Index/getPopupContainer'; import getPopupContainer from '@/webPublic/one_stop_public/tableCompon/Split_Index/getPopupContainer';
import StepDiy from '@/webPublic/one_stop_public/tableCompon/Split_Index/StepDiy'; import StepDiy from '@/webPublic/one_stop_public/tableCompon/Split_Index/StepDiy';
import EchartsDiy from '@/webPublic/one_stop_public/tableCompon/Split_Index/EchartsDiy'; import EchartsDiy from '@/webPublic/one_stop_public/tableCompon/Split_Index/EchartsDiy';
import { getServicesNomal } from '../Services/services';
import {
getHeaderListApi,
getSqlDataApi,
findApi,
getSqlOptionsApi,
getSqlLabelsApi,
getLabelsApi,
getOptionsApi,
} from '../Services/apiConfig';
/** /**
* 日期组件antd3.x有bug 详情见禅道 27152 毕业跟踪调查管理 毕业时间改为年级筛选 * 日期组件antd3.x有bug 详情见禅道 27152 毕业跟踪调查管理 毕业时间改为年级筛选
*/ */
...@@ -447,123 +456,106 @@ export default class TableCom extends Component { ...@@ -447,123 +456,106 @@ export default class TableCom extends Component {
preHandle(allValues); preHandle(allValues);
allValues = JSON.stringify(allValues); allValues = JSON.stringify(allValues);
if (json.comName === 'TableSelect') { if (json.comName === 'TableSelect') {
const { dispatch } = this.props;
const { sqlKey, optionType } = json; const { sqlKey, optionType } = json;
if (optionType === 'sql') { if (optionType === 'sql') {
dispatch({ getServicesNomal(findApi, { sqlKey }).then(sqlModel => {
type: 'SqlManageEntity/find', this.setState({ sqlModel });
payload: { sqlKey }, if (sqlModel.dataObjId) {
callback: sqlModel => { getServicesNomal(getHeaderListApi, { dataObjId: sqlModel.dataObjId }).then(datas => {
this.setState({ sqlModel }); if (datas) {
if (sqlModel.dataObjId) {
dispatch({
type: 'formList/getHead',
payload: { dataObjId: sqlModel.dataObjId },
callback: datas => {
if (datas) {
const columns = [];
for (var i = 0; i < datas.length; i++) {
if (i <= json.colNum ? json.colNum : 10) {
let column = {};
column.title = datas[i].title;
column.dataIndex = datas[i].name;
if (
['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)
) {
column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
}
column = giveRender(column);
columns.push(column);
} else {
break;
}
}
this.setState({ columns });
}
},
});
} else {
const cols = sqlModel.cols;
if (cols != null || cols.length > 0) {
const columns = []; const columns = [];
const cll = JSON.parse(cols); for (var i = 0; i < datas.length; i++) {
for (var k in cll) { if (i <= json.colNum ? json.colNum : 10) {
let column = {}; let column = {};
column.title = cll[k].title; column.title = datas[i].title;
column.dataIndex = cll[k].name; column.dataIndex = datas[i].name;
if (['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(cll[k].type)) { if (
var ff = 'YYYY-MM-DD HH:mm:ss'; ['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)
switch (cll[k].type) { ) {
case 'DATE': column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
ff = 'YYYY-MM-DD';
break;
case 'YEAR':
ff = 'YYYY';
break;
case 'TIME':
ff = 'HH:mm:ss';
break;
} }
column.render = val => moment(parseInt(val)).format(ff); column = giveRender(column);
}
if (cll[k].isQuery) {
column = {
...this.getColumnSearchProps(cll[k].name, cll[k].title),
...column,
};
}
column = giveRender(column); columns.push(column);
} else {
columns.push(column); break;
}
} }
this.setState({ columns }); this.setState({ columns });
} }
dispatch({ });
type: 'DataColumn/getSqlData', } else {
payload: { const cols = sqlModel.cols;
sqlKey, if (cols != null || cols.length > 0) {
allValues, const columns = [];
isCache: this.otherProps?.isCache || false, const cll = JSON.parse(cols);
}, for (var k in cll) {
callback: list => { let column = {};
const x = { column.title = cll[k].title;
list: list, column.dataIndex = cll[k].name;
pagination: false, if (['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(cll[k].type)) {
var ff = 'YYYY-MM-DD HH:mm:ss';
switch (cll[k].type) {
case 'DATE':
ff = 'YYYY-MM-DD';
break;
case 'YEAR':
ff = 'YYYY';
break;
case 'TIME':
ff = 'HH:mm:ss';
break;
}
column.render = val => moment(parseInt(val)).format(ff);
}
if (cll[k].isQuery) {
column = {
...this.getColumnSearchProps(cll[k].name, cll[k].title),
...column,
}; };
this.setState({ dataSource: x }); }
},
}); column = giveRender(column);
columns.push(column);
}
this.setState({ columns });
} }
}, getServicesNomal(getSqlDataApi, {
sqlKey,
allValues,
isCache: this.otherProps?.isCache || false,
}).then(list => {
const x = {
list: list,
pagination: false,
};
this.setState({ dataSource: x });
});
}
}); });
} else if (optionType == 'reference' && dataColumn.referenceObjId) { } else if (optionType == 'reference' && dataColumn.referenceObjId) {
dispatch({ getServicesNomal(getHeaderListApi, { dataObjId: dataColumn.referenceObjId }).then(datas => {
type: 'formList/getHead', if (datas) {
payload: { dataObjId: dataColumn.referenceObjId }, const columns = [];
callback: datas => { for (var i = 0; i < datas.length; i++) {
if (datas) { if (i <= json.colNum ? json.colNum : 10) {
const columns = []; let column = {};
for (var i = 0; i < datas.length; i++) { column.title = datas[i].title;
if (i <= json.colNum ? json.colNum : 10) { column.dataIndex = datas[i].name;
let column = {}; if (['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)) {
column.title = datas[i].title; column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
column.dataIndex = datas[i].name;
if (['DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'YEAR'].includes(datas[i].type)) {
column.render = val => moment(val).format('YYYY-MM-DD HH:mm:ss');
}
column = giveRender(column);
columns.push(column);
} else {
break;
} }
column = giveRender(column);
columns.push(column);
} else {
break;
} }
this.setState({ columns });
} }
}, this.setState({ columns });
}
}); });
} }
} }
...@@ -1270,14 +1262,9 @@ export default class TableCom extends Component { ...@@ -1270,14 +1262,9 @@ export default class TableCom extends Component {
return; return;
} }
if (json.sqlKey != null && json.sqlKey !== '') { if (json.sqlKey != null && json.sqlKey !== '') {
const { dispatch } = this.props; getServicesNomal(findApi, { sqlKey: json.sqlKey }).then(res => {
dispatch({ this.setState({ sqlContent: res.sql });
type: 'SqlManageEntity/find', })
payload: { sqlKey: json.sqlKey },
callback: res => {
this.setState({ sqlContent: res.sql });
},
});
} }
const bindObj = this.getColumn('c1'); const bindObj = this.getColumn('c1');
...@@ -1325,7 +1312,6 @@ export default class TableCom extends Component { ...@@ -1325,7 +1312,6 @@ export default class TableCom extends Component {
// 解决禅道bug 28017 // 解决禅道bug 28017
allValues = {}; allValues = {};
} }
const { dispatch } = this.props;
if (init != null && Object.keys(init).length > 0) { if (init != null && Object.keys(init).length > 0) {
const params = { const params = {
sqlKey, sqlKey,
...@@ -1341,35 +1327,30 @@ export default class TableCom extends Component { ...@@ -1341,35 +1327,30 @@ export default class TableCom extends Component {
getServicesNomal(getSqlOptionsApi, params).then(options => {
dispatch({ const optionsx = [];
type: 'DataColumn/getSqlOptions', let base52 = dataColumn.base52;
payload: params, let vl = this.props.form.getFieldsValue()[base52];
callback: options => { let isExist = false;
const optionsx = []; for (var i = 0; i < options.length; i++) {
let base52 = dataColumn.base52; if (vl == options[i][valueName] && !isExist) {
let vl = this.props.form.getFieldsValue()[base52]; isExist = true;
let isExist = false;
for (var i = 0; i < options.length; i++) {
if (vl == options[i][valueName] && !isExist) {
isExist = true;
}
optionsx.push({
label: options[i][labelName],
value: options[i][valueName],
});
}
if (!isExist && vl != null && options.length > 0) {
// console.log(base52, 1144);
this.props.form.setFieldsValue({ [base52]: null });
} }
this.setState({ optionsx.push({
getSqlOptionsCache, label: options[i][labelName],
options: optionsx, value: options[i][valueName],
selectDis: false,
}); });
}, }
if (!isExist && vl != null && options.length > 0) {
// console.log(base52, 1144);
this.props.form.setFieldsValue({ [base52]: null });
}
this.setState({
getSqlOptionsCache,
options: optionsx,
selectDis: false,
});
}); });
} 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;
...@@ -1394,17 +1375,13 @@ export default class TableCom extends Component { ...@@ -1394,17 +1375,13 @@ export default class TableCom extends Component {
} }
if (obj[base52]) { if (obj[base52]) {
dispatch({ getServicesNomal(getSqlLabelsApi, params).then(labels => {
type: 'DataColumn/getSqlLabels', this.setState({
payload: params, getSqlOptionsCache,
callback: labels => { labels,
this.setState({ selectDis: false,
getSqlOptionsCache, });
labels, })
selectDis: false,
});
},
});
} }
} else { } else {
const params = { const params = {
...@@ -1423,42 +1400,35 @@ export default class TableCom extends Component { ...@@ -1423,42 +1400,35 @@ export default class TableCom extends Component {
// if(params.sqlKey === 'KFRvOyGdyvU'){ // if(params.sqlKey === 'KFRvOyGdyvU'){
// console.log(params); // console.log(params);
// } // }
dispatch({ getServicesNomal(getSqlOptionsApi, params).then(options => {
type: 'DataColumn/getSqlOptions', let base52 = dataColumn.base52;
payload: params, let vl = this.props.form.getFieldsValue()[base52];
callback: options => { const optionsx = [];
// console.log(options); let isExist = false;
let base52 = dataColumn.base52; for (var i = 0; i < options.length; i++) {
let vl = this.props.form.getFieldsValue()[base52]; if (vl == options[i][valueName] && !isExist) {
const optionsx = []; isExist = true;
let isExist = false;
for (var i = 0; i < options.length; i++) {
if (vl == options[i][valueName] && !isExist) {
isExist = true;
}
if (Array.isArray(vl) && vl.length && vl.includes(options[i][valueName]) && !isExist) {
// 钟是志 2021年9月28日 16:19:46 解决 checkbox 多选负值不上的bug
isExist = true;
}
optionsx.push({
label: options[i][labelName],
value: options[i][valueName],
});
} }
if (Array.isArray(vl) && vl.length && vl.includes(options[i][valueName]) && !isExist) {
if (!isExist && vl != null && options.length > 0) { // 钟是志 2021年9月28日 16:19:46 解决 checkbox 多选负值不上的bug
//console.log("isExist",optionsx,vl,isExist) isExist = true;
// console.log(1186, base52);
this.props.form.setFieldsValue({ [base52]: null });
} }
optionsx.push({
this.setState({ label: options[i][labelName],
getSqlOptionsCache, value: options[i][valueName],
options: optionsx,
selectDis: false,
}); });
}, }
});
if (!isExist && vl != null && options.length > 0) {
this.props.form.setFieldsValue({ [base52]: null });
}
this.setState({
getSqlOptionsCache,
options: optionsx,
selectDis: false,
});
})
} }
}; };
changeEnum = (obj, dataColumn, options) => { changeEnum = (obj, dataColumn, options) => {
...@@ -1499,18 +1469,14 @@ export default class TableCom extends Component { ...@@ -1499,18 +1469,14 @@ export default class TableCom extends Component {
} }
}; };
fetchData = (obj, dataColumn, init, filterSql, allValues) => { fetchData = (obj, dataColumn, init, filterSql, allValues) => {
const { dispatch } = this.props;
if (init != null && Object.keys(init).length > 0) { if (init != null && Object.keys(init).length > 0) {
dispatch({ getServicesNomal(getSqlOptionsApi, {
type: 'DataColumn/getOptions', id: dataColumn.id,
payload: { filterSql,
id: dataColumn.id, allValues,
filterSql, }).then(options => {
allValues, const optionsx = [];
},
callback: options => {
const optionsx = [];
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
optionsx.push({ optionsx.push({
label: options[i][dataColumn.referenceNameName], label: options[i][dataColumn.referenceNameName],
...@@ -1521,36 +1487,28 @@ export default class TableCom extends Component { ...@@ -1521,36 +1487,28 @@ export default class TableCom extends Component {
options: optionsx, options: optionsx,
selectDis: false, 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({ getServicesNomal(getLabelsApi, {
type: 'DataColumn/getLabels',
payload: {
id: dataColumn.id,
values: obj[dataColumn.base52],
filterSql,
allValues,
},
callback: labels => {
this.setState({
labels,
selectDis: false,
});
},
});
}
} else {
dispatch({
type: 'DataColumn/getOptions',
payload: {
id: dataColumn.id, id: dataColumn.id,
values: obj[dataColumn.base52],
filterSql, filterSql,
allValues, allValues,
}, }).then(labels => {
callback: options => { this.setState({
const optionsx = []; labels,
selectDis: false,
});
});
}
} else {
getServicesNomal(getOptionsApi, {
id: dataColumn.id,
filterSql,
allValues,
}).then(options => {
const optionsx = [];
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
optionsx.push({ optionsx.push({
label: options[i][dataColumn.referenceNameName], label: options[i][dataColumn.referenceNameName],
...@@ -1561,7 +1519,6 @@ export default class TableCom extends Component { ...@@ -1561,7 +1519,6 @@ export default class TableCom extends Component {
options: optionsx, options: optionsx,
selectDis: false, selectDis: false,
}); });
},
}); });
} }
}; };
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论