Merge remote-tracking branch 'origin/master'

This commit is contained in:
jerryjzhang
2024-06-01 21:48:59 +08:00
5 changed files with 7 additions and 6 deletions

View File

@@ -102,7 +102,7 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
{chatConfigType === ChatConfigType.TAG && (
<FormItem
name={['queryConfig', defaultConfigKeyMap[ChatConfigType.TAG], 'defaultDisplayInfo']}
label="圈选结果展示字段"
label="明细查询结果展示字段"
getValueFromEvent={(value, items) => {
const result: { dimensionIds: number[]; metricIds: number[] } = {
dimensionIds: [],
@@ -147,7 +147,7 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
}
return false;
}}
placeholder="请选择圈选结果展示字段"
placeholder="请选择明细查询结果展示字段"
options={dataItemListOptions}
/>
</FormItem>

View File

@@ -83,7 +83,7 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
{chatConfigType === TransType.TAG && (
<FormItem
name={['queryConfig', defaultConfigKeyMap[TransType.TAG], 'defaultDisplayInfo']}
label="圈选结果展示字段"
label="明细查询结果展示字段"
getValueFromEvent={(value, items) => {
const result: { tagIds: number[] } = {
tagIds: [],
@@ -117,7 +117,7 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
}
return false;
}}
placeholder="请选择圈选结果展示字段"
placeholder="请选择明细查询结果展示字段"
options={dataItemListOptions}
/>
</FormItem>

View File

@@ -118,7 +118,7 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
/>
</ProCard>
<ProCard title="标签模式">
<ProCard title="明细模式">
<DefaultSettingForm
form={form}
dimensionList={dimensionList}

View File

@@ -15,7 +15,7 @@ import {
} from 'antd';
import React, { useState, useEffect } from 'react';
import { getSystemConfig, saveSystemConfig } from '@/services/user';
import { ProCard } from '@ant-design/pro-components';
import { ProCard } from '@ant-design/pro-components';
import SelectTMEPerson from '@/components/SelectTMEPerson';
import { ConfigParametersItem, SystemConfig } from './types';
import FormItemTitle from '@/components/FormHelper/FormItemTitle';

View File

@@ -3,6 +3,7 @@ export type ConfigParametersItem = {
name: string;
comment: string;
value: string;
defaultValue?: string;
candidateValues: string[];
description: string;
require?: boolean;