Merge branch 'fix/DEFECT-1414' into 'main_dev'

fix: DEFECT-1414修复任务中心寄存器验证未通过

See merge request yunteng/thingskit-front!742

@@ -51,6 +51,7 @@ export interface ModelOfMatterParams {
   callType?: string;
   callType?: string;
   eventType?: string;
   eventType?: string;
   accessMode?: string;
   accessMode?: string;
+  extensionDesc?: Recordable;
 }
 }
 
 
 export interface GetModelTslParams {
 export interface GetModelTslParams {

@@ -39,6 +39,8 @@ import CustomMinMaxInput from './externalCompns/components/CustomMinMaxInput.vue
 import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import InputGroup from './components/InputGroup.vue';
 import InputGroup from './components/InputGroup.vue';
+import RegisterAddressInput from '/@/views/task/center/components/PollCommandInput/RegisterAddressInput.vue';
+import ExtendDesc from '/@/components/Form/src/externalCompns/components/ExtendDesc/index.vue';
 
 
 const componentMap = new Map<ComponentType, Component>();
 const componentMap = new Map<ComponentType, Component>();
 
 
@@ -85,6 +87,8 @@ componentMap.set('CustomMinMaxInput', CustomMinMaxInput);
 componentMap.set('StructForm', StructForm);
 componentMap.set('StructForm', StructForm);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
 componentMap.set('InputGroup', InputGroup);
 componentMap.set('InputGroup', InputGroup);
+componentMap.set('RegisterAddressInput', RegisterAddressInput);
+componentMap.set('ExtendDesc', ExtendDesc);
 
 
 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 { Button } from 'ant-design-vue';
+  import { nextTick, ref, watch } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { BasicModal } from '/@/components/Modal';
+
+  const show = ref(false);
+
+  const props = withDefaults(
+    defineProps<{
+      value?: object;
+      disabled?: boolean;
+    }>(),
+    {
+      value: () => ({}),
+    }
+  );
+
+  const emit = defineEmits(['update:value']);
+
+  const [registerForm, { setFieldsValue, getFieldsValue, setProps }] = useForm({
+    schemas: [
+      {
+        field: 'registerAddress',
+        component: 'Input',
+        label: '寄存器地址',
+        componentProps: {
+          placeholder: '请输入寄存器地址',
+        },
+      },
+    ],
+    showActionButtonGroup: false,
+  });
+
+  const handleClick = async () => {
+    show.value = true;
+    await nextTick();
+    setProps({ disabled: props.disabled });
+    setFieldsValue(props.value);
+  };
+
+  const handleSubmit = () => {
+    const value = getFieldsValue();
+    emit('update:value', value);
+    show.value = false;
+  };
+
+  watch(
+    () => props.value,
+    (value) => {
+      setFieldsValue(value);
+    }
+  );
+</script>
+
+<template>
+  <section>
+    <Button type="link" @click="handleClick">新增扩展描述</Button>
+    <BasicModal title="扩展描述" v-model:visible="show" @ok="handleSubmit">
+      <BasicForm @register="registerForm" />
+    </BasicModal>
+  </section>
+</template>

@@ -28,7 +28,7 @@ export const validateJSON = (_rule, value = [] as ModelOfMatterParams[], _callba
   return Promise.reject('JSON对象不能为空');
   return Promise.reject('JSON对象不能为空');
 };
 };
 
 
-export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
+export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[] => {
   return [
   return [
     {
     {
       field: FormField.FUNCTION_NAME,
       field: FormField.FUNCTION_NAME,
@@ -276,6 +276,27 @@ export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
       ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRING,
       ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRING,
     },
     },
     {
     {
+      field: FormField.EXTENSION_DESC,
+      component: 'ExtendDesc',
+      label: '扩展描述',
+      valueField: 'value',
+      changeEvent: 'update:value',
+      rules: [
+        {
+          message: '请输入扩展描述',
+          required: true,
+          validator(_rule, value, _callback) {
+            if (!value?.['registerAddress']) return Promise.reject('请输入寄存器地址');
+            return Promise.resolve();
+          },
+        },
+      ],
+      ifShow: isTcp,
+      colProps: {
+        span: 16,
+      },
+    },
+    {
       field: FormField.ACCESS_MODE,
       field: FormField.ACCESS_MODE,
       component: 'ApiRadioGroup',
       component: 'ApiRadioGroup',
       label: '读写类型',
       label: '读写类型',

@@ -129,4 +129,5 @@ export type ComponentType =
   | 'RegisterAddressInput'
   | 'RegisterAddressInput'
   | 'ControlGroup'
   | 'ControlGroup'
   | 'JSONEditor'
   | 'JSONEditor'
-  | 'OrgTreeSelect';
+  | 'OrgTreeSelect'
+  | 'ExtendDesc';

@@ -30,6 +30,7 @@
         <Attribute
         <Attribute
           v-if="activeKey === FunctionType.PROPERTIES"
           v-if="activeKey === FunctionType.PROPERTIES"
           :openModalMode="openModalMode"
           :openModalMode="openModalMode"
+          :transportType="record.transportType"
           ref="AttrRef"
           ref="AttrRef"
         />
         />
         <Service
         <Service

@@ -13,12 +13,13 @@
   import { isArray } from 'lodash';
   import { isArray } from 'lodash';
   import { OpenModelMode } from '../types';
   import { OpenModelMode } from '../types';
   import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config';
+  import { TransportTypeEnum } from '../../../../components/TransportDescript/const';
 
 
-  defineProps<{ openModalMode: OpenModelMode }>();
+  const props = defineProps<{ openModalMode: OpenModelMode; transportType: string }>();
 
 
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
-    schemas: formSchemas(false),
+    schemas: formSchemas(false, props.transportType === TransportTypeEnum.TCP),
     actionColOptions: {
     actionColOptions: {
       span: 14,
       span: 14,
     },
     },
@@ -37,13 +38,13 @@
     const { functionName, remark, identifier, accessMode } = _values;
     const { functionName, remark, identifier, accessMode } = _values;
     const structJSON = transfromToStructJSON(_values);
     const structJSON = transfromToStructJSON(_values);
     const dataType = excludeIdInStructJSON(structJSON.dataType!);
     const dataType = excludeIdInStructJSON(structJSON.dataType!);
-
     const value = {
     const value = {
       functionName,
       functionName,
       functionType: FunctionType.PROPERTIES,
       functionType: FunctionType.PROPERTIES,
       remark,
       remark,
       identifier,
       identifier,
       accessMode,
       accessMode,
+      extensionDesc: _values.extensionDesc,
       functionJson: {
       functionJson: {
         dataType: dataType,
         dataType: dataType,
       },
       },
@@ -67,7 +68,6 @@
       ...dataType,
       ...dataType,
       ...(isArray(specs) ? specs : { ...specs }),
       ...(isArray(specs) ? specs : { ...specs }),
     };
     };
-
     setFieldsValue(value);
     setFieldsValue(value);
   };
   };
 
 

@@ -24,7 +24,8 @@ export enum FormField {
   EVENT_TYPE = 'eventType',
   EVENT_TYPE = 'eventType',
   SERVICE_COMMAND = 'serviceCommand',
   SERVICE_COMMAND = 'serviceCommand',
   ACCESS_MODE = 'accessMode',
   ACCESS_MODE = 'accessMode',
-
+  REGISTER_ADDRESS = 'registerAddress',
+  EXTENSION_DESC = 'extensionDesc',
   STRUCT = 'struct',
   STRUCT = 'struct',
 }
 }
 
 

@@ -3,7 +3,7 @@
   import { ComponentType, ColEx } from '/@/components/Form/src/types/index';
   import { ComponentType, ColEx } from '/@/components/Form/src/types/index';
   import { computed } from '@vue/reactivity';
   import { computed } from '@vue/reactivity';
   import { isFunction } from '/@/utils/is';
   import { isFunction } from '/@/utils/is';
-  import { unref } from 'vue';
+  import { toRaw, unref } from 'vue';
   import { watch } from 'vue';
   import { watch } from 'vue';
   import { nextTick } from 'vue';
   import { nextTick } from 'vue';
   import { ref } from 'vue';
   import { ref } from 'vue';
@@ -48,17 +48,13 @@
     }
     }
   );
   );
 
 
-  const getProps = computed(() => {
-    return props;
-  });
-
   const batchSetValue = (value: any): ValueItemType[] => {
   const batchSetValue = (value: any): ValueItemType[] => {
-    const { length } = unref(getProps);
+    const { length } = props;
     return Array.from({ length }, () => ({ value }));
     return Array.from({ length }, () => ({ value }));
   };
   };
 
 
   const getTotalControlItem = computed(() => {
   const getTotalControlItem = computed(() => {
-    const { totalControlProps, component, showTotalControl } = unref(getProps);
+    const { totalControlProps, component, showTotalControl } = props;
     return {
     return {
       ...totalControlProps,
       ...totalControlProps,
       field: FormFieldsEnum.TOTAL_CONTROL,
       field: FormFieldsEnum.TOTAL_CONTROL,
@@ -72,12 +68,12 @@
     } as FormSchema;
     } as FormSchema;
   });
   });
 
 
-  const getSchemas = computed(() => {
-    const { itemProps, itemLabel, length, component } = unref(getProps);
+  const getSchemas = () => {
+    const { itemProps, itemLabel, length, component } = props;
     let label = isFunction(itemLabel) ? itemLabel : (index: number) => `#${index}`;
     let label = isFunction(itemLabel) ? itemLabel : (index: number) => `#${index}`;
     let _itemProps = isFunction(itemProps) ? itemProps : () => ({});
     let _itemProps = isFunction(itemProps) ? itemProps : () => ({});
     const schemas = Array.from(
     const schemas = Array.from(
-      { length },
+      { length: props.length },
       (_item, index) =>
       (_item, index) =>
         ({
         ({
           ..._itemProps(index),
           ..._itemProps(index),
@@ -93,14 +89,14 @@
         } as FormSchema)
         } as FormSchema)
     );
     );
 
 
-    length && schemas.unshift(unref(getTotalControlItem));
+    length && schemas.unshift(toRaw(getTotalControlItem.value));
 
 
     return schemas;
     return schemas;
-  });
+  };
 
 
   const [registerForm, { getFieldsValue, setProps, setFieldsValue }] = useForm({
   const [registerForm, { getFieldsValue, setProps, setFieldsValue }] = useForm({
     showActionButtonGroup: false,
     showActionButtonGroup: false,
-    schemas: unref(getSchemas),
+    schemas: toRaw(unref(getSchemas())),
     // baseColProps,
     // baseColProps,
     baseColProps: props.itemColProps,
     baseColProps: props.itemColProps,
   });
   });
@@ -111,19 +107,16 @@
       return;
       return;
     }
     }
     const allValue = getFieldsValue();
     const allValue = getFieldsValue();
-    const sortKeyList = Array.from({ length: unref(getProps).length }, (_v, key) => key);
+    const sortKeyList = Array.from({ length: props.length }, (_v, key) => key);
     const res = sortKeyList.map((item) => ({ value: allValue[item] } as ValueItemType));
     const res = sortKeyList.map((item) => ({ value: allValue[item] } as ValueItemType));
 
 
     emit(EmitEventEnum.UPDATE_VALUE, res);
     emit(EmitEventEnum.UPDATE_VALUE, res);
   };
   };
 
 
   const transformValue = (value: ValueItemType[]) => {
   const transformValue = (value: ValueItemType[]) => {
-    const { length } = unref(getProps);
+    const { length } = props;
     if (value.length !== length) {
     if (value.length !== length) {
-      value = Array.from(
-        { length: unref(getProps).length },
-        () => ({ value: null } as ValueItemType)
-      );
+      value = Array.from({ length: props.length }, () => ({ value: null } as ValueItemType));
     }
     }
     return value.reduce((prev, next, index) => ({ ...prev, [index]: next.value }), {});
     return value.reduce((prev, next, index) => ({ ...prev, [index]: next.value }), {});
   };
   };
@@ -153,13 +146,11 @@
 
 
   watch(
   watch(
     () => [props.length, props.component],
     () => [props.length, props.component],
-    (target) => {
-      if (target !== undefined || target !== null) {
-        setProps({
-          schemas: unref(getSchemas),
-        });
-        handleUpdateValue();
-      }
+    () => {
+      setProps({
+        schemas: toRaw(unref(getSchemas())),
+      });
+      handleUpdateValue();
     }
     }
   );
   );
 
 

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { InputGroup, InputNumber, Select, Input } from 'ant-design-vue';
   import { InputGroup, InputNumber, Select, Input } from 'ant-design-vue';
-  import { unref } from 'vue';
+  import { unref, watch } from 'vue';
   import { computed } from 'vue';
   import { computed } from 'vue';
   import { ref } from 'vue';
   import { ref } from 'vue';
 
 
@@ -13,10 +13,11 @@
 
 
   const DEC_MAX_VALUE = parseInt('0xffff', 16);
   const DEC_MAX_VALUE = parseInt('0xffff', 16);
 
 
-  withDefaults(
+  const props = withDefaults(
     defineProps<{
     defineProps<{
       value?: number | string;
       value?: number | string;
       inputProps?: Recordable;
       inputProps?: Recordable;
+      disabled?: boolean;
     }>(),
     }>(),
     {
     {
       value: 0,
       value: 0,
@@ -31,7 +32,7 @@
 
 
   const type = ref(AddressTypeEnum.DEC);
   const type = ref(AddressTypeEnum.DEC);
 
 
-  const inputValue = ref<number | string>(0);
+  const inputValue = ref<number | string>(props.value);
 
 
   const getHexValue = computed(() => {
   const getHexValue = computed(() => {
     return parseInt(unref(inputValue) || 0, 16);
     return parseInt(unref(inputValue) || 0, 16);
@@ -61,6 +62,14 @@
     inputValue.value = syncValue;
     inputValue.value = syncValue;
     emit('update:value', toDEC(syncValue));
     emit('update:value', toDEC(syncValue));
   };
   };
+
+  const stop = watch(
+    () => props.value,
+    (value) => {
+      inputValue.value = value;
+      stop();
+    }
+  );
 </script>
 </script>
 
 
 <template>
 <template>
@@ -69,6 +78,7 @@
       v-model:value="type"
       v-model:value="type"
       :options="addressTypeOptions"
       :options="addressTypeOptions"
       @change="handleChange"
       @change="handleChange"
+      :disabled="disabled"
       class="bg-gray-200 max-w-20"
       class="bg-gray-200 max-w-20"
     />
     />
     <InputNumber
     <InputNumber
@@ -76,6 +86,7 @@
       v-model:value="inputValue"
       v-model:value="inputValue"
       :step="1"
       :step="1"
       class="flex-1"
       class="flex-1"
+      :disabled="disabled"
       v-bind="inputProps"
       v-bind="inputProps"
       @change="handleEmit"
       @change="handleEmit"
     />
     />

@@ -178,7 +178,7 @@ export const formSchemas: FormSchema[] = [
     changeEvent: 'update:value',
     changeEvent: 'update:value',
     ifShow: ({ model }) => showCoilValue(model[FormFieldsEnum.METHOD]),
     ifShow: ({ model }) => showCoilValue(model[FormFieldsEnum.METHOD]),
     defaultValue: '0',
     defaultValue: '0',
-    rules: [{ required: true, message: '请输入线圈值' }],
+    rules: [{ required: true, message: '请输入线圈值', type: 'number' }],
     componentProps: {
     componentProps: {
       placeholder: '请输入线圈值',
       placeholder: '请输入线圈值',
     },
     },
@@ -191,7 +191,7 @@ export const formSchemas: FormSchema[] = [
     changeEvent: 'update:value',
     changeEvent: 'update:value',
     ifShow: ({ model }) => showRegisterValue(model[FormFieldsEnum.METHOD]),
     ifShow: ({ model }) => showRegisterValue(model[FormFieldsEnum.METHOD]),
     defaultValue: '0',
     defaultValue: '0',
-    rules: [{ required: true, message: '请输入寄存器值' }],
+    rules: [{ required: true, message: '请输入寄存器值', type: 'number' }],
     componentProps: {
     componentProps: {
       placeholder: '请输入寄存器值',
       placeholder: '请输入寄存器值',
     },
     },

@@ -41,7 +41,7 @@ export const composeModbusModalData = (record: ModbusCommandValueType): GenModbu
   return {
   return {
     crc,
     crc,
     deviceCode,
     deviceCode,
-    method,
+    method: Number(method).toString(16).padStart(2, '0'),
     registerAddr,
     registerAddr,
     ...registerInfo(record),
     ...registerInfo(record),
   };
   };