diff --git a/www/scripts/controllers/settings-controller.js b/www/scripts/controllers/settings-controller.js index 83c4f51..d3586d1 100644 --- a/www/scripts/controllers/settings-controller.js +++ b/www/scripts/controllers/settings-controller.js @@ -18,9 +18,12 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ $scope.key = ''; $scope.url = ''; $scope.quickUrl = {}; + $scope.loading = false; + $scope.href = ""; $scope.changeForm = async function (index) { console.log("changeForm = ", index); + $scope.href = ""; $scope.form = $scope.form.map(() => false); $scope.form[index] = true; if (index == 0 || index == 1 || index == 4) { @@ -113,8 +116,13 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ } $scope.exportBookmark = async function () { + $scope.loading = true; let fileName = await get('bookmarkBackup'); - $window.open(`${document.location.origin}/api/bookmarkDownload?fileName=${fileName}`, '_blank'); + $timeout(() => { + $scope.href = `${document.location.origin}/api/bookmarkDownload?fileName=${fileName}`; + $scope.loading = false; + $window.open($scope.href, '_blank'); + }) } setTimeout(function () { diff --git a/www/views/settings.html b/www/views/settings.html index 3461b1b..563a1c9 100644 --- a/www/views/settings.html +++ b/www/views/settings.html @@ -61,7 +61,7 @@

上传浏览器书签到系统

-
点我上传
+
点我上传

注意事项

1、导入的方法是将浏览器里面收藏的网站导出HTML文件。然后将导出的HTML文件点击上面的Upload按钮上传到服务器。目前只测试过谷歌浏览器跟IE浏览器的书签导入。但是因为浏览器的标签是可以支持互相导入的,我觉得应该是没问题的。如果不成功,可以先将其他浏览器的书签导入谷歌浏览器再导出。

@@ -72,7 +72,8 @@

6、注意:从浏览器导入进系统的书签,没有浏览器目录的树形结构,在浏览器没有目录的标签,统统转入系统未分类目录下面。

导出为浏览器书签

- + +

如果没有自动下载,请点击此{{href}}进行下载,十分钟有效!若已下载,则此下载链接无效!

为什么要做个网络书签

@@ -116,11 +117,11 @@
- +
- +
@@ -132,20 +133,20 @@ - + - +
快捷键快捷键 网站地址操作操作
{{key}} - + {{value}} - +