From 7f9cbe8466f8a49366d0d04d46e6c69306af7a04 Mon Sep 17 00:00:00 2001
From: luoer <luoer@szbeihai.com>
Date: Tue, 30 Jan 2024 10:02:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AC=AC=E4=B8=89=E6=96=B9=E5=BA=93?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BAVUE=E6=8F=92=E4=BB=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc                                 |  2 +-
 package.json                                |  2 +-
 src/api/instance/api.ts                     |  2 +-
 src/api/instance/service.ts                 |  9 ++++++
 src/components/AnBreadcrumb/bread-page.vue  |  5 ---
 src/components/AnTable/components/Table.tsx | 34 +++------------------
 src/components/AnTable/hooks/useActions.tsx | 16 ++++++++++
 src/components/AnTable/hooks/useTable.tsx   | 10 ++++++
 src/libs/dayjs/index.ts                     | 26 ++++++----------
 src/libs/dayjs/interface.d.ts               |  3 ++
 src/libs/nprogress/index.ts                 |  7 ++++-
 src/libs/nprogress/interface.d.ts           |  8 +++++
 src/main.ts                                 | 14 ++++++---
 src/pages/_layout/Menu.vue                  | 26 +++++++++++-----
 src/pages/_layout/index.vue                 | 18 ++---------
 src/pages/setting/index.vue                 |  4 ---
 src/router/guards/progress.ts               |  2 +-
 src/styles/css-arco.less                    |  8 ++---
 src/types/vue.d.ts                          |  5 +--
 19 files changed, 108 insertions(+), 93 deletions(-)
 create mode 100644 src/components/AnTable/hooks/useActions.tsx
 create mode 100644 src/libs/nprogress/interface.d.ts

diff --git a/.prettierrc b/.prettierrc
index 7f81539..4da0e9f 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,6 +1,6 @@
 {
   "tabWidth": 2,
-  "printWidth": 120,
+  "printWidth": 180,
   "bracketSpacing": true,
   "singleQuote": true,
   "arrowParens": "avoid"
diff --git a/package.json b/package.json
index 26ec3b1..b170dc0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "starter-vue",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src/api/instance/api.ts b/src/api/instance/api.ts
index fa9558a..90e6151 100644
--- a/src/api/instance/api.ts
+++ b/src/api/instance/api.ts
@@ -22,8 +22,8 @@ addToastInterceptor(api.instance);
  * 添加异常处理拦截器
  */
 addExceptionInterceptor(api.instance, () => api.expireHandler?.());
+
 /**
  * 添加登陆令牌拦截器
  */
 addAuthInterceptor(api.instance);
-
diff --git a/src/api/instance/service.ts b/src/api/instance/service.ts
index 3664394..9e2b504 100644
--- a/src/api/instance/service.ts
+++ b/src/api/instance/service.ts
@@ -1,3 +1,4 @@
+import { App } from 'vue';
 import { Api } from '../generated/Api';
 
 /**
@@ -9,4 +10,12 @@ export class Service extends Api<unknown> {
    * @description 勿动
    */
   expireHandler: () => void = () => {};
+
+  /**
+   * 作为VUE插件进行初始化
+   * @param app
+   */
+  install(app: App) {
+    app.config.globalProperties.$api = this;
+  }
 }
diff --git a/src/components/AnBreadcrumb/bread-page.vue b/src/components/AnBreadcrumb/bread-page.vue
index dd06f38..e5b4245 100644
--- a/src/components/AnBreadcrumb/bread-page.vue
+++ b/src/components/AnBreadcrumb/bread-page.vue
@@ -5,11 +5,6 @@
         <BreadCrumb></BreadCrumb>
         <div>
           <a-link>需要帮助？</a-link>
-          <a-button size="mini" @click="router.push({ path: route.path, query: { s: Math.random() }, force: true })">
-            <template #icon>
-              <i class="icon-park-outline-redo"></i>
-            </template>
-          </a-button>
         </div>
       </div>
     </div>
diff --git a/src/components/AnTable/components/Table.tsx b/src/components/AnTable/components/Table.tsx
index c23da3d..a84daed 100644
--- a/src/components/AnTable/components/Table.tsx
+++ b/src/components/AnTable/components/Table.tsx
@@ -1,12 +1,4 @@
-import {
-  AnForm,
-  AnFormInstance,
-  AnFormModal,
-  AnFormModalInstance,
-  AnFormModalProps,
-  AnFormProps,
-  getModel,
-} from '@/components/AnForm';
+import { AnForm, AnFormInstance, AnFormModal, AnFormModalInstance, AnFormModalProps, AnFormProps, getModel } from '@/components/AnForm';
 import AnEmpty from '@/components/AnEmpty/AnEmpty.vue';
 import { Button, PaginationProps, Table, TableColumnData, TableData, TableInstance } from '@arco-design/web-vue';
 import { isArray, isFunction, merge } from 'lodash-es';
@@ -14,14 +6,8 @@ import { InjectionKey, PropType, Ref, VNodeChild, defineComponent, ref } from 'v
 import { PluginContainer } from '../hooks/useTablePlugin';
 
 type DataFn = (filter: { page: number; size: number; [key: string]: any }) => any | Promise<any>;
-
-export type ArcoTableProps = Omit<
-  TableInstance['$props'],
-  'ref' | 'pagination' | 'loading' | 'data' | 'onPageChange' | 'onPageSizeChange'
->;
-
+export type ArcoTableProps = Omit<TableInstance['$props'], 'ref' | 'pagination' | 'loading' | 'data' | 'onPageChange' | 'onPageSizeChange'>;
 export const AnTableContextKey = Symbol('AnTableContextKey') as InjectionKey<AnTableContext>;
-
 export type TableColumnRender = (data: { record: TableData; column: TableColumnData; rowIndex: number }) => VNodeChild;
 
 /**
@@ -207,9 +193,7 @@ export const AnTable = defineComponent({
       <div class="an-table table w-full">
         <div class={`mb-3 flex gap-2 toolbar justify-between`}>
           {this.create && <AnFormModal {...this.create} ref="createRef" onSubmited={this.reload}></AnFormModal>}
-          {this.modify && (
-            <AnFormModal {...this.modify} trigger={false} ref="modifyRef" onSubmited={this.refresh}></AnFormModal>
-          )}
+          {this.modify && <AnFormModal {...this.modify} trigger={false} ref="modifyRef" onSubmited={this.refresh}></AnFormModal>}
           {this.$slots.action?.(this.renderData)}
           {this.pluginer?.actions && (
             <div class={`flex-1 flex gap-2 items-center`}>
@@ -220,12 +204,7 @@ export const AnTable = defineComponent({
           )}
           {this.search && (
             <div>
-              <AnForm
-                ref="searchRef"
-                v-model:model={this.search.model}
-                items={this.search.items}
-                formProps={this.search.formProps}
-              >
+              <AnForm ref="searchRef" v-model:model={this.search.model} items={this.search.items} formProps={this.search.formProps}>
                 {{
                   submit: () => (
                     <Button type="primary" loading={this.loading} onClick={this.reload}>
@@ -279,10 +258,7 @@ export type AnTableInstance = InstanceType<typeof AnTable>;
 /**
  * 表格组件参数
  */
-export type AnTableProps = Pick<
-  AnTableInstance['$props'],
-  'source' | 'columns' | 'search' | 'paging' | 'create' | 'modify' | 'tableProps' | 'pluginer'
->;
+export type AnTableProps = Pick<AnTableInstance['$props'], 'source' | 'columns' | 'search' | 'paging' | 'create' | 'modify' | 'tableProps' | 'pluginer'>;
 
 export interface AnTableContext {
   /**
diff --git a/src/components/AnTable/hooks/useActions.tsx b/src/components/AnTable/hooks/useActions.tsx
new file mode 100644
index 0000000..acf258c
--- /dev/null
+++ b/src/components/AnTable/hooks/useActions.tsx
@@ -0,0 +1,16 @@
+import { ButtonProps, TableData } from '@arco-design/web-vue';
+
+export interface AnTableActionBase {
+  text: string;
+  icon: string | Component;
+  visible: () => boolean;
+  disable: () => boolean;
+  buttonProps: ButtonProps;
+}
+
+interface AnTableActionBatch {
+  type: 'batch';
+  onClick: (rows: TableData) => void;
+}
+
+export type AnTableAction = AnTableActionBase & AnTableActionBatch;
diff --git a/src/components/AnTable/hooks/useTable.tsx b/src/components/AnTable/hooks/useTable.tsx
index f49e474..b771791 100644
--- a/src/components/AnTable/hooks/useTable.tsx
+++ b/src/components/AnTable/hooks/useTable.tsx
@@ -35,6 +35,16 @@ export interface TableUseOptions extends Pick<AnTableProps, 'source' | 'tablePro
    * ```
    */
   columns?: TableColumn[];
+  /**
+   * 操作栏
+   * @example
+   * ```ts
+   * [{
+   *   text: '按钮',
+   *   onClick: () => null,
+   * }]
+   * ```
+   */
   actions?: any[];
   /**
    * 搜索表单
diff --git a/src/libs/dayjs/index.ts b/src/libs/dayjs/index.ts
index accf608..5201c38 100644
--- a/src/libs/dayjs/index.ts
+++ b/src/libs/dayjs/index.ts
@@ -2,22 +2,7 @@ import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 import localData from 'dayjs/plugin/localeData';
 import relativeTime from 'dayjs/plugin/relativeTime';
-
-/**
- *
- * 默认日期时间格式
- */
-const DATETIME = 'YYYY-MM-DD HH:mm';
-
-/**
- * 默认日期格式
- */
-const DATE = 'YYYY-MM-DD';
-
-/**
- * 默认时间格式
- */
-const TIME = 'HH:mm:ss';
+import { App } from 'vue';
 
 /**
  * 中文语言包
@@ -63,4 +48,11 @@ dayjs.prototype.format = function (format: string = dayjs.DATETIME) {
   return this._format(format);
 };
 
-export { DATE, DATETIME, TIME, dayjs };
+/**
+ * 作为VUE插件进行初始化
+ */
+dayjs.install = function dayjsPlugin(app: App) {
+  app.config.globalProperties.$dayjs = dayjs;
+};
+
+export { dayjs };
diff --git a/src/libs/dayjs/interface.d.ts b/src/libs/dayjs/interface.d.ts
index a1c04c8..b5d6a44 100644
--- a/src/libs/dayjs/interface.d.ts
+++ b/src/libs/dayjs/interface.d.ts
@@ -1,4 +1,5 @@
 import 'dayjs';
+import { App } from 'vue';
 
 declare module 'dayjs' {
   /**
@@ -13,4 +14,6 @@ declare module 'dayjs' {
   interface Dayjs {
     _format: Dayjs['format'];
   }
+
+  export var install: (app: App) => void;
 }
diff --git a/src/libs/nprogress/index.ts b/src/libs/nprogress/index.ts
index bc0ec51..1f93915 100644
--- a/src/libs/nprogress/index.ts
+++ b/src/libs/nprogress/index.ts
@@ -1,6 +1,7 @@
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import './nprogress.css';
+import { App } from 'vue';
 
 NProgress.configure({
   showSpinner: false,
@@ -8,5 +9,9 @@ NProgress.configure({
   minimum: 0.3,
 });
 
-export { NProgress };
+/**
+ * 作为VUE插件进行初始化
+ */
+NProgress.install = function (app: App) {};
 
+export { NProgress };
diff --git a/src/libs/nprogress/interface.d.ts b/src/libs/nprogress/interface.d.ts
new file mode 100644
index 0000000..763c313
--- /dev/null
+++ b/src/libs/nprogress/interface.d.ts
@@ -0,0 +1,8 @@
+import 'nprogress';
+import { App } from 'vue';
+
+declare module 'nprogress' {
+  interface NProgress {
+    install: (app: App) => void;
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index 947a094..8e98c69 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,12 +1,18 @@
 import { createApp } from 'vue';
-import App from './App.vue';
-import { router } from './router';
-import { store } from './store';
-import { style } from './styles';
+import App from '@/App.vue';
+import { router } from '@/router';
+import { store } from '@/store';
+import { style } from '@/styles';
+import { dayjs } from '@/libs/dayjs';
+import { NProgress } from '@/libs/nprogress';
+import { api } from '@/api';
 
 const run = async () => {
   const app = createApp(App);
+  app.use(dayjs);
+  app.use(NProgress);
   app.use(store);
+  app.use(api);
   app.use(style);
   app.use(router);
   await router.isReady();
diff --git a/src/pages/_layout/Menu.vue b/src/pages/_layout/Menu.vue
index a6407d5..71cbe55 100644
--- a/src/pages/_layout/Menu.vue
+++ b/src/pages/_layout/Menu.vue
@@ -42,14 +42,26 @@ export default defineComponent({
         }
         return (
           <>
-            <a-menu-item key={route.path} v-slots={{ icon }} onClick={() => goto(route)}>
-              <div class="flex items-center justify-between gap-2">
-                <div>{route.title}</div>
-                <div class="text-xs text-gray-400">
-                  {/* <a-badge count={8}>8</a-badge> */}
-                  {route.hide === 'prod' ? <a-tag color="red">{'开发'}</a-tag> : null}
+            <a-menu-item key={route.path} v-slots={{ icon }}>
+              {route.link ? (
+                <div class="flex items-center justify-between gap-2" onClick={() => goto(route)}>
+                  <div>{route.title}</div>
+                  <div class="text-xs text-gray-400">
+                    {/* <a-badge count={8}>8</a-badge> */}
+                    {route.hide === 'prod' ? <a-tag color="red">{'开发'}</a-tag> : null}
+                  </div>
                 </div>
-              </div>
+              ) : (
+                <router-link to={route.path}>
+                  <div class="flex items-center justify-between gap-2">
+                    <div>{route.title}</div>
+                    <div class="text-xs text-gray-400">
+                      {/* <a-badge count={8}>8</a-badge> */}
+                      {route.hide === 'prod' ? <a-tag color="red">{'开发'}</a-tag> : null}
+                    </div>
+                  </div>
+                </router-link>
+              )}
             </a-menu-item>
           </>
         );
diff --git a/src/pages/_layout/index.vue b/src/pages/_layout/index.vue
index 2030612..aba6c6b 100644
--- a/src/pages/_layout/index.vue
+++ b/src/pages/_layout/index.vue
@@ -1,8 +1,6 @@
 <template>
   <a-layout class="layout">
-    <a-layout-header
-      class="h-13 overflow-hidden flex justify-between items-center gap-4 px-2 pr-4 border-b border-slate-200 bg-white dark:bg-slate-800 dark:border-slate-700"
-    >
+    <a-layout-header class="h-13 overflow-hidden flex justify-between items-center gap-4 px-2 pr-4 border-b border-slate-200 bg-white dark:bg-slate-800 dark:border-slate-700">
       <div class="h-13 flex items-center">
         <!-- <a-button size="small" @click="isCollapsed = !isCollapsed">
           <template #icon>
@@ -19,18 +17,6 @@
         </router-link>
       </div>
       <div class="flex items-center gap-2">
-        <div>
-          <a-input-search placeholder="搜索菜单/页面" :allow-clear="true"></a-input-search>
-        </div>
-        <a-tooltip content="上传文件">
-          <a-button @click="() => null" class="!bg-transparent !hover:bg-gray-100">
-            <template #icon>
-              <a-badge :count="1" :dot="true">
-                <i class="text-base icon-park-outline-upload-one"></i>
-              </a-badge>
-            </template>
-          </a-button>
-        </a-tooltip>
         <a-tooltip v-for="btn in buttons" :key="btn.icon" :content="btn.tooltip">
           <a-button @click="btn.onClick" class="!bg-transparent !hover:bg-gray-100">
             <template #icon>
@@ -90,9 +76,9 @@ import { useAppStore } from '@/store/app';
 import { useMenuStore } from '@/store/menu';
 import { Message } from '@arco-design/web-vue';
 import { IconSync } from '@arco-design/web-vue/es/icon';
+import { useFullscreen } from '@vueuse/core';
 import Menu from './Menu.vue';
 import userDropdown from './UserDropdown.vue';
-import { useFullscreen } from '@vueuse/core';
 
 defineOptions({ name: 'LayoutPage' });
 
diff --git a/src/pages/setting/index.vue b/src/pages/setting/index.vue
index 334cda4..3e0fecd 100644
--- a/src/pages/setting/index.vue
+++ b/src/pages/setting/index.vue
@@ -2,10 +2,6 @@
   <AnPage></AnPage>
 </template>
 
-<script setup lang="tsx"></script>
-
-<style lang="less"></style>
-
 <route lang="json">
 {
   "redirect": "/setting/common",
diff --git a/src/router/guards/progress.ts b/src/router/guards/progress.ts
index 440b10e..37fc045 100644
--- a/src/router/guards/progress.ts
+++ b/src/router/guards/progress.ts
@@ -1,4 +1,4 @@
-import { NProgress } from '@/libs/nprogress';
+import NProgress from 'nprogress';
 import { useAppStore } from '@/store/app';
 import { Router } from 'vue-router';
 
diff --git a/src/styles/css-arco.less b/src/styles/css-arco.less
index bdbc00f..405dbd7 100644
--- a/src/styles/css-arco.less
+++ b/src/styles/css-arco.less
@@ -78,10 +78,10 @@ body {
         background-color: var(--color-neutral-2);
       }
       &.arco-menu-selected {
-        color: @arcoblue-6;
-        background-color: rgb(var(--primary-1));
-        // color: #fff;
-        // background-color: rgb(var(--primary-6));
+        // color: @arcoblue-6;
+        // background-color: rgb(var(--primary-1));
+        color: #fff;
+        background-color: rgb(var(--primary-6));
         .arco-menu-icon {
           color: inherit;
         }
diff --git a/src/types/vue.d.ts b/src/types/vue.d.ts
index bef4cd0..520abce 100644
--- a/src/types/vue.d.ts
+++ b/src/types/vue.d.ts
@@ -1,8 +1,9 @@
-import { Router, RouteLocationNormalizedLoaded } from "vue-router";
+import { Router, RouteLocationNormalizedLoaded } from 'vue-router';
 
-declare module "vue" {
+declare module 'vue' {
   interface ComponentCustomProperties {
     $router: Router;
     $route: RouteLocationNormalizedLoaded;
+    $dayjs: Dayjs;
   }
 }