poi-plugin-kai-planner 1.0.10 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-kai-planner",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "main": "index.js",
   "author": "aulu",
   "contributors": ["aulu"],

package/src/app/components/EquipTypeIconFilter.js

@@ -1,61 +1,84 @@
 /* src/app/components/EquipTypeIconFilter.js */
 
 const React = require("react");
-const { SlotitemTypeIcon } = require("./SlotitemTypeIcon");
+
+let SlotitemIcon = null;
+try {
+  ({ SlotitemIcon } = require("views/components/etc/icon"));
+} catch {}
 
 function EquipTypeIconFilter({ options, selectedKeys, onToggle, onClear }) {
   if (!Array.isArray(options) || options.length === 0) return null;
 
   const selectedSet = new Set((selectedKeys || []).map(String));
-  const baseButtonStyle = {
+  const areaStyle = {
+    display: "flex",
+    flexWrap: "wrap",
+    alignItems: "center",
+  };
+  const entryStyle = {
     display: "inline-flex",
     alignItems: "center",
-    justifyContent: "center",
-    minWidth: 44,
-    height: 44,
-    padding: 0,
-    borderRadius: 8,
+    marginRight: "1em",
+    marginBottom: 8,
+    cursor: "pointer",
+  };
+  const checkboxStyle = {
+    verticalAlign: "middle",
+    display: "inline-block",
+    margin: 0,
+    marginRight: 4,
+  };
+  const actionButtonStyle = {
+    marginTop: 10,
+    marginBottom: 10,
+    minWidth: 120,
+    height: 24,
     border: "1px solid rgba(255,255,255,0.12)",
-    background: "rgba(255,255,255,0.04)",
+    background: "rgba(255,255,255,0.08)",
     color: "#e5e7eb",
     cursor: "pointer",
-    flexShrink: 0,
   };
 
   return React.createElement(
     "div",
-    { style: { display: "flex", gap: 8, flexWrap: "wrap", alignItems: "center" } },
+    null,
     React.createElement(
-      "button",
-      {
-        type: "button",
-        onClick: onClear,
-        style: {
-          ...baseButtonStyle,
-          padding: "0 10px",
-          background: selectedSet.size === 0 ? "rgba(255,255,255,0.14)" : "rgba(255,255,255,0.04)",
-        },
-      },
-      "全部"
+      "div",
+      { style: areaStyle },
+      ...options.map((option) => {
+        const key = String(option.key);
+        const active = selectedSet.has(key);
+        return React.createElement(
+          "label",
+          {
+            key,
+            style: entryStyle,
+            title: option.name || key,
+          },
+          React.createElement("input", {
+            type: "checkbox",
+            checked: active,
+            onChange: () => onToggle(key),
+            style: checkboxStyle,
+          }),
+          SlotitemIcon ? React.createElement(SlotitemIcon, { slotitemId: option.iconType }) : null
+        );
+      })
     ),
-    ...options.map((option) => {
-      const key = String(option.key);
-      const active = selectedSet.has(key);
-      return React.createElement(
+    React.createElement(
+      "div",
+      { style: { display: "flex", gap: 12, flexWrap: "wrap" } },
+      React.createElement(
         "button",
         {
-          key,
           type: "button",
-          onClick: () => onToggle(key),
-          "aria-label": option.name || key,
-          style: {
-            ...baseButtonStyle,
-            background: active ? "rgba(255,255,255,0.14)" : "rgba(255,255,255,0.04)",
-          },
+          onClick: onClear,
+          style: actionButtonStyle,
         },
-        React.createElement(SlotitemTypeIcon, { iconType: option.iconType })
-      );
-    })
+        "重置选项"
+      )
+    )
   );
 }
 

package/src/app/tabs/daily/DailyTab.js

@@ -2,7 +2,10 @@
 
 const React = require("react");
 
-const { SlotitemTypeIcon } = require("../../components/SlotitemTypeIcon");
+let SlotitemIcon = null;
+try {
+  ({ SlotitemIcon } = require("views/components/etc/icon"));
+} catch {}
 
 const { EquipTypeIconFilter } = require("../../components/EquipTypeIconFilter");
 
@@ -828,10 +831,9 @@ React.createElement("th", { style: { ...thStyle, ...upgradeColStyle } }, "可进
                               foldIcon,
                             ),
 
-                            React.createElement(SlotitemTypeIcon, {
-                              iconType: r.iconType,
-                              title: r.equipTypeName,
-                            }),
+                            SlotitemIcon && r.iconType
+                              ? React.createElement(SlotitemIcon, { slotitemId: r.iconType })
+                              : null,
 
                             React.createElement(
                               "div",

package/src/app/tabs/wishlist/components/WishlistTable.js

@@ -1,7 +1,10 @@
 /* src/app/tabs/wishlist/components/WishlistTable.js */
 
 const React = require("react");
-const { SlotitemTypeIcon } = require("../../../components/SlotitemTypeIcon");
+let SlotitemIcon = null;
+try {
+  ({ SlotitemIcon } = require("views/components/etc/icon"));
+} catch {}
 
 const PRIORITY_STYLE_MAP = {
   P0: { color: "#fecaca", borderColor: "rgba(239,68,68,0.55)", background: "rgba(239,68,68,0.16)" },
@@ -133,10 +136,9 @@ function WishlistTable({
                 },
                 expandIcon
               ),
-              React.createElement(SlotitemTypeIcon, {
-                iconType: rowVm.targetIconType,
-                title: rowVm.targetEquipTypeName,
-              }),
+              SlotitemIcon && rowVm.targetIconType
+                ? React.createElement(SlotitemIcon, { slotitemId: rowVm.targetIconType })
+                : null,
               React.createElement(
                 "div",
                 null,