|
@@ -31,10 +31,9 @@ const SortableBody = SortableContainer((props: React.HTMLAttributes<HTMLTableSec
|
|
|
type iState = {
|
|
|
menuData: API.DataSourceMenuItem[]
|
|
|
activeID: Nullable<string>
|
|
|
- current: API.DataSourceItem[]
|
|
|
+ current: NonNullable<API.DataSourceItem>
|
|
|
modalType: ModalType
|
|
|
- menuDataItems: API.DataSourceItem[]
|
|
|
- items: API.DataSourceItem[]
|
|
|
+ menuDataItems?: API.DataSourceItem[]
|
|
|
}
|
|
|
const Option = () => {
|
|
|
const formRef = useRef<ProFormInstance>(null)
|
|
@@ -44,12 +43,7 @@ const Option = () => {
|
|
|
modalVisible: false,
|
|
|
modalType: OptionModalType.ADD,
|
|
|
menuDataItems: [],
|
|
|
- items: [],
|
|
|
- current: {
|
|
|
- ID: null,
|
|
|
- name: null,
|
|
|
- enable: true
|
|
|
- }
|
|
|
+ current: null
|
|
|
})
|
|
|
console.log(state.menuDataItems)
|
|
|
|
|
@@ -237,19 +231,14 @@ const Option = () => {
|
|
|
try {
|
|
|
if (state.modalType === OptionModalType.ADD) {
|
|
|
await tryAddDataSourceItem({ ...values, dataSourceID: state.activeID })
|
|
|
- // setState({
|
|
|
- // ...state,
|
|
|
- // menuDataItems: state.menuData.find(i => i.ID === state.activeID)?.items
|
|
|
- // })
|
|
|
} else {
|
|
|
- const newItemData = state.menuDataItems.map(item => {
|
|
|
- if (item.ID === state.current.ID) {
|
|
|
+ const newItemData = state.menuDataItems?.map(item => {
|
|
|
+ if (item.ID === values.ID) {
|
|
|
const newItem = { ...values }
|
|
|
return newItem
|
|
|
}
|
|
|
return item
|
|
|
})
|
|
|
- setState({ ...state, items: newItemData })
|
|
|
await tryUpdateDataSourceItem({
|
|
|
ID: state.activeID,
|
|
|
items: newItemData
|