Update version to 2.3.3

Merge pull request #26 from jxpeng98/notice-info
change the success notice colour
2026-07-29 16:35:57 +08:00 · 2024-07-15 14:19:11 +01:00 · 2024-07-15 14:17:01 +01:00 · 2024-07-15 14:15:10 +01:00 · 2024-07-15 14:13:09 +01:00 · 2024-07-14 23:57:01 +01:00
31 changed files with 1705 additions and 1233 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,85 +7,94 @@ on:

 env:
    PLUGIN_NAME: share-to-notionnext # Change this to match the id of your plugin.
-
+    CHANGELOG_FILENAME: CHANGELOG.md
 jobs:
    build:
        name: release
        runs-on: ubuntu-latest

        steps:
-            - uses: actions/checkout@v4
-            - name: Use Node.js
-              uses: actions/setup-node@v3
-              with:
-                  node-version: "18"
+            -   uses: actions/checkout@v4
+            -   name: Use Node.js
+                uses: actions/setup-node@v3
+                with:
+                    node-version: "18"

-            - name: Build
-              id: build
-              run: |
-                  npm install
-                  npm run build
-                  mkdir ${{ env.PLUGIN_NAME }}
-                  cp main.js manifest.json ${{ env.PLUGIN_NAME }}
-                  zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
-                  ls
-                  echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT
+            #            - name: Generate changelog
+            #              id: changelog
+            #              uses: saadmk11/changelog-ci@v1.1.2
+            #              with:
+            #                  github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
+            #                  release_version: ${{ github.ref }}
+            #                  changelog_filename: CHANGELOG.md

-            - name: Create Release
-              id: create_release
-              uses: actions/create-release@v1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-                  VERSION: ${{ github.ref }}
-              with:
-                  tag_name: ${{ github.ref }}
-                  release_name: ${{ github.ref }}
-                  draft: false
-                  prerelease: false
+            -   name: Build
+                id: build
+                run: |
+                    npm install
+                    npm run build
+                    mkdir ${{ env.PLUGIN_NAME }}
+                    cp main.js manifest.json ${{ env.PLUGIN_NAME }}
+                    zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
+                    ls
+                    echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT

-            - name: Upload zip file
-              id: upload-zip
-              uses: actions/upload-release-asset@v1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-              with:
-                  upload_url: ${{ steps.create_release.outputs.upload_url }}
-                  asset_path: ./${{ env.PLUGIN_NAME }}.zip
-                  asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
-                  asset_content_type: application/zip
+            -   name: Create Release
+                id: create_release
+                uses: actions/create-release@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    VERSION: ${{ github.ref }}
+                with:
+                    tag_name: ${{ github.ref }}
+                    release_name: ${{ github.ref }}
+                    body_path: ${{ env.CHANGELOG_FILENAME }}
+                    draft: false
+                    prerelease: false

-            - name: Upload main.js
-              id: upload-main
-              uses: actions/upload-release-asset@v1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-              with:
-                  upload_url: ${{ steps.create_release.outputs.upload_url }}
-                  asset_path: ./main.js
-                  asset_name: main.js
-                  asset_content_type: text/javascript
+            -   name: Upload zip file
+                id: upload-zip
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./${{ env.PLUGIN_NAME }}.zip
+                    asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
+                    asset_content_type: application/zip

-            - name: Upload manifest.json
-              id: upload-manifest
-              uses: actions/upload-release-asset@v1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-              with:
-                  upload_url: ${{ steps.create_release.outputs.upload_url }}
-                  asset_path: ./manifest.json
-                  asset_name: manifest.json
-                  asset_content_type: application/json
+            -   name: Upload main.js
+                id: upload-main
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./main.js
+                    asset_name: main.js
+                    asset_content_type: text/javascript

-            - name: Upload markdown template
-              id: upload-md
-              uses: actions/upload-release-asset@v1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-              with:
-                  upload_url: ${{ steps.create_release.outputs.upload_url }}
-                  asset_path: ./obsidian_template.md
-                  asset_name: template.md
-                  asset_content_type: text/markdown
+            -   name: Upload manifest.json
+                id: upload-manifest
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./manifest.json
+                    asset_name: manifest.json
+                    asset_content_type: application/json
+
+            -   name: Upload markdown template
+                id: upload-md
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./obsidian_template.md
+                    asset_name: template.md
+                    asset_content_type: text/markdown

            # - name: Upload styles.css
            #   id: upload-css
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,7 @@
+## Fix
+
+- Fix a gif link in README.md
+
+## Features
+
+- Change the success notice colour to green
--- a/README.md
+++ b/README.md
@@ -2,252 +2,262 @@

 [![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)
-[![Github all releases](https://img.shields.io/github/downloads/jxpeng98/obsidian-to-NotionNext/total.svg)](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/)
+[![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/package-json/v/jxpeng98/obsidian-to-NotionNext)](https://github.com/jxpeng98/obsidian-to-NotionNext/releases/)

-[中文文档](README-zh.md)
+[//]: # ([![Github all releases]&#40;https://img.shields.io/github/downloads/jxpeng98/obsidian-to-NotionNext/total.svg&#41;]&#40;https://GitHub.com/jxpeng98/obsidian-to-NotionNext/releases/&#41;)
+
+[//]: # ([中文文档]&#40;README-zh.md&#41;)
+
+**Now, support both NotionNext and General databases with customised properties.**
+
+**现在支持NotionNext和普通Notion数据库，可自定义数据库列表。**
+
+## Precautions
+
+### For customised database users
+
+**⚠️⚠️⚠️: The existing customised database should be recreated if you want to update to version 2.3.0. The new version has a new database structure, and the old database structure is not compatible with the new version to build the index properly.**
+
+### 自定义数据库用户
+
+**⚠️⚠️⚠️: 如果你想要更新到2.3.0版本，你需要重新创建自定义数据库。新版本有一个新的数据库结构，旧的数据库结构无法构建索引。**
+
+## TODO List
+
+- [x] ~~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
+
+If you want to use this plugin, you need to follow the following steps to set up the plugin. The steps can be divided into two parts: setting up the Notion API and setting up the plugin in Obsidian.
+
+### 1. Setting up the Notion API
+
+1). Go to [Notion API](https://www.notion.com/my-integrations) to create a new integration, and **copy the token**.
+
+![create-api](https://minioapi.pjx.ac.cn/img1/2024/07/28526e416571f8b1fe70d90bd9975b81.gif)
+
+2). Create a database in your Notion workspace.
+
+Open Notion, click top-left `Create` a new page` -> You can give a title for the page and press "/" Select 'Database - Full page'.
+
+![create-database](https://minioapi.pjx.ac.cn/img1/2024/07/f1bd993ed667bcc980a45194eb647c34.gif)
+
+Rename the database properties to `title` and `tags`.
+**⚠️⚠️`title` is the title column! `tags` is lower case⚠️⚠️**
+
+![rename-title-tags](https://minioapi.pjx.ac.cn/img1/2024/07/20c7b81761195706dde6e7dae69edbc4.gif)
+
+3). Add the Notion API integration.
+
+Click the right-top '...' -> connections -> connect to -> find the integration you created and connect it.
+
+![add-integration](https://minioapi.pjx.ac.cn/img1/2024/07/bf59397146d96727c96dac06515c6c22.gif)
+
+4). Publish the database to the public.
+Click the 'Share' -> 'Publish' -> 'Publish' -> **copy the database id from the URL**.
+
+![share-publish](https://minioapi.pjx.ac.cn/img1/2024/07/5e5b9585cfa4a9086ef6704c3b48eacf.gif)
+
+### 2. Setting up the plugin in Obsidian
+
+1). Go to Obsidian settings -> community plugins -> search 'NotionNext' -> install it.
+  ![plugin](https://minioapi.pjx.ac.cn/img1/2024/07/1bf82618e943ec5eb68d89d4556bc3fc.png)
+
+2). Open the plugin settings and create a new database.
+
+![add-database](https://minioapi.pjx.ac.cn/img1/2024/07/115f47b4180d04fb362b931f8092b5fb.png)
+
+### 3. Create a database
+
+**You can create three types of databases:**
+
+#### 1️⃣ General database
+
+General database is the default database, which only has the `title` and `tags` columns. **⚠️⚠️`title` and `tags` are lowercase⚠️⚠️**
+
+![general](https://minioapi.pjx.ac.cn/img1/2024/07/b2d0d0259afae7a542bd9f62256cd2c2.png)
+
+The general is as follows:
+
+- Full Name: the full name that you would like to give to the database.
+- Abbreviate Name: the abbreviation that you would like to give to the database.
+- Notion tags sync: whether you want to sync the tags column to Notion.
+- Customise title property: whether you want to change the `title` to another name (e.g., `name`).
+- Notion API token: the token you copied from the Notion API page.
+- Notion Database ID: the database ID you copied from the Notion database URL. (e.g., only copy `7158cd3f70ce4f60afd9da5bdf74fd0c` between `site/` and `?`. `https://jxpeng.notion.site/7158cd3f70ce4f60afd9da5bdf74fd0c?v=380317ac5373sadasdas3c13e618f&pvs=4**`)
+
+After setting, it should look like this:
+
+![general-setting](https://minioapi.pjx.ac.cn/img1/2024/07/3fc630171f6e8ae1011271b2b37d5d48.png)
+
+Once you click `save`, the new database will be created in the plugin settings and display in the detabase list.
+
+![database-list](https://minioapi.pjx.ac.cn/img1/2024/07/3dff23b1c13a31f7696dc794fb78eba5.png)
+
+#### 2️⃣ NotionNext database
+
+If you use [NotionNext](https://github.com/tangly1024/NotionNext) to set up your website, you can use the NotionNext database. (**All the properties are in lowercase, and you do not need to change the properties**)
+
+![notionnext](https://minioapi.pjx.ac.cn/img1/2024/07/b164160ccfaf4fb23aa7ac1ce467e235.png)
+
+Like the general database, you need to fill in the following information:
+
+- Full Name: the full name that you would like to give to the database.
+- Abbreviate Name: the abbreviation that you would like to give to the database.
+- Notion API token: the token you copied from the Notion API page.
+- Notion Database ID: the database ID you copied from the Notion database URL.
+
+#### 3️⃣ Custom database
+
+The custom database is purely customised, and you can customise the properties you want to sync. (**All the properties are in lowercase, and you do not need to change the properties**)
+
+![customise](https://minioapi.pjx.ac.cn/img1/2024/07/612b1377ec94d452abec7dc3fbe6cefb.png)
+
+The basic information is identical to the general database and NotionNext database. You need to fill in the following information:
+
+- Full Name: the full name that you would like to give to the database.
+- Abbreviate Name: the abbreviation that you would like to give to the database.
+- Notion API token: the token you copied from the Notion API page.
+- Notion Database ID: the database ID you copied from the Notion database URL.
+
+After adding the information, You can click `Add New Property` to add the properties you want to sync. There is no limit to the number of properties you can add.
+
+![customise-add-property](https://minioapi.pjx.ac.cn/img1/2024/07/17cfbfa93d92404ff70d920302f15981.png)
+
+**⚠️⚠️⚠️**: **`Title column` is the main property in the Notion database, which has the open button to open the underlying page.** You can select the type of all other properties. **⚠️⚠️⚠️**
+
+![title-column](https://minioapi.pjx.ac.cn/img1/2024/07/0521b0aa6cedbe67bca4966bf79041ea.png)
+
+According to the previously shown database, you can use `title` as the `Title column`, and `Tags` as the property 1.
+
+![title-and-tags](https://minioapi.pjx.ac.cn/img1/2024/07/87529214008147d3aa1bbe5868849f31.png)
+
+**Until now, you have set up the plugin in Obsidian. You can start syncing your notes to Notion.**
+
+### 4. Start syncing
+
+Create a new note in Obsidian, and fill in the front matter with the properties you want to sync.
+
+#### 1️⃣ note for general database
+
+For example, we can create a test note with the following front matter:
+
+``` markdown
+---
+title: test
+tags: [test, web]
+---
+
+This is a test file. 
+
+```
+
+After creating the note, you can click the `Share to NotionNext` button on the left sidebar to sync the note to Notion.
+
+![general-sync](https://minioapi.pjx.ac.cn/img1/2024/07/6a690dc4b04d6b74134e9d3d76636c1b.gif)
+
+#### 2️⃣ note for NotionNext database
+
+We use the following front matter for the NotionNext database:
+
+```markdown
+---
+title: test-notionnext
+titleicon: 📎
+date: 2023-07-23
+coverurl: https://img.jxpeng.dev/2023/08/843e27a210847f05a0f7cfb121fec100.jpg
+type: Post
+slug: test
+status: Draft
+category: test
+summary: this is a summary for test post
+icon: fa-solid fa-camera
+password: "1234"
+tags:
+  - test
+  - web
+NotionID-pengjiaxin: 8ba573de-8fdf-4681-b063-c39d26e7860e
+---
+
+this is a test file
+```
+
+![notionnext-sync](https://minioapi.pjx.ac.cn/img1/2024/07/5539ec534e7a855ad87aa7949e5e836f.gif)
+
+#### 3️⃣ note for custom database
+
+##### sync title and tags
+
+Use the previously created general database and rename `title` to `Name` and `tags` to `Tags` in Notion.
+
+![rename-notion](https://minioapi.pjx.ac.cn/img1/2024/07/e4d1c988be22353537998db897c7a471.gif)
+
+The front matter for the custom database is as follows:
+
+```markdown
+---
+Name: test-custom
+Tags:
+  - test
+  - web
+---
+
+This is a test file. 
+```
+
+![sync-custom](https://minioapi.pjx.ac.cn/img1/2024/07/973f17955cd921cca6b5007f0990eea4.gif)
+
+##### sync more properties
+
+Add more property to the custom database. For example, we can add a `summary` and `date` property to the custom database.
+
+  1). Click `Edit` in the plugin settings.
+  ![edit](https://minioapi.pjx.ac.cn/img1/2024/07/f50639d8118b1f106d7bb29be5d3527b.png)
+  2). Click `Add` and add the `summary` and `date` property.
+
+![add-property](https://minioapi.pjx.ac.cn/img1/2024/07/49716657adf0255a37fa214abf4716dc.gif)
+
+  3). After adding the properties, you can see the properties in the plugin settings.
+  ![four properties](https://minioapi.pjx.ac.cn/img1/2024/07/63a0a0e09d537b1cf55cfdc49de4db1a.png)
+  4). Add the `summary` and `date` in Notion
+
+  ![add-in-notion](https://minioapi.pjx.ac.cn/img1/2024/07/d193fe72ce3676bf643b0d1eb92dd4b7.gif)
+
+  5). Create a new note with the `summary` and `date` property.
+    
+  ```markdown
+  ---
+  Name: test-custom-more
+  Tags:
+    - test
+    - web
+  summary: this is a summary for test custom
+  date: 2022-05-03
+  ---
+
+  This is a test file.
+  ```
+
+  6). Sync the note to Notion.
+
+  ![sync-custom](https://minioapi.pjx.ac.cn/img1/2024/07/0e4cfbd61acdaf813fd81ee6d046e067.gif)
+  
+---
+
+## Acknowledgment

 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
-
-### 2.0.1
-
- Add the preview and edit function for database details in the plugin settings. 增加插件设置中数据库详情的预览和编辑功能。
-![](https://minioapi.pjx.ac.cn/img1/2024/01/952f1e579daeac35b257ff7d744b0a3d.png)
-  - Preview:
-  ![](https://minioapi.pjx.ac.cn/img1/2024/01/952f1e579daeac35b257ff7d744b0a3d.png)
-
-  - Edit:
-	![](https://minioapi.pjx.ac.cn/img1/2024/01/ded3d62660f5488c76488304a3fb269e.png)
-  
-### 2.0.0 (Big Update)
-
- redesign the plugin settings UI. From this version, the settings UI will be separated into two parts: 
-  - one for general settings: bannerUrl and your notion username (ID)
-  - one for database list: You can add new database or delete the database.
- 重新设计了插件设置界面。从这个版本开始，设置界面将被分成两部分：
-  - 一部分是通用设置：bannerUrl和你的notion用户名（ID）
-  - 一部分是数据库列表：你可以添加新的数据库或者删除数据库。
-
-![](https://minioapi.pjx.ac.cn/img1/2023/12/f7e89241f45cfee6b902ec4b69dd6f63.png)
-
- You can add more databases in the plugin settings.
- 你可以在插件设置中添加更多的数据库。
-
-![](https://minioapi.pjx.ac.cn/img1/2023/12/023bf46ebbc92c3991d2c443c575bc80.gif)
-
- You can sync one note to multiple databases.
- 你可以将一个笔记同步到多个数据库中。
-
-![](https://minioapi.pjx.ac.cn/img1/2023/12/75f793bad756162e46bf41e54166eb32.png)
-
-**Note: You need to add your previous database in the new template.**
-**注意：你需要将之前的数据库添加到新的模板中。**
-
-### 1.1.2
- Fix the typo that you cannot sync the markdown file `status` in the frontmatter to NotionNext. You can use `stats` or `status` to sync the status of the post to NotionNext. This update will not affect the function of syncing to General database. 
- 修复了一个拼写错误，导致无法同步`status`到NotionNext。现在你可以使用`stats`或者`status`来同步文章的状态到NotionNext。这个更新不会影响到同步到General数据库的功能。
- **Both `stats` and `status` will work, but you can only use one of them.**
- **`stats`和`status`都可以使用，但是你只能使用其中一个。**
-
-For example, 
-```yaml
-stats: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
-# or 
-status: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
-# both of them will work, but you can only use one of them.
-```
-
-### 1.1.1
- Fix the setting display bug in Japanese.
- Add Japanese translation.
-
-### 1.1.0
- Fix the custom name setting tab display bug. 
- Add a toggle to control whether to sync `tags` since the empty tags may cause the syncing error.
-
-If you switch off the `tags` function in the plugin settings, it will ignore the `tags` in your frontmatter. 
-
-If you prefer to sync tags to Notion database, you can switch on the `tags` function in the plugin settings. **You can only use the following format for tags:**
-
-```yaml
-tags: #empty tags, option 1
-tags: [test,test1,test2] # use the square brackets, option 2
-tags: 
-  - test
-  - test1
-  - test2 # use the dash option 3
-```
-
-### 1.0.1
-
- Fix the custom name element display bug in the settings.
-
-### 1.0.0 (Big Update)
-
- From this version, you can **modify the first column name (title column, default: 'title')** as you want. (**Note: You need to have the 'tags' column in your Notion General database, and add `tags:` in your markdown frontmatter. If not, you will receive `network error 400`. But you can leave the `tags:` blank.**)
-
-![](https://minioapi.pjx.ac.cn/img1/2023/11/4a298b9be3990e9d2201bf2f50ca5a0a.png)
-Like this:
-![](https://minioapi.pjx.ac.cn/img1/2023/11/4cd8d79cd9dd9dde299e39c666cb3473.gif)
-
- Add a switch button to control whether display the setting tabs in the plugin settings for both NotionNext and Notion General databases.
-
-![](https://minioapi.pjx.ac.cn/img1/2023/11/becb60fc44783842da4b3cf4c322f363.gif)
-
-### 0.2.6
-
- Add a switch button to control whether to show the upload command in the command palette.
-
-<!-- ![](https://minioapi.pjx.ac.cn/img1/2023/11/147c6a4eaa34da41a6f102558ed77106.png)
-If you turn off the button for the General database, you won't see the option for the General database in the upload command list.
-
-If you turn off the button for the NotionNext database, you won't see the option for the NotionNext database in the upload command list.
-
-![](https://minioapi.pjx.ac.cn/img1/2023/11/70b8e4fc2148688ccbd6cfc53ce339a2.png) -->
-
-### 0.2.3
-
- Fix the bug, now you can update normally.
-
-### 0.2.2
-
- Support both NotionNext and General Notion database.
- You can have one NotionNext and one General Notion database.
- General Notion database can only have `title` and `tags` columns, and `tags` columns should be the multi-selected property. **the name of the columns is case sensitive. You should use small letter.**
-
-![](https://minioapi.pjx.ac.cn/img1/2023/11/712a12081d855aa60f82a7b46913ab7e.gif)
-
-![](https://minioapi.pjx.ac.cn/img1/2023/11/9de76cecceef74c78884ddfc1c221659.gif)
-
-### 0.2.1
-
- Restructure the code
-
-### 0.2.0
-
- From this version, the interactive logic has been rewritten. When you click the ribbon icon, it will display the sync command for all presetting NotionNext databases. You can choose the database you want to sync to. **However, only NotionNext database is supported for now.**
-
-### 0.1.10
-
- Fix the Chinese support in the settings.
-
-### 0.1.8
-
- Rebuild the uploadCommand function, and add one button to select the different databases. **However, only NotionNext database is supported for now.**  
-
-### 0.1.7
-
- [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
-
-### Precautions
-
-For now, this plugin is exclusively for [NotionNext](https://github.com/tangly1024/NotionNext). If you're not using this template, you'll keep receiving `error 400`.
-
-For those without a NotionNext requirement, please use the original [Obsidian-to-notion](https://github.com/EasyChris/obsidian-to-notion).
-
-### Pre-Installation Steps
-
-Before installing the plugin, you must have set up the following:
-
-1. Your NotionNext database.
-2. According to the original author's readme.md, set up the Notion API, and it should already be associated with your NotionNext repository.
-3. NotionNext Database ID
-4. Your NotionNext database should have the following contents:
-    - type
-    - title
-    - slug
-    - category
-    - tags
-    - date
-    - status
-    - summary
-    - password
-    - icon
-
-From version 0.0.6, I also add the following contents:
- - titleicon: the unique icon for each post, it can only support emoji currently.
- - cover url: the cover image for each post, it should be end with a type of image, such as .jpg, .png, .gif, etc.
-
-**If you've directly copied the NotionNext template, these contents should already exist. I've made changes to this plugin based on the original author's work. All you need to ensure is that your database has the above content, and every letter is in lowercase!!!**
-
-**⚠️⚠️⚠️: All headers are in lowercase!!! The order doesn't matter!**
-
-### Plugin Installation
-
-#### Install via Community Plugins
-
-Open `Obsidian settings -> Community Plugins -> Browse -> NotionNext -> Share to NotionNext`
-
-#### Mannually Install
-
-1. Close Obsidian.
-2. Download the plugin file from Release and unzip it into your Obsidian plugin directory.
-3. Re-open Obsidian, go to settings, and enable the plugin.
-4. In the settings, find Obsidian to NotionNext, and enter your NotionNext Database ID and API token.
-
-### How to Use
-
-### Using the Plugin
-
-In the repository, I have uploaded a template which you can directly copy into your template folder. After that, use Obsidian's template feature to create a new note with one click.
-
-If you don't want to use the template, you can also directly create a new file in Obsidian and then copy the content below. Then save it.
-
-```markdown
---
-# 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， 默认是空
-stats: 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
 ---

-Contents Below
-
-```
-
-Usage of the template is as follows:
-![](https://minioapi.pjx.ac.cn/img1/2023/09/354b950e5777b48832c2475e4a31f2cc.gif)
-
-**Plugin preview is shown below**
-![](https://minioapi.pjx.ac.cn/img1/2023/09/d6199619b68fab218fca8ae0cebece78.gif)
-
---
-
-**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.

@@ -421,10 +431,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)
@@ -441,3 +447,6 @@ node update-version.js

 # License
 GNU GPLv3
+
+
+</details>
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
  "id": "share-to-notionnext",
  "name": "Share to NotionNext",
-  "version": "2.0.1",
+  "version": "2.3.3",
  "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",
--- a/obsidian_template.md
+++ b/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， 默认是空，可直接删除
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "share-to-notionnext",
-  "version": "2.0.1",
+  "version": "2.3.3",
  "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",
--- a/src/commands/FuzzySuggester.ts
+++ b/src/commands/FuzzySuggester.ts
@@ -11,7 +11,7 @@ export interface DatabaseList {
 }


-export class FuzzySuggester extends FuzzySuggestModal<DatabaseList>{
+export class FuzzySuggester extends FuzzySuggestModal<DatabaseList> {
    private plugin: MyPlugin;
    private data: DatabaseList[];
    private callback: any;
--- a/src/commands/NotionCommands.ts
+++ b/src/commands/NotionCommands.ts
@@ -1,9 +1,9 @@
 import { i18nConfig } from "src/lang/I18n";
-import {Editor, MarkdownView, setTooltip} from "obsidian";
+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";
+import { DatabaseDetails } from "../ui/settingTabs";


 interface Command {
@@ -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 });
 	}
--- a/src/lang/locale/en.ts
+++ b/src/lang/locale/en.ts
@@ -23,15 +23,18 @@ 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:
-"Collect from share link likes:https://username.notion.site. Your notion id is [username]",
+		"Collect from share link likes:https://username.notion.site. Your notion id is [username]",
 	NotionUserText: "Enter your notion ID",
+	NotionLinkDisplay: "Notion Link Display",
+	NotionLinkDisplayDesc: "Default is ON, if you want to hide the link in the front matter, please turn it off",
 	NotionGeneralSettingHeader: "General Notion Database Settings",
 	NotionGeneralButton: "Notion General Sync",
 	NotionGeneralButtonDesc: "Open this option, Sync to Notion General Database command will be displayed in the command palette (default: ON)",
@@ -45,24 +48,32 @@ export const en = {
 	NotionCustomValues: "Customise values property",
 	NotionCustomValuesDesc: "Modify the column name of the Notion database，one per line",
 	NotionCustomValuesText: "Enter all properties that you want to sync",
-	NotYetFinish:
-"Not finished. This function will be available in the next version",
+	NotYetFinish: "Not finished. This function will be available in the next version",
 	PlaceHolder: "Enter database Name",
 	"notion-logo": "Share to NotionNext",
-	"sync-success": "Sync to NotionNext success: \n",
-	"sync-fail": "Sync to NotionNext fail: \n",
+	"sync-preffix": "Sync to ",
+	"sync-success": "success",
+	"sync-fail": "failed",
 	"open-notion": "Please open the file that needs to be synchronized",
 	"config-secrets-notion-api":
-"Please set up the notion API in the settings tab.",
+		"Please set up the notion API in the settings tab.",
 	"config-secrets-database-id":
-"Please set up the database id in the settings tab.",
+		"Please set up the database id in the settings tab.",
 	"set-tags-fail":
-"Set tags fail,please check the frontmatter of the file or close the tag switch in the settings tab.",
+		"Set tags fail,please check the frontmatter of the file or close the tag switch in the settings tab.",
 	NNonMissing:
-"The 'NNon' property is missing in the settings. Please set it up.",
+		"The 'NNon' property is missing in the settings. Please set it up.",
 	"set-api-id":
-"Please set up the notion API and database ID in the settings tab.",
+		"Please set up the notion API and database ID in the settings tab.",
 	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",
+	CopyErrorMessage: "Auto copy failed, please copy it manually",
 }
--- a/src/lang/locale/ja.ts
+++ b/src/lang/locale/ja.ts
@@ -23,13 +23,16 @@ 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]です",
    NotionUserText: "Notion IDを入力",
+	NotionLinkDisplay: "Notionリンク表示",
+	NotionLinkDisplayDesc: "デフォルトはONです。front matterにリンクを非表示にしたい場合は、オフにしてください",
    NotionGeneralSettingHeader: "一般的なNotionデータベース設定",
    NotionGeneralButton: "一般的なNotion同期",
    NotionGeneralButtonDesc: "このオプションを開くと、一般的なNotionデータベース同期コマンドがコマンドパレットに表示されます（デフォルト：ON）",
@@ -57,4 +60,12 @@ export const ja = {
    NotionCustomSettingHeader: "Notionカスタムデータベース設定",
    NotionCustomButton: "Notionカスタマイズコマンドの切り替え",
    NotionCustomButtonDesc: "このオプションを開くと、Notionカスタムデータベース同期コマンドがコマンドパレットに表示されます",
+	CustomPropertyName: "カスタムプロパティ名",
+	CustomPropertyFirstColumn: "最初の列のカスタムプロパティ名",
+	CustomPropertyFirstColumnDesc: "最初の列のカスタムプロパティ名を入力してください",
+	CustomProperty: "カスタムプロパティ",
+	AddCustomProperty: "カスタムプロパティを追加",
+	AddNewProperty: "新しいプロパティを追加",
+	AddNewPropertyDesc: "新しいプロパティを追加してください",
+    CopyErrorMessage: "自動コピーに失敗しました",
 };
--- a/src/lang/locale/zh.ts
+++ b/src/lang/locale/zh.ts
@@ -23,15 +23,18 @@ 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:
 		"数据库分享链接类似：https://username.notion.site/。你的 Notion ID 是 [username]",
 	NotionUserText: "输入你的 Notion ID",
+	NotionLinkDisplay: "Notion 链接显示",
+	NotionLinkDisplayDesc: "默认开启，如果你不想在front matter中显示链接，请关闭",
 	NotionGeneralSettingHeader: "普通 Notion 数据库设置",
 	NotionGeneralButton: "普通数据库同步",
 	NotionGeneralButtonDesc: "打开此选项，同步到普通数据库命令将显示在命令面板中（默认：开）",
@@ -60,4 +63,12 @@ export const zh = {
 	NotionCustomSettingHeader: "Notion 自定义数据库设置",
 	NotionCustomButton: "Notion 自定义数据库同步命令开关",
 	NotionCustomButtonDesc: "打开此选项，同步到自定义数据库命令将显示在命令面板中",
+	CustomPropertyName: "自定义属性名",
+	CustomPropertyFirstColumn: "第一列属性名",
+	CustomPropertyFirstColumnDesc: "第一列必须为标题属性名",
+	CustomProperty: "自定义属性",
+	AddCustomProperty: "添加自定义属性",
+	AddNewProperty: "添加新属性",
+	AddNewPropertyDesc: "添加一个和Notion数据库匹配的新属性",
+	CopyErrorMessage: "复制链接失败，请手动复制",
 }
--- a/src/main.ts
+++ b/src/main.ts
@@ -55,33 +55,33 @@ export default class ObsidianSyncNotionPlugin extends Plugin {
        await this.saveData(this.settings);
    }

-	async addDatabaseDetails(dbDetails: DatabaseDetails) {
-		this.settings.databaseDetails = {
-			...this.settings.databaseDetails,
-			[dbDetails.abName]: dbDetails,
-		};
+    async addDatabaseDetails(dbDetails: DatabaseDetails) {
+        this.settings.databaseDetails = {
+            ...this.settings.databaseDetails,
+            [dbDetails.abName]: dbDetails,
+        };

-		await this.saveSettings();
-	}
+        await this.saveSettings();
+    }

-	async deleteDatabaseDetails(dbDetails: DatabaseDetails) {
-		delete this.settings.databaseDetails[dbDetails.abName];
+    async deleteDatabaseDetails(dbDetails: DatabaseDetails) {
+        delete this.settings.databaseDetails[dbDetails.abName];

-		await this.saveSettings();
-	}
+        await this.saveSettings();
+    }

-	async updateDatabaseDetails(dbDetails: DatabaseDetails) {
-		// delete the old database details
-		delete this.settings.databaseDetails[dbDetails.abName];
+    async updateDatabaseDetails(dbDetails: DatabaseDetails) {
+        // delete the old database details
+        delete this.settings.databaseDetails[dbDetails.abName];

-		this.settings.databaseDetails = {
-			...this.settings.databaseDetails,
-			[dbDetails.abName]: dbDetails,
-		};
+        this.settings.databaseDetails = {
+            ...this.settings.databaseDetails,
+            [dbDetails.abName]: dbDetails,
+        };
+
+        await this.saveSettings();
+    }

-		await this.saveSettings();
-	}
-	
 }


--- a/src/ui/DeleteModal.ts
+++ b/src/ui/DeleteModal.ts
@@ -0,0 +1,64 @@
+import { App, ButtonComponent, Modal, Setting } from "obsidian";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
+import ObsidianSyncNotionPlugin from "../main";
+
+export class DeleteModal extends Modal {
+	data: Record<string, any> = {
+		deleted: false,
+	}
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+	dbDetails: DatabaseDetails
+
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
+		super(app);
+		this.plugin = plugin;
+		this.settingTab = settingTab;
+		this.dbDetails = dbDetails;
+	}
+
+	display() {
+		this.containerEl.addClass("delete-modal");
+		this.titleEl.setText('Delete Database');
+
+		let { contentEl } = this;
+		contentEl.empty();
+
+		const deleteDiv = contentEl.createDiv('delete-div');
+		deleteDiv.createEl('h4', { text: 'Are you sure you want to delete the following database?' });
+		deleteDiv.createEl('h2', { text: this.dbDetails.fullName + ' (' + this.dbDetails.abName + ', ' + this.dbDetails.format + ')' });
+
+
+		// add delete button
+		let footerEl = contentEl.createDiv('save-button');
+		let deleteButton = new Setting(footerEl)
+
+		deleteButton
+			.addButton((button: ButtonComponent): ButtonComponent => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(async () => {
+						this.data.deleted = true;
+						this.close();
+					})
+			});
+
+		deleteButton.addExtraButton((button) => {
+			return button
+				.setTooltip('Cancel')
+				.setIcon('cross')
+				.onClick(() => {
+					this.data.deleted = false;
+					this.close();
+				});
+		});
+
+	}
+
+
+	onOpen() {
+		this.display();
+	}
+
+}
--- a/src/ui/EditModal.ts
+++ b/src/ui/EditModal.ts
@@ -0,0 +1,349 @@
+import { App, ButtonComponent, Setting } from "obsidian";
+import { customProperty, SettingModal } from "./settingModal";
+import ObsidianSyncNotionPlugin from "../main";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
+import { i18nConfig } from "../lang/I18n";
+
+export class EditModal extends SettingModal {
+	propertyLines: Setting[] = []; // Store all property line settings
+	[key: string]: any; // Index signature
+	dataTemp: Record<string, any> = {
+		databaseFormatTemp: '',
+		// databaseFormatTempInd: false,
+		databaseFullNameTemp: '',
+		// databaseFullNameTempInd: false,
+		databaseAbbreviateNameTemp: '',
+		// databaseAbbreviateNameTempInd: false,
+		notionAPITemp: '',
+		// notionAPITempInd: false,
+		databaseIDTemp: '',
+		// databaseIDTempInd: false,
+		tagButtonTemp: false,
+		// tagButtonTempInd: false,
+		customTitleButtonTemp: false,
+		// customTitleButtonTempInd: false,
+		customTitleNameTemp: '',
+		customPropertiesTemp: [],
+		// customTitleNameTempInd: false,
+		// customValues: '',
+		savedTemp: false,
+		savedTempInd: false,
+	};
+	dataPrev: Record<string, any> = {
+		databaseFormatPrev: '',
+		// databaseFormatPrevInd: false,
+		databaseFullNamePrev: '',
+		// databaseFullNamePrevInd: false,
+		databaseAbbreviateNamePrev: '',
+		// databaseAbbreviateNamePrevInd: false,
+		notionAPIPrev: '',
+		// notionAPIPrevInd: false,
+		databaseIDPrev: '',
+		// databaseIDPrevInd: false,
+		tagButtonPrev: false,
+		// tagButtonPrevInd: false,
+		customTitleButtonPrev: false,
+		// customTitleButtonPrevInd: false,
+		customTitleNamePrev: '',
+		customPropertiesPrev: [],
+		// customTitleNamePrevInd: false,
+		// customValues: '',
+		savedPrev: false,
+		savedPrevInd: false,
+	};
+
+
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+	dbDetails: DatabaseDetails;
+
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
+		super(app, plugin, settingTab);
+		this.plugin = plugin;
+		this.settingTab = settingTab;
+		if (dbDetails) {
+			// Temp details
+			this.dataTemp.databaseFormatTemp = dbDetails.format;
+			this.dataTemp.databaseFullNameTemp = dbDetails.fullName;
+			this.dataTemp.databaseAbbreviateNameTemp = dbDetails.abName;
+			this.dataTemp.notionAPITemp = dbDetails.notionAPI;
+			this.dataTemp.databaseIDTemp = dbDetails.databaseID;
+			this.dataTemp.tagButtonTemp = dbDetails.tagButton;
+			this.dataTemp.customTitleButtonTemp = dbDetails.customTitleButton;
+			this.dataTemp.customTitleNameTemp = dbDetails.customTitleName;
+			this.dataTemp.customPropertiesTemp = dbDetails.customProperties.map(prop => ({ ...prop })); // Ensure deep copy
+			// this.dataTemp.customValues = dbDetails.customValues;
+			this.dataTemp.savedTemp = dbDetails.saved;
+
+			// Prev details
+			this.dataPrev.databaseFormatPrev = dbDetails.format;
+			this.dataPrev.databaseFullNamePrev = dbDetails.fullName;
+			this.dataPrev.databaseAbbreviateNamePrev = dbDetails.abName;
+			this.dataPrev.notionAPIPrev = dbDetails.notionAPI;
+			this.dataPrev.databaseIDPrev = dbDetails.databaseID;
+			this.dataPrev.tagButtonPrev = dbDetails.tagButton;
+			this.dataPrev.customTitleButtonPrev = dbDetails.customTitleButton;
+			this.dataPrev.customTitleNamePrev = dbDetails.customTitleName;
+			this.dataPrev.customPropertiesPrev = dbDetails.customProperties.map(prop => ({ ...prop })); // Ensure deep copy
+			// this.dataTemp.customValues = dbDetails.customValues;
+			this.dataPrev.savedPrev = dbDetails.saved;
+		}
+	}
+
+
+	display(): void {
+		this.containerEl.addClass("edit-modal");
+		this.titleEl.setText('Edit Database');
+
+		let { contentEl } = this;
+		contentEl.empty();
+
+		const editDiv = contentEl.createDiv('edit-div');
+		const nextTabs = contentEl.createDiv('next-tabs');
+
+
+		new Setting(editDiv)
+			.setName(i18nConfig.databaseFormat)
+			.setDesc(i18nConfig.databaseFormatDesc)
+			.addDropdown((component) => {
+				component
+					.addOption('none', '')
+					.addOption('general', i18nConfig.databaseGeneral)
+					.addOption('next', i18nConfig.databaseNext)
+					.addOption('custom', i18nConfig.databaseCustom)
+					.setValue(this.dataTemp.databaseFormatTemp)
+					.onChange(async (value) => {
+						this.dataTemp.databaseFormatTemp = value;
+						nextTabs.empty();
+						this.updateContentBasedOnSelection(value, nextTabs);
+					});
+
+				// Initialize content based on the current dropdown value
+				this.updateContentBasedOnSelection(this.dataTemp.databaseFormatTemp, nextTabs);
+			});
+
+
+		// add save button
+		let footerEl = contentEl.createDiv('save-button');
+		let saveButton = new Setting(footerEl)
+		saveButton.addButton((button: ButtonComponent) => {
+			return button
+				.setTooltip('Save')
+				.setIcon('checkmark')
+				.onClick(async () => {
+					this.dataTemp.savedTempInd = true;
+					this.dataTemp.savedTemp = true;
+					// console.log(this.dataTemp);
+					// console.log(this.dataPrev);
+					this.close();
+				});
+		}
+		);
+		saveButton.addExtraButton((button) => {
+			return button
+				.setTooltip('Cancel')
+				.setIcon('cross')
+				.onClick(() => {
+					// console.log(this.dataTemp);
+					// console.log(this.dataPrev);
+					this.close();
+				});
+		}
+		);
+	}
+
+	onOpen(): void {
+		this.display()
+	}
+
+	updateContentBasedOnSelection(value: string, nextTabs: HTMLElement): void {
+		// Clear existing content
+		nextTabs.empty();
+
+		// Generate content based on the selected value
+		if (value === 'general') {
+			nextTabs.createEl('h3', { text: i18nConfig.NotionGeneralSettingHeader });
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.dataTemp.databaseFullNameTemp, 'dataTemp', 'databaseFullNameTemp')
+
+			// 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)
+
+						})
+				);
+
+
+			// 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 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.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp', 'databaseIDTemp')
+
+
+		} else if (value === 'next') {
+
+			nextTabs.createEl('h3', { text: i18nConfig.NotionNextSettingHeader });
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.dataTemp.databaseFullNameTemp, 'dataTemp', 'databaseFullNameTemp')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.dataTemp.databaseAbbreviateNameTemp, 'dataTemp', 'databaseAbbreviateNameTemp')
+
+			// 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.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp', 'databaseIDTemp')
+
+		} else if (value === 'custom') {
+
+			nextTabs.createEl('h3', { text: i18nConfig.NotionCustomSettingHeader });
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.dataTemp.databaseFullNameTemp, 'dataTemp', 'databaseFullNameTemp')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.dataTemp.databaseAbbreviateNameTemp, 'dataTemp', 'databaseAbbreviateNameTemp')
+
+			// 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.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp', 'databaseIDTemp')
+
+			// add custom properties
+			this.initializePropertyLines(nextTabs, this.dataTemp.customPropertiesTemp);
+		}
+	}
+
+	initializePropertyLines(containerEl: HTMLElement, properties: customProperty[]): void {
+		if (!containerEl) {
+			console.error('Failed to initialize property lines: containerEl is null');
+			return;
+		}
+
+		new Setting(containerEl)
+			.setName("Add New Property")
+			.setDesc("Click to add a new property")
+			.addButton(button => {
+				return button
+					.setButtonText('Add')
+					.setTooltip('Add one more property')
+					.onClick(() => {
+						this.createPropertyLine(containerEl, properties);
+					});
+			});
+
+		properties.forEach(property => {
+			this.updatePropertyLine(containerEl, property, properties);
+		});
+	}
+
+
+	updatePropertyLine(containerEl: HTMLElement, property: customProperty, properties: customProperty[]) {
+		let isExistingProperty = property !== null;
+		const propertyIndex = isExistingProperty ? property.index : properties.length;
+
+		const propertyLine = new Setting(containerEl)
+			.setName(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${propertyIndex}`)
+			.setDesc(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumnDesc : "");
+
+		propertyLine.addText(text => {
+			text.setPlaceholder(i18nConfig.CustomPropertyName)
+				.setValue(isExistingProperty ? property.customName : "")
+				.onChange(value => {
+					const actualIndex = properties.findIndex(p => p.index === propertyIndex);
+					if (actualIndex !== -1) {
+						properties[actualIndex].customName = value;
+					} else {
+						properties.push({ customName: value, customType: '', index: propertyIndex });
+						isExistingProperty = true;
+					}
+				});
+		});
+
+		propertyLine.addDropdown((dropdown) => {
+			const options: Record<string, string> = {
+				'rich_text': 'Text',
+				'number': 'Number',
+				'select': 'Select',
+				'multi_select': 'Multi-Select',
+				'date': 'Date',
+				'files': 'Files & Media',
+				'checkbox': 'Checkbox',
+				'url': 'URL',
+				'email': 'Email',
+				'phone_number': 'Phone Number'
+			};
+
+			if (propertyIndex === 0) {
+				dropdown.addOption('title', 'Title');
+			} else {
+				Object.keys(options).forEach(key => {
+					dropdown.addOption(key, options[key]);
+				});
+			}
+
+			dropdown.setValue(isExistingProperty ? property.customType : "")
+				.onChange(value => {
+					const actualIndex = properties.findIndex(p => p.index === propertyIndex);
+					if (actualIndex !== -1) {
+						properties[actualIndex].customType = value;
+					} else if (!isExistingProperty) {
+						properties.push({ customName: '', customType: value, index: propertyIndex });
+						isExistingProperty = true; // Update the flag to prevent re-adding
+					}
+				});
+		});
+
+		if (propertyIndex > 0) {
+			propertyLine.addButton(button => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(() => {
+						console.log('Deleting property', properties[propertyIndex]);
+						this.deleteProperty(propertyIndex, properties);
+					});
+			});
+		}
+
+		this.propertyLines.push(propertyLine);
+		this.updatePropertyLines();
+
+	}
+
+	createStyleDiv(className: string, commandValue: boolean = false, parentEl: HTMLElement): HTMLDivElement {
+		return super.createStyleDiv(className, commandValue, parentEl);
+	}
+
+	updateSettingEl(element: HTMLElement, commandValue: boolean) {
+		super.updateSettingEl(element, commandValue);
+	}
+
+	createSettingEl(contentEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, dataRecord: string, settingsKey: string): Setting {
+		return super.createSettingEl(contentEl, name, desc, type, placeholder, holderValue, dataRecord, settingsKey);
+	}
+}
--- a/src/ui/PreviewModal.ts
+++ b/src/ui/PreviewModal.ts
@@ -1,13 +1,15 @@
-import {App, ExtraButtonComponent, Modal, Notice, Setting} from "obsidian";
+import { App, ExtraButtonComponent, Modal, Notice, Setting } from "obsidian";
 import ObsidianSyncNotionPlugin from "../main";
-import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
+import { customProperty } from "./settingModal";
+import { i18nConfig } from "../lang/I18n";

 export class PreviewModal extends Modal {
 	plugin: ObsidianSyncNotionPlugin;
 	settingTab: ObsidianSettingTab;
 	dbDetails: DatabaseDetails;

-	constructor(app:App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
 		super(app);
 		this.plugin = plugin;
 		this.settingTab = settingTab;
@@ -24,25 +26,25 @@ export class PreviewModal extends Modal {
 		const previewEl = contentEl.createDiv('preview-content')

 		const dbFormatEl = new Setting(previewEl)
-			dbFormatEl
+		dbFormatEl
 			.setName('Database Format')
-				.addText(text => text
-					.setValue(this.dbDetails.format)
-					.setDisabled(true));
+			.addText(text => text
+				.setValue(this.dbDetails.format)
+				.setDisabled(true));

 		const dbFullEl = new Setting(previewEl)
-			dbFullEl
+		dbFullEl
 			.setName('Database Full Name')
-				.addText(text => text
-					.setValue(this.dbDetails.fullName)
-					.setDisabled(true));
+			.addText(text => text
+				.setValue(this.dbDetails.fullName)
+				.setDisabled(true));

 		const dbAbbrEl = new Setting(previewEl)
-			dbAbbrEl
+		dbAbbrEl
 			.setName('Database Abbreviate Name')
-				.addText(text => text
-					.setValue(this.dbDetails.abName)
-					.setDisabled(true));
+			.addText(text => text
+				.setValue(this.dbDetails.abName)
+				.setDisabled(true));
 		// .controlEl.createEl('p', { text: this.dbDetails.abName })

 		// Setting for toggle and copy buttons
@@ -116,10 +118,61 @@ export class PreviewModal extends Modal {

 		dbIdSetting.settingEl.style.display = 'none'; // Hide initially

+		// Preview the custom properties
+
+		if (this.dbDetails.format === 'custom') {
+
+			const customPrv = previewEl.createDiv("custom-tabs");
+
+			this.previewPropertyLine(previewEl, this.dbDetails.customProperties);
+		}
+
 	}


 	onOpen() {
 		this.display()
 	}
+
+
+	previewPropertyLine(containerEl: HTMLElement, properties: customProperty[]): void {
+
+		properties.forEach((property, index) => {
+			const propertyLine = new Setting(containerEl)
+				.setName(index === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${index}`)
+				.setDesc(index === 0 ? i18nConfig.CustomPropertyFirstColumnDesc : "");
+
+			propertyLine.addText(text => {
+				text.setPlaceholder(i18nConfig.CustomPropertyName)
+					.setValue(property.customName)
+					.setDisabled(true);
+			});
+
+			propertyLine.addDropdown((dropdown) => {
+				const options: Record<string, string> = {
+					'title': 'Title',
+					'rich_text': 'Text',
+					'number': 'Number',
+					'select': 'Select',
+					'multi_select': 'Multi-Select',
+					'date': 'Date',
+					'files': 'Files & Media',
+					'checkbox': 'Checkbox',
+					'url': 'URL',
+					'email': 'Email',
+					'phone_number': 'Phone Number',
+					// Additional options can be added here
+				};
+
+				// Populate dropdown with options
+				Object.keys(options).forEach(key => {
+					dropdown.addOption(key, options[key]);
+				});
+
+				dropdown.setValue(property.customType)
+					.setDisabled(true); // Disable dropdown to prevent changes
+			});
+		});
+	}
+
 }
--- a/src/ui/addButton.ts
+++ b/src/ui/addButton.ts
--- a/src/ui/settingGeneralTabs.ts
+++ b/src/ui/settingGeneralTabs.ts
@@ -1,116 +0,0 @@
-import {App, PluginSettingTab, Setting} from "obsidian";
-import ObsidianSyncNotionPlugin from "../main";
-import {i18nConfig} from "../lang/I18n";
-import {ObsidianSettingTab} from "./settingTabs";
-
-export class SettingGeneralTabs extends PluginSettingTab {
-	plugin: ObsidianSyncNotionPlugin;
-	private settingTab: ObsidianSettingTab;
-
-	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab) {
-		super(app, plugin);
-		this.plugin = plugin;
-		this.settingTab = settingTab;
-	}
-
-	display(): void {
-
-		// General Database Settings
-		this.settingTab.containerEl.createEl('h2', { text: i18nConfig.NotionGeneralSettingHeader });
-
-		// new Setting(containerEl)
-		//     .setName(i18nConfig.NotYetFinish)
-		new Setting(this.settingTab.containerEl)
-			.setName(i18nConfig.NotionGeneralButton)
-			.setDesc(i18nConfig.NotionGeneralButtonDesc)
-			.addToggle((toggle) =>
-				toggle
-					.setValue(this.plugin.settings.GeneralButton)
-					.onChange(async (value) => {
-						this.plugin.settings.GeneralButton = value;
-
-						this.settingTab.updateSettingEl(tagButtonEl, value)
-						this.settingTab.updateSettingEl(CustomTitleEl, value)
-						// name should follow the result of the title button
-						if (value) {
-							this.settingTab.updateSettingEl(CustomNameEl, this.plugin.settings.CustomTitleButton)
-							this.settingTab.updateSettingEl(CustomValuesEl, this.plugin.settings.CustomTitleButton)
-						} else {
-							this.settingTab.updateSettingEl(CustomNameEl, value)
-							this.settingTab.updateSettingEl(CustomValuesEl, value)
-						}
-
-						this.settingTab.updateSettingEl(notionAPIGeneralEl, value)
-						this.settingTab.updateSettingEl(databaseIDGeneralEl, value)
-
-
-						await this.plugin.saveSettings();
-						await this.plugin.commands.updateCommand();
-
-					})
-			);
-
-		// add the tagButton to control whether to add tags to the general database
-		const tagButtonEl = this.settingTab.createStyleDiv('tag-button', (this.plugin.settings.GeneralButton && this.plugin.settings.CustomTitleButton));
-		this.settingTab.createSettingEl(tagButtonEl, i18nConfig.NotionTagButton, i18nConfig.NotionTagButtonDesc, 'toggle', i18nConfig.NotionCustomTitleText, this.plugin.settings.tagButton, 'tagButton')
-
-		// Custom Title Button
-		const CustomTitleEl = this.settingTab.createStyleDiv('custom-title', this.plugin.settings.GeneralButton);
-		new Setting(CustomTitleEl)
-			.setName(i18nConfig.NotionCustomTitle)
-			.setDesc(i18nConfig.NotionCustomTitleDesc)
-			.addToggle((toggle) =>
-				toggle
-					.setValue(this.plugin.settings.CustomTitleButton)
-					.onChange(async (value) => {
-						this.plugin.settings.CustomTitleButton = value;
-
-						this.settingTab.updateSettingEl(CustomNameEl, value)
-
-						this.settingTab.updateSettingEl(CustomValuesEl, value)
-
-						await this.plugin.saveSettings();
-						await this.plugin.commands.updateCommand();
-					})
-			);
-
-		// Custom Title Name
-		const CustomNameEl = this.settingTab.createStyleDiv('custom-name', (this.plugin.settings.CustomTitleButton && this.plugin.settings.GeneralButton));
-		this.settingTab.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.plugin.settings.CustomTitleName, 'CustomTitleName')
-
-		// Custom database properties
-		const CustomValuesEl = this.settingTab.createStyleDiv('custom-values', (this.plugin.settings.CustomTitleButton && this.plugin.settings.GeneralButton));
-		new Setting(CustomValuesEl)
-			.setName(i18nConfig.NotionCustomValues)
-			.setDesc(i18nConfig.NotionCustomValuesDesc)
-			.addTextArea((text) =>
-				text
-					.setPlaceholder(i18nConfig.NotionCustomValuesText)
-					.setValue(this.plugin.settings.CustomValues)
-					.onChange(async (value) => {
-						this.plugin.settings.CustomValues = value;
-						await this.plugin.saveSettings();
-						await this.plugin.commands.updateCommand();
-					})
-			);
-		// new Setting(containerEl)
-		// .setName("Convert tags(optional)")
-		// .setDesc("Transfer the Obsidian tags to the Notion table. It requires the column with the name 'Tags'")
-		// .addToggle((toggle) =>
-		// 	toggle
-		// 		.setValue(this.plugin.settings.allowTags)
-		// 		.onChange(async (value) => {
-		// 			this.plugin.settings.allowTags = value;
-		// 			await this.plugin.saveSettings();
-		// 		})
-		// );
-
-		const notionAPIGeneralEl = this.settingTab.createStyleDiv('api-general', this.plugin.settings.GeneralButton);
-		this.settingTab.createSettingEl(notionAPIGeneralEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.plugin.settings.notionAPIGeneral, 'notionAPIGeneral')
-
-
-		const databaseIDGeneralEl = this.settingTab.createStyleDiv('databaseID-general', this.plugin.settings.GeneralButton);
-		this.settingTab.createSettingEl(databaseIDGeneralEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.plugin.settings.databaseIDGeneral, 'databaseIDGeneral')
-	}
-
-}
--- a/src/ui/settingModal.ts
+++ b/src/ui/settingModal.ts
@@ -1,18 +1,23 @@
 import {
 	Modal,
 	Setting,
-	PluginSettingTab,
 	ButtonComponent, App
 } from 'obsidian';

 import { i18nConfig } from "../lang/I18n";
 import ObsidianSyncNotionPlugin from "../main";
-import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
-import {SettingNextTabs} from "./settingNextTabs";
-import {SettingGeneralTabs} from "./settingGeneralTabs";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";

+export interface customProperty {
+	customName: string;
+	customType: string;
+	index: number;
+}

 export class SettingModal extends Modal {
+	propertyLines: Setting[] = []; // Store all property line settings
+	properties: customProperty[] = []; // Array to store property values and types
+	[key: string]: any; // Index signature
 	data: Record<string, any> = {
 		databaseFormat: 'none',
 		databaseFullName: '',
@@ -22,6 +27,7 @@ export class SettingModal extends Modal {
 		tagButton: true,
 		customTitleButton: false,
 		customTitleName: '',
+		customProperties: [],
 		// customValues: '',
 		saved: false,
 	};
@@ -32,6 +38,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;
@@ -41,10 +48,10 @@ 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;
 		}
-
 	}

 	display(): void {
@@ -59,50 +66,26 @@ export class SettingModal extends Modal {
 		const nextTabs = contentEl.createDiv('next-tabs');


+		new Setting(settingDiv)
+			.setName(i18nConfig.databaseFormat)
+			.setDesc(i18nConfig.databaseFormatDesc)
+			.addDropdown((component) => {
+				component
+					.addOption('none', '')
+					.addOption('general', i18nConfig.databaseGeneral)
+					.addOption('next', i18nConfig.databaseNext)
+					.addOption('custom', i18nConfig.databaseCustom)
+					.setValue(this.data.databaseFormat)
+					.onChange(async (value) => {
+						this.data.databaseFormat = value;
+						nextTabs.empty();
+						this.updateContentBasedOnSelection(value, nextTabs);
+					});

-		if (this.data.saved) {
-			new Setting(settingDiv)
-				.setName(i18nConfig.databaseFormat)
-				.setDesc(i18nConfig.databaseFormatDesc)
-				.addDropdown((component) => {
-					component
-						.addOption('none', '')
-						.addOption('general', i18nConfig.databaseGeneral)
-						.addOption('next', i18nConfig.databaseNext)
-						// .addOption('custom', i18nConfig.databaseCustom)
-						.setValue(this.data.databaseFormat)
-						.onChange(async (value) => {
-							this.data.databaseFormat = value;
-							nextTabs.empty();
-							this.updateContentBasedOnSelection(value, nextTabs);
-						});
-
-					// Initialize content based on the current dropdown value
-					this.updateContentBasedOnSelection(this.data.databaseFormat, nextTabs);
-				});
-
-		} else {
-			new Setting(settingDiv)
-				.setName(i18nConfig.databaseFormat)
-				.setDesc(i18nConfig.databaseFormatDesc)
-				.addDropdown((component) => {
-					component
-						.addOption('none', '')
-						.addOption('general', i18nConfig.databaseGeneral)
-						.addOption('next', i18nConfig.databaseNext)
-						// .addOption('custom', i18nConfig.databaseCustom)
-						.setValue(this.data.databaseFormat)
-						.onChange(async (value) => {
-							this.data.databaseFormat = value;
-							nextTabs.empty();
-							this.updateContentBasedOnSelection(value, nextTabs);
-						});
-
-					// Initialize content based on the current dropdown value
-					this.updateContentBasedOnSelection(this.plugin.settings.databaseFormat, nextTabs);
-				});
-		}
+				// Initialize content based on the current dropdown value
+				(this.data.saved) ? this.updateContentBasedOnSelection(this.data.databaseFormat, nextTabs) : this.updateContentBasedOnSelection(this.plugin.settings.databaseFormat, nextTabs);

+			});


 		// add save button
@@ -114,6 +97,7 @@ export class SettingModal extends Modal {
 				.setIcon('checkmark')
 				.onClick(async () => {
 					this.data.saved = true;
+					this.data.customProperties = this.properties;
 					this.close();
 				});
 		}
@@ -124,6 +108,7 @@ export class SettingModal extends Modal {
 				.setIcon('cross')
 				.onClick(() => {
 					this.data.saved = false;
+					// this.data.customProperties = this.properties;
 					this.close();
 				});
 		}
@@ -139,13 +124,13 @@ export class SettingModal extends Modal {
 			nextTabs.createEl('h3', { text: i18nConfig.NotionGeneralSettingHeader });

 			// add full name
-			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'databaseFullName')
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'data', 'databaseFullName')

 			// add abbreviate name
-			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'databaseAbbreviateName')
+			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, 'tagButton')
+			this.createSettingEl(nextTabs, i18nConfig.NotionTagButton, i18nConfig.NotionTagButtonDesc, 'toggle', i18nConfig.NotionCustomTitleText, this.data.tagButton, 'data', 'tagButton')

 			// add custom title button

@@ -154,30 +139,25 @@ 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)

-							// 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, '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, 'notionAPI')
+			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, 'databaseID')
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')


 		} else if (value === 'next') {
@@ -185,97 +165,167 @@ export class SettingModal extends Modal {
 			nextTabs.createEl('h3', { text: i18nConfig.NotionNextSettingHeader });

 			// add full name
-			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'databaseFullName')
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'data', 'databaseFullName')

 			// add abbreviate name
-			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'databaseAbbreviateName')
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'data', 'databaseAbbreviateName')

 			// add api key
-			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.data.notionAPI, 'notionAPI')
+			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, '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});
+
+			nextTabs.createEl('h3', { text: i18nConfig.NotionCustomSettingHeader });

 			// add full name
-			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'databaseFullName')
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'data', 'databaseFullName')

 			// add abbreviate name
-			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'databaseAbbreviateName')
-
-			// tag button
-			this.createSettingEl(nextTabs, i18nConfig.NotionTagButton, i18nConfig.NotionTagButtonDesc, 'toggle', i18nConfig.NotionCustomTitleText, this.data.tagButton, '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, '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();
-			// 			});
-			// 	});
-
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'data', 'databaseAbbreviateName')

 			// 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, '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, '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 one more property')
+						.setButtonText('Add New Property')
+						.onClick(async () => {
+							const customTabs = nextTabs.createDiv("custom-tabs");
+							this.createPropertyLine(customTabs, this.properties);
+						});
+				}
+				);
 		}
-
 	}


-
 	onOpen() {
 		// add console log to check if the modal is opened
 		this.display()
 	}

+	createPropertyLine(containerEl: HTMLElement, properties: customProperty[]): void {
+		const propertyIndex = properties.length;

+		properties.push({ customName: "", customType: "", index: propertyIndex });
+
+		const propertyLine = new Setting(containerEl)
+			.setName(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${propertyIndex}`)
+			.setDesc(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumnDesc : "");
+
+		propertyLine.addText(text => {
+			text.setPlaceholder(i18nConfig.CustomPropertyName)
+				.setValue("")
+				.onChange(value => {
+					let actualIndex = properties.findIndex(p => p.index === propertyIndex);
+					if (actualIndex !== -1) {
+						properties[actualIndex].customName = value;
+					}
+				});
+		});
+
+
+		propertyLine.addDropdown((dropdown) => {
+			const options: Record<string, string> = {
+				'rich_text': 'Text',
+				'number': 'Number',
+				'select': 'Select',
+				'multi_select': 'Multi-Select',
+				'date': 'Date',
+				'files': 'Files & Media',
+				'checkbox': 'Checkbox',
+				'url': 'URL',
+				'email': 'Email',
+				'phone_number': 'Phone Number',
+				// 'formula': 'Formula',
+				// 'relation': 'Relation',
+				// 'rollup': 'Rollup',
+				// 'created_time': 'Created time',
+				// 'created_by': 'Created by',
+				// 'last_edited_time': 'Last Edited Time',
+				// 'last_edited_by': 'Last Edited By',
+			};
+
+			const currentProperty = properties[propertyIndex];
+
+			if (propertyIndex === 0) {
+				dropdown.addOption("title", "Title");
+			} else {
+				Object.keys(options).forEach(key => {
+					dropdown.addOption(key, options[key]);
+				});
+			}
+			dropdown.setValue("")
+				.onChange(value => {
+					if (currentProperty) {
+						currentProperty.customType = value;
+						// Retrieve the index of currentProperty from the properties array
+						const updatedIndex = properties.findIndex(p => p === currentProperty);
+						console.log(`Updated value at index ${updatedIndex}: ${value}`);
+					} else {
+						console.log("Property not found, may have been deleted.");
+					}
+				});
+		});
+
+
+		if (propertyIndex > 0) {
+			propertyLine.addButton(button => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(() => {
+						this.deleteProperty(propertyIndex, properties);
+					});
+			});
+		}
+
+		this.propertyLines.push(propertyLine);
+		this.updatePropertyLines(); // Ensure property lines are updated after creation
+	}
+
+	deleteProperty(propertyIndex: number, properties: customProperty[]): void {
+		let actualIndex = properties.findIndex(p => p.index === propertyIndex);
+		if (actualIndex !== -1) {
+			properties.splice(actualIndex, 1);
+			if (this.propertyLines[actualIndex]) {
+				this.propertyLines[actualIndex].settingEl.remove();
+				this.propertyLines.splice(actualIndex, 1);
+			}
+			// Update indices in the properties array
+			properties.forEach((prop, idx) => {
+				prop.index = idx;
+			});
+
+			this.updatePropertyLines();
+		}
+	}
+
+	updatePropertyLines() {
+		this.propertyLines.forEach((line, idx) => {
+			line.setName(idx === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${idx}`);
+		});
+	}

 	// create a function to create a div with a style for pop over elements
-	public createStyleDiv(className: string, commandValue: boolean = false,parentEl: HTMLElement ) {
+	public createStyleDiv(className: string, commandValue: boolean = false, parentEl: HTMLElement) {
 		return parentEl.createDiv(className, (div) => {
 			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";
@@ -285,7 +335,7 @@ export class SettingModal extends Modal {
 	}

 	// function to add one setting element in the setting tab.
-	public createSettingEl(contentEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any,settingsKey: string) {
+	public createSettingEl(contentEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, dataRecord: string, settingsKey: string) {
 		if (type === 'password') {
 			return new Setting(contentEl)
 				.setName(name)
@@ -296,7 +346,7 @@ export class SettingModal extends Modal {
 						.setPlaceholder(placeholder)
 						.setValue(holderValue)
 						.onChange(async (value) => {
-							this.data[settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
+							this[dataRecord][settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
 						})
 				});
 		} else if (type === 'toggle') {
@@ -307,7 +357,7 @@ export class SettingModal extends Modal {
 					toggle
 						.setValue(holderValue)
 						.onChange(async (value) => {
-							this.data[settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
+							this[dataRecord][settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
 						})
 				);
 		} else if (type === 'text') {
@@ -319,7 +369,7 @@ export class SettingModal extends Modal {
 						.setPlaceholder(placeholder)
 						.setValue(holderValue)
 						.onChange(async (value) => {
-							this.data[settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
+							this[dataRecord][settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
 						})
 				);
 		}
--- a/src/ui/settingNextTabs.ts
+++ b/src/ui/settingNextTabs.ts
@@ -1,49 +0,0 @@
-import {App, PluginSettingTab, Setting} from "obsidian";
-import ObsidianSyncNotionPlugin from "../main";
-import {i18nConfig} from "../lang/I18n";
-import {ObsidianSettingTab} from "./settingTabs";
-import {SettingModal} from "./settingModal";
-
-export class SettingNextTabs extends PluginSettingTab {
-	plugin: ObsidianSyncNotionPlugin;
-	settingModal: SettingModal;
-
-	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab) {
-		super(app, plugin);
-		this.plugin = plugin;
-	}
-
-	display(): void {
-
-		// notion next database settings
-		this.containerEl.createEl('h2', { text: i18nConfig.NotionNextSettingHeader });
-
-		const NextButtonEl = this.containerEl.createDiv();
-
-		new Setting(NextButtonEl)
-			.setName(i18nConfig.NotionNextButton)
-			.setDesc(i18nConfig.NotionNextButtonDesc)
-			.addToggle((toggle) =>
-				toggle
-					.setValue(this.plugin.settings.NextButton)
-					.onChange(async (value) => {
-						this.plugin.settings.NextButton = value;
-
-						this.settingModal.updateSettingEl(notionAPINextEl, value)
-
-						this.settingModal.updateSettingEl(databaseIDNextEl, value)
-
-						await this.plugin.saveSettings();
-						await this.plugin.commands.updateCommand();
-					})
-			);
-
-
-		const notionAPINextEl = this.settingModal.createStyleDiv('api-next', this.plugin.settings.NextButton,NextButtonEl)
-		this.settingModal.createSettingEl(notionAPINextEl, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.plugin.settings.notionAPINext,'notionAPINext')
-
-		const databaseIDNextEl = this.settingModal.createStyleDiv('databaseID-next', this.plugin.settings.NextButton,NextButtonEl)
-		this.settingModal.createSettingEl(databaseIDNextEl, i18nConfig.DatabaseID, i18nConfig.NotionAPIDesc, 'password', i18nConfig.DatabaseIDText, this.plugin.settings.databaseIDNext,'databaseIDNext')
-	}
-
-}
--- a/src/ui/settingTabs.ts
+++ b/src/ui/settingTabs.ts
@@ -1,30 +1,30 @@
-import {App, ButtonComponent, PluginSettingTab, Setting} from "obsidian";
-import {i18nConfig} from "../lang/I18n";
+import { App, ButtonComponent, PluginSettingTab, Setting } from "obsidian";
+import { i18nConfig } from "../lang/I18n";
 import ObsidianSyncNotionPlugin from "../main";
-import {SettingModal} from "./settingModal";
-import {SettingNextTabs} from "./settingNextTabs";
-import {SettingGeneralTabs} from "./settingGeneralTabs";
-import {set} from "yaml/dist/schema/yaml-1.1/set";
-import {PreviewModal} from "./PreviewModal";
+import { SettingModal } from "./settingModal";
+import { PreviewModal } from "./PreviewModal";
+import { EditModal } from "./EditModal";
+import { DeleteModal } from "./DeleteModal";

 export interface PluginSettings {
-    NextButton: boolean;
-    notionAPINext: string;
-    databaseIDNext: string;
-    bannerUrl: string;
-    notionUser: string;
-    proxy: string;
-    GeneralButton: boolean;
-    tagButton: boolean;
-    CustomTitleButton: boolean;
-    CustomTitleName: string;
-    notionAPIGeneral: string;
-    databaseIDGeneral: string;
-    CustomButton: boolean;
-    CustomValues: string;
-    notionAPICustom: string;
-    databaseIDCustom: string;
-    [key: string]: any;
+	NextButton: boolean;
+	notionAPINext: string;
+	databaseIDNext: string;
+	bannerUrl: string;
+	notionUser: string;
+	NotionLinkDisplay: boolean;
+	proxy: string;
+	GeneralButton: boolean;
+	tagButton: boolean;
+	customTitleButton: boolean;
+	customTitleName: string;
+	notionAPIGeneral: string;
+	databaseIDGeneral: string;
+	CustomButton: boolean;
+	CustomValues: string;
+	notionAPICustom: string;
+	databaseIDCustom: string;
+	[key: string]: any;
 	databaseDetails: Record<string, DatabaseDetails>
 }

@@ -37,55 +37,58 @@ export interface DatabaseDetails {
 	tagButton: boolean;
 	customTitleButton: boolean;
 	customTitleName: string;
+	customProperties: { customName: string, customType: string, index: number }[];
 	// customValues: string;
 	saved: boolean;
 }

 export const DEFAULT_SETTINGS: PluginSettings = {
-    NextButton: true,
-    notionAPINext: "",
-    databaseIDNext: "",
-    bannerUrl: "",
-    notionUser: "",
-    proxy: "",
-    GeneralButton: true,
-    tagButton: true,
-    CustomTitleButton: false,
-    CustomTitleName: "",
-    notionAPIGeneral: "",
-    databaseIDGeneral: "",
-    CustomButton: false,
-    CustomValues: "",
-    notionAPICustom: "",
-    databaseIDCustom: "",
+	NextButton: true,
+	notionAPINext: "",
+	databaseIDNext: "",
+	bannerUrl: "",
+	notionUser: "",
+	NotionLinkDisplay: true,
+	proxy: "",
+	GeneralButton: true,
+	tagButton: true,
+	customTitleButton: false,
+	customTitleName: "",
+	notionAPIGeneral: "",
+	databaseIDGeneral: "",
+	CustomButton: false,
+	CustomValues: "",
+	notionAPICustom: "",
+	databaseIDCustom: "",
 	databaseDetails: {},
 };


 export class ObsidianSettingTab extends PluginSettingTab {
-    plugin: ObsidianSyncNotionPlugin;
+	plugin: ObsidianSyncNotionPlugin;
 	databaseEl: HTMLDivElement;

-    constructor(app: App, plugin: ObsidianSyncNotionPlugin) {
-        super(app, plugin);
-        this.plugin = plugin;
-    }
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin) {
+		super(app, plugin);
+		this.plugin = plugin;
+	}

-    display(): void {
-        const { containerEl } = this;
+	display(): void {
+		const { containerEl } = this;

-        containerEl.empty();
+		containerEl.empty();

-        // General Settings
-        containerEl.createEl('h2', { text: i18nConfig.GeneralSetting });
+		// General Settings
+		containerEl.createEl('h2', { text: i18nConfig.GeneralSetting });

-        this.createSettingEl(containerEl, i18nConfig.BannerUrl, i18nConfig.BannerUrlDesc, 'text', i18nConfig.BannerUrlText, this.plugin.settings.bannerUrl, '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, 'notionUser')
+		this.createSettingEl(containerEl, i18nConfig.NotionUser, i18nConfig.NotionUserDesc, 'text', i18nConfig.NotionUserText, this.plugin.settings.notionUser, 'notionUser')
+
+		this.createSettingEl(containerEl, i18nConfig.NotionLinkDisplay, i18nConfig.NotionLinkDisplayDesc, 'toggle', i18nConfig.NotionLinkDisplay, this.plugin.settings.NotionLinkDisplay, 'NotionLinkDisplay')


 		// add new button
-
 		new Setting(containerEl)
 			.setName("Add New Database")
 			.setDesc("Add New Database")
@@ -107,6 +110,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,
 								}
@@ -124,105 +128,74 @@ export class ObsidianSettingTab extends PluginSettingTab {
 			});

 		// new section to display all created database
-		containerEl.createEl('h2', {text: "Database List"});
+		containerEl.createEl('h2', { text: "Database List" });

 		this.databaseEl = containerEl.createDiv('database-list');
 		// list all created database
 		this.showDatabase();

+	}

+	// create a function to create a div with a style for pop over elements
+	// public createStyleDiv(className: string, commandValue: boolean = false) {
+	//     return this.containerEl.createDiv(className, (div) => {
+	//         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";
+		element.style.paddingTop = commandValue ? "0.75em" : "0";
+		element.style.display = commandValue ? "block" : "none";
+		element.style.alignItems = "center";
+	}

-
-		// // notion next database settings
-		//
-		// const NextTabs = new SettingNextTabs(this.app, this.plugin, this);
-		//
-		// NextTabs.display();
-		//
-		//
-        // // General Database Settings
-		// const GeneralTabs = new SettingGeneralTabs(this.app, this.plugin, this);
-		//
-		// GeneralTabs.display();
-
-
-        // Custom Database Settings
-
-        // containerEl.createEl('h2', {text: i18nConfig.NotionCustomSettingHeader});
-        //
-        // new Setting(containerEl)
-        // 	.setName(i18nConfig.NotionCustomButton)
-        // 	.setDesc(i18nConfig.NotionCustomButtonDesc)
-        // 	.addToggle((toggle) =>
-        // 		toggle
-        // 			.setValue(this.plugin.settings.CustomButton)
-        // 			.onChange(async (value) => {
-        // 				this.plugin.settings.CustomButton = value;
-        // 				await this.plugin.saveSettings();
-        // 			})
-        // 	);
-    }
-
-    // create a function to create a div with a style for pop over elements
-    public createStyleDiv(className: string, commandValue: boolean = false) {
-        return this.containerEl.createDiv(className, (div) => {
-            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";
-        element.style.paddingTop = commandValue ? "0.75em" : "0";
-        element.style.display = commandValue ? "block" : "none";
-        element.style.alignItems = "center";
-    }
-
-    // function to add one setting element in the setting tab.
-    public createSettingEl(containerEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, settingsKey: string) {
-        if (type === 'password') {
-            return new Setting(containerEl)
-                .setName(name)
-                .setDesc(desc)
-                .addText((text) => {
-                    text.inputEl.type = type;
-                    return text
-                        .setPlaceholder(placeholder)
-                        .setValue(holderValue)
-                        .onChange(async (value) => {
-                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
-                            await this.plugin.saveSettings();
-                        })
-                });
-        } else if (type === 'toggle') {
-            return new Setting(containerEl)
-                .setName(name)
-                .setDesc(desc)
-                .addToggle((toggle) =>
-                    toggle
-                        .setValue(holderValue)
-                        .onChange(async (value) => {
-                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
-                            await this.plugin.saveSettings();
-                            await this.plugin.commands.updateCommand();
-                        })
-                );
-        } else if (type === 'text') {
-            return new Setting(containerEl)
-                .setName(name)
-                .setDesc(desc)
-                .addText((text) =>
-                    text
-                        .setPlaceholder(placeholder)
-                        .setValue(holderValue)
-                        .onChange(async (value) => {
-                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
-                            await this.plugin.saveSettings();
-                            await this.plugin.commands.updateCommand();
-                        })
-                );
-        }
-    }
+	// function to add one setting element in the setting tab.
+	public createSettingEl(containerEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, settingsKey: string) {
+		if (type === 'password') {
+			return new Setting(containerEl)
+				.setName(name)
+				.setDesc(desc)
+				.addText((text) => {
+					text.inputEl.type = type;
+					return text
+						.setPlaceholder(placeholder)
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+							await this.plugin.saveSettings();
+						})
+				});
+		} else if (type === 'toggle') {
+			return new Setting(containerEl)
+				.setName(name)
+				.setDesc(desc)
+				.addToggle((toggle) =>
+					toggle
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+							await this.plugin.saveSettings();
+							await this.plugin.commands.updateCommand();
+						})
+				);
+		} else if (type === 'text') {
+			return new Setting(containerEl)
+				.setName(name)
+				.setDesc(desc)
+				.addText((text) =>
+					text
+						.setPlaceholder(placeholder)
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+							await this.plugin.saveSettings();
+							await this.plugin.commands.updateCommand();
+						})
+				);
+		}
+	}

 	// function to show all the database details
 	showDatabase() {
@@ -238,8 +211,8 @@ export class ObsidianSettingTab extends PluginSettingTab {
 				.setDesc(dbDetails.format)


-				// add a button for preview data
-				settingEl
+			// add a button for preview data
+			settingEl
 				.addButton((button: ButtonComponent): ButtonComponent => {
 					return button
 						.setTooltip("Preview Database")
@@ -251,30 +224,47 @@ export class ObsidianSettingTab extends PluginSettingTab {
 						});
 				});

-				settingEl
+			// add a button for edit data
+			settingEl
 				.addButton((button: ButtonComponent): ButtonComponent => {
 					return button
 						.setTooltip("Edit Database")
 						.setIcon("pencil")
 						.onClick(async () => {
-							let modal = new SettingModal(this.app, this.plugin, this, dbDetails);
+							let modal = new EditModal(this.app, this.plugin, this, dbDetails);

 							modal.onClose = () => {
-								if (modal.data.saved) {
-									const dbDetails = {
-										format: modal.data.databaseFormat,
-										fullName: modal.data.databaseFullName,
-										abName: modal.data.databaseAbbreviateName,
-										notionAPI: modal.data.notionAPI,
-										databaseID: modal.data.databaseID,
-										tagButton: modal.data.tagButton,
-										customTitleButton: modal.data.customTitleButton,
-										customTitleName: modal.data.customTitleName,
+								if (modal.dataTemp.savedTempInd) {
+									const dbDetailsNew: DatabaseDetails = {
+										format: modal.dataTemp.databaseFormatTemp,
+										fullName: modal.dataTemp.databaseFullNameTemp,
+										abName: modal.dataTemp.databaseAbbreviateNameTemp,
+										notionAPI: modal.dataTemp.notionAPITemp,
+										databaseID: modal.dataTemp.databaseIDTemp,
+										tagButton: modal.dataTemp.tagButtonTemp,
+										customTitleButton: modal.dataTemp.customTitleButtonTemp,
+										customTitleName: modal.dataTemp.customTitleNameTemp,
+										customProperties: modal.dataTemp.customPropertiesTemp,
 										// customValues: modal.data.customValues,
-										saved: modal.data.saved,
+										saved: modal.dataTemp.savedTemp,
 									}

-									this.plugin.updateDatabaseDetails(dbDetails);
+									const dbDetailsPrev: DatabaseDetails = {
+										format: modal.dataPrev.databaseFormatPrev,
+										fullName: modal.dataPrev.databaseFullNamePrev,
+										abName: modal.dataPrev.databaseAbbreviateNamePrev,
+										notionAPI: modal.dataPrev.notionAPIPrev,
+										databaseID: modal.dataPrev.databaseIDPrev,
+										tagButton: modal.dataPrev.tagButtonPrev,
+										customTitleButton: modal.dataPrev.customTitleButtonPrev,
+										customTitleName: modal.dataPrev.customTitleNamePrev,
+										customProperties: modal.dataPrev.customPropertiesPrev,
+										// customValues: modal.data.customValues,
+										saved: modal.dataPrev.savedPrev,
+									}
+
+									this.plugin.deleteDatabaseDetails(dbDetailsPrev);
+									this.plugin.updateDatabaseDetails(dbDetailsNew);

 									this.plugin.commands.updateCommand();

@@ -286,17 +276,28 @@ export class ObsidianSettingTab extends PluginSettingTab {
 						});
 				});

-				settingEl
+			settingEl
 				.addButton((button: ButtonComponent): ButtonComponent => {
 					return button
 						.setTooltip("Delete Database")
 						.setIcon("trash")
 						.onClick(async () => {
-							await this.plugin.deleteDatabaseDetails(dbDetails);
+							let modal = new DeleteModal(this.app, this.plugin, this, dbDetails);

-							await this.plugin.commands.updateCommand();
+							modal.onClose = () => {
+								if (modal.data.deleted) {
+									this.plugin.deleteDatabaseDetails(dbDetails);
+
+									console.log(dbDetails.fullName + " deleted");
+
+									this.plugin.commands.updateCommand();
+
+									this.display()
+								}
+							}
+
+							modal.open();

-							this.display()
 						});
 				});
 		}
--- a/src/upload/updateYaml.ts
+++ b/src/upload/updateYaml.ts
@@ -1,6 +1,7 @@
 import { App, Notice, TFile } from "obsidian";
 import ObsidianSyncNotionPlugin from "../main";
-import {DatabaseDetails, PluginSettings} from "../ui/settingTabs";
+import { DatabaseDetails } from "../ui/settingTabs";
+import { i18nConfig } from "src/lang/I18n";

 export async function updateYamlInfo(
    yamlContent: string,
@@ -8,14 +9,14 @@ export async function updateYamlInfo(
    res: any,
    app: App,
    plugin: ObsidianSyncNotionPlugin,
-	dbDetails: DatabaseDetails,
+    dbDetails: DatabaseDetails,
 ) {
    let { url, id } = res.json
    // replace www to notionID
-    const { notionUser } = plugin.settings;
-	const { abName } = dbDetails
-	const notionIDKey = `NotionID-${abName}`;
-	const linkKey = `link-${abName}`;
+    const { notionUser, NotionLinkDisplay } = plugin.settings;
+    const { abName } = dbDetails
+    const notionIDKey = `NotionID-${abName}`;
+    const linkKey = `link-${abName}`;

    if (notionUser !== "") {
        // replace url str "www" to notionID
@@ -31,25 +32,13 @@ export async function updateYamlInfo(
        }
        // add new notionID and link
        yamlContent[notionIDKey] = id;
-        yamlContent[linkKey] = url;
+        (NotionLinkDisplay) ? yamlContent[linkKey] = url : null;
    });

    try {
        await navigator.clipboard.writeText(url)
    } catch (error) {
-        new Notice(`复制链接失败，请手动复制${error}`)
+        console.log(error)
+        new Notice(`${i18nConfig.CopyErrorMessage}`);
    }
-    // const __content = yamlContent.__content;
-    // delete yamlContent.__content
-    // const yamlhead = yaml.stringify(yamlContent)
-    // //  if yamlhead hava last \n  remove it
-    // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
-    // // if __content have start \n remove it
-    // const __content_remove_n = __content.replace(/^\n/, '')
-    // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
-    // try {
-    // 	await nowFile.vault.modify(nowFile, content)
-    // } catch (error) {
-    // 	new Notice(`write file error ${error}`)
-    // }
 }
--- a/src/upload/uploadCommand.ts
+++ b/src/upload/uploadCommand.ts
@@ -3,116 +3,122 @@ import { App, Notice } from "obsidian";
 import { Upload2NotionNext } from "./upload_next/Upload2NotionNext";
 import { Upload2NotionGeneral } from "./upload_general/Upload2NotionGeneral";
 import { Upload2NotionCustom } from "./upoload_custom/Upload2NotionCustom";
-import {DatabaseDetails, PluginSettings} from "../ui/settingTabs";
+import { DatabaseDetails, PluginSettings } from "../ui/settingTabs";
 import ObsidianSyncNotionPlugin from "../main";
 import { getNowFileMarkdownContentNext } from "./upload_next/getMarkdownNext";
 import { getNowFileMarkdownContentGeneral } from "./upload_general/getMarkdownGeneral";
-import {getNowFileMarkdownContentCustom} from "./upoload_custom/getMarkdownCustom";
+import { getNowFileMarkdownContentCustom } from "./upoload_custom/getMarkdownCustom";

 export async function uploadCommandNext(
-    plugin: ObsidianSyncNotionPlugin,
-    settings: PluginSettings,
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
 	dbDetails: DatabaseDetails,
-    app: App,
+	app: App,
 ) {

-    const { notionAPI, databaseID } = dbDetails;
+	const { notionAPI, databaseID } = dbDetails;

-    // Check if NNon exists
-    // if (NNon === undefined) {
-    //     const NNonmessage = i18nConfig.NNonMissing;
-    //     new Notice(NNonmessage);
-    //     return;
-    // }
+	// Check if the user has set up the Notion API and database ID
+	if (notionAPI === "" || databaseID === "") {
+		const setAPIMessage = i18nConfig["set-api-id"];
+		new Notice(setAPIMessage);
+		return;
+	}

-    // Check if the user has set up the Notion API and database ID
-    if (notionAPI === "" || databaseID === "") {
-        const setAPIMessage = i18nConfig["set-api-id"];
-        new Notice(setAPIMessage);
-        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;
+		const upload = new Upload2NotionNext(plugin, dbDetails);
+		const res = await upload.syncMarkdownToNotionNext(basename, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, markDownData, nowFile, this.app);

-    if (markDownData) {
-        const { basename } = nowFile;
-        const upload = new Upload2NotionNext(plugin, dbDetails);
-        const res = await upload.syncMarkdownToNotionNext(basename, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, markDownData, nowFile, this.app);
+		if (res.status === 200) {
+			new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
+		}

-        if (res.status === 200) {
-            new Notice(`${i18nConfig["sync-success"]}${basename}`);
-        } else {
-            new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
-        }
-
-    }
+	}
 }


-
 export async function uploadCommandGeneral(
-    plugin: ObsidianSyncNotionPlugin,
-    settings: PluginSettings,
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
 	dbDetails: DatabaseDetails,
-    app: App,
+	app: App,
 ) {

-    const { notionAPI, databaseID } = dbDetails;
+	const { notionAPI, databaseID } = dbDetails;

-    // Check if the user has set up the Notion API and database ID
-    if (notionAPI === "" || databaseID === "") {
-        const setAPIMessage = i18nConfig["set-api-id"];
-        new Notice(setAPIMessage);
-        return;
-    }
+	// Check if the user has set up the Notion API and database ID
+	if (notionAPI === "" || databaseID === "") {
+		const setAPIMessage = i18nConfig["set-api-id"];
+		new Notice(setAPIMessage);
+		return;
+	}

-    const { markDownData, nowFile, cover, tags } = await getNowFileMarkdownContentGeneral(app, settings)
+	const { markDownData, nowFile, cover, tags } = await getNowFileMarkdownContentGeneral(app, settings)

-    if (markDownData) {
-        const { basename } = nowFile;
+	if (markDownData) {
+		const { basename } = nowFile;

-        const upload = new Upload2NotionGeneral(plugin, dbDetails);
-        const res = await upload.syncMarkdownToNotionGeneral(basename, cover, tags, markDownData, nowFile, this.app);
+		const upload = new Upload2NotionGeneral(plugin, dbDetails);
+		const res = await upload.syncMarkdownToNotionGeneral(basename, cover, tags, markDownData, nowFile, this.app);

-        if (res.status === 200) {
-            new Notice(`${i18nConfig["sync-success"]}${basename}`);
-        } else {
-            new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
-        }
+		if (res.status === 200) {
+			new Notice(`${i18nConfig["sync-success"]}${basename}`).noticeEl.style.color = "green";
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
+		}

-    }
+	}
 }


 export async function uploadCommandCustom(
-    plugin: ObsidianSyncNotionPlugin,
-    settings: PluginSettings,
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
 	dbDetails: DatabaseDetails,
-    app: App,
+	app: App,
 ) {

-    const { notionAPI, databaseID } = settings;
+	const { notionAPI, databaseID } = settings;

-    // Check if the user has set up the Notion API and database ID
-    if (notionAPI === "" || databaseID === "") {
-        const setAPIMessage = i18nConfig["set-api-id"];
-        new Notice(setAPIMessage);
-        return;
-    }
+	// Check if the user has set up the Notion API and database ID
+	if (notionAPI === "" || databaseID === "") {
+		const setAPIMessage = i18nConfig["set-api-id"];
+		new Notice(setAPIMessage);
+		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;
+	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 upload = new Upload2NotionCustom(plugin, dbDetails);
+		const res = await upload.syncMarkdownToNotionCustom(cover, customValues, markDownData, nowFile, this.app);

-        if (res.status === 200) {
-            new Notice(`${i18nConfig["sync-success"]}${basename}`);
-        } else {
-            new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
-        }
+		if (res.status === 200) {
+			new Notice(`${i18nConfig["sync-success"]}${basename}`).noticeEl.style.color = "green";
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
+		}

-    }
+	}
 }
--- a/src/upload/upload_general/BaseUpload2NotionGeneral.ts
+++ b/src/upload/upload_general/BaseUpload2NotionGeneral.ts
@@ -1,95 +1,96 @@
-import {App, Notice, requestUrl, TFile} from "obsidian";
-import {Client} from '@notionhq/client';
-import {markdownToBlocks,} from "@tryfabric/martian";
+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"
 import MyPlugin from "src/main";
-import {DatabaseDetails} from "../../ui/settingTabs";
+import { DatabaseDetails } from "../../ui/settingTabs";

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

-    async deletePage(notionID: string) {
+	async deletePage(notionID: string) {

-		const {notionAPI} = this.dbDetails
-        return requestUrl({
-            url: `https://api.notion.com/v1/blocks/${notionID}`,
-            method: 'DELETE',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': 'Bearer ' + notionAPI,
-                'Notion-Version': '2022-06-28',
-            },
-            body: ''
-        });
-    }
+		const { notionAPI } = this.dbDetails
+		return requestUrl({
+			url: `https://api.notion.com/v1/blocks/${notionID}`,
+			method: 'DELETE',
+			headers: {
+				'Content-Type': 'application/json',
+				'Authorization': 'Bearer ' + notionAPI,
+				'Notion-Version': '2022-06-28',
+			},
+			body: ''
+		});
+	}

-    async getDataBase(databaseID: string) {
-		const {notionAPI} = this.dbDetails
-        const response = await requestUrl({
-                url: `https://api.notion.com/v1/databases/${databaseID}`,
-                method: 'GET',
-                headers: {
-                    'Authorization': 'Bearer ' + notionAPI,
-                    'Notion-Version': '2022-06-28',
-                }
-            }
-        )
+	async getDataBase(databaseID: string) {
+		const { notionAPI } = this.dbDetails
+		const response = await requestUrl({
+			url: `https://api.notion.com/v1/databases/${databaseID}`,
+			method: 'GET',
+			headers: {
+				'Authorization': 'Bearer ' + notionAPI,
+				'Notion-Version': '2022-06-28',
+			}
+		}
+		)

-        // Check if cover is present in the JSON response and then get the URL
-        if (response.json.cover && response.json.cover.external) {
-            return response.json.cover.external.url;
-        } else {
-            return null;  // or some other default value, if you prefer
-        }
-    }
+		// Check if cover is present in the JSON response and then get the URL
+		if (response.json.cover && response.json.cover.external) {
+			return response.json.cover.external.url;
+		} else {
+			return null;  // or some other default value, if you prefer
+		}
+	}

-    // async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
-    //     let {url, id} = res.json
-    //     // replace www to notionID
-    //     const {notionUser} = this.plugin.settings;
-    //
-    //     if (notionUser !== "") {
-    //         // replace url str "www" to notionID
-    //         url = url.replace("www.notion.so", `${notionUser}.notion.site`)
-    //     }
-    //
-    //     await app.fileManager.processFrontMatter(nowFile, yamlContent => {
-    //         if (yamlContent['notionID']) {
-    //             delete yamlContent['notionID']
-    //         }
-    //         if (yamlContent['link']) {
-    //             delete yamlContent['link']
-    //         }
-    //         // add new notionID and link
-    //         yamlContent.notionID = id;
-    //         yamlContent.link = url;
-    //     });
-    //
-    //     try {
-    //         await navigator.clipboard.writeText(url)
-    //     } catch (error) {
-    //         new Notice(`复制链接失败，请手动复制${error}`)
-    //     }
-    //     // const __content = yamlContent.__content;
-    //     // delete yamlContent.__content
-    //     // const yamlhead = yaml.stringify(yamlContent)
-    //     // //  if yamlhead hava last \n  remove it
-    //     // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
-    //     // // if __content have start \n remove it
-    //     // const __content_remove_n = __content.replace(/^\n/, '')
-    //     // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
-    //     // try {
-    //     // 	await nowFile.vault.modify(nowFile, content)
-    //     // } catch (error) {
-    //     // 	new Notice(`write file error ${error}`)
-    //     // }
-    // }
+	// async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
+	//     let {url, id} = res.json
+	//     // replace www to notionID
+	//     const {notionUser} = this.plugin.settings;
+	//
+	//     if (notionUser !== "") {
+	//         // replace url str "www" to notionID
+	//         url = url.replace("www.notion.so", `${notionUser}.notion.site`)
+	//     }
+	//
+	//     await app.fileManager.processFrontMatter(nowFile, yamlContent => {
+	//         if (yamlContent['notionID']) {
+	//             delete yamlContent['notionID']
+	//         }
+	//         if (yamlContent['link']) {
+	//             delete yamlContent['link']
+	//         }
+	//         // add new notionID and link
+	//         yamlContent.notionID = id;
+	//         yamlContent.link = url;
+	//     });
+	//
+	//     try {
+	//         await navigator.clipboard.writeText(url)
+	//     } catch (error) {
+	//         new Notice(`复制链接失败，请手动复制${error}`)
+	//     }
+	//     // const __content = yamlContent.__content;
+	//     // delete yamlContent.__content
+	//     // const yamlhead = yaml.stringify(yamlContent)
+	//     // //  if yamlhead hava last \n  remove it
+	//     // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
+	//     // // if __content have start \n remove it
+	//     // const __content_remove_n = __content.replace(/^\n/, '')
+	//     // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
+	//     // try {
+	//     // 	await nowFile.vault.modify(nowFile, content)
+	//     // } catch (error) {
+	//     // 	new Notice(`write file error ${error}`)
+	//     // }
+	// }
 }
--- a/src/upload/upload_general/Upload2NotionGeneral.ts
+++ b/src/upload/upload_general/Upload2NotionGeneral.ts
@@ -4,7 +4,7 @@ import { markdownToBlocks } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import { DatabaseDetails, PluginSettings } from "../../ui/settingTabs";
 import { UploadBaseGeneral } from "./BaseUpload2NotionGeneral";
 import { updateYamlInfo } from "../updateYaml";

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


--- a/src/upload/upload_general/getMarkdownGeneral.ts
+++ b/src/upload/upload_general/getMarkdownGeneral.ts
@@ -1,33 +1,33 @@
-import {App, Notice} from "obsidian";
-import {i18nConfig} from "../../lang/I18n";
-import {PluginSettings} from "../../ui/settingTabs";
+import { App, Notice } from "obsidian";
+import { i18nConfig } from "../../lang/I18n";
+import { PluginSettings } from "../../ui/settingTabs";

 export async function getNowFileMarkdownContentGeneral(
-    app: App,
-    settings: PluginSettings,
+	app: App,
+	settings: PluginSettings,
 ) {
-    const nowFile = app.workspace.getActiveFile();
-    let cover = '';
-    let tags = [];
+	const nowFile = app.workspace.getActiveFile();
+	let cover = '';
+	let tags = [];

-    const FileCache = app.metadataCache.getFileCache(nowFile);
-    try {
-            cover = FileCache.frontmatter.coverurl;
-            tags = FileCache.frontmatter.tags;
-    } catch (error) {
-        new Notice(i18nConfig["set-tags-fail"]);
-    }
+	const FileCache = app.metadataCache.getFileCache(nowFile);
+	try {
+		cover = FileCache.frontmatter.coverurl;
+		tags = FileCache.frontmatter.tags;
+	} catch (error) {
+		new Notice(i18nConfig["set-tags-fail"]);
+	}

-    if (nowFile) {
-        const markDownData = await nowFile.vault.read(nowFile);
-        return {
-            markDownData,
-            nowFile,
-            cover,
-            tags,
-        };
-    } else {
-        new Notice(i18nConfig["open-file"]);
-        return;
-    }
+	if (nowFile) {
+		const markDownData = await nowFile.vault.read(nowFile);
+		return {
+			markDownData,
+			nowFile,
+			cover,
+			tags,
+		};
+	} else {
+		new Notice(i18nConfig["open-file"]);
+		return;
+	}
 }
--- a/src/upload/upload_next/BaseUpload2NotionNext.ts
+++ b/src/upload/upload_next/BaseUpload2NotionNext.ts
@@ -4,21 +4,21 @@ import { markdownToBlocks, } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails} from "../../ui/settingTabs";
+import { DatabaseDetails } from "../../ui/settingTabs";

 export class UploadBaseNext {
    plugin: MyPlugin;
    notion: Client;
    agent: any;
-	dbDetails: DatabaseDetails
+    dbDetails: DatabaseDetails

    constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
        this.plugin = plugin;
-		this.dbDetails = dbDetails
+        this.dbDetails = dbDetails
    }

    async deletePage(notionID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails
        return requestUrl({
            url: `https://api.notion.com/v1/blocks/${notionID}`,
            method: 'DELETE',
@@ -32,7 +32,7 @@ export class UploadBaseNext {
    }

    async getDataBase(databaseID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails

        const response = await requestUrl({
            url: `https://api.notion.com/v1/databases/${databaseID}`,
--- a/src/upload/upload_next/Upload2NotionNext.ts
+++ b/src/upload/upload_next/Upload2NotionNext.ts
@@ -5,17 +5,17 @@ import { markdownToBlocks, } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import { DatabaseDetails, PluginSettings } from "../../ui/settingTabs";
 import { updateYamlInfo } from "../updateYaml";
-import {LIMITS, paragraph} from "@tryfabric/martian/src/notion";
+import { LIMITS, paragraph } from "@tryfabric/martian/src/notion";

 export class Upload2NotionNext extends UploadBaseNext {
    settings: PluginSettings;
-	dbDetails: DatabaseDetails
+    dbDetails: DatabaseDetails

    constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
        super(plugin, dbDetails);
-		this.dbDetails = dbDetails
+        this.dbDetails = dbDetails
    }

    // 因为需要解析notion的block进行对比，非常的麻烦，
@@ -38,7 +38,7 @@ export class Upload2NotionNext extends UploadBaseNext {
    ) {
        await this.deletePage(notionID)

-		const { databaseID} = this.dbDetails
+        const { databaseID } = this.dbDetails

        const databaseCover = await this.getDataBase(databaseID)

@@ -78,19 +78,16 @@ export class Upload2NotionNext extends UploadBaseNext {
        childArr: any
    ) {

-		const {
-			databaseID,
-			notionAPI
-		} = this.dbDetails
+        const {
+            databaseID,
+            notionAPI
+        } = this.dbDetails


        const bodyString: any = {
            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",
@@ -217,41 +238,41 @@ export class Upload2NotionNext extends UploadBaseNext {
        nowFile: TFile,
        app: App,
    ): Promise<any> {
-		const options = {
-			notionLimits: {
-				truncate: false,
-			}
-		}
+        const options = {
+            notionLimits: {
+                truncate: false,
+            }
+        }
        let res: any
        const yamlContent: any = yamlFrontMatter.loadFront(markdown);
        const __content = yamlContent.__content
        const file2Block = markdownToBlocks(__content, options);
        const frontmasster = app.metadataCache.getFileCache(nowFile)?.frontmatter
-		const {abName} = this.dbDetails
-		const notionIDKey = `${abName}-NotionID`;
-		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
+        const { abName } = this.dbDetails
+        const notionIDKey = `NotionID-${abName}`;
+        const notionID = frontmasster ? frontmasster[notionIDKey] : null;


-		// increase the limits
-		// Motivated by https://github.com/tryfabric/martian/issues/51
-		file2Block.forEach((block,index) => {
-			if (
-				block.type === 'paragraph' &&
-				block.paragraph.rich_text.length > LIMITS.RICH_TEXT_ARRAYS
-			) {
+        // increase the limits
+        // Motivated by https://github.com/tryfabric/martian/issues/51
+        file2Block.forEach((block, index) => {
+            if (
+                block.type === 'paragraph' &&
+                block.paragraph.rich_text.length > LIMITS.RICH_TEXT_ARRAYS
+            ) {

-				const newParagraphBlocks: any[] = []
-				const chunk:any = []
-				const richTextChunks = chunk(block.paragraph.rich_text, 100)
+                const newParagraphBlocks: any[] = []
+                const chunk: any = []
+                const richTextChunks = chunk(block.paragraph.rich_text, 100)

-				richTextChunks.forEach((chunk: any) => {
-					newParagraphBlocks.push(paragraph(chunk))
-				})
+                richTextChunks.forEach((chunk: any) => {
+                    newParagraphBlocks.push(paragraph(chunk))
+                })

-				file2Block.splice(index, 1, ...newParagraphBlocks)
+                file2Block.splice(index, 1, ...newParagraphBlocks)

-			}
-		})
+            }
+        })

        if (notionID) {
            res = await this.updatePage(
--- a/src/upload/upload_next/getMarkdownNext.ts
+++ b/src/upload/upload_next/getMarkdownNext.ts
@@ -13,7 +13,7 @@ export async function getNowFileMarkdownContentNext(
    let type = '';
    let slug = '';
    let stats = '';
-	let status = '';
+    let status = '';
    let category = '';
    let summary = '';
    let paword = '';
--- a/src/upload/upoload_custom/BaseUpload2NotionCustom.ts
+++ b/src/upload/upoload_custom/BaseUpload2NotionCustom.ts
@@ -1,24 +1,24 @@
-import {App, Notice, requestUrl, TFile} from "obsidian";
-import {Client} from '@notionhq/client';
-import {markdownToBlocks,} from "@tryfabric/martian";
+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"
 import MyPlugin from "src/main";
-import {DatabaseDetails} from "../../ui/settingTabs";
+import { DatabaseDetails } from "../../ui/settingTabs";

 export class UploadBaseCustom {
    plugin: MyPlugin;
    notion: Client;
    agent: any;
-	dbDetails: DatabaseDetails
+    dbDetails: DatabaseDetails

    constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
        this.plugin = plugin;
-		this.dbDetails = dbDetails
+        this.dbDetails = dbDetails
    }

    async deletePage(notionID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails
        return requestUrl({
            url: `https://api.notion.com/v1/blocks/${notionID}`,
            method: 'DELETE',
@@ -32,15 +32,15 @@ export class UploadBaseCustom {
    }

    async getDataBase(databaseID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails
        const response = await requestUrl({
-                url: `https://api.notion.com/v1/databases/${databaseID}`,
-                method: 'GET',
-                headers: {
-                    'Authorization': 'Bearer ' + notionAPI,
-                    'Notion-Version': '2022-06-28',
-                }
+            url: `https://api.notion.com/v1/databases/${databaseID}`,
+            method: 'GET',
+            headers: {
+                'Authorization': 'Bearer ' + notionAPI,
+                'Notion-Version': '2022-06-28',
            }
+        }
        )

        // Check if cover is present in the JSON response and then get the URL
@@ -50,46 +50,4 @@ export class UploadBaseCustom {
            return null;  // or some other default value, if you prefer
        }
    }
-
-    // async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
-    //     let {url, id} = res.json
-    //     // replace www to notionID
-    //     const {notionUser} = this.plugin.settings;
-    //
-    //     if (notionUser !== "") {
-    //         // replace url str "www" to notionID
-    //         url = url.replace("www.notion.so", `${notionUser}.notion.site`)
-    //     }
-    //
-    //     await app.fileManager.processFrontMatter(nowFile, yamlContent => {
-    //         if (yamlContent['notionID']) {
-    //             delete yamlContent['notionID']
-    //         }
-    //         if (yamlContent['link']) {
-    //             delete yamlContent['link']
-    //         }
-    //         // add new notionID and link
-    //         yamlContent.notionID = id;
-    //         yamlContent.link = url;
-    //     });
-    //
-    //     try {
-    //         await navigator.clipboard.writeText(url)
-    //     } catch (error) {
-    //         new Notice(`复制链接失败，请手动复制${error}`)
-    //     }
-    //     // const __content = yamlContent.__content;
-    //     // delete yamlContent.__content
-    //     // const yamlhead = yaml.stringify(yamlContent)
-    //     // //  if yamlhead hava last \n  remove it
-    //     // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
-    //     // // if __content have start \n remove it
-    //     // const __content_remove_n = __content.replace(/^\n/, '')
-    //     // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
-    //     // try {
-    //     // 	await nowFile.vault.modify(nowFile, content)
-    //     // } catch (error) {
-    //     // 	new Notice(`write file error ${error}`)
-    //     // }
-    // }
 }
--- a/src/upload/upoload_custom/Upload2NotionCustom.ts
+++ b/src/upload/upoload_custom/Upload2NotionCustom.ts
@@ -1,12 +1,11 @@
 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"
 import MyPlugin from "src/main";
-import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import { DatabaseDetails, PluginSettings } from "../../ui/settingTabs";
 import { updateYamlInfo } from "../updateYaml";
-import {UploadBaseCustom} from "./BaseUpload2NotionCustom";
+import { UploadBaseCustom } from "./BaseUpload2NotionCustom";

 export class Upload2NotionCustom extends UploadBaseCustom {
 	settings: PluginSettings;
@@ -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 = {
@@ -108,6 +71,8 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 			};
 		}

+		console.log(bodyString)
+
 		try {
 			return await requestUrl({
 				url: `https://api.notion.com/v1/pages`,
@@ -127,15 +92,14 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 	}

 	async syncMarkdownToNotionCustom(
-		title: string,
 		cover: string,
-		tags: string[],
 		customValues: Record<string, string>,
 		markdown: string,
 		nowFile: TFile,
 		app: App,
 	): Promise<any> {
 		const options = {
+			strictImageUrls: true,
 			notionLimits: {
 				truncate: false,
 			}
@@ -146,25 +110,134 @@ 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) {
+		if (res && res.status === 200) {
 			await updateYamlInfo(markdown, nowFile, res, app, this.plugin, this.dbDetails);
 		} else {
 			new Notice(`${res.text}`);
 		}
 		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 } = {};
+
+		// Only include custom properties that have values
+		customProperties.forEach(({ customName, customType }) => {
+			if (customValues[customName] !== undefined) {
+				properties[customName] = this.buildPropertyObject(customName, customType, customValues);
+			}
+		}
+		);
+
+		// console.log(properties)
+
+		return {
+			parent: {
+				database_id: this.dbDetails.databaseID,
+			},
+			properties,
+			children: childArr,
+		};
+	}
+
 }
--- a/src/upload/upoload_custom/getMarkdownCustom.ts
+++ b/src/upload/upoload_custom/getMarkdownCustom.ts
@@ -1,43 +1,57 @@
-import {App, Notice} from "obsidian";
-import {i18nConfig} from "../../lang/I18n";
-import {PluginSettings} from "../../ui/settingTabs";
+import { App, Notice } from "obsidian";
+import { i18nConfig } from "../../lang/I18n";
+import { DatabaseDetails } from "../../ui/settingTabs";

 export async function getNowFileMarkdownContentCustom(
-    app: App,
-    settings: PluginSettings,
+	app: App,
+	dbDetails: DatabaseDetails,
 ) {
-    const nowFile = app.workspace.getActiveFile();
-    let cover = '';
-    let tags = [];
-    let customValues: Record<string, string> = {};
+	const nowFile = app.workspace.getActiveFile();
+	if (!nowFile) {
+		new Notice(i18nConfig["open-file"]);
+		return;
+	}
+	let cover = '';
+	let customValues: Record<string, any> = {};

-    const FileCache = app.metadataCache.getFileCache(nowFile);
-    try {
-            cover = FileCache.frontmatter.coverurl;
-            tags = FileCache.frontmatter.tags;
+	const FileCache = app.metadataCache.getFileCache(nowFile);
+	try {
+		cover = FileCache.frontmatter.coverurl;

-            // 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];
-            });
-    } catch (error) {
-        new Notice(i18nConfig["set-tags-fail"]);
-    }
+		// 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];
+			}
+		});

-    if (nowFile) {
-        const markDownData = await nowFile.vault.read(nowFile);
-        return {
-            markDownData,
-            nowFile,
-            cover,
-            tags,
-            customValues,
-        };
-    } else {
-        new Notice(i18nConfig["open-file"]);
-        return;
-    }
+		// 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"]);
+	}
+
+	if (nowFile) {
+		const markDownData = await nowFile.vault.read(nowFile);
+		return {
+			markDownData,
+			nowFile,
+			cover,
+			customValues,
+		};
+	} else {
+		new Notice(i18nConfig["open-file"]);
+		return;
+	}
 }
Author	SHA1	Message	Date
Jiaxin Peng	3c3ec6881e	Update version to 2.3.3	2024-07-15 14:19:11 +01:00
Jiaxin Peng	a80155fafc	Merge pull request #26 from jxpeng98/notice-info change the success notice colour	2024-07-15 14:17:01 +01:00
Jiaxin Peng	3a814b8390	feat: change the success notice colour	2024-07-15 14:15:10 +01:00
Jiaxin Peng	bb522db9a2	fix: readme gif link update	2024-07-15 14:13:09 +01:00
Jiaxin Peng	201f72ae0e	update notice	2024-07-14 23:57:01 +01:00
Jiaxin Peng	be6f192dd8	Update readme file	2024-07-14 21:51:53 +01:00
Jiaxin Peng	4ce1019094	Update Readme links	2024-07-14 20:27:02 +01:00
Jiaxin Peng	095c608511	update readme with new instruction	2024-07-14 17:58:21 +01:00
Jiaxin Peng	2d8d7fb11a	Update version to 2.3.2	2024-07-14 17:52:59 +01:00
Jiaxin Peng	36725cb699	fix: Text property in custom database	2024-07-14 17:52:43 +01:00
Jiaxin Peng	654e7e854d	更新 README.md	2024-07-10 00:32:00 +01:00
Jiaxin Peng	fa67f08512	Update version to 2.3.1	2024-07-05 09:50:31 +01:00
Jiaxin Peng	7e42ef49a7	Merge pull request #24 from jxpeng98/notion-link feat: add notion link display	2024-07-05 09:49:27 +01:00
Jiaxin Peng	5a95aa0acc	feat: add notion link display	2024-07-05 09:48:35 +01:00
Jiaxin Peng	ded01ce678	Update version to 2.3.0	2024-07-04 20:57:35 +01:00
Jiaxin Peng	3535d9fc70	Merge pull request #23 from jxpeng98/edit-modal edit modal update for customised database	2024-07-04 20:55:41 +01:00
Jiaxin Peng	9c93e38aff	reformat code and update readme file	2024-07-04 20:51:07 +01:00
Jiaxin Peng	bfde5dfe1a	finish the edit modal	2024-07-04 20:28:28 +01:00
Jiaxin Peng	d8eb3c8984	feat: cancel function works well	2024-07-04 18:12:31 +01:00
Jiaxin Peng	1cee2b67a6	update edit modal with better display setting.	2024-07-04 17:06:23 +01:00
Jiaxin Peng	82529ce56a	back up for edit modal	2024-07-04 10:00:46 +01:00
Jiaxin Peng	70f30f0713	Add support for notion link display in the front matter.	2024-07-03 22:35:47 +01:00
Jiaxin Peng	24ebb0bf8a	Back up edit modal	2024-07-03 22:01:46 +01:00
Jiaxin Peng	d7372c7c55	Improve preview function for customised database	2024-07-03 16:05:24 +01:00
Jiaxin Peng	f7bcf71020	create retrieve function to get all created properties for customised database	2024-07-03 14:26:02 +01:00
Jiaxin Peng	72146afe48	update settingModal.ts refactor the customise database and improve the creating logic	2024-07-03 13:39:56 +01:00
Jiaxin Peng	9bcdb42edb	settingmodal save mapping for reference	2024-07-03 11:06:54 +01:00
Jiaxin Peng	16e0827991	update the basic function of edit modal	2024-07-03 08:47:33 +01:00
Jiaxin Peng	863a6fb0dc	more clear logic customised database setting code	2024-07-02 23:56:35 +01:00
Jiaxin Peng	5799ffe79b	Update custom function and adjust the custom interface ui	2024-07-02 23:48:37 +01:00
Jiaxin Peng	a8ebab7fcb	change tags titleicon and summary to optional function in next database	2024-03-17 14:36:55 +00:00
Jiaxin Peng	e0ec27ad07	update readme	2024-03-12 22:04:34 +00:00
Jiaxin Peng	85220105b0	update README	2024-03-08 15:23:17 +00:00
Jiaxin Peng	9afdb24a82	typo	2024-02-26 11:57:28 +00:00
Jiaxin Peng	3c7ab13995	update readme	2024-02-26 11:53:02 +00:00
Jiaxin Peng	31b72f3bd3	Update version to 2.2.4	2024-02-19 23:08:47 +00:00
Jiaxin Peng	ee5aada1b9	Update version to 2.2.3	2024-02-19 20:51:47 +00:00
Jiaxin Peng	9e15044f6a	Update version to 2.2.2	2024-02-16 23:10:22 +00:00
Jiaxin Peng	9d891dae55	Update version to 2.2.1	2024-01-29 20:43:14 +00:00
Jiaxin Peng	bc665253ec	Update version to 2.2.0	2024-01-29 19:03:09 +00:00
Jiaxin Peng	125c75f7c0	Merge pull request #13 from jxpeng98/custom add the customisation function	2024-01-29 19:01:37 +00:00
Jiaxin Peng	8248640b5f	fix the extra argument in the uploadcommand	2024-01-29 11:55:52 +00:00
Jiaxin Peng	0198898086	update the readme and changelog	2024-01-29 11:53:18 +00:00
Jiaxin Peng	8c6aea8250	Complete the basic function of customisation	2024-01-29 11:12:07 +00:00
Jiaxin Peng	a179d3da52	almost finish the structure	2024-01-29 00:55:06 +00:00
Jiaxin Peng	569d8eb699	fix the error of the display of title custom button	2024-01-28 00:26:58 +00:00
Jiaxin Peng	2a58dd3258	complete the custom ui design	2024-01-28 00:11:11 +00:00
Jiaxin Peng	8c65e471eb	Update version to 2.1.2	2024-01-09 11:44:40 +00:00
Jiaxin Peng	388693d5b4	Update version to 2.1.1	2024-01-09 11:38:03 +00:00
Jiaxin Peng	dda6710fe9	remove redundant settingtabs	2024-01-09 11:37:47 +00:00
Jiaxin Peng	76ea9a4aee	Update version to 2.1.0	2024-01-09 11:34:11 +00:00
Jiaxin Peng	856f83e8a1	Add confirmation delete button and modify edit modal interface.	2024-01-09 11:33:39 +00:00