Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2023-03-19 23:30:39 +08:00
commit 7ad5cdd067
31 changed files with 155 additions and 249 deletions

View file

@ -11,7 +11,6 @@ import {confirmDialog} from "../../dialog/confirmDialog";
import {getThemeMode, setInlineStyle} from "../../util/assets";
import {fetchPost} from "../../util/fetch";
import {Dialog} from "../../dialog";
import {lockFile} from "../../dialog/processSystem";
import {pathPosix} from "../../util/pathName";
import {replaceLocalPath} from "../../editor/rename";
import {setStorageVal} from "../util/compatibility";
@ -468,11 +467,6 @@ const getExportPath = (option: { type: string, id: string }, removeAssets?: bool
fetchPost("/api/block/getBlockInfo", {
id: option.id
}, (response) => {
if (response.code === 2) {
// 文件被锁定
lockFile(response.data);
return;
}
if (response.code === 3) {
showMessage(response.msg);
return;