@@ -31,7 +31,7 @@ import {showAppSnapshotSelector} from "@lowcoder-ee/redux/selectors/appSnapshotS
31
31
import { DraggableTreeNode , DraggableTreeNodeItemRenderProps } from "@lowcoder-ee/components/DraggableTree/types" ;
32
32
import RefTreeComp from "@lowcoder-ee/comps/comps/refTreeComp" ;
33
33
import { EmptyContent } from "components/EmptyContent" ;
34
- import { deleteFolder , moveToFolder } from "@lowcoder-ee/redux/reduxActions/folderActions" ;
34
+ import { deleteFolder , moveToFolder , updateFolder } from "@lowcoder-ee/redux/reduxActions/folderActions" ;
35
35
import { HomeResInfo } from "@lowcoder-ee/util/homeResUtils" ;
36
36
const ItemWrapper = styled . div `
37
37
display: flex;
@@ -300,6 +300,10 @@ interface ModuleSidebarItemProps extends DraggableTreeNodeItemRenderProps {
300
300
onSelect : ( ) => void ;
301
301
onDelete : ( ) => void ;
302
302
onToggleFold : ( ) => void ;
303
+ selectedID : string ;
304
+ setSelectedID : ( id : string ) => void ;
305
+ selectedType : boolean ;
306
+ setSelectedType : ( id : boolean ) => void ;
303
307
}
304
308
305
309
const empty = (
@@ -321,13 +325,18 @@ const empty = (
321
325
) ;
322
326
323
327
function ModuleSidebarItem ( props : ModuleSidebarItemProps ) {
328
+ const dispatch = useDispatch ( ) ;
324
329
const {
325
330
id,
326
331
resComp,
327
332
isOver,
328
333
isOverlay,
329
334
path,
330
335
isFolded,
336
+ selectedID,
337
+ setSelectedID,
338
+ selectedType,
339
+ setSelectedType,
331
340
onDelete,
332
341
onCopy,
333
342
onSelect,
@@ -338,13 +347,11 @@ function ModuleSidebarItem(props: ModuleSidebarItemProps) {
338
347
const [ editing , setEditing ] = useState ( false ) ;
339
348
const editorState = useContext ( EditorContext ) ;
340
349
const readOnly = useSelector ( showAppSnapshotSelector ) ;
341
- const [ selectedModuleResName , setSelectedModuleResName ] = useState ( "" ) ;
342
- const [ selectedModuleResType , setSelectedModuleResType ] = useState ( false ) ;
343
350
const level = path . length - 1 ;
344
351
const type = resComp . isFolder ;
345
352
const name = resComp . name ;
346
353
const icon = resComp . isFolder ?< FileFolderIcon /> : < ModuleDocIcon width = { "16px" } height = { "16px" } /> ;
347
- const isSelected = type === selectedModuleResType && id === selectedModuleResName ;
354
+ const isSelected = type === selectedType && id === selectedID ;
348
355
const isFolder = type ;
349
356
350
357
const handleFinishRename = ( value : string ) => {
@@ -358,20 +365,15 @@ function ModuleSidebarItem(props: ModuleSidebarItemProps) {
358
365
success = true ;
359
366
}
360
367
if ( success ) {
361
- setSelectedModuleResName ( compId ) ;
362
- setSelectedModuleResType ( type ) ;
368
+ setSelectedID ( compId ) ;
369
+ setSelectedType ( type ) ;
363
370
setError ( undefined ) ;
371
+ dispatch ( updateFolder ( { id : selectedID , name : value } ) ) ;
364
372
}
365
373
} ;
366
374
367
375
const handleNameChange = ( value : string ) => {
368
- let err = "" ;
369
- if ( resComp . checkName ) {
370
- err = resComp . checkName ( value ) ;
371
- } else {
372
- err = editorState . checkRename ( name , value ) ;
373
- }
374
- setError ( err ) ;
376
+ value === "" ? setError ( "Cannot Be Empty" ) : setError ( "" ) ;
375
377
} ;
376
378
377
379
const handleClickItem = ( ) => {
@@ -422,6 +424,8 @@ export default function ModulePanel() {
422
424
// const reload = () => elements = useSelector(folderElementsSelector);
423
425
const { onDrag, searchValue } = useContext ( RightContext ) ;
424
426
const [ deleteFlag , setDeleteFlag ] = useState ( false ) ;
427
+ const [ selectedID , setSelectedID ] = useState ( "" ) ;
428
+ const [ selectedType , setSelectedType ] = useState ( false ) ;
425
429
useEffect ( ( ) => {
426
430
dispatch ( fetchAllModules ( { } ) ) ;
427
431
} , [ dispatch ] ) ;
@@ -575,14 +579,14 @@ export default function ModulePanel() {
575
579
} ;
576
580
577
581
const node = convertRefTree ( tree ) ;
578
- console . log ( "started!!!!" , node )
579
582
function onCopy ( type : boolean , id : string ) {
580
583
console . log ( "onCopy" , type , id ) ;
581
584
}
582
585
583
586
function onSelect ( type : boolean , id : string , meta : any ) {
587
+ setSelectedID ( id ) ;
588
+ setSelectedType ( type ) ;
584
589
console . log ( "onSelect" , type , id , meta )
585
- // return <ModuleItem onDrag={onDrag} key={id} meta={meta} />
586
590
}
587
591
588
592
function onDelete ( type : boolean , id : string , node : NodeType ) {
@@ -683,6 +687,10 @@ export default function ModulePanel() {
683
687
onToggleFold = { onToggleFold }
684
688
onCopy = { ( ) => onCopy ( isFolder , id ) }
685
689
onSelect = { ( ) => onSelect ( isFolder , id , resComp ) }
690
+ selectedID = { selectedID }
691
+ setSelectedID = { setSelectedID }
692
+ selectedType = { selectedType }
693
+ setSelectedType = { setSelectedType }
686
694
onDelete = { ( ) => {
687
695
( onDelete ( isFolder , id , resComp ) )
688
696
} }
0 commit comments