Merge branch 'master' of http://192.168.100.32:3000/fanfan/xt-front

src/components/Upload/src/UploadModal.vue

@@ -222,7 +222,6 @@
           const data = await Promise.all(
             uploadFileList.map(item => {
               const result = uploadApiByItem(item);
-              console.log('result::::::::::::', result);
               return result;
             }),
           );

src/views/infra/storage/list/data.ts

@@ -28,7 +28,7 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
   {
     label: '文件名称',
-    field: 'name',
+    field: 'realName',
     component: 'Input',
     componentProps: {
       placeholder: '请输入文件名称',

src/views/infra/storage/list/index.vue

@@ -104,7 +104,7 @@
     },
   ]) as any;
 
-  const [registerTable, { reload, getSelectRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
     title: ' ',
     api: storageRecordQueryPage,
     rowKey: 'id',
@@ -163,16 +163,21 @@
       createMessage.success('删除成功！');
       await reload();
     } else {
-      createConfirm({
-        content: '你确定要删除?',
-        iconType: 'warning',
-        onOk: async () => {
-          const keys = getSelectRowKeys();
-          await storageRecordRemove(keys);
-          createMessage.success('删除成功！');
-          await reload();
-        },
-      });
+      const keys = getSelectRowKeys();
+      if (keys.length > 0) {
+        createConfirm({
+          content: '是否确定要删除此附件？',
+          iconType: 'warning',
+          onOk: async () => {
+            await storageRecordRemove(keys);
+            createMessage.success('删除成功！');
+            await reload();
+            clearSelectedRowKeys();
+          },
+        });
+      } else {
+        createMessage.warning('请选择要删除的数据');
+      }
     }
   }
 

src/views/infra/storage/oss/data.ts

@@ -44,7 +44,7 @@ export const searchFormSchema: FormSchema[] = [
         },
         {
           label: '本地存储',
-          value: '1ocal',
+          value: 'local',
         },
         {
           label: 'minio存储',

src/views/infra/storage/oss/index.vue

@@ -7,6 +7,13 @@
             {{ commonDict(record.master, 0) }}
           </Tag>
         </template>
+        <template v-if="column.key === 'type'">
+          <span v-if="record.type == 'ali'">阿里云</span>
+          <span v-else-if="record.type == 'db'">数据库</span>
+          <span v-else-if="record.type == 'local'">本地存储</span>
+          <span v-else-if="record.type == 'minio'">minio存储</span>
+        </template>
+
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
@@ -49,7 +56,7 @@
                 label: '删除',
                 color: 'error',
                 popConfirm: {
-                  title: '是否确认删除',
+                  title: '是否确定要删除此配置？',
                   placement: 'left',
                   confirm: handleDelete.bind(null, record),
                 },
@@ -122,7 +129,7 @@
     },
   ]) as any;
 
-  const [registerTable, { reload, getSelectRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
     title: '文件存储配置 ',
     api: infraStorageconfigQueryPage,
     rowKey: 'id',
@@ -181,16 +188,22 @@
       createMessage.success('删除成功！');
       await reload();
     } else {
-      createConfirm({
-        content: '你确定要删除?',
-        iconType: 'warning',
-        onOk: async () => {
-          const keys = getSelectRowKeys();
-          await infraStorageconfigRemove(keys);
-          createMessage.success('删除成功！');
-          await reload();
-        },
-      });
+      const keys = getSelectRowKeys();
+      if (keys.length > 0) {
+        createConfirm({
+          content: '你确定要删除?',
+          iconType: 'warning',
+          onOk: async () => {
+            const keys = getSelectRowKeys();
+            await infraStorageconfigRemove(keys);
+            createMessage.success('删除成功！');
+            await reload();
+            clearSelectedRowKeys();
+          },
+        });
+      } else {
+        createMessage.warning('请选择要删除的数据');
+      }
     }
   }
   // 设置主配置

src/views/infra/storage/oss/uploadModel.vue

@@ -1,7 +1,7 @@
 <template>
   <BasicUpload
     @register="registerModal"
-    :maxSize="20"
+    :maxSize="10"
     :maxNumber="5"
     @change="handleChange"
     :api="uploadApi"

src/views/monitor/loginLog/index.vue

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

src/views/sys/sysPortal/index.vue

@@ -112,7 +112,7 @@
     },
   ]) as any;
 
-  const [registerTable, { reload, getSelectRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
     title: ' ',
     api: sysPortalQueryPage,
     rowKey: 'id',
@@ -171,19 +171,24 @@
       createMessage.success('删除成功！');
       await reload();
     } else {
-      createConfirm({
-        content: '你确定要删除?',
-        iconType: 'warning',
-        onOk: async () => {
-          const keys = getSelectRowKeys();
-          await sysPortalRemove(keys);
-          createMessage.success('删除成功！');
-          await reload();
-        },
-      });
+      const keys = getSelectRowKeys();
+      if (keys.length > 0) {
+        createConfirm({
+          content: '你确定要删除?',
+          iconType: 'warning',
+          onOk: async () => {
+            const keys = getSelectRowKeys();
+            await sysPortalRemove(keys);
+            createMessage.success('删除成功！');
+            await reload();
+            clearSelectedRowKeys();
+          },
+        });
+      } else {
+        createMessage.warning('请选择要删除的数据');
+      }
     }
   }
-
   // 分配菜单按钮事件
   function handlePortalMenu(record: Recordable) {
     console.log(record);

src/views/sys/sysTenant/package/index.vue

@@ -128,7 +128,7 @@
     },
   ]) as any;
 
-  const [registerTable, { reload, getSelectRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
     title: ' ',
     api: sysTenantPackageQueryPage,
     rowKey: 'id',
@@ -187,16 +187,21 @@
       createMessage.success('删除成功！');
       await reload();
     } else {
-      createConfirm({
-        content: '你确定要删除?',
-        iconType: 'warning',
-        onOk: async () => {
-          const keys = getSelectRowKeys();
-          await sysTenantPackageRemove(keys);
-          createMessage.success('删除成功！');
-          await reload();
-        },
-      });
+      const keys = getSelectRowKeys();
+      if (keys.length > 0) {
+        createConfirm({
+          content: '你确定要删除?',
+          iconType: 'warning',
+          onOk: async () => {
+            await sysTenantPackageRemove(keys);
+            createMessage.success('删除成功！');
+            await reload();
+            clearSelectedRowKeys();
+          },
+        });
+      } else {
+        createMessage.warning('请选择要删除的数据');
+      }
     }
   }
   // 分配菜单按钮事件