feat(fr):v1.13.6

alibaba · Jun 17, 2022 · 1c8536d · 1c8536d
1 parent a4e8995
commit 1c8536d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 58 deletions.
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
@@ -45,7 +45,7 @@ const CardList = ({
               className={`fr-card-item ${
                 displayType === 'row' ? 'fr-card-item-row' : ''
               }`}
-              key={Date.now()}
+              key={idx}
             >
               <div className="fr-card-index">{idx + 1}</div>
               <Core {...fieldsProps} />

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
@@ -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) => (
-    <DefaultTabBar {...tabBarProps}>
-      {node => (
-        <DraggableTabNode
-          key={node.key}
-          index={node.key}
-          moveNode={moveTabNode}
-        >
-          {node}
-        </DraggableTabNode>
-      )}
-    </DefaultTabBar>
-  );
-
-  return (
-    <DndProvider backend={HTML5Backend}>
-      <Tabs renderTabBar={renderTabBar} {...props}>
-        {children}
-      </Tabs>
-    </DndProvider>
-  );
-};
-
 const TabList = ({
   displayList = [],
   listData,
@@ -122,27 +86,7 @@ const TabList = ({
       : `${tabName || '项目'} ${idx + 1}`;
   };
 
-  return draggable ? (
-    <DraggableTabs
-      type={type || 'line'}
-      onChange={setActiveKey}
-      activeKey={activeKey}
-      onEdit={onEdit}
-      changeList={changeList}
-      displayList={displayList}
-      {...restProps}
-    >
-      {displayList.map((item, idx) => {
-        const fieldsProps = getFieldsProps(idx);
-        fieldsProps.displayType = displayType;
-        return (
-          <TabPane tab={getCurrentTabPaneName(idx)} key={`${idx}`}>
-            <Core {...fieldsProps} />
-          </TabPane>
-        );
-      })}
-    </DraggableTabs>
-  ) : (
+  return (
     <Tabs
       type={type || 'line'}
       onChange={setActiveKey}