Skip to content

Commit c160d28

Browse files
committed
Merge remote-tracking branch origin into refactor/theme
2 parents 4950bbf + 1215f30 commit c160d28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3190
-3190
lines changed

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
"editor.formatOnSave": true,
2222
"editor.defaultFormatter": "esbenp.prettier-vscode"
2323
},
24+
"[vue]": {
25+
"editor.formatOnSave": true,
26+
"editor.defaultFormatter": "esbenp.prettier-vscode"
27+
},
2428
"cSpell.words": ["tdesign","miniprogram"],
2529
"cSpell.ignorePaths": ["pnpm-lock.yaml", "node_modules", ".git", ".vscode"]
2630
}

packages/site-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tdesign/site-components",
3-
"version": "0.17.3",
3+
"version": "0.17.4",
44
"license": "MIT",
55
"main": "lib/site.es.js",
66
"type": "module",

packages/site-components/src/components/td-doc-changelog/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ const logsPrefix = `${classPrefix}__logs`;
1212
const locale = getLocale();
1313

1414
const OFFICIAL_DOMAINS = ['tencent.com', 'woa.com'];
15-
15+
// 静态资源统一的地址,支持tencent.com 和 woa.com的跨域请求
16+
const OFFICIAL_STATIC_DOMAINS = 'https://static.tdesign.tencent.com';
1617
const SPECIAL_NAME_MAP = {
1718
qrcode: 'QRCode',
1819
};
@@ -21,7 +22,9 @@ function getLogUrlPrefix() {
2122
const currentUrl = window.location.href;
2223
const framework = currentUrl.split('/')[3];
2324
const isOfficial = OFFICIAL_DOMAINS.some((domain) => location.hostname.includes(domain));
24-
return `${location.origin}${isOfficial ? `/${framework}` : ''}`;
25+
if (isOfficial) return `${OFFICIAL_STATIC_DOMAINS}/${framework}`;
26+
27+
return location.origin;
2528
}
2629

2730
function getCompName() {

pnpm-lock.yaml

Lines changed: 2864 additions & 2955 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"lint:fix": "eslint --ext .vue,.js,.ts,.tsx ./src --fix"
1111
},
1212
"dependencies": {
13-
"@tdesign/site-components": "^0.17.3",
13+
"@tdesign/site-components": "^0.17.4",
1414
"canvas-3d": "^1.0.14",
1515
"lottie-web": "^5.7.0",
1616
"markdown-it": "^12.3.2",
1717
"markdown-it-link-attributes": "^4.0.0",
1818
"prismjs": "^1.29.0",
1919
"tdesign-icons-view": "~0.4.0",
20-
"tdesign-icons-vue": "^0.1.4",
20+
"tdesign-icons-vue": "^0.4.1",
2121
"tdesign-vue": "1.9.8-naruto",
2222
"three": "0.127.0",
2323
"vue": "2.7.14",
-59.7 KB
Binary file not shown.
-10.3 KB
Binary file not shown.
-11.5 KB
Binary file not shown.
12.6 KB
-11.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)