diff --git a/.vscode/settings.json b/.vscode/settings.json index c9366055..5de3d18d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -69,6 +69,7 @@ "codabar", "commitmsg", "crossorigin", + "daterange", "datetimerange", "depcheckrc", "domtoimage", diff --git a/src/app-components/app/AppLockScreen/index.scss b/src/app-components/app/AppLockScreen/index.scss index 8b4dbb9c..59184457 100644 --- a/src/app-components/app/AppLockScreen/index.scss +++ b/src/app-components/app/AppLockScreen/index.scss @@ -93,7 +93,7 @@ } } -.ray-template--light { +.r-template--light { .app-lock-screen__unlock__content-bg__wrapper { background-color: #fff !important; } diff --git a/src/app-config/app-config.ts b/src/app-config/app-config.ts index 823120b4..4b157cba 100644 --- a/src/app-config/app-config.ts +++ b/src/app-config/app-config.ts @@ -10,8 +10,8 @@ import type { MessageProviderProps } from 'naive-ui' * 避免样式出现奇奇怪怪的问题。 */ export const GLOBAL_CLASS_NAMES = { - darkClassName: 'ray-template--dark', - lightClassName: 'ray-template--light', + darkClassName: 'r-template--dark', + lightClassName: 'r-template--light', rayTemplateThemePrimaryColor: '--r-theme-primary-color', rayTemplateThemePrimaryFadeColor: '--r-theme-primary-fade-color', preLoadingAnimation: 'pre-loading-animation', @@ -72,9 +72,9 @@ export const PRE_LOADING_CONFIG: PreloadingConfig = { * 默认不启用。 * * @example - * export const APP_CATCH_KEY_PREFIX = 'ray-template:' + * export const APP_CATCH_KEY_PREFIX = 'r-template:' * - * 转换后的缓存 key: ray-template:signing。 + * 转换后的缓存 key: r-template:signing。 */ export const APP_CATCH_KEY_PREFIX = '' diff --git a/src/components/base/RChart/src/Chart.tsx b/src/components/base/RChart/src/Chart.tsx index 9c738aa0..45911264 100644 --- a/src/components/base/RChart/src/Chart.tsx +++ b/src/components/base/RChart/src/Chart.tsx @@ -534,7 +534,7 @@ export default defineComponent({ return preset === 'card' ? ( {{ default: renderNode( -
, +
, ), header: renderNode(title, { defaultElement:
, @@ -563,8 +563,8 @@ export default defineComponent({ }}
) : ( -
-
+
+
) }, diff --git a/src/components/base/RChart/src/index.scss b/src/components/base/RChart/src/index.scss index 4bede3d8..2c672d47 100644 --- a/src/components/base/RChart/src/index.scss +++ b/src/components/base/RChart/src/index.scss @@ -1,4 +1,4 @@ -.ray-chart { +.r-chart { width: var(--r-chart-width); height: var(--r-chart-height); border: none; @@ -6,7 +6,7 @@ box-sizing: border-box; transition: width 0.35s var(--r-bezier); - & .ray-chart__container { + & .r-chart__container { width: 100%; height: 100%; box-sizing: border-box; diff --git a/src/components/base/RCollapseGrid/src/index.scss b/src/components/base/RCollapseGrid/src/index.scss index 4e6b293d..03fd5634 100644 --- a/src/components/base/RCollapseGrid/src/index.scss +++ b/src/components/base/RCollapseGrid/src/index.scss @@ -1,4 +1,4 @@ -.ray-collapse-grid { +.r-collapse-grid { box-sizing: border-box; & .collapse-icon { @@ -21,7 +21,7 @@ } } - .ray-collapse-grid__suffix--btn { + .r-collapse-grid__suffix--btn { align-self: var(--r-collapse-grid-action-align); } } diff --git a/src/components/base/RCollapseGrid/src/index.tsx b/src/components/base/RCollapseGrid/src/index.tsx index d0873b14..7d61e014 100644 --- a/src/components/base/RCollapseGrid/src/index.tsx +++ b/src/components/base/RCollapseGrid/src/index.tsx @@ -87,7 +87,7 @@ export default defineComponent({ {{ default: () => ( diff --git a/src/components/base/RIframe/src/Iframe.tsx b/src/components/base/RIframe/src/Iframe.tsx index 2be7dff1..ab629845 100644 --- a/src/components/base/RIframe/src/Iframe.tsx +++ b/src/components/base/RIframe/src/Iframe.tsx @@ -56,16 +56,13 @@ export default defineComponent({ }, render() { return ( -
+
{{ ...this.$slots, default: () => (