react-toolkits 2.13.30 → 2.13.32

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.13.32
+
+### Patch Changes
+
+- 575bb87: feat: display user search only when current permission is v3
+
+## 2.13.31
+
+### Patch Changes
+
+- e423d66: fix: app-id should be 'global' when disallowed changing game
+
 ## 2.13.30
 
 ### Patch Changes

package/lib/index.js

@@ -619,20 +619,12 @@ var init_highlight = __esm({
   }
 });
 function usePermission(code, config) {
-  const { axios: axios2, permissionVersion, gameId } = useToolkitsStore((s) => s);
+  const { axios: axios2, permissionVersion } = useToolkitsStore((s) => s);
   const url4 = permissionVersion !== "v1" /* V1 */ ? "/api/usystem/user/checkV2" : "/api/usystem/user/check";
   const permissionCodes = typeof code !== "undefined" ? typeof code === "string" ? [code] : code : [];
   const body = { permissions: permissionCodes };
-  const mergedConfig = {
-    ...config,
-    headers: {
-      // FIXME: 在 QueryList 内，切换游戏的时有时不会触发查询
-      [APP_ID_HEADER]: gameId,
-      ...config?.headers
-    }
-  };
   const { data, ...rest } = useSWR6(
-    permissionCodes.length > 0 ? [url4, body, mergedConfig] : null,
+    permissionCodes.length > 0 ? [url4, body, config] : null,
     (args) => axios2.post(...args).then((response) => response.data.data)
   );
   let newData;
@@ -2570,6 +2562,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 });
@@ -2600,7 +2593,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;
@@ -2611,7 +2604,7 @@ var init_userList = __esm({
           dataIndex: "id",
           key: "id"
         },
-        permissionVersion !== "v3" /* V3 */ && {
+        isV3 && {
           title: t("global.role"),
           dataIndex: "roles",
           key: "roles",
@@ -2639,7 +2632,7 @@ var init_userList = __esm({
                   type: "link",
                   code: "100003",
                   onClick: () => {
-                    if (permissionVersion === "v3" /* V3 */) {
+                    if (isV3) {
                       showUpdateModalV2({
                         initialValues: {
                           name,
@@ -2711,7 +2704,7 @@ var init_userList = __esm({
                 icon: /* @__PURE__ */ jsx(UserAddOutlined, {}),
                 code: "100002",
                 onClick: () => {
-                  if (permissionVersion === "v3" /* V3 */) {
+                  if (isV3) {
                     showCreateModalV2();
                   } else {
                     showCreateModal();
@@ -2729,7 +2722,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
               }
             )
           }