Merge branch 'ft' into 'main'

fix:修复告警管理启用不能批量删除

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

@@ -6,7 +6,13 @@
         @select="handleSelect"
         ref="organizationIdTreeRef"
       />
-      <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
+      <BasicTable
+        @selection-change="useSelectionChange"
+        @register="registerTable"
+        :searchInfo="searchInfo"
+        :rowSelection="{ type: 'checkbox' }"
+        class="w-3/4 xl:w-4/5"
+      >
         <template #toolbar>
           <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警配置 </a-button>
           <a-button
@@ -61,7 +67,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, reactive, ref, computed, h } from 'vue';
+  import { defineComponent, reactive, ref, h } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -84,16 +90,12 @@
       ContactDrawer,
     },
     setup() {
-      let selectedRowIds = ref<string[]>([]);
-      const hasBatchDelete = computed(() => selectedRowIds.value.length <= 0);
-      // 复选框事件
-      const onSelectRowChange = (selectedRowKeys: string[]) => {
-        selectedRowIds.value = selectedRowKeys;
-      };
+      const selectArray: any = ref([]);
+      const hasBatchDelete = ref(true);
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, getSelectRows }] = useTable({
         title: '告警配置列表',
         api: queryAlarmConfig,
         columns,
@@ -107,10 +109,6 @@
         useSearchForm: true,
         showTableSetting: true,
         bordered: true,
-        rowSelection: {
-          onChange: onSelectRowChange,
-          type: 'checkbox',
-        },
         rowKey: 'id',
         actionColumn: {
           width: 200,
@@ -141,6 +139,19 @@
           });
         }
       };
+      const useSelectionChange = () => {
+        selectArray.value = getSelectRows()
+          .filter((f) => f.status !== 1)
+          .map((m) => m.id);
+        if (selectArray.value.length > 0) {
+          hasBatchDelete.value = false;
+        } else {
+          hasBatchDelete.value = true;
+        }
+        // const isJude = getSelectRows().some((s) => {
+        //   if (s.status == 1) return createMessage.error('不能删除已经启用的，请选择未启用的');
+        // });
+      };
       // 删除或批量删除
       const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
         if (record) {
@@ -148,17 +159,18 @@
             await deleteAlarmConfig([record.id]);
             createMessage.success('删除成功');
             handleSuccess();
-          } catch (e) {
-            createMessage.error('删除失败');
+          } catch (e: any) {
+            createMessage.error(e.msg);
           }
         } else {
           try {
-            await deleteAlarmConfig(selectedRowIds.value);
+            await deleteAlarmConfig(selectArray.value);
             createMessage.success('批量删除成功');
-            selectedRowIds.value = [];
             handleSuccess();
-          } catch (e) {
-            createMessage.info('删除失败');
+            selectArray.value.length = 0;
+          } catch (e: any) {
+            createMessage.error(e.msg);
+            selectArray.value.length = 0;
           }
         }
       };
@@ -210,6 +222,7 @@
         });
       };
       return {
+        useSelectionChange,
         searchInfo,
         hasBatchDelete,
         handleCreateOrEdit,

@@ -39,6 +39,7 @@
   import { Button } from '/@/components/Button';
   import MqttCpns from '../step/cpns/mqtt/Mqtt.vue';
   import CoapCpns from '../step/cpns/coap/Coap.vue';
+  import Lwm2mCpns from '../step/cpns/lwm2m/index.vue';
 
   export default defineComponent({
     components: {

@@ -29,32 +29,392 @@ export const serverSchemas: FormSchema[] = [
     defaultValue: 123,
     colProps: { span: 8 },
   },
+  {
+    field: '3',
+    component: 'InputNumber',
+    label: 'Minimum period between two',
+    required: true,
+    defaultValue: 123,
+    colProps: { span: 8 },
+  },
+  {
+    field: '4',
+    component: 'Select',
+    label: 'Binding',
+    defaultValue: 'UQ: UDP connection in queue mode',
+    componentProps: {
+      options: [
+        {
+          label: 'U: UDP connection in standard mode',
+          value: 'U: UDP connection in standard mode',
+        },
+        {
+          label: 'UQ: UDP connection in queue mode',
+          value: 'UQ: UDP connection in queue mode',
+        },
+        {
+          label: 'T: TCP connection in standard mode',
+          value: 'T: TCP connection in standard mode',
+        },
+        {
+          label: 'TQ: TCP connection in queue mode',
+          value: 'TQ: TCP connection in queue mode',
+        },
+        {
+          label: 'S: SMS connection in standard mode',
+          value: 'S: SMS connection in standard mode',
+        },
+        {
+          label: 'SQ: SMS connection in queue mode',
+          value: 'SQ: SMS connection in queue mode',
+        },
+        {
+          label: 'US: both UDP and SMS connections active, both in standard mode',
+          value: 'US: both UDP and SMS connections active, both in standard mode',
+        },
+        {
+          label: 'TS: both TCP and SMS connections active, both in standard mode',
+          value: 'TS: both TCP and SMS connections active, both in standard mode',
+        },
+        {
+          label:
+            'UQS: both UDP and SMS connections active; UDP in queue mode, SMS in standard mode',
+          value:
+            'UQS: both UDP and SMS connections active; UDP in queue mode, SMS in standard mode',
+        },
+        {
+          label:
+            'TQS: both TCP and SMS connections active; TCP in queue mode, SMS in standard mode',
+          value:
+            'TQS: both TCP and SMS connections active; TCP in queue mode, SMS in standard mode',
+        },
+      ],
+    },
+    colProps: { span: 8 },
+  },
+  {
+    field: '5',
+    label: '启用',
+    colProps: { span: 22 },
+    component: 'Checkbox',
+    renderComponentContent: 'Notification storing when disabled or offline',
+  },
+  {
+    field: '6',
+    component: 'Select',
+    label: 'Security config mode',
+    defaultValue: 'No Security',
+    componentProps: {
+      options: [
+        {
+          label: 'No Security',
+          value: 'No Security',
+        },
+        {
+          label: 'Pre-Shared Key',
+          value: 'Pre-Shared Key',
+        },
+        {
+          label: 'Raw Public Key',
+          value: 'Raw Public Key',
+        },
+        {
+          label: 'X.509 Certificate',
+          value: 'X.509 Certificate',
+        },
+      ],
+    },
+    colProps: { span: 8 },
+  },
+  {
+    field: '7',
+    component: 'Input',
+    label: 'Host',
+    required: true,
+    defaultValue: '0.0.0.0',
+    colProps: { span: 8 },
+  },
+  {
+    field: '8',
+    component: 'InputNumber',
+    label: 'Port',
+    required: true,
+    defaultValue: 5688,
+    colProps: { span: 8 },
+  },
+  {
+    field: '9',
+    component: 'InputNumber',
+    label: 'Short ID',
+    required: true,
+    defaultValue: 111,
+    colProps: { span: 8 },
+  },
+  {
+    field: '10',
+    component: 'InputNumber',
+    label: 'Hold Off Time',
+    required: true,
+    defaultValue: 1,
+    colProps: { span: 8 },
+  },
+  {
+    field: '11',
+    component: 'InputNumber',
+    label: 'Account after the timeout',
+    required: true,
+    defaultValue: 0,
+    colProps: { span: 8 },
+  },
+  {
+    field: '12',
+    component: 'InputTextArea',
+    label: 'Account after the timeout',
+    required: true,
+    defaultValue: `3059301306072a8648ce3d020106082a8648ce3d03010703420004e353af009b814ee2f9ab393a975e0c39
+    e2fff60e3603fd6ee54a43b89a4f56258a7aa9c7e4a577760edb289dc955d91968473ee8a1bfc2b9c423563796113009`,
+    colProps: { span: 22 },
+    componentProps: {
+      autoSize: {
+        maxRows: 10,
+      },
+    },
+  },
+
+  {
+    field: '61',
+    component: 'Select',
+    label: 'Security config mode',
+    defaultValue: 'No Security',
+    componentProps: {
+      options: [
+        {
+          label: 'No Security',
+          value: 'No Security',
+        },
+        {
+          label: 'Pre-Shared Key',
+          value: 'Pre-Shared Key',
+        },
+        {
+          label: 'Raw Public Key',
+          value: 'Raw Public Key',
+        },
+        {
+          label: 'X.509 Certificate',
+          value: 'X.509 Certificate',
+        },
+      ],
+    },
+    colProps: { span: 8 },
+  },
+  {
+    field: '71',
+    component: 'Input',
+    label: 'Host',
+    required: true,
+    defaultValue: '0.0.0.0',
+    colProps: { span: 8 },
+  },
+  {
+    field: '81',
+    component: 'InputNumber',
+    label: 'Port',
+    required: true,
+    defaultValue: 5688,
+    colProps: { span: 8 },
+  },
+  {
+    field: '91',
+    component: 'InputNumber',
+    label: 'Short ID',
+    required: true,
+    defaultValue: 111,
+    colProps: { span: 8 },
+  },
+  {
+    field: '101',
+    component: 'InputNumber',
+    label: 'Hold Off Time',
+    required: true,
+    defaultValue: 1,
+    colProps: { span: 8 },
+  },
+  {
+    field: '111',
+    component: 'InputNumber',
+    label: 'Account after the timeout',
+    required: true,
+    defaultValue: 0,
+    colProps: { span: 8 },
+  },
+  {
+    field: '121',
+    component: 'InputTextArea',
+    label: 'Account after the timeout',
+    required: true,
+    defaultValue: `3059301306072a8648ce3d020106082a8648ce3d03010703420004e353af009b814ee2f9ab393a975e0c39
+    e2fff60e3603fd6ee54a43b89a4f56258a7aa9c7e4a577760edb289dc955d91968473ee8a1bfc2b9c423563796113009`,
+    colProps: { span: 22 },
+    componentProps: {
+      autoSize: {
+        maxRows: 10,
+      },
+    },
+  },
 ];
 
 export const settingsSchemas: FormSchema[] = [
   {
-    field: 'deviceTelemetryTopic',
+    field: '1',
+    component: 'Select',
+    label: 'Firmware update strategy',
+    defaultValue: 'Push firmware update as binary file using Object 5 and Resource 0 (Package)',
+    componentProps: {
+      options: [
+        {
+          label: 'Push firmware update as binary file using Object 5 and Resource 0 (Package)',
+          value: 'Push firmware update as binary file using Object 5 and Resource 0 (Package)',
+        },
+        {
+          label:
+            'Auto-generate unique CoAP URL to download the package and push firmware update as Object 5 and ',
+          value:
+            'Auto-generate unique CoAP URL to download the package and push firmware update as Object 5 and ',
+        },
+        {
+          label: 'Push firmware update as binary file using Object 19 and Resource 0 (Data)',
+          value: 'Push firmware update as binary file using Object 19 and Resource 0 (Data)',
+        },
+      ],
+    },
+    colProps: { span: 22 },
+  },
+  {
+    field: '2',
+    component: 'Select',
+    label: 'Firmware update strategy',
+    defaultValue: 'Push firmware update as binary file using Object 5 and Resource 0 (Package)',
+    componentProps: {
+      options: [
+        {
+          label: 'Push binary file using Object 9 and Resource 2 (Package)',
+          value: 'Push binary file using Object 9 and Resource 2 (Package)',
+        },
+        {
+          label:
+            'Auto-generate unique CoAP URL to download the package and push software update using Object 9 and  ',
+          value:
+            'Auto-generate unique CoAP URL to download the package and push software update using Object 9 and  ',
+        },
+      ],
+    },
+    colProps: { span: 22 },
+  },
+  {
+    field: '3',
     component: 'Input',
-    label: '筛选器',
+    label: 'Software update CoAP resource',
     required: true,
-    defaultValue: 'v1/devices/me/telemetry',
+    defaultValue: 'coap://localhost:5685',
     componentProps: {
-      placeholder: '请输入遥测数据 topic 筛选器',
+      placeholder: '请输入',
     },
     colProps: { span: 11 },
   },
+  {
+    field: '4',
+    component: 'Select',
+    label: 'Discontinuous Reception (DRX)',
+    defaultValue: 'Push firmware update as binary file using Object 5 and Resource 0 (Package)',
+    componentProps: {
+      options: [
+        {
+          label: 'Discontinuous Reception (DRX)',
+          value: 'Discontinuous Reception (DRX)',
+        },
+        {
+          label: 'Power Saving Mode (PSM)  ',
+          value: 'Power Saving Mode (PSM)  ',
+        },
+        {
+          label: 'Extended Discontinuous Reception (eDRX)  ',
+          value: 'Extended Discontinuous Reception (eDRX)  ',
+        },
+      ],
+    },
+    colProps: { span: 22 },
+  },
+  {
+    field: '5',
+    label: '启用',
+    colProps: { span: 22 },
+    component: 'Checkbox',
+    renderComponentContent: 'Supports composite Read/Write/Observe operations',
+  },
 ];
 
 export const deviceSchemas: FormSchema[] = [
   {
-    field: 'deviceTelemetryTopic',
-    component: 'Input',
-    label: '筛选器',
-    required: true,
-    defaultValue: 'v1/devices/me/telemetry',
+    field: '1',
+    label: 'LWM2M',
+    colProps: { span: 22 },
+    component: 'InputTextArea',
     componentProps: {
-      placeholder: '请输入遥测数据 topic 筛选器',
+      autoSize: {
+        maxRows: 30,
+      },
     },
-    colProps: { span: 11 },
+    defaultValue: `
+    {
+      "observeAttr": {
+        "observe": [],
+        "attribute": [],
+        "telemetry": [],
+        "keyName": {},
+        "attributeLwm2m": {}
+      },
+      "bootstrap": {
+        "servers": {
+          "binding": "UQ",
+          "shortId": 123,
+          "lifetime": 300,
+          "notifIfDisabled": true,
+          "defaultMinPeriod": 1
+        },
+        "bootstrapServer": {
+          "bootstrapServerIs": true,
+          "host": "0.0.0.0",
+          "port": 5687,
+          "securityHost": "0.0.0.0",
+          "securityPort": 5688,
+          "serverId": 111,
+          "clientHoldOffTime": 1,
+          "serverPublicKey": "",
+          "bootstrapServerAccountTimeout": 0
+        },
+        "lwm2mServer": {
+          "bootstrapServerIs": false,
+          "host": "0.0.0.0",
+          "port": 5685,
+          "securityHost": "0.0.0.0",
+          "securityPort": 5686,
+          "serverId": 123,
+          "clientHoldOffTime": 1,
+          "serverPublicKey": "",
+          "bootstrapServerAccountTimeout": 0
+        }
+      },
+      "clientLwM2mSettings": {
+        "clientOnlyObserveAfterConnect": 1,
+        "fwUpdateStrategy": 1,
+        "swUpdateStrategy": 2,
+        "swUpdateResource": "coap://localhost:5685",
+        "powerMode": "DRX",
+        "compositeOperationsSupport": false
+      },
+      "type": "LWM2M"
+    }
+    `,
   },
 ];