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

View File

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

View File

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

View File

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