From b7f4d87236676dcc5bfc6514166011d7b0bb672c Mon Sep 17 00:00:00 2001 From: Simba Date: Sat, 2 Jan 2021 17:08:18 +0800 Subject: [PATCH] add scan immediately. --- src/common/model/global/i18n/LangEn.ts | 3 +- src/common/model/global/i18n/LangZh.ts | 3 +- src/common/model/preference/Preference.ts | 7 +++++ src/pages/preference/Index.tsx | 37 +++++++++++++++++++---- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/common/model/global/i18n/LangEn.ts b/src/common/model/global/i18n/LangEn.ts index 688283a..c1d3186 100644 --- a/src/common/model/global/i18n/LangEn.ts +++ b/src/common/model/global/i18n/LangEn.ts @@ -222,7 +222,8 @@ let LangEn = { scanPerHour: "Scan every hour", scanCustom: "Scan custom", chooseUsers: "Fuzzy search users", - chooseUsersValidate: "choose one more user" + chooseUsersValidate: "choose one more user", + scanLoading: "waiting..." }, share: { shareDetail: "Share Detail", diff --git a/src/common/model/global/i18n/LangZh.ts b/src/common/model/global/i18n/LangZh.ts index 71544f2..34fbfab 100644 --- a/src/common/model/global/i18n/LangZh.ts +++ b/src/common/model/global/i18n/LangZh.ts @@ -222,7 +222,8 @@ let LangZh = { scanPerHour: "每小时", scanCustom: "自定义", chooseUsers: "模糊搜索用户", - chooseUsersValidate: "请选择至少一个用户" + chooseUsersValidate: "请选择至少一个用户", + scanLoading: "扫描中,请稍后..." }, share: { shareDetail: "分享详情", diff --git a/src/common/model/preference/Preference.ts b/src/common/model/preference/Preference.ts index bd370e5..56e7f39 100644 --- a/src/common/model/preference/Preference.ts +++ b/src/common/model/preference/Preference.ts @@ -12,6 +12,7 @@ export default class Preference extends BaseEntity { static URL_API_SYSTEM_CLEANUP = '/api/preference/system/cleanup' static URL_API_PREFERENCE_EDIT_PREVIEW_CONFIG = '/api/preference/edit/preview/config' static URL_API_PREFERENCE_EDIT_SCAN = '/api/preference/edit/scan/config' + static URL_API_PREFERENCE_SCAN_ONCE = '/api/preference/scan/once' //网站名称 @@ -141,6 +142,12 @@ export default class Preference extends BaseEntity { } + httpScanOnce(successCallback?: any, errorCallback?: any, finalCallback?: any) { + this.httpGet(Preference.URL_API_PREFERENCE_SCAN_ONCE, {}, function (response: any) { + SafeUtil.safeCallback(successCallback)(response); + }, errorCallback, finalCallback) + } + } diff --git a/src/pages/preference/Index.tsx b/src/pages/preference/Index.tsx index abb5e71..583df42 100644 --- a/src/pages/preference/Index.tsx +++ b/src/pages/preference/Index.tsx @@ -5,8 +5,12 @@ import TankComponent from "../../common/component/TankComponent"; import User from "../../common/model/user/User"; import Moon from "../../common/model/global/Moon"; import TankTitle from "../widget/TankTitle"; -import { Button, Divider, Empty, Tag, Tooltip } from "antd"; -import { EditOutlined, ThunderboltOutlined } from "@ant-design/icons"; +import { Button, Divider, Empty, Tag, Tooltip, message } from "antd"; +import { + EditOutlined, + ThunderboltOutlined, + ScanOutlined, +} from "@ant-design/icons"; import InfoCell from "../widget/InfoCell"; import Preference from "../../common/model/preference/Preference"; import TankContentCard from "../widget/TankContentCard"; @@ -65,6 +69,17 @@ export default class Index extends TankComponent { ); } + immediateScan() { + const hide = message.loading(Lang.t("preference.scanLoading"), 0); + this.preference.httpSaveScan( + () => { + message.success(Lang.t("operationSuccess")); + }, + null, + hide + ); + } + render() { const { previewConfig: { previewEngines }, @@ -198,11 +213,21 @@ export default class Index extends TankComponent {

{Lang.t("preference.scan")}

- - - + + + +
{scanConfig.enable ? (