nicecode/nicecode-v2
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
NICE CODE BY DEV 2024-04-16 11:53:32 +08:00
commit d6fab922a9
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/biz/src/treeTransfer/index.less
View File

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

21
packages/material/src/algorithmConfig/algorithmConfig.tsx
View File

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

4
packages/request/es/index.d.ts vendored
View File

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

4
packages/request/lib/index.d.ts vendored
View File

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