diff --git a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/CardList.js b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/CardList.js index 4eff3202a..f33d2e01a 100644 --- a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/CardList.js +++ b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/CardList.js @@ -45,7 +45,7 @@ const CardList = ({ className={`fr-card-item ${ displayType === 'row' ? 'fr-card-item-row' : '' }`} - key={Date.now()} + key={idx} >
{idx + 1}
diff --git a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/TabList.js b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/TabList.js index fd717ff75..f4501bb97 100644 --- a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/TabList.js +++ b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/TabList.js @@ -1,8 +1,6 @@ /* eslint-disable jsx-a11y/anchor-is-valid */ import React, { useState, useRef } from 'react'; import { Tabs } from 'antd'; -import { DndProvider, useDrag, useDrop } from 'react-dnd'; -import { HTML5Backend } from 'react-dnd-html5-backend'; import Core from '../../index'; const { TabPane } = Tabs; @@ -52,40 +50,6 @@ const DraggableTabNode = ({ index, children, moveNode }) => { ); }; -const DraggableTabs = props => { - const { children, changeList, displayList } = props; - - const moveTabNode = (dragKey, hoverKey) => { - let newDisplayList = displayList.slice(); - newDisplayList.splice(dragKey, 1); - newDisplayList.splice(hoverKey, 0, displayList[dragKey]); - - changeList(newDisplayList); - }; - - const renderTabBar = (tabBarProps, DefaultTabBar) => ( - - {node => ( - - {node} - - )} - - ); - - return ( - - - {children} - - - ); -}; - const TabList = ({ displayList = [], listData, @@ -122,27 +86,7 @@ const TabList = ({ : `${tabName || '项目'} ${idx + 1}`; }; - return draggable ? ( - - {displayList.map((item, idx) => { - const fieldsProps = getFieldsProps(idx); - fieldsProps.displayType = displayType; - return ( - - - - ); - })} - - ) : ( + return (