From 26fd4df6abcb06879665f320479e75a12c8c0362 Mon Sep 17 00:00:00 2001 From: gimmyhehe <975402925@qq.com> Date: Thu, 7 Dec 2023 09:52:06 +0800 Subject: [PATCH] fix(sites): fix console warning (#1042) * fix(sites): fix console warning * fix(sites): fix console warning --- examples/sites/demos/pc/webdoc/theme-en.md | 12 +++++--- examples/sites/demos/pc/webdoc/theme.md | 13 ++++++-- examples/sites/src/i18n/index.js | 6 ++-- examples/sites/src/main.js | 9 ++---- examples/sites/src/menus.jsx | 2 +- examples/sites/src/tools/utils.js | 4 +-- .../sites/src/views/components/VersionTip.vue | 22 +++++++++----- .../sites/src/views/components/components.vue | 30 +++++++++---------- examples/sites/src/views/components/demo.vue | 22 +++++++------- examples/sites/src/views/docs/docs.vue | 5 ++-- examples/sites/src/views/layout/layout.vue | 28 +++++++++-------- examples/sites/src/views/overview.vue | 29 ++++++++++-------- examples/sites/vite.config.ts | 14 ++++++--- 13 files changed, 109 insertions(+), 87 deletions(-) diff --git a/examples/sites/demos/pc/webdoc/theme-en.md b/examples/sites/demos/pc/webdoc/theme-en.md index e4339ff7a..1a15e7fe1 100644 --- a/examples/sites/demos/pc/webdoc/theme-en.md +++ b/examples/sites/demos/pc/webdoc/theme-en.md @@ -96,10 +96,10 @@ If you want to control the `css` variable through `js`, you can do this: ```js const el = document.documentElement -//Obtain the CSS variable. +// Obtain the CSS variable. getComputedStyle(el).getPropertyValue('--ti-base-color-white') -//Set the CSS variable. +// Set the CSS variable. el.style.setProperty('--ti-base-color-white', '#fefefe') ``` @@ -115,11 +115,15 @@ Replace all the old variable names in the `src` directory in the project as an e Step 1: Click to download the mapping table `newVars.json` and the replacement script `replaceVar.js`. -newVars.json files and replaceVar.js files + + +newVars.json files and replaceVar.js files Step 2: Place `newVars.json` and `replaceVar.js` in the root directory of the project, which is at the same level as the src directory. -

+

Step 3: Run the following command in the root directory of the project: diff --git a/examples/sites/demos/pc/webdoc/theme.md b/examples/sites/demos/pc/webdoc/theme.md index 6101216ce..294ecc18b 100644 --- a/examples/sites/demos/pc/webdoc/theme.md +++ b/examples/sites/demos/pc/webdoc/theme.md @@ -47,7 +47,10 @@ resolve: { ```js import TinyThemeTool from '@opentiny/vue-theme/theme-tool' -import { tinySmbTheme } from '@opentiny/vue-theme/theme' // 导入主题 + +import { tinySmbTheme } from '@opentiny/vue-theme/theme' + +// 导入主题 new TinyThemeTool(tinySmbTheme, 'tinyStyleSheetId') // 初始化主题 ``` @@ -162,11 +165,15 @@ el.style.setProperty('--ti-base-color-white', '#fefefe') 步骤一、点击下载新旧变量的映射表`newVars.json`和替换脚本`replaceVar.js` -newVars.json 文件replaceVar.js 文件 + + +newVars.json 文件replaceVar.js 文件 步骤二、将 `newVars.json` 和 `replaceVar.js` 放到项目根目录下,与 src 目录同级; -

+

步骤三、在项目根目录下,执行以下命令进行替换; diff --git a/examples/sites/src/i18n/index.js b/examples/sites/src/i18n/index.js index 577ebc3b5..330d95d99 100644 --- a/examples/sites/src/i18n/index.js +++ b/examples/sites/src/i18n/index.js @@ -20,7 +20,7 @@ const i18n = initI18n({ }, messages }) -const $t = i18n.global.t -const $t2 = (cn, en) => (i18n.global.locale === 'zhCN' ? cn : en) +const i18nByKey = i18n.global.t +const getWord = (cn, en) => (i18n.global.locale === 'zhCN' ? cn : en) -export { i18n, $t, $t2 } +export { i18n, i18nByKey, getWord } diff --git a/examples/sites/src/main.js b/examples/sites/src/main.js index a585aec85..051e578c5 100644 --- a/examples/sites/src/main.js +++ b/examples/sites/src/main.js @@ -21,8 +21,7 @@ import './assets/custom-block.less' import { i18n } from './i18n/index' import { router } from './router' import App from './App.vue' -import { $t, $t2 } from './i18n' -import { $pub, appData } from './tools' +import { appData } from './tools' import { ZH_CN_LANG, EN_US_LANG, LANG_PATH_MAP } from './const' import demoConfig from '@demos/config.js' @@ -62,11 +61,7 @@ if (import.meta.env.VITE_TINY_THEME === 'saas') { import('./tailwind.css') } -app - .use(router) - .use(i18n) - .use(createHead()) // 支持md修改title - .mixin({ methods: { $t, $t2, $pub } }) +app.use(router).use(i18n).use(createHead()) // 支持md修改title if (typeof demoConfig.initApp === 'function') { demoConfig.initApp(app) diff --git a/examples/sites/src/menus.jsx b/examples/sites/src/menus.jsx index 38c429fda..657468cb6 100644 --- a/examples/sites/src/menus.jsx +++ b/examples/sites/src/menus.jsx @@ -1,6 +1,6 @@ import { docMenus, cmpMenus } from '@menu/menus.js' -import { appData, $t2 } from './tools' +import { appData } from './tools' /** * 聚合doc / cmp 两个页面的所有菜单. diff --git a/examples/sites/src/tools/utils.js b/examples/sites/src/tools/utils.js index 6169a7d40..c274ed049 100644 --- a/examples/sites/src/tools/utils.js +++ b/examples/sites/src/tools/utils.js @@ -27,7 +27,7 @@ const $delay = (time) => new Promise((resolve) => setTimeout(resolve, time)) */ const $idle = () => new Promise((resolve) => (window.requestIdleCallback || window.requestAnimationFrame)(resolve)) -const $pub = (url) => { +const pubUrl = (url) => { return baseUrl + url } @@ -80,4 +80,4 @@ const fetchDemosFile = (path) => { }) } -export { $clone, $split, $delay, $idle, $pub, fetchDemosFile } +export { $clone, $split, $delay, $idle, pubUrl, fetchDemosFile } diff --git a/examples/sites/src/views/components/VersionTip.vue b/examples/sites/src/views/components/VersionTip.vue index ee80cc783..9d3ebaade 100644 --- a/examples/sites/src/views/components/VersionTip.vue +++ b/examples/sites/src/views/components/VersionTip.vue @@ -25,7 +25,7 @@ import type { PropType } from 'vue' import { defineComponent, computed } from 'vue' import { Tag as TinyTag, Alert as TinyAlert, Tooltip as TinyTooltip } from '@opentiny/vue' -import { $t2 } from '../../i18n/index' +import { getWord } from '../../i18n/index' enum STAGE { experimental = 'experimental', @@ -140,9 +140,11 @@ export default defineComponent({ }) const generateDes = (desMap: typeof cnDesMap) => { - // 当前stable之后,不显示experimental的描述 - const isFilterExperimental = [STAGE.removed, STAGE.deprecated, STAGE.stable].includes(currentStageComputed.value as STAGE) - // 当前deprecated之后,不显示stable的描述 + // 当前stable之后,不显示experimental的描述 + const isFilterExperimental = [STAGE.removed, STAGE.deprecated, STAGE.stable].includes( + currentStageComputed.value as STAGE + ) + // 当前deprecated之后,不显示stable的描述 const isFilterStable = [STAGE.removed, STAGE.deprecated].includes(currentStageComputed.value as STAGE) const goingStages = Object.entries(desMap).filter(([stage]) => { @@ -163,17 +165,21 @@ export default defineComponent({ } const tipComputed = computed(() => { - if (props.tip) return $t2(props.tip['zh-CN'], props.tip['en-US']) as string + if (props.tip) return getWord(props.tip['zh-CN'], props.tip['en-US']) as string if (!props.metaData) return '' const vertionDesZnCn = generateDes(cnDesMap) - const znChTip = `该${props.tipSubject === 'component' ? '组件' : '特性'}${vertionDesZnCn}。${props.extendTip?.['zh-CN'] || ''}` + const znChTip = `该${props.tipSubject === 'component' ? '组件' : '特性'}${vertionDesZnCn}。${ + props.extendTip?.['zh-CN'] || '' + }` const vertionDesEnUs = generateDes(enDesMap) - const enUsTip = `This ${props.tipSubject === 'component' ? 'component' : 'feature'} is ${vertionDesEnUs}. ${props.extendTip?.['en-US'] || ''}` + const enUsTip = `This ${props.tipSubject === 'component' ? 'component' : 'feature'} is ${vertionDesEnUs}. ${ + props.extendTip?.['en-US'] || '' + }` - return $t2(znChTip, enUsTip) as string + return getWord(znChTip, enUsTip) as string }) const alertTypeComputed = computed(() => { diff --git a/examples/sites/src/views/components/components.vue b/examples/sites/src/views/components/components.vue index add660783..1d15f3889 100644 --- a/examples/sites/src/views/components/components.vue +++ b/examples/sites/src/views/components/components.vue @@ -16,7 +16,7 @@