complete the basic customisation feature

This commit is contained in:
Jiaxin Peng
2023-11-16 01:00:52 +00:00
parent b978cf7e01
commit 6ce689ba96
8 changed files with 86 additions and 86 deletions

View File

@@ -17,6 +17,7 @@ export interface PluginSettings {
CustomButton: boolean; CustomButton: boolean;
notionAPICustom: string; notionAPICustom: string;
databaseIDCustom: string; databaseIDCustom: string;
[key: string]: any;
} }
export const DEFAULT_SETTINGS: PluginSettings = { export const DEFAULT_SETTINGS: PluginSettings = {
@@ -53,9 +54,9 @@ export class ObsidianSettingTab extends PluginSettingTab {
// General Settings // General Settings
containerEl.createEl('h2', { text: i18nConfig.GeneralSetting }); containerEl.createEl('h2', { text: i18nConfig.GeneralSetting });
this.createSettingEl(containerEl, i18nConfig.BannerUrl, i18nConfig.BannerUrlDesc, 'text', i18nConfig.BannerUrlText, this.plugin.settings.bannerUrl) this.createSettingEl(containerEl, i18nConfig.BannerUrl, i18nConfig.BannerUrlDesc, 'text', i18nConfig.BannerUrlText, this.plugin.settings.bannerUrl, 'bannerUrl')
this.createSettingEl(containerEl, i18nConfig.NotionUser, i18nConfig.NotionUserDesc, 'text', i18nConfig.NotionUserText, this.plugin.settings.notionUser) this.createSettingEl(containerEl, i18nConfig.NotionUser, i18nConfig.NotionUserDesc, 'text', i18nConfig.NotionUserText, this.plugin.settings.notionUser, 'notionUser')
containerEl.createEl('h2', { text: i18nConfig.NotionNextSettingHeader }) containerEl.createEl('h2', { text: i18nConfig.NotionNextSettingHeader })
@@ -80,10 +81,10 @@ export class ObsidianSettingTab extends PluginSettingTab {
const notionAPINextEl = this.createStyleDiv('api-next', this.plugin.settings.NextButton) const notionAPINextEl = this.createStyleDiv('api-next', this.plugin.settings.NextButton)
this.createSettingEl(notionAPINextEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.plugin.settings.notionAPINext) this.createSettingEl(notionAPINextEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.plugin.settings.notionAPINext, 'notionAPINext')
const databaseIDNextEl = this.createStyleDiv('databaseID-next', this.plugin.settings.NextButton) const databaseIDNextEl = this.createStyleDiv('databaseID-next', this.plugin.settings.NextButton)
this.createSettingEl(databaseIDNextEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.plugin.settings.databaseIDNext) this.createSettingEl(databaseIDNextEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.plugin.settings.databaseIDNext, 'databaseIDNext')
// General Database Settings // General Database Settings
@@ -129,7 +130,7 @@ export class ObsidianSettingTab extends PluginSettingTab {
); );
const CustomNameEl = this.createStyleDiv('custom-name', this.plugin.settings.CustomTitleButton); const CustomNameEl = this.createStyleDiv('custom-name', this.plugin.settings.CustomTitleButton);
this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.plugin.settings.CustomTitleName) this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.plugin.settings.CustomTitleName, 'CustomTitleName')
// new Setting(containerEl) // new Setting(containerEl)
// .setName("Convert tags(optional)") // .setName("Convert tags(optional)")
@@ -144,11 +145,11 @@ export class ObsidianSettingTab extends PluginSettingTab {
// ); // );
const notionAPIGeneralEl = this.createStyleDiv('api-general', this.plugin.settings.GeneralButton); const notionAPIGeneralEl = this.createStyleDiv('api-general', this.plugin.settings.GeneralButton);
this.createSettingEl(notionAPIGeneralEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.plugin.settings.notionAPIGeneral) this.createSettingEl(notionAPIGeneralEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.plugin.settings.notionAPIGeneral, 'notionAPIGeneral')
const databaseIDGeneralEl = this.createStyleDiv('databaseID-general', this.plugin.settings.GeneralButton); const databaseIDGeneralEl = this.createStyleDiv('databaseID-general', this.plugin.settings.GeneralButton);
this.createSettingEl(databaseIDGeneralEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.plugin.settings.databaseIDGeneral) this.createSettingEl(databaseIDGeneralEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.plugin.settings.databaseIDGeneral, 'databaseIDGeneral')
// Custom Database Settings // Custom Database Settings
@@ -182,7 +183,7 @@ export class ObsidianSettingTab extends PluginSettingTab {
} }
// function to add one setting element in the setting tab. // function to add one setting element in the setting tab.
private createSettingEl(containerEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any) { private createSettingEl(containerEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, settingsKey: string) {
if (type === 'password') { if (type === 'password') {
return new Setting(containerEl) return new Setting(containerEl)
.setName(name) .setName(name)
@@ -193,11 +194,10 @@ export class ObsidianSettingTab extends PluginSettingTab {
.setPlaceholder(placeholder) .setPlaceholder(placeholder)
.setValue(holderValue) .setValue(holderValue)
.onChange(async (value) => { .onChange(async (value) => {
holderValue = value; this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
await this.plugin.saveSettings(); await this.plugin.saveSettings();
}) })
} });
)
} else if (type === 'toggle') { } else if (type === 'toggle') {
return new Setting(containerEl) return new Setting(containerEl)
.setName(name) .setName(name)
@@ -206,13 +206,13 @@ export class ObsidianSettingTab extends PluginSettingTab {
toggle toggle
.setValue(holderValue) .setValue(holderValue)
.onChange(async (value) => { .onChange(async (value) => {
holderValue = value; this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
await this.plugin.saveSettings(); await this.plugin.saveSettings();
await this.plugin.commands.updateCommand(); await this.plugin.commands.updateCommand();
}) })
) );
} else if (type === 'text') { } else if (type === 'text') {
new Setting(containerEl) return new Setting(containerEl)
.setName(name) .setName(name)
.setDesc(desc) .setDesc(desc)
.addText((text) => .addText((text) =>
@@ -220,11 +220,11 @@ export class ObsidianSettingTab extends PluginSettingTab {
.setPlaceholder(placeholder) .setPlaceholder(placeholder)
.setValue(holderValue) .setValue(holderValue)
.onChange(async (value) => { .onChange(async (value) => {
holderValue = value; this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
await this.plugin.saveSettings(); await this.plugin.saveSettings();
await this.plugin.commands.updateCommand(); await this.plugin.commands.updateCommand();
}) })
) );
} }
} }

View File

@@ -22,7 +22,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
title: string, title: string,
cover: string, cover: string,
tags: string[], tags: string[],
childArr: any childArr: any,
) { ) {
await this.deletePage(notionID) await this.deletePage(notionID)
@@ -50,7 +50,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
database_id: this.plugin.settings.databaseIDGeneral, database_id: this.plugin.settings.databaseIDGeneral,
}, },
properties: { properties: {
title: { [this.plugin.settings.CustomTitleButton ? this.plugin.settings.CustomTitleName : 'title']: {
title: [ title: [
{ {
text: { text: {