TS类型修改

src/model/baselist.ts

@@ -6,16 +6,16 @@ export default abstract class BaseList<T extends Page> extends Vue {
   /**
    * 表格数据加载中
    */
-  protected loading: boolean = false
+  loading: boolean = false
   /**
    * 表单提交中
    */
-  protected modalLoading: boolean = true
+  modalLoading: boolean = false
   /**
    * 数据总数
    */
-  protected total: number = 0
-  protected abstract search: T
+  total: number = 0
+  abstract search: T
   /**
    * 加载数据的实现
    */

src/views/system/SystemRole.vue

@@ -110,7 +110,7 @@ export default class SystemRole extends BaseList<SystemRolePage> {
     ],
   }
   systemRoleData: SystemRoleModel[] = []
-  protected search = new SystemRolePage()
+  search = new SystemRolePage()
   addModal: boolean  = false
   modalTitle: string | null = null
   uri: {
@@ -153,7 +153,7 @@ export default class SystemRole extends BaseList<SystemRolePage> {
     this.modalTitle = '新增角色'
     this.addModal = true
   }
-  addUri(fieldName: 'include_uri' | 'exclude_uri', uri: string) {
+  addUri(fieldName: 'include_uri' | 'exclude_uri', uri: string | null) {
     if(!uri) return
     if(this.formData[fieldName].indexOf(uri) === -1) {
       this.formData[fieldName].push(uri)
@@ -190,11 +190,10 @@ export default class SystemRole extends BaseList<SystemRolePage> {
   }
   async save() {
     this.roleForm.validate(async (valid: boolean) => {
-      if(!valid) {
-        this.modalLoading = false
-        return
-      }
+      if(!valid) return
+      this.modalLoading = true
       const { data } = await this.$http.post<SystemRoleModel, AxiosResponse<any>>('/api/system/role/save', this.formData)
+      this.modalLoading = false
       this.addModal = false
       ElMessage.success(data.message)
       this.loadData()