提交 ae8993bb authored 作者: 钟是志's avatar 钟是志

Merge remote-tracking branch 'origin/master'

...@@ -41,6 +41,7 @@ export default class TableList extends React.Component { ...@@ -41,6 +41,7 @@ export default class TableList extends React.Component {
} }
render() { render() {
console.log(this.state)
const {isTree,json} = this.props const {isTree,json} = this.props
return isTree? return isTree?
<TreeList <TreeList
......
...@@ -379,11 +379,13 @@ class FormList extends React.Component { ...@@ -379,11 +379,13 @@ class FormList extends React.Component {
componentWillReceiveProps(nextProps){ componentWillReceiveProps(nextProps){
const b = nextProps.value||{} const b = nextProps.value||{}
const a = this.props.value||{} const a = this.props.value||{}
const jsonb=JSON.stringify(b)
const jsona=JSON.stringify(a)
if(JSON.stringify(a)!=JSON.stringify(b)){ this.custom=Base16Encode(jsonb)
if(jsona!=jsonb){
const params = { const params = {
pageNo: 1, pageNo: 1,
pageSize: this.props.pageSize||10, pageSize: this.props.pageSize||10,
...@@ -393,7 +395,7 @@ class FormList extends React.Component { ...@@ -393,7 +395,7 @@ class FormList extends React.Component {
this.columns=nextProps.value.columns this.columns=nextProps.value.columns
} }
this.custom=Base16Encode(JSON.stringify(b))
if( nextProps.value.getPage){ if( nextProps.value.getPage){
this.getPage(params,null,nextProps.value.getPage); this.getPage(params,null,nextProps.value.getPage);
}else{ }else{
......
...@@ -117,6 +117,19 @@ const myCollect = { ...@@ -117,6 +117,19 @@ const myCollect = {
callback(response) callback(response)
} }
}, },
*getCodeDetail({ payload, callback }, { call, put }) {
const response = yield call(uaaRequest, "/UnifiedServicePatternApi/getDetail", {
...payload,
});
yield put({
type: 'initAffair',
payload: response,
});
if (response == null) { yield put({ type: 'nom' }); return }
if (callback) {
callback(response)
}
}
}, },
reducers: { reducers: {
initHome(state, action) { initHome(state, action) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论