Browse Source

prettier all code

pull/4336/head
陈帅 7 years ago
parent
commit
99ea8e5381
  1. 4
      scripts/fetch-blocks.js
  2. 12
      src/models/global.ts

4
scripts/fetch-blocks.js

@ -94,9 +94,7 @@ const installBlock = async () => {
console.log('install ' + chalk.green(item.name) + ' to: ' + chalk.yellow(item.path)); console.log('install ' + chalk.green(item.name) + ' to: ' + chalk.yellow(item.path));
gitFiles = gitFiles.filter(file => file.path !== gitPath); gitFiles = gitFiles.filter(file => file.path !== gitPath);
const skipModifyRouter = item.routes ? '--skip-modify-routes' : ''; const skipModifyRouter = item.routes ? '--skip-modify-routes' : '';
const cmd = `umi block add https://github.com/ant-design/pro-blocks/tree/master/${gitPath} --path=${ const cmd = `umi block add https://github.com/ant-design/pro-blocks/tree/master/${gitPath} --path=${item.path} ${skipModifyRouter}`;
item.path
} ${skipModifyRouter}`;
try { try {
await execCmd(cmd); await execCmd(cmd);
console.log(`install ${chalk.hex('#1890ff')(item.name)} success`); console.log(`install ${chalk.hex('#1890ff')(item.name)} success`);

12
src/models/global.ts

@ -124,13 +124,11 @@ const GlobalModel: GlobalModelType = {
subscriptions: { subscriptions: {
setup({ history }): void { setup({ history }): void {
// Subscribe history(url) change, trigger `load` action if pathname is `/` // Subscribe history(url) change, trigger `load` action if pathname is `/`
history.listen( history.listen(({ pathname, search }): void => {
({ pathname, search }): void => { if (typeof (window as any).ga !== 'undefined') {
if (typeof (window as any).ga !== 'undefined') { (window as any).ga('send', 'pageview', pathname + search);
(window as any).ga('send', 'pageview', pathname + search); }
} });
},
);
}, },
}, },
}; };

Loading…
Cancel
Save