Merge branch 'ww' into 'main'

feat: model of matter save accessMode, callType, eventType fields

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

@@ -42,7 +42,9 @@ export interface ModelOfMatterParams {
   identifier: string;
   identifier: string;
   remark: string;
   remark: string;
   id?: string;
   id?: string;
-  // callType
+  callType?: string;
+  eventType?: string;
+  accessMode?: string;
 }
 }
 
 
 export interface GetModelTslParams {
 export interface GetModelTslParams {

@@ -236,14 +236,14 @@ export const formSchemas: FormSchema[] = [
     ifShow: ({ values }) => values[FormField.TYPE] === DateTypeEnum.IS_STRING,
     ifShow: ({ values }) => values[FormField.TYPE] === DateTypeEnum.IS_STRING,
   },
   },
   {
   {
-    field: FormField.R_W_FLAG,
+    field: FormField.ACCESS_MODE,
     component: 'ApiRadioGroup',
     component: 'ApiRadioGroup',
     label: '读写类型',
     label: '读写类型',
     required: true,
     required: true,
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },
-    defaultValue: 'READ_ONLY',
+    defaultValue: 'r',
     componentProps: {
     componentProps: {
       placeholder: '请选择读写类型',
       placeholder: '请选择读写类型',
       api: findDictItemByCode,
       api: findDictItemByCode,

@@ -16,8 +16,9 @@ export function transfromToStructJSON(value: StructFormValue): StructJSON {
     identifier,
     identifier,
     remark,
     remark,
     specs,
     specs,
+    assessMode,
   } = value;
   } = value;
-  const basic = { functionName, identifier, remark };
+  const basic = { functionName, identifier, remark, assessMode };
   let dataType = {} as unknown as DataType;
   let dataType = {} as unknown as DataType;
 
 
   switch (type) {
   switch (type) {

@@ -24,13 +24,14 @@
   async function getFormData(): Promise<Partial<ModelOfMatterParams>> {
   async function getFormData(): Promise<Partial<ModelOfMatterParams>> {
     const _values = (await validate()) as StructFormValue;
     const _values = (await validate()) as StructFormValue;
     if (!_values) return {};
     if (!_values) return {};
-    const { functionName, remark, identifier } = _values;
+    const { functionName, remark, identifier, accessMode } = _values;
     const structJSON = transfromToStructJSON(_values);
     const structJSON = transfromToStructJSON(_values);
     const value = {
     const value = {
       functionName,
       functionName,
       functionType: FunctionType.PROPERTIES,
       functionType: FunctionType.PROPERTIES,
       remark,
       remark,
       identifier,
       identifier,
+      accessMode,
       functionJson: {
       functionJson: {
         dataType: structJSON.dataType,
         dataType: structJSON.dataType,
       },
       },

@@ -20,28 +20,28 @@
 
 
   //回显数据
   //回显数据
   const setFormData = (record: ModelOfMatterParams) => {
   const setFormData = (record: ModelOfMatterParams) => {
-    const { functionJson = {}, functionName, identifier, remark } = record;
+    const { functionJson = {}, functionName, identifier, remark, eventType } = record;
     const { outputData } = functionJson;
     const { outputData } = functionJson;
     const value = {
     const value = {
       functionName,
       functionName,
       identifier,
       identifier,
       remark,
       remark,
       outputData,
       outputData,
+      eventType,
     };
     };
     setFieldsValue(value);
     setFieldsValue(value);
   };
   };
 
 
   async function getFormData() {
   async function getFormData() {
     const _values = (await validate()) as StructFormValue;
     const _values = (await validate()) as StructFormValue;
-    const { functionName, remark, identifier, outputData } = _values;
+    const { functionName, remark, identifier, outputData, eventType } = _values;
     if (!_values) return {} as unknown as ModelOfMatterParams;
     if (!_values) return {} as unknown as ModelOfMatterParams;
     const value = {
     const value = {
       functionName,
       functionName,
       identifier,
       identifier,
       remark,
       remark,
       functionType: FunctionType.EVENTS,
       functionType: FunctionType.EVENTS,
-      // callType,
-      // eventType,
+      eventType,
       functionJson: {
       functionJson: {
         outputData,
         outputData,
       },
       },

@@ -26,7 +26,7 @@
 
 
   //回显数据
   //回显数据
   const setFormData = (record: ModelOfMatterParams) => {
   const setFormData = (record: ModelOfMatterParams) => {
-    const { functionJson = {}, functionName, identifier, remark } = record;
+    const { functionJson = {}, functionName, identifier, remark, callType } = record;
     const { inputData, outputData, serviceCommand } = functionJson;
     const { inputData, outputData, serviceCommand } = functionJson;
     const value = {
     const value = {
       functionName,
       functionName,
@@ -35,6 +35,7 @@
       inputData,
       inputData,
       outputData,
       outputData,
       serviceCommand,
       serviceCommand,
+      callType,
     };
     };
     setFieldsValue(value);
     setFieldsValue(value);
   };
   };
@@ -42,14 +43,15 @@
   //获取数据
   //获取数据
   async function getFormData() {
   async function getFormData() {
     const _values = (await validate()) as StructFormValue;
     const _values = (await validate()) as StructFormValue;
-    const { functionName, remark, identifier, inputData, outputData, serviceCommand } = _values;
+    const { functionName, remark, identifier, inputData, outputData, serviceCommand, callType } =
+      _values;
     if (!_values) return {};
     if (!_values) return {};
     const value = {
     const value = {
       functionName,
       functionName,
       identifier,
       identifier,
       remark,
       remark,
       functionType: FunctionType.SERVICE,
       functionType: FunctionType.SERVICE,
-      // callType,
+      callType,
       functionJson: {
       functionJson: {
         inputData,
         inputData,
         outputData,
         outputData,

@@ -17,13 +17,13 @@ export enum FormField {
   BOOL_CLOSE = 'boolClose',
   BOOL_CLOSE = 'boolClose',
   BOOL_OPEN = 'boolOpen',
   BOOL_OPEN = 'boolOpen',
   LENGTH = 'length',
   LENGTH = 'length',
-  R_W_FLAG = 'rwFlag',
   SPECS_LIST = 'specs',
   SPECS_LIST = 'specs',
   CALL_TYPE = 'callType',
   CALL_TYPE = 'callType',
   INPUT_PARAM = 'inputData',
   INPUT_PARAM = 'inputData',
   OUTPUT_PARAM = 'outputData',
   OUTPUT_PARAM = 'outputData',
   EVENT_TYPE = 'eventType',
   EVENT_TYPE = 'eventType',
   SERVICE_COMMAND = 'serviceCommand',
   SERVICE_COMMAND = 'serviceCommand',
+  ACCESS_MODE = 'accessMode',
 
 
   STRUCT = 'struct',
   STRUCT = 'struct',
 }
 }
@@ -34,6 +34,11 @@ export enum FunctionType {
   SERVICE = 'services',
   SERVICE = 'services',
 }
 }
 
 
+export enum AssessMode {
+  READ = 'r',
+  WRITE = 'w',
+}
+
 /**
 /**
  * 新增参数 动态显示表单
  * 新增参数 动态显示表单
  */
  */
@@ -205,7 +210,7 @@ export const eventSchemas: FormSchema[] = [
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },
-    defaultValue: 'INFO_EVENT_TYPE',
+    defaultValue: 'INFO',
     componentProps: {
     componentProps: {
       placeholder: '请选择事件类型',
       placeholder: '请选择事件类型',
       api: findDictItemByCode,
       api: findDictItemByCode,