Merge branch 'ft' into 'main'

fix:修改一些验证（alarm/config,alarm/contacts)，fix:修改设备管理凭证400提示（device/list/cpns/mod...

See merge request huang/yun-teng-iot-front!182

@@ -141,19 +141,18 @@
       };
       const useSelectionChange = () => {
         let getRows = getSelectRows();
-        getRows.forEach((f) => {
-          if (f.status == 1 && f.status !== 0) {
-            hasBatchDelete.value = true;
-          } else if (f.status == 0 && f.status !== 1) {
-            hasBatchDelete.value = false;
-          } else if (f.status == 0 && f.status == 1) {
-            hasBatchDelete.value = true;
-          }
-        });
-        selectArray = getRows.filter((f) => f.status !== 1).map((m) => m.id);
-        if (selectArray.length == 0) {
+        const isJudge = getRows.map((m) => m.status);
+        if (isJudge.length === 0) {
           hasBatchDelete.value = true;
         }
+        if (isJudge.includes(1) && isJudge.includes(0)) {
+          hasBatchDelete.value = true;
+        } else if (isJudge.includes(1) && !isJudge.includes(0)) {
+          hasBatchDelete.value = true;
+        } else if (!isJudge.includes(1) && isJudge.includes(0)) {
+          hasBatchDelete.value = false;
+        }
+        selectArray = getRows.filter((f) => f.status !== 1).map((m) => m.id);
       };
       // 删除或批量删除
       const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
@@ -162,9 +161,7 @@
             await deleteAlarmConfig([record.id]);
             createMessage.success('删除成功');
             handleSuccess();
-          } catch (e: any) {
-            // createMessage.error(e.msg);
-          }
+          } catch (e: any) {}
         } else {
           try {
             await deleteAlarmConfig(selectArray);
@@ -172,7 +169,6 @@
             handleSuccess();
             selectArray.length = 0;
           } catch (e: any) {
-            // createMessage.error(e.msg);
             selectArray.length = 0;
           } finally {
             selectArray.length = 0;

@@ -77,6 +77,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'organizationId',
     label: '所属组织',
+    required: true,
     component: 'ApiTreeSelect',
     componentProps: {
       api: async () => {

@@ -6,17 +6,17 @@ import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel';
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
-    title: '设备名称',
-    dataIndex: 'name',
-    width: 120,
-  },
-  {
     title: '设备图片',
     dataIndex: 'deviceInfo.avatar',
     width: 120,
     slots: { customRender: 'img' },
   },
   {
+    title: '设备名称',
+    dataIndex: 'name',
+    width: 120,
+  },
+  {
     title: '设备类型',
     dataIndex: 'deviceType',
     width: 100,

@@ -171,6 +171,7 @@
         ]);
       };
       const handleOk = async () => {
+        const { createMessage } = useMessage();
         // 验证
         const valid = await validate();
         if (!valid) return;
@@ -197,14 +198,17 @@
               ? field.publicKey
               : null,
         };
-
-        await saveDeviceToken(editData);
-        const { createMessage } = useMessage();
-        createMessage.success('修改设备凭证成功');
-
-        // 请求
-        closeModal();
-        handleCancel();
+        saveDeviceToken(editData)
+          .then((res) => {
+            if (!res) return;
+            createMessage.success('修改设备凭证成功');
+            // 请求
+            closeModal();
+            handleCancel();
+          })
+          .catch((e) => {
+            createMessage.error(e);
+          });
       };
       return {
         registerModal,

@@ -103,7 +103,7 @@
               {
                 label: '删除',
                 icon: 'ant-design:delete-outlined',
-                ifShow: authBtn(role),
+                ifShow: authBtn(role) && record.customerId === undefined,
                 color: 'error',
                 popConfirm: {
                   title: '是否确认删除',

@@ -167,11 +167,17 @@
         if (isUpdate.value == 1) {
           delete postDeviceConfogData.id;
         }
-        await deviceConfigAddOrEdit(postDeviceConfogData);
-        createMessage.success(isUpdate.value == 1 ? '新增' + '成功' : '编辑' + '成功');
-        closeModal();
-        emit('success');
-        isNextStatus.value = false;
+        deviceConfigAddOrEdit(postDeviceConfogData)
+          .then((res) => {
+            if (!res) return;
+            createMessage.success(isUpdate.value == 1 ? '新增' + '成功' : '编辑' + '成功');
+            closeModal();
+            emit('success');
+            isNextStatus.value = false;
+          })
+          .catch((e) => {
+            createMessage.error(e);
+          });
       };
       const handleCancel = () => {
         nextTick(() => {

@@ -6,17 +6,17 @@ import { numberRule } from '/@/utils/rules';
 
 export const columns: BasicColumn[] = [
   {
-    title: '名称',
-    dataIndex: 'name',
-    width: 120,
-  },
-  {
     title: '配置图片', //图标
     dataIndex: 'image',
     width: 80,
     slots: { customRender: 'img' },
   },
   {
+    title: '名称',
+    dataIndex: 'name',
+    width: 120,
+  },
+  {
     title: '配置类型',
     dataIndex: 'type',
     width: 90,

@@ -98,6 +98,7 @@
       const getPathUrlName = ref('');
       const disabled = ref(true);
       const onCloseVal = ref(0);
+      const immediateStatus = ref(false);
 
       const { createMessage } = useMessage();
       const [registerModal, { openModal }] = useModal();
@@ -106,6 +107,7 @@
         title: '设备配置列表',
         clickToRowSelect: false,
         api: deviceConfigGetQuery,
+        immediate: immediateStatus.value,
         columns,
         formConfig: {
           labelWidth: 120,
@@ -162,12 +164,13 @@
               resetFields();
             }
           });
+        } else {
+          setTimeout(() => {
+            reload();
+          }, 80);
         }
       };
-      setTimeout(() => {
-        setRowClassName();
-      }, 500);
-
+      setRowClassName();
       onUnmounted(() => {
         getPathUrlName.value = '';
         onCloseVal.value = 1;

@@ -91,7 +91,7 @@
         }
         const isLt2M = (file.size as number) / 1024 / 1024 < 2;
         if (!isLt2M) {
-          createMessage.error('图片大小不能超过5MB!');
+          createMessage.error('图片大小不能超过2MB!');
         }
         return isJpgOrPng && isLt2M;
       };

@@ -15,7 +15,8 @@
               icon: 'ant-design:eye-outlined',
               onClick: handleView.bind(null, record),
               ifShow: (_action) => {
-                return record.status === 1 && rolePermission == 'CUSTOMER_USER';
+                const isCurrent = record.status === 1 && record.creator === userId;
+                return isCurrent;
               },
             },
             {
@@ -23,14 +24,15 @@
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               ifShow: (_action) => {
-                return record.status === 0 && record.creator == userId;
+                const isCurrent = record.status === 0 && record.creator === userId;
+                return isCurrent;
               },
             },
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
-              ifShow: record.creator == userId,
+              ifShow: record.creator === userId,
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -49,7 +51,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import NotifyManagerDrawer from './useDrawer.vue';
@@ -59,22 +61,14 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
-  import { RoleEnum } from '/@/enums/roleEnum';
-  import { usePermission } from '/@/hooks/web/usePermission';
-  import { useUserStore } from '/@/store/modules/user';
 
   export default defineComponent({
     name: 'Notificationmannager',
     components: { BasicTable, NotifyManagerDrawer, TableAction, tableViewChild },
     setup() {
-      const { hasPermission } = usePermission();
-      const userStore = useUserStore();
-      const isTenant = computed(() => userStore.getRoleList.includes(RoleEnum.TENANT_ADMIN));
-      const isCustomer = computed(() => userStore.getRoleList.includes(RoleEnum.CUSTOMER_USER));
       const userInfo: any = getAuthCache(USER_INFO_KEY);
       const userId = userInfo.userId;
       const tenantId = userInfo.tenantId;
-      const rolePermission: string = userInfo.roles[0];
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerAdd, { openDrawer: openDrawerAdd }] = useDrawer();
       // 批量删除
@@ -137,12 +131,8 @@
         handleSuccess,
         handleDeleteOrBatchDelete,
         NotifyManagerDrawerRef,
-        rolePermission,
         userId,
         tenantId,
-        hasPermission,
-        isTenant,
-        isCustomer,
       };
     },
   });

@@ -380,6 +380,7 @@ export const modeMqttForm: FormSchema[] = [
     component: 'Select',
     label: 'type',
     colProps: { span: 12 },
+    defaultValue: 'anonymous',
     componentProps: {
       placeholder: '请选择Credentials',
       options: [
@@ -898,6 +899,7 @@ export const modeApiForm: FormSchema[] = [
     component: 'Select',
     label: 'type',
     colProps: { span: 12 },
+    defaultValue: 'anonymous',
     componentProps: {
       placeholder: '请选择Number of acknowledgments',
       options: [

@@ -122,6 +122,7 @@ export const schemas: FormSchema[] = [
   {
     field: 'prov',
     label: '所在城市',
+    required: true,
     component: 'Input',
     colProps: {
       span: 24,