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

…eat/add-task-components-lesChamps

Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f…
…eat/add-task-components-lesChamps
loveumiko
2 parents bad447e3 15b017fc
Showing 6 changed files with 245 additions and 40 deletions
src/api/device/deviceManager.ts
src/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue
src/enums/toolEnum.ts
src/views/device/list/config/data.ts
src/views/device/list/cpns/tabs/CommandIssuance.vue
src/views/device/profiles/step/cpns/physical/cpns/config.ts
--- a/src/api/device/deviceManager.ts
View file @69e26c8
+++ b/src/api/device/deviceManager.ts
View file @69e26c8
@@ -13,6 +13,7 @@ import { ChildDeviceParams } from './model/deviceModel';
 import { PaginationResult } from '/#/axios';
 import { AlarmLogItem } from './model/deviceConfigModel';
 import { omit } from 'lodash-es';
+import { CommandDeliveryWayEnum } from '/@/enums/toolEnum';
 enum DeviceManagerApi {
   /**
    * 设备URL
@@ -260,11 +261,14 @@ export const generateSNCode = () => {
 };
 //命令下发
-export const commandIssuanceApi = (type, tbDeviceId, data) => {
-  const T = type === 'OneWay' ? 'oneway' : 'twoway';
+export const commandIssuanceApi = (
+  type: CommandDeliveryWayEnum,
+  tbDeviceId: string,
+  data: Recordable
+) => {
   return defHttp.post(
     {
-      url: DeviceManagerApi.COMMAND_ISSUANCE + '/' + T + '/' + tbDeviceId,
+      url: `${DeviceManagerApi.COMMAND_ISSUANCE}/${type}/${tbDeviceId}`,
       data,
     },
     {
--- a/src/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue
View file @69e26c8
+++ b/src/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue
View file @69e26c8
 <script lang="ts" setup>
   import { Card } from 'ant-design-vue';
-  import { nextTick, onBeforeUpdate, onUpdated } from 'vue';
+  import { computed, nextTick, onMounted, onUpdated, unref, watch } from 'vue';
   import { DataTypeEnum } from '../StructForm/config';
   import { BasicCreateFormParams } from './type';
   import { DynamicProps } from '/#/utils';
@@ -22,6 +22,11 @@
   const emit = defineEmits(['update:value']);
+  const getCurrentKeys = computed(() => {
+    const { inputData } = props;
+    return (inputData || []).map((item) => item.identifier);
+  });
+
   const [register, { setProps, getFieldsValue, setFieldsValue }] = useForm({
     schemas: [],
     showActionButtonGroup: false,
@@ -32,8 +37,16 @@
   });
   const syncValue = (key: string, value: any) => {
-    const record = getFieldsValue();
-    emit('update:value', { ...record, [key]: value });
+    let record = getFieldsValue();
+    record = { ...record, [key]: value };
+    const setValues = {};
+    Object.keys(record).forEach((key) => {
+      const hasKey = unref(getCurrentKeys).includes(key);
+      if (hasKey) {
+        setValues[key] = record[key];
+      }
+    });
+    emit('update:value', setValues);
   };
   const createInputNumber = ({
@@ -52,6 +65,8 @@
           type: 'number',
           trigger: 'change',
           validator: (_rule, value) => {
+            const reg = /^[0-9]*$/;
+            if (!reg.test(value)) return Promise.reject(`${functionName}不是一个有效的数字`);
             if (value < min || value > max) {
               return Promise.reject(`${functionName}取值范围在${min}~${max}之间`);
             }
@@ -167,19 +182,37 @@
     return schemas;
   };
-  onBeforeUpdate(() => {
-    if (props.inputData && props.inputData.length) {
-      const schemas = transformToFormSchema(props.inputData);
+  const generateSchemas = (value: StructJSON[]) => {
+    if (value && value.length) {
+      const schemas = transformToFormSchema(value);
       setProps({ schemas });
     }
+  };
+
+  onMounted(() => {
+    generateSchemas(props.inputData);
   });
   onUpdated(async () => {
     if (props.inputData && props.inputData.length) {
       await nextTick();
-      setFieldsValue(props.value);
+      setFieldsValue(props.value || {});
     }
   });
+
+  watch(
+    () => props.inputData,
+    (value) => {
+      generateSchemas(value);
+    }
+  );
+
+  watch(
+    () => props.formProps,
+    (value) => {
+      setProps(value);
+    }
+  );
 </script>
 <template>
--- a/src/enums/toolEnum.ts
View file @69e26c8
+++ b/src/enums/toolEnum.ts
View file @69e26c8
@@ -34,3 +34,13 @@ export enum ReadAndWriteEnum {
   READ = 'r',
   READ_AND_WRITE = 'rw',
 }
+
+export enum ServiceCallTypeEnum {
+  ASYNC = 'ASYNC',
+  SYNC = 'SYNC',
+}
+
+export enum CommandDeliveryWayEnum {
+  ONE_WAY = 'oneway',
+  TWO_WAY = 'twoway',
+}
--- a/src/views/device/list/config/data.ts
View file @69e26c8
+++ b/src/views/device/list/config/data.ts
View file @69e26c8
-import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { FormProps, FormSchema, useComponentRegister } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile, getGatewayDevice } from '/@/api/device/deviceManager';
 import { TransportTypeEnum } from '../../profiles/components/TransportDescript/const';
 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
 import { JSONEditor } from '/@/components/CodeEditor';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+import { getModelServices } from '/@/api/device/modelOfMatter';
+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+import { toRaw, unref } from 'vue';
+import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
+import { CommandDeliveryWayEnum, ServiceCallTypeEnum } from '/@/enums/toolEnum';
 useComponentRegister('JSONEditor', JSONEditor);
+useComponentRegister('ObjectModelValidateForm', ObjectModelValidateForm);
 export enum TypeEnum {
   IS_GATEWAY = 'GATEWAY',
@@ -711,37 +717,87 @@ export const TokenSchemas: FormSchema[] = [
   },
 ];
-export const CommandSchemas = (transportType: TransportTypeEnum): FormSchema[] => {
+export enum ValueType {
+  JSON = 'json',
+  STRING = 'string',
+}
+
+export enum CommandFieldsEnum {
+  COMMAND_TYPE = 'commandType',
+  VALUE_TYPE = 'valueType',
+  COMMAND_TEXT = 'commandText',
+  COMAND_VALUE = 'commandValue',
+  SERVICE = 'service',
+  SERVICE_TYPE = 'service_type',
+  TCP_SERVICE = 'tcpService',
+  MODEL_INPUT = 'modelInput',
+  CUSTOM_TYPE = 'customType',
+}
+
+export enum CommandType {
+  CUSTOM = 'custom',
+  SERVICE = 'service',
+}
+
+export const CommandSchemas = (
+  transportType: TransportTypeEnum,
+  deviceProfileId: string
+): FormSchema[] => {
   return [
     {
-      field: 'commandType',
+      field: CommandFieldsEnum.COMMAND_TYPE,
       component: 'RadioGroup',
       label: '下发类型',
-      defaultValue: 'OneWay',
+      defaultValue: CommandType.CUSTOM,
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          options: [
+            { label: '自定义', value: CommandType.CUSTOM },
+            { label: '服务', value: CommandType.SERVICE },
+          ],
+          onChange() {
+            setFieldsValue({
+              [CommandFieldsEnum.SERVICE]: null,
+              [CommandFieldsEnum.MODEL_INPUT]: null,
+              [CommandFieldsEnum.COMAND_VALUE]: null,
+              [CommandFieldsEnum.COMMAND_TEXT]: null,
+            });
+          },
+        };
+      },
+    },
+    {
+      field: CommandFieldsEnum.CUSTOM_TYPE,
+      component: 'RadioGroup',
+      label: '单向/双向',
+      defaultValue: CommandDeliveryWayEnum.ONE_WAY,
+      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
       componentProps: {
         options: [
           {
             label: '单向',
-            value: 'OneWay',
+            value: CommandDeliveryWayEnum.ONE_WAY,
           },
           {
             label: '双向',
-            value: 'TwoWay',
+            value: CommandDeliveryWayEnum.TWO_WAY,
           },
         ],
       },
     },
     {
-      field: 'valueType',
+      field: CommandFieldsEnum.VALUE_TYPE,
       label: '命令类型',
       component: 'RadioGroup',
-      defaultValue: transportType === TransportTypeEnum.TCP ? 'string' : 'json',
+      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
+      defaultValue: transportType === TransportTypeEnum.TCP ? ValueType.STRING : ValueType.JSON,
       componentProps: () => {
         const options: Record<'label' | 'value', string>[] = [];
         if (transportType === TransportTypeEnum.TCP) {
-          options.push({ label: '字符串', value: 'string' });
+          options.push({ label: '字符串', value: ValueType.STRING });
         } else {
-          options.push({ label: 'JSON', value: 'json' });
+          options.push({ label: 'JSON', value: ValueType.JSON });
         }
         return {
           options,
@@ -749,18 +805,18 @@ export const CommandSchemas = (transportType: TransportTypeEnum): FormSchema[] =
       },
     },
     {
-      field: 'commandText',
-      label: '请输入命令内容',
-      ifShow: ({ model }) => {
-        return model['valueType'] === 'string';
-      },
+      field: CommandFieldsEnum.COMMAND_TEXT,
+      label: '命令',
+      ifShow: ({ model }) =>
+        model[CommandFieldsEnum.VALUE_TYPE] === ValueType.STRING &&
+        model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
       component: 'InputTextArea',
       componentProps: {
         autoSize: {
-          minRows: 6,
+          minRows: 3,
         },
+        placeholder: '请输入命令内容',
       },
-      colProps: { span: 20 },
       dynamicRules: () => {
         return [
           {
@@ -778,19 +834,97 @@ export const CommandSchemas = (transportType: TransportTypeEnum): FormSchema[] =
       },
     },
     {
-      field: 'commandValue',
-      label: '请输入命令内容',
+      field: CommandFieldsEnum.COMAND_VALUE,
+      label: '命令',
       component: 'JSONEditor',
       colProps: { span: 20 },
       changeEvent: 'update:value',
       valueField: 'value',
       rules: [...JSONEditorValidator()],
-      ifShow: ({ model }) => {
-        return model['valueType'] === 'json';
-      },
+      ifShow: ({ model }) =>
+        model[CommandFieldsEnum.VALUE_TYPE] === ValueType.JSON &&
+        model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
+
       componentProps: {
         height: 250,
       },
     },
+    {
+      field: CommandFieldsEnum.SERVICE,
+      label: '服务',
+      component: 'ApiSelect',
+      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] !== CommandType.CUSTOM,
+      rules: [{ required: true, message: '请选择服务' }],
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue, updateSchema } = formActionType;
+        return {
+          api: async () => {
+            try {
+              const result = await getModelServices({ deviceProfileId });
+              return result || [];
+            } catch (error) {
+              console.error(error);
+              return [];
+            }
+          },
+          valueField: 'id',
+          labelField: 'functionName',
+          getPopupContainer: () => document.body,
+          onChange(value: string, options: ModelOfMatterParams) {
+            if (!value) return;
+
+            const setValues = {
+              [CommandFieldsEnum.CUSTOM_TYPE]:
+                options.callType === ServiceCallTypeEnum.ASYNC
+                  ? CommandDeliveryWayEnum.TWO_WAY
+                  : CommandDeliveryWayEnum.ONE_WAY,
+              [CommandFieldsEnum.MODEL_INPUT]: null,
+            };
+
+            if (transportType !== TransportTypeEnum.TCP) {
+              updateSchema({
+                field: CommandFieldsEnum.MODEL_INPUT,
+                componentProps: {
+                  inputData: toRaw(unref(options.functionJson.inputData)),
+                },
+              });
+            } else {
+              Object.assign(setValues, {
+                [CommandFieldsEnum.TCP_SERVICE]:
+                  options.functionJson?.inputData?.[0]?.serviceCommand,
+              });
+            }
+
+            setFieldsValue(setValues);
+          },
+        };
+      },
+    },
+    {
+      field: CommandFieldsEnum.TCP_SERVICE,
+      component: 'Input',
+      label: '命令',
+      dynamicDisabled: true,
+      ifShow: ({ model }) =>
+        model[CommandFieldsEnum.SERVICE] &&
+        transportType === TransportTypeEnum.TCP &&
+        model[CommandFieldsEnum.COMMAND_TYPE] !== CommandType.CUSTOM,
+    },
+    {
+      field: CommandFieldsEnum.MODEL_INPUT,
+      component: 'ObjectModelValidateForm',
+      label: '输入参数',
+      changeEvent: 'update:value',
+      valueField: 'value',
+      ifShow: ({ model }) =>
+        model[CommandFieldsEnum.SERVICE] &&
+        transportType !== TransportTypeEnum.TCP &&
+        model[CommandFieldsEnum.COMMAND_TYPE] !== CommandType.CUSTOM,
+      componentProps: {
+        formProps: {
+          wrapperCol: { span: 24 },
+        } as FormProps,
+      },
+    },
   ];
 };
--- a/src/views/device/list/cpns/tabs/CommandIssuance.vue
View file @69e26c8
+++ b/src/views/device/list/cpns/tabs/CommandIssuance.vue
View file @69e26c8
@@ -12,7 +12,7 @@
 <script lang="ts">
   import { defineComponent, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { CommandSchemas } from '../../config/data';
+  import { CommandFieldsEnum, CommandSchemas, CommandType, ValueType } from '../../config/data';
   import { commandIssuanceApi } from '/@/api/device/deviceManager';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Button } from '/@/components/Button';
@@ -20,6 +20,7 @@
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { TransportTypeEnum } from '../../../profiles/components/TransportDescript/const';
   import { parseStringToJSON } from '/@/components/CodeEditor/src/JSONEditor';
+  import { CommandDeliveryWayEnum } from '/@/enums/toolEnum';
   export default defineComponent({
     components: { BasicForm, Button, Space },
@@ -37,8 +38,10 @@
       const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
         labelWidth: 120,
         schemas: CommandSchemas(
-          props.deviceDetail.deviceProfile.transportType as TransportTypeEnum
+          props.deviceDetail.deviceProfile.transportType as TransportTypeEnum,
+          props.deviceDetail.deviceProfileId
         ),
+        baseColProps: { span: 20 },
         labelAlign: 'right',
         showSubmitButton: false,
         showResetButton: false,
@@ -59,14 +62,27 @@
           let command = {
             persistent: true,
             method: 'methodThingskit',
-            params: field.commandText,
+            params: field[CommandFieldsEnum.COMMAND_TEXT],
           };
-          if (field.valueType === 'json') {
-            const { json } = parseStringToJSON(field.commandValue);
-            command.params = json;
+
+          if (field[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM) {
+            if (field[CommandFieldsEnum.VALUE_TYPE] === ValueType.JSON) {
+              const { json } = parseStringToJSON(field.commandValue);
+              command.params = json;
+            }
+          } else {
+            const { transportType } = props.deviceDetail.deviceProfile;
+            command.params =
+              transportType === TransportTypeEnum.TCP
+                ? field[CommandFieldsEnum.TCP_SERVICE]
+                : field[CommandFieldsEnum.MODEL_INPUT];
           }
-          commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, command)
+          commandIssuanceApi(
+            field[CommandFieldsEnum.CUSTOM_TYPE] as CommandDeliveryWayEnum,
+            props.deviceDetail.tbDeviceId,
+            command
+          )
             .then((res) => {
               if (!res) return;
               createMessage.success('命令下发成功');
@@ -100,9 +116,15 @@
     },
   });
 </script>
-<style scoped>
+<style scoped lang="less">
   .jsoneditor-transform {
     background-position: -144px -96px;
     display: none !important;
   }
+
+  .tabs-detail:deep(.object-model-validate-form) {
+    > .ant-row {
+      @apply w-full;
+    }
+  }
 </style>
--- a/src/views/device/profiles/step/cpns/physical/cpns/config.ts
View file @69e26c8
+++ b/src/views/device/profiles/step/cpns/physical/cpns/config.ts
View file @69e26c8
@@ -116,6 +116,7 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
       field: FormField.SERVICE_COMMAND,
       label: '输入参数',
       component: 'Input',
+      rules: [{ message: '输入参数为必填项', required: true }],
       ifShow: tcpDeviceFlag,
       componentProps: {
         placeholder: '请输入ASCII或HEX服务命令',
@@ -127,6 +128,7 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
       component: 'StructForm',
       valueField: 'value',
       changeEvent: 'update:value',
+      rules: [{ message: '输入参数为必填项', required: true, type: 'array' }],
       ifShow: !tcpDeviceFlag,
       colProps: { span: 24 },
     },