From 0a48ee233c598e2cb7872bde092acdf905d64f27 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 3 Sep 2025 09:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E3=80=81?= =?UTF-8?q?=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/elder/eldertag/ElderTag.data.ts | 11 ++++++- .../eldertag/components/ElderTagForm.vue | 33 ++++++++++++------- .../components/ElderTagRespositoryList.vue | 26 ++++++++------- .../ConfigServiceDirective.data.ts | 21 ++++++++++-- .../components/ConfigServiceDirectiveForm.vue | 21 ++++++++++++ .../components/DirectiveRespositoryList.vue | 25 +++++++------- 6 files changed, 99 insertions(+), 38 deletions(-) diff --git a/src/views/elder/eldertag/ElderTag.data.ts b/src/views/elder/eldertag/ElderTag.data.ts index 7f7f0ca..55c55d6 100644 --- a/src/views/elder/eldertag/ElderTag.data.ts +++ b/src/views/elder/eldertag/ElderTag.data.ts @@ -29,7 +29,16 @@ export const columns: BasicColumn[] = [ title: '图标', align: 'center', dataIndex: 'pic', - customRender: render.renderImage, + customRender: ({ text, record }) => { + // 如果 text 为空或 null/undefined，使用默认图片 + const imageUrl = text + ? text + : record.type == 'tx' + ? import.meta.env.VITE_DEFAULT_ELDER_TAG_BODY_PIC + : import.meta.env.VITE_DEFAULT_ELDER_TAG_EMO_PIC; + return render.renderImage({ text: imageUrl }); + }, + // customRender: render.renderImage, }, // { // title: '排序', diff --git a/src/views/elder/eldertag/components/ElderTagForm.vue b/src/views/elder/eldertag/components/ElderTagForm.vue index e97a93d..ae3754f 100644 --- a/src/views/elder/eldertag/components/ElderTagForm.vue +++ b/src/views/elder/eldertag/components/ElderTagForm.vue @@ -150,20 +150,28 @@ function edit(record) { if (record.hasOwnProperty(key)) { tmpData[key] = record[key] } - }) - //赋值 - Object.assign(formData, tmpData); - if (props.opeType == 'dmlook') { - if (!!formData.pic) { - dmlookVal.value = props.mediaApiAddress + formData.pic - } else { - if (formData.type == 'qx') { - dmlookVal.value = defaultEmoPic + //赋值 + Object.assign(formData, tmpData); + if (props.opeType == 'dmlook') { + if (!!formData.pic) { + dmlookVal.value = props.mediaApiAddress + formData.pic } else { - dmlookVal.value = defaultBodyPic + if (formData.type == 'qx') { + dmlookVal.value = defaultEmoPic + } else { + dmlookVal.value = defaultBodyPic + } + } + } else { + if (!formData.pic) { + if (formData.type == 'qx') { + formData.pic = defaultEmoPic + } else { + formData.pic = defaultBodyPic + } } } - } + }) }); } @@ -201,6 +209,9 @@ async function submitForm() { } } } + if (model.pic == defaultBodyPic || model.pic == defaultEmoPic) { + model.pic = null + } await saveOrUpdate(model, isUpdate.value) .then((res) => { if (res.success) { diff --git a/src/views/elder/eldertag/components/ElderTagRespositoryList.vue b/src/views/elder/eldertag/components/ElderTagRespositoryList.vue index b0c2705..bdb730b 100644 --- a/src/views/elder/eldertag/components/ElderTagRespositoryList.vue +++ b/src/views/elder/eldertag/components/ElderTagRespositoryList.vue @@ -87,6 +87,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ useSearchForm: false, showIndexColumn: true, scroll: { y: '58vh' }, + immediate: false, pagination: { current: 1, pageSize: 15, @@ -106,7 +107,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ params.excludeIds = excludeIds.value.join(',') } params.izEnabled = '0' - return Object.assign(params,queryParam) + return Object.assign(params, queryParam) }, }, }); @@ -197,21 +198,22 @@ async function init() { } let { ids } = getSelectedIds(); - let res = await idListByDS({ dataSourceCode: 'master' }); + idListByDS({ dataSourceCode: 'master' }).then(res => { + // 现有的ID + let existingExcludeIds = res.records.map(item => item.id); - // 现有的ID - let existingExcludeIds = res.records.map(item => item.id); + // 如果ids不为空，则拆分并添加到排除列表中 + if (ids) { + const idsToAdd = ids.split(','); + existingExcludeIds = [...existingExcludeIds, ...idsToAdd]; + } - // 如果ids不为空，则拆分并添加到排除列表中 - if (ids) { - const idsToAdd = ids.split(','); - existingExcludeIds = [...existingExcludeIds, ...idsToAdd]; - } + // 去重并更新excludeIds.value + excludeIds.value = [...new Set(existingExcludeIds)]; - // 去重并更新excludeIds.value - excludeIds.value = [...new Set(existingExcludeIds)]; + reload(); + }) - reload(); } /** diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 9356621..6c36420 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -117,13 +117,23 @@ export const columns: BasicColumn[] = [ title: '服务指令图片大图', align: 'center', dataIndex: 'previewFile', - customRender: render.renderImage, + customRender: ({ text }) => { + // 如果 text 为空或 null/undefined，使用默认图片 + const imageUrl = text ? text : import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC; + return render.renderImage({ text: imageUrl }); + }, + // customRender: render.renderImage, }, { title: '服务指令图片小图', align: 'center', dataIndex: 'previewFileSmall', - customRender: render.renderImage, + customRender: ({ text }) => { + // 如果 text 为空或 null/undefined，使用默认图片 + const imageUrl = text ? text : import.meta.env.VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC; + return render.renderImage({ text: imageUrl }); + }, + // customRender: render.renderImage, }, { title: '服务指令描述', @@ -147,7 +157,12 @@ export const columns: BasicColumn[] = [ title: '即时指令图标', align: 'center', dataIndex: 'immediateFile', - customRender: render.renderImage, + customRender: ({ text }) => { + // 如果 text 为空或 null/undefined，使用默认图片 + const imageUrl = text ? text : import.meta.env.VITE_DEFAULT_DIRECTIVE_IM_PIC; + return render.renderImage({ text: imageUrl }); + }, + // customRender: render.renderImage, }, ]; diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index ff0d822..3820d18 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -520,6 +520,17 @@ function edit(record, isEditMedia_ = false, showMedia_ = true, showExistTags = t }) //赋值 Object.assign(formData, tmpData); + if (props.opeType != 'dmlook') { + if (!formData.previewFile) { + formData.previewFile = defaultPrePic + } + if (!formData.previewFileSmall) { + formData.previewFileSmall = defaultPreSmallPic + } + if (!formData.immediateFile) { + formData.immediateFile = defaultImmediatePic + } + } }); } @@ -571,6 +582,16 @@ async function submitForm() { model.mediaFileSavePath = formComputedData.value.mediaFileSavePath + if (model.previewFile == defaultPrePic) { + model.previewFile = null + } + if (model.previewFileSmall == defaultPreSmallPic) { + model.previewFileSmall = null + } + if (model.immediateFile == defaultImmediatePic) { + model.immediateFile = null + } + await saveOrUpdate(model, isUpdate.value) .then((res) => { if (res.success) { diff --git a/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue b/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue index 7935c08..6b1ac52 100644 --- a/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue +++ b/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue @@ -143,6 +143,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ useSearchForm: false, showIndexColumn: true, scroll: { y: '58vh' }, + immediate: false, pagination: { current: 1, pageSize: 15, @@ -293,21 +294,23 @@ async function init() { } let { ids } = getSelectedIds(); - let res = await idListByDS({ dataSourceCode: 'master' }); + idListByDS({ dataSourceCode: 'master' }).then(res => { - // 现有的ID - let existingExcludeIds = res.records.map(item => item.id); + // 现有的ID + let existingExcludeIds = res.records.map(item => item.id); - // 如果ids不为空，则拆分并添加到排除列表中 - if (ids) { - const idsToAdd = ids.split(','); - existingExcludeIds = [...existingExcludeIds, ...idsToAdd]; - } + // 如果ids不为空，则拆分并添加到排除列表中 + if (ids) { + const idsToAdd = ids.split(','); + existingExcludeIds = [...existingExcludeIds, ...idsToAdd]; + } - // 去重并更新excludeIds.value - excludeIds.value = [...new Set(existingExcludeIds)]; + // 去重并更新excludeIds.value + excludeIds.value = [...new Set(existingExcludeIds)]; + + reload(); + }) - reload(); } /**