aldehyde 0.2.454 → 0.2.455

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

@@ -137,6 +137,15 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         }
     }
 
+    // ws订阅数据更新
+    const handleWSData = (val: DataConfigProps) => {
+        if (val.sourceType === "sourceId" && val.wsData) {
+            const { value } = val.initData;
+            const temData = handleData(value);
+            setData(temData);
+        }
+    }
+
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => {
             const { base, style: newStyle, data: newDataConfig, initSearchParams: newISParams } = newConfig;
@@ -147,6 +156,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleInitData(newDataConfig);
             setSearchParams(newDataConfig.searchParams);
             setInitSearchParams(newISParams);
+            handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
     }));

package/src/aldehyde/lowcode-components/stroke-animation/index.tsx

@@ -64,6 +64,15 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         }
     }
 
+    // ws订阅数据更新
+    const handleWSData = (val: DataConfigProps) => {
+        if (val.sourceType === "sourceId" && val.wsData) {
+            const { value } = val.initData;
+            const temData = handleData(value);
+            setData(temData);
+        }
+    }
+
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => {
             const { base, style: newStyle, data: newDataConfig, initSearchParams: newISParams } = newConfig;
@@ -73,6 +82,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleInitData(newDataConfig);
             setSearchParams(newDataConfig.searchParams);
             setInitSearchParams(newISParams);
+            handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
     }));

package/src/aldehyde/lowcode-components/text-scroller/index.tsx

@@ -63,6 +63,15 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         }
     }
 
+    // ws订阅数据更新
+    const handleWSData = (val: DataConfigProps) => {
+        if (val.sourceType === "sourceId" && val.wsData) {
+            const { value } = val.initData;
+            const temData = handleData(value);
+            setData(temData);
+        }
+    }
+
     useImperativeHandle(ref, () => ({
         updateConfig: (newConfig) => {
             const { style: newStyle, data: newDataConfig, initSearchParams: newISParams } = newConfig;
@@ -72,6 +81,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             handleInitData(newDataConfig);
             setSearchParams(newDataConfig.searchParams);
             setInitSearchParams(newISParams);
+            handleWSData(newDataConfig);
         },
         destroy: handleDestroy,
     }));

package/src/aldehyde/table/column/column-builder.tsx

@@ -97,7 +97,16 @@ export default {
             if (hiddenColIds && hiddenColIds.includes(item.originalId)) {
                 return
             } else {
-                tableColumns.push(column);
+                if (item.columnGroupName) { // 表头分组功能实现
+                    const groupIndex = tableColumns.findIndex(r => r.children?.length && r.title === item.columnGroupName);
+                    if (groupIndex !== -1) {
+                        tableColumns[groupIndex].children.push(column);
+                    } else {
+                        tableColumns.push({ title: item.columnGroupName, align: "center", children: [column] });
+                    }
+                } else {
+                    tableColumns.push(column);
+                }
             }
             let title1 = translate("${" + item.title + "}");
             column["title"] = item.tip ? <>{title1}<Tooltip placement="top" title={item.tip}>

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

@@ -761,6 +761,18 @@ export default class HcserviceV3 {
     return res;
   }
 
+  static async requestCharWSConfig(
+    serverKey: string,
+    sourceIds: string[]
+  ) {
+    let res = await Super.super({
+      url: `/v3/chart/ws/config`,
+      serverKey,
+      method: "GET",
+      query: { sourceIds },
+    });
+    return res;
+  }
 
   static async postActions(
     serverKey: string,
@@ -1498,7 +1510,8 @@ export default class HcserviceV3 {
   }
 
   // ws发送消息
-  static async wsPush(hydrocarbonToken, data = { message: "测试数据", destination: "/user/queue/dashboard" }) {
+  // data:{ message: "测试数据", destination: "/user/queue/dashboard" }
+  static async wsPush(hydrocarbonToken, data) {
     const res = await Super.super({
       url: `/v3/ws-push/${hydrocarbonToken}`,
       data,

package/src/aldehyde/tmpl/interface.tsx

@@ -291,6 +291,7 @@ export interface ColumnConfig extends FieldConfig {
   originalId: string;
   upperColumnTitle?: string,
   rowEditable?: boolean,
+  columnGroupName?: string, // 列分组
 }
 
 export type CodeSource = "new" | "listop" | "listop-new" | undefined;

package/src/aldehyde/tmpl/web-socket.ts

@@ -309,7 +309,7 @@ class WebSocket {
     // 订阅队列
     private async _flushQueue() {
         if (this.operationQueue.length === 0) return;
-        console.log(`[WS] 🚀 正在执行 ${this.operationQueue.length} 个排队操作...`);
+        // console.log(`[WS] 🚀 正在执行 ${this.operationQueue.length} 个排队操作...`);
         const queue = [...this.operationQueue];
         this.operationQueue = [];
         for (const op of queue) {

package/lib/lowcode-components/lowcode-view/component/abstract-designer-controller.d.ts

@@ -1,28 +0,0 @@
-import AbstractController from "./abstract-controller";
-import { IFilterConfigType, ThemeItemType } from "../interface";
-/**
- * AbstractDesignerController继承自AbstractController，在泛型的定义和约束上和AbstractController完全保持一致。
- * 此外，AbstractDesignerController扩展了一些自定义组件所需的特有方法，如：修改组件数据等
- */
-declare abstract class AbstractDesignerController<I = any, C = any> extends AbstractController<I, C> {
-    /**
-     * 更新组件数据,且必须触发组件的重新渲染
-     * @param data
-     */
-    changeData(data: any): void;
-    /**
-     * 更新组件数据
-     */
-    loadComponentData({ type, data }: {
-        type: string;
-        data: any;
-    }): void;
-    /**
-     * 更新本组件的主题样式方法，用于在全局切换主题时使用
-     * @param newTheme 新主题
-     */
-    updateTheme(newTheme: ThemeItemType): void;
-    updateFilter(filter: IFilterConfigType): void;
-}
-export default AbstractDesignerController;
-//# sourceMappingURL=abstract-designer-controller.d.ts.map

package/lib/lowcode-components/lowcode-view/component/abstract-designer-controller.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"abstract-designer-controller.d.ts","sourceRoot":"","sources":["../../../../../../src/aldehyde/lowcode-components/lowcode-view/component/abstract-designer-controller.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAsB,iBAAiB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEpF;;;GAGG;AACH,uBAAe,0BAA0B,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,CAAE,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAExF;;;OAGG;IAEI,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;IAIlC;;OAEG;IACI,iBAAiB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,GAAG,IAAI;IAW3E;;;OAGG;IAEI,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAI1C,YAAY,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;CAYvD;AAED,eAAe,0BAA0B,CAAC"}

package/lib/lowcode-components/lowcode-view/component/abstract-designer-controller.js

@@ -1,49 +0,0 @@
-import AbstractController from "./abstract-controller";
-/**
- * AbstractDesignerController继承自AbstractController，在泛型的定义和约束上和AbstractController完全保持一致。
- * 此外，AbstractDesignerController扩展了一些自定义组件所需的特有方法，如：修改组件数据等
- */
-class AbstractDesignerController extends AbstractController {
-    /**
-     * 更新组件数据,且必须触发组件的重新渲染
-     * @param data
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    changeData(data) {
-    }
-    /**
-     * 更新组件数据
-     */
-    loadComponentData({ type, data }) {
-        switch (type) {
-            case "initData":
-                // 初始化数据加载逻辑
-                this.changeData(Object.assign(Object.assign({}, data), { type: "initData" }));
-                break;
-            default:
-                break;
-        }
-    }
-    /**
-     * 更新本组件的主题样式方法，用于在全局切换主题时使用
-     * @param newTheme 新主题
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    updateTheme(newTheme) {
-    }
-    // 设置滤镜效果
-    updateFilter(filter) {
-        if (this.config && this.config.filter)
-            this.config.filter = filter;
-        if (!this.container)
-            return;
-        if (filter === null || filter === void 0 ? void 0 : filter.enable) {
-            this.container.style.filter = `blur(${filter.blur}px) brightness(${filter.brightness}) contrast(${filter.contrast}) opacity(${filter.opacity}) saturate(${filter.saturate}) hue-rotate(${filter.hueRotate}deg)`;
-        }
-        else {
-            this.container.style.filter = 'none';
-        }
-    }
-}
-export default AbstractDesignerController;
-//# sourceMappingURL=abstract-designer-controller.js.map

package/lib/lowcode-components/lowcode-view/component/abstract-designer-controller.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"abstract-designer-controller.js","sourceRoot":"","sources":["../../../../../../src/aldehyde/lowcode-components/lowcode-view/component/abstract-designer-controller.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AAGvD;;;GAGG;AACH,MAAe,0BAA6C,SAAQ,kBAAwB;IAExF;;;OAGG;IACH,6DAA6D;IACtD,UAAU,CAAC,IAAS;IAC3B,CAAC;IAGD;;OAEG;IACI,iBAAiB,CAAC,EAAE,IAAI,EAAE,IAAI,EAA+B;QAChE,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,UAAU;gBACX,YAAY;gBACZ,IAAI,CAAC,UAAU,iCAAM,IAAI,KAAE,IAAI,EAAE,UAAU,IAAG,CAAC;gBAC/C,MAAM;YACV;gBACI,MAAM;QACd,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,6DAA6D;IACtD,WAAW,CAAC,QAAuB;IAC1C,CAAC;IAED,SAAS;IACF,YAAY,CAAC,MAAyB;QACzC,IAAI,IAAI,CAAC,MAAM,IAAK,IAAI,CAAC,MAA6B,CAAC,MAAM;YACxD,IAAI,CAAC,MAA8B,CAAC,MAAM,GAAG,MAAM,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,SAAS;YACf,OAAO;QACX,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,MAAM,CAAC,IAAI,kBAAkB,MAAM,CAAC,UAAU,cAAc,MAAM,CAAC,QAAQ,aAAa,MAAM,CAAC,OAAO,cAAc,MAAM,CAAC,QAAQ,gBAAgB,MAAM,CAAC,SAAS,MAAM,CAAA;QACnN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QACzC,CAAC;IACL,CAAC;CAEJ;AAED,eAAe,0BAA0B,CAAC"}

package/src/aldehyde/lowcode-components/lowcode-view/component/abstract-designer-controller.ts

@@ -1,56 +0,0 @@
-import AbstractController from "./abstract-controller";
-import { ComponentBaseProps, IFilterConfigType, ThemeItemType } from "../interface";
-
-/**
- * AbstractDesignerController继承自AbstractController，在泛型的定义和约束上和AbstractController完全保持一致。
- * 此外，AbstractDesignerController扩展了一些自定义组件所需的特有方法，如：修改组件数据等
- */
-abstract class AbstractDesignerController<I = any, C = any> extends AbstractController<I, C> {
-
-    /**
-     * 更新组件数据,且必须触发组件的重新渲染
-     * @param data
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    public changeData(data: any): void {
-    }
-
-
-    /**
-     * 更新组件数据
-     */
-    public loadComponentData({ type, data }: { type: string, data: any }): void {
-        switch (type) {
-            case "initData":
-                // 初始化数据加载逻辑
-                this.changeData({ ...data, type: "initData" });
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * 更新本组件的主题样式方法，用于在全局切换主题时使用
-     * @param newTheme 新主题
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    public updateTheme(newTheme: ThemeItemType): void {
-    }
-
-    // 设置滤镜效果
-    public updateFilter(filter: IFilterConfigType): void {
-        if (this.config && (this.config as ComponentBaseProps).filter)
-            (this.config as ComponentBaseProps)!.filter = filter;
-        if (!this.container)
-            return;
-        if (filter?.enable) {
-            this.container.style.filter = `blur(${filter.blur}px) brightness(${filter.brightness}) contrast(${filter.contrast}) opacity(${filter.opacity}) saturate(${filter.saturate}) hue-rotate(${filter.hueRotate}deg)`
-        } else {
-            this.container.style.filter = 'none';
-        }
-    }
-
-}
-
-export default AbstractDesignerController;