aldehyde 0.2.455 → 0.2.457

package/src/aldehyde/layout2/components/user-notification.tsx

@@ -0,0 +1,74 @@
+import React, { useEffect, useRef } from "react";
+import { notification, Modal, Button } from "antd";
+import { useNavigate } from "react-router-dom";
+import { MenuType } from "../type/layout-type";
+import WebSocket from "../../tmpl/web-socket";
+import Units from "../../units";
+import { useLocale } from "../../locale/useLocale";
+
+interface UserNotification {
+    title?: string; // 标题
+    description?: string; // 内容
+    duration?: number; // 延迟时间
+    type?: "success" | "error" | "info" | "warning"; // 类型
+    closable?: boolean; // 是否可以关闭
+    sysDisabled?: boolean; // 是否显示遮罩层
+    sourceId?: string; // 用户消息推送，菜单sourceId
+}
+
+interface Props {
+    menuList: MenuType[];
+}
+
+// 用户消息
+const Index = (props: Props) => {
+    const { menuList } = props;
+    const [api, contextHolder] = notification.useNotification();
+    const { translate } = useLocale();
+    const navigate = useNavigate();
+    const wsRef = useRef(undefined); // 实时数据websocket连接
+    const subscribeRef = useRef(undefined); // 实时数据订阅
+
+    // 订阅消息数据
+    const getWebSocketUserNotification = async () => {
+        if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
+        wsRef.current = WebSocket.getInstance("v3/kk-ws");
+        subscribeRef.current = await wsRef.current.subscribe("/user/queue/notification", {}, (data) => {
+            openNotification(data);
+        });
+    }
+
+    useEffect(() => {
+        getWebSocketUserNotification();
+        return () => {
+            if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
+        }
+    }, []);
+
+    const routerTo = (sourceId: string) => {
+        const menu = Units.findItemByIdIterative(menuList, sourceId);
+        if (menu) {
+            navigate(`/${menu.url}`);
+        }
+    }
+
+    const openNotification = (message: UserNotification) => {
+        if (!message) {
+            return;
+        }
+        const { title, description, duration, type, closable, sysDisabled, sourceId } = message;
+        const btn = sourceId ? <div style={{ textAlign: "end" }}><Button style={{ padding: 0 }} type="link" onClick={() => routerTo(sourceId)}>{translate("${查看}")}</Button></div> : false;
+        const nContent = { style: { padding: "12px" }, message: title, description, duration, closeIcon: closable, btn };
+        const mContent = { styles: { content: { padding: "20px 20px 12px" } }, title, content: description, closable, footer: btn };
+        if (sysDisabled) { // 带遮罩层
+            const modal = Modal[type || "confirm"](mContent);
+            if (duration) setTimeout(() => modal.destroy(), duration * 1000);
+        } else { // 不带遮罩层
+            api[type || "open"](nContent);
+        }
+    };
+
+    return contextHolder;
+};
+
+export default Index;

package/src/aldehyde/layout2/header.tsx

@@ -25,6 +25,8 @@ import { useLayoutContext } from "./layout-context";
 import IconFont from "./components/icon-font";
 import SearchMenu from "./components/search-menu";
 import ScreenfullButton from "./components/screenfull-button";
+import SystemMessages from "./components/system-messages";
+import UserNotification from "./components/user-notification";
 import { ThemeConfig } from "../tmpl/interface";
 
 const toolbarStyle: CSSProperties = {
@@ -247,6 +249,8 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoIm
             flexDirection: "row",
           }}
         >
+          {themeConfig?.wsTypes?.includes("sys-messages") ? <SystemMessages menuList={menuList} /> : ""}
+          {themeConfig?.wsTypes?.includes("user-notification") ? <UserNotification menuList={menuList} /> : ""}
           <Space size="large">
             <ScreenfullButton style={toolbarStyle} />
             <SearchMenu menuList={menuList} />

package/src/aldehyde/layout3/header.tsx

@@ -13,6 +13,8 @@ import { useLayoutContext } from "../layout2/layout-context";
 import UserButton from "../layout2/components/user-button";
 import SearchMenu from "../layout2/components/search-menu";
 import ScreenfullButton from "../layout2/components/screenfull-button";
+import SystemMessages from "../layout2/components/system-messages";
+import UserNotification from "../layout2/components/user-notification";
 import headerBgImg from "./imgs/header-bg.png";
 import homeBgImg from "./imgs/home-bg.png";
 import Time from "./components/time";
@@ -141,6 +143,8 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, themeConfig,
         <div className="header-time"><Time /></div>
         <div className="header-title">{translate("${" + systemName + "}")}</div>
         <div className="header-right" >
+          {themeConfig?.wsTypes?.includes("sys-messages") ? <SystemMessages menuList={menuList} /> : ""}
+          {themeConfig?.wsTypes?.includes("user-notification") ? <UserNotification menuList={menuList} /> : ""}
           <Space size="large" >
             <ScreenfullButton style={toolbarStyle} />
             <SearchMenu menuList={menuList} style={toolbarStyle} />

package/src/aldehyde/layout4/header.tsx

@@ -12,6 +12,8 @@ import { useLayoutContext } from "../layout2/layout-context";
 import UserButton from "../layout2/components/user-button";
 import SearchMenu from "../layout2/components/search-menu";
 import ScreenfullButton from "../layout2/components/screenfull-button";
+import SystemMessages from "../layout2/components/system-messages";
+import UserNotification from "../layout2/components/user-notification";
 import headerBgImg from "./imgs/header-bg.png";
 import menuItemBgImg from "./imgs/menu-item-bg.png";
 import userImg from "./imgs/user.png";
@@ -156,6 +158,8 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, logoImg, them
           />
         </div>
         <div className="header-right" >
+          {themeConfig?.wsTypes?.includes("sys-messages") ? <SystemMessages menuList={menuList} /> : ""}
+          {themeConfig?.wsTypes?.includes("user-notification") ? <UserNotification menuList={menuList} /> : ""}
           <Space size="large">
             <ScreenfullButton style={toolbarStyle} />
             <SearchMenu menuList={menuList} style={toolbarStyle} />

package/src/aldehyde/layout5/header.tsx

@@ -9,6 +9,8 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
 import UserButton from "../layout2/components/user-button";
 import SearchMenu from "../layout2/components/search-menu";
 import ScreenfullButton from "../layout2/components/screenfull-button";
+import SystemMessages from "../layout2/components/system-messages";
+import UserNotification from "../layout2/components/user-notification";
 import { MenuType } from "../layout2/type/layout-type";
 import { useLocale } from "../locale/useLocale";
 import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
@@ -164,6 +166,8 @@ const Header: React.FC<HeaderPropsType> = ({ menuList, themeConfig }) => {
         <Breadcrumb items={breadcrumbItems} />
       </ConfigProvider>
       <Space size="large" style={{ height: "100%" }}>
+        {themeConfig?.wsTypes?.includes("sys-messages") ? <SystemMessages menuList={menuList} /> : ""}
+        {themeConfig?.wsTypes?.includes("user-notification") ? <UserNotification menuList={menuList} /> : ""}
         <ScreenfullButton style={toolbarStyle} />
         <SearchMenu menuList={menuList} style={toolbarStyle} />
         {menu?.length > 1 &&

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -351,7 +351,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
 
     onChangePage = (pageNo: number, pageSize: number, pageSizeOptions?: number[]) => {
         const { location } = this.props;
-        const temPageSizeOptions = pageSizeOptions ? pageSizeOptions : this.state.pageSizeOptions;
+        const temPageSizeOptions = pageSizeOptions?.length ? pageSizeOptions : this.state.pageSizeOptions;
         let search = location.search;
         let params = Units.transQueryStrToParams(search, null);
         params["pageNo"] = pageNo;

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/hc-data-source.tsx

@@ -25,6 +25,8 @@ const fastMenuCache: Map<string, Level2Menu[]> = new Map<
   Level2Menu[]
 >();
 const enumMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>(); //key mstrucId
+// pendingEnumRequests: 用于存储正在进行的枚举请求，防止多个组件同时请求同一个枚举时产生重复请求；key: mstrucId (枚举ID), value: Promise (对应的请求Promise)
+const pendingEnumRequests: Map<string, Promise<void>> = new Map();
 const enumValueMap: Map<string, Map<string, string>> = new Map<
   string,
   Map<string, string>
@@ -156,15 +158,39 @@ async function loadEnumOfLtmplConfig(
 
 async function loadEnum(serverKey: string, mstrucIds: string[], path?: string) {
   if (mstrucIds && mstrucIds.length > 0) {
-    let reqEnum = await HcserviceV3.requestEnum(serverKey, mstrucIds, path);
-    for (let key in reqEnum) {
-      let ems = reqEnum[key];
-      for (let option of ems) {
-        if (option["css"]) {
-          option["color"] = option["css"].color;
-        }
+    const pendingIds: string[] = [];  // 需要发起新请求的枚举ID
+    const waitPromises: Promise<void>[] = [];  // 正在请求中的Promise，等待它们完成
+    for (const id of mstrucIds) {
+      if (pendingEnumRequests.has(id)) {  // 该枚举正在请求中，加入等待队列
+        waitPromises.push(pendingEnumRequests.get(id));
+      } else { // 该枚举需要发起新请求
+        pendingIds.push(id);
       }
-      enumMap.set(key, ems);
+    }
+    if (waitPromises.length > 0) {  // 等待所有已在请求中的枚举完成
+      await Promise.all(waitPromises);
+    }
+    if (pendingIds.length > 0) {  //发起新的请求（仅针对未加载且未在请求中的枚举）
+      // 创建请求Promise并记录到pendingEnumRequests，防止后续请求重复发起
+      const requestPromise = (async () => {
+        try {
+          let reqEnum = await HcserviceV3.requestEnum(serverKey, pendingIds, path);
+          for (let key in reqEnum) {
+            let ems = reqEnum[key];
+            for (let option of ems) {
+              if (option["css"]) {
+                option["color"] = option["css"].color;
+              }
+            }
+            enumMap.set(key, ems);
+          }
+        } finally {
+          // 请求完成后清理pending状态
+          pendingIds.forEach(id => pendingEnumRequests.delete(id));
+        }
+      })();
+      pendingIds.forEach(id => pendingEnumRequests.set(id, requestPromise));
+      await requestPromise;
     }
   }
 }

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);
+                        }
                     }
                 }
             }