diff --git a/src/layout/slide/index.tsx b/src/layout/slide/index.tsx index 978744a..0539754 100644 --- a/src/layout/slide/index.tsx +++ b/src/layout/slide/index.tsx @@ -56,7 +56,7 @@ const SlideIndex = () => { headerStyle={{ padding: '24px 0', border: 'none' }} bodyStyle={{ padding: '0 16px' }} onClose={() => { - //setCollapsed(true); + setCollapsed(true); }} > {renderMenu()} diff --git a/src/pages/custom/product/finished/index.tsx b/src/pages/custom/product/finished/index.tsx index 5d9bf45..d4525b0 100644 --- a/src/pages/custom/product/finished/index.tsx +++ b/src/pages/custom/product/finished/index.tsx @@ -165,7 +165,7 @@ const FinishedProductPage: React.FC = () => { <>
- +
{ const showDeleteConfirm = (item: DataType) => { @@ -191,11 +192,13 @@ const TablePage: React.FC = () => { const data: Array = mData as Array; + const [isDisableDelete, setDisableDelete] = useState(true) const [selectedRowKeys, setSelectedRowKeys] = useState([]); const onSelectChange = (newSelectedRowKeys: React.Key[]) => { console.log('selectedRowKeys changed: ', newSelectedRowKeys); setSelectedRowKeys(newSelectedRowKeys); + setDisableDelete(newSelectedRowKeys.length === 0) }; const rowSelection: TableRowSelection = { @@ -207,7 +210,7 @@ const TablePage: React.FC = () => { Table.SELECTION_NONE, { key: 'odd', - text: 'Select Odd Row', + text: '选择双数行', onSelect: (changeableRowKeys) => { let newSelectedRowKeys = []; newSelectedRowKeys = changeableRowKeys.filter((_, index) => { @@ -221,7 +224,7 @@ const TablePage: React.FC = () => { }, { key: 'even', - text: 'Select Even Row', + text: '选择单数行', onSelect: (changeableRowKeys) => { let newSelectedRowKeys = []; newSelectedRowKeys = changeableRowKeys.filter((_, index) => { @@ -236,16 +239,23 @@ const TablePage: React.FC = () => { ], }; - return ( <> -
-
- -
-
+
+ + + +
+ + +
+
+ ); diff --git a/src/pages/custom/product/sample/index.tsx b/src/pages/custom/product/sample/index.tsx index c364c7f..9aea3eb 100644 --- a/src/pages/custom/product/sample/index.tsx +++ b/src/pages/custom/product/sample/index.tsx @@ -1,7 +1,6 @@ -import { Space, Table, message, Avatar } from 'antd'; +import { Space, Table, Image, Button, Card, Input, TreeSelect } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import { t } from '@/utils/i18n'; -import { IconBuguang } from '@/assets/icons/buguang'; import React, { useState } from 'react'; import type { TableRowSelection } from 'antd/es/table/interface'; import SampleAttrEditor from './components/attr-editor' @@ -9,9 +8,50 @@ 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'; -import { ExclamationCircleFilled } from '@ant-design/icons'; +import { ExclamationCircleFilled, PlusOutlined, DeleteOutlined, CarryOutOutlined } from '@ant-design/icons'; import { antdUtils } from '@/utils/antd'; +const { Search } = Input; + +const treeData = [ + { + value: 'parent 1', + title: 'parent 1', + icon: , + children: [ + { + value: 'parent 1-0', + title: 'parent 1-0', + icon: , + children: [ + { + value: 'leaf1', + title: 'leaf1', + icon: , + }, + { + value: 'leaf2', + title: 'leaf2', + icon: , + }, + ], + }, + { + value: 'parent 1-1', + title: 'parent 1-1', + icon: , + children: [ + { + value: 'sss', + title: 'sss', + icon: , + }, + ], + }, + ], + }, +]; + interface DataType { id: number; createTime: string; @@ -61,13 +101,7 @@ const TablePage: React.FC = () => { dataIndex: 'oneImgUrl', key: 'oneImgUrl', render: (value: string) => ( -
- {value ? ( - - ) : ( - } /> - )} -
+ ), align: 'center', width: 100, @@ -110,11 +144,11 @@ const TablePage: React.FC = () => { // setEditData(record); setAttrEditorVisible(true); }}>属性设置 - { navigate('/custom/product/sample/editor') }}>编辑 - { showDeleteConfirm(record) }}>删除 @@ -242,6 +276,7 @@ const TablePage: React.FC = () => { const [attrEditorVisible, setAttrEditorVisible] = useState(false); const [maskEditorVisible, setMaskEditorVisible] = useState(false); + const [isDisableDelete, setDisableDelete] = useState(true) const [selectedRowKeys, setSelectedRowKeys] = useState([]); const navigate = useNavigate(); const cancelHandle = () => { @@ -259,6 +294,7 @@ const TablePage: React.FC = () => { const onSelectChange = (newSelectedRowKeys: React.Key[]) => { console.log('selectedRowKeys changed: ', newSelectedRowKeys); setSelectedRowKeys(newSelectedRowKeys); + setDisableDelete(newSelectedRowKeys.length === 0) }; const rowSelection: TableRowSelection = { @@ -270,7 +306,7 @@ const TablePage: React.FC = () => { Table.SELECTION_NONE, { key: 'odd', - text: 'Select Odd Row', + text: '选择双数行', onSelect: (changeableRowKeys) => { let newSelectedRowKeys = []; newSelectedRowKeys = changeableRowKeys.filter((_, index) => { @@ -284,7 +320,7 @@ const TablePage: React.FC = () => { }, { key: 'even', - text: 'Select Even Row', + text: '选择单数行', onSelect: (changeableRowKeys) => { let newSelectedRowKeys = []; newSelectedRowKeys = changeableRowKeys.filter((_, index) => { @@ -298,14 +334,42 @@ const TablePage: React.FC = () => { }, ], }; - + const [treeLine, setTreeLine] = useState(true); + const [showLeafIcon, setShowLeafIcon] = useState(false); + const [showIcon, setShowIcon] = useState(false); return (
-
-
+
+ +
+
+ + + + +
+
+ + +
+
+ + +
+ { { setMaskEditorVisible(false) }} + onCancel={() => { setMaskEditorVisible(false) }} visible={maskEditorVisible} dataSource={maskPictures} /> diff --git a/src/pages/custom/product/shape/index.tsx b/src/pages/custom/product/shape/index.tsx index 35fabe1..90f25fe 100644 --- a/src/pages/custom/product/shape/index.tsx +++ b/src/pages/custom/product/shape/index.tsx @@ -48,7 +48,7 @@ const ShapePage: React.FC = () => { ), align: 'center', - width: 130, + width: 100, }, { title: 'SPU编码', @@ -60,12 +60,13 @@ const ShapePage: React.FC = () => { title: '样机名称', dataIndex: 'prototypeName', key: 'prototypeName', - width: 150, + width: 200, }, { title: '类目', key: 'categoryName', - dataIndex: 'categoryName' + dataIndex: 'categoryName', + width: 150, }, { title: '款式数量', @@ -101,7 +102,6 @@ const ShapePage: React.FC = () => { ), - width: 150, }, ]; @@ -142,7 +142,7 @@ const ShapePage: React.FC = () => { <>
- +
{ setToken(data.accessToken); const [ _, { data: menus } ] = await listMenus(); const [err, {data: profile}] = await getProfile(); - // const [ error, {data: tokenData}] = await rerefshToken(data.refreshToken) + const [ error, {data: tokenData}] = await rerefshToken(data.refreshToken) setCurrentUser(profile) navigate('/'); }; diff --git a/src/request/service/auth.ts b/src/request/service/auth.ts index 1b99ab2..4f05e18 100644 --- a/src/request/service/auth.ts +++ b/src/request/service/auth.ts @@ -11,6 +11,6 @@ export default { return request.post('/app-api/member/auth/logout'); }, rerefshToken: (refreshToken: string) => { - return request.post('/app-api/member/auth/refresh-token', { refreshToken }); + return request.post(`/app-api/member/auth/refresh-token?refreshToken=${refreshToken}`, { refreshToken }); } };