🐛 修复脚本列表页一些警告问题

scriptscat · Jun 27, 2023 · fc6d14d · fc6d14d
1 parent bb7d4d5
commit fc6d14d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/src/locales/en-US/translation.yaml b/src/locales/en-US/translation.yaml
@@ -43,6 +43,7 @@ silent_update_non_critical_changes: Silent Update Non-critical Script Changes
 enable_eslint: Enable ESLint
 eslint_rules: ESLint Rules
 enter_eslint_rules: Please Enter ESLint Rules, Configurations Can Be Downloaded from https://eslint.org/play/
+language_change_tip: Language Change Successful
 
 # Tools Page Tools
 backup: Backup

diff --git a/src/locales/zh-CN/translation.yaml b/src/locales/zh-CN/translation.yaml
@@ -43,6 +43,7 @@ silent_update_non_critical_changes: 非重要变更静默更新脚本
 enable_eslint: 开启 ESLint
 eslint_rules: ESLint规则
 enter_eslint_rules: 请输入 ESLint 规则，可以从 https://eslint.org/play/ 下载配置
+language_change_tip: 语言切换成功
 
 # 工具页 Tools
 backup: 备份

diff --git a/src/pages/options/routes/ScriptList.tsx b/src/pages/options/routes/ScriptList.tsx
@@ -70,7 +70,7 @@ import CloudScriptPlan from "@App/pages/components/CloudScriptPlan";
 import SynchronizeController from "@App/app/service/synchronize/controller";
 import { useTranslation } from "react-i18next";
 import { nextTime, semTime } from "@App/pkg/utils/utils";
-import { getValues, listHomeRender, scriptListSort } from "./utils";
+import { getValues, ListHomeRender, scriptListSort } from "./utils";
 
 type ListType = Script & { loading?: boolean };
 
@@ -377,13 +377,13 @@ function ScriptList() {
       key: "home",
       width: 100,
       render(col, item: Script) {
-        return listHomeRender(item);
+        return <ListHomeRender script={item} />;
       },
     },
     {
       title: t("sorting"),
       dataIndex: "sort",
-      key: "sort",
+      key: "id",
       width: 80,
       sorter: (a, b) => a.sort - b.sort,
       align: "center",
@@ -607,7 +607,7 @@ function ScriptList() {
   );
 
   // eslint-disable-next-line react/no-unstable-nested-components
-  const SortableWrapper = (props: any) => {
+  const SortableWrapper = (props: any, ref: any) => {
     return (
       <DndContext
         sensors={sensors}
@@ -639,7 +639,7 @@ function ScriptList() {
           items={scriptList}
           strategy={verticalListSortingStrategy}
         >
-          <tbody {...props} />
+          <table ref={ref} {...props} />
         </SortableContext>
       </DndContext>
     );
@@ -680,8 +680,9 @@ function ScriptList() {
   };
 
   const components: ComponentsProps = {
+    table: React.forwardRef(SortableWrapper),
     body: {
-      tbody: SortableWrapper,
+      // tbody: SortableWrapper,
       row: SortableItem,
     },
   };

diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx
@@ -74,6 +74,7 @@ function Setting() {
                   ).toLocaleLowerCase()
                 );
                 localStorage.language = value;
+                Message.success(t("language_change_tip")!);
               }}
             >
               {languageList.map((item) => (

diff --git a/src/pages/options/routes/utils.tsx b/src/pages/options/routes/utils.tsx
@@ -93,71 +93,71 @@ export function installUrlToHome(installUrl: string) {
   return undefined;
 }
 
-export function listHomeRender(item: Script) {
+export function ListHomeRender({ script }: { script: Script }) {
   const { t } = useTranslation();
   let home;
-  if (!item.metadata.homepageurl) {
-    home = installUrlToHome(item.downloadUrl || "");
+  if (!script.metadata.homepageurl) {
+    home = installUrlToHome(script.downloadUrl || "");
   }
   return (
     <Space size="mini">
       {home && <Tooltip content={t("homepage")}>{home}</Tooltip>}
-      {item.metadata.homepage && (
+      {script.metadata.homepage && (
         <Tooltip content={t("homepage")}>
           <Button
             type="text"
             iconOnly
             icon={<IconHome />}
             size="small"
-            href={item.metadata.homepage[0]}
+            href={script.metadata.homepage[0]}
             target="_blank"
           />
         </Tooltip>
       )}
-      {item.metadata.homepageurl && (
+      {script.metadata.homepageurl && (
         <Tooltip content={t("homepage")}>
           <Button
             type="text"
             iconOnly
             icon={<IconHome />}
             size="small"
-            href={item.metadata.homepageurl[0]}
+            href={script.metadata.homepageurl[0]}
             target="_blank"
           />
         </Tooltip>
       )}
-      {item.metadata.website && (
+      {script.metadata.website && (
         <Tooltip content={t("script_website")}>
           <Button
             type="text"
             iconOnly
             icon={<IconHome />}
             size="small"
-            href={item.metadata.website[0]}
+            href={script.metadata.website[0]}
             target="_blank"
           />
         </Tooltip>
       )}
-      {item.metadata.source && (
+      {script.metadata.source && (
         <Tooltip content={t("script_source")}>
           <Button
             type="text"
             iconOnly
             icon={<IconCode />}
             size="small"
-            href={item.metadata.source[0]}
+            href={script.metadata.source[0]}
             target="_blank"
           />
         </Tooltip>
       )}
-      {item.metadata.supporturl && (
+      {script.metadata.supporturl && (
         <Tooltip content={t("bug_feedback_script_support")}>
           <Button
             type="text"
             iconOnly
             icon={<IconBug />}
             size="small"
-            href={item.metadata.supporturl[0]}
+            href={script.metadata.supporturl[0]}
             target="_blank"
           />
         </Tooltip>

diff --git a/src/pkg/utils/utils.ts b/src/pkg/utils/utils.ts
@@ -6,7 +6,6 @@ import Logger from "@App/app/logger/logger";
 import MessageInternal from "@App/app/message/internal";
 import { CronTime } from "cron";
 import dayjs from "dayjs";
-import "dayjs/locale/zh-cn";
 import semver from "semver";
 import { enc, MD5 } from "crypto-js";