diff --git a/packages/site-components/.env b/packages/site-components/.env index b801287ef..6aa1b53df 100644 --- a/packages/site-components/.env +++ b/packages/site-components/.env @@ -1,2 +1,4 @@ VITE_SITE_NOTICE_URL = https://tdesign-site-services.surge.sh/notice.json VITE_SLIDER_NOTICE_URL = https://tdesign-site-services.surge.sh/components-notice.json +VITE_CONTRIBUTORS_API_URL = https://service-edbzjd6y-1257786608.hk.apigw.tencentcs.com/release/github-contributors/list +VITE_NPM_VERSIONS_API_URL = https://service-edbzjd6y-1257786608.hk.apigw.tencentcs.com/release/npm/latest-versions diff --git a/packages/site-components/index.html b/packages/site-components/index.html index c91d8779a..c7ea23251 100755 --- a/packages/site-components/index.html +++ b/packages/site-components/index.html @@ -25,15 +25,14 @@
-          // 关于语言切换功能,需在引入时全局注册事件,cb 可传可不传,不传则用默认事件
-          import { registerLocaleChange } from '@tdesign/site-components';
-          registerLocaleChange(cb);
-        
+ // 关于语言切换功能,需在引入时全局注册事件,cb 可传可不传,不传则用默认事件 + import { registerLocaleChange } from '@tdesign/site-components'; + registerLocaleChange(cb); +
-          tdesign
-        
+ tdesign +
diff --git a/packages/site-components/package.json b/packages/site-components/package.json index f7c8766f5..69ad05b15 100755 --- a/packages/site-components/package.json +++ b/packages/site-components/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@popperjs/core": "^2.11.5", - "hybrids": "8.2.2", + "hybrids": "^9.1.23", "nprogress": "^0.2.0", "prismjs": "^1.29.0", "qrcode": "^1.5.1", diff --git a/packages/site-components/src/components/td-aegis/index.js b/packages/site-components/src/components/td-aegis/index.js index 13cb2544b..7fb5a1758 100755 --- a/packages/site-components/src/components/td-aegis/index.js +++ b/packages/site-components/src/components/td-aegis/index.js @@ -1,11 +1,11 @@ +/* global Aegis */ import { html, define } from 'hybrids'; export default define({ tag: 'td-aegis', aegisId: 'rDISNMyXgKnpdSRvul', stats: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, connect: (host) => { function registerStats() { if (document.getElementById('__td_aegis__')) return; @@ -22,15 +22,20 @@ export default define({ reportApiSpeed: true, // 接口测速 spa: true, // spa 页面需要开启,页面切换的时候上报pv }); - } + }; document.body.appendChild(script); } - window.addEventListener('DOMContentLoaded', registerStats) + window.addEventListener('DOMContentLoaded', registerStats); return () => { - window.removeEventListener('DOMContentLoaded', registerStats) + window.removeEventListener('DOMContentLoaded', registerStats); }; }, }, - render: () => html``, + render: () => + html``, }); diff --git a/packages/site-components/src/components/td-backtop/index.js b/packages/site-components/src/components/td-backtop/index.js index 605b55d69..e5c00988a 100755 --- a/packages/site-components/src/components/td-backtop/index.js +++ b/packages/site-components/src/components/td-backtop/index.js @@ -9,8 +9,7 @@ function handleBacktop() { export default define({ tag: 'td-backtop', backtopShow: { - get: (_host, lastValue) => lastValue || false, - set: (_host, value) => value, + value: (_host, v) => v || false, connect: (host, key, invalidate) => { function toggleVisible() { const { scrollTop } = document.documentElement; diff --git a/packages/site-components/src/components/td-code-block/index.js b/packages/site-components/src/components/td-code-block/index.js index c96147f49..7f4c18e9c 100755 --- a/packages/site-components/src/components/td-code-block/index.js +++ b/packages/site-components/src/components/td-code-block/index.js @@ -41,8 +41,7 @@ function extractSlots(host) { export default define({ tag: 'td-code-block', panel: { - get: (host, lastValue) => lastValue || '', - set: (host, value) => value, + value: (host, v) => v || '', observe: (host) => { if (!host.shadowRoot) return; diff --git a/packages/site-components/src/components/td-contributors/index.js b/packages/site-components/src/components/td-contributors/index.js index 6a462087d..40e791a9a 100755 --- a/packages/site-components/src/components/td-contributors/index.js +++ b/packages/site-components/src/components/td-contributors/index.js @@ -1,7 +1,7 @@ import { html, define } from 'hybrids'; import style from './style.less?inline'; -const apiUrl = 'https://service-edbzjd6y-1257786608.hk.apigw.tencentcs.com/release/github-contributors/list'; +const apiUrl = import.meta.env.VITE_CONTRIBUTORS_API_URL; function renderContributors(list) { if (!list.length) return html``; @@ -62,8 +62,7 @@ export default define({ framework: '', componentName: '', contributorsData: { - get: (host, lastValue) => lastValue || {}, - set: (host, value) => value, + value: (host, v) => v || {}, connect: (host, key, invalidate) => { const cache = sessionStorage.getItem('__tdesign_contributors__'); diff --git a/packages/site-components/src/components/td-doc-aside/index.js b/packages/site-components/src/components/td-doc-aside/index.js index 1061fe1b1..225accd42 100755 --- a/packages/site-components/src/components/td-doc-aside/index.js +++ b/packages/site-components/src/components/td-doc-aside/index.js @@ -98,18 +98,15 @@ function toggleCollapseAside(host) { export default define({ tag: 'td-doc-aside', routerList: { - get: (_host, lastValue) => lastValue || [], - set: (_host, value) => value, + value: (_host, v) => v || [], }, title: '', patchDom: { - get: (_host, lastValue) => lastValue || false, - set: (_host, value) => value, + value: (_host, v) => v || false, connect: patchShadowDomIntoDom, }, updateNotice: { - get: (_host, lastValue) => lastValue || {}, - set: (_host, value) => value, + value: (_host, v) => v || {}, connect: (host) => { fetch(import.meta.env.VITE_SLIDER_NOTICE_URL) .then((res) => res.json()) @@ -120,8 +117,7 @@ export default define({ }, }, asideStyle: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, connect: (host) => { function setFixed() { if (!host.shadowRoot) return; diff --git a/packages/site-components/src/components/td-doc-changelog/index.js b/packages/site-components/src/components/td-doc-changelog/index.js index a38b6648c..ec726f08a 100755 --- a/packages/site-components/src/components/td-doc-changelog/index.js +++ b/packages/site-components/src/components/td-doc-changelog/index.js @@ -167,8 +167,7 @@ function replaceSpecialTags(html) { export default define({ tag: 'td-doc-changelog', changelogEn: { - get: (_host, lastValue) => parseBoolean(lastValue, false), - set: (_host, value) => value, + value: (_host, v) => parseBoolean(v, false), }, visible: { value: false, diff --git a/packages/site-components/src/components/td-doc-content/index.js b/packages/site-components/src/components/td-doc-content/index.js index cd2ef75ba..35ce8ea3c 100755 --- a/packages/site-components/src/components/td-doc-content/index.js +++ b/packages/site-components/src/components/td-doc-content/index.js @@ -47,8 +47,7 @@ export default define({ pageStatus: 'show', mobileBodyStyle, fixedAnchor: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, connect: () => { let demoLoadObserver; diff --git a/packages/site-components/src/components/td-doc-demo/index.js b/packages/site-components/src/components/td-doc-demo/index.js index 69edc988e..9ebbf3a55 100755 --- a/packages/site-components/src/components/td-doc-demo/index.js +++ b/packages/site-components/src/components/td-doc-demo/index.js @@ -16,10 +16,8 @@ export default define({ mode: 'auto', // auto open currentLangIndex: 0, languages: undefined, // multiple languages display - currentRenderCode: '', theme: { - get: (host, lastValue) => lastValue || localStorage.getItem('--tdesign-theme') || 'light', - set: (host, value) => value, + value: (host, v) => v || localStorage.getItem('--tdesign-theme') || 'light', connect(host, key, invalidate) { function themeChange() { const theme = localStorage.getItem('--tdesign-theme'); @@ -33,8 +31,7 @@ export default define({ }, }, activeStyleMap: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, connect: (host, key) => { function handleResize() { if (!host.shadowRoot) { @@ -79,7 +76,6 @@ export default define({ const currentLang = languageArr[currentLangIndex] || ''; const currentCode = host.dataset?.[currentLang] || host.dataset?.[currentLang.toLocaleLowerCase()] || code; const highlightCode = Prism.highlight(currentCode, Prism.languages[language], language); - host.currentRenderCode = currentCode; const activeStyle = activeStyleMap && languageArr.length ? activeStyleMap[languageArr[currentLangIndex]] : {}; const showCodeStyle = { transitionDuration: '.2s', diff --git a/packages/site-components/src/components/td-doc-footer/index.js b/packages/site-components/src/components/td-doc-footer/index.js index 90df6093a..eedea27f8 100755 --- a/packages/site-components/src/components/td-doc-footer/index.js +++ b/packages/site-components/src/components/td-doc-footer/index.js @@ -38,8 +38,7 @@ export default define({ platform: 'web', displayQrCode: '', patchDom: { - get: (_host, lastValue) => lastValue || false, - set: (_host, value) => value, + value: (_host, v) => v || false, connect: patchShadowDomIntoDom, }, render: (host) => { diff --git a/packages/site-components/src/components/td-doc-header/index.js b/packages/site-components/src/components/td-doc-header/index.js index b18552bb7..0b0a4cb55 100755 --- a/packages/site-components/src/components/td-doc-header/index.js +++ b/packages/site-components/src/components/td-doc-header/index.js @@ -58,8 +58,7 @@ function iframeOnload(host) { export default define({ tag: 'td-doc-header', spline: { - get: (_host, lastValue) => lastValue || '', - set: (_host, value) => value, + value: (_host, v) => v || '', connect: (host) => { const observer = watchHtmlMode((themeMode) => handleModeChange(themeMode, host)); @@ -75,21 +74,17 @@ export default define({ }, platform: 'web', changelog: { - get: (_host, lastValue) => parseBoolean(lastValue, true), - set: (_host, value) => parseBoolean(value, true), + value: (_host, v) => parseBoolean(v, true), }, changelogEn: { - get: (_host, lastValue) => parseBoolean(lastValue, true), - set: (_host, value) => parseBoolean(value, true), + value: (_host, v) => parseBoolean(v, true), }, mobileBodyStyle, shouldShowPopup: { - get: (_host, lastValue) => lastValue || false, - set: (_host, value) => value, + value: (_host, v) => v || false, }, docInfo: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, observe: (host, value) => { if (document.getElementById('__td_doc_title__') || !value) return; @@ -103,8 +98,7 @@ export default define({ }, }, fixedTitle: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, connect: (host) => { const mediaQuery = window.matchMedia('(max-width: 1200px)'); let lastWidth = window.innerWidth; @@ -204,8 +198,7 @@ export default define({ }, }, showIssue: { - get: (_host, lastValue) => parseBoolean(lastValue, true), - set: (_host, value) => parseBoolean(value, true), + value: (_host, v) => parseBoolean(v, true), }, render: (host) => { diff --git a/packages/site-components/src/components/td-doc-header/td-doc-issue/index.js b/packages/site-components/src/components/td-doc-header/td-doc-issue/index.js index e91f12f73..3413773e3 100755 --- a/packages/site-components/src/components/td-doc-header/td-doc-issue/index.js +++ b/packages/site-components/src/components/td-doc-header/td-doc-issue/index.js @@ -105,8 +105,7 @@ function fetchGithubIssueNum(host, name, state = 'open', framework) { export default define({ tag: 'td-doc-issue', openNum: { - get: (_host, lastValue) => lastValue || '', - set: (_host, value) => value, + value: (_host, v) => v || '', connect: (host) => { const [, framework, componentName] = parseUrl(); if (!componentName) return; @@ -114,8 +113,7 @@ export default define({ }, }, closedNum: { - get: (_host, lastValue) => lastValue || '', - set: (_host, value) => value, + value: (_host, v) => v || '', connect: (host) => { const [, framework, componentName] = parseUrl(); if (!componentName) return; diff --git a/packages/site-components/src/components/td-doc-layout/index.js b/packages/site-components/src/components/td-doc-layout/index.js index 3232f370a..5719d0579 100755 --- a/packages/site-components/src/components/td-doc-layout/index.js +++ b/packages/site-components/src/components/td-doc-layout/index.js @@ -5,8 +5,7 @@ import style from './style.less?inline'; export default define({ tag: 'td-doc-layout', loaded: { - get: (_host, lastValue) => lastValue || false, - set: (_host, value) => value, + value: (_host, v) => v || false, connect: (host, key) => { function onLoad() { Object.assign(host, { [key]: true }); diff --git a/packages/site-components/src/components/td-doc-phone/index.js b/packages/site-components/src/components/td-doc-phone/index.js index 317279d16..59e85869d 100755 --- a/packages/site-components/src/components/td-doc-phone/index.js +++ b/packages/site-components/src/components/td-doc-phone/index.js @@ -25,8 +25,7 @@ export default define({ QRCode: () => QRCode, qrCanvas: ({ render }) => render().querySelector('#qrcode'), qrcodeUrl: { - get: (host, lastValue) => lastValue, - set: (host, value) => value, + value: (host, v) => v, connect: (host) => { requestAnimationFrame(() => { const qrcodeSlot = host.querySelector('[slot="qrcode"]'); @@ -42,8 +41,7 @@ export default define({ }, }, fixedStyle: { - get: (host, lastValue) => lastValue || {}, - set: (host, value) => value, + value: (host, v) => v || {}, connect: (host, key) => { function handleScroll() { const isMobileResponse = window.innerWidth < 960; diff --git a/packages/site-components/src/components/td-doc-popup/index.js b/packages/site-components/src/components/td-doc-popup/index.js index 665c46ca8..b46d7fed9 100755 --- a/packages/site-components/src/components/td-doc-popup/index.js +++ b/packages/site-components/src/components/td-doc-popup/index.js @@ -29,12 +29,10 @@ export default define({ placement: 'bottom-end', triggerType: 'hover', equalWidth: { - get: (_host, lastValue) => parseBoolean(lastValue, false), - set: (_host, value) => parseBoolean(value, false), + value: (_host, v) => parseBoolean(v, false), }, visible: { - get: (host, lastValue) => lastValue || false, - set: (host, value) => value, + value: (host, v) => v || false, connect: (host) => { const { reference, placement } = host; let resizeObserver; diff --git a/packages/site-components/src/components/td-doc-search/index.js b/packages/site-components/src/components/td-doc-search/index.js index db4f08579..3fd9f1c99 100755 --- a/packages/site-components/src/components/td-doc-search/index.js +++ b/packages/site-components/src/components/td-doc-search/index.js @@ -178,8 +178,7 @@ const HANDLERS = { * @param {string} defaultValue 未显式设置 attribute 时返回的默认值 */ const stringProp = (defaultValue) => ({ - get: (_h, v) => v || defaultValue, - set: (_h, v) => v, + value: (_h, v) => v || defaultValue, }); /* ------------------------------------------------------------------ * @@ -199,10 +198,9 @@ export default define({ apiKey: stringProp(DEFAULT_API_KEY), indexName: stringProp(DEFAULT_INDEX_NAME), // urlFilter 特殊:显式传空串 "" 应被视为"关闭过滤",所以用 == null 判空而非 || 短路 - urlFilter: { get: (_h, v) => (v == null ? getDefaultUrlFilter() : v), set: (_h, v) => v }, + urlFilter: { value: (_h, v) => (v == null ? getDefaultUrlFilter() : v) }, hitsPerPage: { - get: (_h, v) => (v != null && v !== '' ? Number(v) : DEFAULT_HITS_PER_PAGE), - set: (_h, v) => v, + value: (_h, v) => (v != null && v !== '' ? Number(v) : DEFAULT_HITS_PER_PAGE), }, // ---------- 2) 文案 ---------- @@ -220,19 +218,18 @@ export default define({ resultLabel: stringProp('结果'), // ---------- 3) 内部状态 ---------- - _query: { get: (_h, v) => v || '', set: (_h, v) => v }, - _loading: { get: (_h, v) => Boolean(v), set: (_h, v) => Boolean(v) }, - _groups: { get: (_h, v) => v || [], set: (_h, v) => v || [] }, - _activeKey: { get: (_h, v) => (v == null ? null : v), set: (_h, v) => v }, - _flatHits: { get: (_h, v) => v || [], set: (_h, v) => v || [] }, + _query: { value: (_h, v) => v || '' }, + _loading: { value: (_h, v) => Boolean(v) }, + _groups: { value: (_h, v) => v || [] }, + _activeKey: { value: (_h, v) => (v == null ? null : v) }, + _flatHits: { value: (_h, v) => v || [] }, _currentIndex: { - get: (_h, v) => (Number.isFinite(v) ? v : 0), - set: (_h, v) => { + value: (_h, v) => { const n = Number(v); return Number.isFinite(n) ? n : 0; }, }, - _recent: { get: (_h, v) => v || [], set: (_h, v) => v || [] }, + _recent: { value: (_h, v) => v || [] }, // ---------- open 属性 + 生命周期 ---------- /** @@ -240,8 +237,7 @@ export default define({ * observe 里还兼做"每次打开时刷新最近搜索"。 */ open: { - get: (_host, lastValue) => Boolean(lastValue), - set: (_host, value) => Boolean(value), + value: (_host, v) => Boolean(v), connect: (host) => { // 初始最近搜索填充 host._recent = listRecent(); diff --git a/packages/site-components/src/components/td-doc-tabs/index.js b/packages/site-components/src/components/td-doc-tabs/index.js index 4d818508a..d06e39e56 100755 --- a/packages/site-components/src/components/td-doc-tabs/index.js +++ b/packages/site-components/src/components/td-doc-tabs/index.js @@ -34,22 +34,19 @@ export default define({ autoScroll: true, // 记录每个 tab 的滚动距离 tabScrollMap: { - get: (host, lastValue) => { + value: (host, v) => { const tabMap = {}; host.tabs.forEach(({ tab }) => { tabMap[tab] = 0; }); - return lastValue || tabMap; + return v || tabMap; }, - set: (_host, value) => value, }, tabs: { - get: (_host, lastValue) => lastValue || defaultTabs, - set: (_host, value) => value, + value: (_host, v) => v || defaultTabs, }, blockStyleMap: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, connect: (host, key) => { function handleResize() { if (!host.shadowRoot) { diff --git a/packages/site-components/src/components/td-doc-usage/index.js b/packages/site-components/src/components/td-doc-usage/index.js index 913293d22..9f0f47313 100755 --- a/packages/site-components/src/components/td-doc-usage/index.js +++ b/packages/site-components/src/components/td-doc-usage/index.js @@ -81,14 +81,11 @@ export default define({ showCode: false, language: 'markup', panel: { - set: (host, value, lastValue) => { + value: (host, v) => v || host.panelList[0]?.value, + observe: (host, value, lastValue) => { if (value && lastValue !== value) { dispatch(host, 'PanelChange', { detail: { value } }); } - return value; - }, - get: (host, lastValue) => lastValue || host.panelList[0]?.value, - observe: (host) => { if (!host.shadowRoot) return; const lineEl = host.shadowRoot.querySelector('.active-line'); @@ -96,12 +93,10 @@ export default define({ }, }, panelList: { - get: (host, lastValue) => lastValue || [], - set: (host, value) => value, + value: (host, v) => v || [], }, configList: { - get: (host, lastValue) => lastValue || [], - set: (host, value) => value, + value: (host, v) => v || [], }, render: (host) => { const { code, language, showCode, configList, panelList, panel } = host; diff --git a/packages/site-components/src/components/td-header/index.js b/packages/site-components/src/components/td-header/index.js index 7fe111420..c90fbcb04 100755 --- a/packages/site-components/src/components/td-header/index.js +++ b/packages/site-components/src/components/td-header/index.js @@ -209,8 +209,7 @@ export default define({ disabledTheme: false, disabledLocale: false, notice: { - get: (_host, lastValue) => lastValue || {}, - set: (_host, value) => value, + value: (_host, v) => v || {}, connect: (host) => { fetch(import.meta.env.VITE_SITE_NOTICE_URL) .then((res) => res.json()) @@ -221,10 +220,9 @@ export default define({ }, }, npmVersions: { - get: (_host, lastValue) => lastValue || {}, - set: (_host, value) => value, + value: (_host, v) => v || {}, connect: (host) => { - fetch(`https://service-edbzjd6y-1257786608.hk.apigw.tencentcs.com/release/npm/latest-versions`) + fetch(import.meta.env.VITE_NPM_VERSIONS_API_URL) .then((res) => res.json()) .then((res) => { host.npmVersions = { @@ -235,8 +233,7 @@ export default define({ }, }, collapseMenu: { - get: (_host, lastValue) => lastValue || false, - set: (_host, value) => value, + value: (_host, v) => v || false, connect: (host, key) => { const mediaQuery = window.matchMedia('(max-width: 960px)'); diff --git a/packages/site-components/src/components/td-header/td-collapse-menu/index.js b/packages/site-components/src/components/td-header/td-collapse-menu/index.js index 6a7bd7c91..a58346b0a 100755 --- a/packages/site-components/src/components/td-header/td-collapse-menu/index.js +++ b/packages/site-components/src/components/td-header/td-collapse-menu/index.js @@ -62,12 +62,10 @@ function renderLinks({ headerList, baseComponentsLinks, platform, framework }) { export default define({ tag: 'td-collapse-menu', headerList: { - get: (_host, lastValue) => lastValue || [], - set: (_host, value) => value, + value: (_host, v) => v || [], }, baseComponentsLinks: { - get: (_host, lastValue) => lastValue || [], - set: (_host, value) => value, + value: (_host, v) => v || [], }, platform: 'web', framework: 'vue', diff --git a/packages/site-components/src/components/td-logo/index.js b/packages/site-components/src/components/td-logo/index.js index b4893df47..29b460307 100755 --- a/packages/site-components/src/components/td-logo/index.js +++ b/packages/site-components/src/components/td-logo/index.js @@ -44,12 +44,10 @@ function renderMenu(list) { export default define({ tag: 'td-logo', menuList: { - get: (host, lastValue) => lastValue || [], - set: (host, value) => value, + value: (host, v) => v || [], }, isIntranet: { - get: () => isIntranet(), - set: (value) => value, + value: () => isIntranet(), connect: (host) => { const menuCdn = isIntranet() ? logoMenuConfigWoaCdn : logoMenuConfigCdn; fetch(menuCdn) diff --git a/packages/site-components/src/components/td-portal/index.js b/packages/site-components/src/components/td-portal/index.js index 38158245d..9b2f7ffa5 100755 --- a/packages/site-components/src/components/td-portal/index.js +++ b/packages/site-components/src/components/td-portal/index.js @@ -3,7 +3,7 @@ import style from './style.less?inline'; export default define({ tag: 'td-portal', - visible: false, + visible: { value: false, reflect: true }, portalStyle: '', render: (host) => { return html` diff --git a/packages/site-components/src/components/td-select/index.js b/packages/site-components/src/components/td-select/index.js index 438429962..709149160 100755 --- a/packages/site-components/src/components/td-select/index.js +++ b/packages/site-components/src/components/td-select/index.js @@ -37,8 +37,7 @@ export default define({ value: '', visible: false, options: { - get: (host, lastValue) => lastValue || [], - set: (host, value) => value, + value: (host, v) => v || [], }, render: (host) => { const { options, value, visible, borderless } = host; diff --git a/packages/site-components/src/components/td-stats/index.js b/packages/site-components/src/components/td-stats/index.js index 9118c02bf..17cdf623a 100755 --- a/packages/site-components/src/components/td-stats/index.js +++ b/packages/site-components/src/components/td-stats/index.js @@ -20,15 +20,14 @@ export default define({ tag: 'td-stats', dataAccount: 'tdesign', track: { - get() { + value() { return () => { window._horizon && window._horizon.track(); }; }, }, stats: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, connect: (host) => { function registerStats() { // horizon diff --git a/packages/site-components/src/components/td-theme-tabs/index.js b/packages/site-components/src/components/td-theme-tabs/index.js index c1d5b1e68..c0b700389 100755 --- a/packages/site-components/src/components/td-theme-tabs/index.js +++ b/packages/site-components/src/components/td-theme-tabs/index.js @@ -45,14 +45,13 @@ function initBlockStyleMap(host) { export default define({ tag: 'td-theme-tabs', theme: { - get: (_host, lastValue) => lastValue || 'light', - set: (_host, value) => { - if (value) { - localStorage.setItem('--tdesign-theme', value); + value: (_host, v) => { + if (v) { + localStorage.setItem('--tdesign-theme', v); window.dispatchEvent(storageChangeEvent); } - return value; + return v || 'light'; }, connect: (host, key, invalidate) => { const lastTheme = localStorage.getItem('--tdesign-theme'); @@ -69,8 +68,7 @@ export default define({ }, }, blockStyleMap: { - get: (_host, lastValue) => lastValue || undefined, - set: (_host, value) => value, + value: (_host, v) => v || undefined, }, render: (host) => { const { theme, blockStyleMap } = host; diff --git a/packages/site-components/src/utils/index.js b/packages/site-components/src/utils/index.js index bd2fda945..993654f72 100755 --- a/packages/site-components/src/utils/index.js +++ b/packages/site-components/src/utils/index.js @@ -56,8 +56,7 @@ export function isGlobalConfigPage() { // 手机定位特殊处理 export const mobileBodyStyle = { - get: (host, lastValue) => lastValue || {}, - set: (host, value) => value, + value: (host, v) => v || {}, connect: (host) => { // 响应手机定位 const handleResize = () => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e15eff750..0bd8f8692 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,8 +86,8 @@ importers: specifier: ^2.11.5 version: 2.11.8 hybrids: - specifier: 8.2.2 - version: 8.2.2 + specifier: ^9.1.23 + version: 9.1.23 nprogress: specifier: ^0.2.0 version: 0.2.0 @@ -4467,6 +4467,11 @@ packages: engines: {node: '>=18.0.0'} hasBin: true + hybrids@9.1.23: + resolution: {integrity: sha512-WMM/5wsE2f7nL3DL0BPokeSFOBaiQrUxt/9oWnejahZLqk0Mqs+FZOD9K96R13v066EJdhlachpmF2dD84ynSg==} + engines: {node: '>=18.0.0'} + hasBin: true + iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -12867,6 +12872,8 @@ snapshots: hybrids@8.2.2: {} + hybrids@9.1.23: {} + iconv-lite@0.4.24: dependencies: safer-buffer: 2.1.2