merge type and bug fixed

Author: gmingchen

.env.development

@@ -2,7 +2,7 @@
 NODE_ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'https://gumingchen.cn/apis/loafer'
+VUE_APP_BASE_API = 'http://localhost:8887/loafer'
 
 VUE_APP_PORT = '9585'
 

src/types/el/index.ts

@@ -1,9 +1,20 @@
+/*
+ * @Description: 
+ * @Author: gumingchen
+ * @Email: [email protected]
+ * @Date: 2021-04-28 14:35:39
+ * @LastEditors: gumingchen
+ * @LastEditTime: 2021-04-29 13:50:55
+ */
 import { CascaderProps as ElCascaderProps, CascaderOption as ElCascaderOption } from 'node_modules/element-plus/lib/el-cascader-panel/src/types'
 
 export namespace El {
 
   export type CascaderProps = ElCascaderProps
   export type CascaderOption = ElCascaderOption
+  export interface CascaderCheckedNode<T> {
+    pathValues: T[]
+  }
 
   export interface TreeNode<T> {
     children: T[]

src/utils/index.ts

@@ -4,7 +4,7 @@
  * @Email: [email protected]
  * @Date: 2021-01-19 14:41:18
  * @LastEditors: gumingchen
- * @LastEditTime: 2021-04-21 17:42:11
+ * @LastEditTime: 2021-04-29 11:38:07
  */
 import store from '@/store'
 import { IObject } from '@/types'
@@ -174,7 +174,7 @@ export function $clearJson<T>(data: T): void {
   for (key in json) {
     if (json[key] instanceof Array) {
       json[key] = []
-    } else if (typeof json[key] === 'object' && IObject.prototype.toString.call(json[key]).toLowerCase() === '[object object]' && !json[key].length) {
+    } else if (typeof json[key] === 'object' && Object.prototype.toString.call(json[key]).toLowerCase() === '[object object]' && !json[key].length) {
       json[key] = {}
     } else {
       json[key] = ''

src/utils/request.ts

@@ -4,7 +4,7 @@
  * @Email: [email protected]
  * @Date: 2020-12-21 16:45:49
  * @LastEditors: gumingchen
- * @LastEditTime: 2021-04-17 13:20:12
+ * @LastEditTime: 2021-04-29 13:13:16
  */
 'use strict'
 import axios from 'axios'
@@ -39,8 +39,7 @@ const prompt = (message?: string): void => {
  */
 const codeHandle = (code?: number, message?: string): void => {
   switch (code) {
-    case 5001:
-    case 5005:
+    case 401:
       prompt(message)
       router.replace({
         name: 'login'

src/views/components/page/index.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Description:
+ * @Author: gumingchen
+ * @Email: [email protected]
+ * @Date: 2021-04-26 16:58:39
+ * @LastEditors: gumingchen
+ * @LastEditTime: 2021-04-29 11:39:19
+-->
 <template>
   <el-pagination
     class="page"
@@ -16,7 +24,7 @@
 <script lang="ts">
 import { Options, Vue } from 'vue-class-component'
 import { Prop } from 'vue-property-decorator'
-import { Mixins } from '@/types/mixins'
+import { IPage } from '@/mixins/page'
 
 @Options({
   emits: ['change']
@@ -26,7 +34,7 @@ export default class extends Vue {
     type: Object,
     require: true
   })
-  readonly page!: Mixins.Page
+  readonly page!: IPage
 
   currentChangeHandle(val: number): void {
     this.$emit('change', { current: val, size: this.page.size })

src/views/modules/base/menu/components/add-edit.vue

@@ -4,7 +4,7 @@
  * @Email: [email protected]
  * @Date: 2021-02-03 15:48:37
  * @LastEditors: gumingchen
- * @LastEditTime: 2021-04-21 22:42:39
+ * @LastEditTime: 2021-04-29 14:12:49
 -->
 <template>
   <el-dialog
@@ -157,6 +157,7 @@ export default class extends Vue {
 
   async init(id?: number): Promise<void> {
     this.visible = true
+    this.loading = true
     this.form.id = id
     const res = await select()
     if (res) {
@@ -169,12 +170,14 @@ export default class extends Vue {
       this.menus = $parseData2Tree(res.data, 'id', 'parent_id')
     }
     if (this.form.id) {
-      info(this.form.id).then(r => {
-        if (r) {
-          this.form = r.data
-        }
-      })
+      const r = await info(this.form.id)
+      if (r) {
+        this.form = r.data
+      }
     }
+    this.$nextTick(() => {
+      this.loading = false
+    })
   }
 
   /**

src/views/modules/base/role/components/add-edit.vue

@@ -4,7 +4,7 @@
  * @Email: [email protected]
  * @Date: 2021-02-03 15:48:37
  * @LastEditors: gumingchen
- * @LastEditTime: 2021-04-21 22:42:39
+ * @LastEditTime: 2021-04-29 14:08:04
 -->
 <template>
   <el-dialog
@@ -52,7 +52,7 @@ import { Inject } from 'vue-property-decorator'
 import { add, edit, info } from '@/api/base/role'
 import { selfSelect } from '@/api/base/menu'
 import { $parseData2Tree } from '@/utils/index'
-import { Set } from '@/store/modules/common'
+import { Set as ISet } from '@/store/modules/common'
 import { El } from '@/types/el'
 import { IObject } from '@/types'
 import { Menu } from '@/types/menu'
@@ -62,7 +62,7 @@ import { Role } from '@/types/role'
   emits: ['refresh']
 })
 export default class extends Vue {
-  @Inject('set') readonly set!: Set
+  @Inject('set') readonly set!: ISet
   protected visible: boolean = false
   protected loading: boolean = false
 
@@ -77,7 +77,7 @@ export default class extends Vue {
     const prop = {
       multiple: true,
       emitPath: false,
-      checkStrictly: true,
+      checkStrictly: false,
       value: 'id',
       label: `name_${ this.set.language }`,
       children: 'children'
@@ -96,6 +96,7 @@ export default class extends Vue {
 
   async init(id?: number): Promise<void> {
     this.visible = true
+    this.loading = true
     this.form.id = id
     const res = await selfSelect()
     if (res) {
@@ -109,12 +110,14 @@ export default class extends Vue {
       this.menus = $parseData2Tree(res.data, 'id', 'parent_id')
     }
     if (this.form.id) {
-      info(this.form.id).then(r => {
-        if (r) {
-          this.form = r.data
-        }
-      })
+      const r = await info(this.form.id)
+      if (r) {
+        this.form = r.data
+      }
     }
+    this.$nextTick(() => {
+      this.loading = false
+    })
   }
 
   /**
@@ -126,6 +129,17 @@ export default class extends Vue {
   submit(): void {
     this.$refs.formR.validate(async (valid: boolean) => {
       if (valid) {
+        // 处理菜单权限ID
+        const checkedNodes = this.$refs.cascaderR.getCheckedNodes(true) as El.CascaderCheckedNode<number>[]
+        let menuIds: number[] = []
+        checkedNodes.forEach(item => {
+          menuIds.push.apply(menuIds, item.pathValues)
+        })
+        menuIds = Array.from(new Set(menuIds)).filter(item => {
+          return item !== 0
+        })
+        this.form.menu_ids = menuIds
+
         const r = !this.form.id ? await add(this.form) : await edit(this.form)
         if (r) {
           this.visible = false

src/views/modules/base/role/index.vue

@@ -4,7 +4,7 @@
  * @Email: [email protected]
  * @Date: 2021-04-21 22:52:19
  * @LastEditors: gumingchen
- * @LastEditTime: 2021-04-21 23:19:02
+ * @LastEditTime: 2021-04-29 11:40:58
 -->
 <template>
   <div class="g-container">
@@ -76,13 +76,12 @@
 <script lang="ts">
 import { mixins, Options } from 'vue-class-component'
 import { Inject } from 'vue-property-decorator'
-import page from '@/mixins/page'
+import page, { IPage } from '@/mixins/page'
 import Page from '@V/components/page/index.vue'
 import AddEdit from './components/add-edit.vue'
 import { del, getPage } from '@/api/base/role'
 import { IObject } from '@/types'
 import { Role } from '@/types/role'
-import { Mixins } from '@/types/mixins'
 
 @Options({
   components: { Page, AddEdit }
@@ -191,7 +190,7 @@ export default class extends mixins(page) {
    * @return {*}
    * @author: gumingchen
    */
-  pageChangeHandle(data: Mixins.Page): void {
+  pageChangeHandle(data: IPage): void {
     this.page.current = data.current
     this.page.size = data.size
     this.getList()

src/views/modules/base/user/components/add-edit.vue

@@ -4,7 +4,7 @@
  * @Email: [email protected]
  * @Date: 2021-02-03 15:48:37
  * @LastEditors: gumingchen
- * @LastEditTime: 2021-04-21 22:42:39
+ * @LastEditTime: 2021-04-29 14:11:28
 -->
 <template>
   <el-dialog
@@ -128,25 +128,28 @@ export default class extends Vue {
 
   async init(id?: number): Promise<void> {
     this.visible = true
+    this.loading = true
     this.form.id = id
     const res = await select()
     if (res) {
       this.roles = res.data
     }
     if (this.form.id) {
-      info(this.form.id).then(r => {
-        if (r) {
-          this.form.username = r.data.username
-          this.form.nickname = r.data.username
-          this.form.mobile = r.data.mobile
-          this.form.email = r.data.email
-          this.form.status = r.data.status
-          this.form.role_ids = r.data.roles!.map(item => {
-            return item.id
-          })
-        }
-      })
+      const r = await info(this.form.id)
+      if (r) {
+        this.form.username = r.data.username
+        this.form.nickname = r.data.username
+        this.form.mobile = r.data.mobile
+        this.form.email = r.data.email
+        this.form.status = r.data.status
+        this.form.role_ids = r.data.roles!.map(item => {
+          return item.id
+        })
+      }
     }
+    this.$nextTick(() => {
+      this.loading = false
+    })
   }
 
   /**

src/views/modules/base/user/index.vue

@@ -4,7 +4,7 @@
  * @Email: [email protected]
  * @Date: 2021-04-21 22:52:19
  * @LastEditors: gumingchen
- * @LastEditTime: 2021-04-21 23:19:02
+ * @LastEditTime: 2021-04-29 11:41:32
 -->
 <template>
   <div class="g-container">
@@ -101,13 +101,12 @@
 <script lang="ts">
 import { mixins, Options } from 'vue-class-component'
 import { Inject } from 'vue-property-decorator'
-import page from '@/mixins/page'
+import page, { IPage } from '@/mixins/page'
 import Page from '@V/components/page/index.vue'
 import AddEdit from './components/add-edit.vue'
 import { del, getPage, setStatus } from '@/api/base/user'
 import { IObject } from '@/types'
 import { User } from '@/types/user'
-import { Mixins } from '@/types/mixins'
 
 @Options({
   components: { Page, AddEdit }
@@ -249,7 +248,7 @@ export default class extends mixins(page) {
    * @return {*}
    * @author: gumingchen
    */
-  pageChangeHandle(data: Mixins.Page): void {
+  pageChangeHandle(data: IPage): void {
     this.page.current = data.current
     this.page.size = data.size
     this.getList()