dcim-topology2d 2.2.4 → 2.2.5

package/core/src/middles/nodes/{arrow.anchor.d.ts → basic/arrow.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function arrowAnchors(node: Node): void;

package/core/src/middles/nodes/{arrow.anchor.js → basic/arrow.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function arrowAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width, node.rect.y + node.rect.height / 2, Direction.Right));

package/core/src/middles/nodes/{arrow.d.ts → basic/arrow.d.ts}

@@ -1,4 +1,4 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function leftArrow(ctx: CanvasRenderingContext2D, node: Node): void;
 export declare function rightArrow(ctx: CanvasRenderingContext2D, node: Node): void;
 export declare function twowayArrow(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{arrow.rect.d.ts → basic/arrow.rect.d.ts}

@@ -1,4 +1,4 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function leftArrowIconRect(node: Node): void;
 export declare function leftArrowTextRect(node: Node): void;
 export declare function rightArrowIconRect(node: Node): void;

package/core/src/middles/nodes/{arrow.rect.js → basic/arrow.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function leftArrowIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/core/src/middles/nodes/{circle.anchor.d.ts → basic/circle.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function circleAnchors(node: Node): void;

package/core/src/middles/nodes/{circle.anchor.js → basic/circle.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function circleAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));

package/core/src/middles/nodes/{circle.d.ts → basic/circle.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models';
+import { Node } from '../../../models';
 export declare function circle(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{circle.rect.d.ts → basic/circle.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function circleIconRect(node: Node): void;
 export declare function circleTextRect(node: Node): void;

package/core/src/middles/nodes/{circle.rect.js → basic/circle.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function circleIconRect(node) {
     var w = node.rect.width / 2;
     var h = node.rect.height / 2;

package/core/src/middles/nodes/{cloud.anchor.d.ts → basic/cloud.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models';
+import { Node } from '../../../models';
 export declare function cloudAnchors(node: Node): void;

package/core/src/middles/nodes/{cloud.anchor.js → basic/cloud.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function cloudAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + (node.rect.height * 3) / 5, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y + node.rect.height / 9, Direction.Up));

package/core/src/middles/nodes/{cloud.d.ts → basic/cloud.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models';
+import { Node } from '../../../models';
 export declare function cloud(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{cloud.rect.d.ts → basic/cloud.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function cloudIconRect(node: Node): void;
 export declare function cloudTextRect(node: Node): void;

package/core/src/middles/nodes/{cloud.rect.js → basic/cloud.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function cloudIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/core/src/middles/nodes/{cube.anchor.d.ts → basic/cube.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function cubeAnchors(node: Node): void;

package/core/src/middles/nodes/{cube.anchor.js → basic/cube.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function cubeAnchors(node) {
     var offset = node.z * Math.sin((45 * Math.PI) / 180);
     node.anchors.push(new Point(node.rect.x, node.rect.ey - (node.rect.height - offset) / 2, Direction.Left));

package/core/src/middles/nodes/{cube.d.ts → basic/cube.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function cube(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{cube.model.d.ts → basic/cube.model.d.ts}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Rect } from '../../models/rect';
+import { Point } from '../../../models/point';
+import { Rect } from '../../../models/rect';
 export declare class Surface {
     points: Point[];
     fillStyle: string;

package/core/src/middles/nodes/{cube.model.js → basic/cube.model.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { pSBC } from '../../utils/math';
+import { Point } from '../../../models/point';
+import { pSBC } from '../../../utils/math';
 var Surface = /** @class */ (function () {
     function Surface(pt1, pt2, pt3, pt4, fillStyle, strokeStyle) {
         if (fillStyle === void 0) { fillStyle = ''; }

package/core/src/middles/nodes/{cube.rect.d.ts → basic/cube.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function cubeIconRect(node: Node): void;
 export declare function cubeTextRect(node: Node): void;

package/core/src/middles/nodes/{cube.rect.js → basic/cube.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function cubeIconRect(node) {
     node.fullIconRect = node.fullTextRect;
     node.iconRect = new Rect(node.fullIconRect.x, node.fullIconRect.y, node.fullIconRect.width, (node.fullIconRect.height * 2) / 3);

package/core/src/middles/nodes/{diamond.d.ts → basic/diamond.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function diamond(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{diamond.rect.d.ts → basic/diamond.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function diamondIconRect(node: Node): void;
 export declare function diamondTextRect(node: Node): void;

package/core/src/middles/nodes/{diamond.rect.js → basic/diamond.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function diamondIconRect(node) {
     var w = node.rect.width / 3;
     var h = node.rect.height / 3;

package/core/src/middles/nodes/{file.d.ts → basic/file.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function file(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{iframe.d.ts → basic/iframe.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models';
+import { Node } from '../../../models';
 export declare function iframePrimeval(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{iframe.js → basic/iframe.js}

@@ -1,7 +1,7 @@
 import {rectangle} from './rectangle';
-import {s8} from "../../utils";
-import {createIframeElement} from "../../element";
-import {commonStore} from "../../store";
+import {s8} from "../../../utils";
+import {createIframeElement} from "../../../element";
+import {commonStore} from "../../../store";
 
 export function iframePrimeval(ctx, node) {
     //console.log('iframePrimeval############', node)

package/core/src/middles/nodes/{image.anchor.d.ts → basic/image.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function imageAnchors(node: Node): void;

package/core/src/middles/nodes/{image.anchor.js → basic/image.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function imageAnchors(node) {
     var textHeight = node.text
         ? node.paddingBottomNum || node.font.lineHeight * node.font.fontSize * (node.textMaxLine || 1)

package/core/src/middles/nodes/{image.rect.d.ts → basic/image.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function imageIconRect(node: Node): void;
 export declare function imageTextRect(node: Node): void;

package/core/src/middles/nodes/{image.rect.js → basic/image.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 import { getLines, getWords } from './text';
 // import { Store } from 'le5le-store';
 var txtMarginTop = 5;

package/core/src/middles/nodes/{line.anchor.d.ts → basic/line.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function lineAnchors(node: Node): void;

package/core/src/middles/nodes/{line.anchor.js → basic/line.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function lineAnchors(node) {
     var y = node.rect.y + node.rect.height / 2;
     node.anchors.push(new Point(node.rect.x, y, Direction.Left));

package/core/src/middles/nodes/{line.d.ts → basic/line.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function line(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{line.rect.d.ts → basic/line.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function lineIconRect(node: Node): void;
 export declare function lineTextRect(node: Node): void;

package/core/src/middles/nodes/{line.rect.js → basic/line.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function lineIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/core/src/middles/nodes/{message.anchor.d.ts → basic/message.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function messageAnchors(node: Node): void;

package/core/src/middles/nodes/{message.anchor.js → basic/message.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function messageAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + (node.rect.height * 3) / 8, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));

package/core/src/middles/nodes/{message.d.ts → basic/message.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function message(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{message.rect.d.ts → basic/message.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function messageIconRect(node: Node): void;
 export declare function messageTextRect(node: Node): void;

package/core/src/middles/nodes/{message.rect.js → basic/message.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function messageIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
     node.fullIconRect = node.iconRect;

package/core/src/middles/nodes/{pentagon.anchor.d.ts → basic/pentagon.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function pentagonAnchors(node: Node): void;

package/core/src/middles/nodes/{pentagon.anchor.js → basic/pentagon.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function pentagonAnchors(node) {
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
     node.anchors.push(new Point(node.rect.x + node.rect.width, node.rect.y + (node.rect.height * 2) / 5, Direction.Right));

package/core/src/middles/nodes/{pentagon.d.ts → basic/pentagon.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function pentagon(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{pentagon.rect.d.ts → basic/pentagon.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function pentagonIconRect(node: Node): void;
 export declare function pentagonTextRect(node: Node): void;

package/core/src/middles/nodes/{pentagon.rect.js → basic/pentagon.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models';
+import { Rect } from '../../../models';
 export function pentagonIconRect(node) {
     var w = node.rect.width / 2;
     var h = node.rect.height / 2;

package/core/src/middles/nodes/{pentagram.anchor.d.ts → basic/pentagram.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function pentagramAnchors(node: Node): void;

package/core/src/middles/nodes/{pentagram.anchor.js → basic/pentagram.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function pentagramAnchors(node) {
     node.anchors.push(new Point((Math.cos((18 / 180) * Math.PI) * node.rect.width) / 2 + node.rect.x + node.rect.width / 2, (-Math.sin((18 / 180) * Math.PI) * node.rect.width) / 2 + node.rect.y + node.rect.height / 2, Direction.Right));
     node.anchors.push(new Point((Math.cos(((18 + 72) / 180) * Math.PI) * node.rect.width) / 2 + node.rect.x + node.rect.width / 2, (-Math.sin(((18 + 72) / 180) * Math.PI) * node.rect.width) / 2 + node.rect.y + node.rect.height / 2, Direction.Up));

package/core/src/middles/nodes/{pentagram.d.ts → basic/pentagram.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function pentagram(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{pentagram.rect.d.ts → basic/pentagram.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function pentagramIconRect(node: Node): void;
 export declare function pentagramTextRect(node: Node): void;

package/core/src/middles/nodes/{pentagram.rect.js → basic/pentagram.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function pentagramIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/core/src/middles/nodes/{people.d.ts → basic/people.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function people(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{people.rect.d.ts → basic/people.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function peopleIconRect(node: Node): void;
 export declare function peopleTextRect(node: Node): void;

package/core/src/middles/nodes/{people.rect.js → basic/people.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function peopleIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/core/src/middles/nodes/{rectangle.d.ts → basic/rectangle.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function rectangle(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{rectangle.js → basic/rectangle.js}

@@ -61,4 +61,4 @@ export function rectangle(ctx, node) {
     (node.fillStyle || node.bkType) && ctx.fill();
     ctx.stroke();
 }
-//# sourceMappingURL=rectangle.js.map
+//# sourceMappingURL=rectangle.js.map defaultStrokeStyle

package/core/src/middles/nodes/{rectangle.rect.d.ts → basic/rectangle.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function rectangleIconRect(node: Node): void;
 export declare function rectangleTextRect(node: Node): void;

package/core/src/middles/nodes/{rectangle.rect.js → basic/rectangle.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models';
+import { Rect } from '../../../models';
 export function rectangleIconRect(node) {
     node.iconRect = new Rect(node.rect.x + node.paddingLeftNum, node.rect.y + node.paddingTopNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum);
     node.fullIconRect = new Rect(node.rect.x + node.paddingLeftNum, node.rect.y + node.paddingTopNum, node.rect.width - node.paddingLeftNum - node.paddingRightNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum);

package/core/src/middles/nodes/{text.d.ts → basic/text.d.ts}

@@ -1,5 +1,5 @@
-import { Node } from '../../models/node';
-import { Line } from '../../models/line';
+import { Node } from '../../../models/node';
+import { Line } from '../../../models/line';
 export declare function getWords(txt: string): any[];
 export declare function getLines(ctx: CanvasRenderingContext2D, words: string[], maxWidth: number, fontSize: number): any[];
 export declare function fillText(ctx: CanvasRenderingContext2D, lines: string[], x: number, y: number, width: number, height: number, lineHeight: number, maxLineLen?: number, bk?: string): void;

package/core/src/middles/nodes/{triangle.anchor.d.ts → basic/triangle.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function triangleAnchors(node: Node): void;

package/core/src/middles/nodes/{triangle.anchor.js → basic/triangle.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function triangleAnchors(node) {
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
     node.anchors.push(new Point(node.rect.x + (node.rect.width * 3) / 4, node.rect.y + node.rect.height / 2, Direction.Right));

package/core/src/middles/nodes/{triangle.d.ts → basic/triangle.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function triangle(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{triangle.rect.d.ts → basic/triangle.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function triangleIconRect(node: Node): void;
 export declare function triangleTextRect(node: Node): void;

package/core/src/middles/nodes/{triangle.rect.js → basic/triangle.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function triangleIconRect(node) {
     var w = (node.rect.width * 2) / 7;
     var h = (node.rect.height * 2) / 7;

package/core/src/middles/nodes/custom/humiture.d.ts

@@ -0,0 +1,2 @@
+import { Node } from '../../../models/node';
+export declare function humiture(ctx: CanvasRenderingContext2D, node: Node, state?: boolean): void;

package/core/src/middles/nodes/custom/humiture.js

@@ -0,0 +1,24 @@
+import {defaultTextRect} from '../../index';
+export function humiture(ctx, node, state) {
+    if(node.name === 'combine' && !state) return;
+    node.name = 'combine';
+    node.children.forEach((item, index) => {
+        if(index === 0) {
+            item.rect.width = Math.round(node.rect.width * 0.318840);
+            item.rect.height = node.rect.height;
+        }else {
+            item.rect.width = Math.round(node.rect.width * 0.666666);
+            item.rect.height = (node.rect.height - 1) / 2;
+        }
+        item.rect.x = index === 0 ? node.rect.x : node.rect.x + item.rect.width / 2;
+        item.rect.y = index === 2 ? node.rect.y + item.rect.height + 1 : node.rect.y;
+        item.rect.center = {
+            x: item.rect.x + item.rect.width / 2,
+            y: item.rect.y + item.rect.height / 2
+        }
+        item.rect.ex = item.rect.x + item.rect.width;
+        item.rect.ey = item.rect.y + item.rect.height;
+        item.calcRectInParent(node);
+        defaultTextRect(item);
+    });
+}

package/core/src/middles/nodes/{hexagon.anchor.d.ts → flow/hexagon.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function hexagonAnchors(node: Node): void;

package/core/src/middles/nodes/{hexagon.anchor.js → flow/hexagon.anchor.js}

@@ -1,5 +1,5 @@
-import { Point } from '../../models/point';
-import { Direction } from '../../models/direction';
+import { Point } from '../../../models/point';
+import { Direction } from '../../../models/direction';
 export function hexagonAnchors(node) {
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
     node.anchors.push(new Point(node.rect.x + node.rect.width, node.rect.y + node.rect.height / 2, Direction.Right));

package/core/src/middles/nodes/{hexagon.d.ts → flow/hexagon.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function hexagon(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{hexagon.rect.d.ts → flow/hexagon.rect.d.ts}

@@ -1,3 +1,3 @@
-import { Node } from '../../models/node';
+import { Node } from '../../../models/node';
 export declare function hexagonIconRect(node: Node): void;
 export declare function hexagonTextRect(node: Node): void;

package/core/src/middles/nodes/{hexagon.rect.js → flow/hexagon.rect.js}

@@ -1,4 +1,4 @@
-import { Rect } from '../../models/rect';
+import { Rect } from '../../../models/rect';
 export function hexagonIconRect(node) {
     var w = (node.rect.width * 3) / 5;
     var h = (node.rect.height * 3) / 4;

package/core/src/middles/nodes/form/formDatePicker.d.ts

@@ -0,0 +1,2 @@
+import { Node } from '../../../models';
+export declare function fromDatePicker(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{formDatePicker.js → form/formDatePicker.js}

@@ -1,9 +1,9 @@
 import {Store} from "le5le-store";
-import {rectangle} from './rectangle';
-import { createDatePickerElement, loadJS, setDataPickerElementStyle } from '../../element';
-import { s8, datePickerValueFormatting } from '../../utils';
-import {commonStore} from "../../store";
-import {datePickerType} from "../../../../store";
+import {rectangle} from '../basic/rectangle';
+import { createDatePickerElement, loadJS, setDataPickerElementStyle } from '../../../element';
+import { s8, datePickerValueFormatting } from '../../../utils';
+import {commonStore} from "../../../store";
+import {datePickerType} from "../../../../../store";
 
 export async function fromDatePicker(ctx, node) {
     // 绘制一个底图，类似于占位符。

package/core/src/middles/nodes/{formoverflow.js → form/formoverflow.js}

@@ -1,5 +1,5 @@
-import {rectangle, createDiv, s8, Preview} from  '../../../../core';
-import {commonStore} from "../../store";
+import {rectangle, createDiv, s8, Preview} from '../../../../index';
+import {commonStore} from "../../../store";
 
 export async function formOverflow(ctx, node) {
     // 绘制一个底图，类似于占位符。

package/core/src/middles/nodes/{formselect.d.ts → form/formselect.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models';
+import { Node } from '../../../models';
 export declare function formSelect(ctx: CanvasRenderingContext2D, node: Node): void;

package/core/src/middles/nodes/{formselect.js → form/formselect.js}

@@ -1,12 +1,12 @@
-import {rectangle} from './rectangle';
+import {rectangle} from '../basic/rectangle';
 import {
     createSelectElement,
-    createSelectDropdown} from '../../element';
+    createSelectDropdown} from '../../../element';
 import {
     setEventListener,
-    s8} from '../../utils';
-import {selectDefaultData} from '../../../../static';
-import {commonStore} from "../../store";
+    s8} from '../../../utils';
+import {selectDefaultData} from '../../../../../static';
+import {commonStore} from "../../../store";
 
 export function formSelect(ctx, node) {
     // 绘制一个底图，类似于占位符。
@@ -14,14 +14,13 @@ export function formSelect(ctx, node) {
     if (!commonStore[node.TID].selectDataPool[node.id]) {
         const currentStore = commonStore[node.TID];
         node.elementId = s8();
-        node.dash = 4;
         // 下拉切换类型
         const selectedType = node.events && node.events.find((item) => {
             return !!item.dcimStaticForType
         });
         currentStore.selectDataPool[node.id] = {
             slideState: node.selectDropdown,
-            staticType: selectedType.dcimStaticForType,
+            staticType: selectedType && selectedType.dcimStaticForType || '',
             node: {
                 id: node.id,
                 color: node.font.color,

package/core/src/middles/nodes/{formtable.d.ts → form/formtable.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models';
+import { Node } from '../../../models';
 export declare function formtable(ctx: CanvasRenderingContext2D, node: Node): void;