study/uTools-quickcommand
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-quickcommand.git synced 2025-07-26 13:29:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化浏览器命令功能，新增通过URL、标题和ID获取标签的支持，重构标签激活逻辑以支持模糊匹配。更新相关命令为异步执行，简化配置项

Browse Source
This commit is contained in:
fofolee 2025-01-22 21:30:16 +08:00
parent c3ca34bd2a
commit c1e255dd56
2 changed files with 28 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugin/lib/quickcomposer/browser/browser.js
View File

@ -200,9 +200,7 @@ const initCDP = async (port) => {
await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
} catch (err) {
console.log(err);
throw new Error(
`请先通过浏览器控制中的“启动浏览器”打开浏览器`
);
throw new Error(`请先通过浏览器控制中的"启动浏览器"打开浏览器`);
}
}
return { Page, Runtime, DOM };
@ -246,16 +244,17 @@ const getTabs = async () => {
.map((target) => ({
url: target.url,
title: target.title,
id: target.id,
}));
};
const activateTab = async (index) => {
const activateTab = async (type, value) => {
const targets = await CDP.List();
const pages = targets.filter((target) => target.type === "page");
if (index > 0 && index <= pages.length) {
const targetId = pages[index - 1].id;
await CDP.Activate({ id: targetId });
const target = targets.find((target) => target[type].includes(value));
if (!target) {
throw new Error(`未找到目标: ${type} = ${value}`);
}
await CDP.Activate({ id: target.id });
};
const clickElement = async (selector) => {

85
src/js/composer/commands/browserCommands.js
View File

@ -105,6 +105,7 @@ export const browserCommands = {
value: "quickcomposer.browser.getTabs",
label: "获取/切换标签",
icon: "tab",
isAsync: true,
subCommands: [
{
value: "quickcomposer.browser.getTabs",
@ -117,12 +118,22 @@ export const browserCommands = {
icon: "tab_unselected",
config: [
{
label: "标签索引",
component: "NumberInput",
component: "QSelect",
icon: "tab",
min: 1,
defaultValue: 1,
width: 12,
width: 3,
options: [
{ label: "通过URL", value: "url" },
{ label: "通过标题", value: "title" },
{ label: "通过ID", value: "id" },
],
defaultValue: "url",
},
{
label: "URL/标题/ID",
component: "VariableInput",
icon: "tab",
width: 9,
placeholder: "支持模糊匹配",
},
],
},
@ -132,6 +143,7 @@ export const browserCommands = {
value: "quickcomposer.browser.executeScript",
label: "执行脚本",
icon: "code",
isAsync: true,
config: [
{
label: "脚本内容",
@ -152,6 +164,7 @@ export const browserCommands = {
value: "quickcomposer.browser.setCookie",
label: "Cookie操作",
icon: "cookie",
isAsync: true,
subCommands: [
{
value: "quickcomposer.browser.setCookie",
@ -240,6 +253,7 @@ export const browserCommands = {
value: "quickcomposer.browser.injectCSS",
label: "注入CSS",
icon: "style",
isAsync: true,
config: [
{
label: "CSS内容",
@ -255,6 +269,7 @@ export const browserCommands = {
label: "手动选择元素",
icon: "mouse",
isAsync: true,
config: [],
},
{
value: "quickcomposer.browser.clickElement",
@ -284,13 +299,6 @@ export const browserCommands = {
label: "输入文本",
icon: "edit",
config: [
{
label: "选择器",
component: "VariableInput",
icon: "code",
width: 12,
placeholder: "输入CSS选择器",
},
{
label: "文本内容",
component: "VariableInput",
@ -304,84 +312,32 @@ export const browserCommands = {
value: "quickcomposer.browser.getText",
label: "获取文本",
icon: "text_fields",
config: [
{
label: "选择器",
component: "VariableInput",
icon: "code",
width: 12,
placeholder: "输入CSS选择器",
},
],
},
{
value: "quickcomposer.browser.getHtml",
label: "获取HTML",
icon: "code",
config: [
{
label: "选择器",
component: "VariableInput",
icon: "code",
width: 12,
placeholder: "输入CSS选择器",
},
],
},
{
value: "quickcomposer.browser.hideElement",
label: "隐藏元素",
icon: "visibility_off",
config: [
{
label: "选择器",
component: "VariableInput",
icon: "code",
width: 12,
placeholder: "输入CSS选择器",
},
],
},
{
value: "quickcomposer.browser.showElement",
label: "显示元素",
icon: "visibility",
config: [
{
label: "选择器",
component: "VariableInput",
icon: "code",
width: 12,
placeholder: "输入CSS选择器",
},
],
},
{
value: "quickcomposer.browser.scrollToElement",
label: "滚动到元素",
icon: "open_in_full",
config: [
{
label: "选择器",
component: "VariableInput",
icon: "code",
width: 12,
placeholder: "输入CSS选择器",
},
],
},
{
value: "quickcomposer.browser.waitForElement",
label: "等待元素",
icon: "hourglass_empty",
config: [
{
label: "选择器",
component: "VariableInput",
icon: "code",
width: 12,
placeholder: "输入CSS选择器",
},
{
label: "超时时间",
component: "NumberInput",
@ -399,6 +355,7 @@ export const browserCommands = {
value: "quickcomposer.browser.scrollTo",
label: "滚动及页面尺寸",
icon: "open_in_full",
isAsync: true,
subCommands: [
{
value: "quickcomposer.browser.scrollTo",