fix: merge

src/components/AMapComponent/PathSimplifier/PathNavigator.tsx

@@ -47,21 +47,26 @@ export default (props: PathNavigatorProps) => {
   const createPathNavigator = useCallback(
     (path?: PathSimplifier) => {
       if (path) {
-        PathNavigatorRef.current = path.createPathNavigator(navKey!, {
-          speed: props.speed || 10000,
-          ...omit(extraProps, Object.values(EventMap)),
-        });
+        const pathData = path.getPathData(navKey!);
+        if (pathData?.path && pathData?.path.length) {
+          // 避免path为空数组时，导致创建巡航器异常
 
-        if (PathNavigatorRef.current) {
-          createEvent();
-        }
+          PathNavigatorRef.current = path.createPathNavigator(navKey!, {
+            speed: props.speed || 10000,
+            ...omit(extraProps, Object.values(EventMap)),
+          });
 
-        if (onCreate && PathNavigatorRef.current) {
-          onCreate(PathNavigatorRef.current);
-        }
+          if (PathNavigatorRef.current) {
+            createEvent();
+          }
+
+          if (onCreate && PathNavigatorRef.current) {
+            onCreate(PathNavigatorRef.current);
+          }
 
-        if (props.isAuto !== false) {
-          PathNavigatorRef.current?.start();
+          if (props.isAuto !== false) {
+            PathNavigatorRef.current?.start();
+          }
         }
       }
     },

src/components/AMapComponent/PathSimplifier/index.tsx

@@ -34,6 +34,7 @@ const PathSimplifier = (props: PathSimplifierProps) => {
       }
 
       if (props.pathData) {
+        console.log(props.pathData.map((item) => ({ name: item.name || '路线', path: item.path })));
         pathSimplifierRef.current?.setData(
           props.pathData.map((item) => ({ name: item.name || '路线', path: item.path })),
         );

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

@@ -13,7 +13,7 @@ interface InputUploadProps {
 export default (props: InputUploadProps) => {
   const { onChange } = props;
 
-  const [url, setUrl] = useState(props.value);
+  const [url, setUrl] = useState(props.value || undefined);
   const [loading, setLoading] = useState<boolean>(false);
 
   useEffect(() => {
@@ -28,7 +28,9 @@ export default (props: InputUploadProps) => {
       info.file.url = info.file.response?.result;
       setLoading(false);
       if (onChange) {
-        onChange(info.file.response?.result);
+        const result = info.file.response?.result;
+        setUrl(result);
+        onChange(result);
       }
     }
   };

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

@@ -190,21 +190,6 @@ const Scene = () => {
         },
       },
       renderText: (record) => TriggerWayType[record],
-      valueType: 'select',
-      valueEnum: {
-        manual: {
-          text: '手动触发',
-          status: 'manual',
-        },
-        timer: {
-          text: '定时触发',
-          status: 'timer',
-        },
-        device: {
-          text: '设备触发',
-          status: 'device',
-        },
-      },
     },
     {
       dataIndex: 'description',

src/pages/system/Platforms/index.tsx

@@ -8,6 +8,7 @@ import SearchComponent from '@/components/SearchComponent';
 import {
   DeleteOutlined,
   EditOutlined,
+  ExclamationCircleOutlined,
   PlayCircleOutlined,
   PlusOutlined,
   StopOutlined,
@@ -225,17 +226,17 @@ export default () => {
           type={'link'}
           style={{ padding: 0 }}
           isPermission={permission.delete}
-          disabled={record.state.value === 'started'}
+          disabled={record.state.value === 'enabled'}
           popConfirm={{
             title: '确认删除？',
-            disabled: record.state.value === 'started',
+            disabled: record.state.value === 'enabled',
             onConfirm: () => {
               deleteById(record.id);
             },
           }}
           tooltip={{
             title:
-              record.state.value === 'started' ? <span>请先禁用,再删除</span> : <span>删除</span>,
+              record.state.value === 'enabled' ? <span>请先禁用,再删除</span> : <span>删除</span>,
           }}
           onClick={() => {}}
         >
@@ -261,8 +262,18 @@ export default () => {
         params={param}
         columns={columns}
         actionRef={actionRef}
-        request={(params: any) => service.query(params)}
-        headerTitle={
+        request={(params: any) =>
+          service.query({
+            ...params,
+            sorts: [
+              {
+                name: 'createTime',
+                order: 'desc',
+              },
+            ],
+          })
+        }
+        headerTitle={[
           <PermissionButton
             key="button"
             type="primary"
@@ -277,8 +288,20 @@ export default () => {
               id: 'pages.data.option.add',
               defaultMessage: '新增',
             })}
-          </PermissionButton>
-        }
+          </PermissionButton>,
+          <div
+            style={{
+              paddingLeft: 24,
+              background: '#fff',
+              fontSize: 14,
+            }}
+          >
+            <span style={{ marginRight: 8, fontSize: 16 }}>
+              <ExclamationCircleOutlined />
+            </span>
+            第三方平台用户是一个身份实体，代表您的组织中需要访问物联网平台资源的用户或应用程序。
+          </div>,
+        ]}
       />
       <SaveModal
         visible={saveVisible}

src/pages/system/Platforms/save.tsx

@@ -106,7 +106,7 @@ export default (props: SaveProps) => {
         getDetail(props.data.id);
       } else {
         form.setValues({
-          enableOAuth2: true,
+          enableOAuth2: false,
           id: randomString(16),
           secureKey: randomString(),
         });
@@ -378,6 +378,7 @@ export default (props: SaveProps) => {
             'x-component-props': {
               placeholder: '请输入redirectUrl',
             },
+            'x-hidden': true,
             'x-decorator-props': {
               gridSpan: 2,
               tooltip: '授权后自动跳转的页面地址',