change tags titleicon and summary to optional function in next database

add the customisation function

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 env:
     PLUGIN_NAME: share-to-notionnext # Change this to match the id of your plugin.
-
+    CHANGELOG_FILENAME: CHANGELOG.md
 jobs:
     build:
         name: release
@@ -22,11 +22,11 @@ jobs:
 
             #            - name: Generate changelog
             #              id: changelog
-#              uses: release-changelog/action@v1.0.0
+            #              uses: saadmk11/changelog-ci@v1.1.2
             #              with:
-#                  repo-token: ${{ secrets.REPO_ACCESS_TOKEN }}
-#                  version: ${{ github.ref }}
-#                  file: CHANGELOG.md
+            #                  github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
+            #                  release_version: ${{ github.ref }}
+            #                  changelog_filename: CHANGELOG.md
 
             -   name: Build
                 id: build
@@ -48,6 +48,7 @@ jobs:
                 with:
                     tag_name: ${{ github.ref }}
                     release_name: ${{ github.ref }}
+                    body_path: ${{ env.CHANGELOG_FILENAME }}
                     draft: false
                     prerelease: false
 

CHANGELOG.md

@@ -1,18 +1,5 @@
-# Changelog v2.1.0
+- Update NotionNext function that 
+  - `tags`, `titleicon`, `slug` and `summary` are now optional. You can remove them from the frontmatter if you don't need them.
 
-## Feature
-
-- add confirmation interface for deleting a database
-- 增加删除数据库的确认界面
-
-## Fix
-
-- fix the typo in the edit database modal
-- improve the logic for the database editing
-- 修复编辑数据库界面的标题错误
-- 改进数据库编辑界面的逻辑
-
-## TODO
-
-- [ ] add the support for the customised properties of general databases
-- [ ] 增加对普通数据库自定义属性的支持
+- 更新 NotionNext 同步功能
+  - `tags`, `titleicon`, `slug` 和 `summary` 现在不是必选项了。你可以从你的模板中删除这些字段。

README.md

@@ -3,27 +3,137 @@
 [![Test](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/test.yml/badge.svg)](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/test.yml)
 [![Release](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/release.yml/badge.svg)](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/release.yml)
 [![Obsidian Downloads](https://img.shields.io/badge/dynamic/json?logo=obsidian&color=%23483699&label=downloads&query=%24%5B%22share-to-notionnext%22%5D.downloads&url=https%3A%2F%2Fraw.githubusercontent.com%2Fobsidianmd%2Fobsidian-releases%2Fmaster%2Fcommunity-plugin-stats.json)](https://GitHub.com/jxpeng98/obsidian-to-NotionNext/releases/)
-[![GitHub release (with filter)](https://img.shields.io/github/v/release/jxpeng98/obsidian-to-NotionNext)](https://github.com/jxpeng98/obsidian-to-NotionNext/releases/)
+[![GitHub release (with filter)](https://img.shields.io/github/package-json/v/jxpeng98/obsidian-to-NotionNext)](https://github.com/jxpeng98/obsidian-to-NotionNext/releases/)
 
 [//]: # ([![Github all releases](https://img.shields.io/github/downloads/jxpeng98/obsidian-to-NotionNext/total.svg)](https://GitHub.com/jxpeng98/obsidian-to-NotionNext/releases/))
 
+
 [中文文档](README-zh.md)
 
+**Now, support both NotionNext and General databases with customised properties.**
+
+**现在支持NotionNext和普通Notion数据库，可自定义数据库列表。**
+
+## TODO List
+
+- [ ] Modify the Edit function for the custom properties. 改进自定义属性的编辑功能
+- [ ] Support group upload with one click 支持一键多数据库上传
+- [x] Support custom properties for Notion General database. 支持自定义属性
+- [x] Support preview for database details in plugin settings. 支持预览数据库详情
+- [x] Support edit for database details in plugin settings. 支持编辑数据库详情
+
+## How to use
+You need seven steps to use this plugin in your Obsidian.
+1. Create a database in your Notion workspace.
+Open Notion, clink the `+` button on the left side, and 'Add a page' -> select 'Table' -> 'New database'.
+2. On the right-top corner, click the 'Share' -> 'Publish' -> 'Publish' -> copy the database id from the URL.
+3. go to [Notion API](https://www.notion.com/my-integrations) to create a new integration, and copy the token.
+4. Go back to your created Notion database, click the right-top '...' -> connections -> connect to -> find the integration you created and connect it.
+5. Go to obsidian settings -> community plugins -> search 'NotionNext' -> install it.
+6. Create a database in the plugin settings, and fill in the database details and all properties you want to sync (**Note: the name of the properties is case-sensitive.**).
+   - There are three type of database that you can use:
+	 - NotionNext: the database for the NotionNext template.(**All the properties are in lowercase**)
+	 - General: the database for the general Notion database (**Only have `title` and `tags` columns**)
+	 - Custom: the database for the custom properties (You can customise the properties you want to sync)
+7. Create a new note in Obsidian, and fill in the frontmatter with the properties you want to sync.
+
+## 使用方法
+如果你想使用这个插件，你需要完成下边的七个步骤。
+1. 首先在你的Notion中创建一个数据库。
+2. 点击右上角的'分享' -> '发布' -> '发布' -> 然后复制URL中的数据库ID。(版本不同，可能id的形式也不同。只需要复制在？之前的纯数字部分应该就可以了)
+3. 去[Notion API](https://www.notion.com/my-integrations)创建一个新的API，然后复制token。
+4. 回到你创建的Notion数据库，点击右上角的'...' -> 连接 -> 连接到 -> 把你刚才创建的API绑定到你的数据库
+5. 回到Obsidian的设置 -> 社区插件 -> 搜索'NotionNext' -> 安装
+6. 在插件设置中创建一个数据库，然后填写数据库的详情和你想要同步的属性 (**注意：Notion会识别表头的大小写，一定要和notion中的表头保持大小写一致**)。
+   - 你可以使用三种类型的数据库：
+	 - NotionNext: 用于NotionNext模板的数据库。(**默认全部小写**)
+	 - General: 用于普通的Notion数据库（**只有`title`和`tags`两个属性**）
+	 - Custom: 用于自定义属性的数据库（你可以自定义你想要同步的属性）
+7. 在Obsidian中创建一个新的笔记，然后在frontmatter中写入你想要的属性。
+
+## Example
+```plain
+---
+# default value has been set.
+# for any unwanted value, you can delete it or set it to empty.
+# for example, if you donot want to set password, you can delete password: "1234" or set it to password: ""
+# 我已经在插件中设置了默认值，如果有不需要的选项，可以直接删除。
+# 例如你不需要密码选项，你可以将password: "1234"删除，或者将它设置为空。
+# !!!!!!!!!!!!
+# 现在阶段一定不要修改表头的名字， please do not change the name of the header in YAML front matter 
+# !!!!!!!!!!!!
+titleicon: 📎 # emoji icon, default is 📜， 默认是📜
+date: 2023-07-23 # default is today， 默认是今天。 Format is YYYY-MM-DD， 格式是YYYY-MM-DD
+coverurl: https://img.jxpeng.dev/2023/08/843e27a210847f05a0f7cfb121fec100.jpg # default is empty， 默认是空
+type: Post # Post or Page, default is Post， 默认是Post
+slug: test # slug for url, default is empty， 默认是空
+status: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft 
+category: test # default is 'Obsidian'， 默认是'Obsidian'
+summary: this is a summary for test post # default is empty， 默认是空
+icon: fa-solid fa-camera # you can ignore this, default is empty， 默认是空，可直接删除
+password: "1234" # if you donot want to set password, you can delete this line, default is empty， 默认是空，可直接删除
+# 现在必须开启tags选项，否则会报错
+tags:
+  - test  # tags for post
+  - web # add more tags if you want
+---
+```
+<details> <summary> Update </summary>
+
+### 2.2.5
+
+- Update NotionNext function that 
+  - `tags`, `titleicon`, `slug` and `summary` are now optional. You can remove them from the frontmatter if you don't need them.
+
+
+### 2.2.3
+
+- Fix a bug that 'text' property cannot be synchronized. 修复了一个无法同步'text'属性的bug。
+
+### 2.2.2
+
+- Fix the setting description of database. 修复数据库设置的描述错误。
+
+### 2.2.1
+
+- improve the localisation for the custom properties setting. 改进自定义属性设置的本地化。
+
+**Warning: the edit function for the custom properties is not perfect for now. You need to re-enter all the properties if you want to edit the properties.**
+
+**注意：自定义属性的编辑功能现在还不完善。如果你想编辑属性，你需要重新输入所有的属性。**
+
+### 2.2.0 (Big Update)
+
+- add the support for custom properties in the Notion General database. 支持自定义属性
+	- [x] `title`, which is the first column of the database
+	- [x] 'Text'
+	- [x] 'Number'
+	- [x] 'Date'
+	- [x] 'Checkbox'
+	- [x] 'Select'
+	- [x] 'Multi-select'
+	- [x] 'URL'
+	- [x] 'Email'
+	- [x] 'Phone'
+	- [x] 'File' (**Only support external embedded files**)
+
+</details>
+
+![](https://minioapi.pjx.ac.cn/img1/2024/01/0cd99007409feede77bf5a3291e88af3.png)
+- Once you create the properties, you can preview the database details in the plugin settings.
+![](https://minioapi.pjx.ac.cn/img1/2024/01/665139962cc4cee2a0cb576b508b29f2.png)
+
+---
+
+## Acknowledgement
+
 Thanks to the [original author](https://github.com/EasyChris/obsidian-to-notion) for developing such a useful plugin that can synchronize Obsidian to Notion. However, the original repository can only sync Name and Tag information. For those like me who use [NotionNext](https://github.com/tangly1024/NotionNext) to set up their website, this presents some limitations. Every time I import, I need to make a lot of modifications.
 
 Thus, based on the [original author's work](https://github.com/EasyChris/obsidian-to-notion), I've added a feature to match the [NotionNext](https://github.com/tangly1024/NotionNext) template. This way, you can edit directly in Obsidian and publish with a single click after organizing.
 
-**Now, support both NotionNext and General databases.**
+---
 
-**现在支持NotionNext和普通Notion数据库。**
-
-## TODO List
-
-- [ ] Support custom properties for Notion General database. 支持自定义属性
-- [x] Support preview for database details in plugin settings. 支持预览数据库详情
-- [x] Support edit for database details in plugin settings. 支持编辑数据库详情
-
-## Update
+<details> <summary> Archive Update </summary>
 
 ### 2.1.0
 
@@ -161,7 +271,9 @@ If you turn off the button for the NotionNext database, you won't see the option
 
 - [x] Removed the `convert tag` option. Now, you can directly add tags in the YAML front matter. If you don't want to add tags, you can delete the tags in the YAML front matter or leave the tags blank.
 
-## How to Use
+</details>
+
+<details> <summary> Previous How to Use </summary>
 
 ### Precautions
 
@@ -253,9 +365,11 @@ Usage of the template is as follows:
 **Plugin preview is shown below**
 ![](https://minioapi.pjx.ac.cn/img1/2023/09/d6199619b68fab218fca8ae0cebece78.gif)
 
+</details>
+
 ---
 
-**Original README.md**
+<details> <summary> Original README.md </summary>
 
 Many Thanks for the original author's work. I've only made some changes to the original author's work. If you find this plugin useful, please give the [original author](https://github.com/EasyChris/obsidian-to-notion) a star.
 
@@ -429,10 +543,6 @@ node update-version.js
 ./release.sh
 ```
 
-```
-
-
-
 
 # Thanks
 [Development Process | Obsidian Plugin Development Documentation](https://luhaifeng666.github.io/obsidian-plugin-docs-zh/zh/getting-started/development-workflow.html)
@@ -449,3 +559,6 @@ node update-version.js
 
 # License
 GNU GPLv3
+
+
+</details>

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "share-to-notionnext",
   "name": "Share to NotionNext",
-  "version": "2.1.2",
+  "version": "2.2.5",
   "minAppVersion": "0.0.1",
   "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
   "author": "EasyChris, jxpeng98",

obsidian_template.md

@@ -12,7 +12,7 @@ date: 2023-07-23 # default is today， 默认是今天。 Format is YYYY-MM-DD
 coverurl: https://img.jxpeng.dev/2023/08/843e27a210847f05a0f7cfb121fec100.jpg # default is empty， 默认是空
 type: Post # Post or Page, default is Post， 默认是Post
 slug: test # slug for url, default is empty， 默认是空
-stats: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
+status: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
 category: test # default is 'Obsidian'， 默认是'Obsidian'
 summary: this is a summary for test post # default is empty， 默认是空
 icon: fa-solid fa-camera # you can ignore this, default is empty， 默认是空，可直接删除

package.json

@@ -1,6 +1,6 @@
 {
   "name": "share-to-notionnext",
-  "version": "2.1.2",
+  "version": "2.2.5",
   "type": "module",
   "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
   "main": "main.js",

src/commands/NotionCommands.ts

@@ -1,7 +1,7 @@
 import { i18nConfig } from "src/lang/I18n";
 import {Editor, MarkdownView, setTooltip} from "obsidian";
 import { FuzzySuggester, DatabaseList } from "./FuzzySuggester";
-import { uploadCommandGeneral, uploadCommandNext } from "../upload/uploadCommand";
+import {uploadCommandCustom, uploadCommandGeneral, uploadCommandNext} from "../upload/uploadCommand";
 import ObsidianSyncNotionPlugin from "src/main";
 import {DatabaseDetails} from "../ui/settingTabs";
 
@@ -94,11 +94,11 @@ export default class RibbonCommands {
 				await uploadCommandGeneral(this.plugin, this.plugin.settings, dbDetails, this.plugin.app);
 			};
 		}
-		// else if (dbDetails.format === 'custom') {
-		// 	editorCallback = async (editor, view) => {
-		// 		await uploadCommandGeneral(this.plugin, dbDetails, this.plugin.app);
-		// 	};
-		// }
+		else if (dbDetails.format === 'custom') {
+			editorCallback = async (editor, view) => {
+				await uploadCommandCustom(this.plugin, this.plugin.settings, dbDetails, this.plugin.app);
+			};
+		}
 
 		this.Ncommand.push({ id: commandId, name: commandName, editorCallback });
 	}

src/lang/locale/en.ts

@@ -23,10 +23,11 @@ export const en = {
 	NotionAPIDesc: "Generate from https://www.notion.so/my-integrations",
 	NotionAPIText: "Enter your Notion API Token",
 	DatabaseID: "Database ID",
+	DatabaseIDDesc: "Collect from the top-right Share --> Publish",
 	DatabaseIDText: "Enter your Database ID",
 	BannerUrl: "Banner url (optional)",
 	BannerUrlDesc:
-"Default is empty, if you want to show a banner, please enter the url (like: https://minioapi.pjx.ac.cn/img1/2023/11/b7b40a0724e93b7d7ab494bb3b8a2da8.png)",
+"Default is empty, if you want to show a banner, please enter the url (like: https://abc.com/b.png)",
 	BannerUrlText: "Enter your banner url",
 	NotionUser: "Notion ID (username, optional)",
 	NotionUserDesc:
@@ -65,4 +66,11 @@ export const en = {
 	NotionCustomSettingHeader: "Notion Custom Database Settings",
 	NotionCustomButton: "Notion Customised command switch",
 	NotionCustomButtonDesc: "Open this option, Sync to Notion Customised Database command will be displayed in the command palette",
+	CustomPropertyName: "Property Name",
+	CustomPropertyFirstColumn: "Title Column",
+	CustomPropertyFirstColumnDesc: "The title of the page, must be the first property",
+	CustomProperty: "Property",
+	AddCustomProperty: "Add Custom Property",
+	AddNewProperty: "Add New Property",
+	AddNewPropertyDesc: "Add new property match with your notion database",
 }

src/lang/locale/ja.ts

@@ -23,9 +23,10 @@ export const ja = {
     NotionAPIDesc: "https://www.notion.so/my-integrations から生成してください",
     NotionAPIText: "Notion API トークンを入力",
     DatabaseID: "データベースID",
+	DatabaseIDDesc: "右上の共有 --> 公開から取得してください",
     DatabaseIDText: "データベースIDを入力",
     BannerUrl: "バナーのURL（任意）",
-    BannerUrlDesc: "デフォルトは空白です。バナーを表示したい場合は、URLを入力してください（例：https://minioapi.pjx.ac.cn/img1/2023/11/b7b40a0724e93b7d7ab494bb3b8a2da8.png）",
+    BannerUrlDesc: "デフォルトは空白です。バナーを表示したい場合は、URLを入力してください（例：https://abc.com/b.png）",
     BannerUrlText: "バナーのURLを入力",
     NotionUser: "Notion ID（ユーザー名、任意）",
     NotionUserDesc: "共有リンクから取得（例：https://username.notion.site）。Notion IDは[username]です",
@@ -57,4 +58,11 @@ export const ja = {
     NotionCustomSettingHeader: "Notionカスタムデータベース設定",
     NotionCustomButton: "Notionカスタマイズコマンドの切り替え",
     NotionCustomButtonDesc: "このオプションを開くと、Notionカスタムデータベース同期コマンドがコマンドパレットに表示されます",
+	CustomPropertyName: "カスタムプロパティ名",
+	CustomPropertyFirstColumn: "最初の列のカスタムプロパティ名",
+	CustomPropertyFirstColumnDesc: "最初の列のカスタムプロパティ名を入力してください",
+	CustomProperty: "カスタムプロパティ",
+	AddCustomProperty: "カスタムプロパティを追加",
+	AddNewProperty: "新しいプロパティを追加",
+	AddNewPropertyDesc: "新しいプロパティを追加してください",
 };

src/lang/locale/zh.ts

@@ -23,10 +23,11 @@ export const zh = {
 	NotionAPIDesc: "从 https://www.notion.so/my-integrations 生成",
 	NotionAPIText: "输入你的 Notion API 令牌",
 	DatabaseID: "数据库 ID",
+	DatabaseIDDesc: "从右上角的分享 --> 发布中获取",
 	DatabaseIDText: "输入你的数据库 ID",
 	BannerUrl: "封面图片地址（可选）",
 	BannerUrlDesc:
-		"默认为空，如果你想显示封面图片，请输入图片地址（例如：https://minioapi.pjx.ac.cn/img1/2023/11/b7b40a0724e93b7d7ab494bb3b8a2da8.png）",
+		"默认为空，如果你想显示封面图片，请输入图片地址（例如：https://abc.com/b.png）",
 	BannerUrlText: "输入你的封面图片地址",
 	NotionUser: "Notion ID（用户名，可选）",
 	NotionUserDesc:
@@ -60,4 +61,11 @@ export const zh = {
 	NotionCustomSettingHeader: "Notion 自定义数据库设置",
 	NotionCustomButton: "Notion 自定义数据库同步命令开关",
 	NotionCustomButtonDesc: "打开此选项，同步到自定义数据库命令将显示在命令面板中",
+	CustomPropertyName: "自定义属性名",
+	CustomPropertyFirstColumn: "第一列属性名",
+	CustomPropertyFirstColumnDesc: "第一列必须为标题属性名",
+	CustomProperty: "自定义属性",
+	AddCustomProperty: "添加自定义属性",
+	AddNewProperty: "添加新属性",
+	AddNewPropertyDesc: "添加一个和Notion数据库匹配的新属性",
 }

src/ui/CustomModal.ts

@@ -0,0 +1,162 @@
+import {App, Modal, Setting} from "obsidian";
+import ObsidianSyncNotionPlugin from "../main";
+import {ObsidianSettingTab} from "./settingTabs";
+import {i18nConfig} from "../lang/I18n";
+
+export class CustomModal extends Modal {
+	propertyLines: Setting[] = []; // Store all property line settings
+	properties: { customName: string, customType: string }[] = []; // Array to store property values and types
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+
+	constructor(app: App) {
+		super(app);
+	}
+
+	createPropertyLine(containerEl: HTMLElement): void {
+		const propertyIndex = this.properties.length;
+		this.properties.push({customName: "", customType: ""}); // Initialize with empty values
+
+		const propertyLine = new Setting(containerEl)
+
+		if (propertyIndex === 0) {
+			propertyLine
+				.setName(i18nConfig.CustomPropertyFirstColumn)
+				.setDesc(i18nConfig.CustomPropertyFirstColumnDesc)
+
+				propertyLine.addText((text) => {
+					text
+						.setPlaceholder("Property name")
+						.setValue("")
+						.onChange(async (value) => {
+							this.properties[propertyIndex].customName = value; // Update the customValue of the specific property
+						});
+
+				}
+			)
+
+			propertyLine.addDropdown((dropdown) => {
+					dropdown
+						.addOption("title", "Title")
+						.setValue("")
+						.onChange(async (value) => {
+							this.properties[propertyIndex].customType = value; // Update the customType of the specific property
+						});
+				}
+		)
+		} else {
+			propertyLine
+			.setName(i18nConfig.CustomProperty + (propertyIndex))
+
+		propertyLine.addText((text) => {
+				text
+					.setPlaceholder(i18nConfig.CustomPropertyName)
+					.setValue("")
+					.onChange(async (value) => {
+						this.properties[propertyIndex].customName = value; // Update the customValue of the specific property
+					});
+			}
+		)
+
+		propertyLine.addDropdown((dropdown) => {
+				dropdown
+					// .addOption("none", '')
+					.addOption("text", "Text")
+					.addOption("number", "Number")
+					.addOption("select", "Select")
+					.addOption("multi_select", "Multi-Select")
+					.addOption("date", "Date")
+					// .addOption("person", "Person")
+					.addOption("files", "Files & Media")
+					.addOption("checkbox", "Checkbox")
+					.addOption("url", "URL")
+					.addOption("email", "Email")
+					.addOption("phone_number", "Phone Number")
+					// .addOption("formula", "Formula")
+					// .addOption("relation", "Relation")
+					// .addOption("rollup", "Rollup")
+					// .addOption("created_time", "Created time")
+					// .addOption("created_by", "Created by")
+					// .addOption("last_edited_time", "Last Edited Time")
+					// .addOption("last_edited_by", "Last Edited By")
+					.setValue("")
+					.onChange(async (value) => {
+						this.properties[propertyIndex].customType = value; // Update the customType of the specific property
+					});
+			}
+		)
+
+		propertyLine.addButton((button) => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(async () => {
+						// Handle the deletion of this property line
+						this.propertyLines = this.propertyLines.filter(line => line !== propertyLine);
+						this.properties.splice(propertyIndex, 1); // Remove the property from the array
+						propertyLine.settingEl.remove();
+					});
+			}
+		);
+		}
+		this.propertyLines.push(propertyLine);
+	}
+
+
+	display(): void {
+
+		this.containerEl.addClass("custom-modal");
+		this.titleEl.setText(i18nConfig.AddCustomProperty);
+
+		let {contentEl} = this;
+		contentEl.empty();
+
+		const customDiv = contentEl.createDiv("custom-div");
+
+		new Setting(customDiv)
+			.setName(i18nConfig.AddNewProperty)
+			.setDesc(i18nConfig.AddNewPropertyDesc)
+			.addButton((button) => {
+				return button
+					.setTooltip("Add")
+					.setIcon("plus")
+					.onClick(async () => {
+						const customTabs = customDiv.createDiv("custom-tabs");
+						this.createPropertyLine(customTabs);
+					});
+			});
+
+
+		let footerEl = this.contentEl.createDiv("save-custom-value");
+		let saveButton = new Setting(footerEl)
+		saveButton.addButton((button) => {
+				return button
+					.setTooltip("Save")
+					.setIcon("checkmark")
+					.onClick(async () => {
+						this.close();
+					});
+			}
+		);
+
+		saveButton.addExtraButton((button) => {
+				return button
+					.setTooltip("Cancel")
+					.setIcon("cross")
+					.onClick(async () => {
+						this.close();
+					});
+			}
+		);
+	}
+
+	onOpen(): void {
+		this.display();
+	}
+
+	onClose(): void {
+		const {contentEl} = this;
+
+		contentEl.empty();
+	}
+}

src/ui/EditModal.ts

@@ -3,6 +3,7 @@ import {SettingModal} from "./settingModal";
 import ObsidianSyncNotionPlugin from "../main";
 import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
 import {i18nConfig} from "../lang/I18n";
+import {CustomModal} from "./CustomModal";
 
 export class EditModal extends SettingModal {
 	dataTemp: Record<string, any> = {
@@ -21,6 +22,7 @@ export class EditModal extends SettingModal {
 		customTitleButtonTemp: false,
 		// customTitleButtonTempInd: false,
 		customTitleNameTemp: '',
+		customPropertiesTemp: [],
 		// customTitleNameTempInd: false,
 		// customValues: '',
 		savedTemp: false,
@@ -42,6 +44,7 @@ export class EditModal extends SettingModal {
 		customTitleButtonPrev: false,
 		// customTitleButtonPrevInd: false,
 		customTitleNamePrev: '',
+		customPropertiesPrev: [],
 		// customTitleNamePrevInd: false,
 		// customValues: '',
 		savedPrev: false,
@@ -67,6 +70,7 @@ export class EditModal extends SettingModal {
 			this.dataTemp.tagButtonTemp = dbDetails.tagButton;
 			this.dataTemp.customTitleButtonTemp = dbDetails.customTitleButton;
 			this.dataTemp.customTitleNameTemp = dbDetails.customTitleName;
+			this.dataTemp.customPropertiesTemp = dbDetails.customProperties;
 			// this.dataTemp.customValues = dbDetails.customValues;
 			this.dataTemp.savedTemp = dbDetails.saved;
 
@@ -79,6 +83,7 @@ export class EditModal extends SettingModal {
 			this.dataPrev.tagButtonPrev = dbDetails.tagButton;
 			this.dataPrev.customTitleButtonPrev = dbDetails.customTitleButton;
 			this.dataPrev.customTitleNamePrev = dbDetails.customTitleName;
+			this.dataPrev.customPropertiesPrev = dbDetails.customProperties;
 			// this.dataTemp.customValues = dbDetails.customValues;
 			this.dataPrev.savedPrev = dbDetails.saved;
 		}
@@ -103,7 +108,7 @@ export class EditModal extends SettingModal {
 						.addOption('none', '')
 						.addOption('general', i18nConfig.databaseGeneral)
 						.addOption('next', i18nConfig.databaseNext)
-						// .addOption('custom', i18nConfig.databaseCustom)
+						.addOption('custom', i18nConfig.databaseCustom)
 						.setValue(this.dataTemp.databaseFormatTemp)
 						.onChange(async (value) => {
 							this.dataTemp.databaseFormatTemp = value;
@@ -172,9 +177,9 @@ export class EditModal extends SettingModal {
 				.setDesc(i18nConfig.NotionCustomTitleDesc)
 				.addToggle((toggle) =>
 					toggle
-						.setValue(this.dataTemp.CustomTitleButtonTemp)
+						.setValue(this.dataTemp.customTitleButtonTemp)
 						.onChange(async (value) => {
-							this.dataTemp.CustomTitleButtonTemp = value;
+							this.dataTemp.customTitleButtonTemp = value;
 
 							this.updateSettingEl(CustomNameEl, value)
 
@@ -187,15 +192,15 @@ export class EditModal extends SettingModal {
 
 
 			// add custom title name
-			const CustomNameEl = this.createStyleDiv('custom-name', (this.dataTemp.CustomTitleButtonTemp), nextTabs);
-			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.dataTemp.CustomTitleNameTemp,'dataTemp', 'CustomTitleNameTemp')
+			const CustomNameEl = this.createStyleDiv('custom-name', (this.dataTemp.customTitleButtonTemp), nextTabs);
+			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.dataTemp.customTitleNameTemp,'dataTemp', 'customTitleNameTemp')
 
 
 			// add api key
 			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.dataTemp.notionAPITemp, 'dataTemp','notionAPITemp')
 
 			// add database id
-			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp','databaseIDTemp')
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp','databaseIDTemp')
 
 
 		} else if (value === 'next') {
@@ -211,11 +216,11 @@ export class EditModal extends SettingModal {
 			// add api key
 			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.dataTemp.notionAPITemp, 'dataTemp','notionAPITemp')
 
-
 			// add database id
-			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp','databaseIDTemp')
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp','databaseIDTemp')
 
 		} else if (value === 'custom') {
+
 			nextTabs.createEl('h3', {text: i18nConfig.NotionCustomSettingHeader});
 
 			// add full name
@@ -224,57 +229,33 @@ export class EditModal extends SettingModal {
 			// add abbreviate name
 			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.dataTemp.databaseAbbreviateNameTemp, 'dataTemp', 'databaseAbbreviateNameTemp')
 
-			// tag button
-			this.createSettingEl(nextTabs, i18nConfig.NotionTagButton, i18nConfig.NotionTagButtonDesc, 'toggle', i18nConfig.NotionCustomTitleText, this.dataTemp.tagButtonTemp, 'dataTemp','tagButtonTemp')
-
-			// add custom title button
-
-			new Setting(nextTabs)
-				.setName(i18nConfig.NotionCustomTitle)
-				.setDesc(i18nConfig.NotionCustomTitleDesc)
-				.addToggle((toggle) =>
-					toggle
-						.setValue(this.dataTemp.CustomTitleButtonTemp)
-						.onChange(async (value) => {
-							this.dataTemp.CustomTitleButtonTemp = value;
-
-							this.updateSettingEl(CustomNameEl, value)
-
-							// this.updateSettingEl(CustomValuesEl, value)
-
-							// await this.plugin.saveSettings();
-							// await this.plugin.commands.updateCommand();
-						})
-				);
-
-
-			// add custom title name
-			const CustomNameEl = this.createStyleDiv('custom-name', (this.dataTemp.CustomTitleButtonTemp), nextTabs);
-			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.dataTemp.CustomTitleNameTemp,'dataTemp', 'CustomTitleNameTemp')
-
-			// // add custom values
-			// const CustomValuesEl = this.createStyleDiv('custom-values', (this.dataTemp.CustomTitleButton), nextTabs);
-			// new Setting(CustomValuesEl)
-			// 	.setName(i18nConfig.NotionCustomValues)
-			// 	.setDesc(i18nConfig.NotionCustomValuesDesc)
-			// 	.addTextArea((text) => {
-			// 		return text
-			// 			.setPlaceholder(i18nConfig.NotionCustomValuesText)
-			// 			.setValue(this.dataTemp.CustomValues)
-			// 			.onChange(async (value) => {
-			// 				this.dataTemp.CustomValues = value;
-			// 				await this.plugin.saveSettings();
-			// 			});
-			// 	});
-
-
 			// add api key
-			const notionAPIGeneralEl = this.createStyleDiv('api-general', this.plugin.settings.GeneralButton, nextTabs);
-			this.createSettingEl(notionAPIGeneralEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.dataTemp.notionAPITemp, 'dataTemp','notionAPITemp')
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.dataTemp.notionAPITemp, 'dataTemp', 'notionAPITemp')
 
 			// add database id
-			const databaseIDGeneralEl = this.createStyleDiv('databaseID-general', this.plugin.settings.GeneralButton, nextTabs);
-			this.createSettingEl(databaseIDGeneralEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp', 'databaseIDTemp')
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp', 'databaseIDTemp')
+
+			// add new property button
+			new Setting(nextTabs)
+				.setName(i18nConfig.NotionCustomValues)
+				.setDesc(i18nConfig.NotionCustomValuesDesc)
+				.addButton((button: ButtonComponent) => {
+						return button
+							.setTooltip('Add new property')
+							.setIcon('plus')
+							.onClick(async () => {
+								let customModal = new CustomModal(this.app);
+
+								customModal.onClose = () => {
+
+									this.renderCustomPreview(customModal.properties, nextTabs)
+									this.dataTemp.customPropertiesTemp = customModal.properties;
+								}
+
+								customModal.open();
+							});
+					}
+				);
 		}
 
 	}

src/ui/PreviewModal.ts

@@ -116,10 +116,24 @@ export class PreviewModal extends Modal {
 
 		dbIdSetting.settingEl.style.display = 'none'; // Hide initially
 
+		// Preview the custom properties
+
+		if (this.dbDetails.format === 'custom') {
+
+			const customPropertiesEl = new Setting(previewEl)
+			customPropertiesEl
+				.setName('Custom Properties')
+				.addTextArea(text => text
+					.setValue(JSON.stringify(this.dbDetails.customProperties, null, 2))
+					.setDisabled(true));
+		}
+
 	}
 
 
 	onOpen() {
 		this.display()
 	}
+
+
 }

src/ui/settingModal.ts

@@ -8,6 +8,7 @@ import {
 import {i18nConfig} from "../lang/I18n";
 import ObsidianSyncNotionPlugin from "../main";
 import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
+import {CustomModal} from "./CustomModal";
 
 
 export class SettingModal extends Modal {
@@ -21,6 +22,7 @@ export class SettingModal extends Modal {
 		tagButton: true,
 		customTitleButton: false,
 		customTitleName: '',
+		customProperties: [],
 		// customValues: '',
 		saved: false,
 	};
@@ -31,6 +33,7 @@ export class SettingModal extends Modal {
 		super(app);
 		this.plugin = plugin;
 		this.settingTab = settingTab;
+		this.properties = [];
 		if (dbDetails) {
 			this.data.databaseFormat = dbDetails.format;
 			this.data.databaseFullName = dbDetails.fullName;
@@ -40,6 +43,7 @@ export class SettingModal extends Modal {
 			this.data.tagButton = dbDetails.tagButton;
 			this.data.customTitleButton = dbDetails.customTitleButton;
 			this.data.customTitleName = dbDetails.customTitleName;
+			this.data.customProperties = dbDetails.customProperties;
 			// this.data.customValues = dbDetails.customValues;
 			this.data.saved = dbDetails.saved;
 		}
@@ -58,7 +62,6 @@ export class SettingModal extends Modal {
 		const nextTabs = contentEl.createDiv('next-tabs');
 
 
-
 		if (this.data.saved) {
 			new Setting(settingDiv)
 				.setName(i18nConfig.databaseFormat)
@@ -68,7 +71,7 @@ export class SettingModal extends Modal {
 						.addOption('none', '')
 						.addOption('general', i18nConfig.databaseGeneral)
 						.addOption('next', i18nConfig.databaseNext)
-						// .addOption('custom', i18nConfig.databaseCustom)
+						.addOption('custom', i18nConfig.databaseCustom)
 						.setValue(this.data.databaseFormat)
 						.onChange(async (value) => {
 							this.data.databaseFormat = value;
@@ -89,7 +92,7 @@ export class SettingModal extends Modal {
 						.addOption('none', '')
 						.addOption('general', i18nConfig.databaseGeneral)
 						.addOption('next', i18nConfig.databaseNext)
-						// .addOption('custom', i18nConfig.databaseCustom)
+						.addOption('custom', i18nConfig.databaseCustom)
 						.setValue(this.data.databaseFormat)
 						.onChange(async (value) => {
 							this.data.databaseFormat = value;
@@ -103,7 +106,6 @@ export class SettingModal extends Modal {
 		}
 
 
-
 		// add save button
 		let footerEl = contentEl.createDiv('save-button');
 		let saveButton = new Setting(footerEl)
@@ -153,9 +155,9 @@ export class SettingModal extends Modal {
 				.setDesc(i18nConfig.NotionCustomTitleDesc)
 				.addToggle((toggle) =>
 					toggle
-						.setValue(this.data.CustomTitleButton)
+						.setValue(this.data.customTitleButton)
 						.onChange(async (value) => {
-							this.data.CustomTitleButton = value;
+							this.data.customTitleButton = value;
 
 							this.updateSettingEl(CustomNameEl, value)
 
@@ -168,15 +170,15 @@ export class SettingModal extends Modal {
 
 
 			// add custom title name
-			const CustomNameEl = this.createStyleDiv('custom-name', (this.data.CustomTitleButton), nextTabs);
-			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.data.CustomTitleName, 'data','CustomTitleName')
+			const CustomNameEl = this.createStyleDiv('custom-name', (this.data.customTitleButton), nextTabs);
+			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.data.customTitleName, 'data', 'customTitleName')
 
 
 			// add api key
 			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.data.notionAPI, 'data', 'notionAPI')
 
 			// add database id
-			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data','databaseID')
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')
 
 
 		} else if (value === 'next') {
@@ -194,9 +196,10 @@ export class SettingModal extends Modal {
 
 
 			// add database id
-			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data','databaseID')
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')
 
 		} else if (value === 'custom') {
+
 			nextTabs.createEl('h3', {text: i18nConfig.NotionCustomSettingHeader});
 
 			// add full name
@@ -205,68 +208,52 @@ export class SettingModal extends Modal {
 			// add abbreviate name
 			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'data', 'databaseAbbreviateName')
 
-			// tag button
-			this.createSettingEl(nextTabs, i18nConfig.NotionTagButton, i18nConfig.NotionTagButtonDesc, 'toggle', i18nConfig.NotionCustomTitleText, this.data.tagButton,'data', 'tagButton')
-
-			// add custom title button
-
-			new Setting(nextTabs)
-				.setName(i18nConfig.NotionCustomTitle)
-				.setDesc(i18nConfig.NotionCustomTitleDesc)
-				.addToggle((toggle) =>
-					toggle
-						.setValue(this.data.CustomTitleButton)
-						.onChange(async (value) => {
-							this.data.CustomTitleButton = value;
-
-							this.updateSettingEl(CustomNameEl, value)
-
-							// this.updateSettingEl(CustomValuesEl, value)
-
-							// await this.plugin.saveSettings();
-							// await this.plugin.commands.updateCommand();
-						})
-				);
-
-
-			// add custom title name
-			const CustomNameEl = this.createStyleDiv('custom-name', (this.data.CustomTitleButton), nextTabs);
-			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.data.CustomTitleName,'data', 'CustomTitleName')
-
-			// // add custom values
-			// const CustomValuesEl = this.createStyleDiv('custom-values', (this.data.CustomTitleButton), nextTabs);
-			// new Setting(CustomValuesEl)
-			// 	.setName(i18nConfig.NotionCustomValues)
-			// 	.setDesc(i18nConfig.NotionCustomValuesDesc)
-			// 	.addTextArea((text) => {
-			// 		return text
-			// 			.setPlaceholder(i18nConfig.NotionCustomValuesText)
-			// 			.setValue(this.data.CustomValues)
-			// 			.onChange(async (value) => {
-			// 				this.data.CustomValues = value;
-			// 				await this.plugin.saveSettings();
-			// 			});
-			// 	});
-
-
 			// add api key
-			const notionAPIGeneralEl = this.createStyleDiv('api-general', this.plugin.settings.GeneralButton, nextTabs);
-			this.createSettingEl(notionAPIGeneralEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.data.notionAPI,'data', 'notionAPI')
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.data.notionAPI, 'data', 'notionAPI')
 
 			// add database id
-			const databaseIDGeneralEl = this.createStyleDiv('databaseID-general', this.plugin.settings.GeneralButton, nextTabs);
-			this.createSettingEl(databaseIDGeneralEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')
+
+			// add new property button
+			new Setting(nextTabs)
+				.setName(i18nConfig.NotionCustomValues)
+				.setDesc(i18nConfig.NotionCustomValuesDesc)
+				.addButton((button: ButtonComponent) => {
+						return button
+							.setTooltip('Add new property')
+							.setIcon('plus')
+							.onClick(async () => {
+								let customModal = new CustomModal(this.app);
+
+								customModal.onClose = () => {
+
+									this.renderCustomPreview(customModal.properties, nextTabs)
+									this.data.customProperties = customModal.properties;
+								}
+
+								customModal.open();
+							});
+					}
+				);
 		}
 
 	}
 
 
-
 	onOpen() {
 		// add console log to check if the modal is opened
 		this.display()
 	}
 
+	renderCustomPreview(properties: any[], nextTabs: HTMLElement) {
+		const previewContainer = nextTabs.createDiv('preview-container');
+
+		properties.forEach((property: { customName: any; customType: any; }) => {
+			const propertyEl = previewContainer.createEl('div', {cls: 'property-preview'});
+			propertyEl.createEl('span', {text: `Property: ${property.customName}, Type: ${property.customType}`});
+		});
+
+	}
 
 
 	// create a function to create a div with a style for pop over elements
@@ -275,6 +262,7 @@ export class SettingModal extends Modal {
 			this.updateSettingEl(div, commandValue);
 		});
 	}
+
 	// update the setting display style in the setting tab
 	public updateSettingEl(element: HTMLElement, commandValue: boolean) {
 		element.style.borderTop = commandValue ? "1px solid var(--background-modifier-border)" : "none";

src/ui/settingTabs.ts

@@ -16,8 +16,8 @@ export interface PluginSettings {
     proxy: string;
     GeneralButton: boolean;
     tagButton: boolean;
-    CustomTitleButton: boolean;
-    CustomTitleName: string;
+    customTitleButton: boolean;
+    customTitleName: string;
     notionAPIGeneral: string;
     databaseIDGeneral: string;
     CustomButton: boolean;
@@ -37,6 +37,7 @@ export interface DatabaseDetails {
 	tagButton: boolean;
 	customTitleButton: boolean;
 	customTitleName: string;
+	customProperties:{ customName: string, customType: string }[];
 	// customValues: string;
 	saved: boolean;
 }
@@ -50,8 +51,8 @@ export const DEFAULT_SETTINGS: PluginSettings = {
     proxy: "",
     GeneralButton: true,
     tagButton: true,
-    CustomTitleButton: false,
-    CustomTitleName: "",
+    customTitleButton: false,
+    customTitleName: "",
     notionAPIGeneral: "",
     databaseIDGeneral: "",
     CustomButton: false,
@@ -107,6 +108,7 @@ export class ObsidianSettingTab extends PluginSettingTab {
 									tagButton: modal.data.tagButton,
 									customTitleButton: modal.data.customTitleButton,
 									customTitleName: modal.data.customTitleName,
+									customProperties: modal.data.customProperties,
 									// customValues: modal.data.customValues,
 									saved: modal.data.saved,
 								}
@@ -271,6 +273,7 @@ export class ObsidianSettingTab extends PluginSettingTab {
 										tagButton: modal.dataTemp.tagButtonTemp,
 										customTitleButton: modal.dataTemp.customTitleButtonTemp,
 										customTitleName: modal.dataTemp.customTitleNameTemp,
+										customProperties: modal.dataTemp.customPropertiesTemp,
 										// customValues: modal.data.customValues,
 										saved: modal.dataTemp.savedTemp,
 									}
@@ -284,6 +287,7 @@ export class ObsidianSettingTab extends PluginSettingTab {
 										tagButton: modal.dataPrev.tagButtonPrev,
 										customTitleButton: modal.dataPrev.customTitleButtonPrev,
 										customTitleName: modal.dataPrev.customTitleNamePrev,
+										customProperties: modal.dataPrev.customPropertiesPrev,
 										// customValues: modal.data.customValues,
 										saved: modal.dataPrev.savedPrev,
 									}

src/upload/updateYaml.ts

@@ -1,6 +1,6 @@
 import { App, Notice, TFile } from "obsidian";
 import ObsidianSyncNotionPlugin from "../main";
-import {DatabaseDetails, PluginSettings} from "../ui/settingTabs";
+import {DatabaseDetails} from "../ui/settingTabs";
 
 export async function updateYamlInfo(
     yamlContent: string,

src/upload/uploadCommand.ts

@@ -32,7 +32,21 @@ export async function uploadCommandNext(
 		return;
 	}
 
-    const { markDownData, nowFile, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime } = await getNowFileMarkdownContentNext(app, settings)
+	const {
+		markDownData,
+		nowFile,
+		emoji,
+		cover,
+		tags,
+		type,
+		slug,
+		stats,
+		category,
+		summary,
+		paword,
+		favicon,
+		datetime
+	} = await getNowFileMarkdownContentNext(app, settings)
 
 	if (markDownData) {
 		const {basename} = nowFile;
@@ -49,7 +63,6 @@ export async function uploadCommandNext(
 }
 
 
-
 export async function uploadCommandGeneral(
 	plugin: ObsidianSyncNotionPlugin,
 	settings: PluginSettings,
@@ -100,13 +113,13 @@ export async function uploadCommandCustom(
 		return;
 	}
 
-    const { markDownData, nowFile, cover, tags ,customValues} = await getNowFileMarkdownContentCustom(app, settings)
+	const {markDownData, nowFile, cover, customValues} = await getNowFileMarkdownContentCustom(app, dbDetails)
 
 	if (markDownData) {
 		const { basename} = nowFile;
 
 		const upload = new Upload2NotionCustom(plugin, dbDetails);
-        const res = await upload.syncMarkdownToNotionCustom(basename, cover, tags, customValues, markDownData, nowFile, this.app);
+		const res = await upload.syncMarkdownToNotionCustom(cover, customValues, markDownData, nowFile, this.app);
 
 		if (res.status === 200) {
 			new Notice(`${i18nConfig["sync-success"]}${basename}`);

src/upload/upload_general/BaseUpload2NotionGeneral.ts

@@ -11,6 +11,7 @@ export class UploadBaseGeneral {
 	notion: Client;
 	agent: any;
 	dbDetails: DatabaseDetails
+
 	constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
 		this.plugin = plugin;
 		this.dbDetails = dbDetails

src/upload/upload_general/Upload2NotionGeneral.ts

@@ -139,7 +139,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 		const frontmasster =
 			app.metadataCache.getFileCache(nowFile)?.frontmatter;
 		const {abName} = this.dbDetails
-		const notionIDKey = `${abName}-NotionID`;
+		const notionIDKey = `NotionID-${abName}`;
 		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
 
 

src/upload/upload_next/Upload2NotionNext.ts

@@ -88,9 +88,6 @@ export class Upload2NotionNext extends UploadBaseNext {
             parent: {
                 database_id: databaseID,
             },
-            icon: {
-                emoji: emoji || '📜'
-            },
             properties: {
                 title: {
                     title: [
@@ -101,25 +98,11 @@ export class Upload2NotionNext extends UploadBaseNext {
                         },
                     ],
                 },
-                tags: {
-                    multi_select: tags && true ? tags.map(tag => {
-                        return { "name": tag }
-                    }) : [],
-                },
                 type: {
                     select: {
                         name: type || 'Post'
                     }
                 },
-                slug: {
-                    rich_text: [
-                        {
-                            text: {
-                                content: slug || ''
-                            }
-                        }
-                    ]
-                },
                 status: {
                     select: {
                         name: stats || 'Draft'
@@ -130,15 +113,7 @@ export class Upload2NotionNext extends UploadBaseNext {
                         name: category || 'Obsidian'
                     }
                 },
-                summary: {
-                    rich_text: [
-                        {
-                            text: {
-                                content: summary || ''
-                            }
-                        }
-                    ]
-                },
+
                 password: {
                     rich_text: [
                         {
@@ -165,6 +140,52 @@ export class Upload2NotionNext extends UploadBaseNext {
             },
             children: childArr,
         }
+
+		// add tags
+		if (tags) {
+			bodyString.properties.tags = {
+				multi_select: tags.map(tag => {
+					return { "name": tag }
+				})
+			}
+		}
+
+		// add title icon
+		if (emoji) {
+				bodyString.icon = {
+					emoji: emoji
+				}
+		}
+
+		// add slug
+		if (slug) {
+			bodyString.properties.slug = {
+				rich_text: [
+					{
+						text: {
+							content: slug
+						}
+					}
+				]
+			}
+		}
+
+		// check if summary is available
+		if (summary) {
+			bodyString.properties.summary = {
+				rich_text: [
+					{
+						text: {
+							content: summary
+						}
+					}
+				]
+			}
+		}
+
+
+
+
         if (cover) {
             bodyString.cover = {
                 type: "external",
@@ -228,7 +249,7 @@ export class Upload2NotionNext extends UploadBaseNext {
         const file2Block = markdownToBlocks(__content, options);
         const frontmasster = app.metadataCache.getFileCache(nowFile)?.frontmatter
 		const {abName} = this.dbDetails
-		const notionIDKey = `${abName}-NotionID`;
+		const notionIDKey = `NotionID-${abName}`;
 		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
 
 

src/upload/upoload_custom/Upload2NotionCustom.ts

@@ -1,5 +1,4 @@
 import {App, Notice, requestUrl, TFile} from "obsidian";
-import { Client } from "@notionhq/client";
 import {markdownToBlocks} from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
@@ -21,9 +20,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 	// 暂时就直接删除，新建一个page
 	async updatePage(
 		notionID: string,
-		title: string,
 		cover: string,
-		tags: string[],
 		customValues: Record<string, string>,
 		childArr: any,
 	) {
@@ -39,56 +36,22 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 			cover = databaseCover;
 		}
 
-		return await this.createPage(title, cover, tags, customValues, childArr);
+		return await this.createPage(cover, customValues, childArr);
 	}
 
 	async createPage(
-		title: string,
 		cover: string,
-		tags: string[],
 		customValues: Record<string, string>,
 		childArr: any,
 	) {
 
 		const {
 			databaseID,
-			customTitleButton,
-			customTitleName,
-			tagButton,
+			customProperties,
 			notionAPI
 		} = this.dbDetails;
 
-		const bodyString: any = {
-			parent: {
-				database_id: databaseID,
-			},
-			properties: {
-				[customTitleButton
-					? customTitleName
-					: "title"]: {
-					title: [
-						{
-							text: {
-								content: title,
-							},
-						},
-					],
-				},
-				...(Object.keys(customValues).reduce((acc, key) => {
-					acc[key] = {
-						rich_text: [
-							{
-								text: {
-									content: customValues[key] || '',
-								},
-							},
-						],
-					};
-					return acc;
-				}, {} as Record<string, { rich_text: { text: { content: string } }[] } >)),
-			},
-			children: childArr,
-		};
+		const bodyString: any = this.buildBodyString(customProperties, customValues, childArr);
 
 		if (cover) {
 			bodyString.cover = {
@@ -127,9 +90,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 	}
 
 	async syncMarkdownToNotionCustom(
-		title: string,
 		cover: string,
-		tags: string[],
 		customValues: Record<string, string>,
 		markdown: string,
 		nowFile: TFile,
@@ -146,19 +107,19 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 		const file2Block = markdownToBlocks(__content, options);
 		const frontmasster =
 			app.metadataCache.getFileCache(nowFile)?.frontmatter;
-		const notionID = frontmasster ? frontmasster.notionID : null;
+		const {abName} = this.dbDetails
+		const notionIDKey = `NotionID-${abName}`;
+		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
 
 		if (notionID) {
 			res = await this.updatePage(
 				notionID,
-				title,
 				cover,
-				tags,
 				customValues,
 				file2Block,
 			);
 		} else {
-			res = await this.createPage(title, cover, tags, customValues, file2Block);
+			res = await this.createPage(cover, customValues, file2Block);
 		}
 		if (res.status === 200) {
 			await updateYamlInfo(markdown, nowFile, res, app, this.plugin, this.dbDetails);
@@ -167,4 +128,109 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 		}
 		return res;
 	}
+
+	private buildPropertyObject(customName: string, customType: string, customValues: Record<string, any>) {
+		const value = customValues[customName] || '';
+
+		switch (customType) {
+			case "title":
+				return {
+					title: [
+						{
+							text: {
+								content: value,
+							},
+						},
+					],
+				};
+			case "rich_text":
+				return {
+					rich_text: [
+						{
+							text: {
+								content: value || '',
+							},
+						},
+					],
+				};
+			case "date":
+				return {
+					date: {
+						start: value || new Date().toISOString(),
+					},
+				};
+			case "number":
+				return {
+					number: Number(value),
+				};
+			case "phone_number":
+				return {
+					phone_number: value,
+				};
+			case "email":
+				return {
+					email: value,
+				};
+			case "url":
+				return {
+					url: value,
+				};
+			case "files":
+				return {
+					files: Array.isArray(value) ? value.map(url => ({
+						name: url,
+						type: "external",
+						external: {
+							url: url,
+						},
+					})) : [
+						{
+							name: value,
+							type: "external",
+							external: {
+								url: value,
+							},
+						},
+					],
+				};
+			case "checkbox":
+				return {
+					checkbox: Boolean(value) || false,
+				};
+			case "select":
+				return {
+					select: {
+						name: value,
+					},
+				};
+			case "multi_select":
+				return {
+					multi_select: Array.isArray(value) ? value.map(item => ({name: item})) : [{name: value}],
+				};
+		}
+	}
+
+	private buildBodyString(
+		customProperties: { customName: string; customType: string }[],
+		customValues: Record<string, string>,
+		childArr: any,
+	) {
+
+		const properties: { [key: string]: any } = {};
+
+		customProperties.forEach(({customName, customType}) => {
+			properties[customName] = this.buildPropertyObject(customName, customType, customValues);
+			}
+		);
+
+
+		return {
+			parent: {
+				database_id: this.dbDetails.databaseID,
+			},
+			properties,
+			children: childArr,
+		};
+	}
+
 }

src/upload/upoload_custom/getMarkdownCustom.ts

@@ -1,28 +1,43 @@
 import {App, Notice} from "obsidian";
 import {i18nConfig} from "../../lang/I18n";
-import {PluginSettings} from "../../ui/settingTabs";
+import {DatabaseDetails} from "../../ui/settingTabs";
 
 export async function getNowFileMarkdownContentCustom(
 	app: App,
-    settings: PluginSettings,
+	dbDetails: DatabaseDetails,
 ) {
 	const nowFile = app.workspace.getActiveFile();
+	if (!nowFile) {
+		new Notice(i18nConfig["open-file"]);
+		return;
+	}
 	let cover = '';
-    let tags = [];
-    let customValues: Record<string, string> = {};
+	let customValues: Record<string, any> = {};
 
 	const FileCache = app.metadataCache.getFileCache(nowFile);
 	try {
 		cover = FileCache.frontmatter.coverurl;
-            tags = FileCache.frontmatter.tags;
 
-            // split the CustomValues into an array
-            const customValuesNames = settings.CustomValues.split('\n').map(value => value.trim());
+		// Get custom property names from dbDetails excluding the title type property
+		const customPropertyNames = dbDetails.customProperties
+			.filter(property => property.customType !== 'title') // Exclude 'title' type property
+			.map(property => property.customName);
 
-            // get the custom values from the frontmatter
-            customValuesNames.forEach(valueName => {
-                customValues[valueName] = FileCache.frontmatter[valueName];
+		// Extract custom values from the front matter based on the names
+		customPropertyNames.forEach(propertyName => {
+			if (FileCache.frontmatter && FileCache.frontmatter[propertyName] !== undefined) {
+				customValues[propertyName] = FileCache.frontmatter[propertyName];
+			}
 		});
+
+		// Check if any of the customProperties has a customType of 'title'
+		const titleProperty = dbDetails.customProperties.find(property => property.customType === 'title');
+
+		// If a 'title' type property exists, use the file's basename as its value
+		if (titleProperty) {
+			customValues[titleProperty.customName] = nowFile.basename; // Use 'basename' for the file name without extension
+		}
+
 	} catch (error) {
 		new Notice(i18nConfig["set-tags-fail"]);
 	}
@@ -33,7 +48,6 @@ export async function getNowFileMarkdownContentCustom(
 			markDownData,
 			nowFile,
 			cover,
-            tags,
 			customValues,
 		};
 	} else {