Merge remote-tracking branch 'origin/dev' into release

This commit is contained in:
萌萌哒赫萝 2023-08-01 02:09:33 -07:00
commit b39a165ca8
13 changed files with 86 additions and 190 deletions

View File

@ -66,7 +66,7 @@
"mime-types": "^2.1.35", "mime-types": "^2.1.35",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"nodejs-file-downloader": "^4.12.1", "nodejs-file-downloader": "^4.12.1",
"piclist": "^0.7.6", "piclist": "^0.8.5",
"pinia": "^2.1.4", "pinia": "^2.1.4",
"pinia-plugin-persistedstate": "^3.1.0", "pinia-plugin-persistedstate": "^3.1.0",
"qiniu": "^7.8.0", "qiniu": "^7.8.0",
@ -76,10 +76,10 @@
"uuid": "^9.0.0", "uuid": "^9.0.0",
"video.js": "^8.3.0", "video.js": "^8.3.0",
"vue": "^3.3.4", "vue": "^3.3.4",
"vue-router": "^4.2.2", "vue-router": "^4.2.4",
"vue3-lazyload": "^0.3.6", "vue3-lazyload": "^0.3.6",
"vue3-photo-preview": "^0.3.0", "vue3-photo-preview": "^0.3.0",
"webdav": "^5.1.0", "webdav": "^5.2.3",
"write-file-atomic": "^4.0.1" "write-file-atomic": "^4.0.1"
}, },
"devDependencies": { "devDependencies": {

View File

@ -4,7 +4,6 @@ OPEN_MAIN_WINDOW: Open Main Window
OPEN_MINI_WINDOW: Open Mini Window OPEN_MINI_WINDOW: Open Mini Window
CHOOSE_DEFAULT_PICBED: Choose Default Picbed CHOOSE_DEFAULT_PICBED: Choose Default Picbed
OPEN_UPDATE_HELPER: Open Update Helper OPEN_UPDATE_HELPER: Open Update Helper
PRIVACY_AGREEMENT: Privacy Agreement
RELOAD_APP: Reload App RELOAD_APP: Reload App
UPLOAD_FAILED: Upload Failed UPLOAD_FAILED: Upload Failed
UPLOAD_SUCCEED: Upload Succeed UPLOAD_SUCCEED: Upload Succeed
@ -119,8 +118,10 @@ UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: Compression Quality
UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: Convert Format UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: Convert Format
UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: Destination Format UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: Destination Format
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: Resize to fixed size UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: Resize to fixed size
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: Width UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: Width(Set to 0 to scale by height)
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: Height UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: Height(Set to 0 to scale by width)
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: Skip resize when image height is smaller than target height
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: Skip resize when image width is smaller than target width
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: Resize by percentage (Higher priority) UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: Resize by percentage (Higher priority)
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: Resize Percentage, enter 50 for 50% UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: Resize Percentage, enter 50 for 50%
UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: Rotate UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: Rotate
@ -883,39 +884,4 @@ TIPS_CUSTOM_LINK_STYLE_MODIFIED_SUCCEED: Custom link style modified successfully
TIPS_FIND_NEW_VERSION: Find new version ${v}, update many new features, do you want to download the latest version in the background? TIPS_FIND_NEW_VERSION: Find new version ${v}, update many new features, do you want to download the latest version in the background?
UPDATE_DOWNLOADED: Update downloaded UPDATE_DOWNLOADED: Update downloaded
TIPS_UPDATE_DOWNLOADED: The update has been downloaded and will be installed on the next app restart. Would you like to restart now? TIPS_UPDATE_DOWNLOADED: The update has been downloaded and will be installed on the next app restart. Would you like to restart now?
# privacy
PRIVACY: >
This software respects and protects the personal privacy of all users who use the service. In order to provide you with more accurate and better services, this software will use and collect some of your behavioral information in accordance with the provisions of this Privacy Policy. When you agree to the software service use agreement, you are deemed to have agreed to the entire content of this privacy policy. This privacy policy is an integral part of the software service use agreement, and it will not be used if you do not agree.
This Agreement will be updated periodically.
1. Scope of application
a) When you use this software, this software will record some information about your operation behavior of this software, including but not limited to the time-consuming, type, quantity and other information of your use of this software to upload files.
2. Use of Information
a) After obtaining your usage data, the software will upload it to the data analysis server so as to provide you with better services after analyzing the data.
3. Information disclosure
a) This software will not disclose your information to untrusted third parties.
b) In accordance with the relevant provisions of the law, or the requirements of administrative or judicial institutions, disclose to third parties or administrative or judicial institutions;
c) If you violate relevant Chinese laws, regulations or relevant rules, you need to disclose it to a third party;
4. Information Security
a) This software does not collect your personal information, key information and other private information, and the collected information is only used for improving the software, optimizing the experience, and understanding the daily activities of the software.
PRIVACY_TIPS: Please agree the privacy policy to upload
QUIT: Quit QUIT: Quit

View File

@ -4,7 +4,6 @@ OPEN_MAIN_WINDOW: 打开主窗口
OPEN_MINI_WINDOW: 打开mini窗口 OPEN_MINI_WINDOW: 打开mini窗口
CHOOSE_DEFAULT_PICBED: 选择默认图床 CHOOSE_DEFAULT_PICBED: 选择默认图床
OPEN_UPDATE_HELPER: 打开更新助手 OPEN_UPDATE_HELPER: 打开更新助手
PRIVACY_AGREEMENT: 隐私协议
RELOAD_APP: 重启应用 RELOAD_APP: 重启应用
UPLOAD_SUCCEED: 上传成功 UPLOAD_SUCCEED: 上传成功
UPLOAD_FAILED: 上传失败 UPLOAD_FAILED: 上传失败
@ -119,8 +118,10 @@ UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 压缩质量
UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否转换格式 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否转换格式
UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 转换目的格式 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 转换目的格式
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸调整图片 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸调整图片
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 调整尺寸宽度 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 调整尺寸宽度(设为0则按高度等比缩放)
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 调整尺寸高度 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 调整尺寸高度(设为0则按宽度等比缩放)
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: 当图片高度小于设定高度时跳过缩放
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: 当图片宽度小于设定宽度时跳过缩放
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: 是否按比例调整尺寸,优先级更高 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: 是否按比例调整尺寸,优先级更高
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: 调整尺寸比例, 输入50表示50% UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: 调整尺寸比例, 输入50表示50%
UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: 是否旋转 UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: 是否旋转
@ -888,39 +889,4 @@ TIPS_FIND_NEW_VERSION: 发现新版本${v},更新了很多功能,是否后
UPDATE_DOWNLOADED: 更新已下载 UPDATE_DOWNLOADED: 更新已下载
TIPS_UPDATE_DOWNLOADED: 更新已下载,将在下次启动时安装,是否现在重启? TIPS_UPDATE_DOWNLOADED: 更新已下载,将在下次启动时安装,是否现在重启?
# privacy
PRIVACY: >
本软件尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更优质的服务,本软件会按照本隐私权政策的规定使用和收集您的一些行为信息。您在同意本软件服务使用协议之时,即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本软件服务使用协议不可分割的一部分,如果不同意将无法使用。本协议会定期更新。
1.适用范围
a)在您使用本软件时,本软件会记录的您对本软件的一些操作行为信息,包括但不限于您使用本软件进行文件上传的耗时、类型、数量等信息。
2.信息的使用
a)在获得您的使用数据之后,本软件会将其上传至数据分析服务器,以便分析数据后,提供给您更好的服务。
3.信息披露
a)本软件不会将您的信息披露给不受信任的第三方。
b)根据法律的有关规定,或者行政或司法机构的要求,向第三方或者行政、司法机构披露;
c)如您出现违反中国有关法律、法规或者相关规则的情况,需要向第三方披露;
4.信息安全
a)本软件不会收集您的个人信息、密钥信息等隐私信息,所收集的信息仅仅作为改善软件、优化体验、了解软件日活等用途。
PRIVACY_TIPS: 请同意隐私协议,否则无法上传。
QUIT: 退出 QUIT: 退出

View File

@ -4,7 +4,6 @@ OPEN_MAIN_WINDOW: 打開主視窗
OPEN_MINI_WINDOW: 打開mini視窗 OPEN_MINI_WINDOW: 打開mini視窗
CHOOSE_DEFAULT_PICBED: 選擇預設圖床 CHOOSE_DEFAULT_PICBED: 選擇預設圖床
OPEN_UPDATE_HELPER: 開啟更新助手 OPEN_UPDATE_HELPER: 開啟更新助手
PRIVACY_AGREEMENT: 隱私協議
RELOAD_APP: 重啟程式 RELOAD_APP: 重啟程式
UPLOAD_SUCCEED: 上傳成功 UPLOAD_SUCCEED: 上傳成功
UPLOAD_FAILED: 上傳失敗 UPLOAD_FAILED: 上傳失敗
@ -119,8 +118,10 @@ UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 壓縮質量
UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否轉換格式 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否轉換格式
UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 轉換目的格式 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 轉換目的格式
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸調整圖片 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸調整圖片
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 調整尺寸寬度 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 調整尺寸寬度(設為0則按高度等比縮放)
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 調整尺寸高度 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 調整尺寸高度(設為0則按寬度等比縮放)
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: 當圖片高度小於設定高度時跳過縮放
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: 當圖片寬度小於設定寬度時跳過縮放
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: 是否按比例調整尺寸,優先級更高 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: 是否按比例調整尺寸,優先級更高
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: 調整尺寸比例輸入50表示50% UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: 調整尺寸比例輸入50表示50%
UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: 是否旋轉 UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: 是否旋轉
@ -882,39 +883,4 @@ TIPS_CUSTOM_LINK_STYLE_MODIFIED_SUCCEED: 自訂連結格式已經修改成功
TIPS_FIND_NEW_VERSION: 發現新版本${v},更新了很多功能,是否後台下載最新的版本? TIPS_FIND_NEW_VERSION: 發現新版本${v},更新了很多功能,是否後台下載最新的版本?
UPDATE_DOWNLOADED: 更新已下載 UPDATE_DOWNLOADED: 更新已下載
TIPS_UPDATE_DOWNLOADED: 更新已下載,将在下次啟動時安裝,是否立即重啟? TIPS_UPDATE_DOWNLOADED: 更新已下載,将在下次啟動時安裝,是否立即重啟?
# privacy
PRIVACY: >
本軟體尊重並保護所有使用服務用戶的個人隱私權。為了給您提供更準確、更優質的服務,本軟體會按照本隱私權政策的規定使用和收集您的一些行為信息。您在同意本軟體服務使用協議之時,即視為您已經同意本隱私權政策全部內容。本隱私權政策屬於本軟體服務使用協議不可分割的一部分,如果不同意將無法使用。本協議會定期更新。
1.適用範圍
a)在您使用本軟體時,本軟體會記錄的您對本軟體的一些操作行為信息,包括但不限於您使用本軟體進行文件上傳的耗時、類型、數量等信息。
2.信息的使用
a)在獲得您的使用數據之後,本軟體會將其上傳至數據分析服務器,以便分析數據後,提供給您更好的服務。
3.信息披露
a)本軟體不會將您的信息披露給不受信任的第三方。
b)根據法律的有關規定,或者行政或司法機構的要求,向第三方或者行政、司法機構披露;
c)如您出現違反中國有關法律、法規或者相關規則的情況,需要向第三方披露;
4.信息安全
a)本軟體不會收集您的個人信息、密鑰信息等隱私信息,所收集的信息僅僅作為改善軟體、優化體驗、了解軟體日活等用途。
PRIVACY_TIPS: 請同意隱私協議,否則無法上傳。
QUIT: 退出 QUIT: 退出

View File

@ -18,7 +18,6 @@ import logger from '@core/picgo/logger'
import { T } from '~/main/i18n' import { T } from '~/main/i18n'
import fse from 'fs-extra' import fse from 'fs-extra'
import path from 'path' import path from 'path'
import { privacyManager } from '~/main/utils/privacyManager'
import writeFile from 'write-file-atomic' import writeFile from 'write-file-atomic'
import { CLIPBOARD_IMAGE_FOLDER } from '~/universal/utils/static' import { CLIPBOARD_IMAGE_FOLDER } from '~/universal/utils/static'
@ -131,10 +130,6 @@ class Uploader {
async upload (img?: IUploadOption): Promise<ImgInfo[]|false> { async upload (img?: IUploadOption): Promise<ImgInfo[]|false> {
try { try {
const privacyCheckRes = await privacyManager.check()
if (!privacyCheckRes) {
throw Error(T('PRIVACY_TIPS'))
}
const output = await picgo.upload(img) const output = await picgo.upload(img)
if (Array.isArray(output) && output.some((item: ImgInfo) => item.imgUrl)) { if (Array.isArray(output) && output.some((item: ImgInfo) => item.imgUrl)) {
output.forEach((item: ImgInfo) => { output.forEach((item: ImgInfo) => {

View File

@ -6,7 +6,6 @@ import picgo from '@core/picgo'
import { import {
uploadClipboardFiles uploadClipboardFiles
} from '~/main/apis/app/uploader/apis' } from '~/main/apis/app/uploader/apis'
import { privacyManager } from '~/main/utils/privacyManager'
import pkg from 'root/package.json' import pkg from 'root/package.json'
import GuiApi from 'apis/gui' import GuiApi from 'apis/gui'
import { PICGO_CONFIG_PLUGIN, PICGO_HANDLE_PLUGIN_DONE, PICGO_HANDLE_PLUGIN_ING, PICGO_TOGGLE_PLUGIN, SHOW_MAIN_PAGE_DONATION, SHOW_MAIN_PAGE_QRCODE } from '~/universal/events/constants' import { PICGO_CONFIG_PLUGIN, PICGO_HANDLE_PLUGIN_DONE, PICGO_HANDLE_PLUGIN_ING, PICGO_TOGGLE_PLUGIN, SHOW_MAIN_PAGE_DONATION, SHOW_MAIN_PAGE_QRCODE } from '~/universal/events/constants'
@ -130,12 +129,6 @@ const buildMainPageMenu = (win: BrowserWindow) => {
click () { click () {
win?.webContents?.openDevTools() win?.webContents?.openDevTools()
} }
},
{
label: T('PRIVACY_AGREEMENT'),
click () {
privacyManager.show(false)
}
} }
] ]
// @ts-ignore // @ts-ignore

View File

@ -1,34 +0,0 @@
import db from '~/main/apis/core/datastore'
import { showMessageBox } from '~/main/utils/common'
import { T } from '~/main/i18n'
class PrivacyManager {
async check () {
if (db.get('settings.privacyEnsure') !== true) {
const res = await this.show(true)
// cancel
if (res.result === 1) {
return false
} else {
db.set('settings.privacyEnsure', true)
}
}
return true
}
async show (showCancel = true) {
const res = await showMessageBox({
type: 'info',
buttons: showCancel ? ['Yes', 'No'] : ['Yes'],
title: T('PRIVACY_AGREEMENT'),
message: T('PRIVACY')
})
return res
}
}
const privacyManager = new PrivacyManager()
export {
privacyManager
}

View File

@ -1,5 +1,8 @@
<template> <template>
<div id="gallery-view"> <div
id="gallery-view"
:style="handleBarActive? 'height: 85%;': 'height: 95%;'"
>
<div class="view-title"> <div class="view-title">
{{ $T('GALLERY') }} - {{ filterList.length }} {{ $T('GALLERY') }} - {{ filterList.length }}
<el-icon <el-icon
@ -1026,7 +1029,7 @@ export default {
position absolute position absolute
left 142px left 142px
right 0 right 0
height 95% height 85%
.cursor-pointer .cursor-pointer
cursor pointer cursor pointer
.item-base .item-base

View File

@ -1376,6 +1376,26 @@
:min="0" :min="0"
/> />
</el-form-item> </el-form-item>
<el-form-item
v-show="compressForm.isReSize && compressForm.reSizeHeight > 0 && compressForm.reSizeWidth === 0"
:label="$T('UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT')"
>
<el-switch
v-model="compressForm.skipReSizeOfSmallImg"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item
v-show="compressForm.isReSize && compressForm.reSizeWidth > 0 && compressForm.reSizeHeight === 0"
:label="$T('UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH')"
>
<el-switch
v-model="compressForm.skipReSizeOfSmallImg"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item <el-form-item
:label="$T('UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT')" :label="$T('UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT')"
> >
@ -1523,6 +1543,7 @@ async function initForm () {
compressForm.reSizeWidth = compress.reSizeWidth ?? 500 compressForm.reSizeWidth = compress.reSizeWidth ?? 500
compressForm.reSizeHeight = compress.reSizeHeight ?? 500 compressForm.reSizeHeight = compress.reSizeHeight ?? 500
compressForm.isReSizeByPercent = compress.isReSizeByPercent ?? false compressForm.isReSizeByPercent = compress.isReSizeByPercent ?? false
compressForm.skipReSizeOfSmallImg = compress.skipReSizeOfSmallImg ?? false
compressForm.reSizePercent = compress.reSizePercent ?? 50 compressForm.reSizePercent = compress.reSizePercent ?? 50
compressForm.isRotate = compress.isRotate ?? false compressForm.isRotate = compress.isRotate ?? false
compressForm.rotateDegree = compress.rotateDegree ?? 0 compressForm.rotateDegree = compress.rotateDegree ?? 0

View File

@ -327,6 +327,26 @@
:min="0" :min="0"
/> />
</el-form-item> </el-form-item>
<el-form-item
v-show="compressForm.isReSize && compressForm.reSizeHeight > 0 && compressForm.reSizeWidth === 0"
:label="$T('UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT')"
>
<el-switch
v-model="compressForm.skipReSizeOfSmallImg"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item
v-show="compressForm.isReSize && compressForm.reSizeWidth > 0 && compressForm.reSizeHeight === 0"
:label="$T('UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH')"
>
<el-switch
v-model="compressForm.skipReSizeOfSmallImg"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item <el-form-item
:label="$T('UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT')" :label="$T('UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT')"
> >
@ -440,6 +460,7 @@ const compressForm = reactive<any>({
isReSize: false, isReSize: false,
reSizeWidth: 500, reSizeWidth: 500,
reSizeHeight: 500, reSizeHeight: 500,
skipReSizeOfSmallImg: false,
isReSizeByPercent: false, isReSizeByPercent: false,
reSizePercent: 50, reSizePercent: 50,
isRotate: false, isRotate: false,
@ -467,6 +488,7 @@ async function initData () {
compressForm.isReSize = compress.isReSize ?? false compressForm.isReSize = compress.isReSize ?? false
compressForm.reSizeWidth = compress.reSizeWidth ?? 500 compressForm.reSizeWidth = compress.reSizeWidth ?? 500
compressForm.reSizeHeight = compress.reSizeHeight ?? 500 compressForm.reSizeHeight = compress.reSizeHeight ?? 500
compressForm.skipReSizeOfSmallImg = compress.skipReSizeOfSmallImg ?? false
compressForm.isReSizeByPercent = compress.isReSizeByPercent ?? false compressForm.isReSizeByPercent = compress.isReSizeByPercent ?? false
compressForm.reSizePercent = compress.reSizePercent ?? 50 compressForm.reSizePercent = compress.reSizePercent ?? 50
compressForm.isRotate = compress.isRotate ?? false compressForm.isRotate = compress.isRotate ?? false

View File

@ -2,7 +2,6 @@ export const SHOW_INPUT_BOX = 'SHOW_INPUT_BOX'
export const SHOW_INPUT_BOX_RESPONSE = 'SHOW_INPUT_BOX_RESPONSE' export const SHOW_INPUT_BOX_RESPONSE = 'SHOW_INPUT_BOX_RESPONSE'
export const TOGGLE_SHORTKEY_MODIFIED_MODE = 'TOGGLE_SHORTKEY_MODIFIED_MODE' export const TOGGLE_SHORTKEY_MODIFIED_MODE = 'TOGGLE_SHORTKEY_MODIFIED_MODE'
export const C1N = 'WjJoeFdWWklhVTlXYVRKTU5EUmFOVkEwUlVRPQ==' export const C1N = 'WjJoeFdWWklhVTlXYVRKTU5EUmFOVkEwUlVRPQ=='
export const SHOW_PRIVACY_MESSAGE = 'SHOW_PRIVACY_MESSAGE'
export const PICGO_SAVE_CONFIG = 'PICGO_SAVE_CONFIG' export const PICGO_SAVE_CONFIG = 'PICGO_SAVE_CONFIG'
export const PICGO_GET_CONFIG = 'PICGO_GET_CONFIG' export const PICGO_GET_CONFIG = 'PICGO_GET_CONFIG'
export const PICGO_GET_DB = 'PICGO_GET_DB' export const PICGO_GET_DB = 'PICGO_GET_DB'

View File

@ -5,7 +5,6 @@ interface ILocales {
OPEN_MINI_WINDOW: string OPEN_MINI_WINDOW: string
CHOOSE_DEFAULT_PICBED: string CHOOSE_DEFAULT_PICBED: string
OPEN_UPDATE_HELPER: string OPEN_UPDATE_HELPER: string
PRIVACY_AGREEMENT: string
RELOAD_APP: string RELOAD_APP: string
UPLOAD_SUCCEED: string UPLOAD_SUCCEED: string
UPLOAD_FAILED: string UPLOAD_FAILED: string
@ -118,6 +117,8 @@ interface ILocales {
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: string UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: string
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: string
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: string
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: string
UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: string
UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: string UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: string
UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: string
UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: string UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: string
@ -836,8 +837,6 @@ interface ILocales {
TIPS_FIND_NEW_VERSION: string TIPS_FIND_NEW_VERSION: string
UPDATE_DOWNLOADED: string UPDATE_DOWNLOADED: string
TIPS_UPDATE_DOWNLOADED: string TIPS_UPDATE_DOWNLOADED: string
PRIVACY: string
PRIVACY_TIPS: string
QUIT: string QUIT: string
} }
type ILocalesKey = keyof ILocales type ILocalesKey = keyof ILocales

View File

@ -7432,13 +7432,6 @@ fast-xml-parser@4.0.11:
dependencies: dependencies:
strnum "^1.0.5" strnum "^1.0.5"
fast-xml-parser@^3.19.0:
version "3.21.1"
resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736"
integrity sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==
dependencies:
strnum "^1.0.4"
fast-xml-parser@^4.2.2: fast-xml-parser@^4.2.2:
version "4.2.2" version "4.2.2"
resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.2.tgz#cb7310d1e9cf42d22c687b0fae41f3c926629368" resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.2.tgz#cb7310d1e9cf42d22c687b0fae41f3c926629368"
@ -7446,6 +7439,13 @@ fast-xml-parser@^4.2.2:
dependencies: dependencies:
strnum "^1.0.5" strnum "^1.0.5"
fast-xml-parser@^4.2.4:
version "4.2.7"
resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz#871f2ca299dc4334b29f8da3658c164e68395167"
integrity sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==
dependencies:
strnum "^1.0.5"
fast-xml-parser@^4.2.5: fast-xml-parser@^4.2.5:
version "4.2.5" version "4.2.5"
resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz#a6747a09296a6cb34f2ae634019bf1738f3b421f" resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz#a6747a09296a6cb34f2ae634019bf1738f3b421f"
@ -11054,10 +11054,10 @@ performance-now@^2.1.0:
resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
piclist@^0.7.6: piclist@^0.8.5:
version "0.7.6" version "0.8.5"
resolved "https://registry.npmjs.org/piclist/-/piclist-0.7.6.tgz#93ac36f2f3fa067d014b4ff1e808bd6304fa29e3" resolved "https://registry.npmjs.org/piclist/-/piclist-0.8.5.tgz#0f0e5861451eef0a18a017001ee25f9c9af52bd6"
integrity sha512-aLoVhvl8A/Ez2I3T3rmqQ5MCBw6txTQ+5H0zGvgybEpHGpuTHct9MBplfJVj2eIyqwbbcWT24t5bkvaByma2gw== integrity sha512-Gop8vwVNfwENau/WVQGicNZeYoqyo9jUQB9GPwh8PaxzFY4mO6f3fHXgzKU7A8ejoskECUgo52i4sKuD1fTpvQ==
dependencies: dependencies:
"@picgo/i18n" "^1.0.0" "@picgo/i18n" "^1.0.0"
"@picgo/store" "^2.0.4" "@picgo/store" "^2.0.4"
@ -13003,7 +13003,7 @@ strip-outer@^1.0.0:
dependencies: dependencies:
escape-string-regexp "^1.0.2" escape-string-regexp "^1.0.2"
strnum@^1.0.4, strnum@^1.0.5: strnum@^1.0.5:
version "1.0.5" version "1.0.5"
resolved "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" resolved "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db"
integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==
@ -13959,10 +13959,10 @@ vue-loader@^17.0.0:
hash-sum "^2.0.0" hash-sum "^2.0.0"
loader-utils "^2.0.0" loader-utils "^2.0.0"
vue-router@^4.2.2: vue-router@^4.2.4:
version "4.2.2" version "4.2.4"
resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.2.2.tgz#b0097b66d89ca81c0986be03da244c7b32a4fd81" resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz#382467a7e2923e6a85f015d081e1508052c191b9"
integrity sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ== integrity sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==
dependencies: dependencies:
"@vue/devtools-api" "^6.5.0" "@vue/devtools-api" "^6.5.0"
@ -14031,15 +14031,15 @@ web-streams-polyfill@^3.0.3:
resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6" resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q== integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
webdav@^5.1.0: webdav@^5.2.3:
version "5.1.0" version "5.2.3"
resolved "https://registry.npmjs.org/webdav/-/webdav-5.1.0.tgz#959cb5c34379cd0202adcce58c8a71266d9c2d35" resolved "https://registry.npmjs.org/webdav/-/webdav-5.2.3.tgz#73f5ddfef170ea594a63620b99081e4db6d90860"
integrity sha512-66OP2/PkVe3tkVy5wO/XsGebKuWhn2ebywA7a11ViHNls8Y6pgop6hU9j7god+GbZv/zVQeTs9w3ZS7JhHhE7g== integrity sha512-u5wqJULZhB7IwO3qVD9r0ikt6SMHZ4P4YYtLJ6JrCmSoZuW6KvanXWJAA4LZDm548lK7aCNUsy0VxbBKBXAGrg==
dependencies: dependencies:
"@buttercup/fetch" "^0.1.1" "@buttercup/fetch" "^0.1.1"
base-64 "^1.0.0" base-64 "^1.0.0"
byte-length "^1.0.2" byte-length "^1.0.2"
fast-xml-parser "^3.19.0" fast-xml-parser "^4.2.4"
he "^1.2.0" he "^1.2.0"
hot-patcher "^2.0.0" hot-patcher "^2.0.0"
layerr "^0.1.2" layerr "^0.1.2"