@gedit/editor-2d 0.2.46 → 0.2.48
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/lib/browser/model/editor2d-document.d.ts +11 -2
- package/lib/browser/model/editor2d-document.d.ts.map +1 -1
- package/lib/browser/model/editor2d-document.js +44 -8
- package/lib/browser/model/editor2d-document.js.map +1 -1
- package/lib/browser/model/editor2d-model-container.d.ts.map +1 -1
- package/lib/browser/model/editor2d-model-container.js +1 -1
- package/lib/browser/model/editor2d-model-container.js.map +1 -1
- package/lib/browser/model/editor2d-model.d.ts +2 -0
- package/lib/browser/model/editor2d-model.d.ts.map +1 -1
- package/lib/browser/model/editor2d-model.js +5 -0
- package/lib/browser/model/editor2d-model.js.map +1 -1
- package/lib/browser/model/editor2d.d.ts +2 -0
- package/lib/browser/model/editor2d.d.ts.map +1 -1
- package/lib/browser/model/editor2d.js +4 -2
- package/lib/browser/model/editor2d.js.map +1 -1
- package/lib/browser/playground/canvas-draw.d.ts +6 -2
- package/lib/browser/playground/canvas-draw.d.ts.map +1 -1
- package/lib/browser/playground/canvas-draw.js +174 -49
- package/lib/browser/playground/canvas-draw.js.map +1 -1
- package/lib/browser/playground/canvas-layer.d.ts +15 -3
- package/lib/browser/playground/canvas-layer.d.ts.map +1 -1
- package/lib/browser/playground/canvas-layer.js +134 -72
- package/lib/browser/playground/canvas-layer.js.map +1 -1
- package/lib/browser/playground/index.d.ts +2 -0
- package/lib/browser/playground/index.d.ts.map +1 -1
- package/lib/browser/playground/index.js +2 -0
- package/lib/browser/playground/index.js.map +1 -1
- package/lib/browser/playground/path-edit/index.d.ts +4 -0
- package/lib/browser/playground/path-edit/index.d.ts.map +1 -0
- package/lib/browser/playground/path-edit/index.js +20 -0
- package/lib/browser/playground/path-edit/index.js.map +1 -0
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.d.ts +18 -0
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.d.ts.map +1 -0
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.js +52 -0
- package/lib/browser/playground/path-edit/path-edit-layer-move-point.js.map +1 -0
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.d.ts +21 -0
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.d.ts.map +1 -0
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.js +158 -0
- package/lib/browser/playground/path-edit/path-edit-layer-svg-path.js.map +1 -0
- package/lib/browser/playground/path-edit/utils.d.ts +37 -0
- package/lib/browser/playground/path-edit/utils.d.ts.map +1 -0
- package/lib/browser/playground/path-edit/utils.js +236 -0
- package/lib/browser/playground/path-edit/utils.js.map +1 -0
- package/lib/browser/playground/path-edit-layer.d.ts +32 -12
- package/lib/browser/playground/path-edit-layer.d.ts.map +1 -1
- package/lib/browser/playground/path-edit-layer.js +460 -146
- package/lib/browser/playground/path-edit-layer.js.map +1 -1
- package/lib/browser/playground/playground-context.d.ts +5 -2
- package/lib/browser/playground/playground-context.d.ts.map +1 -1
- package/lib/browser/playground/playground-context.js +13 -2
- package/lib/browser/playground/playground-context.js.map +1 -1
- package/lib/browser/playground/playground-contribution.d.ts +4 -1
- package/lib/browser/playground/playground-contribution.d.ts.map +1 -1
- package/lib/browser/playground/playground-contribution.js +23 -23
- package/lib/browser/playground/playground-contribution.js.map +1 -1
- package/lib/browser/playground/selection-entity-manager.d.ts +1 -1
- package/lib/browser/playground/selection-entity-manager.d.ts.map +1 -1
- package/lib/browser/playground/selection-entity-manager.js +40 -10
- package/lib/browser/playground/selection-entity-manager.js.map +1 -1
- package/lib/browser/playground/selector-extend-renderer.d.ts +2 -1
- package/lib/browser/playground/selector-extend-renderer.d.ts.map +1 -1
- package/lib/browser/playground/selector-extend-renderer.js +50 -21
- package/lib/browser/playground/selector-extend-renderer.js.map +1 -1
- package/lib/browser/utils/snapshot.d.ts +1 -0
- package/lib/browser/utils/snapshot.d.ts.map +1 -1
- package/lib/browser/utils/snapshot.js +12 -1
- package/lib/browser/utils/snapshot.js.map +1 -1
- package/package.json +9 -7
- package/src/browser/model/editor2d-document.ts +44 -6
- package/src/browser/model/editor2d-model-container.ts +2 -0
- package/src/browser/model/editor2d-model.ts +2 -0
- package/src/browser/model/editor2d.ts +4 -1
- package/src/browser/playground/canvas-draw.ts +331 -112
- package/src/browser/playground/canvas-layer.ts +120 -59
- package/src/browser/playground/index.ts +2 -0
- package/src/browser/playground/path-edit/index.ts +3 -0
- package/src/browser/playground/path-edit/path-edit-layer-move-point.tsx +108 -0
- package/src/browser/playground/path-edit/path-edit-layer-svg-path.tsx +283 -0
- package/src/browser/playground/path-edit/utils.tsx +285 -0
- package/src/browser/playground/path-edit-layer.tsx +563 -216
- package/src/browser/playground/playground-context.ts +7 -1
- package/src/browser/playground/playground-contribution.ts +17 -24
- package/src/browser/playground/selection-entity-manager.tsx +48 -8
- package/src/browser/playground/selector-extend-renderer.tsx +69 -37
- package/src/browser/style/index.less +6 -0
- package/src/browser/style/path-edit-layer.less +17 -30
- package/src/browser/svg/pen_close.svg +24 -0
- package/src/browser/utils/snapshot.ts +12 -1
- package/LICENSE +0 -21
- package/lib/browser/playground/path-edit-layer-move-point.d.ts +0 -15
- package/lib/browser/playground/path-edit-layer-move-point.d.ts.map +0 -1
- package/lib/browser/playground/path-edit-layer-move-point.js +0 -47
- package/lib/browser/playground/path-edit-layer-move-point.js.map +0 -1
- package/lib/browser/playground/path-edit-layer-svg-path.d.ts +0 -11
- package/lib/browser/playground/path-edit-layer-svg-path.d.ts.map +0 -1
- package/lib/browser/playground/path-edit-layer-svg-path.js +0 -21
- package/lib/browser/playground/path-edit-layer-svg-path.js.map +0 -1
- package/src/browser/playground/path-edit-layer-move-point.tsx +0 -71
- package/src/browser/playground/path-edit-layer-svg-path.tsx +0 -50
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
|
+
var t = {};
|
|
4
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
+
t[p] = s[p];
|
|
6
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
+
t[p[i]] = s[p[i]];
|
|
10
|
+
}
|
|
11
|
+
return t;
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
14
|
exports.SelectorExtendRender = void 0;
|
|
4
15
|
const React = require("react");
|
|
@@ -23,22 +34,25 @@ const defaultExtends = [
|
|
|
23
34
|
label: '类型',
|
|
24
35
|
renderProps: {
|
|
25
36
|
defaultValue: 'url',
|
|
26
|
-
items: [
|
|
27
|
-
|
|
37
|
+
items: [
|
|
38
|
+
{ value: 'url', label: 'URL' },
|
|
39
|
+
{ value: 'scene', label: '场景' },
|
|
40
|
+
],
|
|
41
|
+
},
|
|
28
42
|
},
|
|
29
43
|
{
|
|
30
44
|
type: 'text',
|
|
31
45
|
key: 'link',
|
|
32
|
-
visible: (v, key, node) => (node && !node.linkType || node.linkType === 'url'
|
|
46
|
+
visible: (v, key, node) => (node && !node.linkType) || node.linkType === 'url',
|
|
33
47
|
label: '链接',
|
|
34
48
|
placeholder: '请输入 url 地址',
|
|
35
49
|
},
|
|
36
50
|
{
|
|
37
51
|
type: 'mindmapSelect',
|
|
38
52
|
key: 'link',
|
|
39
|
-
visible: (v, key, node) =>
|
|
53
|
+
visible: (v, key, node) => node && node.linkType === 'scene',
|
|
40
54
|
renderProps: {
|
|
41
|
-
filterTypes: ['scene']
|
|
55
|
+
filterTypes: ['scene'],
|
|
42
56
|
},
|
|
43
57
|
label: '场景',
|
|
44
58
|
placeholder: '请选择场景',
|
|
@@ -54,9 +68,9 @@ const defaultExtends = [
|
|
|
54
68
|
placeholder: 'c位',
|
|
55
69
|
renderProps: {
|
|
56
70
|
style: {
|
|
57
|
-
width: 80
|
|
58
|
-
}
|
|
59
|
-
}
|
|
71
|
+
width: 80,
|
|
72
|
+
},
|
|
73
|
+
},
|
|
60
74
|
},
|
|
61
75
|
{
|
|
62
76
|
type: 'text',
|
|
@@ -64,12 +78,12 @@ const defaultExtends = [
|
|
|
64
78
|
placeholder: 'd位',
|
|
65
79
|
renderProps: {
|
|
66
80
|
style: {
|
|
67
|
-
width: 80
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
]
|
|
72
|
-
}
|
|
81
|
+
width: 80,
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
],
|
|
86
|
+
},
|
|
73
87
|
],
|
|
74
88
|
},
|
|
75
89
|
},
|
|
@@ -120,7 +134,13 @@ const sortData = (data) => {
|
|
|
120
134
|
.map(k => states[parseFloat(k)]);
|
|
121
135
|
};
|
|
122
136
|
const SelectorIcon = (props) => {
|
|
123
|
-
|
|
137
|
+
var _a;
|
|
138
|
+
const { item, onChange, context, node } = props;
|
|
139
|
+
const tooltipProps = typeof item.tooltipProps === 'function'
|
|
140
|
+
? item.tooltipProps(node, context)
|
|
141
|
+
: item.tooltipProps || {};
|
|
142
|
+
const [open, setOpen] = React.useState(false);
|
|
143
|
+
(_a = item.changeCallback) === null || _a === void 0 ? void 0 : _a.call(item, setOpen);
|
|
124
144
|
const child = (React.createElement("div", { className: (0, clsx_1.default)(getClassName('icon'), item.className), onMouseDown: (e) => {
|
|
125
145
|
e.stopPropagation();
|
|
126
146
|
e.preventDefault();
|
|
@@ -128,30 +148,39 @@ const SelectorIcon = (props) => {
|
|
|
128
148
|
return;
|
|
129
149
|
}
|
|
130
150
|
onChange === null || onChange === void 0 ? void 0 : onChange(item.type);
|
|
131
|
-
} }, selector_extend_icons_1.selectIcon[item.type]));
|
|
151
|
+
} }, item.icon || selector_extend_icons_1.selectIcon[item.type]));
|
|
132
152
|
if (item.event) {
|
|
133
|
-
|
|
153
|
+
const _b = item.event, { hover } = _b, event = __rest(_b, ["hover"]);
|
|
154
|
+
const pop = (React.createElement(ui_1.Popover, Object.assign({ content: props.context.formService.renderSchema(Object.assign(Object.assign({}, event), { context: {
|
|
134
155
|
node,
|
|
135
156
|
}, onChange: (key, value) => {
|
|
136
157
|
onChange === null || onChange === void 0 ? void 0 : onChange('updateData', {
|
|
137
158
|
[key]: value,
|
|
138
159
|
});
|
|
139
|
-
}, values: node, size: 'middle' })), title: item.event.title || item.title, placement: "right"
|
|
160
|
+
}, values: node, size: 'middle' })), open: open, title: item.event.title || item.title, placement: "right", onOpenChange: () => {
|
|
161
|
+
setOpen(!open);
|
|
162
|
+
} }, tooltipProps), child));
|
|
163
|
+
if (hover) {
|
|
164
|
+
return React.createElement(ui_1.Tooltip, Object.assign({}, hover), pop);
|
|
165
|
+
}
|
|
166
|
+
return pop;
|
|
140
167
|
}
|
|
141
168
|
if (item.title) {
|
|
142
|
-
return (React.createElement(ui_1.Tooltip, { title: item.title, placement: "right"
|
|
169
|
+
return (React.createElement(ui_1.Tooltip, Object.assign({ title: item.title, open: open, placement: "right", onOpenChange: () => {
|
|
170
|
+
setOpen(!open);
|
|
171
|
+
} }, tooltipProps), child));
|
|
143
172
|
}
|
|
144
173
|
return child;
|
|
145
174
|
};
|
|
146
175
|
const SelectorExtendRender = (props) => {
|
|
147
|
-
const { entity, register, context } = props;
|
|
176
|
+
const { entity, register, context, customExtendSchema = [] } = props;
|
|
148
177
|
const { node } = entity;
|
|
149
178
|
const { selectorExtends = [] } = (register === null || register === void 0 ? void 0 : register.decoration) || {};
|
|
150
179
|
const [t, update] = React.useState(0);
|
|
151
180
|
if (!node)
|
|
152
181
|
return React.createElement(React.Fragment, null);
|
|
153
182
|
const childData = sortData([]
|
|
154
|
-
.concat(defaultExtends, selectorExtends)
|
|
183
|
+
.concat(defaultExtends, selectorExtends, customExtendSchema)
|
|
155
184
|
.filter(c => (c.visible ? c.visible(node, register) : true)));
|
|
156
185
|
const onChange = (type, value) => {
|
|
157
186
|
var _a, _b;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selector-extend-renderer.js","sourceRoot":"","sources":["../../../src/browser/playground/selector-extend-renderer.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"selector-extend-renderer.js","sourceRoot":"","sources":["../../../src/browser/playground/selector-extend-renderer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,7 @@ export declare class SnapshotCreator extends DisposableImpl {
|
|
|
48
48
|
getSnapshot(uri: string): Snapshot | undefined;
|
|
49
49
|
draw(scenes: SnapshotInput[]): Promise<Snapshot[]>;
|
|
50
50
|
protected process(): Promise<void>;
|
|
51
|
+
protected setParent(n: Editor2dNode): Editor2dNode;
|
|
51
52
|
protected next(end: () => void): void;
|
|
52
53
|
/**
|
|
53
54
|
* 监听变化，并自动刷新缩略图缓存
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAGL,UAAU,EAEV,cAAc,EACd,OAAO,EACP,eAAe,EACf,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAA;CACtB;AAaD,wBAAsB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAK1G;AAID,qBAAa,eAAgB,SAAQ,cAAc;IAS/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IARvC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAC7B,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAM;IACnD,SAAS,CAAC,cAAc,EAAE,aAAa,EAAE,CAAM;IAC/C,SAAS,CAAC,eAAe,gBAAuB;IAChD,QAAQ,CAAC,QAAQ,qCAA8B;IAC/C,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;gBAEb,IAAI,EAAE,YAAY;IAmBvC;;OAEG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAO7C,kBAAkB,IAAI,QAAQ,EAAE;IAGhC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAGvC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAGxC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUxD,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ClC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY;IAQlD,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,IAAI,GAAG,IAAI;IA0BrC;;;;;;OAMG;IACH,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EAAE,OAAO,SAAM,EAAE,KAAK,SAAO,GAAG,UAAU;CAgBnH"}
|
|
@@ -37,7 +37,7 @@ class SnapshotCreator extends utils_1.DisposableImpl {
|
|
|
37
37
|
if (!host) {
|
|
38
38
|
host = document.createElement('div');
|
|
39
39
|
host.className = 'gedit-editor-snapshots';
|
|
40
|
-
host.style.display = 'none';
|
|
40
|
+
// host.style.display = 'none';
|
|
41
41
|
document.body.appendChild(host);
|
|
42
42
|
}
|
|
43
43
|
this.drawer = new canvas_draw_1.CanvasDraw(Object.assign({ host, isSnapshot: true }, opts));
|
|
@@ -117,6 +117,15 @@ class SnapshotCreator extends utils_1.DisposableImpl {
|
|
|
117
117
|
this.next(() => dispose.dispose());
|
|
118
118
|
return deferred.promise;
|
|
119
119
|
}
|
|
120
|
+
setParent(n) {
|
|
121
|
+
if (!n.children)
|
|
122
|
+
return n;
|
|
123
|
+
n.children.forEach((c) => {
|
|
124
|
+
c.parent = n;
|
|
125
|
+
this.setParent(c);
|
|
126
|
+
});
|
|
127
|
+
return n;
|
|
128
|
+
}
|
|
120
129
|
next(end) {
|
|
121
130
|
var _a, _b;
|
|
122
131
|
const next = this.processingData.shift();
|
|
@@ -131,6 +140,8 @@ class SnapshotCreator extends utils_1.DisposableImpl {
|
|
|
131
140
|
const attrs = this.opts.renderEngine.getDisplayDefaultData(this.opts.engineName, content.displayType);
|
|
132
141
|
Object.assign(content, Object.assign({}, attrs));
|
|
133
142
|
}
|
|
143
|
+
// 设置 parent, 保持 id 一致； mask 里用的是 path id;
|
|
144
|
+
content = this.setParent((0, utils_1.deepClone)(content));
|
|
134
145
|
this.drawer.update({
|
|
135
146
|
visible: true,
|
|
136
147
|
uri: next.uri,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gedit/editor-2d",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.48",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "lib/browser/index",
|
|
6
6
|
"typings": "lib/browser/index.d.ts",
|
|
@@ -9,11 +9,13 @@
|
|
|
9
9
|
"src"
|
|
10
10
|
],
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@gedit/app-config": "^0.2.
|
|
13
|
-
"@gedit/
|
|
14
|
-
"@gedit/
|
|
15
|
-
"@gedit/
|
|
16
|
-
"@gedit/
|
|
12
|
+
"@gedit/app-config": "^0.2.41",
|
|
13
|
+
"@gedit/canvas-draw": "^0.2.33",
|
|
14
|
+
"@gedit/editor": "^0.2.14",
|
|
15
|
+
"@gedit/playground": "^0.2.19",
|
|
16
|
+
"@gedit/render-engine-ide": "^0.2.39",
|
|
17
|
+
"@gedit/theme": "^0.2.11",
|
|
18
|
+
"@gedit/workspace-2d": "^0.2.19",
|
|
17
19
|
"bezier-js": "^4.0.3",
|
|
18
20
|
"clsx": "^1.1.1",
|
|
19
21
|
"json-stringify-pretty-compact": "^2.0.0",
|
|
@@ -37,5 +39,5 @@
|
|
|
37
39
|
"nyc": {
|
|
38
40
|
"extends": "../../configs/nyc.json"
|
|
39
41
|
},
|
|
40
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "ae3505802ae3cfe1d1915d916400583dcf7f5ba1"
|
|
41
43
|
}
|
|
@@ -30,6 +30,8 @@ import { WorkspaceResourceService } from '@gedit/workspace-2d';
|
|
|
30
30
|
import { ResourceProvider, ResourceRefError } from '@gedit/resource';
|
|
31
31
|
import { AppConfigService } from '@gedit/app-config';
|
|
32
32
|
import { Editor2dIterator } from './editor2d-iterator';
|
|
33
|
+
import { ThemeService } from '@gedit/theme';
|
|
34
|
+
import { followKeyType, getFollowValue } from '@gedit/render-engine-pixi';
|
|
33
35
|
// import { getAnimationKeys, getChangeAnimationData } from './utils';
|
|
34
36
|
|
|
35
37
|
export const maskShowArray: GameObjectType[] = [
|
|
@@ -41,7 +43,8 @@ export const maskShowArray: GameObjectType[] = [
|
|
|
41
43
|
GameObjectBaseType.TEXT,
|
|
42
44
|
GameObjectBaseType.TRIANGLE,
|
|
43
45
|
GameObjectBaseType.COMPONENT,
|
|
44
|
-
GameObjectBaseType.ANIM_FRAMES
|
|
46
|
+
GameObjectBaseType.ANIM_FRAMES,
|
|
47
|
+
GameObjectBaseType.STAR,
|
|
45
48
|
];
|
|
46
49
|
export const maskEnabledArray: GameObjectType[] = [
|
|
47
50
|
GameObjectBaseType.GROUP,
|
|
@@ -91,7 +94,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
91
94
|
}
|
|
92
95
|
|
|
93
96
|
constructor(
|
|
94
|
-
@inject(MessageService)
|
|
97
|
+
@inject(MessageService) readonly message: MessageService,
|
|
95
98
|
@inject(Editor2dModelOptions) protected readonly options: Editor2dModelOptions,
|
|
96
99
|
@inject(ResourceProvider) protected readonly resourceProvider: ResourceProvider,
|
|
97
100
|
@inject(ResourceAutoSaveService) protected readonly resourceAutoSaveService: ResourceAutoSaveService,
|
|
@@ -99,6 +102,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
99
102
|
@inject(RenderEngineIDEService) readonly engineService: RenderEngineIDEService,
|
|
100
103
|
@inject(AppConfigService) readonly appConfig: AppConfigService,
|
|
101
104
|
@inject(Editor2dComponentProvider) @optional() readonly componentProvider?: Editor2dComponentProvider,
|
|
105
|
+
@inject(ThemeService) @optional() readonly themeService?: ThemeService,
|
|
102
106
|
) {
|
|
103
107
|
super();
|
|
104
108
|
this.toDispose.push(this.onContentChangedEmitter);
|
|
@@ -886,8 +890,11 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
886
890
|
if (!checkSuccess) return false;
|
|
887
891
|
const siblings = (targetNode as Editor2dContainerNode).children || [];
|
|
888
892
|
if (childDeco.single) {
|
|
889
|
-
const
|
|
890
|
-
if (
|
|
893
|
+
const single = typeof childDeco.single === 'function' ? childDeco.single(this.themeService?.mode) : childDeco.single;
|
|
894
|
+
if (single) {
|
|
895
|
+
const addedNodes = siblings.filter(s => s.displayType === childDisplayType);
|
|
896
|
+
if (addedNodes.length > 0) return false;
|
|
897
|
+
}
|
|
891
898
|
}
|
|
892
899
|
if (childDeco.canbeAddedAsChild !== undefined) {
|
|
893
900
|
return childDeco.canbeAddedAsChild(targetNode, siblings);
|
|
@@ -1110,9 +1117,24 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
1110
1117
|
x: moveType === 'x' ? position.x + moveDelta : position.x,
|
|
1111
1118
|
y: moveType === 'y' ? position.y + moveDelta : position.y,
|
|
1112
1119
|
};
|
|
1113
|
-
|
|
1120
|
+
// 锁定跟随图层
|
|
1121
|
+
if (node.follow) {
|
|
1122
|
+
const { open, target, type } = node.follow;
|
|
1123
|
+
if (open && target && node.position) {
|
|
1124
|
+
this.message.warn(
|
|
1125
|
+
`元素开启了跟随，${type
|
|
1126
|
+
?.map(c => followKeyType[c])
|
|
1127
|
+
.join(',')} 被锁定`,
|
|
1128
|
+
{timeout: 2000 }
|
|
1129
|
+
);
|
|
1130
|
+
const p = this.getFollowPosition(node);
|
|
1131
|
+
p.forEach(c => {
|
|
1132
|
+
newPosition[c.type] = c.value;
|
|
1133
|
+
});
|
|
1134
|
+
}
|
|
1135
|
+
}
|
|
1136
|
+
this.updateNode(node, { position: newPosition }, true, true, true);
|
|
1114
1137
|
});
|
|
1115
|
-
this.clearSelectNodeFollow();
|
|
1116
1138
|
this.fireContentChanged(nodes, 'update');
|
|
1117
1139
|
}
|
|
1118
1140
|
|
|
@@ -1139,6 +1161,22 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
|
|
|
1139
1161
|
return 0;
|
|
1140
1162
|
}
|
|
1141
1163
|
|
|
1164
|
+
/**
|
|
1165
|
+
* 锁定节点的 follow
|
|
1166
|
+
*/
|
|
1167
|
+
getFollowPosition(node: Editor2dNode): { value: number; type: 'x' | 'y' }[] {
|
|
1168
|
+
if (node.follow) {
|
|
1169
|
+
const { open, target } = node.follow;
|
|
1170
|
+
if (open && target && node.position) {
|
|
1171
|
+
const targetNode = this.getNodeById(target);
|
|
1172
|
+
if (targetNode && targetNode.position) {
|
|
1173
|
+
const t = getFollowValue(node.follow, targetNode);
|
|
1174
|
+
return t;
|
|
1175
|
+
}
|
|
1176
|
+
}
|
|
1177
|
+
}
|
|
1178
|
+
return [];
|
|
1179
|
+
}
|
|
1142
1180
|
/**
|
|
1143
1181
|
* 清除节点的 follow
|
|
1144
1182
|
*/
|
|
@@ -2,6 +2,7 @@ import { Container, interfaces } from 'inversify';
|
|
|
2
2
|
import {
|
|
3
3
|
Editor2dDocument,
|
|
4
4
|
Editor2dDocumentContextMenuPath,
|
|
5
|
+
Editor2dDocumentContextMenuPathEditPath,
|
|
5
6
|
Editor2dModel,
|
|
6
7
|
Editor2dModelOptions,
|
|
7
8
|
Editor2dSelection,
|
|
@@ -39,6 +40,7 @@ export function createEditor2dModelContainer(parent: interfaces.Container, opts:
|
|
|
39
40
|
...createDefaultPlaygroundConfig(),
|
|
40
41
|
autoFocus: false,
|
|
41
42
|
contextMenuPath: Editor2dDocumentContextMenuPath,
|
|
43
|
+
contextMenuPathEditPath: Editor2dDocumentContextMenuPathEditPath,
|
|
42
44
|
...opts.playgroundConfig,
|
|
43
45
|
});
|
|
44
46
|
c.bind(PlaygroundContribution).toService(PlaygroundContribution2d);
|
|
@@ -6,6 +6,7 @@ import { Editor2dModelOptions } from './editor2d';
|
|
|
6
6
|
import { Editor2dSelection } from './editor2d-selection';
|
|
7
7
|
import { Editor2dWidget } from './editor2d-widget';
|
|
8
8
|
import type { Editor2dPlayGround } from '../playground/playground-context';
|
|
9
|
+
import { PathPointSelectionService } from '@gedit/playground';
|
|
9
10
|
|
|
10
11
|
export const Editor2dModelFactory = Symbol('Editor2dModelFactory');
|
|
11
12
|
export type Editor2dModelFactory = (options: Editor2dModelOptions) => Editor2dModel;
|
|
@@ -26,6 +27,7 @@ export class Editor2dModel implements Editor {
|
|
|
26
27
|
@inject(Editor2dModelOptions) protected readonly options: Editor2dModelOptions;
|
|
27
28
|
@inject(Editor2dDocument) readonly document: Editor2dDocument;
|
|
28
29
|
@inject(Editor2dSelection) readonly selection: Editor2dSelection;
|
|
30
|
+
@inject(PathPointSelectionService) readonly pathPointSelection: PathPointSelectionService;
|
|
29
31
|
node: HTMLElement;
|
|
30
32
|
|
|
31
33
|
@postConstruct()
|
|
@@ -29,7 +29,9 @@ export interface Editor2dContent {
|
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
// 文档内容菜单
|
|
32
|
-
export const Editor2dDocumentContextMenuPath = ['editor2d-
|
|
32
|
+
export const Editor2dDocumentContextMenuPath = ['editor2d-document-menu'];
|
|
33
|
+
// 路径编辑态的菜单
|
|
34
|
+
export const Editor2dDocumentContextMenuPathEditPath = ['editor2d-document-path-menu'];
|
|
33
35
|
|
|
34
36
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
35
37
|
function omitNode(node?: Editor2dNode | Editor2dContainerNode, omitKeys: string[] = [], assign?: (n: Editor2dNode) => Editor2dNode): any {
|
|
@@ -91,6 +93,7 @@ export interface Editor2dNode extends TreeNode, EditorDocumentNode, Lockable, Se
|
|
|
91
93
|
*/
|
|
92
94
|
export interface Editor2dPathNode extends Editor2dNode {
|
|
93
95
|
[GameObjectBaseType.PATH]: {
|
|
96
|
+
closed?: boolean;
|
|
94
97
|
paths: PathChild[]
|
|
95
98
|
}
|
|
96
99
|
}
|