obsidian-plugin/ljcoder2015_obsidian-excel
1
0
Fork 0
mirror of https://github.com/ljcoder2015/obsidian-excel.git synced 2026-07-22 08:30:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: app 全局变量改成 plugin.app

Browse source
This commit is contained in:
雷军 2023-09-22 10:27:34 +08:00
parent 77c92ea976
commit dbd7ab460f
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifest.json
View file

@ -1,7 +1,7 @@
{
"id": "excel",
"name": "Excel",
"version": "1.3.2",
"version": "1.3.3",
"minAppVersion": "0.15.0",
"description": "Create spreadsheets and easily embed them in Markdown",
"author": "ljcoder",

2
src/ExcelView.ts
View file

@ -54,7 +54,7 @@ export class ExcelView extends TextFileView {
setViewData(data: string, clear: boolean): void {
this.data = data;
app.workspace.onLayoutReady(async () => {
this.app.workspace.onLayoutReady(async () => {
// console.log('setViewData')
await this.refresh();
});

1
src/MarkdownPostProcessor.ts
View file

@ -7,7 +7,6 @@ import {
import ExcelPlugin from "./main";
import Spreadsheet from "x-data-spreadsheet";
import { getExcelData, getExcelAreaData } from "./utils/DataUtils";
import { text } from "stream/consumers";
let plugin: ExcelPlugin;
let vault: Vault;

15
src/utils/ObsidianUtils.ts
View file

@ -2,11 +2,12 @@ import ExcelPlugin from "src/main";
import { WorkspaceLeaf } from "obsidian";
const getLeafLoc = (
plugin: ExcelPlugin,
leaf: WorkspaceLeaf
): ["main" | "popout" | "left" | "right" | "hover", any] => {
//@ts-ignore
const leafId = leaf.id;
const layout = app.workspace.getLayout();
const layout = plugin.app.workspace.getLayout();
const getLeaves = (l: any) =>
l.children
.filter((c: any) => c.type !== "leaf")
@ -47,12 +48,12 @@ export const getNewOrAdjacentLeaf = (
plugin: ExcelPlugin,
leaf: WorkspaceLeaf
): WorkspaceLeaf | null => {
const [leafLoc, mainLeavesIds] = getLeafLoc(leaf);
const [leafLoc, mainLeavesIds] = getLeafLoc(plugin, leaf);
const getMostRecentOrAvailableLeafInMainWorkspace = (
inDifferentTabGroup?: boolean
): WorkspaceLeaf | null => {
let mainLeaf = app.workspace.getMostRecentLeaf();
let mainLeaf = plugin.app.workspace.getMostRecentLeaf();
if (
mainLeaf &&
mainLeaf !== leaf &&
@ -64,7 +65,7 @@ export const getNewOrAdjacentLeaf = (
//Iterate all leaves in the main workspace and find the first one that is not the originating leaf
mainLeaf = null;
mainLeavesIds.forEach((id: any) => {
const l = app.workspace.getLeafById(id);
const l = plugin.app.workspace.getLeafById(id);
if (
mainLeaf ||
!l.view?.navigation ||
@ -83,7 +84,7 @@ export const getNewOrAdjacentLeaf = (
) {
//1.2 - Reuse leaf if it is adjacent
const ml = getMostRecentOrAvailableLeafInMainWorkspace(true);
return ml ?? app.workspace.createLeafBySplit(leaf); //app.workspace.getLeaf(true);
return ml ?? plugin.app.workspace.createLeafBySplit(leaf); //app.workspace.getLeaf(true);
}
// //3
@ -106,7 +107,7 @@ export const getNewOrAdjacentLeaf = (
//4
if (leafLoc === "popout") {
const popoutLeaves = new Set<WorkspaceLeaf>();
app.workspace.iterateAllLeaves((l) => {
plugin.app.workspace.iterateAllLeaves((l) => {
if (
l !== leaf &&
l.view.navigation &&
@ -117,7 +118,7 @@ export const getNewOrAdjacentLeaf = (
}
});
if (popoutLeaves.size === 0) {
return app.workspace.createLeafBySplit(leaf);
return plugin.app.workspace.createLeafBySplit(leaf);
}
return Array.from(popoutLeaves)[0];
}