Merge branch 'master' of http://app.puruiit.cn:9092/data_center_platform/prims-web

src/app/pages/IndexDefine/components/CompositeIndexForm.jsx

@@ -6,7 +6,7 @@ import {selectModals} from "../../MainPage/slice/selectors";
 import {Col, Row} from "antd";
 import {styled} from "styled-components";
 import {DATA_TYPE} from "../constants";
-import {getModalInfo} from "../../MainPage/slice/thunks";
+import {getModalInfoList} from "../../MainPage/slice/thunks";
 import useI18NPrefix from "../../../hooks/useI18NPrefix";
 
 export const CompositeIndexForm = memo(({
@@ -32,16 +32,33 @@ export const CompositeIndexForm = memo(({
   }, []);
 
   const onModalSelect = useCallback(async (modelId) => {
-    // todo  接口调整为可以批量查询
     if(Array.isArray(modelId)){
       modelId = modelId.join(','); 
     }
     if (!modelId) return false
     // computedEditorRef?.current?.clear();
-    await dispatch(getModalInfo({
+    await dispatch(getModalInfoList({
       id:modelId,
       resolve(data) {
-        const {dimensions,metrics}=data;
+        let dimensions = [];
+        let metrics = [];
+
+        if (Array.isArray(data)) {
+          data.forEach(item => {
+            if (!item) {
+              return;
+            }
+            if (Array.isArray(item.dimensions)) {
+              dimensions.push(...item.dimensions);
+            }
+            if (Array.isArray(item.metrics)) {
+              metrics.push(...item.metrics);
+            }
+          });
+        } else if (data) {
+          dimensions = Array.isArray(data.dimensions) ? data.dimensions : [];
+          metrics = Array.isArray(data.metrics) ? data.metrics : [];
+        }
         const analyze = dimensions.filter(({type})=>type!=="time").map(({name, bizName, description, id})=>({
           label: description|| name|| bizName,
           value: id

src/app/pages/MainPage/slice/thunks.js

@@ -285,6 +285,18 @@ export const getModalInfo = createAsyncThunk(
   },
 );
 
+export const getModalInfoList = createAsyncThunk(
+  'main/getModelInfoList',
+  async ({id,resolve}) => {
+    const {data} = await request({
+      url: '/semantic/model/getModelInfoList/'+ id,
+      method: "GET",
+    })
+    resolve && resolve(data)
+    return data
+  },
+);
+
 /** 获取模型下的所有指标 */
 export const getMetricList = createAsyncThunk(
   'main/getMetricList',

vite.config.js

@@ -64,7 +64,7 @@ export default defineConfig(({mode})=> {
       proxy: {
         // 当有 /api开头的地址是，代理到target地址
         '^/api': {
-          target: 'http://172.20.2.23:18084/', //目标源，目标服务器，真实请求地址
+          target: 'http://localhost:9080/', //目标源，目标服务器，真实请求地址
           //target: 'http://192.168.2.211:9080/', //目标源，目标服务器，真实请求地址
           changeOrigin: true, //支持跨域
           rewrite: (path) => path.replace(/^\/api/, "/api"), //重写真实路径,替换/api