Merge remote-tracking branch 'origin/develop' into develop

backend/dvadmin/system/models.py

@@ -408,6 +408,18 @@ class FileList(CoreModel):
     mime_type = models.CharField(max_length=100, blank=True, verbose_name="Mime类型", help_text="Mime类型")
     size = models.CharField(max_length=36, blank=True, verbose_name="文件大小", help_text="文件大小")
     md5sum = models.CharField(max_length=36, blank=True, verbose_name="文件md5", help_text="文件md5")
+    UPLOAD_METHOD_CHOIDES = (
+        (0, '默认上传'),
+        (1, '文件选择器上传'),
+    )
+    upload_method = models.SmallIntegerField(default=0, blank=True, null=True, choices=UPLOAD_METHOD_CHOIDES, verbose_name='上传方式', help_text='上传方式')
+    FILE_TYPE_CHOIDES = (
+        (0, '图片'),
+        (1, '视频'),
+        (2, '音频'),
+        (3, '其他'),
+    )
+    file_type = models.SmallIntegerField(default=3, choices=FILE_TYPE_CHOIDES, blank=True, null=True, verbose_name='文件类型', help_text='文件类型')
 
     def save(self, *args, **kwargs):
         if not self.md5sum:  # file is new

backend/dvadmin/system/views/file_list.py

@@ -1,6 +1,7 @@
 import hashlib
 import mimetypes
 
+import django_filters
 from rest_framework import serializers
 from rest_framework.decorators import action
 
@@ -35,6 +36,8 @@ class FileSerializer(CustomModelSerializer):
         validated_data['md5sum'] = md5.hexdigest()
         validated_data['engine'] = file_engine
         validated_data['mime_type'] = file.content_type
+        ft = {'image':0,'video':1,'audio':2}.get(file.content_type.split('/')[0], None)
+        validated_data['file_type'] = 3 if ft is None else ft
         if file_backup:
             validated_data['url'] = file
         if file_engine == 'oss':
@@ -64,6 +67,22 @@ class FileSerializer(CustomModelSerializer):
         return super().create(validated_data)
 
 
+class FileAllSerializer(CustomModelSerializer):
+    
+    class Meta:
+        model = FileList
+        fields = ['id', 'name']
+
+
+class FileFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(field_name="name", lookup_expr="icontains", help_text="文件名")
+    mime_type = django_filters.CharFilter(field_name="mime_type", lookup_expr="icontains", help_text="文件类型")
+
+    class Meta:
+        model = FileList
+        fields = ['name', 'mime_type', 'upload_method', 'file_type']
+
+
 class FileViewSet(CustomModelViewSet):
     """
     文件管理接口
@@ -75,5 +94,9 @@ class FileViewSet(CustomModelViewSet):
     """
     queryset = FileList.objects.all()
     serializer_class = FileSerializer
-    filter_fields = ['name', ]
+    filter_class = FileFilter
-    permission_classes = []
+    permission_classes = []
+
+    @action(methods=['GET'], detail=False)
+    def get_all(self, request):
+        return DetailResponse(data=self.get_serializer(self.get_queryset(), many=True).data)

web/src/components/fileSelector/fileItem.vue

@@ -0,0 +1,65 @@
+<template>
+    <div ref="itemRef" class="file-item" :title="data.name">
+        <div class="file-name">{{ data.name }}</div>
+        <component :is="FileTypes[data.file_type].tag" v-bind="FileTypes[data.file_type].attr" />
+    </div>
+</template>
+<script setup lang="ts">
+import { defineComponent, nextTick } from 'vue';
+import { ref, defineProps, PropType, watch, onMounted, h } from 'vue';
+const props = defineProps({
+    fileData: { type: Object as PropType<any>, required: true },
+});
+const _OtherFileComponent = defineComponent({ template: '<el-icon><Files /></el-icon>' });
+const FileTypes = [
+    { tag: 'img', attr: { src: props.fileData.url, draggable: false } },
+    { tag: 'video', attr: { src: props.fileData.url, controls: false, autoplay: true, muted: true, loop: true } },
+    { tag: 'audio', attr: { src: props.fileData.url, controls: true, autoplay: false, muted: false, loop: false, volume: 0 } },
+    { tag: _OtherFileComponent, attr: { style: { fontSize: '2rem' } } },
+];
+const itemRef = ref<HTMLDivElement | null>(null);
+const data = ref<any>(null);
+watch(props.fileData, (nVal) => data.value = nVal, { immediate: true, deep: true });
+defineExpose({});
+onMounted(async () => {
+    await nextTick();
+    itemRef.value?.addEventListener('mouseenter', () => {
+        itemRef.value?.querySelector('.file-name')?.classList.add('show');
+    });
+    itemRef.value?.addEventListener('mouseleave', () => {
+        itemRef.value?.querySelector('.file-name')?.classList.remove('show');
+    });
+});
+</script>
+<style scoped>
+.file-item {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-items: center;
+}
+
+.file-item>* {
+    width: 100% !important;
+}
+
+.file-name {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 0 12px;
+    text-align: center;
+    color: white;
+    background-color: rgba(0, 0, 0, .5);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.show {
+    display: block !important;
+}
+</style>

web/src/components/fileSelector/index.vue

@@ -0,0 +1,232 @@
+<template>
+	<el-select v-show="props.selectable" v-model="data" suffix-icon="arrow-down" clearable :multiple="props.multiple"
+		placeholder="请选择文件" @click="selectVisiable = true" @clear="selectedInit" @remove-tag="selectedInit">
+		<el-option v-for="item, index in listAllData" :key="index" :value="item[props.valueKey]" :label="item.name" />
+	</el-select>
+	<el-dialog v-model="selectVisiable" :draggable="false" width="50%" :align-center="false"
+		@open="if (listData.length === 0) listRequest();" @closed="if (!props.selectable) clear();">
+		<template #header>
+			<span class="el-dialog__title">文件选择</span>
+			<el-divider style="margin: 0;" />
+		</template>
+		<div style="padding: 4px;">
+			<el-tabs v-model="tabsActived" :type="props.tabsType" :stretch="true" @tab-change="handleTabChange">
+				<el-tab-pane v-if="props.tabsShow & SHOW.IMAGE" :name="0" label="图片" />
+				<el-tab-pane v-if="props.tabsShow & SHOW.VIDEO" :name="1" label="视频" />
+				<el-tab-pane v-if="props.tabsShow & SHOW.AUDIO" :name="2" label="音频" />
+				<el-tab-pane v-if="props.tabsShow & SHOW.OTHER" :name="3" label="其他" />
+			</el-tabs>
+			<el-row justify="space-between" class="headerBar">
+				<el-span :span="16">
+					<el-input v-model="filterForm.name" :placeholder="`请输入${TypeLabel[tabsActived]}名`"
+						prefix-icon="search" clearable @change="listRequest" />
+					<div>
+						<el-tag v-if="props.multiple" type="primary" effect="light">
+							一共选中&nbsp;{{ data?.length || 0 }}&nbsp;个文件
+						</el-tag>
+					</div>
+				</el-span>
+				<el-span :span="8">
+					<el-button type="default" circle icon="refresh" @click="listRequest" />
+					<!-- 这里 show-file-list 和 clearFiles 一起使用确保不会显示上传列表 -->
+					<el-upload ref="uploadRef" :action="getBaseURL() + 'api/system/file/'" :multiple="false"
+						:data="{ upload_method: 1 }" :drag="false" :show-file-list="false"
+						:accept="AcceptList[tabsActived]"
+						:on-success="() => { listRequest(); listRequestAll(); uploadRef.clearFiles(); }">
+						<el-button type="primary" icon="plus">上传{{ TypeLabel[tabsActived] }}</el-button>
+					</el-upload>
+				</el-span>
+			</el-row>
+			<el-empty v-if="!listData.length" description="无内容，请上传"
+				style="width: 100%; height: calc(50vh); margin-top: 24px; padding: 4px;" />
+			<div ref="listContainerRef" class="listContainer" v-else>
+				<div v-for="item in listData" :style="{ width: (props.itemSize || 100) + 'px' }" :key="item.id"
+					@click="onItemClick($event)" :data-id="item[props.valueKey]">
+					<FileItem :fileData="item" />
+				</div>
+			</div>
+			<div class="listPaginator">
+				<el-pagination background size="small" layout="total, sizes, prev, pager, next" :total="pageForm.total"
+					v-model:page-size="pageForm.limit" :page-sizes="[10, 20, 30, 40, 50]"
+					v-model:current-page="pageForm.page" :hide-on-single-page="false" @change="handlePageChange" />
+			</div>
+		</div>
+		<template #footer v-if="props.selectable">
+			<el-button type="default" @click="selectVisiable = false">取消</el-button>
+			<el-button type="primary" @click="selectVisiable = false">确定</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { useUi, UserPageQuery, AddReq, EditReq, DelReq } from '@fast-crud/fast-crud';
+import { ref, reactive, defineProps, PropType, watch, onMounted, nextTick } from 'vue';
+import { getBaseURL } from '/@/utils/baseUrl';
+import { request } from '/@/utils/service';
+import { SHOW } from './types';
+import FileItem from './fileItem.vue';
+
+const TypeLabel = ['图片', '视频', '音频', '文件']
+const AcceptList = ['image/*', 'video/*', 'audio/*', ''];
+const props = defineProps({
+	modelValue: {},
+	tabsType: { type: Object as PropType<'' | 'card' | 'border-card'>, default: '' },
+	itemSize: { type: Number, default: 100 },
+
+	// 1000图片 100视频 10音频 1 其他 控制tabs的显示
+	tabsShow: { type: Number, default: SHOW.ALL },
+
+	// 是否可以多选，默认单选
+	multiple: { type: Boolean, default: false },
+
+	// 是否可选，该参数用于控制是否显示select输入框。若赋值为false，则不会显示select输入框，也不会显示底部按钮
+	// 如果不显示select输入框，则无法触发dialog，需要父组件通过修改本组件暴露的 selectVisiable 状态来控制dialog
+	selectable: { type: Boolean, default: true },
+
+	// v-model绑定的值是file数据的哪个key，默认是id
+	valueKey: { type: String, default: 'id' },
+} as any);
+const selectVisiable = ref<boolean>(false);
+const tabsActived = ref<number>(0);
+const fileApiPrefix = '/api/system/file/';
+const fileApi = {
+	GetList: (query: UserPageQuery) => request({ url: fileApiPrefix, method: 'get', params: query }),
+	GetAll: () => request({ url: fileApiPrefix + 'get_all/' }),
+};
+// 过滤表单
+const filterForm = reactive({ name: '' });
+// 分页表单
+const pageForm = reactive({ page: 1, limit: 10, total: 0 });
+// 展示的数据列表
+const listData = ref<any[]>([]);
+const listAllData = ref<any[]>([]);
+const listRequest = async () => {
+	let res = await fileApi.GetList({ page: pageForm.page, limit: pageForm.limit, file_type: tabsActived.value, ...filterForm });
+	listData.value = res.data;
+	pageForm.total = res.total;
+	pageForm.page = res.page;
+	pageForm.limit = res.limit;
+	selectedInit();
+};
+const listRequestAll = async () => { let res = await fileApi.GetAll(); listAllData.value = res.data; };
+// tab改变时触发
+const handleTabChange = (name: string) => { pageForm.page = 1; listRequest(); };
+// 分页器改变时触发
+const handlePageChange = (currentPage: number, pageSize: number) => { pageForm.page = currentPage; pageForm.limit = pageSize; listRequest(); };
+// 选择的行为
+const listContainerRef = ref<any>();
+const onItemClick = async (e: MouseEvent) => {
+	if (!props.selectable) return;
+	let target = e.target as HTMLElement;
+	let flat = 0;  // -1删除 0不变 1添加
+	while (!target.dataset.id) target = target.parentElement as HTMLElement;
+	let fileId = target.dataset.id;
+	if (props.multiple) {
+		if (target.classList.contains('active')) {
+			target.classList.remove('active');
+			flat = -1;
+		} else {
+			target.classList.add('active');
+			flat = 1;
+		}
+		if (data.value) {
+			if (flat === 1) data.value.push(fileId);
+			else data.value.splice(data.value.indexOf(fileId), 1);
+		}
+		else data.value = [fileId];
+		// 去重排序，<降序，>升序
+		data.value = Array.from(new Set(data.value)).sort();
+	} else {
+		for (let i of listContainerRef.value?.children) {
+			(i as HTMLElement).classList.remove('active');
+		}
+		target.classList.add('active');
+		data.value = fileId;
+	}
+	onDataChange(data.value);
+};
+// 每次列表刷新都得更新一下选择状态，因为所有标签页共享列表
+const selectedInit = async () => {
+	if (!props.selectable) return;
+	await nextTick();
+	for (let i of (listContainerRef.value?.children || [])) {
+		i.classList.remove('active');
+		let fid = (i as HTMLElement).dataset.id;
+		if (props.multiple) {
+			if (data.value?.includes(fid)) i.classList.add('active');
+		} else {
+			if (fid === data.value) i.classList.add('active');
+		}
+	}
+};
+const uploadRef = ref<any>();
+// 清空状态
+const clear = () => {
+	filterForm.name = '';
+	pageForm.page = 1;
+	pageForm.limit = 10;
+	pageForm.total = 0;
+	listData.value = [];
+	// all数据不能清，因为all只会在挂载的时候赋值一次
+	// listAllData.value = [];
+	data.value = null;
+};
+
+
+// fs-crud部分
+const data = ref<any>();
+const emit = defineEmits(['update:modelValue']);
+watch(() => props.modelValue, (val) => { data.value = val; }, { immediate: true });
+const { ui } = useUi();
+const formValidator = ui.formItem.injectFormItemContext();
+const onDataChange = (value: any) => {
+	emit('update:modelValue', value);
+	formValidator.onChange();
+	formValidator.onBlur();
+};
+defineExpose({ data, onDataChange, selectVisiable, clear });
+
+onMounted(() => listRequestAll());
+</script>
+
+<style scoped>
+.headerBar>* {
+	display: flex;
+	justify-content: space-between;
+	gap: 12px;
+}
+
+.listContainer {
+	display: grid;
+	justify-items: center;
+	grid-template-columns: repeat(4, 1fr);
+	grid-auto-rows: min-content;
+	grid-gap: 36px;
+	margin-top: 24px;
+	padding: 8px;
+	height: calc(50vh);
+	overflow-y: auto;
+	scrollbar-width: thin;
+}
+
+.listContainer>* {
+	aspect-ratio: 1 / 1;
+	/* border: 1px solid rgba(0, 0, 0, .1); */
+	/* div阴影，2px范围，均匀投影，0偏移 */
+	box-shadow: 0 0 4px rgba(0, 0, 0, .2);
+	cursor: pointer;
+	border-radius: 8px;
+	overflow: hidden;
+}
+
+.active {
+	box-shadow: 0 0 8px var(--el-color-primary);
+}
+
+.listPaginator {
+	display: flex;
+	justify-content: flex-end;
+	justify-items: center;
+	padding-top: 24px;
+}
+</style>

web/src/components/fileSelector/types.ts

@@ -0,0 +1,7 @@
+export const SHOW = {
+	IMAGE: 0b1000, // 图片
+	VIDEO: 0b0100, // 视频
+	AUDIO: 0b0010, // 音频
+	OTHER: 0b0001, // 其他
+	ALL: 0b1111, // 全部
+};

web/src/views/system/fileList/crud.tsx

@@ -1,7 +1,17 @@
 import * as api from './api';
-import { UserPageQuery, AddReq, DelReq, EditReq, CrudExpose, CrudOptions, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
+import {
+	UserPageQuery,
+	AddReq,
+	DelReq,
+	EditReq,
+	CrudExpose,
+	CrudOptions,
+	CreateCrudOptionsProps,
+	CreateCrudOptionsRet,
+	dict
+} from '@fast-crud/fast-crud';
 
-export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
 		return await api.GetList(query);
 	};
@@ -20,7 +30,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 			actionbar: {
 				buttons: {
 					add: {
-						show: false,
+						show: true,
+						click: () => context.openAddHandle?.()
 					},
 				},
 			},
@@ -34,7 +45,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				//固定右侧
 				fixed: 'right',
 				width: 200,
-				show:false,
+				show: false,
 				buttons: {
 					view: {
 						show: false,
@@ -95,12 +106,13 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						show: true,
 					},
 					type: 'input',
-					column:{
+					column: {
-						minWidth: 120,
+						minWidth: 200,
 					},
 					form: {
 						component: {
 							placeholder: '请输入文件名称',
+							clearable: true
 						},
 					},
 				},
@@ -110,8 +122,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					search: {
 						disabled: true,
 					},
-					column:{
+					column: {
-						minWidth: 200,
+						minWidth: 360,
 					},
 				},
 				md5sum: {
@@ -119,13 +131,76 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					search: {
 						disabled: true,
 					},
-					column:{
+					column: {
-						minWidth: 120,
+						minWidth: 300,
 					},
 					form: {
-						disabled: false,
+						disabled: false
 					},
 				},
+				mime_type: {
+					title: '文件类型',
+					type: 'input',
+					form: {
+						show: false,
+						component: {
+							placeholder: '请输入文件名称',
+							clearable: true
+						},
+					},
+					column: {
+						minWidth: 160
+					}
+				},
+				file_type: {
+					title: '文件类型',
+					type: 'dict-select',
+					dict: dict({
+						data: [
+							{ label: '图片', value: 0, color: 'success' },
+							{ label: '视频', value: 1, color: 'warning' },
+							{ label: '音频', value: 2, color: 'danger' },
+							{ label: '其他', value: 3, color: 'primary' },
+						]
+					}),
+					column: {
+						show: false
+					},
+					search: {
+						show: true
+					},
+					form: {
+						show: false,
+						component: {
+							placeholder: '请选择文件类型'
+						}
+					}
+				},
+				size: {
+					title: '文件大小',
+					column: {
+						minWidth: 120
+					},
+					form: {
+						show: false
+					}
+				},
+				upload_method: {
+					title: '上传方式',
+					type: 'dict-select',
+					dict: dict({
+						data: [
+							{ label: '默认上传', value: 0, color: 'primary' },
+							{ label: '文件选择器上传', value: 1, color: 'warning' },
+						]
+					}),
+					column: {
+						minWidth: 140
+					},
+					search: {
+						show: true
+					}
+				}
 			},
 		},
 	};

web/src/views/system/fileList/index.vue

@@ -1,13 +1,35 @@
 <template>
   <fs-page>
-    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <template #actionbar-left="scope">
+        <el-upload :action="getBaseURL() + 'api/system/file/'" :multiple="false"
+          :on-success="() => crudExpose.doRefresh()" :drag="false" :show-file-list="false">
+          <el-button type="primary" icon="plus">上传</el-button>
+        </el-upload>
+      </template>
+      <template #cell_size="scope">
+        <span>{{ scope.row.size ? getSizeDisplay(scope.row.size) : '0b' }}</span>
+      </template>
+    </fs-crud>
+    <FileSelector ref="fileSelectorRef" :tabsShow="SHOW.ALL" :itemSize="120" :multiple="false" :selectable="false" />
   </fs-page>
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, nextTick } from 'vue';
 import { useExpose, useCrud } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
+import { getBaseURL } from '/@/utils/baseUrl';
+import FileSelector from '/@/components/fileSelector/index.vue';
+import { SHOW } from '/@/components/fileSelector/types';
+
+const fileSelectorRef = ref<any>(null);
+const getSizeDisplay = (n: number) => n < 1024 ? n + 'b' : (n < 1024 * 1024 ? (n / 1024).toFixed(2) + 'Kb' : (n / (1024 * 1024)).toFixed(2) + 'Mb');
+
+const openAddHandle = async () => {
+  fileSelectorRef.value.selectVisiable = true;
+  await nextTick();
+}
 // crud组件的ref
 const crudRef = ref();
 // crud 配置的ref
@@ -15,7 +37,7 @@ const crudBinding = ref();
 // 暴露的方法
 const { crudExpose } = useExpose({ crudRef, crudBinding });
 // 你的crud配置
-const { crudOptions } = createCrudOptions({ crudExpose });
+const { crudOptions } = createCrudOptions({ crudExpose, context: { openAddHandle } });
 // 初始化crud配置
 const { resetCrudOptions } = useCrud({ crudExpose, crudOptions });
 
@@ -23,4 +45,4 @@ const { resetCrudOptions } = useCrud({ crudExpose, crudOptions });
 onMounted(() => {
   crudExpose.doRefresh();
 });
-</script>
+</script>

web/src/views/system/personal/index.vue

@@ -354,7 +354,8 @@ const uploadImg = (data: any) => {
 	api.uploadAvatar(formdata).then((res: any) => {
 		if (res.code === 2000) {
 			selectImgVisible.value = false;
-			state.personalForm.avatar = getBaseURL() + res.data.url;
+			// state.personalForm.avatar = getBaseURL() + res.data.url;
+			state.personalForm.avatar = res.data.url;
 			api.updateUserInfo(state.personalForm).then((res: any) => {
 				successMessage('更新成功');
 				getUserInfo();

web/vite.config.ts

@@ -31,7 +31,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 		server: {
 			host: '0.0.0.0',
 			port: env.VITE_PORT as unknown as number,
-			open: true,
+			open: false,
 			hmr: true,
 			proxy: {
 				'/gitee': {