diff --git a/src/components/RTable/src/Table.tsx b/src/components/RTable/src/Table.tsx
index 22ef8728..38212540 100644
--- a/src/components/RTable/src/Table.tsx
+++ b/src/components/RTable/src/Table.tsx
@@ -251,13 +251,17 @@ export default defineComponent({
{{
default: () => (
<>
(), props)
const { getKeepAliveInclude } = useKeepAliveGetters()
const { setupKeepAlive, maxKeepAliveLength, keepAliveExclude } = APP_KEEP_ALIVE
-./types
diff --git a/src/directives/modules/ellipsis/index.ts b/src/directives/modules/ellipsis/index.ts
index 3c624f69..8e6366d0 100644
--- a/src/directives/modules/ellipsis/index.ts
+++ b/src/directives/modules/ellipsis/index.ts
@@ -36,13 +36,15 @@ const bindEllipsis = (el: HTMLElement, options: EllipsisBindingValue) => {
const { line = 1, type = 'block', width, popoverText } = options
if (width === void 0 || width === null) {
- console.error(`[v-ellipsis]: Expected width, but got ${width}!`)
+ console.error(
+ `[v-ellipsis]: Expected width is string or number, but got typeof ${width}!`,
+ )
return
}
- if (popoverText) {
- el.setAttribute('title', el.textContent || '')
+ if (popoverText && el.textContent) {
+ el.setAttribute('title', el.textContent)
}
if (type === 'line') {
diff --git a/src/error/PageResult/index.tsx b/src/error/PageResult/index.tsx
deleted file mode 100644
index 66b9df3f..00000000
--- a/src/error/PageResult/index.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- * @author Ray
- *
- * @date 2023-06-02
- *
- * @workspace ray-template
- *
- * @remark 今天也是元气满满撸代码的一天
- */
-
-/**
- *
- * 错误页面
- *
- * 基于 NResult 组件实现, 继承该组件所有 props 与 slots
- * 可以当作一个组件使用, 也可以当作一个页面调用
- */
-
-import './index.scss'
-
-import { NResult, NButton } from 'naive-ui'
-
-import { redirectRouterToDashboard } from '@/router/utils/routerCopilot'
-import { resultProps } from 'naive-ui'
-
-const PageResult = defineComponent({
- name: 'PageResult',
- props: {
- ...resultProps,
- },
- render() {
- return (
- (
value: VariableState[T],
cb?: FC,
) {
- variableState[key] = value
+ if (Object.hasOwn(variableState, key)) {
+ variableState[key] = value
- cb?.()
+ cb?.()
+ }
}
/**
diff --git a/src/hooks/web/useI18n.ts b/src/hooks/web/useI18n.ts
index 0d3ed1d1..374b15ca 100644
--- a/src/hooks/web/useI18n.ts
+++ b/src/hooks/web/useI18n.ts
@@ -88,8 +88,11 @@ export const useI18n = (namespace?: string) => {
*
* @description
* 该方法为纯函数，无任何副作用，单纯为了配合 i18n-ally 插件使用。
- *
* 该插件识别 t 方法包裹 path 进行提示文案内容。
+ *
+ * 不过在使用的时候必须按照示例导入，避免 vitest 抛出奇奇怪怪的错误。
+ * @example
+ * import { t } from '@/hooks/web/useI18n'
*/
export const t = (key: string) => key
diff --git a/src/hooks/web/usePagination.ts b/src/hooks/web/usePagination.ts
index 9ae190a4..db3bf4de 100644
--- a/src/hooks/web/usePagination.ts
+++ b/src/hooks/web/usePagination.ts
@@ -146,18 +146,21 @@ export const usePagination = (
*/
const getCallback = callback
- return {
- updatePage,
- updatePageSize,
- getItemCount,
- setItemCount,
- getPage,
- setPage,
- getPageSize,
- setPageSize,
- getPagination,
- getCallback,
- }
+ return [
+ paginationRef as PaginationProps,
+ {
+ updatePage,
+ updatePageSize,
+ getItemCount,
+ setItemCount,
+ getPage,
+ setPage,
+ getPageSize,
+ setPageSize,
+ getPagination,
+ getCallback,
+ },
+ ] as const
}
export type UsePaginationReturn = ReturnType
diff --git a/src/layout/components/MenuTag/index.tsx b/src/layout/components/MenuTag/index.tsx
index b5b719dd..4f72fc5c 100644
--- a/src/layout/components/MenuTag/index.tsx
+++ b/src/layout/components/MenuTag/index.tsx
@@ -509,6 +509,7 @@ export default defineComponent({
onMouseleave: menuTagMouseleave.bind(this, curr),
[MENU_TAG_DATA]: curr.path,
}}
+ size="small"
>
{{
default: () => (
diff --git a/src/layout/components/SiderBar/components/GlobalSearch/index.scss b/src/layout/components/SiderBar/components/GlobalSearch/index.scss
index a5a6e1f3..5e4d33fe 100644
--- a/src/layout/components/SiderBar/components/GlobalSearch/index.scss
+++ b/src/layout/components/SiderBar/components/GlobalSearch/index.scss
@@ -19,7 +19,7 @@ $globalSearchWidth: 650px;
}
& .n-card__action {
- padding: 16px 12px 12px 12px;
+ padding: 8px 12px;
}
& .n-card__content,
diff --git a/src/layout/default/ContentWrapper/index.tsx b/src/layout/default/ContentWrapper/index.tsx
index 7351cf20..ae4b1458 100644
--- a/src/layout/default/ContentWrapper/index.tsx
+++ b/src/layout/default/ContentWrapper/index.tsx
@@ -24,6 +24,7 @@ import AppRequestCancelerProvider from '@/app-components/provider/AppRequestCanc
import { getVariableToRefs } from '@/global-variable'
import { useSettingGetters } from '@/store'
import { useMaximize } from '@/hooks'
+import { LAYOUT_CONTENT_SPIN_WHEN_ROUTE_CHANGE } from '@/app-config'
import type { GlobalThemeOverrides } from 'naive-ui'
@@ -52,7 +53,9 @@ export default defineComponent({
})
}
- setupLayoutContentSpin()
+ if (LAYOUT_CONTENT_SPIN_WHEN_ROUTE_CHANGE) {
+ setupLayoutContentSpin()
+ }
return {
globalMainLayoutLoad,
diff --git a/src/router/modules/error404.ts b/src/router/modules/error404.ts
index f34d05e9..5a18080c 100644
--- a/src/router/modules/error404.ts
+++ b/src/router/modules/error404.ts
@@ -6,7 +6,7 @@ import type { AppRouteRecordRaw } from '@/router/types'
const error404: AppRouteRecordRaw = {
path: '/:catchAll(.*)',
name: 'ErrorPage',
- component: () => import('@/error/views/Error404/index'),
+ component: () => import('@/views/error/views/Error404'),
meta: {
i18nKey: t('menu.Error'),
icon: 'error',
diff --git a/src/store/modules/setting/index.ts b/src/store/modules/setting/index.ts
index a9fac584..ccafd055 100644
--- a/src/store/modules/setting/index.ts
+++ b/src/store/modules/setting/index.ts
@@ -103,7 +103,7 @@ export const piniaSettingStore = defineStore(
value: V[T],
cb?: C,
) => {
- if (Reflect.has(settingState, key)) {
+ if (Object.hasOwn(settingState, key)) {
settingState[key] = value
}
diff --git a/src/utils/app/index.ts b/src/utils/app/index.ts
index 36779e49..115b82c4 100644
--- a/src/utils/app/index.ts
+++ b/src/utils/app/index.ts
@@ -1,4 +1 @@
-// export * from './prefixCacheKey'
-import { prefixCacheKey } from './prefixCacheKey'
-
-export { prefixCacheKey }
+export * from './prefixCacheKey'
diff --git a/src/utils/basic.ts b/src/utils/basic.ts
index 6b183787..a5d3446e 100644
--- a/src/utils/basic.ts
+++ b/src/utils/basic.ts
@@ -293,7 +293,7 @@ export function pick(
const result = [...keys, ...rest].reduce(
(pre, curr) => {
- if (Reflect.has(targetObject, curr)) {
+ if (Object.hasOwn(targetObject, curr)) {
pre[curr] = targetObject[curr]
}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 93e62208..45970f13 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,98 +1,7 @@
-// export * from './basic'
-// export * from './cache'
-// export * from './dom'
-// export * from './element'
-// export * from './precision'
-// export * from './vue'
-// export * from './app'
-
-import {
- getAppEnvironment,
- arrayBufferToBase64Image,
- downloadBase64File,
- isValueType,
- uuid,
- downloadAnyFile,
- omit,
- pick,
- isAsyncFunction,
- isPromise,
- callWithErrorHandling,
- callWithAsyncErrorHandling,
- detectOperatingSystem,
- equalRouterPath,
-} from './basic'
-import { hasStorage, getStorage, setStorage, removeStorage } from './cache'
-import { printDom } from './dom'
-import {
- setClass,
- removeClass,
- hasClass,
- autoPrefixStyle,
- setStyle,
- removeStyle,
- colorToRgba,
- queryElements,
- completeSize,
-} from './element'
-import {
- isCurrency,
- format,
- add,
- subtract,
- multiply,
- divide,
- distribute,
-} from './precision'
-import {
- call,
- unrefElement,
- renderNode,
- effectDispose,
- watchEffectWithTarget,
-} from './vue'
-import { prefixCacheKey } from './app'
-
-export {
- getAppEnvironment,
- arrayBufferToBase64Image,
- downloadBase64File,
- isValueType,
- uuid,
- downloadAnyFile,
- omit,
- pick,
- isAsyncFunction,
- isPromise,
- callWithErrorHandling,
- callWithAsyncErrorHandling,
- detectOperatingSystem,
- equalRouterPath,
- hasStorage,
- getStorage,
- setStorage,
- removeStorage,
- printDom,
- setClass,
- removeClass,
- hasClass,
- autoPrefixStyle,
- setStyle,
- removeStyle,
- colorToRgba,
- queryElements,
- completeSize,
- isCurrency,
- format,
- add,
- subtract,
- multiply,
- divide,
- distribute,
- call,
- unrefElement,
- renderNode,
- effectDispose,
- watchEffectWithTarget,
- prefixCacheKey,
-}
+export * from './basic'
+export * from './cache'
+export * from './dom'
+export * from './element'
+export * from './precision'
+export * from './vue'
+export * from './app'
diff --git a/src/views/dashboard/index.tsx b/src/views/dashboard/index.tsx
index 9de03fae..9698cfc6 100644
--- a/src/views/dashboard/index.tsx
+++ b/src/views/dashboard/index.tsx
@@ -10,7 +10,7 @@ import {
NH6,
} from 'naive-ui'
import { RIcon } from '@/components'
-import RayLink from '@/app-components/app/RayLink'
+import AppShareLink from '@/app-components/app/AppShareLink'
const Dashboard = defineComponent({
name: 'RDashboard',
@@ -123,7 +123,7 @@ const Dashboard = defineComponent({
-
)
diff --git a/src/views/demo/echart/index.tsx b/src/views/demo/echart/index.tsx
index 196818f6..52c87def 100644
--- a/src/views/demo/echart/index.tsx
+++ b/src/views/demo/echart/index.tsx
@@ -1,6 +1,6 @@
import './index.scss'
-import { NCard, NSwitch, NFlex, NH2, NButton } from 'naive-ui'
+import { NCard, NSwitch, NFlex, NButton } from 'naive-ui'
import { RChart } from '@/components'
import { useChart } from '@/components'
@@ -78,11 +78,26 @@ const Echart = defineComponent({
type: 'pie',
radius: '50%',
data: [
- { value: 1048, name: 'Search Engine' },
- { value: 735, name: 'Direct' },
- { value: 580, name: 'Email' },
- { value: 484, name: 'Union Ads' },
- { value: 300, name: 'Video Ads' },
+ {
+ value: 1048,
+ name: 'Search Engine',
+ },
+ {
+ value: 735,
+ name: 'Direct',
+ },
+ {
+ value: 580,
+ name: 'Email',
+ },
+ {
+ value: 484,
+ name: 'Union Ads',
+ },
+ {
+ value: 300,
+ name: 'Video Ads',
+ },
],
emphasis: {
itemStyle: {
@@ -195,7 +210,7 @@ const Echart = defineComponent({
if (isDispose()) {
render()
} else {
- window.$message.warning('图表已经渲染')
+ window.$message.warning('不可以重复渲染图表~')
}
}
@@ -239,36 +254,10 @@ const Echart = defineComponent({
return (
-
@@ -297,7 +286,7 @@ const Echart = defineComponent({
if (isDispose2()) {
render2()
} else {
- window.$message.warning('图表已经渲染')
+ window.$message.warning('不可以重复渲染图表~')
}
}}
>
diff --git a/src/views/demo/mock-demo/index.tsx b/src/views/demo/mock-demo/index.tsx
index ef53550c..108c6942 100644
--- a/src/views/demo/mock-demo/index.tsx
+++ b/src/views/demo/mock-demo/index.tsx
@@ -88,22 +88,16 @@ const MockDemo = defineComponent({
email: null,
})
- const {
- getPagination,
- getPage,
- getPageSize,
- setItemCount,
- getCallback,
- setPage,
- setPageSize,
- } = usePagination(() => {
+ const [
+ paginationRef,
+ { getPage, getPageSize, setItemCount, getCallback, setPage, setPageSize },
+ ] = usePagination(() => {
personFetchRun({
page: getPage(),
pageSize: getPageSize(),
email: condition.email,
})
})
- const paginationRef = getPagination()
const {
data: personData,
loading: personLoading,
@@ -126,7 +120,6 @@ const MockDemo = defineComponent({
return {
personData,
personLoading,
- getPagination,
columns,
...toRefs(condition),
getCallback,
diff --git a/src/views/demo/table/index.tsx b/src/views/demo/table/index.tsx
index 36b45a9d..6a0fd26d 100644
--- a/src/views/demo/table/index.tsx
+++ b/src/views/demo/table/index.tsx
@@ -105,7 +105,10 @@ const TableView = defineComponent({
},
]
const actionColumns = ref>(
- [...baseColumns].map((curr) => ({ ...curr, width: 400 })),
+ [...baseColumns].map((curr) => ({
+ ...curr,
+ width: 400,
+ })),
)
const tableData = ref([])
const tableMenuOptions = [
diff --git a/src/error/PageResult/index.scss b/src/views/error/PageResult/index.scss
similarity index 100%
rename from src/error/PageResult/index.scss
rename to src/views/error/PageResult/index.scss
diff --git a/src/views/error/PageResult/index.tsx b/src/views/error/PageResult/index.tsx
new file mode 100644
index 00000000..d8aec7f9
--- /dev/null
+++ b/src/views/error/PageResult/index.tsx
@@ -0,0 +1,83 @@
+/**
+ *
+ * @author Ray
+ *
+ * @date 2023-06-02
+ *
+ * @workspace ray-template
+ *
+ * @remark 今天也是元气满满撸代码的一天
+ */
+
+/**
+ *
+ * 错误页面
+ *
+ * 基于 NResult 组件实现, 继承该组件所有 props 与 slots
+ * 可以当作一个组件使用, 也可以当作一个页面调用
+ */
+
+import './index.scss'
+
+import { NResult, NButton, NFlex } from 'naive-ui'
+
+import { redirectRouterToDashboard } from '@/router/utils/routerCopilot'
+import { resultProps } from 'naive-ui'
+import { getStorage } from '@/utils'
+import { useVueRouter } from '@/hooks'
+import { APP_CATCH_KEY } from '@/app-config'
+
+const PageResult = defineComponent({
+ name: 'PageResult',
+ props: {
+ ...resultProps,
+ },
+ setup() {
+ const { router } = useVueRouter()
+
+ const goBack = () => {
+ const { appMenuKey } = APP_CATCH_KEY
+ const key = getStorage(appMenuKey, 'sessionStorage', {
+ defaultValue: '',
+ })
+
+ if (key) {
+ router.replace(key)
+ }
+ }
+
+ return {
+ goBack,
+ }
+ },
+ render() {
+ const { goBack } = this
+
+ return (
+ 其他登陆方式
友情链接
-
diff --git a/vite.config.ts b/vite.config.ts
index d6d2c109..83e6ee53 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -19,7 +19,12 @@ export default defineConfig(({ mode }) => {
} = config
const __APP_CFG__ = {
- pkg: { dependencies, devDependencies, name, version },
+ pkg: {
+ dependencies,
+ devDependencies,
+ name,
+ version,
+ },
layout: {
copyright,
sideBarLogo,
-
- {{
- ...this.$slots,
- footer: () => (
-
- 返回首页
-
- ),
- }}
-
-
- )
- },
-})
-
-export default PageResult
diff --git a/src/error/index.ts b/src/error/index.ts
deleted file mode 100644
index 1b74c9c1..00000000
--- a/src/error/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import PageResult from './PageResult/index'
-
-export default PageResult
diff --git a/src/global-variable/variable.ts b/src/global-variable/variable.ts
index 48e3d2f6..4e8890e5 100644
--- a/src/global-variable/variable.ts
+++ b/src/global-variable/variable.ts
@@ -65,9 +65,11 @@ export function setVariable-
-
-
-
1. 当未获取到宽高时，组件会默认以 200*200 尺寸填充。
-
- -
-
- 2. 默认启用 autoChangeTheme，自动监听模板主题变化，如果设置为 - false 则为 APP_THEME.echartTheme 配置项为渲染结果（RayTemplate - 独有） -
-
- -
-
3. 默认启用 watchOptions，自动监听配置项变化
-
- -
-
4. 默认启用 nextTick，强制在下一队列渲染图标内容
-
- -
-
5. 配置 setChartOptions 属性，可以定制化合并模式
-
- -
-
- 6. 默认启用 intersectionObserver - 属性，只有元素在可见范围才会渲染图表，可以滚动查看效果 -
-
- -
-
7. useChart 方法
-
-
该组件基于 ECharts, Vueuse 封装。默认做了最佳的优化封装实践。
++ 开箱即用的优化策略：节流更新图表、异步渲染、自动销毁、贴花、加载、主题、视窗区域渲染、自动更新尺寸等高级特性。 +
+
+ {{
+ ...this.$slots,
+ footer: () => (
+
+
+ 返回首页
+
+
+ 返回上一页面
+
+
+ ),
+ }}
+
+
+ )
+ },
+})
+
+export default PageResult
diff --git a/src/error/README.md b/src/views/error/README.md
similarity index 100%
rename from src/error/README.md
rename to src/views/error/README.md
diff --git a/src/views/error/index.ts b/src/views/error/index.ts
new file mode 100644
index 00000000..1d6751ab
--- /dev/null
+++ b/src/views/error/index.ts
@@ -0,0 +1,3 @@
+import PageResult from './PageResult'
+
+export default PageResult
diff --git a/src/error/views/Error404/index.tsx b/src/views/error/views/Error404/index.tsx
similarity index 90%
rename from src/error/views/Error404/index.tsx
rename to src/views/error/views/Error404/index.tsx
index ccba33c3..d1559c67 100644
--- a/src/error/views/Error404/index.tsx
+++ b/src/views/error/views/Error404/index.tsx
@@ -9,7 +9,7 @@
* @remark 今天也是元气满满撸代码的一天
*/
-import PageResult from '@/error'
+import PageResult from '@/views/error'
const ErrorPage404 = defineComponent({
name: 'ErrorPage404',
diff --git a/src/error/views/Error500/index.tsx b/src/views/error/views/Error500/index.tsx
similarity index 90%
rename from src/error/views/Error500/index.tsx
rename to src/views/error/views/Error500/index.tsx
index 2c9e6ab9..475ae7a5 100644
--- a/src/error/views/Error500/index.tsx
+++ b/src/views/error/views/Error500/index.tsx
@@ -9,7 +9,7 @@
* @remark 今天也是元气满满撸代码的一天
*/
-import PageResult from '@/error'
+import PageResult from '@/views/error'
const ErrorPage500 = defineComponent({
name: 'ErrorPage500',
diff --git a/src/views/login/index.tsx b/src/views/login/index.tsx
index a628920b..693f8ab1 100644
--- a/src/views/login/index.tsx
+++ b/src/views/login/index.tsx
@@ -16,7 +16,7 @@ import Register from './components/Register'
import QRCodeSigning from './components/QRCodeSigning'
import SSOSigning from './components/SSOSigning'
import { RIcon } from '@/components'
-import RayLink from '@/app-components/app/RayLink'
+import AppShareLink from '@/app-components/app/AppShareLink'
import ThemeSwitch from '@/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch'
import { LOCAL_OPTIONS } from '@/app-config'
@@ -140,7 +140,7 @@ const Login = defineComponent({