提交 2651542b authored 作者: 徐立's avatar 徐立

完成中台函数库 数据断言函数封装

上级 cc906839
...@@ -358,7 +358,15 @@ export default class ZdyTable extends Component { ...@@ -358,7 +358,15 @@ export default class ZdyTable extends Component {
render() { render() {
let { width, isBorder, sqlData, mapData, defaultBinds, defaultValues, items, init, currentFormKey, isEdit, datas, isReady, formConfig, formCode, formId } = this.state let { width, isBorder, sqlData, mapData, defaultBinds, defaultValues, items, init, currentFormKey, isEdit, datas, isReady, formConfig, formCode, formId } = this.state
let { border, get, obj, index, fatherCode,routerState } = this.props let {
border,
get,
obj,
index,
fatherCode,
routerState, // 场景设计器共享路由参数
messageData, // 场景设计器共享变量参数 设计器监听到参数发生变化后会重新渲染组件
} = this.props
let style = {} let style = {}
if (formConfig.style != null) { if (formConfig.style != null) {
try { try {
...@@ -481,6 +489,7 @@ export default class ZdyTable extends Component { ...@@ -481,6 +489,7 @@ export default class ZdyTable extends Component {
sqlData={sqlData} sqlData={sqlData}
defaultValues={defaultValues || {}} // 接口中的默认值 defaultValues={defaultValues || {}} // 接口中的默认值
routerState={routerState} // 兼容表单设计器路由传参 routerState={routerState} // 兼容表单设计器路由传参
messageData={messageData} // 场景设计器共享变量参数
/> />
</td> </td>
} }
...@@ -561,7 +570,9 @@ export default class ZdyTable extends Component { ...@@ -561,7 +570,9 @@ export default class ZdyTable extends Component {
json={ary.content} json={ary.content}
uuid={ary.uuid} uuid={ary.uuid}
routerState={routerState} // 兼容表单设计器路由传参 routerState={routerState} // 兼容表单设计器路由传参
defaultValues={defaultValues || {}} /></> defaultValues={defaultValues || {}}
messageData={messageData} // 场景设计器共享变量参数
/></>
}) })
} }
</div>) </div>)
......
...@@ -1127,7 +1127,7 @@ export default class tableCom extends Component { ...@@ -1127,7 +1127,7 @@ export default class tableCom extends Component {
}) })
}) })
try { try {
var fun1 = new Function("obj","init", "defaultValues", "env", "index", "fatherCode", "utils","$","routerState", fun); var fun1 = new Function("obj","init", "defaultValues", "env", "index", "fatherCode", "utils","$","routerState",'shareData', fun);
let obj let obj
if(!this.props.isEdit&&this.props.fatherCode){ if(!this.props.isEdit&&this.props.fatherCode){
...@@ -1150,7 +1150,8 @@ export default class tableCom extends Component { ...@@ -1150,7 +1150,8 @@ export default class tableCom extends Component {
render:this.getRender,base64:getBase64, render:this.getRender,base64:getBase64,
}, },
functionObj, functionObj,
this.props.routerState this.props.routerState,
this.props.messageData,
) )
if (base52) { if (base52) {
......
...@@ -33,12 +33,11 @@ var canReportError = true; ...@@ -33,12 +33,11 @@ var canReportError = true;
const errorHandler = error => { const errorHandler = error => {
const { response } = error; const { response } = error;
console.log(process.env.NODE_ENV)
if (response && response.status) { if (response && response.status) {
const errorText = codeMessage[response.status] || response.statusText; const errorText = codeMessage[response.status] || response.statusText;
notification.error({ notification.error({
message: `请求错误`, message: `请求错误`,
description: process.env.NODE_ENV==='development'? errorText:'', description:errorText,
}); });
if (response.status === 401) { if (response.status === 401) {
...@@ -98,14 +97,14 @@ export const request = (url, data, options = {}) => { ...@@ -98,14 +97,14 @@ export const request = (url, data, options = {}) => {
if (response.errCode || response.errMsg) { if (response.errCode || response.errMsg) {
notification.error({ notification.error({
message: `请求错误`, message: `请求错误`,
description: process.env.NODE_ENV==='development'? response.errMsg:'', description:response.errMsg,
}); });
return; return;
} }
if (response.errcode) { if (response.errcode) {
notification.error({ notification.error({
message: `请求错误`, message: `请求错误`,
description: process.env.NODE_ENV==='development'? response.errmsg:'', description: response.errmsg,
}); });
return; return;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论