${window.siyuan.languages.openSyncTip1}
@@ -360,14 +162,6 @@ ${passwordHTML}
+
${window.siyuan.languages.cloudBackup}
${window.siyuan.languages.cloudBackupTip}
@@ -390,9 +183,6 @@ ${passwordHTML}
return;
}
renderCloudBackup();
- repos.element.querySelector("#updatePassword").addEventListener("click", () => {
- setE2eePassword();
- });
const switchElement = repos.element.querySelector("#reposCloudSyncSwitch") as HTMLInputElement;
switchElement.addEventListener("change", () => {
if (switchElement.checked && window.siyuan.config.sync.cloudName === "") {
@@ -420,36 +210,6 @@ ${passwordHTML}
}
});
});
- const useDataRepoElement = repos.element.querySelector("#useDataRepo") as HTMLInputElement;
- useDataRepoElement.addEventListener("change", () => {
- fetchPost("/api/sync/setSyncUseDataRepo", {enabled: useDataRepoElement.checked}, (response) => {
- if (response.code === 1) {
- showMessage(response.msg);
- useDataRepoElement.checked = false;
- } else {
- window.siyuan.config.sync.useDataRepo = useDataRepoElement.checked;
- const reposBackupElement = repos.element.querySelector("#reposBackup") as HTMLElement;
- const reposPasswordElement = repos.element.querySelector("#updatePassword").parentElement as HTMLElement;
- if (useDataRepoElement.checked) {
- reposBackupElement.classList.add("fn__none");
- reposBackupElement.nextElementSibling.classList.remove("fn__none");
- if (window.siyuan.config.e2eePasswd === "") {
- reposPasswordElement.classList.add("fn__none");
- } else {
- reposPasswordElement.nextElementSibling.classList.add("fn__none");
- }
- } else {
- reposBackupElement.classList.remove("fn__none");
- reposBackupElement.nextElementSibling.classList.add("fn__none");
- if (window.siyuan.config.e2eePasswd === "") {
- reposPasswordElement.classList.remove("fn__none");
- } else {
- reposPasswordElement.nextElementSibling.classList.remove("fn__none");
- }
- }
- }
- });
- });
const loadingElement = repos.element.querySelector("#reposLoading") as HTMLElement;
loadingElement.style.width = repos.element.clientWidth + "px";
loadingElement.style.height = repos.element.clientHeight + "px";
@@ -460,57 +220,12 @@ ${passwordHTML}
const type = target.getAttribute("data-type");
if (type) {
switch (type) {
- case "more":
- repos.element.querySelector("#reposBackup").lastElementChild.classList.toggle("fn__none");
- break;
case "config":
- if (!needPassword()) {
- if (syncConfigElement.classList.contains("fn__none")) {
- getCloudList();
- syncConfigElement.classList.remove("fn__none");
- } else {
- syncConfigElement.classList.add("fn__none");
- }
- }
- break;
- case "cloudDownloadRecover":
- if (!needPassword()) {
- confirmDialog(window.siyuan.languages.downloadCloud, window.siyuan.languages.downloadCloudTip, () => {
- fetchPost("/api/backup/downloadCloudBackup", {}, () => {
- fetchPost("/api/backup/recoverLocalBackup", {}, () => {
- setTimeout(() => {
- /// #if !MOBILE
- exportLayout(false, () => {
- exitSiYuan();
- });
- /// #else
- window.location.reload();
- /// #endif
- }, 7000);
- return;
- });
- });
- });
- }
- break;
- case "cloudRemove":
- if (!needPassword()) {
- confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.confirmDelete + "?", () => {
- fetchPost("/api/backup/removeCloudBackup", {}, () => {
- renderCloudBackup();
- });
- });
- }
- break;
- case "localBackupUpload":
- if (!needPassword()) {
- confirmDialog(window.siyuan.languages.backupUpload, window.siyuan.languages.account3Tip, () => {
- fetchPost("/api/backup/createLocalBackup", {}, () => {
- fetchPost("/api/backup/uploadLocalBackup", {}, () => {
- renderCloudBackup();
- });
- });
- });
+ if (syncConfigElement.classList.contains("fn__none")) {
+ getCloudList();
+ syncConfigElement.classList.remove("fn__none");
+ } else {
+ syncConfigElement.classList.add("fn__none");
}
break;
case "addCloud":
diff --git a/app/src/config/search.ts b/app/src/config/search.ts
index bb63c4dbc..40e21f01a 100644
--- a/app/src/config/search.ts
+++ b/app/src/config/search.ts
@@ -53,9 +53,8 @@ export const initConfigSearch = (element: HTMLElement) => {
.concat(Object.keys(Constants.SIYUAN_KEYMAP.editor.table))),
// 云端
- getLang(["sync", "cloudSpace", "backup", "cdn", "total", "cloudBackup", "downloadRecover", "backupUpload",
- "downloadCloud", "downloadCloudTip", "account3Tip", "updatePath", "cloudSync",
- "changeE2EEPasswd", "e2eePasswdTip", "changeE2EEPasswdTip", "e2eePasswd", "setPasswd", "syncTip", "reposTip", "openSyncTip1", "openSyncTip2", "downloadRecover1", "backupUpload1", "deleteCloudBackup", "cloudSyncDir"]),
+ getLang(["sync", "cloudSpace", "backup", "cdn", "total", "cloudBackup", "updatePath", "cloudSync",
+ "syncTip", "reposTip", "openSyncTip1", "openSyncTip2", "cloudSyncDir"]),
// 账号
getLang(["accountTip", "accountName", "password", "captcha", "forgetPassword", "login", "register", "twoFactorCaptcha",
diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts
index dd785fbc0..d98a74478 100644
--- a/app/src/layout/util.ts
+++ b/app/src/layout/util.ts
@@ -410,7 +410,7 @@ export const resizeTabs = () => {
if (item.editor && item.editor.protyle && item.element.parentElement) {
hideElements(["gutter"], item.editor.protyle);
setTimeout(() => {
- // .layout .fn__flex-shrink {transition: width .3s ease;} 时需要再次计算 padding
+ // .layout .fn__flex-shrink {width .15s cubic-bezier(0, 0, .2, 1) 0ms} 时需要再次计算 padding
setPadding(item.editor.protyle);
if (typeof echarts !== "undefined") {
item.editor.protyle.wysiwyg.element.querySelectorAll('[data-subtype="echarts"], [data-subtype="mindmap"]').forEach((chartItem: HTMLElement) => {
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 43356f2cb..aa5367c1e 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -261,8 +261,6 @@ declare interface IConfig {
repo: {
key: string
},
- e2eePasswd: string
- e2eePasswdMode: number
sync: {
enabled: boolean
mode: number
@@ -270,7 +268,6 @@ declare interface IConfig {
stat: string
interval: number
cloudName: string
- useDataRepo: boolean
},
lang: string
api: {