Browse Source

fix:
1.指标库条件查询

WanRuixiang 5 months ago
parent
commit
3ca13a495d
2 changed files with 5 additions and 3 deletions
  1. 3 3
      src/app/components/FilterPanel.jsx
  2. 2 0
      src/app/pages/IndexLibraryPage/index2.jsx

+ 3 - 3
src/app/components/FilterPanel.jsx

@@ -199,6 +199,8 @@ export const FilterPanel=memo(({
       {options?.metric && <RadioCheckButton title={t("formItem.metric")} options={options.metric} mode="checkBox" onChange={onSelectMetric}/>}
       {/*分析维度*/}
       {options?.dimension && <RadioCheckButton title={t("formItem.dimension")} defaultCheck={[dateDimension?.value]} options={options.dimension} mode="checkBox" onChange={onSelectDimension}/>}
+      {/*展示方式*/}
+      <RadioCheckButton title={t("formItem.display")} options={DISPLAY_COND} onSelect={handelDisplayChange} defaultCheck={DISPLAY_COND[0].value}/>
       {/*筛选条件*/}
       <Popconfirm
         icon={false}
@@ -210,12 +212,10 @@ export const FilterPanel=memo(({
         cancelText={t("button.cancel")}
         arrow={false}
       >
-        <RadioCheckButton title={t("formItem.keyword")} link={t("placeholder.filters")} />
+        <RadioCheckButton title={t("formItem.filters")} link={t("placeholder.filters")} />
       </Popconfirm>
       {/*筛选条件展示/删除栏*/}
       {tags.length>0 && <EditableTags options={tags} onClose={onFilterClose} closable={true}/>}
-      {/*展示方式*/}
-      <RadioCheckButton title={t("formItem.display")} options={DISPLAY_COND} onSelect={handelDisplayChange} defaultCheck={DISPLAY_COND[0].value}/>
       {extra}
       <Spin tip="Loading..." spinning={loading}>
         <ChartsGraph

+ 2 - 0
src/app/pages/IndexLibraryPage/index2.jsx

@@ -174,10 +174,12 @@ export const IndexLibraryPage = () => {
 
 
   const onFilterFinish=useCallback((value)=>{
+    console.log(value)
     dispatch(getIndexByConditions({
       params:{
         hasCollect:value?.collected && value?.collected[0],
         isPublish:1,
+        ...value,
         domainIds:[domain?.id],
       }
     }))