fix: bug

src/pages/Log/Access/index.tsx

@@ -104,6 +104,7 @@ const Access = () => {
       valueType: 'option',
       align: 'left',
       fixed: 'right',
+      width: 70,
       render: (text, record) => [
         <a
           key="editable"

src/pages/device/Instance/Detail/Functions/form.tsx

@@ -177,7 +177,6 @@ export default (props: FunctionProps) => {
   const handleDataSource = (data: any) => {
     const array = [];
     const properties = data.valueType ? data.valueType.properties : data.inputs;
-
     for (const datum of properties) {
       const type = datum.valueType ? datum.valueType.type : '-';
 
@@ -226,6 +225,7 @@ export default (props: FunctionProps) => {
   };
 
   useEffect(() => {
+    console.log(props.data);
     handleDataSource(props.data);
   }, [props.data]);
 

src/pages/device/Instance/Detail/Log/index.tsx

@@ -36,6 +36,7 @@ const Log = () => {
       defaultSortOrder: 'descend',
       valueType: 'dateTime',
       sorter: true,
+      sortDirections: ['ascend', 'descend'],
     },
     {
       title: '内容',
@@ -107,8 +108,27 @@ const Log = () => {
         pagination={{
           pageSize: 10,
         }}
-        request={async (params) => {
-          return service.queryLog(InstanceModel.detail.id!, params);
+        request={async (params, sort) => {
+          const res = await service.queryLog(InstanceModel.detail.id!, {
+            ...params,
+            sorts: [
+              {
+                name: 'timestamp',
+                order: sort.timestamp === 'descend' ? 'desc' : 'asc',
+              },
+            ],
+          });
+          return {
+            code: res.message,
+            result: {
+              data: res.result.data,
+              pageIndex: res.result.pageIndex,
+              pageSize: res.result.pageSize,
+              total: res.result.total,
+            },
+            status: res.status,
+          };
+          // return service.queryLog(InstanceModel.detail.id!, params);
         }}
       />
     </Card>

src/pages/device/Instance/Detail/Running/Event/index.tsx

@@ -95,7 +95,7 @@ const EventLog = (props: Props) => {
             ({
               key: i.id,
               title: i.name,
-              dataIndex: i.id,
+              dataIndex: `${i.id}_format`,
               ellipsis: true,
               renderText: (text) => (typeof text === 'object' ? JSON.stringify(text) : text),
             } as ProColumns),

src/pages/device/Instance/service.ts

@@ -117,7 +117,7 @@ class Service extends BaseService<DeviceInstance> {
     });
 
   public getEventCount = (deviceId: string, eventId: string, params: Record<string, unknown>) =>
-    request(`/${SystemConst.API_BASE}/device-instance/${deviceId}/event/${eventId}`, {
+    request(`/${SystemConst.API_BASE}/device-instance/${deviceId}/event/${eventId}?format=true`, {
       method: 'POST',
       data: params,
     });

src/pages/rule-engine/Scene/Save/action/VariableItems/builtIn.tsx

@@ -55,6 +55,7 @@ export default (props: BuiltInProps) => {
   const sourceChangeEvent = async () => {
     onChange(source, undefined);
     const data = props.form.getFieldsValue();
+    // console.log(data)
     const triggerData = await props.triggerRef?.getTriggerData();
     data.terms = triggerData?.trigger;
     const params = props.name - 1 >= 0 ? { action: props.name - 1 } : undefined;
@@ -102,8 +103,7 @@ export default (props: BuiltInProps) => {
   }, [props.trigger?.trigger?.device?.productId, source]);
 
   useEffect(() => {
-    // console.log(props.value,11111)
-    // console.log(props.form.getFieldsValue(),2222)
+    // console.log(props.value,'value')
     setSource(props.value?.source);
     setValue(props.value?.value);
     setUpperKey(props.value?.upperKey);

src/pages/rule-engine/Scene/Save/action/action.tsx

@@ -152,6 +152,7 @@ export default observer((props: ActionProps) => {
         setNotifyType(data.notify?.notifyType);
         setConfigId(data.notify?.notifierId);
         setTemplateId(data.notify?.templateId);
+        // console.log(props.form.getFieldsValue(),'actions')
       }
     }
   }, []);

src/pages/rule-engine/Scene/Save/action/messageContent.tsx

@@ -7,7 +7,7 @@ import {
   UserList,
 } from '@/pages/rule-engine/Scene/Save/action/VariableItems';
 import { InputFile } from '@/pages/rule-engine/Scene/Save/components';
-import { useCallback } from 'react';
+import { useCallback, useEffect } from 'react';
 
 interface MessageContentProps {
   name: number;
@@ -104,7 +104,11 @@ export default (props: MessageContentProps) => {
     },
     [props.notifyType],
   );
-
+  useEffect(() => {
+    // console.log(props.template,'messageContent')
+    // console.log(props.triggerRef?.getTriggerData(),'triggerRef')
+    console.log(props.form.getFieldValue('actions'), 'message');
+  }, []);
   return (
     <>
       {props.template && (

src/pages/rule-engine/Scene/Save/index.tsx

@@ -68,7 +68,10 @@ export default () => {
         setIsEdit(true);
         const _data: any = resp.result;
         FormModel = _data;
+        console.log(_data.actions, 'initdata');
+
         form.setFieldsValue(_data);
+        // debugger;
         setParallel(_data.parallel);
 
         setTriggerValue({ trigger: _data.terms || [] });
@@ -82,6 +85,7 @@ export default () => {
         }
 
         if (_data.actions) {
+          console.log(_data.actions, 'detail');
           setActionsData(_data.actions);
         }
       }
@@ -225,6 +229,7 @@ export default () => {
               preserve={false}
               className={'scene-save'}
               onValuesChange={(changeValue, allValues) => {
+                console.log(changeValue);
                 if (changeValue.trigger) {
                   if (changeValue.trigger.device) {
                     if (
@@ -256,6 +261,8 @@ export default () => {
                   }
                 }
                 if (allValues.actions) {
+                  // debugger;
+                  console.log(allValues.actions, 'onValuesChange');
                   setActionsData(allValues.actions);
                 }
                 FormModel = { ...allValues };