From 05cf51afa074c5910d3e6718104474dbc738eccc Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 25 May 2022 01:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AE=A2=E9=98=85=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=B2=98=E8=B4=B4=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- shell/update.sh | 18 ++++---- src/pages/crontab/modal.tsx | 2 + src/pages/dependence/modal.tsx | 1 + src/pages/env/editNameModal.tsx | 1 + src/pages/env/modal.tsx | 1 + src/pages/script/editNameModal.tsx | 1 + src/pages/script/saveModal.tsx | 1 + src/pages/setting/appModal.tsx | 1 + src/pages/subscription/modal.tsx | 69 +++++++++++++++++++++++++++++- 10 files changed, 86 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f14fb1d9..d10df79d 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ ql extra # 添加单个脚本文件 ql raw # 添加单个仓库的指定脚本 -ql repo +ql repo # 删除旧日志 ql rmlog # 启动tg-bot @@ -147,6 +147,7 @@ task desi * blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串 * dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响 * branch: 拉取仓库的分支 +* extensions: 拉取仓库的文件后缀 * days: 需要保留的日志的天数 * file_path: 任务执行时的文件路径 * env_name: 任务执行时需要并发或者指定时的环境变量名称 diff --git a/shell/update.sh b/shell/update.sh index 369146fb..43d492ef 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -229,15 +229,15 @@ run_extra_shell() { ## 脚本用法 usage() { echo -e "本脚本用法：" - echo -e "1. $cmd_update update # 更新并重启青龙" - echo -e "2. $cmd_update extra # 运行自定义脚本" - echo -e "3. $cmd_update raw # 更新单个脚本文件" - echo -e "4. $cmd_update repo # 更新单个仓库的脚本" - echo -e "5. $cmd_update rmlog # 删除旧日志" - echo -e "6. $cmd_update bot # 启动tg-bot" - echo -e "7. $cmd_update check # 检测青龙环境并修复" - echo -e "8. $cmd_update resetlet # 重置登录错误次数" - echo -e "9. $cmd_update resettfa # 禁用两步登录" + echo -e "1. $cmd_update update # 更新并重启青龙" + echo -e "2. $cmd_update extra # 运行自定义脚本" + echo -e "3. $cmd_update raw # 更新单个脚本文件" + echo -e "4. $cmd_update repo # 更新单个仓库的脚本" + echo -e "5. $cmd_update rmlog # 删除旧日志" + echo -e "6. $cmd_update bot # 启动tg-bot" + echo -e "7. $cmd_update check # 检测青龙环境并修复" + echo -e "8. $cmd_update resetlet # 重置登录错误次数" + echo -e "9. $cmd_update resettfa # 禁用两步登录" } ## 更新qinglong diff --git a/src/pages/crontab/modal.tsx b/src/pages/crontab/modal.tsx index dc65a1ee..ad449a26 100644 --- a/src/pages/crontab/modal.tsx +++ b/src/pages/crontab/modal.tsx @@ -50,6 +50,7 @@ const CronModal = ({ visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields() @@ -168,6 +169,7 @@ const CronLabelModal = ({ visible={visible} footer={buttons} centered + maskClosable={false} forceRender onCancel={() => handleCancel(false)} confirmLoading={loading} diff --git a/src/pages/dependence/modal.tsx b/src/pages/dependence/modal.tsx index cc6c1b91..d0c66493 100644 --- a/src/pages/dependence/modal.tsx +++ b/src/pages/dependence/modal.tsx @@ -72,6 +72,7 @@ const DependenceModal = ({ visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields() diff --git a/src/pages/env/editNameModal.tsx b/src/pages/env/editNameModal.tsx index afb653b6..8c88f13d 100644 --- a/src/pages/env/editNameModal.tsx +++ b/src/pages/env/editNameModal.tsx @@ -42,6 +42,7 @@ const EditNameModal = ({ visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields() diff --git a/src/pages/env/modal.tsx b/src/pages/env/modal.tsx index 3862c41d..cbe4ebfb 100644 --- a/src/pages/env/modal.tsx +++ b/src/pages/env/modal.tsx @@ -62,6 +62,7 @@ const EnvModal = ({ visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields() diff --git a/src/pages/script/editNameModal.tsx b/src/pages/script/editNameModal.tsx index 68eaf9e0..0e742402 100644 --- a/src/pages/script/editNameModal.tsx +++ b/src/pages/script/editNameModal.tsx @@ -57,6 +57,7 @@ const EditScriptNameModal = ({ visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields() diff --git a/src/pages/script/saveModal.tsx b/src/pages/script/saveModal.tsx index 8b92b20e..1c73d406 100644 --- a/src/pages/script/saveModal.tsx +++ b/src/pages/script/saveModal.tsx @@ -44,6 +44,7 @@ const SaveModal = ({ visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields() diff --git a/src/pages/setting/appModal.tsx b/src/pages/setting/appModal.tsx index 9a81646e..e4695b20 100644 --- a/src/pages/setting/appModal.tsx +++ b/src/pages/setting/appModal.tsx @@ -44,6 +44,7 @@ const AppModal = ({ visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields() diff --git a/src/pages/subscription/modal.tsx b/src/pages/subscription/modal.tsx index 97d6dd64..58cdaf5c 100644 --- a/src/pages/subscription/modal.tsx +++ b/src/pages/subscription/modal.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useCallback, useEffect, useState } from 'react'; import { Modal, message, InputNumber, Form, Radio, Select, Input } from 'antd'; import { request } from '@/utils/http'; import config from '@/utils/config'; @@ -183,6 +183,44 @@ const SubscriptionModal = ({ ); }; + const onPaste = useCallback((e: any) => { + const text = e.clipboardData.getData('text'); + if (!subscription && text.includes('ql ')) { + const [ + , + type, + url, + whitelist, + blacklist, + dependences, + branch, + extensions, + ] = text.split(' ').map((x) => x.trim()); + form.setFieldsValue({ + type: + type === 'raw' + ? 'file' + : url.startsWith('http') + ? 'public-repo' + : 'private-repo', + url, + whitelist, + blacklist, + dependences, + branch, + extensions, + }); + } + }, []); + + useEffect(() => { + if (visible) { + window.addEventListener('paste', onPaste); + } else { + window.removeEventListener('paste', onPaste); + } + }, [visible]); + useEffect(() => { form.setFieldsValue(subscription || {}); setType((subscription && subscription.type) || 'public-repo'); @@ -193,12 +231,39 @@ const SubscriptionModal = ({ } }, [subscription, visible]); + const isFirefox = navigator.userAgent.includes('Firefox'); + const isSafari = + navigator.userAgent.includes('Safari') && + !navigator.userAgent.includes('Chrome'); + const isQQBrowser = navigator.userAgent.includes('QQBrowser'); + return ( + 新建订阅 + + 拷贝repo/raw命令，粘贴导入 + + + ) + } visible={visible} forceRender centered + maskClosable={false} onOk={() => { form .validateFields()