aldehyde 0.2.62 → 0.2.64

package/lib/layout/MainPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MainPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAUzB,OAAO,cAAc,CAAA;AACrB,OAAO,kBAAkB,CAAA;;AAsOzB,wBAAoC"}
+{"version":3,"file":"MainPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAUzB,OAAO,cAAc,CAAA;AACrB,OAAO,kBAAkB,CAAA;;AA4QzB,wBAAoC"}

package/lib/layout/MainPage.js

@@ -53,11 +53,31 @@ class MainPage extends React.PureComponent {
             const { blocks } = this.state;
             if (leMenuId) {
                 for (const block of blocks) {
-                    for (const menul1 of block.l1Menus) {
-                        for (const menul2 of menul1.l2Menus) {
-                            if (menul2.id == leMenuId) {
-                                blockId = block.id;
-                                break;
+                    if (block.l1Menus) {
+                        for (const menul1 of block.l1Menus) {
+                            for (const menul2 of menul1.l2Menus) {
+                                if (menul2.id == leMenuId) {
+                                    blockId = block.id;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        for (const menul1 of block.items) {
+                            if (menul1.items) {
+                                for (const menul2 of menul1.items) {
+                                    if (menul2.id == leMenuId) {
+                                        blockId = block.id;
+                                        break;
+                                    }
+                                }
+                            }
+                            else {
+                                if (menul1.id == leMenuId) {
+                                    blockId = block.id;
+                                    break;
+                                }
                             }
                         }
                     }
@@ -70,11 +90,31 @@ class MainPage extends React.PureComponent {
             let result = undefined;
             if (currentL2MenuId) {
                 for (const block of blocks) {
-                    for (const menul1 of block.l1Menus) {
-                        for (const menul2 of menul1.l2Menus) {
-                            if (menul2.id == currentL2MenuId) {
-                                result = block;
-                                break;
+                    if (block.l1Menus) {
+                        for (const menul1 of block.l1Menus) {
+                            for (const menul2 of menul1.l2Menus) {
+                                if (menul2.id == currentL2MenuId) {
+                                    result = block;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        for (const menul1 of block.items) {
+                            if (menul1.items) {
+                                for (const menul2 of menul1.items) {
+                                    if (menul2.id == currentL2MenuId) {
+                                        result = block;
+                                        break;
+                                    }
+                                }
+                            }
+                            else {
+                                if (menul1.id == currentL2MenuId) {
+                                    result = block;
+                                    break;
+                                }
                             }
                         }
                     }

package/lib/layout/MainPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"MainPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,EAAC,MAAM,MAAM,CAAA;AAC5B,OAAO,MAAM,MAAM,gBAAgB,CAAC;AAEpC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,cAAc,CAAA;AACrB,OAAO,kBAAkB,CAAA;AACzB,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,MAAM,CAAC;AAgBhC,MAAM,QAAS,SAAQ,KAAK,CAAC,aAA2C;IAAxE;;QACI,iBAAY,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,UAAK,GAAG;YACJ,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,EAAE;YACV,eAAe,EAAE,SAAS;YAC1B,cAAc,EAAE,SAAS;YACzB,UAAU,EAAC,KAAK;YAChB,YAAY,EAAC,SAAS;SACzB,CAAA;QAwED,mBAAc,GAAG,CAAC,OAAe,EAAE,EAAE;YACjC,IAAI,UAAkB,CAAC;YACvB,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,IAAI,OAAO,EAAE;gBACT,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBACxB,IAAI,KAAK,CAAC,EAAE,IAAI,OAAO,EAAE;wBACrB,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC;wBACzB,MAAM;qBACT;iBACJ;aACJ;YACD,IAAI,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,IAAI,WAAW,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;YAC5E,KAAK,GAAG,KAAK,GAAG,WAAW,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC,CAAA;QAED,wBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE;YACvC,IAAI,OAAO,GAAW,SAAS,CAAC;YAChC,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,IAAI,QAAQ,EAAE;gBACV,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBACxB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;wBAChC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;4BACjC,IAAI,MAAM,CAAC,EAAE,IAAI,QAAQ,EAAE;gCACvB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC;gCACnB,MAAM;6BACT;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO,OAAO,CAAC;QACnB,CAAC,CAAA;QAED,qBAAgB,GAAG,GAAG,EAAE;YACpB,MAAM,EAAC,MAAM,EAAE,eAAe,EAAE,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC7D,IAAI,MAAM,GAAc,SAAS,CAAC;YAElC,IAAI,eAAe,EAAG;gBAClB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBACxB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;wBAChC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;4BACjC,IAAI,MAAM,CAAC,EAAE,IAAI,eAAe,EAAE;gCAC9B,MAAM,GAAG,KAAK,CAAC;gCACf,MAAM;6BACT;yBACJ;qBACJ;iBACJ;aACJ;YACD,IAAI,cAAc,IAAI,CAAC,MAAM,EAAE;gBAC3B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBACxB,IAAI,KAAK,CAAC,EAAE,KAAK,cAAc,EAAE;wBAC7B,MAAM,GAAG,KAAK,CAAC;wBACf,MAAM;qBACT;iBACJ;aACJ;YACD,IAAG,CAAC,MAAM,EAAC;gBACP,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACzB;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA;QAED,WAAM,GAAG,GAAG,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAC,EAAE,CAAA,CAAC;gBACpB,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS;aACnC,CAAC,CAAC,CAAC;QACR,CAAC,CAAC;IA4DN,CAAC;IAvMS,iBAAiB;;YACnB,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/C,kDAAkD;YAClD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,YAAY,GAAG,IAAI,eAAe,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;YACrD,IAAI,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1C,eAAe;YACf,IAAI,CAAC,QAAQ,EAAE;gBACX,IAAI,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBACvD,IAAI,UAAU,EAAE;oBACZ,IAAI,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACtC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;wBACtB,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;qBACxB;iBACJ;aACJ;YACD,IAAI,QAAQ,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAChH,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAC,EAAE,CAAA,CAAC;gBACpB,UAAU,EAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAC,CAAC;gBACjD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAA,CAAC,CAAA,QAAQ,CAAC,MAAM,CAAA,CAAC,CAAA,EAAE;gBAC1C,eAAe,EAAE,QAAQ,CAAC,QAAQ;gBAClC,cAAc,EAAE,QAAQ,CAAC,OAAO;gBAChC,YAAY,EAAC,QAAQ,CAAC,WAAW;aACpC,CAAC,CAAC,CAAC;QAER,CAAC;KAAA;IAGK,kBAAkB,CAAC,SAAS,EAAE,SAAS;;YAEzC,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,YAAY,GAAG,IAAI,eAAe,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;YACrD,IAAI,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,WAAW,GAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAC,CAAC,CAAC;YACxD,IAAG,SAAS,CAAC,UAAU,IAAE,WAAW,EAAC;gBACjC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAC,EAAE,CAAA,CAAC;oBACpB,UAAU,EAAC,WAAW;iBACzB,CAAC,CAAC,CAAA;aACN;YACD,eAAe;YACf,IAAI,CAAC,QAAQ,EAAE;gBACX,IAAI,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBACvD,IAAI,UAAU,EAAE;oBACZ,IAAI,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACtC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;wBACtB,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;qBACxB;iBACJ;aACJ;YAED,MAAM,EAAC,eAAe,EAAE,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACrD,IAAI,QAAQ,IAAI,eAAe,IAAI,QAAQ,EAAE;gBACzC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAC,EAAE,CAAA,CAAC;oBACpB,eAAe,EAAE,QAAQ;iBAC5B,CAAC,CAAC,CAAC;aACP;YAED,IAAI,CAAC,OAAO,EAAE;gBACV,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;aAChD;YACD,IAAI,OAAO,IAAI,cAAc,IAAI,OAAO,EAAE;gBACtC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAC,EAAE,CAAA,CAAC;oBACpB,cAAc,EAAE,OAAO;iBAC1B,CAAC,CAAC,CAAC;aACP;QACL,CAAC;KAAA;IAyED,MAAM;;QAEF,MAAM,EAAC,SAAS,EAAE,eAAe,EAAE,cAAc,EAAC,UAAU,EAAC,YAAY,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACxF,SAAS;QACT,oEAAoE;QACrE,aAAa;QACZ,iDAAiD;QACjD,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,0CAAE,WAAW,EAAE,CAAC;QAC1C,OAAO,CACH,oBAAC,UAAU,IAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,QAAQ,QAAC,eAAe,EAAE,IAAI;YAUhG,oBAAC,aAAa,IAAC,KAAK,EAAE,CAAC,UAAU,CAAA,CAAC,CAAA,KAAK,CAAA,CAAC,CAAA,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;gBAC7E,oBAAC,MAAM;oBACH,oBAAC,KAAK,IAAC,KAAK,EAAE,OAAO,EACjB,KAAK,EAAE;4BACH,yBAAyB;4BACzB,QAAQ,EAAE,MAAM;4BAChB,MAAM,EAAE,OAAO;4BACf,QAAQ,EAAE,OAAO;4BACjB,IAAI,EAAE,CAAC;4BACP,GAAG,EAAE,CAAC;4BACN,MAAM,EAAE,CAAC;yBACZ,EACD,SAAS,EAAE,SAAS;wBAEpB,oBAAC,OAAO,IAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,EACvD,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,CAC9D;oBACR,oBAAC,MAAM,IAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAC,CAAC,CAAC,CAAC;4BAC9D,UAAU,EAAE,MAAM;4BAClB,UAAU,EAAE,GAAG;yBAClB;wBACG,oBAAC,MAAM,kBAAC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAM,IAAI,CAAC,KAAK,EAAI;wBAC/C,oBAAC,OAAO,IAAC,KAAK,EAAE;gCACZ,MAAM,EAAE,aAAa;gCACrB,QAAQ,EAAE,SAAS;gCACnB,SAAS,EAAE,aAAa;gCACxB,QAAQ,EAAE,GAAG;gCACb,QAAQ,EAAE,IAAI;gCACd,aAAa,EAAE,KAAK;6BACvB,IACI,IAAI,CAAC,KAAK,CAAC,QAAQ,CACd;wBACV,oBAAC,MAAM,OAAE,CACJ,CACJ,CACG,CACP,CAChB,CAAA;IACL,CAAC;CACJ;AAED,eAAe,UAAU,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"MainPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/block.d.ts

@@ -10,7 +10,7 @@ interface BlockState {
 }
 declare class Block extends React.PureComponent<BlockProps, BlockState> {
     constructor(props: any);
-    renderBlockMenu: (blockMenu: BlockMenu) => React.JSX.Element;
+    getSubMenu: (blockMenu: BlockMenu) => import("antd/es/menu/hooks/useItems").ItemType[];
     findBlockId: (blocks: BlockMenu[], currentL2MenuId: string) => string;
     render(): React.JSX.Element | React.JSX.Element[];
 }

package/lib/layout/menu/block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,WAAW,UAAU;IACvB,MAAM,EAAC,SAAS,EAAE,CAAC;IACnB,cAAc,CAAC,EAAC,MAAM,CAAC;IACvB,eAAe,CAAC,EAAC,MAAM,CAAC;IACxB,WAAW,CAAC,EAAC,MAAM,CAAC;CACvB;AACD,UAAU,UAAU;CAEnB;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;gBAE/C,KAAK,KAAA;IAIjB,eAAe,cAAc,SAAS,uBAKrC;IAGD,WAAW,WAAW,SAAS,EAAE,mBAAiB,MAAM,YAavD;IAED,MAAM;CAiCT;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,WAAW,UAAU;IACvB,MAAM,EAAC,SAAS,EAAE,CAAC;IACnB,cAAc,CAAC,EAAC,MAAM,CAAC;IACvB,eAAe,CAAC,EAAC,MAAM,CAAC;IACxB,WAAW,CAAC,EAAC,MAAM,CAAC;CACvB;AACD,UAAU,UAAU;CAEnB;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;gBAE/C,KAAK,KAAA;IAIjB,UAAU,cAAc,SAAS,sDAEhC;IAED,WAAW,WAAW,SAAS,EAAE,mBAAiB,MAAM,YAyBvD;IAED,MAAM;CAiCT;AAED,eAAe,KAAK,CAAC"}

package/lib/layout/menu/block.js

@@ -1,20 +1,32 @@
 import React from "react";
-import { Dropdown, Menu } from 'antd';
+import { Dropdown } from 'antd';
 import MenuRender from './menu-render';
 class Block extends React.PureComponent {
     constructor(props) {
         super(props);
-        this.renderBlockMenu = (blockMenu) => {
-            return React.createElement(Menu, null, MenuRender.renderL1Menu(blockMenu.l1Menus, null));
+        this.getSubMenu = (blockMenu) => {
+            return MenuRender.getMenu(blockMenu, null);
         };
         this.findBlockId = (blocks, currentL2MenuId) => {
             let blockId = undefined;
             for (const block of blocks) {
-                for (const menul1 of block.l1Menus) {
-                    for (const menul2 of menul1.l2Menus) {
-                        if (menul2.id === currentL2MenuId) {
-                            blockId = block.id;
-                            return blockId;
+                if (block.l1Menus) {
+                    for (const menul1 of block.l1Menus) {
+                        for (const menul2 of menul1.l2Menus) {
+                            if (menul2.id === currentL2MenuId) {
+                                blockId = block.id;
+                                return blockId;
+                            }
+                        }
+                    }
+                }
+                else {
+                    for (const menul1 of block.items) {
+                        for (const menul2 of menul1.items) {
+                            if (menul2.id === currentL2MenuId) {
+                                blockId = block.id;
+                                return blockId;
+                            }
                         }
                     }
                 }
@@ -37,7 +49,7 @@ class Block extends React.PureComponent {
         }
         return (blocks.map((item, index) => {
             return React.createElement("div", { key: index, className: `${item.id == blockId ? "active" : ""} header-block`, style: syyy },
-                React.createElement(Dropdown, { overlay: this.renderBlockMenu(item) },
+                React.createElement(Dropdown, { menu: { items: this.getSubMenu(item) } },
                     React.createElement("a", { className: "dropdown-link", style: item.id == blockId ? { color: '#fff' } : { color: activeColor }, rel: "noopener noreferrer" }, item.title)));
         }));
     }

package/lib/layout/menu/block.js.map

@@ -1 +1 @@
-{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAC,MAAM,MAAM,CAAC;AAErC,OAAO,UAAU,MAAM,eAAe,CAAC;AAavC,MAAM,KAAM,SAAQ,KAAK,CAAC,aAAqC;IAE3D,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;QAGjB,oBAAe,GAAG,CAAC,SAAmB,EAAC,EAAE;YACrC,OAAO,oBAAC,IAAI,QACP,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAC,IAAI,CAAC,CAC7C,CAAA;QAEX,CAAC,CAAA;QAGD,gBAAW,GAAG,CAAC,MAAkB,EAAC,eAAsB,EAAE,EAAE;YACxD,IAAI,OAAO,GAAQ,SAAS,CAAC;YAC7B,KAAI,MAAM,KAAK,IAAI,MAAM,EAAC;gBACtB,KAAI,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAC;oBAC9B,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAC;wBAC/B,IAAG,MAAM,CAAC,EAAE,KAAG,eAAe,EAAC;4BAC3B,OAAO,GAAC,KAAK,CAAC,EAAE,CAAC;4BACjB,OAAO,OAAO,CAAC;yBAClB;qBACJ;iBACJ;aACJ;YACD,OAAO,OAAO,CAAC;QACnB,CAAC,CAAA;IAvBD,CAAC;IAyBD,MAAM;QACF,MAAM,EAAC,cAAc,EAAC,MAAM,EAAC,eAAe,EAAC,WAAW,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;QAErE,MAAM,IAAI,GAAC,EAAC,oCAAoC,EAAC,WAAW,CAAA,CAAC,CAAA,WAAW,CAAA,CAAC,CAAA,SAAS,EAAC,gCAAgC,EAAC,WAAW,CAAA,CAAC,CAAA,WAAW,CAAA,CAAC,CAAA,SAAS,EAAkB,CAAA;QAEvK,IAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAC,CAAC,EAAC;YAC1B,OAAO,yCAAK,CAAC;SAChB;QACD,IAAI,OAAO,GAAC,cAAc,CAAC;QAC3B,IAAG,eAAe,IAAI,CAAC,OAAO,EAAC;YAC3B,OAAO,GAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAC,eAAe,CAAC,CAAC;SACpD;QACD,IAAG,CAAC,OAAO,EAAC;YACR,OAAO,GAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3B;QAED,OAAO,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACvB,OAAO,6BAAK,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,eAAe,EAAG,KAAK,EAAE,IAAI;gBACrF,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;oBACzC,2BAAI,SAAS,EAAC,eAAe,EACzB,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,OAAO,CAAA,CAAC,CAAA,EAAC,KAAK,EAAC,MAAM,EAAC,CAAA,CAAC,CAAA,EAAC,KAAK,EAAC,WAAW,EAAC,EAC5D,GAAG,EAAC,qBAAqB,IAExB,IAAI,CAAC,KAAK,CACX,CACG,CACT,CAAA;QACV,CAAC,CAAC,CACL,CAAC;IACN,CAAC;CAEJ;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/menu-2layers.js

@@ -30,7 +30,7 @@ class Menu2layers extends React.PureComponent {
     componentDidMount() {
         const { currentL2MenuId, blockMenu, collapsed } = this.props;
         const { openKeys } = this.state;
-        let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
+        let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
         if (openKey && openKeys.length < 1) {
             this.setState({
                 openKeys: [openKey.toString()]
@@ -43,7 +43,7 @@ class Menu2layers extends React.PureComponent {
         const { openKeys } = this.state;
         if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
             //console.log('currentL2MenuId:',currentL2MenuId);
-            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
+            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
             if (openKey) {
                 this.setState({
                     openKeys: [openKey],
@@ -51,8 +51,8 @@ class Menu2layers extends React.PureComponent {
             }
         }
         else {
-            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
-            let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId) : undefined;
+            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
+            let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu, preMenuId) : undefined;
             if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
                 this.setState({
                     openKeys: [openKey],
@@ -63,7 +63,7 @@ class Menu2layers extends React.PureComponent {
     render() {
         const _a = this.props, { blockMenu, collapsed, currentL2MenuId, basePath } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId", "basePath"]);
         const { openKeys } = this.state;
-        return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined }), blockMenu ? MenuRender.renderL1Menu(blockMenu.l1Menus, undefined, basePath) : ""));
+        return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined, items: blockMenu ? MenuRender.getMenu(blockMenu, undefined, basePath) : [] })));
     }
 }
 export default Menu2layers;

package/lib/layout/menu/menu-2layers.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAE1B,OAAO,UAAU,MAAM,eAAe,CAAC;AAMvC,MAAM,WAAY,SAAQ,KAAK,CAAC,aAAiD;IAG7E,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;QAwCjB,eAAU,GAAG,CAAC,QAAQ,EAAE,EAAE;YACtB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAC,CAAC,EAAE;gBAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACzB;YACD,IAAI,CAAC,QAAQ,CAAC;gBACV,QAAQ;aACX,CAAC,CAAA;QACN,CAAC,CAAA;QA9CG,IAAI,CAAC,KAAK,GAAG;YACT,QAAQ,EAAE,EAAE;SACf,CAAA;IACL,CAAC;IAED,iBAAiB;QACb,MAAM,EAAC,eAAe,EAAE,SAAS,EAAC,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1D,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,OAAO,GAAG,SAAS,CAAA,CAAC,CAAA,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA,CAAC,CAAA,SAAS,CAAC;QAC5F,IAAG,OAAO,IAAI,QAAQ,CAAC,MAAM,GAAC,CAAC,EAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC;gBACV,QAAQ,EAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;aAChC,CAAC,CAAA;SACL;IACL,CAAC;IACD,kBAAkB,CAAC,SAAS;QACxB,MAAM,EAAC,eAAe,EAAE,SAAS,EAAC,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1D,IAAI,EAAC,eAAe,EAAC,SAAS,EAAC,SAAS,EAAC,YAAY,EAAC,GAAC,SAAS,CAAC;QACjE,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAE9B,IAAG,CAAC,YAAY,IAAI,CAAC,SAAS,IAAK,SAAS,CAAC,EAAE,IAAE,YAAY,CAAC,EAAE,EAAE;YAC1D,kDAAkD;YACtD,IAAI,OAAO,GAAG,SAAS,CAAA,CAAC,CAAA,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA,CAAC,CAAA,SAAS,CAAC;YACxF,IAAI,OAAO,EAAE;gBACT,IAAI,CAAC,QAAQ,CAAC;oBACV,QAAQ,EAAC,CAAC,OAAO,CAAC;iBACrB,CAAC,CAAA;aACL;SACR;aAAK;YACF,IAAI,OAAO,GAAG,SAAS,CAAA,CAAC,CAAA,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA,CAAC,CAAA,SAAS,CAAC;YAC5F,IAAI,UAAU,GAAG,SAAS,CAAA,CAAC,CAAA,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA,CAAC,CAAA,SAAS,CAAC;YAC5F,IAAG,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,IAAE,UAAU,CAAC,EAAC;gBAC5D,IAAI,CAAC,QAAQ,CAAC;oBACV,QAAQ,EAAC,CAAC,OAAO,CAAC;iBACrB,CAAC,CAAA;aACL;SACJ;IACL,CAAC;IAWD,MAAM;QACF,MAAM,KAA4D,IAAI,CAAC,KAAK,EAAtE,EAAC,SAAS,EAAE,SAAS,EAAE,eAAe,EAAC,QAAQ,OAAuB,EAAnB,KAAK,cAAxD,yDAAyD,CAAa,CAAC;QAC7E,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAE9B,OAAO,CACH,oBAAC,IAAI,oBACG,KAAK,IACT,YAAY,EAAE,IAAI,CAAC,UAAU,EAC7B,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EACxE,QAAQ,EAAE,CAAC,SAAS,CAAA,CAAC,CAAA,QAAQ,CAAA,CAAC,CAAA,SAAS,KAEtC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAC7E,CACV,CAAC;IACN,CAAC;CACJ;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/menu-render.d.ts

@@ -1,10 +1,12 @@
-import { Level1Menu, Level2Menu } from "../../tmpl/interface";
+import { BlockMenu, Level1Menu, Level2Menu } from "../../tmpl/interface";
 import React from "react";
 declare const _default: {
-    renderL1Menu(menus: Level1Menu[], target: any, basePath?: string): React.JSX.Element[];
+    getMenu(blockMenu: BlockMenu, target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
+    toL1Menu(subMenus: (Level1Menu)[], target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
+    toSubMenu(subMenus: (Level2Menu | BlockMenu)[], target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
     getRoutePath(menu: Level2Menu, basePath: any, defaultCriteriaData: any): string;
-    renderL2Menu(menus: Level2Menu[], target: any, basePath?: string): React.JSX.Element[];
-    findOpenId(l1Menus: Level1Menu[], currentL2MenuId: string): string;
+    toL2MenuTitle(item: Level2Menu, target: any, basePath?: string): React.JSX.Element;
+    findOpenId(blockMenu: BlockMenu, currentL2MenuId: string): string;
 };
 export default _default;
 //# sourceMappingURL=menu-render.d.ts.map

package/lib/layout/menu/menu-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,MAAM,OAAO,CAAC;;wBAMH,UAAU,EAAE;uBASb,UAAU;wBAkCT,UAAU,EAAE;wBAqBZ,UAAU,EAAE,mBAAiB,MAAM;;AAjE1D,wBA6EC"}
+{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,MAAM,OAAO,CAAC;;uBAOH,SAAS;uBAST,CAAC,UAAU,CAAC,EAAE;wBAiBb,CAAC,UAAU,GAAE,SAAS,CAAC,EAAE;uBAmB1B,UAAU;wBAkCT,UAAU;0BAsBR,SAAS,mBAAmB,MAAM;;AAvG5D,wBAwIC"}

package/lib/layout/menu/menu-render.js

@@ -1,15 +1,50 @@
-import { Menu } from "antd";
 import React from "react";
 import { NavLink } from 'react-router-dom';
 import Units from "../../units";
-const { SubMenu } = Menu;
 export default {
-    renderL1Menu(menus, target, basePath = "") {
-        return menus.map((item) => {
-            if (item.l2Menus) {
-                return React.createElement(SubMenu, { title: item.title, key: item.id }, this.renderL2Menu(item.l2Menus, target, basePath));
-            }
-        });
+    getMenu(blockMenu, target, basePath = "") {
+        if (blockMenu.l1Menus) {
+            return this.toL1Menu(blockMenu.l1Menus, target, basePath = "");
+        }
+        else {
+            return this.toSubMenu(blockMenu.items, target, basePath = "");
+        }
+    },
+    toL1Menu(subMenus, target, basePath = "") {
+        let menus = [];
+        let menu;
+        if (subMenus) {
+            subMenus.map((item) => {
+                menu = { key: item.id };
+                let subItems = item.l2Menus;
+                if (subItems) { //菜单
+                    menu.label = item.title;
+                    menu.children = this.toSubMenu(subItems, target, basePath);
+                }
+                menus.push(menu);
+            });
+        }
+        return menus;
+    },
+    toSubMenu(subMenus, target, basePath = "") {
+        let menus = [];
+        let menu;
+        if (subMenus) {
+            subMenus.map((item) => {
+                menu = { key: item.id };
+                let subItems = item.items;
+                if (subItems) { //菜单
+                    menu.label = item.title;
+                    menu.children = this.toSubMenu(subItems, target, basePath);
+                }
+                else {
+                    let i = item;
+                    menu.label = this.toL2MenuTitle(i, target, basePath);
+                }
+                menus.push(menu);
+            });
+        }
+        return menus;
     },
     getRoutePath(menu, basePath, defaultCriteriaData) {
         if (menu) {
@@ -41,31 +76,51 @@ export default {
         }
         return null;
     },
-    renderL2Menu(menus, target, basePath = "") {
-        return menus.map((item) => {
-            let delimiter = "/";
-            let customPath = item.customPath;
-            if (customPath) {
-                if (customPath.startsWith('/') || customPath.startsWith('\\')) {
-                    delimiter = "";
-                }
-            }
-            let defaultCriteriaData = "";
-            if (item.defaultCriteriaValue) {
-                defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
+    toL2MenuTitle(item, target, basePath = "") {
+        if (!item) {
+            return null;
+        }
+        let delimiter = "/";
+        let customPath = item.customPath;
+        if (customPath) {
+            if (customPath.startsWith('/') || customPath.startsWith('\\')) {
+                delimiter = "";
             }
-            let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
-            return React.createElement(Menu.Item, { key: item.id },
-                React.createElement(NavLink, { to: path, target: target }, item.title));
-        });
+        }
+        let defaultCriteriaData = "";
+        if (item['defaultCriteriaValue']) {
+            defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
+        }
+        let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
+        return React.createElement(NavLink, { to: path, target: target }, item.title);
     },
-    findOpenId(l1Menus, currentL2MenuId) {
+    findOpenId(blockMenu, currentL2MenuId) {
         let openL2MenuId = undefined;
-        for (const menul1 of l1Menus) {
-            for (const menul2 of menul1.l2Menus) {
-                if (menul2.id == currentL2MenuId) {
-                    openL2MenuId = menul1.id;
-                    return openL2MenuId;
+        if (blockMenu.l1Menus) {
+            for (const menul1 of blockMenu.l1Menus) {
+                for (const menul2 of menul1.l2Menus) {
+                    if (menul2.id == currentL2MenuId) {
+                        openL2MenuId = menul1.id;
+                        return openL2MenuId;
+                    }
+                }
+            }
+        }
+        else {
+            for (const menul1 of blockMenu.items) {
+                if (menul1.items) {
+                    for (const menul2 of menul1.items) {
+                        if (menul2.id == currentL2MenuId) {
+                            openL2MenuId = menul1.id;
+                            return openL2MenuId;
+                        }
+                    }
+                }
+                else {
+                    if (menul1.id == currentL2MenuId) {
+                        openL2MenuId = menul1.id;
+                        return openL2MenuId;
+                    }
                 }
             }
         }

package/lib/layout/menu/menu-render.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"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"}

package/lib/table/act-table.d.ts

@@ -76,7 +76,7 @@ declare class ActTable extends React.PureComponent<ActTableProps, ActTableStat>
     doDelete: () => Promise<void>;
     doDeleteByCode: (code: string) => Promise<void>;
     doSelectedCQuery: (cqueryId: string) => Promise<void>;
-    doJump: (jump: JumpConfig, record: DtmplData) => Promise<void>;
+    doJump: (jump: JumpConfig, record_: DtmplData) => Promise<void>;
     doRowJump: (jump: JumpConfig, record: DtmplData) => Promise<void>;
     doSelectedJump: (jump: JumpConfig) => Promise<void>;
     changeRowSelection: (selectedRows: SelectedRow[], selectedDatas: DtmplData[]) => void;

package/lib/table/act-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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"}

package/lib/table/act-table.js

@@ -307,16 +307,8 @@ class ActTable extends React.PureComponent {
         });
         this.doSelectedCQuery = (cqueryId) => __awaiter(this, void 0, void 0, function* () {
         });
-        this.doJump = (jump, record) => __awaiter(this, void 0, void 0, function* () {
-            // const {ltmplConfig} = this.props
-            // let result = await HcserviceV3.postJumps(jumpId, code);
-            //
-            // if (result.status === "success") {
-            //     let hydrocarbonToken = Units.hydrocarbonToken();
-            //     let url = result.url + "hydrocarbon_token=" + Units.hydrocarbonToken();
-            //     // console.log(url);
-            //     window.open(url);
-            // }
+        this.doJump = (jump, record_) => __awaiter(this, void 0, void 0, function* () {
+            let record = record_.fieldMap ? record_.fieldMap : record_;
             let url = null;
             let path = jump.path;
             if (!path) {
@@ -340,7 +332,7 @@ class ActTable extends React.PureComponent {
                         //根据参数名匹配参数
                         for (let p of routeParamConfigs) {
                             if (p && pa == p.title) { //赋值替换
-                                paths[i] = record.fieldMap[p.id];
+                                paths[i] = record[p.id] ? record[p.id] : p.defaultValue;
                                 break;
                             }
                         }
@@ -362,7 +354,7 @@ class ActTable extends React.PureComponent {
                 let initSearchLength = searchs.length;
                 for (let i = 0; i < searchParamConfigs.length; i++) {
                     let p = searchParamConfigs[i];
-                    searchs[initSearchLength + i] = p.title + "=" + (record.fieldMap[p.id] ? record.fieldMap[p.id] : p.defaultValue);
+                    searchs[initSearchLength + i] = p.title + "=" + (record[p.id] ? record[p.id] : p.defaultValue);
                 }
             }
             if (searchs.length > 0) {
@@ -377,9 +369,9 @@ class ActTable extends React.PureComponent {
             this.doJump(jump, record);
         });
         this.doSelectedJump = (jump) => __awaiter(this, void 0, void 0, function* () {
-            const { selectedRows } = this.state;
-            if (selectedRows.length == 1) {
-                this.doJump(jump, selectedRows[0]);
+            const { selectedDatas } = this.state;
+            if (selectedDatas.length == 1) {
+                this.doJump(jump, selectedDatas[0]);
             }
         });
         this.changeRowSelection = (selectedRows, selectedDatas) => {