|
1256 | 1256 |
|
1257 | 1257 | function show(title, html) { |
1258 | 1258 | ensure(); |
| 1259 | + // 如果只传了一个参数,且是字符串,那么它应该是内容,标题默认为"通知" |
| 1260 | + if (html === undefined && typeof title === 'string') { |
| 1261 | + html = title; |
| 1262 | + title = '通知'; |
| 1263 | + } |
| 1264 | + |
1259 | 1265 | titleEl.textContent = title || '通知'; |
1260 | | - if (typeof html === 'string') content.innerHTML = html; else { |
| 1266 | + |
| 1267 | + if (html === undefined || html === null) { |
| 1268 | + content.innerHTML = ''; |
| 1269 | + } else if (typeof html === 'string') { |
| 1270 | + // 处理换行符,将其转换为 <br> |
| 1271 | + content.innerHTML = html.replace(/\n/g, '<br>'); |
| 1272 | + } else { |
1261 | 1273 | content.innerHTML = ''; |
1262 | 1274 | content.append(html); |
1263 | 1275 | } |
|
4661 | 4673 | overlay.addEventListener('mousedown', handleClick); |
4662 | 4674 |
|
4663 | 4675 | document.body.appendChild(overlay); |
4664 | | - Toast.show('请点击屏幕任意位置获取坐标\n右键取消', 'info'); |
| 4676 | + Toast.show('提示', '请点击屏幕任意位置获取坐标\n右键取消'); |
4665 | 4677 | } |
4666 | 4678 |
|
4667 | 4679 | function stop() { |
|
4676 | 4688 | function cancel(e) { |
4677 | 4689 | e.preventDefault(); |
4678 | 4690 | stop(); |
4679 | | - Toast.show('已取消坐标拾取'); |
| 4691 | + Toast.show('提示', '已取消坐标拾取'); |
4680 | 4692 | } |
4681 | 4693 |
|
4682 | 4694 | function handleClick(e) { |
|
4697 | 4709 | }); |
4698 | 4710 | } |
4699 | 4711 |
|
4700 | | - Toast.show(`坐标: ${x}, ${y}\n已复制代码: ${code}`, 'success'); |
| 4712 | + Toast.show('拾取成功', `坐标: ${x}, ${y}\n已复制代码: ${code}`); |
4701 | 4713 | console.log(`[CoordinatePicker] Picked: ${x}, ${y}`); |
4702 | 4714 |
|
4703 | 4715 | stop(); |
|
4740 | 4752 | overlay.addEventListener('mousemove', handleMouseMove); |
4741 | 4753 |
|
4742 | 4754 | document.body.appendChild(overlay); |
4743 | | - Toast.show('请点击选择输入框或其他元素\n移动鼠标预览,右键取消', 'info'); |
| 4755 | + Toast.show('提示', '请点击选择输入框或其他元素\n移动鼠标预览,右键取消'); |
4744 | 4756 | } |
4745 | 4757 |
|
4746 | 4758 | function stop() { |
|
4761 | 4773 | function cancel(e) { |
4762 | 4774 | e.preventDefault(); |
4763 | 4775 | stop(); |
4764 | | - Toast.show('已取消元素拾取', 'info'); |
| 4776 | + Toast.show('提示', '已取消元素拾取'); |
4765 | 4777 | } |
4766 | 4778 |
|
4767 | 4779 | function handleMouseMove(e) { |
|
4812 | 4824 | const success = copyWithGreasemonkey(code); |
4813 | 4825 |
|
4814 | 4826 | if (success) { |
4815 | | - Toast.show(`已拾取元素: ${selector}\n代码已复制: ${code}`, 'success'); |
| 4827 | + Toast.show('拾取成功', `已拾取元素: ${selector}\n代码已复制: ${code}`); |
4816 | 4828 | } else { |
4817 | | - Toast.show(`拾取成功: ${selector}\n复制失败,请手动复制控制台输出`, 'warning'); |
| 4829 | + Toast.show('拾取成功', `拾取成功: ${selector}\n复制失败,请手动复制控制台输出`); |
4818 | 4830 | } |
4819 | 4831 |
|
4820 | 4832 | console.log(`[ElementPicker] Picked:`, highlightedElement); |
4821 | 4833 | console.log(`[ElementPicker] Selector: ${selector}`); |
4822 | 4834 | console.log(`[ElementPicker] Code: ${code}`); |
4823 | 4835 | } else { |
4824 | | - Toast.show('未选中任何元素', 'warning'); |
| 4836 | + Toast.show('提示', '未选中任何元素'); |
4825 | 4837 | } |
4826 | 4838 |
|
4827 | 4839 | stop(); |
|
0 commit comments