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.

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

fix: loadlash.template.default is not a function #480

Merged
merged 23 commits into from
Aug 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a197f9b
Merge pull request #394 from ice-lab/release/0.5.0
luhc228 Aug 6, 2020
b9fc544
Merge remote-tracking branch 'origin/release/0.5.0' into beta
alvinhui Aug 7, 2020
5b24bd6
Merge remote-tracking branch 'origin/release/0.5.0' into beta
alvinhui Aug 7, 2020
eaa686d
Merge remote-tracking branch 'origin/release/0.5.0' into beta
alvinhui Aug 10, 2020
533c4d0
Merge remote-tracking branch 'origin/release/0.5.0' into beta
alvinhui Aug 10, 2020
630be26
Merge remote-tracking branch 'origin/release/0.5.0' into beta
alvinhui Aug 10, 2020
890d966
Merge remote-tracking branch 'origin/release/0.5.0' into beta
alvinhui Aug 10, 2020
266c581
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 13, 2020
8e33526
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 13, 2020
8481abf
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 13, 2020
0b65b41
Merge branch 'release/0.6.0' into beta
fyangstudio Aug 13, 2020
a9ed391
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 13, 2020
a2df77f
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 14, 2020
aeae8b0
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 16, 2020
fe99769
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 16, 2020
a0950bf
Merge remote-tracking branch 'origin/release/0.6.0' into beta
alvinhui Aug 16, 2020
5b77373
Merge remote-tracking branch 'origin/release/0.7.0' into beta
alvinhui Aug 20, 2020
4f5a1f8
Merge remote-tracking branch 'origin/release/0.7.0' into beta
alvinhui Aug 20, 2020
be61ec0
Merge remote-tracking branch 'origin/release/0.7.0' into beta
alvinhui Aug 20, 2020
675eb12
Merge branch 'release/0.7.0' into beta
fyangstudio Aug 21, 2020
b9b8092
Merge remote-tracking branch 'origin/release/0.8.0' into beta
alvinhui Aug 28, 2020
0445c17
Merge remote-tracking branch 'origin/release/0.8.0' into beta
alvinhui Aug 28, 2020
6d127c1
fix: loadlash.template.default is not a function
Aug 29, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ const Home = () => {
}

async function getConfigPage() {
console.log('selectedPage', selectedPage);
setDownloading(true);
try {
const data = {
Expand Down
6 changes: 3 additions & 3 deletions packages/common-service/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,14 @@ export const bulkDownloadMaterials = async function (

return await Promise.all(
// @ts-ignore
materials.map(async (template: any) => {
materials.map(async (material: any) => {
await fse.mkdirp(tmpPath);
const materialName: string = upperCamelCase(template.name);
const materialName: string = upperCamelCase(material.name);

let tarballURL: string;
try {
log(i18n.format('package.common-service.downloadMaterial.getDownloadUrl'));
tarballURL = await getTarballURLByMaterielSource(template.source);
tarballURL = await getTarballURLByMaterielSource(material.source);
} catch (error) {
error.message = i18n.format('package.common-service.downloadMaterial.downloadError', {
materialName,
Expand Down
2 changes: 1 addition & 1 deletion packages/i18n/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import template from 'lodash.template';
import * as template from 'lodash.template';

export interface ITextMap {
// "${namespace}.${extensionName}.${moudelName}.${fieldName}": "xxx"
Expand Down