aldehyde 0.2.456 → 0.2.457

package/src/aldehyde/table/modal-select-table.tsx

@@ -1,6 +1,7 @@
-import React from 'react'
-import "./index.css"
-import { DtmplData, QueryKey, SelectConfig, SelectedRow } from "../tmpl/interface";
+import React from 'react';
+import { FormInstance } from "antd";
+import "./index.css";
+import { DtmplData, QueryKey, SelectConfig, SelectedRow, FieldConfig } from "../tmpl/interface";
 import TableUnits from "./table-util";
 import SupportInputTypes from '../tmpl/control-type-supportor';
 import HCDataSource from '../tmpl/hc-data-source';
@@ -23,6 +24,8 @@ interface ModelSelectTableProps {
     onCancel: () => void,
     defaultCriteriaValue?: object,
     onOK: (selectedRows: SelectedRow[]) => void,
+    parentFormInstance?: FormInstance,
+    selectRelValueField?: FieldConfig,
 };
 
 interface ModelSelectTableStat {
@@ -54,8 +57,33 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         selectedRows: [],
     }
 
-    loadData = async (selectConfig: SelectConfig, criteriaData: object) => {
+    // 表单关系字段组查询取值start
+    getSubDtmplData = async (valueField, code) => {
+        const { serverKey } = this.props;
+        const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+        const subField = valueField.subRelValueField;
+        const subData = dtmplData.fieldMap[subField.id];
+        if (subField.subRelValueField && subData) { // 存在下级关联项
+            return this.getSubDtmplData(subField, subData);
+        }
+        return subData;
+    }
+
+    getSecondCriteria = async () => {
+        const { parentFormInstance, selectRelValueField } = this.props;
+        let secondCriteria;
+        if (selectRelValueField && parentFormInstance) {
+            secondCriteria = parentFormInstance.getFieldValue(selectRelValueField.id);
+            if (selectRelValueField.subRelValueField && secondCriteria) {
+                secondCriteria = await this.getSubDtmplData(selectRelValueField, secondCriteria);
+            }
+        }
+        return { secondCriteria };
+    }
+    // 表单关系字段组查询点选取值end
 
+    loadData = async (selectConfig: SelectConfig, criteriaData: object) => {
+        const secondCriteria = await this.getSecondCriteria();
         this.setState({
             loading: true,
         })
@@ -70,7 +98,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         const { sourceId, exceptCodes, serverKey, mainCode, existRelation } = this.props;
         /** 构建 dataSource **/
         //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey, sourceId, { exceptCodes, ...criteriaData, ...pageInfo, mainCode, existRelation });
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey, sourceId, { exceptCodes, ...criteriaData, ...pageInfo, ...secondCriteria, mainCode, existRelation });
         this.setState({
             queryKey,
             criteriaData,

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

@@ -1081,7 +1081,9 @@ class RelationTable extends React.PureComponent<
                         exceptCodes={exceptCodes}
                         mainCode={mainCode1}
                         sourceId={fieldGroupConfig.id}
-                    ></ModelSelectTable>
+                        selectRelValueField={fieldGroupConfig.selectRelValueField}
+                        parentFormInstance={parentFormInstance}
+                    />
                 ) : ""}
             </>
         );

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -1523,4 +1523,17 @@ export default class HcserviceV3 {
       message.error(translate("${发送失败}"), 3);
     }
   }
+
+  static async wsPushTopic(hydrocarbonToken, data) {
+    const res = await Super.super({
+      url: `/v3/ws-push-topic/${hydrocarbonToken}`,
+      data,
+      method: "POST",
+    });
+    if (res.code === 200) {
+      message.success(translate("${已发送}"));
+    } else {
+      message.error(translate("${发送失败}"), 3);
+    }
+  }
 }

package/src/aldehyde/tmpl/interface.tsx

@@ -373,6 +373,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   batchAddFileField?: FieldConfig;
   addRowPosition?: "begin" | "end";
   submitType?: "separate" | "follow";
+  selectRelValueField?: FieldConfig; // 关联关系组点选查询取值字段
 }
 
 export type SaveJumpType = "list" | "add" | "edit";
@@ -446,6 +447,7 @@ export interface FieldConfig extends FieldBase {
   requiredRuleCriterias?: FieldConfig[];
   usableRuleCriterias?: FieldConfig[];
   relValueField?: FieldConfig;
+  subRelValueField?: FieldConfig;
   hidden?: boolean;
   serverKey?: string;
   sourceId?: string;
@@ -471,6 +473,7 @@ export interface FieldConfig extends FieldBase {
   defShowIcon?: boolean; // 图片组件，是否默认显示缩略图，默认显示
   showUploadList?: boolean; // 上传组件是否显示文件列表
   uploadText?: string; // 上传组件文本配置
+  fieldSwitchRequiredClearType?: "doNotClear" | "toOptionalClear" | "toRequiredClear" | "switchClear"; // 必填条件-是否清除关联项
 }
 
 export interface ActionRenderProps {
@@ -891,4 +894,5 @@ export interface ThemeConfig {
   homeSourceId?: string; // 首页菜单
   supportedLanguages?: string[]; // 支持语言
   defaultLanguage?: string; // 默认语言
+  wsTypes?: ("sys-messages" | "user-notification")[];
 }

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -402,7 +402,7 @@ TmplConfigAnalysis.buildInDtmplConfig = (
                 if (!changedValues) {
                     continue;
                 }
-                const requireValue = field.requiredRuleCriterias?.some(r => {
+                const requireValue = field.requiredRuleCriterias?.find(r => {
                     const id = TmplConfigAnalysis.getFieldId(dtmplConfig, r.mstrucId);
                     return changedValues.hasOwnProperty(id);
                 });
@@ -419,11 +419,20 @@ TmplConfigAnalysis.buildInDtmplConfig = (
                         // "secondCriteria": changedValues[field.relValueField.id]
                     };
                     field.configChanged = true;
-                    if (formInstance.getFieldValue(field.id)) {
-                        formInstance.setFieldValue(field.id, null);
+                    // 必填条件配置是否清除/可用条件默认清除
+                    let isClear = false;
+                    if (requireValue) {
+                        const clearType = requireValue?.fieldSwitchRequiredClearType;
+                        const isRequired = field?.required;
+                        isClear = (clearType === "switchClear" || (clearType === "toRequiredClear" && isRequired) || (clearType === "toOptionalClear" && !isRequired)) ? true : false;
                     }
-                    if (formInstance.getFieldValue("c_" + field.id)) {
-                        formInstance.setFieldValue("c_" + field.id, null);
+                    if (isClear || usableValue) { // 清除关联项值
+                        if (formInstance.getFieldValue(field.id)) {
+                            formInstance.setFieldValue(field.id, null);
+                        }
+                        if (formInstance.getFieldValue("c_" + field.id)) {
+                            formInstance.setFieldValue("c_" + field.id, null);
+                        }
                     }
                 }
             }