mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-02-16 20:18:06 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
d78eb52085
5 changed files with 161 additions and 90 deletions
|
|
@ -26,7 +26,6 @@ import {isTouchDevice} from "../../util/functions";
|
|||
import {App} from "../../index";
|
||||
import {refreshFileTree} from "../../dialog/processSystem";
|
||||
import {hideTooltip, showTooltip} from "../../dialog/tooltip";
|
||||
import * as dayjs from "dayjs";
|
||||
|
||||
export class Files extends Model {
|
||||
public element: HTMLElement;
|
||||
|
|
@ -325,8 +324,7 @@ export class Files extends Model {
|
|||
});
|
||||
} else if (type === "addLocal") {
|
||||
fetchPost("/api/filetree/moveLocalShorthands", {
|
||||
"notebook": notebookId,
|
||||
"path": dayjs().format("YYYY-MM-DD HH:mm:ss")
|
||||
"notebook": notebookId
|
||||
});
|
||||
this.element.querySelectorAll('[data-type="addLocal"]').forEach(item => {
|
||||
item.remove();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
import {
|
||||
hasClosestByClassName,
|
||||
hasClosestByTag,
|
||||
hasTopClosestByTag
|
||||
} from "../../protyle/util/hasClosest";
|
||||
import {hasClosestByClassName, hasClosestByTag, hasTopClosestByTag} from "../../protyle/util/hasClosest";
|
||||
import {escapeHtml} from "../../util/escape";
|
||||
import {Model} from "../../layout/Model";
|
||||
import {Constants} from "../../constants";
|
||||
|
|
@ -20,7 +16,6 @@ import {MenuItem} from "../../menus/Menu";
|
|||
import {App} from "../../index";
|
||||
import {refreshFileTree} from "../../dialog/processSystem";
|
||||
import {setStorageVal} from "../../protyle/util/compatibility";
|
||||
import * as dayjs from "dayjs";
|
||||
|
||||
export class MobileFiles extends Model {
|
||||
public element: HTMLElement;
|
||||
|
|
@ -220,8 +215,7 @@ export class MobileFiles extends Model {
|
|||
window.siyuan.menus.menu.fullscreen("bottom");
|
||||
} else if (type === "addLocal") {
|
||||
fetchPost("/api/filetree/moveLocalShorthands", {
|
||||
"notebook": notebookId,
|
||||
"path": dayjs().format("YYYY-MM-DD HH:mm:ss")
|
||||
"notebook": notebookId
|
||||
});
|
||||
this.element.querySelectorAll('[data-type="addLocal"]').forEach(item => {
|
||||
item.remove();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue