#324

MuiseDestiny · Apr 26, 2023 · d9cf893 · d9cf893
1 parent 63ba83b
commit d9cf893
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/addon/chrome/content/preferences.xhtml b/addon/chrome/content/preferences.xhtml
@@ -15,6 +15,7 @@
  <checkbox label="Progress" preference="extensions.zotero.__addonRef__.function.progressColumn.enable" />
  <checkbox label="Graph View" preference="extensions.zotero.__addonRef__.function.graphView.enable" />
  <checkbox label="Nested Tags" preference="extensions.zotero.__addonRef__.function.Tags.enable" />
+ <checkbox label="Publication" preference="extensions.zotero.__addonRef__.function.publicationColumn.enable" />
  <checkbox label="View Groups" preference="extensions.zotero.__addonRef__.function.columnsViews.enable" />
  <checkbox label="Item Type Filter" preference="extensions.zotero.__addonRef__.function.itemTypeFilter.enable" />
  <checkbox label="Publication Tags" preference="extensions.zotero.__addonRef__.function.PublicationTagsColumn.enable" />

diff --git a/addon/prefs.js b/addon/prefs.js
@@ -82,6 +82,10 @@ pref("extensions.zotero.__addonRef__.creatorColumn.format", "${firstCreator}");
 pref("extensions.zotero.__addonRef__.creatorColumn.slices", "0:1");
 pref("extensions.zotero.__addonRef__.creatorColumn.join", ", ");
 
+pref("extensions.zotero.__addonRef__.function.publicationColumn.enable", true);
+pref("extensions.zotero.__addonRef__.publicationColumn.fields", "publicationTitle, proceedingsTitle, university, publisher");
+
+
 
 
 pref("extensions.zotero.__addonRef__.nestedTags.sortord", "0");

diff --git a/src/hooks.ts b/src/hooks.ts
@@ -68,6 +68,7 @@ async function onStartup() {
  views.initItemSelectListener(),
  views.addNumberToCollectionTree(),
  views.renderCreatorColumn(),
+ views.renderPublicationColumn()
  ]
  try {
  await Promise.all(tasks);

diff --git a/src/modules/utils.ts b/src/modules/utils.ts
@@ -6,7 +6,7 @@ import LocalStorage from "./localStorage";
 const requests = new Requests()
 
 export function getPublicationTitle(item: Zotero.Item) {
- return [item.getField("publicationTitle"), item.getField("proceedingsTitle")].find(i => i.trim().length > 0)
+ return [item.getField("publicationTitle"), item.getField("proceedingsTitle")].find(i => i.trim().length > 0) || ""
 }
 
 /**

diff --git a/src/modules/views.ts b/src/modules/views.ts
@@ -130,6 +130,7 @@ export default class Views {
  * 标题是必定显示的所以奇数偶数显示逻辑写在这里
  */
  public async renderTitleColumn() {
+ // 防止与其他插件冲突
  await Zotero.Promise.delay(1000)
  ztoolkit.log("renderTitleColumn")
  if (!Zotero.Prefs.get(`${config.addonRef}.function.titleColumn.enable`) as boolean) { return }
@@ -295,6 +296,34 @@ export default class Views {
  )
  }
 
+ public async renderPublicationColumn() {
+ if (!Zotero.Prefs.get(`${config.addonRef}.function.publicationColumn.enable`) as boolean) { return }
+ const key = "publicationTitle"
+ await ztoolkit.ItemTree.addRenderCellHook(
+ key,
+ (index: number, data: string, column: any, original: Function) => {
+ console.log(data)
+ const cellSpan = original(index, data, column) as HTMLSpanElement;
+ const fields = Zotero.Prefs.get(`${config.addonRef}.publicationColumn.fields`) as string
+ const item = ZoteroPane.getSortedItems()[index]
+ cellSpan.innerText = data || fields.split(/,\x20*/).map((field:string) => {
+ return item.getField(field)
+ }).find((i:string)=>i.length>0) || ""
+ return cellSpan
+ }
+ )
+ this.patchSetting(
+ key,
+ [
+ {
+ prefKey: "publicationColumn.fields",
+ name: "Fields",
+ type: "input"
+ },
+ ]
+ )
+ }
+
  private replaceCellIcon(item: Zotero.Item, cellSpan: HTMLSpanElement) {
  const iconSpan = cellSpan.querySelector(".cell-icon") as HTMLSpanElement
  let res = item.attachmentPath?.match(/\.(\w+)$/)
@@ -589,9 +618,15 @@ export default class Views {
  ) => {
  if (!item.isRegularItem()) { return ""}
  try {
- // 只读取本地，不请求网络，避免卡顿
  const data = this.localStorage.get(item, "publication")
- if (!data || data == "") { return "" }
+ if (data == undefined) {
+ // 自动更新
+ window.setTimeout(async () => {
+ await updatePublicationTags(this.localStorage, item)
+ })
+ return ""
+ }
+ if (data == "") { return data }
  // 排序
  let sortBy: any = Zotero.Prefs.get(`${config.addonRef}.${key}Column.sortBy`) as string
  sortBy = sortBy.split(/,\s*/g)