diff --git a/src/pages/Case/CasePage/index.tsx b/src/pages/Case/CasePage/index.tsx index 4b4fdc2..b2bb1df 100644 --- a/src/pages/Case/CasePage/index.tsx +++ b/src/pages/Case/CasePage/index.tsx @@ -155,6 +155,7 @@ const UserList: React.FC<{}> = () => { const [data, handleDataChange] = useState([]); const [loading, handleLoadChange] = useState(false); const [page, handlePageChange] = useState({ + showQuickJumper: true, total: 0, pageSize: 10, current: 1, @@ -181,9 +182,14 @@ const UserList: React.FC<{}> = () => { handleLoadChange(false); handleDataChange(res.data); handlePageChange({ + showQuickJumper: true, total: res.total, pageSize: pagination.pageSize, current: pagination.current, + pageSizeOptions: ['10'], + showTotal: (total: number) => { + return `共 ${total} 条`; + }, }); }; @@ -209,6 +215,11 @@ const UserList: React.FC<{}> = () => { }; const columns: ColumnsType = [ + { + title: 'ID', + dataIndex: 'id', + key: 'id', + }, { title: '名称', dataIndex: 'title', diff --git a/src/pages/Case/CasePage/update.tsx b/src/pages/Case/CasePage/update.tsx index 8de6ec3..f66073c 100644 --- a/src/pages/Case/CasePage/update.tsx +++ b/src/pages/Case/CasePage/update.tsx @@ -144,8 +144,8 @@ const updateForm: React.FC = (prop: any) => { videoArr.push({ uid: item.uid, name: item.name, - status: item.response && item.response.location ? 'done' : item.response && item.response.code == 2001 ? 'error' : 'uploading', - url: item.response ? item.response.location : item.response, + status: item.response && item.response.location || item.status === 'done' ? 'done' : item.response && item.response.code == 2001 ? 'error' : 'uploading', + url: item.url ? item.url : item.response ? item.response.location : item.response, }); }); setVideoContent(JSON.stringify(videoArr)); @@ -294,7 +294,7 @@ const updateForm: React.FC = (prop: any) => { valuePropName="fileList" getValueFromEvent={normFile} > - + @@ -310,7 +310,7 @@ const updateForm: React.FC = (prop: any) => { branding: false, // 去掉右下角的水印 // language_url: '/tinymce/langs/zh-Hans.js',//注意大小写 language: 'zh-Hans', //注意大小写 - images_upload_url: 'http://localhost:8899/oss/imgUpload', + images_upload_url: 'http://47.92.229.12:8888/oss/imgUpload', plugins: [ 'advlist', 'autolink',