aldehyde 0.2.449 → 0.2.452

package/lib/tmpl/web-socket.js

@@ -0,0 +1,355 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import SockJS from 'sockjs-client';
+import { Client } from '@stomp/stompjs';
+import Units from "../units";
+/**
+ * 使用方法：
+ * const webSocket= WebSocket.getInstance(WS_URL); // 创建连接
+ * const subscribe = webSocket.subscribe('/topic/test',{}, (val)=>{console.log("推送的数据：",val)}); // 订阅
+ * subscribe.unsubscribe(); // 销毁订阅
+ * webSocket.disconnect(); // 关闭连接
+ */
+// 获取订阅地址
+const getWebSocketConfig = (path, options) => {
+    const serverKey = options.serverKey;
+    const header = options.connectionHeaders || {};
+    const programCode = header.programCode || Units.programCode(serverKey);
+    let server = new URL(options.hydrocarbonServer ? options.hydrocarbonServer : Units.api(serverKey));
+    let hydrocarbonToken = null;
+    if (header === null || header === void 0 ? void 0 : header.hydrocarbonToken) {
+        hydrocarbonToken = header.hydrocarbonToken;
+    }
+    else if (serverKey) {
+        hydrocarbonToken = Units.serverHydrocarbonToken(serverKey);
+    }
+    else if (Units.hydrocarbonToken(programCode)) {
+        hydrocarbonToken = Units.hydrocarbonToken(programCode);
+    }
+    else {
+        hydrocarbonToken = Units.getAnoHydrocarbonToken();
+    }
+    const url = `${server.protocol}//${server.host}${server.pathname}/${path}`;
+    return { url, hydrocarbonToken, programCode };
+};
+// 连接状态枚举
+var ConnectionState;
+(function (ConnectionState) {
+    ConnectionState["DISCONNECTED"] = "DISCONNECTED";
+    ConnectionState["CONNECTING"] = "CONNECTING";
+    ConnectionState["CONNECTED"] = "CONNECTED";
+    ConnectionState["RECONNECTING"] = "RECONNECTING";
+})(ConnectionState || (ConnectionState = {}));
+class WebSocket {
+    /**
+     * 获取单例实例的唯一入口
+     * @param url WebSocket 服务器地址
+     * @param options 配置项
+     * @returns 返回对应 URL 的唯一 WebSocket 实例
+     */
+    static getInstance(url, options = {}) {
+        if (!WebSocket.instances.has(url)) {
+            // 注意：这里调用的是私有的构造函数
+            const instance = new WebSocket(url, options);
+            WebSocket.instances.set(url, instance);
+        }
+        return WebSocket.instances.get(url);
+    }
+    /**
+     * 私有构造函数
+     * 防止外部直接使用 new WebSocket() 导致单例失效
+     */
+    constructor(url, options = {}) {
+        this.client = null;
+        this.subscriptions = new Map();
+        this.operationQueue = [];
+        this.state = ConnectionState.DISCONNECTED;
+        this.reconnectAttempts = 0;
+        this.reconnectTimer = null;
+        this.connectPromises = new Map();
+        this.config = {
+            reconnectDelay: 5000,
+            maxReconnectAttempts: 5,
+            heartbeatIncoming: 10000,
+            heartbeatOutgoing: 10000,
+            debug: false,
+            connectionHeaders: {},
+        };
+        this.url = url;
+        this.config = Object.assign(Object.assign({}, this.config), options);
+        this.connect();
+    }
+    // 建立连接
+    connect() {
+        if (this.state === ConnectionState.CONNECTED) { // 当前已连接不重复创建连接
+            return Promise.resolve();
+        }
+        this.state = ConnectionState.CONNECTING;
+        const { url: wsUrl, hydrocarbonToken, programCode } = getWebSocketConfig(this.url, this.config);
+        return new Promise((resolve, reject) => {
+            const currentPromiseId = Date.now().toString();
+            this.connectPromises.set(currentPromiseId, { resolve, reject });
+            const { heartbeatIncoming, heartbeatOutgoing, reconnectDelay } = this.config;
+            const socket = new SockJS(wsUrl);
+            this.client = new Client({
+                webSocketFactory: () => socket,
+                debug: this.config.debug ? (str) => console.log('[STOMP]', str) : () => { },
+                heartbeatIncoming,
+                heartbeatOutgoing,
+                reconnectDelay,
+                connectHeaders: {
+                    "hydrocarbon-token": hydrocarbonToken,
+                    "hydrocarbon-program-token": programCode
+                },
+                onConnect: (frame) => {
+                    console.log("连接成功：frame", frame);
+                    this.state = ConnectionState.CONNECTED;
+                    this.reconnectAttempts = 0;
+                    this.connectPromises.forEach(({ resolve }) => resolve());
+                    this.connectPromises.clear();
+                    this._restoreSubscriptions();
+                    this._flushQueue().catch(console.error);
+                },
+                onStompError: (frame) => {
+                    console.error('[WS] ❌ STOMP 协议错误', frame);
+                    const error = new Error(frame.headers['message'] || 'STOMP Error');
+                    if (this.state !== ConnectionState.DISCONNECTED) {
+                        this.state = ConnectionState.DISCONNECTED;
+                        this.client = null;
+                        this._scheduleReconnect();
+                    }
+                    this.connectPromises.forEach(({ reject }) => reject(error));
+                    this.connectPromises.clear();
+                },
+                onWebSocketClose: () => {
+                    if ([ConnectionState.CONNECTED, ConnectionState.CONNECTING].includes(this.state)) {
+                        console.warn('[WS] ⚠️ 连接意外断开，准备重连...');
+                        this.state = ConnectionState.DISCONNECTED;
+                        this.client = null;
+                        this._scheduleReconnect(); // 断开重连
+                    }
+                },
+                onWebSocketError: (error) => {
+                    console.error('[WS] ❌ WebSocket 错误', error);
+                    const wsError = new Error('WebSocket Error');
+                    if (this.state !== ConnectionState.DISCONNECTED) {
+                        this.state = ConnectionState.DISCONNECTED;
+                        this.client = null;
+                        this._scheduleReconnect();
+                    }
+                    this.connectPromises.forEach(({ reject }) => reject(wsError));
+                    this.connectPromises.clear();
+                },
+            });
+            this.client.activate();
+        });
+    }
+    // 订阅请求
+    subscribe(topic, params, callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.state === ConnectionState.CONNECTED && this.client) {
+                return this._doSubscribe(topic, callback, params);
+            }
+            else {
+                return new Promise((resolve, reject) => {
+                    this.operationQueue.push({
+                        type: 'SUBSCRIBE',
+                        payload: { topic, callback, resolve, reject, params },
+                    });
+                });
+            }
+        });
+    }
+    // 执行实际订阅
+    _doSubscribe(topic, callback, params) {
+        return new Promise((resolve, reject) => {
+            if (!this.client) {
+                reject(new Error('Client not initialized'));
+                return;
+            }
+            try {
+                const stompSub = this.client.subscribe(topic, (message) => {
+                    try {
+                        let body = message.body;
+                        if (typeof message.body === 'string') {
+                            body = JSON.parse(message.body);
+                        }
+                        callback(body, message);
+                    }
+                    catch (e) {
+                        console.error('[WS] JSON 解析错误', e);
+                        callback(message.body, message);
+                    }
+                }, params || {});
+                // 3. 更新内存记录
+                this.subscriptions.set(topic, {
+                    topic,
+                    callback,
+                    subscription: stompSub // 关键：确保新的 subscription 对象被保存
+                });
+                resolve(stompSub);
+            }
+            catch (error) {
+                reject(error);
+            }
+        });
+    }
+    // 发送消息
+    send(destination, body) {
+        if (this.state === ConnectionState.CONNECTED && this.client) {
+            try {
+                this.client.publish({
+                    destination,
+                    body: typeof body === 'string' ? body : JSON.stringify(body),
+                    headers: { 'content-type': 'application/json' },
+                });
+            }
+            catch (error) {
+                console.error('[WS] 发送消息失败:', error);
+            }
+        }
+        else {
+            this.operationQueue.push({ type: 'SEND', payload: { destination, body } });
+        }
+    }
+    // 取消订阅
+    unsubscribe(topic) {
+        var _a;
+        const record = this.subscriptions.get(topic);
+        if (record) {
+            (_a = record.subscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+            this.subscriptions.delete(topic);
+            console.log(`[WS] 🚫 已取消订阅: ${topic}`);
+            return true;
+        }
+        return false;
+    }
+    // 取消所有订阅
+    unsubscribeAll() {
+        this.subscriptions.forEach((record) => {
+            var _a;
+            (_a = record.subscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        });
+        this.subscriptions.clear();
+        console.log('[WS] 🚫 已取消所有订阅');
+    }
+    // 断开连接
+    disconnect() {
+        this.state = ConnectionState.DISCONNECTED;
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+        if (this.client) {
+            WebSocket.instances.delete(this.client.webSocket.url);
+            this.client.deactivate();
+            this.client = null;
+        }
+        this.unsubscribeAll();
+        this.operationQueue = [];
+        this.connectPromises.forEach(({ reject }) => {
+            reject(new Error('Connection manually disconnected'));
+        });
+        this.connectPromises.clear();
+        console.log('[WS] 🔌 客户端已主动断开');
+    }
+    // 当前订阅数量
+    getSubscriptionCount() {
+        return this.subscriptions.size;
+    }
+    // 连接后恢复订阅
+    _restoreSubscriptions() {
+        if (this.subscriptions.size === 0 || !this.client)
+            return;
+        console.log(`[WS] 🔄 正在恢复 ${this.subscriptions.size} 个订阅...`);
+        this.subscriptions.forEach((record, topic) => {
+            try {
+                const stompSub = this.client.subscribe(topic, (message) => {
+                    try {
+                        let body = message.body;
+                        if (typeof message.body === 'string') {
+                            body = JSON.parse(message.body);
+                        }
+                        record.callback(body, message);
+                    }
+                    catch (e) {
+                        record.callback(message.body, message);
+                    }
+                });
+                record.subscription = stompSub;
+            }
+            catch (error) {
+                console.error(`[WS] 恢复订阅失败: ${topic}`, error);
+            }
+        });
+    }
+    // 订阅队列
+    _flushQueue() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.operationQueue.length === 0)
+                return;
+            console.log(`[WS] 🚀 正在执行 ${this.operationQueue.length} 个排队操作...`);
+            const queue = [...this.operationQueue];
+            this.operationQueue = [];
+            for (const op of queue) {
+                try {
+                    if (op.type === 'SUBSCRIBE') {
+                        const { topic, callback, resolve, reject, params } = op.payload;
+                        try {
+                            const subscription = yield this._doSubscribe(topic, callback, params);
+                            resolve(subscription);
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                    }
+                    else if (op.type === 'SEND') {
+                        const { destination, body } = op.payload;
+                        this.send(destination, body);
+                    }
+                }
+                catch (error) {
+                    console.error('[WS] 执行队列操作失败:', error);
+                }
+            }
+        });
+    }
+    // 断连重连
+    _scheduleReconnect() {
+        if (this.reconnectAttempts >= this.config.maxReconnectAttempts) {
+            console.error('[WS] ❌ 重连失败：达到最大尝试次数');
+            return;
+        }
+        if (![ConnectionState.RECONNECTING, ConnectionState.DISCONNECTED].includes(this.state)) {
+            return;
+        }
+        this.reconnectAttempts++;
+        const delay = Math.min(this.config.reconnectDelay * Math.pow(1.5, this.reconnectAttempts - 1), 60000);
+        console.log(`[WS] ⏱️ ${delay}ms 后进行第 ${this.reconnectAttempts} 次重连...`);
+        this.reconnectTimer = setTimeout(() => {
+            this.connect().catch((err) => {
+                if (this.state !== ConnectionState.DISCONNECTED) {
+                    console.error('[WS] 重连尝试异常:', err);
+                }
+            });
+        }, delay);
+    }
+    // 判断是否已连接
+    isConnected() {
+        return this.state === ConnectionState.CONNECTED;
+    }
+    // 获取所有订阅的topic
+    getSubscribedTopics() {
+        return Array.from(this.subscriptions.keys());
+    }
+}
+WebSocket.instances = new Map();
+export default WebSocket;
+//# sourceMappingURL=web-socket.js.map

package/lib/tmpl/web-socket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"web-socket.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/web-socket.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.449",
+  "version": "0.2.452",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",
@@ -28,6 +28,7 @@
     "@emotion/babel-preset-css-prop": "^11.11.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
+    "@stomp/stompjs": "^7.3.0",
     "@tinymce/tinymce-react": "^3.12.2",
     "@types/react-resizable": "^3.0.8",
     "@visactor/vtable": "^1.22.9",
@@ -112,6 +113,7 @@
     "resolve": "^1.8.1",
     "sass-loader": "^7.1.0",
     "scroll-into-view-if-needed": "^2.2.28",
+    "sockjs-client": "^1.6.1",
     "superagent": "^4.0.0",
     "superagent-jsonp": "^0.2.1",
     "three": "^0.134.0",

package/src/aldehyde/controls/enum-badge/index.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { Badge } from "antd";
 import { VControlProps } from "../../tmpl/interface";
 import HCDataSource from "../../tmpl/hc-data-source";
@@ -8,12 +8,22 @@ interface MenuBadgeProps extends VControlProps { }
 
 const MenuBadge: React.FC<MenuBadgeProps> = (props) => {
   const { translate } = useLocale();
-
-  const { value, itemType, fieldConfig } = props;
+  const [color, setColor] = useState<string>();
+  const { value, itemType, fieldConfig, serverKey } = props;
 
   let viewControl = undefined;
 
-  let color = HCDataSource.getEnumValueColor(fieldConfig.mstrucId, value);
+  const getColor = async () => {
+    const temColor = await HCDataSource.getEnumValueColor(fieldConfig.mstrucId, value, serverKey);
+    setColor(temColor);
+  }
+
+  useEffect(() => {
+    if (value) {
+      getColor();
+    }
+  }, [value]);
+
   viewControl = (
     <span className="infoStyle">
       {value ? (

package/src/aldehyde/controls/enum-tag/index.tsx

@@ -1,5 +1,5 @@
-import React from "react";
-import { Space, Tag } from "antd";
+import React, { useEffect, useState } from "react";
+import { Space } from "antd";
 import { VControlProps } from "../../tmpl/interface";
 import HCDataSource from "../../tmpl/hc-data-source";
 import { useLocale } from "../../locale/useLocale";
@@ -8,30 +8,38 @@ interface EnumTagsProps extends VControlProps { }
 
 const EnumTags: React.FC<EnumTagsProps> = (props) => {
   const { translate } = useLocale();
+  const [tagList, setTagList] = useState<any[]>([]);
+  const { value, fieldConfig, serverKey } = props;
 
-  const { value, itemType, fieldConfig } = props;
-  let viewControl = undefined;
-  let tagList = [];
-  if (value) {
-    let v = value;
-    if (value instanceof Array) {
-    } else {
-      if (value.indexOf("@,@") > 0) {
-        v = value.split("@,@");
+  const getTagList = async () => {
+    if (value) {
+      const temArr = [];
+      let v = value;
+      if (value instanceof Array) {
       } else {
-        v = value.split(",");
-      }
+        if (value.indexOf("@,@") > 0) {
+          v = value.split("@,@");
+        } else {
+          v = value.split(",");
+        }
 
+      }
+      for (let index = 0; index < v.length; index++) {
+        const item = v[index];
+        let color = await HCDataSource.getEnumValueColor(fieldConfig.mstrucId, value, serverKey) || "#1677FF";
+        temArr.push(<span key={item} className="tag" style={{ fontSize: "12px", padding: "4px 10px", borderRadius: "9999px", color, background: `${color}1A` }}>
+          {translate("${" + item + "}")}
+        </span>)
+      }
+      setTagList(temArr);
     }
-    v.forEach((v) => {
-      let color = HCDataSource.getEnumValueColor(fieldConfig.mstrucId, value) || "#1677FF";
-      tagList.push(<span key={v} className="tag" style={{ fontSize: "12px", padding: "4px 10px", borderRadius: "9999px", color, background: `${color}1A` }}>
-        {translate("${" + v + "}")}
-      </span>)
-    });
   }
-  viewControl = <Space size={[8, 8]} wrap>{tagList}</Space>;
-  return viewControl;
+
+  useEffect(() => {
+    getTagList();
+  }, [value]);
+
+  return <Space size={[8, 8]} wrap>{tagList}</Space>;
 };
 
 export default EnumTags;

package/src/aldehyde/form/criteria-form.tsx

@@ -545,7 +545,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                   ""
                 )}
                 {showQueryButton ? (
-                  <Button type="primary" htmlType="submit">
+                  <Button type="primary" htmlType="submit" loading={loading}>
                     {translate("${查询}")}
                   </Button>
                 ) : (

package/src/aldehyde/lowcode-components/base-image/index.tsx

@@ -56,9 +56,11 @@ const BaseImageComponent = forwardRef((props: BaseImageComponentProps, ref: Forw
     const [initSearchParams, setInitSearchParams] = useState<{ [key: string]: any }>();
     const [localImgCode, setLocalImgCode] = useState<string>();
     const [localImgDel, setLocalImgDel] = useState<boolean>(false);
+    const [loading, setLoading] = useState<boolean>(true);
 
     // 处理数据源图片地址
     const handleDataImgSrc = (val) => {
+        setLoading(false);
         const src = handleData(val);
         if (!src) {
             setImgSrc("");
@@ -157,8 +159,9 @@ const BaseImageComponent = forwardRef((props: BaseImageComponentProps, ref: Forw
             } else {
                 getInitData();
             }
-        } else if (dataConfig?.sourceType === 'sourceId') {
+        } else {
             setImgSrc("");
+            setLoading(false);
         }
     }, [dataConfig?.sourceType, dataConfig?.sourceId, initSearchParams]);
 
@@ -199,7 +202,7 @@ const BaseImageComponent = forwardRef((props: BaseImageComponentProps, ref: Forw
 
     return (
         <div style={{ width: '100%', height: '100%' }}>
-            {!(imgSrc || defImgSrc) ? emptyImg :
+            {(loading || !(imgSrc || defImgSrc)) ? emptyImg :
                 isDesignMode && localImgDel ? renderLocalImgDel :
                     <img alt={'图片组件'} style={{ opacity: config?.opacity }} width={'100%'} height={'100%'} src={imgSrc || defImgSrc} />}
         </div>

package/src/aldehyde/table/pagination.tsx

@@ -43,12 +43,12 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
       }
     } else if (touchEnd) {
       sewTotal = false;
-      virtualTotal = pageInfo.virtualEndPageNo * pageInfo.pageSize + 1;
+      virtualTotal = (pageInfo.virtualEndPageNo || 0) * pageInfo.pageSize + 1;
       seeTotalTitle = translate("${查看总数}");
     } else {
       //这里还有问题
       sewTotal = false;
-      virtualTotal = pageInfo.virtualEndPageNo * pageInfo.pageSize + 1;
+      virtualTotal = (pageInfo.virtualEndPageNo || 0) * pageInfo.pageSize + 1;
       seeTotalTitle = translate("${查看总数}");
     }
 

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

@@ -177,8 +177,9 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         queryKey,
         pageInfo
       );
-      if (queryData?.key != this.props.queryKey?.key) {
+      if (queryData?.key !== queryKey) {
         this.setState({ loading: false, errorText: translate("${查询异常}"), dataSource: [] });
+        if (loadDataCallback) loadDataCallback([]); // 请求数据回调函数
         return;
       } else {
         let dataSource: object[] = [];

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

@@ -93,7 +93,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             pageNo: pageInfo.pageNo,
             queryKey,
             criteriaData,
-            loading: false,
+            // loading: false,
         });
     }
 
@@ -448,6 +448,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                     onChangeRowSelection={this.changeRowSelection}
                     sortColumnData={[]}
                     doSearch={this.doSearch}
+                    loadDataCallback={() => this.setState({ loading: false })}
                 />
                 {showView && drawCode ? (
                     <DtmplViewDrawer

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -364,14 +364,19 @@ HCDataSource.getEnumsValueMap = function (
   return map;
 };
 
-HCDataSource.getEnumOption = function (
+HCDataSource.getEnumOption = async function (
   mstrucId: string,
-  enumValue: string
-): EnumItem {
+  enumValue: string,
+  serverKey?: string
+) {
   if (!enumValue) {
     return null;
   }
   let options = this.getEnums(mstrucId);
+  if (!options) { // 枚举不存在查询
+    await loadEnum(serverKey, [mstrucId]);
+    options = this.getEnums(mstrucId);
+  }
   let enumItem: EnumItem = undefined;
   if (options) {
     options.forEach((option) => {
@@ -383,11 +388,12 @@ HCDataSource.getEnumOption = function (
   }
   return enumItem;
 };
-HCDataSource.getEnumValueColor = (
+HCDataSource.getEnumValueColor = async (
   mstrucId: string,
-  enumValue: string
-): string => {
-  let enumItem: EnumItem = HCDataSource.getEnumOption(mstrucId, enumValue);
+  enumValue: string,
+  serverKey?: string,
+) => {
+  let enumItem: EnumItem = await HCDataSource.getEnumOption(mstrucId, enumValue, serverKey);
   if (enumItem) {
     return enumItem.color;
   } else {

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

@@ -1496,4 +1496,18 @@ export default class HcserviceV3 {
       return false;
     }
   }
+
+  // ws发送消息
+  static async wsPush(hydrocarbonToken, data = { message: "测试数据", destination: "/user/queue/dashboard" }) {
+    const res = await Super.super({
+      url: `/v3/ws-push/${hydrocarbonToken}`,
+      data,
+      method: "POST",
+    });
+    if (res.code === 200) {
+      message.success(translate("${已发送}"));
+    } else {
+      message.error(translate("${发送失败}"), 3);
+    }
+  }
 }