aldehyde 0.2.485 → 0.2.487

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

@@ -12,6 +12,7 @@ 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";
 
 interface DtmplEditCardProps extends DtmplBaseProps {
     onOk?: (code: string) => void;
@@ -73,6 +74,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 +110,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 +227,14 @@ 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;
+        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);
+        }
+        if (!dtmplData) return null;
         const subField = valueField.subRelValueField;
         const subData = dtmplData.fieldMap[subField.id];
         if (subField.subRelValueField && subData) { // 存在下级关联项
@@ -235,17 +245,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 +267,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 +322,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,6 +24,7 @@ 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";
 
 
 interface ModalEditorProps extends DtmplBaseProps {
@@ -115,6 +116,7 @@ export default class DtmplEditPage extends React.PureComponent<
       ) {
         await this.loadConfigData();
       } else {
+        await this.handleBuildInFuncFields(dtmplConfig);
         await this.loadData(dtmplConfig);
       }
     }
@@ -146,6 +148,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 +170,14 @@ 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;
+    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);
+    }
+    if (!dtmplData) return null;
     const subField = valueField.subRelValueField;
     const subData = dtmplData.fieldMap[subField.id];
     if (subField.subRelValueField && subData) { // 存在下级关联项
@@ -178,17 +188,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 +210,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 +313,7 @@ export default class DtmplEditPage extends React.PureComponent<
    * 匹配关联项的字段，实现值更新关联字段值变化
    */
   handleRelValueField = (dtmplConfig: DtmplConfig) => {
-    if(!dtmplConfig){
+    if (!dtmplConfig) {
       return;
     }
     const { groups } = dtmplConfig;
@@ -316,8 +346,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);

package/src/aldehyde/table/act-table.tsx

@@ -160,6 +160,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
   formRef = React.createRef<FormInstance>(); // 可编辑表格的form Ref
+  isJumpRef = React.createRef<boolean>(); // 是否是action跳转
 
   static defaultProps = {
     criteriaData: {},
@@ -608,8 +609,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   }
 
   isSameSourceQuery = (sourceId, criteriaData) => {
-    // 路由变化时，变化后路由不存在sourceId||menuId，则不触发查询
-    if (!criteriaData['sourceId'] && !criteriaData['menuId']) {
+    // action跳转，路由变化时，变化后路由不存在sourceId||menuId，则不触发查询
+    if (this.isJumpRef.current && !criteriaData['sourceId'] && !criteriaData['menuId']) {
+      this.isJumpRef.current = false;
       return false;
     }
 
@@ -823,6 +825,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       url = url + searchs.join("&");
     }
     if (jump.linkTarget == '_self') {
+      this.isJumpRef.current = true;
       window.location.hash = url.substring(url.indexOf("#") + 1);
     } else {
       debugger