Browse Source

入参增加

liudan 2 weeks ago
parent
commit
12211d3db1

+ 2 - 1
src/app/pages/IndexDefine/components/IndexCreator.jsx

@@ -137,7 +137,8 @@ const component = forwardRef(({
     let composite = compositeRef.current || '';
     if(val.type == "COMPOSITE") {
       delete val.dimensionIds;
-      val.dateDimId = '';
+      val.dateDimId = dateDimId?.[0];
+      val.dimensionId = dimensionIds?.[0];
       val.modelId = Array.isArray(modelId) ? modelId[0] : modelId;
       const metrics = [];
       composite.metrics.forEach((v, i) =>{

+ 7 - 5
src/app/pages/IndexDefine/index.jsx

@@ -220,11 +220,14 @@ export const IndexDefine = () => {
   /** 指标创建表单-提交 */
   const onCreatorFinish = useCallback((values)=>{
     try {
-      const {
+      let {
         id,domainId,type,decimalPlaces,relateDimension,dateDimId,
         measure,operations,sensitiveLevel,filters,formIndex,incrementPeriod,
-        invokeMethod, periodId,runCycleCode,measureExpr, way, startTime,syncToBI
+        invokeMethod, periodId,runCycleCode,measureExpr, way, startTime,syncToBI, dimensionId
       } = values;
+      if(dimensionId){
+        relateDimension = dimensionId;
+      }
       let drillDownDimensions = [];
       if (relateDimension){
         dateDimId && drillDownDimensions.push({
@@ -239,6 +242,7 @@ export const IndexDefine = () => {
             inheritedFromModel:false
           }))
       }
+    
       const bizCondition = bizConditionToSQL(filters);
       // 部分字段需再次处理
       let params = {
@@ -385,9 +389,7 @@ export const IndexDefine = () => {
       resolve(detail){
         dispatch(queryDimensions({
           params:{
-            ids: detail.dataFormatType == "DECIMAL" 
-            ? detail?.metricDefineByMetricParams?.metrics[0]?.dimensionIds 
-            : detail.drillDownDimensions.map(v=>v.dimensionId),
+            ids: detail.drillDownDimensions.map(v=>v.dimensionId),
           },
           resolve(data){
             commonRef.current.indexDetail= {