diff --git a/package.json b/package.json index fca10f68e..ac69babf7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scriptcat", - "version": "1.2.0-beta.5", + "version": "1.2.0", "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!", "author": "CodFrm", "license": "GPLv3", diff --git a/src/manifest.json b/src/manifest.json index 7aea65769..f8cd3f5c0 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "__MSG_scriptcat__", - "version": "1.2.0.1600", + "version": "1.2.0", "author": "CodFrm", "description": "__MSG_scriptcat_description__", "options_ui": { diff --git a/src/pages/components/ScriptResource/index.tsx b/src/pages/components/ScriptResource/index.tsx index 5a2a6505f..8e8901115 100644 --- a/src/pages/components/ScriptResource/index.tsx +++ b/src/pages/components/ScriptResource/index.tsx @@ -4,16 +4,17 @@ import { ResourceClient } from "@App/app/service/service_worker/client"; import { message } from "@App/pages/store/global"; import { base64ToBlob } from "@App/pkg/utils/utils"; import { Button, Drawer, Input, Message, Popconfirm, Space, Table } from "@arco-design/web-react"; -import type { RefInputType } from "@arco-design/web-react/es/Input/interface"; import type { ColumnProps } from "@arco-design/web-react/es/Table"; import { IconDelete, IconDownload, IconSearch } from "@arco-design/web-react/icon"; -import React, { useEffect, useRef, useState } from "react"; +import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; type ResourceListItem = { key: string; } & Resource; +const resourceClient = new ResourceClient(message); + const ScriptResource: React.FC<{ script?: Script; visible: boolean; @@ -21,9 +22,7 @@ const ScriptResource: React.FC<{ onCancel: () => void; }> = ({ script, visible, onCancel, onOk }) => { const [data, setData] = useState([]); - const inputRef = useRef(null); const { t } = useTranslation(); - const resourceClient = new ResourceClient(message); useEffect(() => { if (!script) { @@ -53,8 +52,8 @@ const ScriptResource: React.FC<{ return (
{ @@ -68,11 +67,6 @@ const ScriptResource: React.FC<{ ); }, onFilter: (value, row) => !value || row.key.includes(value), - onFilterDropdownVisibleChange: (v) => { - if (v) { - setTimeout(() => inputRef.current!.focus(), 1); - } - }, }, { title: t("type"), diff --git a/src/pages/components/ScriptStorage/index.tsx b/src/pages/components/ScriptStorage/index.tsx index 2f25446b9..1bce8a33e 100644 --- a/src/pages/components/ScriptStorage/index.tsx +++ b/src/pages/components/ScriptStorage/index.tsx @@ -2,10 +2,9 @@ import type { Script } from "@App/app/repo/scripts"; import { valueClient } from "@App/pages/store/features/script"; import { valueType } from "@App/pkg/utils/utils"; import { Button, Drawer, Form, Input, Message, Modal, Popconfirm, Select, Space, Table } from "@arco-design/web-react"; -import type { RefInputType } from "@arco-design/web-react/es/Input/interface"; import type { ColumnProps } from "@arco-design/web-react/es/Table"; import { IconDelete, IconEdit, IconSearch } from "@arco-design/web-react/icon"; -import React, { useEffect, useRef, useState } from "react"; +import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; const FormItem = Form.Item; @@ -23,7 +22,6 @@ const ScriptStorage: React.FC<{ }> = ({ script, visible, onCancel, onOk }) => { const [data, setData] = useState([]); const [rawData, setRawData] = useState<{ [key: string]: any }>({}); - const inputRef = useRef(null); const [currentValue, setCurrentValue] = useState(); const [visibleEdit, setVisibleEdit] = useState(false); const [isEdit, setIsEdit] = useState(false); @@ -93,8 +91,8 @@ const ScriptStorage: React.FC<{ return (
{ @@ -108,11 +106,6 @@ const ScriptStorage: React.FC<{ ); }, onFilter: (value, row) => !value || row.key.includes(value), - onFilterDropdownVisibleChange: (v) => { - if (v) { - setTimeout(() => inputRef.current!.focus(), 1); - } - }, }, { title: t("value"), diff --git a/src/pages/options/routes/ScriptList/ScriptTable.tsx b/src/pages/options/routes/ScriptList/ScriptTable.tsx index 4ac0f9a02..53635dfc0 100644 --- a/src/pages/options/routes/ScriptList/ScriptTable.tsx +++ b/src/pages/options/routes/ScriptList/ScriptTable.tsx @@ -1,4 +1,4 @@ -import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from "react"; +import React, { createContext, useContext, useEffect, useMemo, useState } from "react"; import { Avatar, Button, @@ -38,7 +38,6 @@ import { RiUploadCloudFill, } from "react-icons/ri"; import { Link, useNavigate } from "react-router-dom"; -import type { RefInputType } from "@arco-design/web-react/es/Input/interface"; import Text from "@arco-design/web-react/es/Typography/text"; import type { DragEndEvent } from "@dnd-kit/core"; import { closestCenter, DndContext, KeyboardSensor, PointerSensor, useSensor, useSensors } from "@dnd-kit/core"; @@ -60,8 +59,7 @@ import { requestEnableScript, pinToTop, scriptClient, synchronizeClient } from " import { getCombinedMeta } from "@App/app/service/service_worker/utils"; import { parseTags } from "@App/app/repo/metadata"; import { EnableSwitch, HomeCell, MemoizedAvatar, ScriptSearchField, SourceCell, UpdateTimeCell } from "./components"; -import type { SetSearchRequest } from "./hooks"; -import type { SearchType } from "@App/app/service/service_worker/types"; +import { SearchFilter } from "./SearchFilter"; type ListType = ScriptLoading; @@ -420,8 +418,6 @@ interface ScriptTableProps { updateScripts: (uuids: string[], data: Partial