@meta2d/core 1.0.74 → 1.0.76
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/canvas/canvas.js +5 -2
- package/src/canvas/canvas.js.map +1 -1
- package/src/core.d.ts +3 -0
- package/src/core.js +142 -42
- package/src/core.js.map +1 -1
- package/src/diagrams/svg/parse.js +3 -2
- package/src/diagrams/svg/parse.js.map +1 -1
- package/src/diagrams/video.js +5 -5
- package/src/diagrams/video.js.map +1 -1
- package/src/dialog/dialog.js +2 -0
- package/src/dialog/dialog.js.map +1 -1
- package/src/pen/model.d.ts +1 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.d.ts +1 -0
- package/src/pen/render.js +7 -3
- package/src/pen/render.js.map +1 -1
- package/src/pen/text.js +2 -2
- package/src/utils/jetLinks.js +5 -1
- package/src/utils/jetLinks.js.map +1 -1
package/src/pen/text.js
CHANGED
|
@@ -314,9 +314,9 @@ export function calcTextAutoWidth(pen) {
|
|
|
314
314
|
pen.y = pen.y - (textHeight - pen.height) / 2;
|
|
315
315
|
}
|
|
316
316
|
// if (textHeight > pen.height) {
|
|
317
|
-
pen.height = textHeight +
|
|
317
|
+
pen.height = textHeight + 5;
|
|
318
318
|
// }
|
|
319
|
-
pen.width = textWidth +
|
|
319
|
+
pen.width = textWidth + 5; //误差
|
|
320
320
|
pen.calculative.canvas.updatePenRect(pen);
|
|
321
321
|
pen.calculative.canvas.calcActiveRect();
|
|
322
322
|
}
|
package/src/utils/jetLinks.js
CHANGED
|
@@ -2,7 +2,11 @@ import { getCookie } from "./url";
|
|
|
2
2
|
import { s8 } from "./uuid";
|
|
3
3
|
export function connectJetLinks(meta2d, net) {
|
|
4
4
|
if (meta2d.jetLinksList.length) {
|
|
5
|
-
|
|
5
|
+
let url = net.url;
|
|
6
|
+
if (url.startsWith('/')) {
|
|
7
|
+
url = (location.protocol === 'https:' ? 'wss://' : 'ws://') + window.location.host + url;
|
|
8
|
+
}
|
|
9
|
+
meta2d.jetLinksClient = new WebSocket(`${url}/${localStorage.getItem('X-Access-Token') ||
|
|
6
10
|
getCookie('X-Access-Token') ||
|
|
7
11
|
new URLSearchParams(location.search).get('X-Access-Token') ||
|
|
8
12
|
''}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jetLinks.js","sourceRoot":"","sources":["../../../../packages/core/src/utils/jetLinks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAI5B,MAAM,UAAU,eAAe,CAAC,MAAa,EAAE,GAAW;IACxD,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,CAAC,cAAc,GAAG,IAAI,SAAS,CACnC,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"jetLinks.js","sourceRoot":"","sources":["../../../../packages/core/src/utils/jetLinks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAI5B,MAAM,UAAU,eAAe,CAAC,MAAa,EAAE,GAAW;IACxD,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAC/B,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QAClB,IAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC,CAAC;YACtB,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAA,CAAC,CAAA,QAAQ,CAAA,CAAC,CAAA,OAAO,CAAC,GAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QACtF,CAAC;QACD,MAAM,CAAC,cAAc,GAAG,IAAI,SAAS,CACnC,GAAG,GAAG,IACJ,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACtC,SAAS,CAAC,gBAAgB,CAAC;YAC3B,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC;YAC1D,EACF,EAAE,CACH,CAAC;QACF,MAAM;QACN,MAAM,CAAC,cAAc,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAChC,IAAG,CAAC,IAAI,CAAC,OAAO,EAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YACD;YACE,0BAA0B;YAC1B,IAAI,CAAC,OAAO,EAAE,UAAU,EACxB,CAAC;gBACD,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChB,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;oBACxC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACzB,IAAI,CAAC,IAAI,CAAC;4BACR,EAAE,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,GAAG,EAAE;4BACvE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;yBACpC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5C,CAAC;iBAAK,IAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAC,CAAC;gBAChD,SAAS,CAAC,MAAM,EAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,GAAG,EAAE;YAClC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnC,MAAM,CAAC,cAAc,CAAC,IAAI,CACxB,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,KAAK;oBACX,KAAK,EAAE,UAAU,IAAI,CAAC,KAAK,0BAA0B;oBACrD,SAAS,EAAE;wBACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,OAAO,EAAE,CAAC;qBACX;oBACD,EAAE,EAAE,IAAI,CAAC,KAAK,GAAG,GAAG,GAAG,EAAE,EAAE;iBAC5B,CAAC,CACH,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,GAAW,CAAC,YAAY,EAAC,CAAC;gBAC5B,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;oBACxC,IAAI,EAAE,KAAK;oBACX,KAAK,EAAC,gBAAgB;oBACtB,EAAE,EAAC,cAAc;oBACjB,SAAS,EAAC,EAAE;iBACb,CAAC,CAAC,CAAA;YACL,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,MAAa,EAAE,IAAI;IACpC,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACvC,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACnC,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACzC,IAAI,OAAO,GACX;;;;2BAIyB,SAAS,wCAAwC,OAAO,CAAC,UAAU,CAAC;;cAEjF,OAAO;UACX,CAAA;IACR,MAAM,CAAC,OAAO,CAAC,EAAC,OAAO,EAAC,QAAQ,EAAC,CAAC,EAAC,QAAQ,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,MAAM,EAAC,EAAE,EAAC,CAAC,CAAC;IAC/E,IAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAC,CAAC;QACrC,OAAO,CAAC,MAAM,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,UAAU,CAAC,SAAS,GAAG,SAAS,CAAA;AAEhC,SAAS,OAAO,CAAC,SAAS;IACxB,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,GAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,GAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAExD,OAAO,IAAI,GAAC,GAAG,GAAC,KAAK,GAAC,GAAG,GAAC,GAAG,GAAC,GAAG,GAAC,KAAK,GAAC,GAAG,GAAC,OAAO,GAAC,GAAG,GAAC,OAAO,CAAA;AACjE,CAAC;AAGD,MAAM,UAAU,aAAa,CAAC,MAAa;IACzC,IAAG,MAAM,CAAC,cAAc,EAAC,CAAC;QACxB,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC9B,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC;IACpC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAa,EAAE,GAAQ,EAAE,CAAQ;IAC3D,MAAM,IAAI,GAAQ,EAAE,CAAC;IACrB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,KAAK,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC7D,IAAI,CAAC,KAAK,CAAC,GAAG;YACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,EAAE;SACf,CAAC;QACF,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC5D,kBAAkB;gBAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CACnC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,GAAG,CACvC,CAAC;gBACF,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;iBAAM,IACL,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ;gBACnC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EACnC,CAAC;gBACD,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACxD,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;oBACjB,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;wBACzB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAAa,EAAE,IAAU;IAC9D,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1B,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,IAAG,QAAQ,IAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAC,CAAC;YACxC,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACjD,IAAG,IAAI,EAAE,MAAM,EAAC,CAAC;gBACf,QAAQ,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAE,QAAQ,CAAC;YACvD,CAAC;QACH,CAAC;QACD,MAAM,GAAG,GAAO,MAAM,KAAK,CAAC,wBAAwB,QAAQ,WAAW,EAAE;YACvE,OAAO,EAAE,EAAC,gBAAgB,EAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAG,EAAE;gBAClI,cAAc,EAAE,kBAAkB,EAAC;YACpC,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;SACtC,CAAC,CAAC;QACH,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrB,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACxD,CAAC;aAAI,CAAC;YACJ,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,4CAA4C;AAC5C,6BAA6B;AAC7B,gCAAgC;AAChC,yBAAyB;AACzB,uBAAuB;AACvB,8EAA8E;AAC9E,uBAAuB;AACvB,2CAA2C;AAC3C,yCAAyC;AACzC,uBAAuB;AACvB,4BAA4B;AAC5B,eAAe;AACf,aAAa;AACb,iEAAiE;AACjE,WAAW;AACX,SAAS;AACT,QAAQ;AACR,IAAI;AAEJ,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,MAAU,EAAC,aAAoB;IAC3D,MAAM,GAAG,GAAO,MAAM,KAAK,CAAC,qBAAqB,aAAa,EAAE,EAAE;QAChE,OAAO,EAAE,EAAC,gBAAgB,EAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAG,EAAE;YAClI,cAAc,EAAE,kBAAkB,EAAC;QACpC,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IACH,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;QACX,IAAI,IAAI,GAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACpB,IAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,CAAC;YACpB,WAAW,CAAC,MAAM,EAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,MAAM,EAAC,KAAK,EAAC,SAAS;IACzC,IAAG,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAC,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,GAAG,KAAK,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAChC,IAAG,SAAS,KAAG,CAAC,CAAC,EAAC,CAAC;QACjB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;IACvC,CAAC;SAAI,CAAC;QACJ,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,GAAG,KAAK,CAAC;QACtC,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,GAAG,GAAG,EAAE;YACtC,IAAI,EAAE,CAAC;YACP,IAAI,IAAI,GAAG,SAAS,EAAE,CAAC;gBACrB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,UAAU,CAAC,WAAW,GAAE,WAAW,CAAA"}
|