Merge branch 'ww' into 'main'

feat: 场景联动服务调用新增根据物模型服务配置下发参数表单

See merge request yunteng/thingskit-front!495

@@ -40,6 +40,7 @@ import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import TransferModal from './components/TransferModal.vue';
 import TransferModal from './components/TransferModal.vue';
 import TransferTableModal from './components/TransferTableModal.vue';
 import TransferTableModal from './components/TransferTableModal.vue';
+import ObjectModelValidateForm from './externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 
 
 const componentMap = new Map<ComponentType, Component>();
 const componentMap = new Map<ComponentType, Component>();
 
 
@@ -87,6 +88,7 @@ componentMap.set('StructForm', StructForm);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
 componentMap.set('TransferModal', TransferModal);
 componentMap.set('TransferModal', TransferModal);
 componentMap.set('TransferTableModal', TransferTableModal);
 componentMap.set('TransferTableModal', TransferTableModal);
+componentMap.set('ObjectModelValidateForm', ObjectModelValidateForm);
 
 
 export function add(compName: ComponentType, component: Component) {
 export function add(compName: ComponentType, component: Component) {
   componentMap.set(compName, component);
   componentMap.set(compName, component);

+<script lang="ts" setup>
+  import { Card } from 'ant-design-vue';
+  import { nextTick, onBeforeUpdate, onUpdated } from 'vue';
+  import { DataTypeEnum } from '../StructForm/config';
+  import { BasicCreateFormParams } from './type';
+  import { DynamicProps } from '/#/utils';
+  import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
+  import { BasicForm, FormProps, FormSchema, useForm } from '/@/components/Form';
+
+  const props = withDefaults(
+    defineProps<{
+      inputData?: StructJSON[];
+      formProps?: FormProps;
+      value?: Recordable;
+    }>(),
+    {
+      inputData: () => [] as StructJSON[],
+      formProps: () => ({}),
+      value: () => ({}),
+    }
+  );
+
+  const emit = defineEmits(['update:value']);
+
+  const [register, { setProps, getFieldsValue, setFieldsValue }] = useForm({
+    schemas: [],
+    showActionButtonGroup: false,
+    layout: 'inline',
+    labelWidth: 80,
+    wrapperCol: { span: 12 },
+    ...(props.formProps || ({} as unknown as Partial<DynamicProps<FormProps>>)),
+  });
+
+  const syncValue = (key: string, value: any) => {
+    const record = getFieldsValue();
+    emit('update:value', { ...record, [key]: value });
+  };
+
+  const createInputNumber = ({
+    identifier,
+    functionName,
+    specs,
+  }: BasicCreateFormParams): FormSchema => {
+    const { valueRange } = specs! as Partial<Specs>;
+    const { max = 2147483647, min = -2147483648 } = valueRange || {};
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'InputNumber',
+      rules: [
+        {
+          type: 'number',
+          trigger: 'change',
+          validator: (_rule, value) => {
+            if (value < min || value > max) {
+              return Promise.reject(`${functionName}取值范围在${min}~${max}之间`);
+            }
+            return Promise.resolve(value);
+          },
+        },
+      ],
+      componentProps: {
+        max,
+        min,
+        // step: step,
+        // formatter: (value: string) => value,
+        // parser: (string: string) => {
+        //   if (dataType === DataTypeEnum.IS_NUMBER_INT) {
+        //     return Number(Number(string).toFixed());
+        //   }
+        //   return Number(string);
+        // },
+        onChange: (value: string) => {
+          syncValue(identifier, value);
+        },
+      },
+    } as FormSchema;
+  };
+
+  const createInput = ({ identifier, functionName, specs }: BasicCreateFormParams): FormSchema => {
+    const { length = 10240 } = specs! as Partial<Specs>;
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'Input',
+      rules: [
+        {
+          type: 'string',
+          trigger: 'change',
+          validator: (_rule, value) => {
+            if (value.length > length) {
+              return Promise.reject(`${functionName}数据长度应该小于${length}`);
+            }
+            return Promise.resolve(value);
+          },
+        },
+      ],
+      componentProps: {
+        maxLength: length,
+        onChange: (value: InputEvent) => {
+          syncValue(identifier, (value.target as HTMLInputElement).value);
+        },
+      },
+    } as FormSchema;
+  };
+
+  const createSelect = ({ identifier, functionName, specs }: BasicCreateFormParams): FormSchema => {
+    const { boolClose, boolOpen } = specs! as Partial<Specs>;
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: `${boolClose}-0`, value: 0 },
+          { label: `${boolOpen}-0`, value: 1 },
+        ],
+        onChange: (value: string) => {
+          syncValue(identifier, value);
+        },
+      },
+    };
+  };
+
+  const createInputJson = ({ identifier, functionName }: BasicCreateFormParams): FormSchema => {
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'InputTextArea',
+      componentProps: {
+        onChange: (value: InputEvent) => {
+          syncValue(identifier, (value.target as HTMLInputElement).value);
+        },
+      },
+    };
+  };
+
+  const transformToFormSchema = (inputData: StructJSON[]) => {
+    const schemas: FormSchema[] = [];
+    for (const item of inputData) {
+      const { dataType, identifier, functionName } = item;
+      const { type, specs } = dataType! || {};
+
+      const params: BasicCreateFormParams = {
+        identifier: identifier!,
+        functionName: functionName!,
+        dataType: dataType! as unknown as DataTypeEnum,
+        specs: specs as Partial<Specs>,
+      };
+      if (type === DataTypeEnum.IS_NUMBER_INT || type === DataTypeEnum.IS_NUMBER_DOUBLE) {
+        schemas.push(createInputNumber(params));
+      }
+
+      if (type === DataTypeEnum.IS_BOOL) {
+        schemas.push(createSelect(params));
+      }
+
+      if (type === DataTypeEnum.IS_STRING) {
+        schemas.push(createInput(params));
+      }
+
+      if (type === DataTypeEnum.IS_STRUCT) {
+        schemas.push(createInputJson(params));
+      }
+    }
+
+    return schemas;
+  };
+
+  onBeforeUpdate(() => {
+    if (props.inputData && props.inputData.length) {
+      const schemas = transformToFormSchema(props.inputData);
+      setProps({ schemas });
+    }
+  });
+
+  onUpdated(async () => {
+    if (props.inputData && props.inputData.length) {
+      await nextTick();
+      setFieldsValue(props.value);
+    }
+  });
+</script>
+
+<template>
+  <Card bordered class="!border-dashed !rounded-lg !border-2px">
+    <!-- <Alert class="!mb-4 w-32" message="服务参数配置" type="info" /> -->
+    <BasicForm class="object-model-validate-form" @register="register" />
+  </Card>
+</template>
+
+<style lang="less">
+  .object-model-validate-form {
+    .ant-input-number {
+      width: 100% !important;
+    }
+  }
+</style>

+import { DataTypeEnum } from '../StructForm/config';
+import { Specs } from '/@/api/device/model/modelOfMatterModel';
+
+export interface BasicCreateFormParams {
+  identifier: string;
+  functionName: string;
+  dataType: DataTypeEnum;
+  specs: Partial<Specs>;
+}

@@ -110,6 +110,7 @@
     <StructFormModel
     <StructFormModel
       :has-struct-form="$props.hasStructForm!"
       :has-struct-form="$props.hasStructForm!"
       :disabled="$props.disabled"
       :disabled="$props.disabled"
+      :value-list="getValue"
       @register="registerModal"
       @register="registerModal"
       @submit="handleSaveStruct"
       @submit="handleSaveStruct"
     />
     />

@@ -7,21 +7,28 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchemas } from './config';
   import { formSchemas } from './config';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { OpenModalMode, OpenModalParams } from './type';
+  import { OpenModalMode, OpenModalParams, StructRecord } from './type';
   import { ref, unref } from 'vue';
   import { ref, unref } from 'vue';
   import { transfromToStructJSON } from './util';
   import { transfromToStructJSON } from './util';
   import { cloneDeep } from 'lodash-es';
   import { cloneDeep } from 'lodash-es';
   import { DataType, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { DataType, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { isArray } from '/@/utils/is';
   import { isArray } from '/@/utils/is';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const modalReceiveRecord = ref<OpenModalParams>({
   const modalReceiveRecord = ref<OpenModalParams>({
     mode: OpenModalMode.CREATE,
     mode: OpenModalMode.CREATE,
   });
   });
 
 
-  const props = defineProps<{ disabled: boolean; hasStructForm: boolean }>();
+  const props = defineProps<{
+    disabled: boolean;
+    hasStructForm: boolean;
+    valueList: StructRecord[];
+  }>();
 
 
   const emit = defineEmits(['register', 'submit']);
   const emit = defineEmits(['register', 'submit']);
 
 
+  const { createMessage } = useMessage();
+
   const [register, { validate, setFieldsValue, setProps }] = useForm({
   const [register, { validate, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
     schemas: formSchemas(props.hasStructForm),
     schemas: formSchemas(props.hasStructForm),
@@ -52,6 +59,10 @@
     setProps({ disabled: props.disabled });
     setProps({ disabled: props.disabled });
   });
   });
 
 
+  const validateRepeat = (value: StructRecord, valueList: StructRecord[]) => {
+    return valueList.filter((item) => item.identifier === value.identifier).length >= 1;
+  };
+
   const handleSubmit = async () => {
   const handleSubmit = async () => {
     try {
     try {
       const _value = await validate();
       const _value = await validate();
@@ -62,6 +73,12 @@
           ? { id: unref(modalReceiveRecord)?.record?.id }
           ? { id: unref(modalReceiveRecord)?.record?.id }
           : {}),
           : {}),
       };
       };
+
+      if (validateRepeat(_value, props.valueList)) {
+        createMessage.error('存在一致的标识符');
+        return;
+      }
+
       emit('submit', unref(modalReceiveRecord).mode, cloneDeep(value));
       emit('submit', unref(modalReceiveRecord).mode, cloneDeep(value));
       closeModal();
       closeModal();
     } catch (error) {}
     } catch (error) {}

@@ -121,4 +121,5 @@ export type ComponentType =
   | 'StructForm'
   | 'StructForm'
   | 'ApiSelectScrollLoad'
   | 'ApiSelectScrollLoad'
   | 'TransferModal'
   | 'TransferModal'
-  | 'TransferTableModal';
+  | 'TransferTableModal'
+  | 'ObjectModelValidateForm';

@@ -5,19 +5,19 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { formatToDateTime } from '/@/utils/dateUtil';
 import { formatToDateTime } from '/@/utils/dateUtil';
 
 
-enum EventType {
+export enum EventType {
   ERROR = 'ERROR',
   ERROR = 'ERROR',
   INFO = 'INFO',
   INFO = 'INFO',
   ALERT = 'ALERT',
   ALERT = 'ALERT',
 }
 }
 
 
-enum EventTypeColor {
+export enum EventTypeColor {
   ERROR = 'error',
   ERROR = 'error',
-  INFO = 'warning',
-  ALERT = 'default',
+  INFO = 'success',
+  ALERT = 'warning',
 }
 }
 
 
-enum EventTypeName {
+export enum EventTypeName {
   ERROR = '故障',
   ERROR = '故障',
   INFO = '信息',
   INFO = '信息',
   ALERT = '告警',
   ALERT = '告警',

@@ -8,6 +8,7 @@ import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
 import { FormField, FunctionType } from './step/cpns/physical/cpns/config';
 import { FormField, FunctionType } from './step/cpns/physical/cpns/config';
 import { h } from 'vue';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
+import { EventType, EventTypeColor, EventTypeName } from '../list/cpns/tabs/EventManage/config';
 
 
 export enum Mode {
 export enum Mode {
   CARD = 'card',
   CARD = 'card',
@@ -81,6 +82,19 @@ export const physicalColumn: BasicColumn[] = [
     },
     },
   },
   },
   {
   {
+    title: '事件类型',
+    dataIndex: 'eventType',
+    customRender({ text }) {
+      return h(
+        Tag,
+        {
+          color: EventTypeColor[text as EventType],
+        },
+        () => EventTypeName[text as EventType]
+      );
+    },
+  },
+  {
     title: '状态',
     title: '状态',
     dataIndex: 'status',
     dataIndex: 'status',
     width: 100,
     width: 100,

@@ -567,11 +567,11 @@
     //TODO fengtao
     //TODO fengtao
     orgId.value = newValue;
     orgId.value = newValue;
     //TODO fengtao
     //TODO fengtao
-    const data = await getOrganizationAlarmConfig({ organizationId: newValue });
-    alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
+    const data = await getOrganizationAlarmConfig({ organizationId: newValue });
+    alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
     // setFields(skipUnwrap.actionItemRefs, true);
     // setFields(skipUnwrap.actionItemRefs, true);
     // console.log(unref(organizationIdRef));
     // console.log(unref(organizationIdRef));
     // setAlarmConfig(skipUnwrap.actionItemRefs, true);
     // setAlarmConfig(skipUnwrap.actionItemRefs, true);

@@ -20,6 +20,11 @@ export type TOption = {
   value: string;
   value: string;
 };
 };
 
 
+export enum CommandTypeEnum {
+  CUSTOM = 0,
+  SERVICE = 1,
+}
+
 /**
 /**
  * 所使用的枚举值
  * 所使用的枚举值
  */
  */
@@ -575,11 +580,28 @@ export const actionSchema: FormSchema[] = [
       span: 6,
       span: 6,
     },
     },
     componentProps: ({ formModel, formActionType }) => {
     componentProps: ({ formModel, formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      const deviceProfileId = formModel['deviceProfileId'];
+      const { updateSchema } = formActionType;
+      const deviceProfileId = Reflect.get(formModel, 'deviceProfileId');
+      const thingsModelId = Reflect.get(formModel, 'thingsModelId');
       return {
       return {
         placeholder: '请选择服务',
         placeholder: '请选择服务',
-        api: getModelServices,
+        api: async (params: Recordable) => {
+          try {
+            const record = await getModelServices(params as Record<'deviceProfileId', string>);
+            const selected = record.find((item) => item.id === thingsModelId);
+            selected &&
+              updateSchema({
+                field: 'serviceInputValue',
+                componentProps: {
+                  inputData: selected?.functionJson.inputData,
+                },
+              });
+            return record;
+          } catch (error) {
+            console.error(error);
+            return [];
+          }
+        },
         params: {
         params: {
           deviceProfileId,
           deviceProfileId,
         },
         },
@@ -587,7 +609,15 @@ export const actionSchema: FormSchema[] = [
         valueField: 'id',
         valueField: 'id',
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
         onChange: (_, options: ModelOfMatterParams) => {
         onChange: (_, options: ModelOfMatterParams) => {
-          setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });
+          if (options) {
+            // setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });
+            updateSchema({
+              field: 'serviceInputValue',
+              componentProps: {
+                inputData: options.functionJson.inputData,
+              },
+            });
+          }
         },
         },
       };
       };
     },
     },
@@ -665,6 +695,18 @@ export const actionSchema: FormSchema[] = [
     },
     },
     slot: 'clearAlarm',
     slot: 'clearAlarm',
   },
   },
+  {
+    field: 'serviceInputValue',
+    component: 'ObjectModelValidateForm',
+    label: '',
+    changeEvent: 'update:value',
+    valueField: 'value',
+    show: ({ values }) => values['thingsModelId'],
+    colProps: {
+      span: 24,
+    },
+    componentProps: {},
+  },
 ];
 ];
 
 
 export const alarmScheduleSchemas: FormSchema[] = [
 export const alarmScheduleSchemas: FormSchema[] = [

@@ -103,7 +103,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Tooltip, Select, Checkbox, Card } from 'ant-design-vue';
   import { Tooltip, Select, Checkbox, Card } from 'ant-design-vue';
   import { Icon } from '/@/components/Icon';
   import { Icon } from '/@/components/Icon';
-  import { actionSchema } from '../config/config.data';
+  import { actionSchema, CommandTypeEnum } from '../config/config.data';
   import jsoneditor from 'jsoneditor';
   import jsoneditor from 'jsoneditor';
   import 'jsoneditor/dist/jsoneditor.min.css';
   import 'jsoneditor/dist/jsoneditor.min.css';
   import { QuestionCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
   import { QuestionCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
@@ -261,19 +261,26 @@
     //TODO-fengtao-设备验证
     //TODO-fengtao-设备验证
     const value = getFieldsValue();
     const value = getFieldsValue();
     const doContext = unref(jsonInstance)?.get() || {};
     const doContext = unref(jsonInstance)?.get() || {};
+    const serviceInputValue = Reflect.get(value, 'serviceInputValue');
+
     return {
     return {
       ...value,
       ...value,
-      ...(Number(value.commandType) === 0 ? { doContext } : {}),
+      ...(Number(value.commandType) === CommandTypeEnum.CUSTOM
+        ? { doContext }
+        : { doContext: serviceInputValue }),
       clearRule,
       clearRule,
     };
     };
   };
   };
 
 
   const setFieldsFormValueFun = (fieldsValue) => {
   const setFieldsFormValueFun = (fieldsValue) => {
+    const doContext = Reflect.get(fieldsValue, 'doContext');
+    const commandType = Reflect.get(fieldsValue, 'commandType');
     setFieldsValue({
     setFieldsValue({
       ...fieldsValue,
       ...fieldsValue,
       ...(isNumber(fieldsValue.commandType)
       ...(isNumber(fieldsValue.commandType)
         ? { commandType: String(fieldsValue.commandType) }
         ? { commandType: String(fieldsValue.commandType) }
         : {}),
         : {}),
+      serviceInputValue: commandType === CommandTypeEnum.SERVICE ? doContext.params || {} : {},
     });
     });
   };
   };
   //ft-add
   //ft-add