.env.build_prod

@@ -1,5 +1,5 @@
-# just a flag
-NODE_ENV = 'production'
-
-# 打包模式连生产服
+# just a flag
+NODE_ENV = 'production'
+
+# 打包模式连生产服
 VUE_APP_BASE_API = '/api-prod'

.env.build_test

@@ -1,6 +1,6 @@
-# just a flag
-NODE_ENV = 'production'
-
-# 打包模式连测试服
-#VUE_APP_BASE_API = './api-test'
+# just a flag
+NODE_ENV = 'production'
+
+# 打包模式连测试服
+#VUE_APP_BASE_API = './api-test'
 VUE_APP_BASE_API = '/'

.env.dev_prod

@@ -1,6 +1,6 @@
-# just a flag
-NODE_ENV = 'development'
-
-# 开发模式连生产服
-VUE_APP_BASE_API = '/api-prod'
+# just a flag
+NODE_ENV = 'development'
+
+# 开发模式连生产服
+VUE_APP_BASE_API = '/api-prod'
 VUE_APP_COOKIE = ''

.env.dev_test

@@ -1,7 +1,7 @@
-# just a flag
-NODE_ENV = 'development'
-
-# 开发模式连测试服
-# VUE_APP_BASE_API = './api-test'
-VUE_APP_BASE_API = '/'
+# just a flag
+NODE_ENV = 'development'
+
+# 开发模式连测试服
+# VUE_APP_BASE_API = './api-test'
+VUE_APP_BASE_API = '/'
 VUE_APP_COOKIE = ''

CODE_OF_CONDUCT.md

@@ -8,7 +8,7 @@
 有助于提高编码效率和质量的行为包括:
 
 - 1、遵守开发规范。
-- 2、使用eslint+Prettier自动修复代码
+- 2、使用eslint自动修复代码
 - 3、代码行文尽量整洁规整。业务逻辑简洁、清晰。
 - 4、核心业务上必须要有注释，头部需要有注释便与溯源。
 - 5、公共组件开发需要记录文档且注释丰富。
@@ -37,7 +37,3 @@
 - 4、细节是否完善、整体代码行文。
 - 5、业务逻辑和代码细节是否合理。
 
-## 相关文档
-
-- 前端通用开发规范 [http://172.18.7.186:8181/read/team/prefix_59454ed663cdb4bb8d542c1967a62056.md]
-

README.md

@@ -29,7 +29,7 @@
 
 ## 推荐的 IDE 工具和插件
 
-[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (禁用 Vetur) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin).
+[VSCode](https://code.visualstudio.com/) + [Vue - Official](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (需禁用旧插件 Vetur、Volar ) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin).
 
 ## Vite 构建工具配置
 
@@ -57,6 +57,12 @@
 
 ## 使用
 
+### 确定本地的node版本>=20。本地使用v20.18.0验证通过。
+
+```sh
+node -v
+```
+
 ### 安装依赖
 
 ```sh
@@ -85,15 +91,9 @@ npm run lint
 
 现代浏览器。
 
-| IE/Edge          | Firefox         | Chrome          | Safari          | 
-| ---------------- | --------------- | --------------- | --------------- | 
-| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions | 
-
-## TODO
-
-当前问题
-
-- 暂未配置git提交规范。
+| Chrome          | Edge            | Firefox         | Safari          | 
+| --------------- | --------------- | --------------- | --------------- | 
+| Chrome ≥ 85     | Edge ≥ 85       | Firefox ≥ 79    | Safari ≥ 14.1   | 
 
 ## 参与贡献
 

components.d.ts

@@ -13,13 +13,19 @@ declare module 'vue' {
     DropdownMenu: typeof import('./src/components/Share/DropdownMenu.vue')['default']
     Dropzone: typeof import('./src/components/Dropzone/index.vue')['default']
     EditorImage: typeof import('./src/components/Tinymce/components/EditorImage.vue')['default']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
@@ -31,19 +37,25 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRate: typeof import('element-plus/es')['ElRate']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElUpload: typeof import('element-plus/es')['ElUpload']
@@ -73,4 +85,7 @@ declare module 'vue' {
     UploadExcel: typeof import('./src/components/UploadExcel/index.vue')['default']
     VueCountTo: typeof import('./src/components/vue-count-to/vue-countTo.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>Vue3 Element Admin</title>
   </head>
   <body>
     <div id="app"></div>

src/App.vue

@@ -8,16 +8,20 @@
 import { defineComponent } from 'vue';
 import { ElConfigProvider } from 'element-plus';
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs';
+import { mapState } from 'pinia';
+import store from '@/store';
 
 export default defineComponent({
   components: {
     ElConfigProvider
   },
+  computed: {
+    ...mapState(store.app, ['size'])
+  },
   data() {
     return {
       locale: zhCn,
-      zIndex: 3000,
-      size: 'default'
+      zIndex: 3000
     };
   }
 });

src/components/Breadcrumb/index.vue

@@ -37,12 +37,12 @@ export default defineComponent({
   methods: {
     getBreadcrumb() {
       // only show routes with meta.title
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title);
-      const first = matched[0];
-
-      if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched);
-      }
+      const matched = this.$route.matched.filter(item => item.meta && item.meta.title);
+      // const first = matched[0];
+      //
+      // if (!this.isDashboard(first)) {
+      //   matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched);
+      // }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false);
     },

src/components/DragSelect/index.vue

@@ -14,6 +14,14 @@ export default defineComponent({
     modelValue: {
       type: Array,
       required: true
+    },
+    placeholder: {
+      type: String,
+      default: null
+    },
+    style: {
+      type: [String, Object],
+      default: null
     }
   },
   computed: {
@@ -31,7 +39,7 @@ export default defineComponent({
   },
   methods: {
     setSort() {
-      const el = this.$refs.dragSelect.$el.querySelectorAll('.el-select__tags > span')[0];
+      const el = this.$refs.dragSelect.$el.querySelector('.el-select__wrapper .el-select__selection');
       this.sortable = Sortable.create(el, {
         ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
         setData: function(dataTransfer) {
@@ -52,7 +60,7 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .drag-select {
-  :deep(.sortable-ghost) {
+  :deep(.sortable-ghost .el-tag) {
     opacity: .8;
     color: #fff !important;
     background: #42b983 !important;

src/components/Dropzone/index.vue

@@ -130,7 +130,7 @@ export default defineComponent({
       },
       accept: (file, done) => {
         /* 七牛*/
-        // const token = this.$store.getters.token;
+        // const token = store.user().token;
         // getToken(token).then(response => {
         //   file.token = response.data.qiniu_token;
         //   file.key = response.data.qiniu_key;

src/components/ErrorLog/index.vue

@@ -10,7 +10,7 @@
       <template v-slot:title>
         <div class="text-title">
           <span style="padding-right: 10px;">Error Log</span>
-          <el-button size="small" type="primary" icon="el-icon-delete" @click="clearAll">Clear All</el-button>
+          <el-button size="small" type="primary" :icon="IconDelete" @click="clearAll">Clear All</el-button>
         </div>
       </template>
       <el-table :data="errorLogs" border>
@@ -49,13 +49,15 @@
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent, markRaw } from 'vue';
 import store from '@/store';
+import { Delete as IconDelete } from '@element-plus/icons-vue';
 
 export default defineComponent({
   name: 'ErrorLog',
   data() {
     return {
+      IconDelete: markRaw(IconDelete),
       dialogTableVisible: false
     };
   },

src/components/SizeSelect/index.vue

@@ -22,9 +22,9 @@ export default defineComponent({
   data() {
     return {
       sizeOptions: [
-        { label: 'Default', value: 'default' },
-        { label: 'Large', value: 'large' },
-        { label: 'small', value: 'default' }
+        { label: '默认', value: 'default' },
+        { label: '大号', value: 'large' },
+        { label: '小号', value: 'small' }
       ]
     };
   },
@@ -35,7 +35,6 @@ export default defineComponent({
   },
   methods: {
     handleSetSize(size) {
-      this.$ELEMENT.size = size;
       store.app().setSize(size);
       this.refreshView();
       ElMessage({

src/components/Tinymce/components/EditorImage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="upload-container">
-    <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="small" type="primary" @click=" dialogVisible=true">
+    <el-button :style="{background:color,borderColor:color}" :icon="IconUpload" size="small" type="primary" @click=" dialogVisible=true">
       upload
     </el-button>
     <el-dialog v-model="dialogVisible">
@@ -30,7 +30,8 @@
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent, markRaw } from 'vue';
+import { Upload as IconUpload } from '@element-plus/icons-vue';
 // import { getToken } from 'api/qiniu'
 
 export default defineComponent({
@@ -43,6 +44,7 @@ export default defineComponent({
   },
   data() {
     return {
+      IconUpload: markRaw(IconUpload),
       dialogVisible: false,
       listObj: {},
       fileList: []

src/components/Tinymce/index.vue

@@ -174,7 +174,7 @@ export default defineComponent({
         // },
         // images_upload_handler(blobInfo, success, failure, progress) {
         //   progress(0);
-        //   const token = that.$store.getters.token;
+        //   const token = store.user().token;
         //   getToken(token).then(response => {
         //     const url = response.data.qiniu_url;
         //     const formData = new FormData();

src/layout/components/Navbar.vue

@@ -13,9 +13,9 @@
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <!-- <el-tooltip content="Global Size" effect="dark" placement="bottom">
+        <el-tooltip content="全局组件尺寸" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>
 
       </template>
 
@@ -29,19 +29,19 @@
         <template #dropdown>
           <el-dropdown-menu>
             <router-link to="/profile/index">
-              <el-dropdown-item>Profile</el-dropdown-item>
+              <el-dropdown-item>个人中心</el-dropdown-item>
             </router-link>
             <router-link to="/">
-              <el-dropdown-item>Dashboard</el-dropdown-item>
+              <el-dropdown-item>首页</el-dropdown-item>
             </router-link>
             <a target="_blank" href="https://github.com/midfar/vue3-element-admin">
-              <el-dropdown-item>Github</el-dropdown-item>
+              <el-dropdown-item>项目地址</el-dropdown-item>
             </a>
             <a target="_blank" href="https://vue3-element-admin-site.midfar.com/">
-              <el-dropdown-item>Docs</el-dropdown-item>
+              <el-dropdown-item>文档地址</el-dropdown-item>
             </a>
             <el-dropdown-item divided @click="logout">
-              <span style="display:block;">Log Out</span>
+              <span style="display:block;">退出登录</span>
             </el-dropdown-item>
           </el-dropdown-menu>
         </template>
@@ -57,7 +57,7 @@ import Breadcrumb from '@/components/Breadcrumb';
 import Hamburger from '@/components/Hamburger';
 import ErrorLog from '@/components/ErrorLog';
 import Screenfull from '@/components/Screenfull';
-// import SizeSelect from '@/components/SizeSelect';
+import SizeSelect from '@/components/SizeSelect';
 import Search from '@/components/HeaderSearch';
 import { defineComponent } from 'vue';
 import { CaretBottom } from '@element-plus/icons-vue';
@@ -68,7 +68,7 @@ export default defineComponent({
     Hamburger,
     ErrorLog,
     Screenfull,
-    // SizeSelect,
+    SizeSelect,
     Search,
     CaretBottom
   },