Commitf4a6efd

authored

Merge branch 'zhangchunlin:master' into master

2 parents387fa4f +c55212a commitf4a6efdCopy full SHA for f4a6efd

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,9 @@`
`196`	`196`	`if(data.code==200){`
`197`	`197`	`vararr=data["[]"]`
`198`	`198`	`for(vari=0;i<arr.length;i++){`
`199`		`-arr[i]=arr[i][thisp.table.model_name]`
	`199`	`+varo=JSON.parse(JSON.stringify(arr[i][thisp.table.model_name]))`
	`200`	`+o._fields=JSON.parse(JSON.stringify(arr[i]))`
	`201`	`+arr[i]=o`
`200`	`202`	`}`
`201`	`203`
`202`	`204`	`if(!thisp.tcolumns_init){`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`"table",`
`6`	`6`	`"id",`
`7`	`7`	`"hook_init",`
`8`		`-"hook_ajax_params"`
	`8`	`+"hook_ajax_params",`
	`9`	`+"hook_ajax_post_result"`
	`10`	`+`
`9`	`11`	`],`
`10`	`12`	template:`<div>
`11`	`13`	`<Spin size="large" fix v-if="loading"></Spin>`
`@@ -111,12 +113,19 @@`
`111`	`113`	`title:'success update #'+thisp.row.id+' in table '+thisp.table.model_name,`
`112`	`114`	`desc:data.msg`
`113`	`115`	`})`
	`116`	`+if(thisp.hook_ajax_post_result){`
	`117`	`+thisp.hook_ajax_post_result(true,params,thisp.row_saved)`
	`118`	`+}`
`114`	`119`	`}`
`115`	`120`	`else{`
`116`	`121`	`thisp.$Notice.error({`
`117`	`122`	`title:'error when update #'+thisp.row.id+' in table '+thisp.table.model_name,`
`118`	`123`	`desc:data.msg`
`119`	`124`	`})`
	`125`	`+if(thisp.hook_ajax_post_result){`
	`126`	`+thisp.hook_ajax_post_result(false,params,thisp.row_saved)`
	`127`	`+}`
	`128`	`+`
`120`	`129`	`}`
`121`	`130`	`}`
`122`	`131`	`})`

Comments

(0)