diff --git a/packages/scripts/src/common/index.ts b/packages/scripts/src/common/index.ts new file mode 100644 index 00000000..d2cfef3c --- /dev/null +++ b/packages/scripts/src/common/index.ts @@ -0,0 +1,6 @@ +import { Page } from 'playwright'; + +export async function openLink(page: Page, { url }: { url: string }) { + await page.goto(url); + return page; +} diff --git a/packages/scripts/src/cx/login/index.ts b/packages/scripts/src/cx/login/index.ts index c94da649..550364e9 100644 --- a/packages/scripts/src/cx/login/index.ts +++ b/packages/scripts/src/cx/login/index.ts @@ -1,4 +1,3 @@ export { phoneCodeLogin } from './phone.code'; export { phoneLogin } from './phone'; export { schoolLogin } from './school'; -export { otherLogin } from './other'; diff --git a/packages/scripts/src/cx/login/other.ts b/packages/scripts/src/cx/login/other.ts deleted file mode 100644 index d0ea6bc8..00000000 --- a/packages/scripts/src/cx/login/other.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Page } from 'playwright'; -import { waitForLogin } from '../utils'; - -export async function otherLogin(page: Page) { - await page.goto('https://passport2.chaoxing.com/login?loginType=4&newversion=true'); - await waitForLogin(page); - return page; -} diff --git a/packages/scripts/src/script.ts b/packages/scripts/src/script.ts index b513ae12..83aac4d2 100644 --- a/packages/scripts/src/script.ts +++ b/packages/scripts/src/script.ts @@ -25,26 +25,24 @@ export interface LaunchScriptsOptions { localStorage: any } -export const scripts: Record = { - 'cx-login-other': CX.otherLogin, - 'cx-login-phone': CX.phoneLogin, - 'cx-login-phone-code': CX.phoneCodeLogin, - 'cx-login-school': CX.schoolLogin, - 'zhs-login-other': ZHS.otherLogin, - 'zhs-login-phone': ZHS.phoneLogin, - 'zhs-login-school': ZHS.schoolLogin -}; - export const scriptNames = [ - ['cx-login-other', '超星手动登录'], ['cx-login-phone', '超星手机密码登录'], ['cx-login-phone-code', '超星手机验证码登录'], ['cx-login-school', '超星学校登录'], - ['zhs-login-other', '智慧树手动登录'], ['zhs-login-phone', '智慧树手机登录'], - ['zhs-login-school', '智慧树学校登录'] + ['zhs-login-school', '智慧树学校登录'], + ['open-diy-link', '进入自定义链接'] ]; +export const scripts: Record = { + 'cx-login-phone': CX.phoneLogin, + 'cx-login-phone-code': CX.phoneCodeLogin, + 'cx-login-school': CX.schoolLogin, + 'zhs-login-phone': ZHS.phoneLogin, + 'zhs-login-school': ZHS.schoolLogin, + 'open-diy-link': openLink +}; + process.on('unhandledRejection', (e) => { console.error('未知错误', e); }); diff --git a/packages/scripts/src/types.ts b/packages/scripts/src/types.ts index 96887b2c..88feb530 100644 --- a/packages/scripts/src/types.ts +++ b/packages/scripts/src/types.ts @@ -4,13 +4,14 @@ import { CXLoginOptions } from './cx/types'; import { ZHSLoginOptions } from './zhs/types'; export interface ScriptOptions { - 'cx-login-other': {} 'cx-login-phone': CXLoginOptions['phone'] 'cx-login-phone-code': CXLoginOptions['phoneCode'] 'cx-login-school': CXLoginOptions['school'] - 'zhs-login-other': {} 'zhs-login-phone': ZHSLoginOptions['phone'] 'zhs-login-school': ZHSLoginOptions['school'] + 'open-diy-link': { + url: string + } } export type ScriptFunction = (page: Page, opts: Opts) => Promise diff --git a/packages/scripts/src/zhs/login/index.ts b/packages/scripts/src/zhs/login/index.ts index c0257bff..8296b983 100644 --- a/packages/scripts/src/zhs/login/index.ts +++ b/packages/scripts/src/zhs/login/index.ts @@ -1,3 +1,2 @@ export { phoneLogin } from './phone'; export { schoolLogin } from './school'; -export { otherLogin } from './other'; diff --git a/packages/scripts/src/zhs/login/other.ts b/packages/scripts/src/zhs/login/other.ts deleted file mode 100644 index c717040b..00000000 --- a/packages/scripts/src/zhs/login/other.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Page } from 'playwright'; -import { waitForLogin } from '../utils'; - -export async function otherLogin(page: Page) { - await page.goto( - 'https://passport.zhihuishu.com/login' - ); - await waitForLogin(page); - return page; -} diff --git a/packages/web/src/components/file/index.ts b/packages/web/src/components/file/index.ts index 70155416..3075482b 100644 --- a/packages/web/src/components/file/index.ts +++ b/packages/web/src/components/file/index.ts @@ -18,11 +18,10 @@ export type Form = Record = { - 'cx-login-other': {} as Form<'cx-login-other'>, 'cx-login-phone': { phone: { type: 'tel', - title: '手机号', + title: '手机', required: true }, password: { @@ -34,7 +33,7 @@ export const scriptForms: Record = { 'cx-login-phone-code': { phone: { type: 'tel', - title: '手机号', + title: '手机', required: true } } as Form<'cx-login-phone-code'>, @@ -55,11 +54,10 @@ export const scriptForms: Record = { required: true } } as Form<'cx-login-school'>, - 'zhs-login-other': {} as Form<'zhs-login-other'>, 'zhs-login-phone': { phone: { type: 'tel', - title: '手机号', + title: '手机', required: true }, password: { @@ -84,5 +82,13 @@ export const scriptForms: Record = { title: '密码', required: true } - } as Form<'zhs-login-school'> + } as Form<'zhs-login-school'>, + 'open-diy-link': { + url: { + type: 'text', + title: '链接', + required: true + } + } as Form<'open-diy-link'> + };