Browse Source

fix: 租户批量删除修复;文件上传修复

Tong 2 years ago
parent
commit
541d60f3ea

+ 1 - 1
src/api/sys/model/uploadModel.ts

@@ -1,6 +1,6 @@
 export interface UploadApiResult {
   message: string;
-  code: number;
+  code: string;
   url: string;
   data: {
     absolutePath: string;

+ 12 - 4
src/components/Upload/src/UploadModal.vue

@@ -124,7 +124,7 @@
         const { maxSize } = props;
         // 设置最大值,则判断
         if (maxSize && file.size / 1024 / 1024 >= maxSize) {
-          createMessage.error(locales.upload.maxSizeMultiple, maxSize);
+          createMessage.error('只能上传不超过' + maxSize + 'MB的文件!');
           return false;
         }
 
@@ -212,7 +212,7 @@
       async function handleStartUpload() {
         const { maxNumber } = props;
         if ((fileListRef.value.length + props.previewFileList?.length ?? 0) > maxNumber) {
-          return createMessage.warning(locales.upload.maxNumber, maxNumber);
+          return createMessage.warning('最多只能上传' + maxNumber + '个文件');
         }
         try {
           isUploadingRef.value = true;
@@ -222,6 +222,8 @@
           const data = await Promise.all(
             uploadFileList.map(item => {
               const result = uploadApiByItem(item);
+              console.log(result);
+              debugger;
               return result;
             }),
           );
@@ -240,7 +242,7 @@
         const { maxNumber } = props;
 
         if (fileListRef.value.length > maxNumber) {
-          return createMessage.warning(locales.upload.maxNumber, maxNumber);
+          return createMessage.warning('最多只能上传' + maxNumber + '个文件');
         }
         if (isUploadingRef.value) {
           return createMessage.warning(locales.upload.saveWarn);
@@ -250,7 +252,13 @@
         for (const item of fileListRef.value) {
           const { status, responseData } = item;
           if (status === UploadResultStatus.SUCCESS && responseData) {
-            fileList.push(responseData.data.absolutePath);
+            console.log(responseData);
+            debugger;
+            if (responseData.code == 'B0001') {
+              createMessage.error('上传失败,请联系管理员查看配置是否正确');
+            } else {
+              fileList.push(responseData.data.absolutePath);
+            }
           }
         }
         // 存在一个上传成功的即可保存

+ 12 - 12
src/views/infra/storage/oss/index.vue

@@ -17,11 +17,11 @@
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
-              {
-                tooltip: '文件上传',
-                label: '文件上传',
-                onClick: handleUpdateModel.bind(null, record),
-              },
+              // {
+              //   tooltip: '文件上传',
+              //   label: '文件上传',
+              //   onClick: handleUpdateModel.bind(null, record),
+              // },
               {
                 auth: 'storage:config:query',
                 icon: 'icon-eye|iconfont',
@@ -87,7 +87,7 @@
     </BasicTable>
     <FormDrawer @register="registerDrawer" @success="handleSuccess" />
     <ViewDrawer @register="registerDrawerView" @success="handleSuccess" />
-    <UploadModal @register="registerUpload" />
+    <!-- <UploadModal @register="registerUpload" /> -->
   </div>
 </template>
 <script lang="ts" setup>
@@ -96,7 +96,7 @@
   import { Button } from '/@/components/Button';
 
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import UploadModal from './uploadModel.vue';
+  // import UploadModal from './uploadModel.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import FormDrawer from './formDrawer.vue';
   import ViewDrawer from './viewDrawer.vue';
@@ -109,7 +109,7 @@
   } from '/@/api/infra/infraStorageConfigApi';
   import { useDrawer } from '/@/components/Drawer';
   import { commonDict } from '/@/utils';
-  import { useModal } from '/@/components/Modal';
+  // import { useModal } from '/@/components/Modal';
 
   onBeforeMount(async () => {});
 
@@ -117,7 +117,7 @@
   // const [registerModal, { openModal }] = useModal();
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerDrawerView, { openDrawer: openDrawerView }] = useDrawer();
-  const [registerUpload, { openModal: openUpload }] = useModal();
+  // const [registerUpload, { openModal: openUpload }] = useModal();
   const tableSort = ref([
     {
       field: 'master',
@@ -216,9 +216,9 @@
   }
 
   // 打开上传测试弹窗
-  function handleUpdateModel(record: Recordable) {
-    openUpload(true, { record });
-  }
+  // function handleUpdateModel(record: Recordable) {
+  //   openUpload(true, { record });
+  // }
   // 表格点击字段排序
   function handleSortFn(sortInfo) {
     if (sortInfo?.order && sortInfo?.columnKey) {

+ 17 - 11
src/views/sys/sysTenant/page/index.vue

@@ -112,7 +112,7 @@
     },
   ]) as any;
 
-  const [registerTable, { reload, getSelectRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
     title: '',
     api: sysTenantQueryPage,
     rowKey: 'id',
@@ -171,16 +171,22 @@
       createMessage.success('删除成功!');
       await reload();
     } else {
-      createConfirm({
-        content: '你确定要删除?',
-        iconType: 'warning',
-        onOk: async () => {
-          const keys = getSelectRowKeys();
-          await sysTenantRemove(keys);
-          createMessage.success('删除成功!');
-          await reload();
-        },
-      });
+      const keys = getSelectRowKeys();
+      if (keys.length > 0) {
+        createConfirm({
+          content: '你确定要删除?',
+          iconType: 'warning',
+          onOk: async () => {
+            const keys = getSelectRowKeys();
+            await sysTenantRemove(keys);
+            createMessage.success('删除成功!');
+            await reload();
+            clearSelectedRowKeys();
+          },
+        });
+      } else {
+        createMessage.warning('请选择要删除的数据');
+      }
     }
   }
   // 表格点击字段排序