@fe-free/core 2.8.2 → 2.8.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 2.8.4
+
+### Patch Changes
+
+- feat: add ProFormListBoolean
+  - @fe-free/tool@2.8.4
+
+## 2.8.3
+
+### Patch Changes
+
+- fix: routeTool
+  - @fe-free/tool@2.8.3
+
 ## 2.8.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -41,7 +41,7 @@
     "remark-gfm": "^4.0.1",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "2.8.2"
+    "@fe-free/tool": "2.8.4"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/form/form.stories.tsx

@@ -5,6 +5,7 @@ import {
   ProFormImageUploadDragger,
   ProFormJSON,
   ProFormJavascript,
+  ProFormListBoolean,
   ProFormListNumber,
   ProFormListText,
   ProFormRecord,
@@ -143,6 +144,14 @@ export const ProFormListNumberComponent: Story = {
   ),
 };
 
+export const ProFormListBooleanComponent: Story = {
+  render: () => (
+    <ProFormBase>
+      <ProFormListBoolean name="listBoolean" label="listBoolean" />
+    </ProFormBase>
+  ),
+};
+
 function customRequest(option: any) {
   const { file, onProgress, onSuccess } = option;
 

package/src/form/form_list/form_list.tsx

@@ -1,6 +1,6 @@
 import type { ProFormItemProps } from '@ant-design/pro-components';
 import { ProForm } from '@ant-design/pro-components';
-import { Input, InputNumber } from 'antd';
+import { Input, InputNumber, Switch } from 'antd';
 
 import { ProFormListHelper } from './form_list_helper';
 
@@ -71,6 +71,21 @@ function ListNumber(props: ListNumberProps) {
   );
 }
 
+interface ListBooleanProps {
+  value?: boolean[];
+  onChange?: (value: boolean[]) => void;
+}
+
+function ListBoolean(props: ListBooleanProps) {
+  return (
+    <ProFormListHelper value={props.value} onChange={props.onChange} getAdd={() => false}>
+      {({ item, onItemChange }) => {
+        return <Switch {...props} value={item} onChange={(checked) => onItemChange(checked)} />;
+      }}
+    </ProFormListHelper>
+  );
+}
+
 function ProFormListBase(props) {
   const { fieldProps, ...rest } = props;
 
@@ -124,4 +139,13 @@ function ProFormListNumber(props: ProFormItemProps<ListNumberProps>) {
   );
 }
 
-export { ProFormListNumber, ProFormListText };
+function ProFormListBoolean(props: ProFormItemProps<ListBooleanProps>) {
+  const { fieldProps, ...rest } = props;
+  return (
+    <ProFormListBase {...rest}>
+      <ListBoolean {...fieldProps} />
+    </ProFormListBase>
+  );
+}
+
+export { ProFormListBoolean, ProFormListNumber, ProFormListText };

package/src/form/index.tsx

@@ -1,4 +1,4 @@
-export { ProFormListNumber, ProFormListText } from './form_list/form_list';
+export { ProFormListBoolean, ProFormListNumber, ProFormListText } from './form_list/form_list';
 export { ProFormListHelper } from './form_list/form_list_helper';
 export { ProFormListModalHelper } from './form_list/form_list_modal_helper';
 export { ProFormEditor } from './pro_form_editor';

package/src/index.ts

@@ -27,6 +27,7 @@ export {
   ProFormImageUploadDragger,
   ProFormJSON,
   ProFormJavascript,
+  ProFormListBoolean,
   ProFormListHelper,
   ProFormListModalHelper,
   ProFormListNumber,

package/src/route/index.tsx

@@ -1,20 +1,28 @@
 import type { NavigateFunction } from 'react-router-dom';
 import { generatePath } from 'react-router-dom';
 
+window.__routeTool_navigate = null;
+window.__routeTool_baseName = '';
+
 const routeTool = {
   _baseName: '' as string,
   _navigate: null as NavigateFunction | null,
   setNavigate: (navigate: NavigateFunction) => {
     routeTool._navigate = navigate;
+    window.__routeTool_navigate = navigate;
   },
   setBaseName: (baseName: string) => {
     routeTool._baseName = baseName;
+    window.__routeTool_baseName = baseName;
   },
   getNavigate: () => {
-    if (!routeTool._navigate) {
+    if (!routeTool._navigate && !window.__routeTool_navigate) {
       throw new Error('routeTool need set navigate first');
     }
-    return routeTool._navigate;
+    return routeTool._navigate || window.__routeTool_navigate;
+  },
+  getBaseName: () => {
+    return routeTool._baseName || window.__routeTool_baseName;
   },
   setSearchParams: (sp: Record<string, any>) => {
     const url = new URL(window.location.href);
@@ -30,7 +38,7 @@ const routeTool = {
     url.search = p.toString();
 
     routeTool.getNavigate()(
-      `${url.pathname.replace(routeTool._baseName, '')}${url.search}${url.hash}`,
+      `${url.pathname.replace(routeTool.getBaseName(), '')}${url.search}${url.hash}`,
     );
   },
   changeSearchParams: (sp: Record<string, any>) => {
@@ -46,7 +54,7 @@ const routeTool = {
     });
 
     routeTool.getNavigate()(
-      `${url.pathname.replace(routeTool._baseName, '')}${url.search}${url.hash}`,
+      `${url.pathname.replace(routeTool.getBaseName(), '')}${url.search}${url.hash}`,
     );
   },
   navigateTo: ({