react-toolkits 2.13.4 → 2.13.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.13.6
+
+### Patch Changes
+
+- 3b3beba: fix: should merge parent state correctly
+
+## 2.13.5
+
+### Patch Changes
+
+- e0a1236: feat: add wildcard in group select
+
 ## 2.13.4
 
 ### Patch Changes

package/lib/index.js

@@ -378,7 +378,7 @@ function useToolkitsStore(selector) {
   if (!store) throw new Error("Missing ToolkitsProvider in the tree");
   return useStore(store, selector);
 }
-var ToolkitsContext, globalState, ToolkitsProvider, withContext, ToolkitsProvider_default;
+var ToolkitsContext, ToolkitsProvider, withContext, ToolkitsProvider_default;
 var init_ToolkitsProvider = __esm({
   "src/components/toolkitsProvider/ToolkitsProvider.tsx"() {
     init_stores();
@@ -387,14 +387,14 @@ var init_ToolkitsProvider = __esm({
     ToolkitsProvider = (props) => {
       const { children, ...restProps } = props;
       const storeRef = useRef();
+      const parentState = useContext(ToolkitsContext)?.getState();
       if (!storeRef.current) {
         storeRef.current = createToolkitsStore({
-          ...globalState,
+          ...parentState,
           ...restProps
         });
       }
-      globalState = storeRef.current.getState();
-      if (!globalState.signInPath) {
+      if (!storeRef.current.getState().signInPath) {
         throw new Error('ToolkitsProvider: \u8BF7\u914D\u7F6E "signInPath"');
       }
       return /* @__PURE__ */ jsx(ToolkitsContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ jsx(App, { children: /* @__PURE__ */ jsx(Interceptors_default, { children }) }) });
@@ -1868,7 +1868,7 @@ function useRemoveUser() {
     }) => axios2.post(url4, arg)
   );
 }
-var Text2, useCreateRoleModal, useUpdateRoleModal, useCreateUserModal, useUpdateUserModal, GameSelect2, UserModalContentV2, useCreateUserModalV2, useUpdateUserModalV2;
+var Text2, useCreateRoleModal, useUpdateRoleModal, useCreateUserModal, useUpdateUserModal, GroupSelect, GameSelect2, UserModalContentV2, useCreateUserModalV2, useUpdateUserModalV2;
 var init_hooks5 = __esm({
   "src/features/permission/hooks/index.tsx"() {
     init_locale();
@@ -1985,6 +1985,39 @@ var init_hooks5 = __esm({
         }
       });
     };
+    GroupSelect = (props) => {
+      const { onChange, ...rest } = props;
+      const { axios: axios2 } = useToolkitsStore((s) => s);
+      const { data, isLoading } = useSWR5(
+        "/api/enum/get?enum=game_group&type=all",
+        (path) => axios2.get(path).then((response) => response.data.data)
+      );
+      const options = [{ label: "\u901A\u7528", value: WILDCARD }].concat(
+        data?.map((group) => ({ label: group, value: group })) ?? []
+      );
+      const onValueChange = (value) => {
+        if (last(value) === WILDCARD) {
+          onChange?.([WILDCARD]);
+        } else if (first(value) === WILDCARD) {
+          onChange?.(value.slice(1));
+        } else {
+          onChange?.(value);
+        }
+      };
+      return /* @__PURE__ */ jsx(
+        Select,
+        {
+          ...rest,
+          allowClear: true,
+          showSearch: true,
+          mode: "tags",
+          optionFilterProp: "label",
+          loading: isLoading,
+          options,
+          onChange: onValueChange
+        }
+      );
+    };
     GameSelect2 = (props) => {
       const { groups, onChange, ...rest } = props;
       const { axios: axios2 } = useToolkitsStore((s) => s);
@@ -2024,6 +2057,9 @@ var init_hooks5 = __esm({
         "/api/enum/get?enum=game_group&type=all",
         (path) => axios2.get(path).then((response) => response.data.data)
       );
+      [{ label: "\u901A\u7528", value: WILDCARD }].concat(
+        groups?.map((group) => ({ label: group, value: group })) ?? []
+      );
       return /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(Form.Item, { label: t("global.name"), name: "name", rules: [{ required: true }], children: /* @__PURE__ */ jsx(Input, { disabled: !isCreate }) }),
         /* @__PURE__ */ jsx(Form.List, { name: "permissions", children: (fields, { add, remove }) => /* @__PURE__ */ jsxs(Row, { gutter: 8, children: [
@@ -2032,14 +2068,8 @@ var init_hooks5 = __esm({
           /* @__PURE__ */ jsx(Col, { span: 6, className: "text-center mb-4", children: /* @__PURE__ */ jsx(Text2, { strong: true, children: t("global.role") }) }),
           fields.map((field) => /* @__PURE__ */ jsxs(Fragment$1, { children: [
             /* @__PURE__ */ jsx(Col, { span: 8, children: /* @__PURE__ */ jsx(Form.Item, { noStyle: true, shouldUpdate: true, children: ({ setFieldValue }) => /* @__PURE__ */ jsx(Form.Item, { name: [field.name, "game_group"], children: /* @__PURE__ */ jsx(
-              Select,
+              GroupSelect,
               {
-                allowClear: true,
-                showSearch: true,
-                mode: "tags",
-                optionFilterProp: "label",
-                loading: isGroupsLoading,
-                options: groups?.map((group) => ({ label: group, value: group })),
                 onChange: () => {
                   setFieldValue(["permissions", field.name, "game_ids"], []);
                 }