From 1a094b20aabdaa0643e9638ac860a90b81f4731d Mon Sep 17 00:00:00 2001
From: terwer <youweics@163.com>
Date: Mon, 27 Feb 2023 23:55:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#276=20=E6=96=B0=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=97=B6=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?fixed=E4=B8=8D=E9=9A=8F=E9=A1=B5=E9=9D=A2=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                         |   3 +
 components.d.ts                   |  78 +++++++-------
 components/blog/BlogMain.vue      | 133 +++++++++++++++---------
 layouts/default/DefaultHeader.vue | 165 ++++++++++++++++--------------
 locales/en_US.ts                  |   1 +
 locales/zh_CN.ts                  |   1 +
 6 files changed, 217 insertions(+), 164 deletions(-)

diff --git a/README.md b/README.md
index 0a03deeb..331241ef 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,9 @@
 - 【文章绑定】操作非配置项，也是可选功能，放在发布页面容易造成误解，现将操作移入详情页，仅在需要将平台文章与思源笔记建立联系时候使用。新增文章无需操作，新增会自动进行绑定
 - 修复浏览器插件不能使用http，只能用https问题
 - 修复typecho发布文章未成功解析文章id
+- 文章列表图标添加tooltip
+- 插槽按钮添加文字提示
+- 新窗口打开时操作按钮fixed不随页面滑动
 
 ### 开发者相关
 
diff --git a/components.d.ts b/components.d.ts
index 0185077b..56492ae5 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -28,50 +28,50 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import "@vue/runtime-core";
+import '@vue/runtime-core'
 
 export {}
 
-declare module "@vue/runtime-core" {
+declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    ElAlert: typeof import("element-plus/es")["ElAlert"]
-    ElAutocomplete: typeof import("element-plus/es")["ElAutocomplete"]
-    ElButton: typeof import("element-plus/es")["ElButton"]
-    ElButtonGroup: typeof import("element-plus/es")["ElButtonGroup"]
-    ElCard: typeof import("element-plus/es")["ElCard"]
-    ElCheckbox: typeof import("element-plus/es")["ElCheckbox"]
-    ElCheckboxGroup: typeof import("element-plus/es")["ElCheckboxGroup"]
-    ElCol: typeof import("element-plus/es")["ElCol"]
-    ElColorPicker: typeof import("element-plus/es")["ElColorPicker"]
-    ElContainer: typeof import("element-plus/es")["ElContainer"]
-    ElDatePicker: typeof import("element-plus/es")["ElDatePicker"]
-    ElDialog: typeof import("element-plus/es")["ElDialog"]
-    ElDivider: typeof import("element-plus/es")["ElDivider"]
-    ElForm: typeof import("element-plus/es")["ElForm"]
-    ElFormItem: typeof import("element-plus/es")["ElFormItem"]
-    ElHeader: typeof import("element-plus/es")["ElHeader"]
-    ElIcon: typeof import("element-plus/es")["ElIcon"]
-    ElInput: typeof import("element-plus/es")["ElInput"]
-    ElMain: typeof import("element-plus/es")["ElMain"]
-    ElOption: typeof import("element-plus/es")["ElOption"]
-    ElPageHeader: typeof import("element-plus/es")["ElPageHeader"]
-    ElPagination: typeof import("element-plus/es")["ElPagination"]
-    ElPopover: typeof import("element-plus/es")["ElPopover"]
-    ElRadio: typeof import("element-plus/es")["ElRadio"]
-    ElRadioGroup: typeof import("element-plus/es")["ElRadioGroup"]
-    ElRow: typeof import("element-plus/es")["ElRow"]
-    ElSelect: typeof import("element-plus/es")["ElSelect"]
-    ElSkeleton: typeof import("element-plus/es")["ElSkeleton"]
-    ElSwitch: typeof import("element-plus/es")["ElSwitch"]
-    ElTable: typeof import("element-plus/es")["ElTable"]
-    ElTableColumn: typeof import("element-plus/es")["ElTableColumn"]
-    ElTabPane: typeof import("element-plus/es")["ElTabPane"]
-    ElTabs: typeof import("element-plus/es")["ElTabs"]
-    ElTag: typeof import("element-plus/es")["ElTag"]
-    ElTooltip: typeof import("element-plus/es")["ElTooltip"]
-    ElTreeSelect: typeof import("element-plus/es")["ElTreeSelect"]
+    ElAlert: typeof import('element-plus/es')['ElAlert']
+    ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
+    ElButton: typeof import('element-plus/es')['ElButton']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
+    ElCard: typeof import('element-plus/es')['ElCard']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElInput: typeof import('element-plus/es')['ElInput']
+    ElMain: typeof import('element-plus/es')['ElMain']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
   }
   export interface ComponentCustomProperties {
-    vLoading: typeof import("element-plus/es")["ElLoadingDirective"]
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
   }
 }
diff --git a/components/blog/BlogMain.vue b/components/blog/BlogMain.vue
index b82065ee..fa66bef2 100644
--- a/components/blog/BlogMain.vue
+++ b/components/blog/BlogMain.vue
@@ -92,34 +92,69 @@
               <div style="text-align: center">操作</div>
             </template>
             <template #default="scope">
-              <!-- 预览 -->
-              <el-button
-                size="small"
-                @click="handleView(scope.$index, scope.row)"
-              >
-                <font-awesome-icon icon="fa-solid fa-book-open-reader" />
-              </el-button>
               <!-- 发布 -->
-              <el-button
-                size="small"
-                @click="handleEdit(scope.$index, scope.row)"
+              <el-tooltip
+                :content="$t('siyuan.browser.menu.publish.btn')"
+                class="box-item"
+                effect="light"
+                placement="right"
+                popper-class="publish-menu-tooltip"
+              >
+                <el-button
+                  size="small"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                  <font-awesome-icon icon="fa-solid fa-upload" />
+                </el-button>
+              </el-tooltip>
+
+              <!-- 预览 -->
+              <el-tooltip
+                :content="$t('siyuan.browser.menu.preview.btn')"
+                class="box-item"
+                effect="light"
+                placement="right"
+                popper-class="publish-menu-tooltip"
               >
-                <font-awesome-icon icon="fa-solid fa-upload" />
-              </el-button>
+                <el-button
+                  size="small"
+                  @click="handleView(scope.$index, scope.row)"
+                >
+                  <font-awesome-icon icon="fa-solid fa-book-open-reader" />
+                </el-button>
+              </el-tooltip>
+
               <!-- anki -->
-              <el-button
-                size="small"
-                @click="handleAnki(scope.$index, scope.row)"
+              <el-tooltip
+                :content="$t('siyuan.browser.menu.anki.btn')"
+                class="box-item"
+                effect="light"
+                placement="right"
+                popper-class="publish-menu-tooltip"
               >
-                <font-awesome-icon icon="fa-solid fa-credit-card" />
-              </el-button>
+                <el-button
+                  size="small"
+                  @click="handleAnki(scope.$index, scope.row)"
+                >
+                  <font-awesome-icon icon="fa-solid fa-credit-card" />
+                </el-button>
+              </el-tooltip>
+
               <!-- picgo -->
-              <el-button
-                size="small"
-                @click="handlePicgo(scope.$index, scope.row)"
+              <el-tooltip
+                :content="$t('siyuan.browser.menu.picture.btn')"
+                class="box-item"
+                effect="light"
+                placement="right"
+                popper-class="publish-menu-tooltip"
               >
-                <font-awesome-icon icon="fa-solid fa-image" />
-              </el-button>
+                <el-button
+                  size="small"
+                  @click="handlePicgo(scope.$index, scope.row)"
+                >
+                  <font-awesome-icon icon="fa-solid fa-image" />
+                </el-button>
+              </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
@@ -180,25 +215,25 @@
 </template>
 
 <script lang="ts" setup>
-import { useI18n } from "vue-i18n"
-import { onMounted, ref } from "vue"
-import { LogFactory } from "~/utils/logUtil"
-import { Post } from "~/utils/models/post"
-import { goToPage } from "~/utils/otherlib/ChromeUtil"
-import { getPageId, isInSiyuanWidget } from "~/utils/platform/siyuan/siyuanUtil"
-import { SiYuanApiAdaptor } from "~/utils/platform/siyuan/siYuanApiAdaptor"
-import { mdToHtml, removeTitleNumber } from "~/utils/htmlUtil"
-import { getByLength } from "~/utils/strUtil"
-import { CONSTANTS } from "~/utils/constants/constants"
-import { formatIsoToZhDate } from "~/utils/dateUtil"
-import { ElMessage, ElMessageBox } from "element-plus"
-import SingleBlogDetail from "~/components/blog/singleWin/SingleBlogDetail.vue"
-import SinglePublish from "~/components/blog/singleWin/singlePublish.vue"
-import { getPublishCfg } from "~/utils/publishUtil"
-import { isEmptyString, parseBoolean } from "~/utils/util"
-import { isInSiyuanNewWinBrowser } from "~/utils/otherlib/siyuanBrowserUtil"
-import SingleAnki from "~/components/blog/singleWin/SingleAnki.vue"
-import SinglePicgo from "~/components/blog/singleWin/SinglePicgo.vue"
+import { useI18n } from "vue-i18n";
+import { onMounted, ref, toRaw } from "vue";
+import { LogFactory } from "~/utils/logUtil";
+import { Post } from "~/utils/models/post";
+import { goToPage } from "~/utils/otherlib/ChromeUtil";
+import { getPageId, isInSiyuanWidget } from "~/utils/platform/siyuan/siyuanUtil";
+import { SiYuanApiAdaptor } from "~/utils/platform/siyuan/siYuanApiAdaptor";
+import { mdToHtml, removeTitleNumber } from "~/utils/htmlUtil";
+import { getByLength } from "~/utils/strUtil";
+import { CONSTANTS } from "~/utils/constants/constants";
+import { formatIsoToZhDate } from "~/utils/dateUtil";
+import { ElMessage, ElMessageBox } from "element-plus";
+import SingleBlogDetail from "~/components/blog/singleWin/SingleBlogDetail.vue";
+import SinglePublish from "~/components/blog/singleWin/singlePublish.vue";
+import { getPublishCfg } from "~/utils/publishUtil";
+import { isEmptyString, parseBoolean } from "~/utils/util";
+import { isInSiyuanNewWinBrowser } from "~/utils/otherlib/siyuanBrowserUtil";
+import SingleAnki from "~/components/blog/singleWin/SingleAnki.vue";
+import SinglePicgo from "~/components/blog/singleWin/SinglePicgo.vue";
 
 const logger = LogFactory.getLogger()
 const { t } = useI18n()
@@ -322,16 +357,18 @@ const emitPublishPageFn = (post) => {
 }
 
 const handleEdit = (index, row) => {
+  console.log(toRaw(row));
+  return;
   if (isNewWin.value) {
-    handleNewWinEdit(index, row)
+    handleNewWinEdit(index, row);
   } else {
-    const post = new Post()
-    post.postid = row.postid
-    post.title = row.title
-    publishData.value = post
+    const post = new Post();
+    post.postid = row.postid;
+    post.title = row.title;
+    publishData.value = post;
 
-    showPublish.value = true
-    showHome.value = false
+    showPublish.value = true;
+    showHome.value = false;
     showDetail.value = false
     showAnki.value = false
     showPicgo.value = false
diff --git a/layouts/default/DefaultHeader.vue b/layouts/default/DefaultHeader.vue
index 45117d72..c13376b4 100644
--- a/layouts/default/DefaultHeader.vue
+++ b/layouts/default/DefaultHeader.vue
@@ -60,17 +60,24 @@
         >
         </el-tooltip>
         -->
-        <el-button
-          v-if="showOpenBtn"
-          class="b3-button--open"
-          type="success"
-          @click="handleWinOpen"
+        <el-tooltip
+          :content="$t('siyuan.browser.menu.publish.btn')"
+          class="box-item"
+          effect="light"
+          placement="right"
+          popper-class="publish-menu-tooltip"
         >
-          <font-awesome-icon icon="fa-solid fa-upload" />
-        </el-button>
+          <el-button
+            v-if="showOpenBtn"
+            class="b3-button--open"
+            type="success"
+            @click="handleWinOpen"
+          >
+            <font-awesome-icon icon="fa-solid fa-upload" />
+          </el-button>
+        </el-tooltip>
 
         <!-- 文章预览 -->
-        <!--
         <el-tooltip
           :content="$t('siyuan.browser.menu.preview.btn')"
           class="box-item"
@@ -78,19 +85,17 @@
           placement="right"
           popper-class="publish-menu-tooltip"
         >
+          <el-button
+            v-if="showOpenBtn"
+            class="b3-button--preview"
+            type="success"
+            @click="handleWinPreview"
+          >
+            <font-awesome-icon icon="fa-solid fa-book-open-reader" />
+          </el-button>
         </el-tooltip>
-        -->
-        <el-button
-          v-if="showOpenBtn"
-          class="b3-button--preview"
-          type="success"
-          @click="handleWinPreview"
-        >
-          <font-awesome-icon icon="fa-solid fa-book-open-reader" />
-        </el-button>
 
         <!-- 文章管理 -->
-        <!--
         <el-tooltip
           :content="$t('siyuan.browser.menu.manage.btn')"
           class="box-item"
@@ -98,19 +103,17 @@
           placement="right"
           popper-class="publish-menu-tooltip"
         >
+          <el-button
+            v-if="showOpenBtn"
+            class="b3-button--preview"
+            type="success"
+            @click="handleWinManage"
+          >
+            <font-awesome-icon icon="fa-solid fa-rectangle-list" />
+          </el-button>
         </el-tooltip>
-        -->
-        <el-button
-          v-if="showOpenBtn"
-          class="b3-button--preview"
-          type="success"
-          @click="handleWinManage"
-        >
-          <font-awesome-icon icon="fa-solid fa-rectangle-list" />
-        </el-button>
 
         <!-- Anki标记 -->
-        <!--
         <el-tooltip
           :content="$t('siyuan.browser.menu.anki.btn')"
           class="box-item"
@@ -118,19 +121,17 @@
           placement="right"
           popper-class="publish-menu-tooltip"
         >
+          <el-button
+            v-if="showOpenBtn"
+            class="b3-button--anki"
+            type="success"
+            @click="handleWinAnki"
+          >
+            <font-awesome-icon icon="fa-solid fa-credit-card" />
+          </el-button>
         </el-tooltip>
-        -->
-        <el-button
-          v-if="showOpenBtn"
-          class="b3-button--anki"
-          type="success"
-          @click="handleWinAnki"
-        >
-          <font-awesome-icon icon="fa-solid fa-credit-card" />
-        </el-button>
 
         <!-- 图床 -->
-        <!--
         <el-tooltip
           :content="$t('siyuan.browser.menu.picture.btn')"
           class="box-item"
@@ -138,26 +139,33 @@
           placement="right"
           popper-class="publish-menu-tooltip"
         >
+          <el-button
+            v-if="showOpenBtn"
+            class="b3-button--picture"
+            type="success"
+            @click="handleWinPicture"
+          >
+            <font-awesome-icon icon="fa-solid fa-image" />
+          </el-button>
         </el-tooltip>
-        -->
-        <el-button
-          v-if="showOpenBtn"
-          class="b3-button--picture"
-          type="success"
-          @click="handleWinPicture"
-        >
-          <font-awesome-icon icon="fa-solid fa-image" />
-        </el-button>
 
         <!-- 统一设置 -->
-        <el-button
-          v-if="showOpenBtn"
-          class="b3-button--picture"
-          type="success"
-          @click="handleWinSet"
+        <el-tooltip
+          :content="$t('siyuan.browser.menu.setting.btn')"
+          class="box-item"
+          effect="light"
+          placement="right"
+          popper-class="publish-menu-tooltip"
         >
-          <font-awesome-icon icon="fa-solid fa-gear" />
-        </el-button>
+          <el-button
+            v-if="showOpenBtn"
+            class="b3-button--picture"
+            type="success"
+            @click="handleWinSet"
+          >
+            <font-awesome-icon icon="fa-solid fa-gear" />
+          </el-button>
+        </el-tooltip>
 
         <!-- 关闭 -->
         <!--
@@ -190,23 +198,17 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from "vue"
-import {
-  doCloseExportWin,
-  doOpenExportWin,
-  isInSiyuanNewWinBrowser,
-} from "~/utils/otherlib/siyuanBrowserUtil"
-import { ElMessage } from "element-plus"
-import {
-  getWidgetId,
-  isInSiyuanWidget,
-} from "~/utils/platform/siyuan/siyuanUtil"
-import { getPublishCfg } from "~/utils/publishUtil"
-import { appendStr } from "~/utils/strUtil"
-import { useI18n } from "vue-i18n"
-import { LogFactory } from "~/utils/logUtil"
-import { isElectron } from "~/utils/browserUtil"
-import { isSlot, isWindows } from "~/utils/otherlib/ChromeUtil"
+import { onMounted, ref } from "vue";
+import { doCloseExportWin, doOpenExportWin, isInSiyuanNewWinBrowser } from "~/utils/otherlib/siyuanBrowserUtil";
+import { ElMessage } from "element-plus";
+import { getWidgetId, isInSiyuanWidget } from "~/utils/platform/siyuan/siyuanUtil";
+import { getPublishCfg } from "~/utils/publishUtil";
+import { appendStr } from "~/utils/strUtil";
+import { useI18n } from "vue-i18n";
+import { LogFactory } from "~/utils/logUtil";
+import { isElectron } from "~/utils/browserUtil";
+import { isSlot, isWindows } from "~/utils/otherlib/ChromeUtil";
+import envUtil from "~/utils/envUtil";
 
 const { t } = useI18n()
 const logger = LogFactory.getLogger("layouts/default/DefaultHeader.vue")
@@ -360,15 +362,22 @@ onMounted(() => {
     showCloseBtn.value = isInSiyuanNewWinBrowser() || publishCfg.showCloseBtn
     showOpenBtn.value = showCloseBtn.value
 
-    showTitle.value = false
+    showTitle.value = false;
 
     // event
-    pageIdChanged()
+    pageIdChanged();
   } else {
-    showOpenBtn.value = false
-    showCloseBtn.value = true
+    showOpenBtn.value = false;
+    showCloseBtn.value = true;
+
+    showTitle.value = true;
+  }
 
-    showTitle.value = true
+  // 开发阶段调试菜单
+  if (envUtil.isDev) {
+    // showOpenBtn.value = true
+    // showCloseBtn.value = true
+    // showTitle.value = false
   }
 })
 </script>
@@ -398,6 +407,8 @@ onMounted(() => {
 }
 
 #publisher-header .b3-button--cancel {
-  float: right;
+  right: 20px;
+  position: fixed;
+  z-index: 99;
 }
 </style>
diff --git a/locales/en_US.ts b/locales/en_US.ts
index 83c3de23..46d3f103 100644
--- a/locales/en_US.ts
+++ b/locales/en_US.ts
@@ -302,6 +302,7 @@ export default {
   "siyuan.browser.menu.manage.btn": "Manage",
   "siyuan.browser.menu.anki.btn": "Anki",
   "siyuan.browser.menu.picture.btn": "PicGO",
+  "siyuan.browser.menu.setting.btn": "Setting",
   "anki.siyuan.deck": "Deck",
   "anki.siyuan.deck.new": "New deck",
   "anki.siyuan.tag": "Tag",
diff --git a/locales/zh_CN.ts b/locales/zh_CN.ts
index 437fd2bb..fa7381f2 100644
--- a/locales/zh_CN.ts
+++ b/locales/zh_CN.ts
@@ -314,6 +314,7 @@ export default {
   "siyuan.browser.menu.manage.btn": "文章管理（全部文章统一管理）",
   "siyuan.browser.menu.anki.btn": "Anki标记（配合ankisiyuan生成Anki标记）",
   "siyuan.browser.menu.picture.btn": "PicGO图床（支持图床配置与图片上传）",
+  "siyuan.browser.menu.setting.btn": "偏好设置（系统设置统一入口）",
   "anki.siyuan.deck": "牌组",
   "anki.siyuan.deck.new": "新牌组",
   "anki.siyuan.tag": "标签",