- {currentUser?.userName}
+ {currentUser?.username}
- {currentUser?.phoneNumber}
+ {currentUser?.mobile}
- {currentUser?.emailAddress}
+ {currentUser?.email}
- {currentUser?.avatarUrl ? (
-
+ {currentUser?.avatar ? (
+
) : (
} />
)}
diff --git a/src/layout/index.tsx b/src/layout/index.tsx
index 566261c..6a5a348 100644
--- a/src/layout/index.tsx
+++ b/src/layout/index.tsx
@@ -80,7 +80,7 @@ const BasicLayout: React.FC = () => {
const formatedMenus = formatMenus(menus.filter(o => !o.parentId), menuGroup, routes);
setMenus(formatedMenus);
- console.log(components, 'components');
+ console.log('components', components);
replaceRoutes('*', [
...routes.map(menu => ({
path: `/*${menu.path}`,
@@ -100,9 +100,18 @@ const BasicLayout: React.FC = () => {
path: '404',
name: '404',
},
+ },
+ {
+ path: `/*/custom/product/sample/editor`,
+ Component: lazy(components['/custom/product/sample/editor/index.tsx']),
+ id: `/*/custom/product/sample/editor`,
+ handle: {
+ parentPaths: ['/custom', '/custom/product', '/custom/product/sample'],
+ path: '/*/custom/product/sample/editor',
+ name: '蒙版编辑',
+ },
}
]);
-
setLoading(false);
// replace一下当前路由，为了触发路由匹配
diff --git a/src/models/user.ts b/src/models/user.ts
index fbfefd3..346d003 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -73,16 +73,15 @@ export interface Menu {
export interface User {
id: number;
- userName: string;
- nickName: string;
- phoneNumber: string;
+ username: string;
+ nickname: string;
+ deptId:number;
+ postIds: number;
+ mobile: string;
email: string;
- createDate: string;
- updateDate: string;
- avatar?: any;
- menus: Menu[];
- routes: any[];
- flatMenus: Menu[];
- avatarPath: string;
- authList: string[];
+ sex: number;
+ createTime: string;
+ loginDate: string;
+ avatar?: string;
+ status: number;
}
diff --git a/src/pages/custom/product/sample/components/mask-picture-editor.tsx b/src/pages/custom/product/sample/components/mask-picture-editor.tsx
index a97f9fa..ddf9803 100644
--- a/src/pages/custom/product/sample/components/mask-picture-editor.tsx
+++ b/src/pages/custom/product/sample/components/mask-picture-editor.tsx
@@ -115,7 +115,7 @@ const MaskPictureEditor: React.FC
= (props) => {
url: item.maskImgUrl,
}] : []
return (
-
+
;
+
+type LineComponent = FC;
+
+interface HandlerClassNames extends Partial> {
+ default?: string;
+ disabled?: string;
+ hover?: string;
+}
+
+interface LineClassNames extends Partial> {
+ default?: string;
+ disabled?: string;
+ hover?: string;
+}
+
+interface DesiredCropperRef {
+ getState: () => CropperState | null;
+ getTransitions: () => CropperTransitions;
+ getInteractions: () => CropperInteractions;
+ hasInteractions: () => boolean;
+ resizeCoordinates: (anchor: ResizeAnchor, directions: Partial, parameters: unknown) => void;
+ resizeCoordinatesEnd: () => void;
+ moveCoordinates: (directions: Partial) => void;
+ moveCoordinatesEnd: () => void;
+}
+
+interface Props {
+ cropper: DesiredCropperRef;
+ coordinates?: Coordinates | ((state: CropperState | null) => Coordinates);
+ handlerComponent?: HandlerComponent;
+ handlers?: Partial>;
+ handlerClassNames?: HandlerClassNames;
+ handlerWrapperClassNames?: HandlerClassNames;
+ lines?: Partial>;
+ lineComponent?: LineComponent;
+ lineClassNames?: LineClassNames;
+ lineWrapperClassNames?: LineClassNames;
+ className?: string;
+ movingClassName?: string;
+ resizingClassName?: string;
+ gridClassName?: string;
+ previewClassName?: string;
+ boundingBoxClassName?: string;
+ overlayClassName?: string;
+ draggableAreaClassName?: string;
+ minAspectRatio?: number;
+ maxAspectRatio?: number;
+ aspectRatio?: RawAspectRatio;
+ movable?: boolean;
+ resizable?: boolean;
+ grid?: boolean;
+}
+
+interface Methods {
+ aspectRatio: RawAspectRatio;
+}
+
+export const ImageStencil = forwardRef(
+ (
+ {
+ cropper,
+ coordinates,
+ aspectRatio,
+ minAspectRatio,
+ maxAspectRatio,
+ handlerComponent = SimpleHandler,
+ handlers = {
+ eastNorth: true,
+ north: true,
+ westNorth: true,
+ west: true,
+ westSouth: true,
+ south: true,
+ eastSouth: true,
+ east: true,
+ },
+ handlerClassNames = {},
+ handlerWrapperClassNames = {},
+ lines = {
+ west: true,
+ north: true,
+ east: true,
+ south: true,
+ },
+ lineComponent = SimpleLine,
+ lineClassNames = {},
+ lineWrapperClassNames = {},
+ resizable = true,
+ movable = true,
+ grid,
+ gridClassName,
+ className,
+ movingClassName,
+ resizingClassName,
+ previewClassName,
+ boundingBoxClassName,
+ overlayClassName,
+ draggableAreaClassName,
+ }: Props,
+ ref,
+ ) => {
+ const state = cropper.getState();
+ const transitions = cropper.getTransitions();
+ const interactions = cropper.getInteractions();
+
+ useImperativeHandle(ref, () => ({
+ aspectRatio: createAspectRatio(
+ aspectRatio || {
+ minimum: minAspectRatio,
+ maximum: maxAspectRatio,
+ },
+ ),
+ }));
+
+ const onMove = (directions: MoveDirections) => {
+ if (cropper && movable) {
+ cropper.moveCoordinates(directions);
+ }
+ };
+
+ const onMoveEnd = () => {
+ if (cropper) {
+ cropper.moveCoordinatesEnd();
+ }
+ };
+
+ const onResize = (anchor: ResizeAnchor, directions: MoveDirections, options: ResizeOptions) => {
+ if (cropper && resizable) {
+ cropper.resizeCoordinates(anchor, directions, options);
+ }
+ };
+
+ const onResizeEnd = () => {
+ if (cropper) {
+ cropper.resizeCoordinatesEnd();
+ }
+ };
+
+ const { width, height, left, top } = coordinates
+ ? isFunction(coordinates)
+ ? coordinates(state)
+ : coordinates
+ : getStencilCoordinates(state);
+
+ return (
+ state && (
+
+
+
+
+
+
+
+ )
+ );
+ },
+);
+
+ImageStencil.displayName = 'ImageStencil';
diff --git a/src/pages/custom/product/sample/editor/index.tsx b/src/pages/custom/product/sample/editor/index.tsx
new file mode 100644
index 0000000..a5498b4
--- /dev/null
+++ b/src/pages/custom/product/sample/editor/index.tsx
@@ -0,0 +1,29 @@
+import React, { useState } from 'react';
+import { CropperRef, Cropper } from 'react-advanced-cropper';
+import 'react-advanced-cropper/dist/style.css'
+import { ImageStencil } from "./components/ImageStencil";
+
+export default () => {
+ const [image] = useState(
+ 'https://test.vogocm.com:9010/eshop/eshop_img/2023/8/21/20230821114346A053.jpg',
+ );
+
+ const onChange = (cropper: CropperRef) => {
+ console.log(cropper.getCoordinates(), cropper.getCanvas());
+ };
+
+ return (
+
+ )
+}
diff --git a/src/pages/custom/product/sample/index.tsx b/src/pages/custom/product/sample/index.tsx
index 32b7ce8..39f8d03 100644
--- a/src/pages/custom/product/sample/index.tsx
+++ b/src/pages/custom/product/sample/index.tsx
@@ -8,6 +8,7 @@ import SampleAttrEditor from './components/attr-editor'
import MaskPictureEditor from './components/mask-picture-editor';
import type { SampleAttribute } from './components/attr-editor'
import type { MaskPicture } from './components/mask-picture-editor';
+import { useNavigate } from 'react-router-dom';
interface DataType {
id: number;
@@ -79,7 +80,10 @@ const TablePage: React.FC = () => {
// setEditData(record);
setAttrEditorVisible(true);
}}>属性设置
- 编辑
+ {
+ navigate('/custom/product/sample/editor')
+ }}>编辑
删除
),
@@ -206,7 +210,7 @@ const TablePage: React.FC = () => {
const [attrEditorVisible, setAttrEditorVisible] = useState(false);
const [maskEditorVisible, setMaskEditorVisible] = useState(false);
const [selectedRowKeys, setSelectedRowKeys] = useState([]);
-
+ const navigate = useNavigate();
const cancelHandle = () => {
setAttrEditorVisible(false);
};
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 2a20401..10cad63 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -14,6 +14,7 @@ import './index.css'
const Login = () => {
const navigate = useNavigate();
const { runAsync: listMenus } = useRequest(userService.listMenus, { manual: true });
+ const { runAsync: getProfile } = useRequest(userService.getProfile, { manual: true });
const { runAsync: login, loading } = useRequest(loginService.login, { manual: true });
const { runAsync: rerefshToken } = useRequest(loginService.rerefshToken, { manual: true });
const { setCurrentUser } = useUserStore();
@@ -28,9 +29,10 @@ const Login = () => {
// data.data.avatarUrl = 'https://test.vogocm.com:9010/eshop/eshop_img/2023/5/24/43853633d16749bfb291f81bebb73451_20230524150631A001.jpg';
setRefreshToken(data.refreshToken);
setToken(data.accessToken);
- const [ _, { data: menus } ] = await listMenus()
+ const [ _, { data: menus } ] = await listMenus();
+ const [err, {data: profile}] = await getProfile();
// const [ error, {data: tokenData}] = await rerefshToken(data.refreshToken)
- debugger
+ setCurrentUser(profile)
navigate('/');
};
diff --git a/src/request/index.ts b/src/request/index.ts
index db8eee7..f902f64 100644
--- a/src/request/index.ts
+++ b/src/request/index.ts
@@ -13,8 +13,8 @@ import { ResponseDTO } from '@/models';
const { apiUrl = '' } = useGlobSetting();
-
-const refreshTokenUrl = '/api/auth/refresh/token';
+const loginUrl = '/auth/login';
+const refreshTokenUrl = '/app-api/member/auth/refresh-token';
export type Response = Promise<[boolean, T, AxiosResponse]>;
@@ -70,9 +70,10 @@ class Request {
const {token} = useGlobalStore.getState();
- if (token) {
+ if (token && !axiosConfig.url?.endsWith(loginUrl)) {
axiosConfig.headers.Authorization = `Bearer ${token}`;
}
+ axiosConfig.headers['tenant-id'] = '1';
return Promise.resolve(axiosConfig);
}
@@ -99,6 +100,7 @@ class Request {
this.requestingCount += 1;
const {token} = useGlobalStore.getState();
config.headers.Authorization = `Bearer ${token}`;
+ config.headers['tenant-id'] = '1'
resolve(config);
}
}
diff --git a/src/request/service/user.ts b/src/request/service/user.ts
index 6aca3ed..8b6bc7d 100644
--- a/src/request/service/user.ts
+++ b/src/request/service/user.ts
@@ -1,8 +1,12 @@
import request from '@/request';
-import { Menu } from '@/models';
+import { Menu, User } from '@/models';
export default {
listMenus: () => {
return request.get