Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f…

…ix/board-style-issues

@@ -47,7 +47,7 @@
       transformFile?: (file: File) => string | Blob | Promise<string | Blob | File>;
       api: (file: string | Blob | Promise<string | Blob | File>) => Promise<FileItem>;
       overFileLimitHiddenUploadEntry?: boolean;
-      beforeUpload: (file: File, fileList: File[]) => boolean;
+      beforeUpload?: (file: File, fileList: File[]) => boolean;
     }>(),
     {
       fileList: () => [],
@@ -146,7 +146,7 @@
     :remove="handleRemove"
   >
     <Spin
-      v-if="!(fileList.length >= getMaxFileLimit) || overFileLimitHiddenUploadEntry"
+      v-if="!(fileList.length >= getMaxFileLimit && overFileLimitHiddenUploadEntry)"
       :spinning="loading"
     >
       <div class="w-full h-full flex flex-col justify-center content-center">

@@ -113,6 +113,10 @@ export const alarmColumns: BasicColumn[] = [
     title: '告警设备',
     dataIndex: 'deviceName',
     width: 100,
+    customRender: ({ record }) => {
+      const { deviceAlias, deviceName } = record || {};
+      return deviceAlias || deviceName;
+    },
   },
   {
     title: '告警场景',

@@ -46,14 +46,16 @@
       const alarmStatus = ref('');
       const [registerDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
         await resetFields();
+        const { deviceAlias, deviceName, severity, status, details, id } = data || {};
         await setFieldsValue({
           ...data,
-          severity: alarmLevel(data.severity),
-          status: statusType(data.status),
-          details: JSON.stringify(data.details),
+          deviceName: deviceAlias || deviceName,
+          severity: alarmLevel(severity),
+          status: statusType(status),
+          details: JSON.stringify(details),
         });
-        alarmStatus.value = data.status;
-        alarmId.value = data.id;
+        alarmStatus.value = status;
+        alarmId.value = id;
       });
       // 处理报警
       const handleAlarm = async () => {

@@ -19,14 +19,14 @@
         </a-button>
       </template>
       <template #toolbar>
-        <Button @click="handleBatchAck" type="primary">批量处理</Button>
+        <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">批量处理</Button>
       </template>
     </BasicTable>
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, nextTick, h } from 'vue';
+  import { defineComponent, nextTick, h, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { alarmColumns, alarmSearchSchemas } from './config/detail.config';
   import { doBatchAckAlarm, getDeviceAlarm } from '/@/api/device/deviceManager';
@@ -55,34 +55,36 @@
     },
 
     setup() {
-      const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
-        title: '告警记录列表',
-        api: getDeviceAlarm,
-        columns: alarmColumns,
-        useSearchForm: true,
-        formConfig: {
-          labelWidth: 120,
-          schemas: alarmSearchSchemas,
-          fieldMapToTime: [['alarmTime', ['startTime', 'endTime'], 'x']],
-        },
-        bordered: true,
-        showIndexColumn: false,
-        showTableSetting: true,
-        rowSelection: {
-          type: 'checkbox',
-          getCheckboxProps: (record: AlarmLogItem) => {
-            return {
-              disabled: record.status === AlarmStatus.CLEARED_ACK,
-            };
+      const [registerTable, { reload, getSelectRows, clearSelectedRowKeys, getRowSelection }] =
+        useTable({
+          title: '告警记录列表',
+          api: getDeviceAlarm,
+          columns: alarmColumns,
+          useSearchForm: true,
+          formConfig: {
+            labelWidth: 120,
+            schemas: alarmSearchSchemas,
+            fieldMapToTime: [['alarmTime', ['startTime', 'endTime'], 'x']],
           },
-        },
-        actionColumn: {
-          width: 200,
-          title: '操作',
-          slots: { customRender: 'action' },
-          fixed: 'right',
-        },
-      });
+          bordered: true,
+          showIndexColumn: false,
+          showTableSetting: true,
+          clickToRowSelect: false,
+          rowSelection: {
+            type: 'checkbox',
+            getCheckboxProps: (record: AlarmLogItem) => {
+              return {
+                disabled: record.status === AlarmStatus.CLEARED_ACK,
+              };
+            },
+          },
+          actionColumn: {
+            width: 200,
+            title: '操作',
+            slots: { customRender: 'action' },
+            fixed: 'right',
+          },
+        });
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const handleDetail = (record: Recordable) => {
         openDrawer(true, record);
@@ -113,7 +115,9 @@
               const value = {
                 ['触发属性']: findName,
                 ['触发条件']: `${findLogin}${curr.value.logicValue}`,
-                ['触发值']: `${curr.value.realValue}${findAttribute.detail?.dataType?.specs?.unit?.key}`,
+                ['触发值']: `${curr.value.realValue}${
+                  findAttribute.detail?.dataType?.specs?.unit?.key ?? ''
+                }`,
               };
               const data = {
                 [item.name]: value,
@@ -151,23 +155,28 @@
         return temp;
       };
       const handleDataFormat = (deviceDetail: any, attributes: any) => {
-        const { name, tbDeviceId } = deviceDetail;
+        const { name, tbDeviceId, alias } = deviceDetail;
         const attribute = attributes.map((item) => ({
           identifier: item.identifier,
           name: item.name,
           detail: item.detail,
         }));
         return {
-          name,
+          name: alias || name,
           tbDeviceId,
           attribute,
         };
       };
 
+      const getCanBatchAck = computed(() => {
+        const rowSelection = getRowSelection();
+        return !rowSelection.selectedRowKeys?.length;
+      });
+
       const { createMessage } = useMessage();
       const handleBatchAck = async () => {
         const ids = getSelectRows<AlarmLogItem>().map((item) => item.id);
-
+        if (!ids.length) return;
         await doBatchAckAlarm(ids);
         createMessage.success('操作成功');
         clearSelectedRowKeys();
@@ -181,6 +190,7 @@
         handleSuccess,
         handleViewAlarmDetails,
         handleBatchAck,
+        getCanBatchAck,
       };
     },
   });

@@ -11,6 +11,7 @@
       <template #iconSelect>
         <Upload
           name="avatar"
+          accept=".png,.jpg,.jpeg,.gif"
           list-type="picture-card"
           class="avatar-uploader"
           :show-upload-list="false"

@@ -93,6 +93,7 @@ export const formSchema: FormSchema[] = [
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
         api: async (file: File) => {
           try {
             const formData = new FormData();

@@ -11,7 +11,7 @@
   import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal';
   import { PageWrapper } from '/@/components/Page';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { ConfigurationPermission, searchFormSchema } from './center.data';
+  import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { isDevMode } from '/@/utils/env';
@@ -30,6 +30,7 @@
   import { ViewType } from '../../visual/board/config/panelDetail';
   import { useRole } from '/@/hooks/business/useRole';
   import { useClipboard } from '@vueuse/core';
+  import { Icon } from '/@/components/Icon';
 
   const listColumn = ref(5);
 
@@ -187,7 +188,7 @@
 
   onMounted(() => {
     const clientHeight = document.documentElement.clientHeight;
-    const rect = getBoundingClientRect(unref(listEl)!.$el!) as DOMRect;
+    const rect = getBoundingClientRect(unref(listEl)!.$el! as HTMLElement) as DOMRect;
     // margin-top 24 height 24
     const paginationHeight = 24 + 24 + 8;
     // list pading top 8 maring-top 8 extra slot 56
@@ -322,7 +323,16 @@
                 </template>
                 <template #description>
                   <div class="truncate h-11">
-                    <div class="truncate">{{ item.organizationDTO.name }}</div>
+                    <div class="truncate flex justify-between items-center">
+                      <div>{{ item.organizationDTO.name }}</div>
+                      <Icon
+                        :icon="
+                          item.platform === Platform.PC
+                            ? 'ri:computer-line'
+                            : 'clarity:mobile-phone-solid'
+                        "
+                      />
+                    </div>
                     <div class="truncate">{{ item.remark || '' }} </div>
                   </div>
                 </template>

@@ -59,6 +59,7 @@ export const formSchema: FormSchema[] = [
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
         api: async (file: File) => {
           try {
             const formData = new FormData();

@@ -175,6 +175,10 @@ export const alarmColumns: BasicColumn[] = [
     title: '告警设备',
     dataIndex: 'deviceName',
     width: 120,
+    customRender: ({ record }) => {
+      const { deviceAlias, deviceName } = record || {};
+      return deviceAlias || deviceName;
+    },
   },
   {
     title: '告警场景',

@@ -52,13 +52,15 @@
       const alarmStatus = ref('');
       const [registerModal, { closeModal }] = useModalInner(async (data) => {
         await resetFields();
+        const { deviceAlias, deviceName, severity, status, id } = data || {};
         await setFieldsValue({
           ...data,
-          severity: alarmLevel(data.severity),
-          status: statusType(data.status),
+          deviceName: deviceAlias || deviceName,
+          severity: alarmLevel(severity),
+          status: statusType(status),
         });
-        alarmId.value = data.id;
-        alarmStatus.value = data.status;
+        alarmId.value = id;
+        alarmStatus.value = status;
       });
       // 处理报警
       const handleAlarm = async () => {

@@ -25,6 +25,7 @@
         <template #iconSelect>
           <Upload
             name="avatar"
+            accept=".png,.jpg,.jpeg,.gif"
             :show-upload-list="false"
             list-type="picture-card"
             class="avatar-uploader"

@@ -143,14 +143,14 @@
         return temp;
       };
       const handleDataFormat = (deviceDetail: any, attributes: any) => {
-        const { name, tbDeviceId } = deviceDetail;
+        const { name, alias, tbDeviceId } = deviceDetail;
         const attribute = attributes.map((item) => ({
           identifier: item.identifier,
           name: item.name,
           detail: item.detail,
         }));
         return {
-          name,
+          name: alias || name,
           tbDeviceId,
           attribute,
         };

@@ -5,6 +5,7 @@
         <Upload
           style="width: 20vw"
           name="avatar"
+          accept=".png,.jpg,.jpeg,.gif"
           list-type="picture-card"
           class="avatar-uploader"
           :show-upload-list="false"

@@ -67,6 +67,9 @@
       for (let i in credentials) Reflect.set(credentialsFile, i, credentials[i]);
     }
     setFieldsValue(value);
+    setFieldsValue({
+      type: credentials.type,
+    });
   };
 
   const resetValue = () => resetFields();

@@ -268,6 +268,7 @@
     //ft-add-2022-11-22
     const type = validate?.outTarget;
     if (type === 'DEVICE_OUT') {
+      if (!validate.deviceType) return createMessage.error('请选择类型');
       if (!validate.deviceProfileId) return createMessage.error('请选择产品');
       if (validate.device == 'PART' && validate.deviceId == undefined)
         return createMessage.error('请选择设备');

@@ -11,6 +11,7 @@
       <template #iconSelect>
         <Upload
           name="avatar"
+          accept=".png,.jpg,.jpeg,.gif"
           list-type="picture-card"
           class="avatar-uploader"
           :show-upload-list="false"