Merge branch 'main' into example

src/hooks/business/captcha.ts

@@ -1,7 +1,7 @@
 import { computed } from 'vue';
 import { useCountDown, useLoading } from '@sa/hooks';
-import { $t } from '@/locales';
 import { REG_PHONE } from '@/constants/reg';
+import { $t } from '@/locales';
 
 export function useCaptcha() {
   const { loading, startLoading, endLoading } = useLoading();

src/hooks/common/echarts.ts

@@ -1,4 +1,5 @@
 import { computed, effectScope, nextTick, onScopeDispose, ref, watch } from 'vue';
+import { useElementSize } from '@vueuse/core';
 import * as echarts from 'echarts/core';
 import { BarChart, GaugeChart, LineChart, PictorialBarChart, PieChart, RadarChart, ScatterChart } from 'echarts/charts';
 import type {
@@ -29,7 +30,6 @@ import type {
 } from 'echarts/components';
 import { LabelLayout, UniversalTransition } from 'echarts/features';
 import { CanvasRenderer } from 'echarts/renderers';
-import { useElementSize } from '@vueuse/core';
 import { useThemeStore } from '@/store/modules/theme';
 
 export type ECOption = echarts.ComposeOption<

src/hooks/common/router.ts

@@ -18,12 +18,7 @@ export function useRouterPush(inSetup = true) {
 
   const routerBack = router.back;
 
-  interface RouterPushOptions {
-    query?: Record<string, string>;
-    params?: Record<string, string>;
-  }
-
-  async function routerPushByKey(key: RouteKey, options?: RouterPushOptions) {
+  async function routerPushByKey(key: RouteKey, options?: App.Global.RouterPushOptions) {
     const { query, params } = options || {};
 
     const routeLocation: RouteLocationRaw = {
@@ -67,7 +62,7 @@ export function useRouterPush(inSetup = true) {
   async function toLogin(loginModule?: UnionKey.LoginModule, redirectUrl?: string) {
     const module = loginModule || 'pwd-login';
 
-    const options: RouterPushOptions = {
+    const options: App.Global.RouterPushOptions = {
       params: {
         module
       }

src/hooks/common/table.ts

@@ -64,7 +64,7 @@ export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTabl
         if (isTableColumnHasKey(column)) {
           checks.push({
             key: column.key as string,
-            title: column.title as string,
+            title: column.title!,
             checked: true
           });
         } else if (column.type === 'selection') {