zant-admin 1.0.4 → 2.0.1

package/src/components/FormTable.vue

@@ -316,21 +316,6 @@ import { menuStore } from '@/stores/menu'
 import { post, get, downloadFilePost } from '@/api/request'
 import { Modal, message } from 'ant-design-vue'
 import { saveAs } from 'file-saver'
-import {
-  PlusOutlined,
-  DeleteOutlined,
-  ExportOutlined,
-  ImportOutlined,
-  UploadOutlined,
-  DownloadOutlined,
-  RedoOutlined,
-  ColumnHeightOutlined,
-  AlignCenterOutlined,
-  UpOutlined,
-  DownOutlined,
-  InboxOutlined,
-  FileExcelOutlined,
-} from '@ant-design/icons-vue'
 
 const config = configStore()
 const menu = menuStore()
@@ -365,7 +350,7 @@ const hasDeletePermission = computed(() => {
 const props = defineProps({
   formStateShow: {
     //筛选条件控制显示隐藏数量
-    type: Int32Array,
+    type: Number,
     default: 7,
   },
   formState: Object, //表格上面搜索条件
@@ -378,7 +363,7 @@ const props = defineProps({
   },
   where: {
     //查询条件
-    type: Array,
+    type: [Array, Object],
     default: [],
   },
   ftableAdd: {
@@ -586,7 +571,7 @@ const dropdownonTableSizeClick = ({ key }) => {
   config.tableSize = key
   formConfig.tableSize = key
 }
-const emit = defineEmits(['edit', 'details'])
+const emit = defineEmits(['edit', 'details', 'delete'])
 //编辑
 const edit = record => {
   // 触发自定义事件，父组件会监听这个事件
@@ -613,6 +598,7 @@ const batchDelete = () => {
             onClose: () => {
               state.selectedRowKeys = []
               tableLoad()
+              emit('delete')
             },
           })
         })
@@ -635,6 +621,7 @@ const tabelDelete = record => {
       duration: 1,
       onClose: () => {
         tableLoad()
+        emit('delete')
       },
     })
   })
@@ -656,7 +643,6 @@ const dataExport = () => {
             resolve() // 请求成功后再关闭对话框
           })
           .catch(error => {
-            console.log('Oops errors!')
             reject(error) // 请求失败时保持对话框打开
           })
       })