aldehyde 0.2.486 → 0.2.488

package/src/aldehyde/draw-canvas-edit/components/render/tools/position-tool.ts

@@ -110,12 +110,12 @@ export class PositionTool {
 
     // 重绘
     this.render.redraw([
-      BgDraw.name,
-      GraphDraw.name,
-      LinkDraw.name,
-      RulerDraw.name,
-      RefLineDraw.name,
-      PreviewDraw.name
+      BgDraw.NAME,
+      GraphDraw.NAME,
+      LinkDraw.NAME,
+      RulerDraw.NAME,
+      RefLineDraw.NAME,
+      PreviewDraw.NAME
     ]);
   }
 
@@ -136,12 +136,12 @@ export class PositionTool {
     });
     // 重绘
     this.render.redraw([
-      BgDraw.name,
-      GraphDraw.name,
-      LinkDraw.name,
-      RulerDraw.name,
-      RefLineDraw.name,
-      PreviewDraw.name
+      BgDraw.NAME,
+      GraphDraw.NAME,
+      LinkDraw.NAME,
+      RulerDraw.NAME,
+      RefLineDraw.NAME,
+      PreviewDraw.NAME
     ]);
   }
 
@@ -181,12 +181,12 @@ export class PositionTool {
     });
     // 重绘
     this.render.redraw([
-      BgDraw.name,
-      GraphDraw.name,
-      LinkDraw.name,
-      RulerDraw.name,
-      RefLineDraw.name,
-      PreviewDraw.name
+      BgDraw.NAME,
+      GraphDraw.NAME,
+      LinkDraw.NAME,
+      RulerDraw.NAME,
+      RefLineDraw.NAME,
+      PreviewDraw.NAME
     ]);
   }
 }

package/src/aldehyde/draw-canvas-edit/components/render/tools/selection-tool.ts

@@ -44,7 +44,7 @@ export class SelectionTool {
     // 隐藏 连接点
     this.render.linkTool.pointsVisible(false);
     // 重绘
-    this.render.redraw([GraphDraw.name, LinkDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME]);
   }
 
   // 选择节点
@@ -121,7 +121,7 @@ export class SelectionTool {
     }
 
     // 重绘
-    this.render.redraw([GraphDraw.name, LinkDraw.name]);
+    this.render.redraw([GraphDraw.NAME, LinkDraw.NAME]);
   }
 
   // 更新节点位置

package/src/aldehyde/draw-canvas-edit/components/render/tools/z-index-tool.ts

@@ -106,10 +106,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }
@@ -151,10 +151,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }
@@ -182,10 +182,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }
@@ -215,10 +215,10 @@ export class ZIndexTool {
       this.render.updateHistory();
       // 重绘
       this.render.redraw([
-        GraphDraw.name,
-        LinkDraw.name,
-        RulerDraw.name,
-        PreviewDraw.name
+        GraphDraw.NAME,
+        LinkDraw.NAME,
+        RulerDraw.NAME,
+        PreviewDraw.NAME
       ]);
     }
   }

package/src/aldehyde/lowcode-components/bar-chart/index.tsx

@@ -81,7 +81,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -90,6 +90,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -147,6 +148,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
     }));
 
     // 窗口大小变化时重新调整图表大小

package/src/aldehyde/lowcode-components/column-3d-chart/index.tsx

@@ -136,7 +136,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number, type: string };
+    base?: { width: number, height: number, type: string };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -145,6 +145,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -202,6 +203,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
     }));
 
     // 窗口大小变化时重新调整图表大小

package/src/aldehyde/lowcode-components/column-chart/index.tsx

@@ -41,7 +41,7 @@ const defOption = {
         show: false, // 无数据时显示
     },
     tooltip: { trigger: "axis" },
-    grid: { top: 30, let: 30, right: 20, bottom: 30 },
+    grid: { top: 30, left: 30, right: 20, bottom: 30 },
     xAxis: {
         type: 'category',
         boundaryGap: true,
@@ -92,7 +92,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
 export interface ComponentStyle {
     tooltip?: { show: boolean };
     color?: string[];
-    grid?: { top: number, let: number, right: number, bottom: number };
+    grid?: { top: number, left: number, right: number, bottom: number };
     xAxis?: { [key: string]: any };
     yAxis?: { [key: string]: any };
     legend?: { [key: string]: any };
@@ -104,7 +104,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number, type: string };
+    base: { width?: number, height?: number, type: string };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -113,6 +113,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -171,6 +172,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             setInitSearchParams(newISParams);
             handleWSData(newDataConfig);
         },
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
         destroy: handleDestroy,
     }));
 

package/src/aldehyde/lowcode-components/line-bar-chart/index.tsx

@@ -97,7 +97,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -106,6 +106,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -164,6 +165,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             setInitSearchParams(newISParams);
             handleWSData(newDataConfig);
         },
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
         destroy: handleDestroy,
     }));
 

package/src/aldehyde/lowcode-components/line-chart/index.tsx

@@ -6,7 +6,6 @@ import { useLocale } from "../../locale/useLocale";
 import HydrocarbonService from "../../tmpl/hcservice-v3";
 import { DataConfigProps } from "../data";
 
-
 const defOption = {
     title: {
         text: '暂无数据',
@@ -15,7 +14,7 @@ const defOption = {
         show: false, // 无数据时显示
     },
     tooltip: { trigger: "axis" },
-    grid: { top: 30, let: 30, right: 20, bottom: 30 },
+    grid: { top: 30, left: 30, right: 20, bottom: 30 },
     xAxis: {
         type: 'category',
         boundaryGap: true,
@@ -71,7 +70,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
 export interface ComponentStyle {
     tooltip?: { show: boolean };
     color?: string[];
-    grid?: { top: number, let: number, right: number, bottom: number };
+    grid?: { top: number, left: number, right: number, bottom: number };
     xAxis?: { [key: string]: any };
     yAxis?: { [key: string]: any };
     legend?: { [key: string]: any };
@@ -92,7 +91,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -101,6 +100,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -159,6 +159,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             setInitSearchParams(newISParams);
             handleWSData(newDataConfig);
         },
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
         destroy: handleDestroy,
     }));
 
@@ -235,7 +238,8 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     }, [searchParams, initSearchParams]);
 
     const renderChart = () => {
-        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, connectNulls, lineStyle, step, isArea, isGradient, areaStyle, dataZoom, slider, symbol: { itemStyle, ...symbol } } = config;
+        const { grid, legend, tooltip, color, xAxis, yAxis, smooth, connectNulls, lineStyle, step, isArea, isGradient, areaStyle, dataZoom, slider, symbol: configSymbol } = config;
+        const { itemStyle, ...symbol } = configSymbol || {};
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
         const temData = isDesignMode && !data?.length ? option.series : data;

package/src/aldehyde/lowcode-components/pie-chart/index.tsx

@@ -130,7 +130,7 @@ export interface ComponentStyle {
 
 export interface ComponentProps {
     style?: ComponentStyle;
-    base: { width: number, height: number };
+    base?: { width: number, height: number };
     data?: DataConfigProps;
     isDesignMode?: boolean; // 是否编辑模式
     initSearchParams?: { [key: string]: any }; // 全局初始化外部参数，例：传参包含设备id，则在查询时带上设备id
@@ -139,6 +139,7 @@ export interface ComponentProps {
 export interface ComponentRef {
     updateConfig: (newConfig: ComponentProps) => void;
     destroy: () => void;
+    updateSearchParams: (params: { [key: string]: any }) => void;
 }
 
 const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>) => {
@@ -196,6 +197,9 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
+        updateSearchParams: (params) => {
+            setInitSearchParams(params);
+        },
     }));
 
     // 窗口大小变化时重新调整图表大小

package/src/aldehyde/module/dtmpl-edit-card.tsx

@@ -12,6 +12,10 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import Action from "../controls/action";
 import { LocaleContext } from "../locale/LocaleProvider";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
+import { relValueFieldExtControlType } from "../controls/entry-control";
+
+// 缓存 getSubDtmplData 的请求结果（防止多次请求）
+const subDtmplDataCache: Map<string, any> = new Map();
 
 interface DtmplEditCardProps extends DtmplBaseProps {
     onOk?: (code: string) => void;
@@ -73,6 +77,7 @@ export default class DtmplEditCard extends React.PureComponent<
             if (prevProps.sourceId != this.props.sourceId || dtmplConfig == null || (!this.props.code && prevProps.code)) {
                 await this.loadConfigData();
             } else if (prevProps.sourceId != this.props.sourceId || queryingCode != code || !dtmplData) {
+                await this.handleBuildInFuncFields(dtmplConfig);
                 //防止反复请求 code
                 if (code) {
                     await this.loadCodeData(dtmplConfig, code);
@@ -108,6 +113,7 @@ export default class DtmplEditCard extends React.PureComponent<
                 addTmplId
             );
         }
+        await this.handleBuildInFuncFields(dtmplConfig);
         this.handleRelValueField(dtmplConfig);
         if (dtmplConfig.entity) {
             let dtmplData = dtmplConfig.entity;
@@ -224,7 +230,21 @@ export default class DtmplEditCard extends React.PureComponent<
     // 表单关联项secondCriterion处理start
     getSubDtmplData = async (valueField, code) => {
         const { serverKey } = this.props;
-        const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+        let dtmplData = null;
+        const cacheKey = `${valueField.extRefPageId || valueField.id}_${code.split("@R@")[0]}`; //缓存Key
+        const cacheData = subDtmplDataCache.get(cacheKey);
+        if (cacheData !== undefined) { // 存在缓存使用缓存，减少请求次数
+            dtmplData = cacheData;
+        } else {
+            if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
+                const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
+                dtmplData = entities?.[0];
+            } else { // 查询字段指向页面的数据
+                dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+            }
+            subDtmplDataCache.set(cacheKey, dtmplData || false);
+        }
+        if (!dtmplData) return null;
         const subField = valueField.subRelValueField;
         const subData = dtmplData.fieldMap[subField.id];
         if (subField.subRelValueField && subData) { // 存在下级关联项
@@ -235,17 +255,21 @@ export default class DtmplEditCard extends React.PureComponent<
 
     getSecondCriteria = async (field) => {
         const { parentFormInstance } = this.props;
-        const { relValueField, relValueField3, baseCriteria = {} } = field;
+        const { relValueField, relValueField3, baseCriteria = {}, relMinValueField, relMaxValueField } = field;
         const temForm = parentFormInstance || this.formRef.current;
-        if (relValueField && temForm) {
+        if (relValueField && temForm) { // 设置默认值或查询次条件
             let relValueData = temForm.getFieldValue(relValueField.id);
             if (relValueField.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField, relValueData);
             }
-            field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
+            if (!relValueFieldExtControlType.includes(field.extControlType)) {
+                field.defaultValue = relValueData;  // 非关系型字段填充默认值
+            } else {
+                field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
+            }
             field.configChanged = true;
         }
-        if (relValueField3 && temForm) {
+        if (relValueField3 && temForm) { // 设置查询三条件
             let relValueData = temForm.getFieldValue(relValueField3.id);
             if (relValueField3.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField3, relValueData);
@@ -253,6 +277,22 @@ export default class DtmplEditCard extends React.PureComponent<
             field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
             field.configChanged = true;
         }
+        if (relMinValueField && temForm) { // 设置最小值
+            let relValueData = temForm.getFieldValue(relMinValueField.id);
+            if (relMinValueField.subRelValueField && relValueData) {
+                relValueData = await this.getSubDtmplData(relMinValueField, relValueData);
+            }
+            field.min = relValueData;
+            field.configChanged = true;
+        }
+        if (relMaxValueField && temForm) { // 设置最大值
+            let relValueData = temForm.getFieldValue(relMaxValueField.id);
+            if (relMaxValueField.subRelValueField && relValueData) {
+                relValueData = await this.getSubDtmplData(relMaxValueField, relValueData);
+            }
+            field.max = relValueData;
+            field.configChanged = true;
+        }
         return field;
     }
     // 表单关联项secondCriterion处理end
@@ -292,8 +332,8 @@ export default class DtmplEditCard extends React.PureComponent<
     };
 
     //关联取值:根据 parentFormInstance / this.formRef 完善 dtmplConfig
-    handleBuildInFuncFields = async () => {
-        const { dtmplConfig } = this.state;
+    handleBuildInFuncFields = async (tDtmplConfig?: DtmplConfig) => {
+        const dtmplConfig = tDtmplConfig || this.state.dtmplConfig;
         if (dtmplConfig) {
             if (!dtmplConfig.buildInFuncFields) {
                 dtmplConfig.buildInFuncFields = TmplConfigAnalysis.buildInFuncFields(dtmplConfig);

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -24,7 +24,10 @@ import Draggable from 'react-draggable';
 import DraggableModal from "./draggable-modal";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 import { LocaleContext } from "../locale/LocaleProvider";
+import { relValueFieldExtControlType } from "../controls/entry-control";
 
+// 缓存 getSubDtmplData 的请求结果（防止多次请求）
+const subDtmplDataCache: Map<string, any> = new Map();
 
 interface ModalEditorProps extends DtmplBaseProps {
   height?: any;
@@ -115,6 +118,7 @@ export default class DtmplEditPage extends React.PureComponent<
       ) {
         await this.loadConfigData();
       } else {
+        await this.handleBuildInFuncFields(dtmplConfig);
         await this.loadData(dtmplConfig);
       }
     }
@@ -146,6 +150,7 @@ export default class DtmplEditPage extends React.PureComponent<
       );
     }
     this.handleRelValueField(dtmplConfig);
+    await this.handleBuildInFuncFields(dtmplConfig);
     // 直接复制
     if (dtmplConfig?.entity && dtmplConfig?.entity?.code == code) {
       let dtmplData = dtmplConfig.entity;
@@ -167,7 +172,21 @@ export default class DtmplEditPage extends React.PureComponent<
   // 表单关联项secondCriterion处理start
   getSubDtmplData = async (valueField, code) => {
     const { serverKey } = this.props;
-    const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+    let dtmplData = null;
+    const cacheKey = `${valueField.extRefPageId || valueField.id}_${code.split("@R@")[0]}`; //缓存Key
+    const cacheData = subDtmplDataCache.get(cacheKey);
+    if (cacheData !== undefined) { // 存在缓存使用缓存，减少请求次数
+      dtmplData = cacheData;
+    } else {
+      if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
+        const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
+        dtmplData = entities?.[0];
+      } else { // 查询字段指向页面的数据
+        dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+      }
+      subDtmplDataCache.set(cacheKey, dtmplData || false);
+    }
+    if (!dtmplData) return null;
     const subField = valueField.subRelValueField;
     const subData = dtmplData.fieldMap[subField.id];
     if (subField.subRelValueField && subData) { // 存在下级关联项
@@ -178,17 +197,21 @@ export default class DtmplEditPage extends React.PureComponent<
 
   getSecondCriteria = async (field) => {
     const { parentFormInstance } = this.props;
-    const { relValueField, relValueField3, baseCriteria = {} } = field;
+    const { relValueField, relValueField3, baseCriteria = {}, relMinValueField, relMaxValueField } = field;
     const temForm = parentFormInstance || this.formRef.current;
-    if (relValueField && temForm) {
+    if (relValueField && temForm) { // 设置默认值或查询次条件
       let relValueData = temForm.getFieldValue(relValueField.id);
       if (relValueField.subRelValueField && relValueData) {
         relValueData = await this.getSubDtmplData(relValueField, relValueData);
       }
-      field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
+      if (!relValueFieldExtControlType.includes(field.extControlType)) {
+        field.defaultValue = relValueData;  // 非关系型字段填充默认值
+      } else {
+        field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
+      }
       field.configChanged = true;
     }
-    if (relValueField3 && temForm) {
+    if (relValueField3 && temForm) { // 设置查询三条件
       let relValueData = temForm.getFieldValue(relValueField3.id);
       if (relValueField3.subRelValueField && relValueData) {
         relValueData = await this.getSubDtmplData(relValueField3, relValueData);
@@ -196,6 +219,22 @@ export default class DtmplEditPage extends React.PureComponent<
       field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
       field.configChanged = true;
     }
+    if (relMinValueField && temForm) { // 设置最小值
+      let relValueData = temForm.getFieldValue(relMinValueField.id);
+      if (relMinValueField.subRelValueField && relValueData) {
+        relValueData = await this.getSubDtmplData(relMinValueField, relValueData);
+      }
+      field.min = relValueData;
+      field.configChanged = true;
+    }
+    if (relMaxValueField && temForm) { // 设置最大值
+      let relValueData = temForm.getFieldValue(relMaxValueField.id);
+      if (relMaxValueField.subRelValueField && relValueData) {
+        relValueData = await this.getSubDtmplData(relMaxValueField, relValueData);
+      }
+      field.max = relValueData;
+      field.configChanged = true;
+    }
     return field;
   }
   // 表单关联项secondCriterion处理end
@@ -283,7 +322,7 @@ export default class DtmplEditPage extends React.PureComponent<
    * 匹配关联项的字段，实现值更新关联字段值变化
    */
   handleRelValueField = (dtmplConfig: DtmplConfig) => {
-    if(!dtmplConfig){
+    if (!dtmplConfig) {
       return;
     }
     const { groups } = dtmplConfig;
@@ -316,8 +355,8 @@ export default class DtmplEditPage extends React.PureComponent<
   };
 
   //关联取值:根据 parentFormInstance / this.formRef 完善 dtmplConfig
-  handleBuildInFuncFields = async () => {
-    const { dtmplConfig } = this.state;
+  handleBuildInFuncFields = async (tDtmplConfig?: DtmplConfig) => {
+    const dtmplConfig = tDtmplConfig || this.state.dtmplConfig;
     if (dtmplConfig) {
       if (!dtmplConfig.buildInFuncFields) {
         dtmplConfig.buildInFuncFields = TmplConfigAnalysis.buildInFuncFields(dtmplConfig);