From 22b6895eed935143c8d648e4b5938a3d6dbac3e8 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Tue, 5 Aug 2025 10:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devicemanagement/deviceinfo/index.vue | 57 +++++++++++++++++-- .../devicemanagement/deviceinfo/schema.ts | 49 +++++++++------- .../iotdbdatamanagement/ctwingLog/index.vue | 17 ++++-- 3 files changed, 90 insertions(+), 33 deletions(-) diff --git a/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue b/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue index 8d87263..f25179e 100644 --- a/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue +++ b/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue @@ -2,7 +2,7 @@ import type { VbenFormProps } from '#/adapter/form'; import type { VxeGridProps } from '#/adapter/vxe-table'; -import { computed, h, ref } from 'vue'; +import { computed, h, ref, watch } from 'vue'; import { useRouter } from 'vue-router'; import { Page, useVbenModal } from '@vben/common-ui'; @@ -18,9 +18,9 @@ import { import { useVbenForm } from '#/adapter/form'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { + postAggregationDeviceBatchCreateAsync, postAggregationDeviceCreateAsync, postAggregationDeviceDeleteAsync, - postAggregationDeviceBatchCreateAsync, postDeviceInfoCacheDeviceDataToRedis, postDeviceInfoPage, } from '#/api-client'; @@ -167,12 +167,15 @@ const [BatchAddForm, batchAddFormApi] = useVbenForm({ showCollapseButton: false, showDefaultActions: false, wrapperClass: 'grid-cols-2', + // 添加响应式监听 + autoSubmitOnEnter: false, }); const [BatchAddModal, batchAddModalApi] = useVbenModal({ draggable: true, onConfirm: submitBatchAdd, onBeforeClose: () => { + batchAddFormApi.resetForm(); return true; }, }); @@ -385,7 +388,9 @@ async function submitBatchAdd() { } // 验证设备地址格式（简单验证） - const invalidAddresses = addressList.filter((address: string) => !address || address.length < 3); + const invalidAddresses = addressList.filter( + (address: string) => !address || address.length < 3, + ); if (invalidAddresses.length > 0) { Message.error(`以下设备地址格式不正确: ${invalidAddresses.join(', ')}`); return; @@ -435,10 +440,41 @@ async function submitBatchAdd() { // 打开批量添加模态框 const openBatchAddModal = () => { + console.log('打开批量添加模态框'); batchAddFormApi.resetForm(); batchAddModalApi.open(); }; +// 批量添加地址行数 +const addressLines = ref(0); + +// 获取当前地址行数的函数 +const getAddressLines = () => { + try { + const formValues = batchAddFormApi.getValues(); + const addressList = formValues?.addressList; + if (!addressList || typeof addressList !== 'string') { + addressLines.value = 0; + return 0; + } + const lines = addressList.split('\n').filter((line: string) => line.trim()); + addressLines.value = lines.length; + return lines.length; + } catch { + addressLines.value = 0; + return 0; + } +}; + +// 监听批量添加表单的地址列表变化 +watch( + () => batchAddFormApi.getValues()?.addressList, + (newValue) => { + getAddressLines(); + }, + { immediate: true }, +); + // 缓存刷新按钮处理函数 const handleCacheRefresh = async () => { try { @@ -561,15 +597,15 @@ const toolbarActions = computed(() => [ diff --git a/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts b/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts index ac7bcb7..e127d86 100644 --- a/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts +++ b/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts @@ -89,6 +89,14 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [ ]); export const addDeviceFormSchema: any = computed(() => [ + { + component: 'Input', + fieldName: 'deviceAddress', + label: $t('abp.deviceInfos.deviceAddress'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('abp.deviceInfos.deviceAddress')}`, + }), + }, { component: 'ApiSelect', fieldName: 'ioTPlatform', @@ -361,14 +369,6 @@ export const addDeviceFormSchema: any = computed(() => [ }, rules: z.string().optional(), }, - { - component: 'Input', - fieldName: 'deviceAddress', - label: $t('abp.deviceInfos.deviceAddress'), - rules: z.string().min(1, { - message: `${$t('common.pleaseInput')}${$t('abp.deviceInfos.deviceAddress')}`, - }), - }, ]); export const editDeviceFormSchemaEdit: any = computed(() => [ @@ -667,6 +667,25 @@ export const commandFormSchema: any = computed(() => [ ]); export const batchAddDeviceFormSchema: any = computed(() => [ + { + component: 'Textarea', + fieldName: 'addressList', + label: $t('abp.deviceInfos.deviceAddress'), + componentProps: { + rows: 4, + placeholder: $t('common.pleaseInput') + $t('abp.deviceInfos.deviceAddress') + '，每行一个设备地址', + showCount: false, + maxLength: 2000, + style: { + resize: 'vertical', + minHeight: '32px', + maxHeight: '200px', + }, + }, + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('abp.deviceInfos.deviceAddress')}`, + }), + }, { component: 'ApiSelect', fieldName: 'ioTPlatform', @@ -939,18 +958,4 @@ export const batchAddDeviceFormSchema: any = computed(() => [ }, rules: z.string().optional(), }, - { - component: 'Textarea', - fieldName: 'addressList', - label: $t('abp.deviceInfos.deviceAddress'), - componentProps: { - rows: 8, - placeholder: $t('common.pleaseInput') + $t('abp.deviceInfos.deviceAddress') + '，每行一个设备地址', - showCount: true, - maxLength: 2000, - }, - rules: z.string().min(1, { - message: `${$t('common.pleaseInput')}${$t('abp.deviceInfos.deviceAddress')}`, - }), - }, ]); diff --git a/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue index 3c1a5f9..3fc0841 100644 --- a/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue +++ b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue @@ -8,8 +8,7 @@ import { useRoute } from 'vue-router'; import { Page } from '@vben/common-ui'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; -import { postDeviceInfoPage } from '#/api-client'; -import { postTableModelCtWingLogInfo } from '#/api-client'; +import { postDeviceInfoPage, postTableModelCtWingLogInfo } from '#/api-client'; import DeviceSelect from '../deviceData/DeviceSelect.vue'; import { querySchema, tableSchema } from './schema'; @@ -53,11 +52,17 @@ const fetchDeviceOptions = async () => { // 根据设备地址获取设备信息对象 const getDeviceInfoByAddress = (deviceAddress: string) => { - if (!deviceAddress || !deviceOptions.value || deviceOptions.value.length === 0) { + if ( + !deviceAddress || + !deviceOptions.value || + deviceOptions.value.length === 0 + ) { return null; } - const device = deviceOptions.value.find((device) => device.deviceAddress === deviceAddress); + const device = deviceOptions.value.find( + (device) => device.deviceAddress === deviceAddress, + ); return device; }; @@ -189,7 +194,9 @@ const gridOptions: VxeGridProps = { ajax: { query: async ({ page }, formValues) => { // 总是从表单API获取最新的表单值，确保分页时参数完整 - const currentFormValues = gridApi?.formApi ? await gridApi.formApi.getValues() : {}; + const currentFormValues = gridApi?.formApi + ? await gridApi.formApi.getValues() + : {}; // 如果表单中没有DeviceAddress，但有路由参数，使用路由参数 if (!currentFormValues.DeviceAddress && DeviceAddress) {