react-toolkits 2.13.31 → 2.13.33

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.13.33
+
+### Patch Changes
+
+- ca6cb9d: feat: some changes
+
+## 2.13.32
+
+### Patch Changes
+
+- 575bb87: feat: display user search only when current permission is v3
+
 ## 2.13.31
 
 ### Patch Changes

package/lib/index.d.ts

@@ -120,7 +120,7 @@ declare const NavMenu: react.NamedExoticComponent<NavMenuProps>;
 
 interface GameSelectProps {
     filter?: (game: Game) => boolean;
-    getOptions?: (data?: Game[]) => SelectProps['options'];
+    options?: (data?: Game[]) => SelectProps['options'];
 }
 
 type HeaderExtra = {
@@ -133,7 +133,7 @@ interface LayoutProps extends Pick<GameSelectProps, 'filter'> {
     items?: NavMenuItem[];
     hideGameSelect?: boolean;
     navWidth?: string | number;
-    getGameSelectOptions?: GameSelectProps['getOptions'];
+    gameSelectOptions?: GameSelectProps['options'];
     headerExtra?: {
         left?: HeaderExtra[];
         right?: HeaderExtra[];

package/lib/index.js

@@ -909,13 +909,13 @@ var init_GameSelect = __esm({
     init_hooks3();
     ({ Text } = Typography);
     GameSelect = (props) => {
-      const { filter, getOptions } = props;
+      const { filter, options } = props;
       const { t } = useTranslation();
       const { gameApiV2, gameId, setGameId } = useToolkitsStore((s) => s);
       const { data, isLoading } = useGames();
       const { mutate: mutate2 } = useSWRConfig();
       const filteredData = data?.filter((item) => filter?.(item) ?? true);
-      const options = typeof getOptions === "function" ? getOptions(filteredData) : filteredData?.map((item) => ({
+      const _options = typeof options === "function" ? options(filteredData) : filteredData?.map((item) => ({
         label: item.name,
         value: gameApiV2 ? item.game_id : item.id
       }));
@@ -924,14 +924,13 @@ var init_GameSelect = __esm({
         setGameId(value);
       };
       useEffect(() => {
-        let id2 = gameId;
-        if (data?.every((item) => String(gameApiV2 ? item.game_id : item.id) !== String(id2))) {
-          id2 = gameApiV2 ? data?.[0]?.game_id : data?.[0]?.id;
-        }
-        if (id2 !== gameId) {
-          setGameId(id2);
+        if (data && data.length > 0) {
+          const firstId = gameApiV2 ? data[0].game_id : data[0].id;
+          if (data.every((item) => String(item.game_id || item.id) !== String(gameId))) {
+            setGameId(firstId);
+          }
         }
-      }, [gameId, data, gameApiV2]);
+      }, [data]);
       return /* @__PURE__ */ jsxs(Space, { children: [
         /* @__PURE__ */ jsx(Text, { children: t("GameSelect.label") }),
         /* @__PURE__ */ jsx(
@@ -943,7 +942,7 @@ var init_GameSelect = __esm({
             placeholder: t("GameSelect.placeholder"),
             loading: isLoading,
             style: { width: "200px" },
-            options,
+            options: _options,
             onChange
           }
         )
@@ -973,7 +972,7 @@ var init_Layout = __esm({
         navWidth,
         hideGameSelect,
         filter,
-        getGameSelectOptions
+        gameSelectOptions
       } = props;
       const {
         token: { colorBgContainer, colorBorder }
@@ -1045,7 +1044,7 @@ var init_Layout = __esm({
                       onClick: onCollapse
                     }
                   ),
-                  permissionVersion !== "v1" /* V1 */ && !hideGameSelect && /* @__PURE__ */ jsx(GameSelect_default, { filter, getOptions: getGameSelectOptions }),
+                  permissionVersion !== "v1" /* V1 */ && !hideGameSelect && /* @__PURE__ */ jsx(GameSelect_default, { filter, options: gameSelectOptions }),
                   headerExtra?.left?.map((extra) => /* @__PURE__ */ jsx("span", { children: extra.children }, extra.key))
                 ] }),
                 /* @__PURE__ */ jsxs(Space, { size: "small", split: /* @__PURE__ */ jsx(Divider, { type: "vertical" }), children: [
@@ -2562,6 +2561,7 @@ var init_userList = __esm({
       const remove = useRemoveUser();
       const { mutate: mutate2, refetch } = useQueryListStore();
       const { permissionVersion } = useToolkitsStore((s) => s);
+      const isV3 = permissionVersion === "v3" /* V3 */;
       const { show: showCreateModal, modal: createModal } = useCreateUserModal({
         onSuccess() {
           refetch(url2, { page: 1 });
@@ -2592,7 +2592,7 @@ var init_userList = __esm({
           dataIndex: "name",
           key: "name",
           render(value, record) {
-            if (permissionVersion === "v3" /* V3 */) {
+            if (isV3) {
               return /* @__PURE__ */ jsx(Link, { to: `./${record.id}`, children: value });
             }
             return value;
@@ -2603,7 +2603,7 @@ var init_userList = __esm({
           dataIndex: "id",
           key: "id"
         },
-        permissionVersion !== "v3" /* V3 */ && {
+        isV3 && {
           title: t("global.role"),
           dataIndex: "roles",
           key: "roles",
@@ -2631,7 +2631,7 @@ var init_userList = __esm({
                   type: "link",
                   code: "100003",
                   onClick: () => {
-                    if (permissionVersion === "v3" /* V3 */) {
+                    if (isV3) {
                       showUpdateModalV2({
                         initialValues: {
                           name,
@@ -2703,7 +2703,7 @@ var init_userList = __esm({
                 icon: /* @__PURE__ */ jsx(UserAddOutlined, {}),
                 code: "100002",
                 onClick: () => {
-                  if (permissionVersion === "v3" /* V3 */) {
+                  if (isV3) {
                     showCreateModalV2();
                   } else {
                     showCreateModal();
@@ -2721,7 +2721,7 @@ var init_userList = __esm({
                 columns,
                 getTotal: (data) => data?.data.Total,
                 getDataSource: (data) => data?.data.List,
-                renderForm: (form) => /* @__PURE__ */ jsx(Form, { form, children: /* @__PURE__ */ jsx(Form.Item, { label: "\u540D\u79F0", name: "name", children: /* @__PURE__ */ jsx(Input, {}) }) })
+                renderForm: isV3 ? (form) => /* @__PURE__ */ jsx(Form, { form, children: /* @__PURE__ */ jsx(Form.Item, { label: "\u540D\u79F0", name: "name", children: /* @__PURE__ */ jsx(Input, {}) }) }) : void 0
               }
             )
           }