Merge branch 'feature/shuiluo' into 'master'

Feature/shuiluo

See merge request product/kim3-web-vue/starter-web-vue!21

src/components/index.js

@@ -2,5 +2,6 @@ import Table from './table/index.vue';
 import WhiteCard from './white_card/index.vue';
 import Upload from './upload/index.vue';
 import MyFormItem from './table/my_item.vue';
+import ActionButoon from './action_button/index.vue';
 
-export { Table, WhiteCard, Upload, MyFormItem };
+export { Table, WhiteCard, Upload, MyFormItem, ActionButoon };

src/components/table/tableDrawer.vue

+<template>
+    <div>
+        <Drawer />
+        
+        <Table>
+            <template #search="query">
+                <slot name="search" :query="query" />
+            </template>
+
+            <slot name="table" />
+        </Table>
+    </div>
+</template>
+
+<script>
+import Table from './table.vue';
+import Drawer from './drawer.vue';
+
+export default {
+    components: { Table, Drawer },
+};
+</script>

src/pages/system/view/menu/MenuManagement.vue

@@ -8,7 +8,8 @@
         ref="table"
     >
         <template #drawer>
-            <Form ref="addForm" />
+            <AddCom v-if="addCom" />
+            <Form ref="addForm" v-else />
         </template>
 
         <a-table-column title="名称" data-index="menuName" />
@@ -18,9 +19,7 @@
         <a-table-column title="模块URL" data-index="menuUrl" />
         <a-table-column title="操作">
             <template #default="row">
-                <a @click="() => edit(row)">编辑</a>
-                <a-divider type="vertical" />
-                <PopconfirmDelete :url="`/api/v1/menus/${row.menuId}`" :cb="refreshTable" />
+                <my-ac-btn :row="row" :buttons="buttons" />
             </template>
         </a-table-column>
     </my-table>
@@ -28,21 +27,37 @@
 
 <script>
 import { convertListToTree } from '@/utils';
-import PopconfirmDelete from '@/components/popconfirm_delete/index.vue';
 import Form from './form.vue';
+import AddCom from './add_com.vue';
 
 export default {
     data: vm => ({
+        addCom: false,
         addBtn: {
             text: '新建',
             onOk() {
                 return vm.$refs['addForm']?.submit();
             },
+            onCancel() {
+                vm.addCom = false;
+            },
         },
         sortOrder: 'ascend',
+        buttons: [
+            {
+                label: '新增组件',
+                click() {
+                    vm.show();
+                    vm.addCom = true;
+                },
+                isHidden: row => row.menuType === 'MENU',
+            },
+            { label: '编辑', click: vm.edit },
+            { type: 'confirm', url: row => `/api/v1/menus/${row.menuId}`, after: vm.refreshTable },
+        ],
     }),
 
-    components: { PopconfirmDelete, Form },
+    components: { Form, AddCom },
 
     methods: {
         formatData: convertListToTree,
@@ -58,6 +73,9 @@ export default {
                 this.$refs['addForm'].setEdit({ ...data });
             });
         },
+        show() {
+            this.$refs['table'].show();
+        },
     },
 };
 </script>

src/pages/system/view/menu/add_com.vue

+<template>
+    <h1>addCom</h1>
+</template>

src/plugins/index.js

 import VueI18nPlugin from './vueI18nPlugin';
 import AuthorityPlugin from './authorityPlugin';
 import TabsPagePlugin from './tabsPagePlugin';
-import { Table, WhiteCard, Upload, MyFormItem } from '@/components';
+import { Table, WhiteCard, Upload, MyFormItem, ActionButoon } from '@/components';
 
 const Plugins = {
     install: function(Vue) {
@@ -12,6 +12,7 @@ const Plugins = {
         Vue.component('my-card', WhiteCard);
         Vue.component('my-upload', Upload);
         Vue.component('my-form-item', MyFormItem);
+        Vue.component('my-ac-btn', ActionButoon);
     },
 };
 export default Plugins;