Merge branch 'develop' of http://10.0.0.88/web-project/zhst-lambo into develop

packages/biz/src/treeTransfer/index.less

@@ -15,7 +15,9 @@
 
       &__items {
         padding: 8px 4px;
-        overflow: scroll;
+        width: 100%;
+        height: calc(100% - 105px);
+        overflow-y: scroll;
 
         &::-webkit-scrollbar {
           display: none;

packages/material/src/algorithmConfig/algorithmConfig.tsx

@@ -35,12 +35,14 @@ export interface AlgorithmConfigProps {
   drawListener?: (data: any) => void;
   algorithmTableDataSource?: {
     id: string;
-    // 模板名称
-    templateName: string;
-    // 运行周期
-    operatingCycle: string;
-    // 算力占用
-    algorithmOccupied: number;
+    templateId:string; // 模版Id
+    templateName: string;    // 模板名称
+    status:boolean; // 算法启用状态
+    operatingCycle: string;  // 运行周期
+    algorithmOccupied: number;   // 算力占用
+    solutionId:string; // 算法Id
+    solutionName: string; // 算法名称
+    solutionParameter: ''; // josn格式算法配置
   }[];
   timeTemplateDataSource?: {
     id: string;
@@ -58,6 +60,7 @@ export interface AlgorithmConfigProps {
   selectedKey?: string
   rowKey?: string
   type: AlgorithmTableProps<any>['tableType']
+  title?:string; // boxList列表的属性名称【点位列表、盒子列表】
   onSelect?: (key: string, info?: any) => void
 }
 
@@ -78,7 +81,7 @@ const AlgorithmConfig = forwardRef<AlgorithmConfigRef, AlgorithmConfigProps>((pr
     selectedKey,
     type = 'multiple',
     rowKey = 'id',
-    onSelect
+    onSelect, title='盒子名称',
   } = props
   const drawImageRef = useRef<ImgViewRef>(null)
   const { token } = useToken()
@@ -94,8 +97,8 @@ const AlgorithmConfig = forwardRef<AlgorithmConfigRef, AlgorithmConfigProps>((pr
 
   return (
     <Flex style={{ border: `1px solid ${token.colorBorder}`, backgroundColor: token.colorBgBase }}>
-      <div title="盒子列表" style={{ width: '13.9%' }}>
-        <Title>盒子列表</Title>
+      <div title={title} style={{ width: '13.9%' }}>
+        <Title>{title}</Title>
         <div style={{ borderTop: `1px solid ${token.colorBorder}` }}>
           {boxList.map(item => {
             return (

packages/request/es/index.d.ts

@@ -5,7 +5,7 @@ export interface ReqConfigProps {
         errorHandler?: (error: any, opts: any) => void;
         errorThrower?: (err: any) => void;
     };
-    authorization: string;
+    authorization?: string;
     showMsg?: boolean;
 }
 export declare const reqConfig: (config: ReqConfigProps) => {
@@ -15,7 +15,7 @@ export declare const reqConfig: (config: ReqConfigProps) => {
         errorHandler?: ((error: any, opts: any) => void) | undefined;
         errorThrower?: ((err: any) => void) | undefined;
     };
-    authorization: string;
+    authorization?: string | undefined;
     showMsg?: boolean | undefined;
     requestInterceptors: (((url: any, options: any) => {
         url: any;

packages/request/lib/index.d.ts

@@ -5,7 +5,7 @@ export interface ReqConfigProps {
         errorHandler?: (error: any, opts: any) => void;
         errorThrower?: (err: any) => void;
     };
-    authorization: string;
+    authorization?: string;
     showMsg?: boolean;
 }
 export declare const reqConfig: (config: ReqConfigProps) => {
@@ -15,7 +15,7 @@ export declare const reqConfig: (config: ReqConfigProps) => {
         errorHandler?: ((error: any, opts: any) => void) | undefined;
         errorThrower?: ((err: any) => void) | undefined;
     };
-    authorization: string;
+    authorization?: string | undefined;
     showMsg?: boolean | undefined;
     requestInterceptors: (((url: any, options: any) => {
         url: any;