mirror/sunmao-ui
2
0
Fork 0
mirror of https://github.com/smartxworks/sunmao-ui.git synced 2024-11-21 03:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix modify module stateMap having $moduleId bug

Browse Source
This commit is contained in:
Bowen Tan 2021-12-02 16:18:22 +08:00
parent 3a12ac2413
commit b2c08f1222
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/editor/src/components/Explorer/ExplorerForm/ExplorerForm.tsx
View File

@ -4,7 +4,7 @@ import { Button, Text, VStack } from '@chakra-ui/react';
import { ArrowLeftIcon } from '@chakra-ui/icons';
import { AppMetaDataForm } from './AppMetaDataForm';
import { ModuleMetaDataForm } from './ModuleMetaDataForm';
import { registry } from 'setup';
import { editorStore } from 'EditorStore';
type Props = {
formType: 'app' | 'module';
@ -25,7 +25,9 @@ export const ExplorerForm: React.FC<Props> = observer(
form = <AppMetaDataForm data={appMetaData} />;
break;
case 'module':
const moduleSpec = registry.getModule(version, name);
const moduleSpec = editorStore.appStorage.modules.find(
m => m.version === version && m.metadata.name === name
)!;
const moduleMetaData = {
name,
version,

31
packages/editor/src/components/Explorer/ExplorerTree.tsx
View File

@ -10,7 +10,7 @@ type ExplorerTreeProps = {
};
export const ExplorerTree: React.FC<ExplorerTreeProps> = observer(({ onEdit }) => {
const { app, modules, updateCurrentEditingTarget } = editorStore;
const { app, modules, currentEditingTarget, updateCurrentEditingTarget } = editorStore;
const appItemId = `app_${app.metadata.name}`;
const [selectedItem, setSelectedItem] = React.useState<string | undefined>(appItemId);
@ -22,6 +22,11 @@ export const ExplorerTree: React.FC<ExplorerTreeProps> = observer(({ onEdit }) =
onEdit('app', app.version, app.metadata.name);
};
const appEditable =
currentEditingTarget.kind === 'app' &&
currentEditingTarget.name === app.metadata.name &&
currentEditingTarget.version === app.version;
const appItem = (
<ExplorerTreeItem
key={app.metadata.name}
@ -29,6 +34,7 @@ export const ExplorerTree: React.FC<ExplorerTreeProps> = observer(({ onEdit }) =
onClick={onClickApp}
isActive={selectedItem === appItemId}
onEdit={onEditApp}
editable={appEditable}
/>
);
@ -44,6 +50,10 @@ export const ExplorerTree: React.FC<ExplorerTreeProps> = observer(({ onEdit }) =
const onRemove = () => {
editorStore.appStorage.removeModule(module.version, module.metadata.name);
};
const editable =
currentEditingTarget.kind === 'module' &&
currentEditingTarget.name === module.metadata.name &&
currentEditingTarget.version === module.version;
return (
<ExplorerTreeItem
key={module.metadata.name}
@ -52,6 +62,7 @@ export const ExplorerTree: React.FC<ExplorerTreeProps> = observer(({ onEdit }) =
onRemove={onRemove}
isActive={selectedItem === moduleItemId}
onEdit={onEditModule}
editable={editable}
/>
);
});
@ -84,6 +95,7 @@ type ExplorerTreeItemProps = {
isActive: boolean;
onClick: () => void;
onEdit: () => void;
editable: boolean;
onRemove?: () => void;
};
@ -93,6 +105,7 @@ const ExplorerTreeItem: React.FC<ExplorerTreeItemProps> = ({
onClick,
onRemove,
onEdit,
editable,
}) => {
const _onEdit = (e: React.MouseEvent<HTMLElement>) => {
e.stopPropagation();
@ -119,13 +132,15 @@ const ExplorerTreeItem: React.FC<ExplorerTreeItemProps> = ({
</Text>
</Tooltip>
<HStack>
<IconButton
variant="ghost"
size="smx"
aria-label="edit"
icon={<EditIcon />}
onClick={_onEdit}
/>
{editable ? (
<IconButton
variant="ghost"
size="smx"
aria-label="edit"
icon={<EditIcon />}
onClick={_onEdit}
/>
) : null}
{onRemove ? (
<IconButton
variant="ghost"