diff --git a/index.html b/index.html index e8465c8..77ef548 100644 --- a/index.html +++ b/index.html @@ -156,9 +156,9 @@
-
<%= title %>
-
- + +
+
@@ -166,7 +166,7 @@ - --> - + diff --git a/public/resource/img/logogif.gif b/public/resource/img/logogif.gif new file mode 100644 index 0000000..3ae0f3b Binary files /dev/null and b/public/resource/img/logogif.gif differ diff --git a/src/components/Form/src/jeecg/components/JImageUpload.vue b/src/components/Form/src/jeecg/components/JImageUpload.vue index 26c9eaf..be55c5b 100644 --- a/src/components/Form/src/jeecg/components/JImageUpload.vue +++ b/src/components/Form/src/jeecg/components/JImageUpload.vue @@ -255,10 +255,21 @@ /** * 预览图片 */ - function handlePreview(file) { - previewImage.value = file.url || file.thumbUrl; + async function handlePreview(file) { + if (!file.url && !file.preview) { + file.preview = (await getBase64(file.originFileObj)) as string; + } + previewImage.value = file.url || file.preview; previewVisible.value = true; } + function getBase64(file: File) { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(file); + reader.onload = () => resolve(reader.result); + reader.onerror = error => reject(error); + }); + } function getAvatarView() { if (uploadFileList.length > 0) { diff --git a/src/components/Icon/src/IconList.vue b/src/components/Icon/src/IconList.vue index 7ceebd2..34d4356 100644 --- a/src/components/Icon/src/IconList.vue +++ b/src/components/Icon/src/IconList.vue @@ -71,7 +71,7 @@ //每页条数 const pageSize = ref(140); //下拉分页显示 - const pageSizeOptions = ref(['10', '20', '50', '100', '140']); + const pageSizeOptions = ref(['15', '50', '80', '100']); //下拉搜索值 const searchIconValue = ref(''); const { clipboardRef, isSuccessRef } = useCopyToClipboard(props.value); diff --git a/src/utils/midiaManage/MediaResourcePicker.vue b/src/utils/midiaManage/MediaResourcePicker.vue index 7462e2f..e8c9d48 100644 --- a/src/utils/midiaManage/MediaResourcePicker.vue +++ b/src/utils/midiaManage/MediaResourcePicker.vue @@ -120,7 +120,7 @@ const pagination = reactive({ total: 0, showSizeChanger: true, showQuickJumper: true, - pageSizeOptions: ['10', '20', '30', '50'], + pageSizeOptions: ['15', '50', '80', '100'], showTotal: total => `共 ${total} 条` }); diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index daf8811..047e234 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -59,7 +59,7 @@
-
+
全部 diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue index a00c5e4..9866ee2 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue @@ -4,17 +4,17 @@