diff --git a/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-service.ts b/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-service.ts index 598e4bc..e7c8b6e 100644 --- a/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-service.ts +++ b/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-service.ts @@ -52,7 +52,13 @@ export class advancedConfigService extends Model { }; getSetting = async (graphId: string, projectId: string) => { - if (!graphId || !projectId) return; + if (!graphId || !projectId) { + this.config = { + maxParallelism: 1, + dataSourceConfig: [], + }; + return; + } this.loading = true; const { status, data } = await getGraphDetail({ graphId, diff --git a/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-view.tsx b/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-view.tsx index d6889dc..9669e1d 100644 --- a/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-view.tsx +++ b/apps/platform/src/modules/advanced-config/advanced-config-drawer/advanced-config-view.tsx @@ -12,9 +12,11 @@ import { getModel, useModel } from '@/util/valtio-helper'; import { advancedConfigService } from './advanced-config-service'; import styles from './index.less'; +import { ProjectEditService } from '@/modules/layout/header-project-list/project-edit.service'; export const AdvancedConfig = () => { const modalManager = useModel(DefaultModalManager); + const projectEditService = useModel(ProjectEditService); const service = useModel(advancedConfigService); const loginService = useModel(LoginService); @@ -183,7 +185,12 @@ export const AdvancedConfig = () => {
- diff --git a/apps/platform/src/modules/component-config/config-item-render/custom-render/linear-model-parameters-modification/index.tsx b/apps/platform/src/modules/component-config/config-item-render/custom-render/linear-model-parameters-modification/index.tsx index 410f762..8464fd3 100644 --- a/apps/platform/src/modules/component-config/config-item-render/custom-render/linear-model-parameters-modification/index.tsx +++ b/apps/platform/src/modules/component-config/config-item-render/custom-render/linear-model-parameters-modification/index.tsx @@ -4,17 +4,14 @@ import { Button, Space, Tooltip } from 'antd'; import React, { useEffect } from 'react'; import type { GraphNodeDetail } from '@/modules/component-config/component-config-protocol'; -import mainDag from '@/modules/main-dag/dag'; -import { Model, getModel, useModel } from '@/util/valtio-helper'; +import { getModel, useModel } from '@/util/valtio-helper'; -import type { NodeAllInfo } from '../../config-render-protocol'; import { ParamsModificationsRenderView } from '../parameters-modification/parameters-modification-view'; import { DefaultRedoUndoService } from '../redo-undo/redo-undo-service'; import { ParametersResultDrawerView } from './drawer'; import { ModelParametersModificationService } from './model-parameters-modification-service'; -import { SourceTypeEnum } from './types'; -import type { CurrOperationEnum, ParametersData, ParametersDatum } from './types'; +import type { ParametersData, ParametersDatum } from './types'; /** 2. 把表单格式,serializer 序列化,转换成 node info */ export const modelModificationsSerializer = (data: ParametersData) => { diff --git a/apps/platform/src/modules/component-config/config-item-render/custom-render/observations-quantiles-render/index.tsx b/apps/platform/src/modules/component-config/config-item-render/custom-render/observations-quantiles-render/index.tsx index 6cef70f..2ad372f 100644 --- a/apps/platform/src/modules/component-config/config-item-render/custom-render/observations-quantiles-render/index.tsx +++ b/apps/platform/src/modules/component-config/config-item-render/custom-render/observations-quantiles-render/index.tsx @@ -29,9 +29,7 @@ const QuatitiesWrapper = (props: { children: React.ReactNode }) => { 采样方式 1,但选择不放回采样则会报错处理。'} > @@ -95,7 +93,9 @@ const ObservationsQuantilesRender: React.FC> = (prop) => { 观测值分位点} + label={ + {translation[node.name] || node.name} + } labelCol={{ span: 12 }} rules={[ { required: true, message: '请输入观测值分位点' }, diff --git a/apps/platform/src/modules/component-config/config-item-render/default-render-template.tsx b/apps/platform/src/modules/component-config/config-item-render/default-render-template.tsx index 9a4fdfb..3c35805 100644 --- a/apps/platform/src/modules/component-config/config-item-render/default-render-template.tsx +++ b/apps/platform/src/modules/component-config/config-item-render/default-render-template.tsx @@ -119,28 +119,51 @@ export const DefaultInputNumber: React.FC> = (config) => { }, { validator: (_, value) => { + let errorText = '取值应该'; if (value === null || value === undefined) return Promise.resolve(); if (minVal !== null && minVal !== undefined) { if (minInclusive) { - if (value < minVal) - return Promise.reject(new Error(`取值应该大于等于${minVal}`)); + errorText += `大于等于${minVal}`; } else { - if (value <= minVal) - return Promise.reject(new Error(`取值应该大于${minVal}`)); + errorText += + (errorText.replace('取值应该', '') ? `且` : '') + `大于${minVal}`; + } + } + + if (maxVal !== null && maxVal !== undefined) { + if (maxInclusive) { + errorText += + (errorText.replace('取值应该', '') ? `且` : '') + `小于等于${maxVal}`; + } else { + errorText += + (errorText.replace('取值应该', '') ? `且` : '') + `小于${maxVal}`; + } + } + + if (minVal !== null && minVal !== undefined) { + if (minInclusive) { + if (value < minVal) { + return Promise.reject(new Error(errorText)); + } + } else { + if (value <= minVal) { + return Promise.reject(new Error(errorText)); + } } } if (maxVal !== null && maxVal !== undefined) { if (maxInclusive) { if (value > maxVal) { - return Promise.reject(new Error(`取值应该小于等于${maxVal}`)); + return Promise.reject(new Error(errorText)); } } else { if (value >= maxVal) { - return Promise.reject(new Error(`取值应该小于${maxVal}`)); + return Promise.reject(new Error(errorText)); } } } + return Promise.resolve(); }, }, diff --git a/apps/platform/src/modules/data-table-tree/datatable-tree.view.tsx b/apps/platform/src/modules/data-table-tree/datatable-tree.view.tsx index 91adb62..2d78b51 100644 --- a/apps/platform/src/modules/data-table-tree/datatable-tree.view.tsx +++ b/apps/platform/src/modules/data-table-tree/datatable-tree.view.tsx @@ -24,11 +24,14 @@ import { getModel, Model, useModel } from '@/util/valtio-helper'; import { DatatableTreeService } from './datatable-tree.service'; import styles from './index.less'; import { openNewTab } from '@/util/path'; +import { ProjectEditService } from '../layout/header-project-list/project-edit.service'; const { Text } = Typography; export const DatatableTreeComponent = () => { const viewInstance = useModel(DatatableTreeView); + const projectEditService = useModel(ProjectEditService); + const ref1 = useRef(null); const { pathname, search } = useLocation(); const { projectId } = parse(search); @@ -191,7 +194,8 @@ export const DatatableTreeComponent = () => { )} {item.nodeId === currentLoginNodeId && - hasAccess({ type: [Platform.AUTONOMY] }) && ( + hasAccess({ type: [Platform.AUTONOMY] }) && + !projectEditService.canEdit.gotoDataManagerDisabled && (