解决首页table加载动画的问题
This commit is contained in:
parent
bbf822bb82
commit
b3a908e0fa
|
|
@ -273,9 +273,11 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
$scope.loadBusy = true;
|
$scope.loadBusy = true;
|
||||||
|
if (params.showStyle == 'table') {
|
||||||
|
$('.js-table-bookmarks').transition('hide');
|
||||||
|
}
|
||||||
bookmarkService.getBookmarks(params)
|
bookmarkService.getBookmarks(params)
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
$scope.loadBusy = false;
|
|
||||||
if (params.showStyle != 'navigate') {
|
if (params.showStyle != 'navigate') {
|
||||||
$scope.bookmarkData = data;
|
$scope.bookmarkData = data;
|
||||||
$scope.totalPages = Math.ceil(data.totalItems / perPageItems);
|
$scope.totalPages = Math.ceil(data.totalItems / perPageItems);
|
||||||
|
|
@ -308,14 +310,16 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
|
||||||
toastr.info('您还没有书签,请点击菜单栏的添加按钮进行添加', "提示");
|
toastr.info('您还没有书签,请点击菜单栏的添加按钮进行添加', "提示");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pubSubService.publish('Common.menuActive', {
|
pubSubService.publish('Common.menuActive', {
|
||||||
login: true,
|
login: true,
|
||||||
index: 0
|
index: 0
|
||||||
});
|
});
|
||||||
if (!($scope.forbidTransition && $scope.forbidTransition == true)) {
|
if (!$scope.forbidTransition) {
|
||||||
$scope.forbidTransition = false;
|
$scope.forbidTransition = false;
|
||||||
transition();
|
transition();
|
||||||
}
|
}
|
||||||
|
$scope.loadBusy = false;
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log('getBookmarks err', err);
|
console.log('getBookmarks err', err);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue