WanGxC 11 сар өмнө
parent
commit
9fc9a10c78

+ 5 - 0
components.d.ts

@@ -23,12 +23,15 @@ declare module 'vue' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -50,6 +53,8 @@ declare module 'vue' {
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']

+ 1 - 0
package-lock.json

@@ -23,6 +23,7 @@
 				"axios": "^1.2.1",
 				"countup.js": "^2.3.2",
 				"cropperjs": "^1.5.13",
+				"dayjs": "^1.11.13",
 				"e-icon-picker": "2.1.1",
 				"echarts": "^5.4.1",
 				"echarts-gl": "^2.0.9",

+ 1 - 0
package.json

@@ -24,6 +24,7 @@
 		"axios": "^1.2.1",
 		"countup.js": "^2.3.2",
 		"cropperjs": "^1.5.13",
+		"dayjs": "^1.11.13",
 		"e-icon-picker": "2.1.1",
 		"echarts": "^5.4.1",
 		"echarts-gl": "^2.0.9",

+ 1 - 0
src/auto-imports.d.ts

@@ -12,6 +12,7 @@ declare global {
   const createApp: typeof import('vue')['createApp']
   const createPinia: typeof import('pinia')['createPinia']
   const customRef: typeof import('vue')['customRef']
+  const dayjs: typeof import('dayjs')['default']
   const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
   const defineComponent: typeof import('vue')['defineComponent']
   const defineStore: typeof import('pinia')['defineStore']

+ 2 - 1
src/layout/footer/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<div class="layout-footer pb5 pt2">
 		<div class="layout-footer-warp">
-			<div>❤️ Powered by Django-Vue3-Admin Copyright © DVAdmin团队 ❤️</div>
+			<!--<div>❤️ Powered by Django-Vue3-Admin Copyright © DVAdmin团队 ❤️</div>-->
+			<div>Designed by Ansjer front end</div>
 		</div>
 	</div>
 </template>

+ 1 - 1
src/layout/routerView/parent.vue

@@ -59,7 +59,7 @@ const setTransitionName = computed(() => {
 });
 // 获取组件缓存列表(name值)
 const getKeepAliveNames = computed(() => {
-  console.log(cachedViews.value)
+  // console.log(cachedViews.value)
 	return themeConfig.value.isTagsview ? cachedViews.value : state.keepAliveNameList;
 });
 // 设置 iframe 显示/隐藏

+ 10 - 2
src/main.ts

@@ -7,7 +7,7 @@ import other from '/@/utils/other';
 import '/@/assets/style/tailwind.css'; // 先引入tailwind css, 以免element-plus冲突
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
-import 'element-plus/es/components/menu/style/css'	// element-plus按需导入会导致菜单样式出现问题 单独导入
+// import 'element-plus/es/components/menu/style/css'	// element-plus按需导入会导致菜单样式出现问题 单独导入
 import '/@/theme/index.scss';
 import mitt from 'mitt';
 import VueGridLayout from 'vue-grid-layout';
@@ -15,6 +15,11 @@ import piniaPersist from 'pinia-plugin-persist';
 // @ts-ignore
 import fastCrud from './settings.ts';
 import pinia from './stores';
+import dayjs from 'dayjs'
+import UTC from 'dayjs/plugin/utc'
+import Timezon from 'dayjs/plugin/timezone'
+import IsSameOrBefore from 'dayjs/plugin/isSameOrBefore'
+import 'dayjs/locale/zh-cn'
 import {RegisterPermission} from '/@/plugin/permission/index';
 // @ts-ignore
 import eIconPicker, { iconList, analyzingIconForIconfont } from 'e-icon-picker';
@@ -52,7 +57,10 @@ app.use(eIconPicker, {
 pinia.use(piniaPersist);
 directive(app);
 other.elSvg(app);
-
+dayjs.extend(UTC)
+dayjs.extend(Timezon)
+dayjs.extend(IsSameOrBefore)
+dayjs.locale('zh-cn')
 
 app.use(VXETable)
 app.use(pinia)

+ 0 - 20
src/views/demo/index.vue

@@ -1,20 +0,0 @@
-<script setup lang="ts">/**
- * @Name: index.vue
- * @Description: demo
- * @Author: Cheney
- */
-
-
-const btnRef = useTemplateRef('btnRef');
-onMounted(() => {
-  console.log('btnRef=> ', btnRef);
-});
-</script>
-
-<template>
-<el-button ref="btnRef">按钮</el-button>
-</template>
-
-<style scoped>
-
-</style>

+ 1 - 3
src/views/system/menu/index.vue

@@ -48,9 +48,7 @@ import XEUtils from 'xe-utils';
 import { ElMessageBox } from 'element-plus';
 import MenuTreeCom from './components/MenuTreeCom/index.vue';
 import MenuButtonCom from './components/MenuButtonCom/index.vue';
-// import MenuFormCom from './components/MenuFormCom/index.vue';
-const MenuFormCom = () => import('./components/MenuFormCom/index.vue');
-import MenuFieldCom from './components/MenuFieldCom/index.vue';
+import MenuFormCom from './components/MenuFormCom/index.vue';
 import { GetList, DelObj } from './api';
 import { successNotification } from '/@/utils/message';
 import { APIResponseData, MenuTreeItemType } from './types';

+ 20 - 0
src/views/test/index.vue

@@ -0,0 +1,20 @@
+<script setup lang="ts">
+/**
+ * @Name: index.vue
+ * @Description: 测试文件
+ * @Author: Cheney
+ */
+
+const myDay = dayjs().format("YYYY-MM-DD");
+console.log("(index.vue: 13)=> myDay", myDay);
+</script>
+
+<template>
+  <div class="w-1/5">
+    <el-button ref="btnRef">按钮</el-button>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

+ 8 - 2
vite.config.ts

@@ -35,13 +35,19 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
         imports: [
           'vue',
           'vue-router',
-          'pinia'
+          'pinia',
+          {
+            'dayjs': [
+              // 默认导入
+              ['default', 'dayjs']
+            ]
+          },
         ],
         resolvers: [ElementPlusResolver()],
         dts: 'src/auto-imports.d.ts', // 生成 TypeScript 声明文件
       }),
       Components({
-        resolvers: [ElementPlusResolver()],
+        // resolvers: [ElementPlusResolver()],
       }),
     ],
     root: process.cwd(),