From e249ea0bf6ed6b82f2a8e7e1fc82aa6694d16f97 Mon Sep 17 00:00:00 2001
From: terwer <youweics@163.com>
Date: Wed, 8 Feb 2023 00:54:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#319=20PicGO=E5=9B=BE=E5=BD=A2=E5=8C=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2-=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/picgo/setting/PicbedConfigForm.vue | 87 +++++++++++++++++--
 components/picgo/setting/PicbedSetting.vue    | 15 +---
 public/lib/picgo/picgo.cfg.json.example       | 51 -----------
 public/manifest.dev.json                      | 25 ++++++
 public/manifest.prod.json                     | 37 ++++++++
 utils/otherlib/picgoUtil.js                   | 41 +++++----
 6 files changed, 170 insertions(+), 86 deletions(-)
 delete mode 100644 public/lib/picgo/picgo.cfg.json.example
 create mode 100644 public/manifest.dev.json
 create mode 100644 public/manifest.prod.json

diff --git a/components/picgo/setting/PicbedConfigForm.vue b/components/picgo/setting/PicbedConfigForm.vue
index 6fa89422..40548fc1 100644
--- a/components/picgo/setting/PicbedConfigForm.vue
+++ b/components/picgo/setting/PicbedConfigForm.vue
@@ -119,25 +119,102 @@
 
 <script lang="ts" setup>
 import { ArrowLeft } from "@element-plus/icons-vue"
-import { onBeforeMount, reactive, ref } from "vue"
+import { onBeforeMount, reactive, ref, toRefs, watch } from "vue"
+import { FormInstance } from "element-plus"
+import { cloneDeep, union } from "lodash"
+import picgoUtil from "~/utils/otherlib/picgoUtil"
 
 const props = defineProps({
+  type: String,
   config: Object,
+  configId: String,
+  isNewForm: Boolean,
 })
 
+const $form = ref<FormInstance>()
 const emits = defineEmits(["on-change"])
 
 const configList = ref<IPicGoPluginConfig[]>([])
 const ruleForm = reactive<IStringKeyMap>({})
 
+watch(
+  toRefs(props.config),
+  (val) => {
+    handleConfigChange(val)
+  },
+  {
+    deep: true,
+    immediate: true,
+  }
+)
+
+function handleConfigChange(val: any) {
+  handleConfig(val)
+}
+
+/**
+ * 获取当前表单数据
+ */
+function getCurConfigFormData(): IStringKeyMap[] {
+  const configId = props.configId
+  const curTypeConfigList =
+    picgoUtil.getPicgoConfig(`uploader.${props.type}.configList`) || []
+  return curTypeConfigList.find((i) => i._id === configId) || {}
+}
+
+function handleConfig(val: IPicGoPluginConfig[]) {
+  const config = getCurConfigFormData()
+  const configId = props.isNewForm ? undefined : props.configId
+  Object.assign(ruleForm, config)
+  if (val.length > 0) {
+    configList.value = cloneDeep(val).map((item) => {
+      if (!configId) return item
+      let defaultValue =
+        item.default !== undefined
+          ? item.default
+          : item.type === "checkbox"
+          ? []
+          : null
+      if (item.type === "checkbox") {
+        const defaults =
+          item.choices
+            ?.filter((i: any) => {
+              return i.checked
+            })
+            .map((i: any) => i.value) || []
+        defaultValue = union(defaultValue, defaults)
+      }
+      if (config && config[item.name] !== undefined) {
+        defaultValue = config[item.name]
+      }
+      ruleForm[item.name] = defaultValue
+      return item
+    })
+  }
+}
+
+async function validate(): Promise<IStringKeyMap | false> {
+  return new Promise((resolve) => {
+    $form.value?.validate((valid: boolean) => {
+      if (valid) {
+        resolve(ruleForm)
+      } else {
+        resolve(false)
+        return false
+      }
+    })
+  })
+}
+
 const onBack = () => {
   emits("on-change")
 }
 
-const onSubmit = () => {
-  alert("onSubmit")
-
-  onBack()
+const onSubmit = async () => {
+  const result = (await validate()) || false
+  if (result !== false) {
+    onBack()
+  }
 }
 
 const initPage = () => {
diff --git a/components/picgo/setting/PicbedSetting.vue b/components/picgo/setting/PicbedSetting.vue
index 07ffb082..7e4fdeff 100644
--- a/components/picgo/setting/PicbedSetting.vue
+++ b/components/picgo/setting/PicbedSetting.vue
@@ -114,6 +114,9 @@
       <div class="profile-form" v-else>
         <picbed-config-form
           :config="profileData.curConfig"
+          :config-id="profileData.defaultConfigId"
+          :is-new-form="isNewForm"
+          :type="type"
           @on-change="emitBackFn"
         />
       </div>
@@ -198,16 +201,6 @@ function selectItem(id: string) {
   alert("selectItem=>" + id)
 }
 
-/**
- * 获取当前表单数据
- */
-function getCurConfigFormData(): IStringKeyMap[] {
-  const configId = profileData.defaultConfigId
-  const curTypeConfigList =
-    picgoUtil.getPicgoConfig(`uploader.${type.value}.configList`) || []
-  return curTypeConfigList.find((i) => i._id === configId) || {}
-}
-
 /**
  * 新增配置
  */
@@ -223,7 +216,7 @@ function addNewConfig() {
  * @param id 配置ID
  */
 function editConfig(id: string) {
-  const config = getCurConfigFormData()
+  const config = picgoUtil.getPicBedConfig(type.value)
   profileData.curConfig = config
 
   isNewForm.value = false
diff --git a/public/lib/picgo/picgo.cfg.json.example b/public/lib/picgo/picgo.cfg.json.example
deleted file mode 100644
index 68787d99..00000000
--- a/public/lib/picgo/picgo.cfg.json.example
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "picBed": {
-    "current": "github",
-    "uploader": "github",
-    "github": {
-      "branch": "main",
-      "customUrl": "https://img1.terwer.space/api",
-      "path": "public/",
-      "repo": "terwer/upload",
-      "token": ""
-    },
-    "list": [
-      {
-        "type": "tcyun",
-        "name": "腾讯云COS",
-        "visible": false
-      },
-      {
-        "type": "aliyun",
-        "name": "阿里云OSS",
-        "visible": true
-      },
-      {
-        "type": "smms",
-        "name": "SM.MS",
-        "visible": false
-      },
-      {
-        "type": "github",
-        "name": "GitHub",
-        "visible": true
-      },
-      {
-        "type": "qiniu",
-        "name": "七牛云",
-        "visible": false
-      },
-      {
-        "type": "imgur",
-        "name": "Imgur",
-        "visible": false
-      },
-      {
-        "type": "upyun",
-        "name": "又拍云",
-        "visible": false
-      }
-    ]
-  },
-  "debug": true
-}
\ No newline at end of file
diff --git a/public/manifest.dev.json b/public/manifest.dev.json
new file mode 100644
index 00000000..e314eefd
--- /dev/null
+++ b/public/manifest.dev.json
@@ -0,0 +1,25 @@
+{
+  "name": "开发版 - 思源笔记发布辅助工具",
+  "version": "0.7.0",
+  "manifest_version": 3,
+  "author": "terwer",
+  "description": "思源笔记发布辅助工具，支持博客式只读浏览，多平台文章发布。",
+  "background": {
+    "service_worker": "background.js"
+  },
+  "host_permissions": ["*://*/*"],
+  "web_accessible_resources": [
+    {
+      "resources": [
+        "blog/index.html",
+        "detail/index.html",
+        "publish/index.html",
+        "index.html"
+      ],
+      "matches": ["<all_urls>"]
+    }
+  ],
+  "action": {
+    "default_popup": "blog/index.html"
+  }
+}
diff --git a/public/manifest.prod.json b/public/manifest.prod.json
new file mode 100644
index 00000000..917f816e
--- /dev/null
+++ b/public/manifest.prod.json
@@ -0,0 +1,37 @@
+{
+  "name": "思源笔记发布辅助工具",
+  "version": "0.7.0",
+  "manifest_version": 3,
+  "author": "terwer",
+  "icons": {
+    "16": "images/icon16.png",
+    "32": "images/icon32.png",
+    "48": "images/icon48.png",
+    "128": "images/icon128.png"
+  },
+  "description": "思源笔记发布辅助工具，支持博客式只读浏览，多平台文章发布。",
+  "background": {
+    "service_worker": "background.js"
+  },
+  "host_permissions": ["*://*/*"],
+  "web_accessible_resources": [
+    {
+      "resources": [
+        "blog/index.html",
+        "detail/index.html",
+        "publish/index.html",
+        "index.html"
+      ],
+      "matches": ["<all_urls>"]
+    }
+  ],
+  "action": {
+    "default_icon": {
+      "16": "images/icon16.png",
+      "32": "images/icon32.png",
+      "48": "images/icon48.png",
+      "128": "images/icon128.png"
+    },
+    "default_popup": "blog/index.html"
+  }
+}
diff --git a/utils/otherlib/picgoUtil.js b/utils/otherlib/picgoUtil.js
index 646a1a76..c02d8f01 100644
--- a/utils/otherlib/picgoUtil.js
+++ b/utils/otherlib/picgoUtil.js
@@ -173,25 +173,25 @@ const completeUploaderMetaConfig = (originData) => {
  * @author terwer
  * @since 0.7.0
  */
-// export const getPicBedConfig = (type) => {
-//   const syWin = siyuanBrowserUtil.getSiyuanWindow()
-//   const picgo = syWin.SyPicgo.getPicgoObj()
-//
-//   const name = picgo.helper.uploader.get(type)?.name || type
-//   if (picgo.helper.uploader.get(type)?.config) {
-//     const _config = picgo.helper.uploader.get(type).config(picgo)
-//     const config = handleConfigWithFunction(_config)
-//     return {
-//       config,
-//       name,
-//     }
-//   } else {
-//     return {
-//       config: [],
-//       name,
-//     }
-//   }
-// }
+export const getPicBedConfig = (type) => {
+  const syWin = siyuanBrowserUtil.getSiyuanWindow()
+  const picgo = syWin.SyPicgo.getPicgoObj()
+
+  const name = picgo.helper.uploader.get(type)?.name || type
+  if (picgo.helper.uploader.get(type)?.config) {
+    const _config = picgo.helper.uploader.get(type).config(picgo)
+    const config = handleConfigWithFunction(_config)
+    return {
+      config,
+      name,
+    }
+  } else {
+    return {
+      config: [],
+      name,
+    }
+  }
+}
 
 /**
  * upgrade old uploader config to new format
@@ -369,6 +369,9 @@ const picgoUtil = {
   getPicgoConfig,
   savePicgoConfig,
 
+  // form
+  getPicBedConfig,
+
   // uploader
   getPicBeds,
   getUploaderConfigList,