From 5b57b844661c0013b7fabd6c7ccfe2447b5f7a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=80=E5=8F=91=E8=80=85?= <1770679549@qq.com> Date: Fri, 14 Oct 2022 11:28:07 +0800 Subject: [PATCH 01/47] =?UTF-8?q?=E9=80=9A=E6=A0=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/banner/index.vue | 12 +--- src/layout/components/components/SubMenu.vue | 59 +++++++++++++++ .../components/components/children-banner.vue | 72 +++++++++++++++++++ 3 files changed, 133 insertions(+), 10 deletions(-) create mode 100644 src/layout/components/components/SubMenu.vue create mode 100644 src/layout/components/components/children-banner.vue diff --git a/src/layout/components/banner/index.vue b/src/layout/components/banner/index.vue index 2ea9811..a7af66f 100644 --- a/src/layout/components/banner/index.vue +++ b/src/layout/components/banner/index.vue @@ -15,15 +15,7 @@
- +
@@ -39,7 +31,7 @@ import MaOperation from '../ma-operation.vue' import MaWorkerArea from '../ma-workerArea.vue' import MaTags from '../ma-tags.vue' - import ChildrenMenu from '../components/children-menu.vue' + import ChildrenBanner from '../components/children-banner.vue' const route = useRoute() diff --git a/src/layout/components/components/SubMenu.vue b/src/layout/components/components/SubMenu.vue new file mode 100644 index 0000000..958e65d --- /dev/null +++ b/src/layout/components/components/SubMenu.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file diff --git a/src/layout/components/components/children-banner.vue b/src/layout/components/components/children-banner.vue new file mode 100644 index 0000000..eb90d66 --- /dev/null +++ b/src/layout/components/components/children-banner.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file -- Gitee From 3a2580ee4449661475599f96dde1efd6672a8cdd Mon Sep 17 00:00:00 2001 From: "X.Mo" Date: Fri, 14 Oct 2022 14:03:58 +0800 Subject: [PATCH 02/47] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/setting/code/components/editInfo.vue | 5 +++-- src/views/setting/code/js/vars.js | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/setting/code/components/editInfo.vue b/src/views/setting/code/components/editInfo.vue index fcddb10..0ce5594 100644 --- a/src/views/setting/code/components/editInfo.vue +++ b/src/views/setting/code/components/editInfo.vue @@ -306,6 +306,7 @@ + @@ -133,7 +128,7 @@ import CustomRender from '../js/custom-render' import tool from '@/utils/tool' import commonApi from '@/api/common' -const emit = defineEmits(['refresh']) +const emit = defineEmits(['refresh', 'showImage']) const props = defineProps({ options: Object, searchRef: Object, @@ -143,6 +138,42 @@ const props = defineProps({ isRecovery: Boolean, }) +const storageMode = { + '1': 'LOCAL', + '2': 'OSS', + '3': 'COS', + '4': 'QINIU' +} + +const imageSee = async (row, record) => { + if (row.returnType) { + if (! ['id', 'hash'].includes(row.returnType)) { + Message.info('该图片无法查看') + return + } + Message.info('获取图片中，请稍等...') + const api = row.returnType == 'id' ? commonApi.getFileInfoById : commonApi.getFileInfoByHash + const result = res?.success ?? false + if (! result) { + Message.info('图片信息无法获取') + return + } + + const isImage = res.data.mime_type.indexOf('image') > -1 + result && emit( + 'showImage', + isImage ? tool.attachUrl(res.data.url, storageMode[res.data.storage_mode]) : 'not-image.png' + ) + + } else { + if (! record[row.dataIndex]) { + Message.info('无图片') + return + } + emit('showImage', record[row.dataIndex] ?? 'not-image.png') + } +} + const getTagColor = (row, record) => { return props.searchRef.dictColors( row.dataIndex, (row.dataIndex.indexOf('.') > -1 ) ? get(record, row.dataIndex) : record[row.dataIndex] ) } diff --git a/src/components/ma-crud/index.vue b/src/components/ma-crud/index.vue index 3a44199..2e26f04 100644 --- a/src/components/ma-crud/index.vue +++ b/src/components/ma-crud/index.vue @@ -157,6 +157,7 @@ :isRecovery="isRecovery" :params="requestParams" @refresh="() => refresh()" + @showImage="showImage" > @@ -240,6 +242,8 @@ import _ from 'lodash' const loading = ref(true) const reloadColumn = ref(true) const openPagination = ref(false) +const imgVisible = ref(false) +const imgUrl = ref('not-image.png') const pageSizeOption = ref([10, 20, 30, 50, 100]) const total = ref(0) const requestParams = ref({}) @@ -478,6 +482,11 @@ const getSlot = (cls = []) => { return sls } +const showImage = url => { + imgUrl.value = url + imgVisible.value = true +} + const getSearchSlot = () => { let sls = [] settingProps.columns.map(item => { -- Gitee From 96f8ca9b3f92fe38db0954ba1f2d52102ecc69e2 Mon Sep 17 00:00:00 2001 From: "X.Mo" Date: Mon, 17 Oct 2022 16:32:33 +0800 Subject: [PATCH 07/47] [refactor] --- src/components/ma-form/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ma-form/index.vue b/src/components/ma-form/index.vue index 86259da..f86dc1e 100644 --- a/src/components/ma-form/index.vue +++ b/src/components/ma-form/index.vue @@ -16,7 +16,7 @@ :label-align="props.options.labelAlign || 'right'" @submit="submit" > -
+