Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: block add modal bug #3332

Merged
merged 2 commits into from
Sep 29, 2019
Merged

fix: block add modal bug #3332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
598f6a9
fix: set page after list changed
yutingzhao1991 Sep 29, 2019
e35dd3c
fix: block add modal bug
yutingzhao1991 Sep 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions packages/umi-build-dev/src/plugins/commands/block/ui/ui/Adder/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,6 @@ const Adder: React.FC<AdderProps> = props => {
const [fromCheck, setFromCheck] = useState<boolean>(false);

const [form] = Form.useForm();
// const [npmClients, setNpmClients] = useState<string[]>(['npm']);
useEffect(() => {
if (api.detectNpmClients) {
api.detectNpmClients().then(clients => {
form.setFieldsValue({
npmClient: clients[0],
});
});
}
}, []);

// 展示哪个界面
// log 日志 form 表单
Expand All @@ -103,6 +93,21 @@ const Adder: React.FC<AdderProps> = props => {
},
);

useEffect(
() => {
if (api.detectNpmClients) {
api.detectNpmClients().then(clients => {
form.setFieldsValue({
npmClient: clients.find(c => {
return npmClients.includes(c);
}),
});
});
}
},
[npmClients],
);

useEffect(() => {
/**
* 成功之后清理状态
Expand Down Expand Up @@ -290,12 +295,14 @@ const Adder: React.FC<AdderProps> = props => {
<AddBlockFormForUI form={form} blockTarget={blockTarget} />
)}

<Form.Item name="js" label="编译为 JS" valuePropName="checked">
<Switch />
</Form.Item>
<Form.Item name="uni18n" label="移除国际化" valuePropName="checked">
<Form.Item name="js" label="编译为 JS" valuePropName="checked" style={{ display: 'none' }}>
<Switch />
</Form.Item>
{blockType === 'template' && (
<Form.Item name="uni18n" label="移除国际化" valuePropName="checked">
<Switch />
</Form.Item>
)}
<Form.Item name="npmClient" label="包管理器">
<Select>
{npmClients.map(client => (
Expand Down
1 change: 1 addition & 0 deletions packages/umi-build-dev/src/plugins/commands/block/ui/ui/BlockList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const BlockList: React.FC<BlockListProps> = props => {
useEffect(
() => {
setSelectedTag('');
setCurrentPage(1);
},
[list],
);
Expand Down
9 changes: 7 additions & 2 deletions packages/umi-build-dev/src/plugins/commands/block/ui/ui/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,15 @@ const BlocksViewer: React.FC<Props> = props => {
() => {
return activeResource || resources.filter(item => item.blockType === type)[0];
},
[resources, activeResource],
[resources, activeResource, type],
);

const blocks = current && block.blockData[current.id] ? block.blockData[current.id] : [];
const blocks = useMemo<Block[]>(
() => {
return current && block.blockData[current.id] ? block.blockData[current.id] : [];
},
[block, current],
);

// 初始化 block dva model data
useEffect(
Expand Down