Merge branch 'master' into feature/shuiluo

src/components/FormMixin/index.js

@@ -27,7 +27,7 @@ export default {
             }
         },
         setData(data, type) {
-            this.form = data;
+            this.form = { ...data };
             this.type = type;
         },
     },

src/pages/system/view/role/RoleManagement.vue

@@ -3,9 +3,9 @@
         <template #drawer>
             <Form ref="form" />
         </template>
-
-        <a-table-column title="名称" data-index="roleName" />
-        <a-table-column title="说明" data-index="remark" />
+        <a-table-column title="角色名称" data-index="roleName" />
+        <a-table-column title="角色编码" data-index="roleCode" />
+        <a-table-column title="角色说明" data-index="remark" />
         <a-table-column title="操作">
             <template #default="row">
                 <a @click="() => view(row, 2)">查看</a>
@@ -36,7 +36,7 @@ export default {
         view(data, type) {
             this.$refs['table']?.show({ type });
             this.$nextTick(() => {
-                this.$refs['form'].setData(data, type);
+                this.$refs['form'].setData({ ...data }, type);
             });
         },
     },

src/pages/system/view/role/form.vue

 <template>
-    <a-form-model layout="vertical" :model="form" :rules="rules">
+    <a-form-model layout="vertical" :model="form" :rules="rules" ref="DrawerForm">
         <a-form-model-item label="角色名称">
             <a-input v-model="form.roleName" :disabled="isView" />
         </a-form-model-item>
@@ -25,30 +25,23 @@
 <script>
 import MenuTree from '@/components/menu_tree/index.vue';
 import { addRoleApi, getRoleApi, updateRoleApi } from '@/api';
+import FormMixin from '@/components/FormMixin';
 
 export default {
+    mixins: [FormMixin],
     components: { MenuTree },
     data() {
         return {
-            type: 0,
             form: {},
             rules: {},
             checkedKeys: [],
             defaultCheckedKeys: [],
         };
     },
-    computed: {
-        isEdit() {
-            return this.type === 1;
-        },
-        isView() {
-            return this.type === 2;
-        },
-    },
+    computed: {},
     methods: {
         submit() {
             const query = { ...this.form, authorityList: this.$refs['menuTree'].get() };
-            console.log(query);
             return this.isEdit ? updateRoleApi(query) : addRoleApi(query);
         },
         setData(data, type) {