plain-design 1.0.0-beta.2 → 1.0.0-beta.20
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/plain-design.commonjs.min.js +2 -2
- package/dist/plain-design.min.css +8 -6
- package/dist/plain-design.min.js +2 -2
- package/dist/report.html +2 -2
- package/package.json +6 -6
- package/src/packages/build.ts +1 -1
- package/src/packages/components/Application/theme/theme.ts +1 -3
- package/src/packages/components/AutoTable/use/useTableOption.methods.tsx +2 -0
- package/src/packages/components/AutoTable/use/useTableOption.state.tsx +1 -0
- package/src/packages/components/AutoTable/utils/TableOption.space.tsx +1 -0
- package/src/packages/components/ColorPicker/sub/ColorSlider.tsx +8 -5
- package/src/packages/components/ColorPicker/sub/ColorSvPanel.tsx +7 -4
- package/src/packages/components/Dialog/index.tsx +2 -1
- package/src/packages/components/Dialog/useDialogMovable.tsx +7 -4
- package/src/packages/components/Dialog/utils/dialog.mouse.ts +4 -2
- package/src/packages/components/DropdownOption/index.tsx +3 -3
- package/src/packages/components/Input/useMultipleInput.tsx +5 -2
- package/src/packages/components/Input/useTextareaInput.tsx +10 -5
- package/src/packages/components/InputNumber/NumberResize.tsx +6 -2
- package/src/packages/components/Layout/index.tsx +31 -0
- package/src/packages/components/Layout/layout.scss +227 -0
- package/src/packages/components/Layout/layout.utils.ts +3 -0
- package/src/packages/components/LayoutSection/index.tsx +67 -0
- package/src/packages/components/LayoutSection/useLayoutSectionResizer.tsx +184 -0
- package/src/{pages/index/PageThemeUtils.tsx → packages/components/PageThemeUtils/index.tsx} +6 -4
- package/src/packages/components/Popup/index.tsx +20 -8
- package/src/packages/components/Rate/index.tsx +3 -1
- package/src/packages/components/Scroll/HorizontalScrollbar.tsx +7 -3
- package/src/packages/components/Scroll/VerticalScrollbar.tsx +7 -3
- package/src/packages/components/Slider/useSliderDotDragier.tsx +7 -4
- package/src/packages/components/StepGroup/step-group.scss +6 -6
- package/src/packages/components/TabGroup/TabsInner.tsx +5 -3
- package/src/packages/components/TabGroup/header/horizontal/tabs-header-horizontal.scss +0 -1
- package/src/packages/components/TabGroup/index.tsx +5 -1
- package/src/packages/components/TabGroup/tabs.scss +3 -0
- package/src/packages/components/Table/table/head/useHeadCellResize.ts +8 -3
- package/src/packages/components/Table/table/use/useTableDraggier.col.tsx +10 -5
- package/src/packages/components/Table/table/use/useTableDraggier.row.tsx +11 -6
- package/src/packages/components/ThemePrimaryColors/index.ts +5 -0
- package/src/packages/components/Tree/RenderTreeNode.tsx +5 -1
- package/src/packages/components/Tree/tree.scss +42 -9
- package/src/packages/components/TreeCore/TreeCore.type.tsx +2 -0
- package/src/packages/components/TreeCore/createTreeCore.tsx +5 -1
- package/src/packages/components/TreeCore/createTreeDraggier.tsx +70 -56
- package/src/packages/components/TreeCore/createTreeMethods.tsx +1 -0
- package/src/packages/components/TreeCore/createTreeProps.ts +2 -1
- package/src/packages/components/TreeNodeWithMenu/index.tsx +91 -0
- package/src/packages/components/TreeNodeWithMenu/tree-node-with-menu.scss +39 -0
- package/src/packages/components/TreeNodeWithMenu/treeNodeWithMenu.utils.ts +12 -0
- package/src/packages/components/VirtualList/useVirtualList.tsx +47 -15
- package/src/packages/components/VirtualTable/index.tsx +2 -2
- package/src/packages/components/createProvider/index.ts +5 -0
- package/src/packages/components/nextPopupId/index.ts +5 -0
- package/src/packages/components/useDialog/DialogService.tsx +13 -1
- package/src/packages/components/useImage/ImageService.tsx +7 -4
- package/src/packages/components/useMessage/Message.tsx +5 -1
- package/src/packages/components/useMessage/message.scss +4 -0
- package/src/packages/components/usePopup/PopupItem.tsx +11 -1
- package/src/packages/components/usePopup/popup-item.scss +4 -0
- package/src/packages/components/usePopupManager/index.ts +5 -0
- package/src/packages/components/usePopupTrigger/index.tsx +5 -0
- package/src/packages/components/useReferenceTrigger/index.tsx +5 -0
- package/src/packages/components/useTooltip/index.tsx +2 -0
- package/src/packages/components/useWatchAutoClear/index.ts +5 -0
- package/src/packages/entry.tsx +34 -0
- package/src/packages/uses/useEdit.ts +4 -0
- package/src/packages/uses/useStyle.tsx +9 -1
- package/src/packages/utils/ClientZoom.ts +24 -2
- package/src/packages/utils/useMove.tsx +10 -4
- package/src/pages/index/App.tsx +3 -2
- package/src/pages/index/app.scss +5 -0
- package/src/pages/index/components/AutoTable/AutoHeightAutoRow.tsx +10 -5
- package/src/pages/index/components/normal/DemoLayout.tsx +144 -0
- package/src/pages/index/components/normal/DemoLoading.tsx +3 -0
- package/src/pages/index/components/normal/DemoTab.tsx +6 -6
- package/src/pages/index/components/normal/DemoTree.tsx +86 -2
- package/src/pages/index/components/service/DemoDialogService.tsx +1 -0
- package/src/pages/index/components/service/DemoPopupService.tsx +6 -3
- package/src/pages/index/home/AppHead.tsx +4 -4
- package/src/pages/index/home/menus.tsx +1 -0
- package/src/pages/index/home/plain-design.png +0 -0
- package/src/pages/index/main.tsx +0 -4
@@ -12,6 +12,7 @@ import {getComponentCls, iMouseEvent, nextIndex, StyleProperties} from "plain-de
|
|
12
12
|
import {iTableHooks} from "../utils/createTableHooks";
|
13
13
|
import {iElementRect} from "../../../../utils/getRowEl";
|
14
14
|
import {createEnum} from "plain-utils/utils/createEnum";
|
15
|
+
import {ClientZoom} from "../../../ClientZoom";
|
15
16
|
|
16
17
|
export function useTableDraggierCol(
|
17
18
|
{
|
@@ -223,11 +224,12 @@ export function useTableDraggierCol(
|
|
223
224
|
};
|
224
225
|
|
225
226
|
const start = (e: iMouseEvent, plc: tPlcType) => {
|
227
|
+
const { clientX, clientY } = ClientZoom.getClientPosition(e);
|
226
228
|
staticState = {
|
227
229
|
plc,
|
228
230
|
start: {
|
229
|
-
x:
|
230
|
-
y:
|
231
|
+
x: clientX,
|
232
|
+
y: clientY,
|
231
233
|
},
|
232
234
|
data: null
|
233
235
|
};
|
@@ -237,11 +239,13 @@ export function useTableDraggierCol(
|
|
237
239
|
const update = (e?: MouseEvent) => {
|
238
240
|
if (!staticState) {return;}
|
239
241
|
|
242
|
+
const { clientX, clientY } = !e ? { clientX: 0, clientY: 0 } : ClientZoom.getClientPosition(e);
|
243
|
+
|
240
244
|
let isDragging = !!staticState.data;
|
241
245
|
|
242
246
|
if (!isDragging) {
|
243
247
|
/*拖拽超过一定距离的时候才开始拖拽,避免与点击事件冲突*/
|
244
|
-
if (!!e && Math.abs(
|
248
|
+
if (!!e && Math.abs(clientX - staticState.start.x) > 5) {
|
245
249
|
isDragging = true;
|
246
250
|
initDraggierState();
|
247
251
|
}
|
@@ -253,7 +257,7 @@ export function useTableDraggierCol(
|
|
253
257
|
}
|
254
258
|
|
255
259
|
if (!!e) {
|
256
|
-
staticState.data.move = { x:
|
260
|
+
staticState.data.move = { x: clientX, y: clientY };
|
257
261
|
}
|
258
262
|
const { data: { cloneTable, move, table, left }, start } = staticState;
|
259
263
|
cloneTable.style.top = table.getBoundingClientRect().top + 'px';
|
@@ -470,7 +474,8 @@ export function useTableDraggierCol(
|
|
470
474
|
};
|
471
475
|
const update = (e?: MouseEvent) => {
|
472
476
|
if (!!e) {
|
473
|
-
|
477
|
+
const { clientX } = ClientZoom.getClientPosition(e);
|
478
|
+
staticState!.moveClientX = clientX;
|
474
479
|
} else {
|
475
480
|
staticState!.moveScrollLeft = staticState!.scrollParent!.scrollLeft;
|
476
481
|
}
|
@@ -9,6 +9,7 @@ import {hasClass} from "plain-utils/dom/hasClass";
|
|
9
9
|
import {addClass} from "plain-utils/dom/addClass";
|
10
10
|
import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
|
11
11
|
import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
|
12
|
+
import {ClientZoom} from "../../../ClientZoom";
|
12
13
|
|
13
14
|
export function useTableDraggierRow(
|
14
15
|
{
|
@@ -85,9 +86,10 @@ export function useTableDraggierRow(
|
|
85
86
|
};
|
86
87
|
let prevClientY = 0;
|
87
88
|
const update = (e?: MouseEvent) => {
|
89
|
+
const { clientY } = !e ? { clientY: prevClientY } : ClientZoom.getClientPosition(e);
|
88
90
|
const moveIndex = (() => {
|
89
91
|
const hostRect = staticState!.bodyHostEl.getBoundingClientRect();
|
90
|
-
let index = Math.floor(((
|
92
|
+
let index = Math.floor(((clientY - hostRect.top + refs.virtual!.refs.scroll!.freezeState.wrapperScrollTop - (staticState!.headTableEl?.clientHeight || 0)) / numberState.bodyRowHeight));
|
91
93
|
if (index < 0) {index = 0;}
|
92
94
|
if (index > bodyNodes.value.length - 1) {
|
93
95
|
index = bodyNodes.value.length - 1;
|
@@ -95,7 +97,7 @@ export function useTableDraggierRow(
|
|
95
97
|
return index;
|
96
98
|
})();
|
97
99
|
if (moveIndex !== move.state.index) {move.state.index = moveIndex;}
|
98
|
-
if (!!e) {prevClientY =
|
100
|
+
if (!!e) {prevClientY = clientY;}
|
99
101
|
};
|
100
102
|
return { state, update, start, get staticState() {return staticState;} };
|
101
103
|
})();
|
@@ -188,9 +190,10 @@ export function useTableDraggierRow(
|
|
188
190
|
};
|
189
191
|
|
190
192
|
const start = (e: iMouseEvent, node: iTableNode) => {
|
193
|
+
const { clientY } = !e ? { clientY: prevClientY } : ClientZoom.getClientPosition(e);
|
191
194
|
const rowEl = (Array.from(refs.el!.querySelectorAll(`.plt-row`)) as HTMLTableRowElement[]).find(i => i.dataset.vid == node.state.index.toString())!;
|
192
195
|
const rowRect = rowEl.getBoundingClientRect();
|
193
|
-
staticState = { startY:
|
196
|
+
staticState = { startY: clientY, startTop: rowRect.top, node, rowEl, data: null, };
|
194
197
|
/*清理状态*/
|
195
198
|
draggierEffects.push(() => {staticState = null;});
|
196
199
|
};
|
@@ -199,11 +202,13 @@ export function useTableDraggierRow(
|
|
199
202
|
const update = (e?: MouseEvent) => {
|
200
203
|
if (!staticState) {return;}
|
201
204
|
|
205
|
+
const { clientY } = !e ? { clientY: prevClientY } : ClientZoom.getClientPosition(e);
|
206
|
+
|
202
207
|
let isDragging = !!staticState.data;
|
203
208
|
|
204
209
|
if (!isDragging) {
|
205
210
|
/*拖拽超过一定距离的时候才开始拖拽,避免与点击事件冲突*/
|
206
|
-
if (!!e && Math.abs(
|
211
|
+
if (!!e && Math.abs(clientY - staticState.startY) > 5) {
|
207
212
|
isDragging = true;
|
208
213
|
initDraggierState();
|
209
214
|
}
|
@@ -214,7 +219,7 @@ export function useTableDraggierRow(
|
|
214
219
|
return;
|
215
220
|
}
|
216
221
|
|
217
|
-
const durY =
|
222
|
+
const durY = clientY - staticState.startY;
|
218
223
|
let top = staticState.startTop + durY;
|
219
224
|
const minTop = move.staticState!.bodyHostEl.getBoundingClientRect().top + (move.staticState!.headTableEl?.clientHeight || 0);
|
220
225
|
if (top < minTop) {
|
@@ -229,7 +234,7 @@ export function useTableDraggierRow(
|
|
229
234
|
|
230
235
|
staticState.data!.cloneRowEl.style.top = `${top}px`;
|
231
236
|
if (!!e) {
|
232
|
-
prevClientY =
|
237
|
+
prevClientY = clientY;
|
233
238
|
}
|
234
239
|
|
235
240
|
/*更细move index信息*/
|
@@ -34,13 +34,16 @@ export const RenderTreeNode = designComponent({
|
|
34
34
|
getComponentCls('tree-node'),
|
35
35
|
{
|
36
36
|
'tree-node-current': tree.state.current === props.treeNode.key,
|
37
|
+
'tree-node-lead': isLeaf.value,
|
37
38
|
'tree-node-single-check': !props.multiple && props.treeNode.checkStatus() === CheckboxStatus.check,
|
39
|
+
'tree-node-multi-check': props.multiple && props.treeNode.checkStatus() === CheckboxStatus.check,
|
38
40
|
'tree-node-disable-check': !props.treeNode.isCheckAble(),
|
39
41
|
}
|
40
42
|
]);
|
41
43
|
|
42
44
|
const checkStatus = cacheComputed(() => props.treeNode.checkStatus());
|
43
45
|
const isExpanded = cacheComputed(() => props.treeNode.isExpanded());
|
46
|
+
const isLeaf = cacheComputed(() => props.treeNode.isLeaf());
|
44
47
|
|
45
48
|
const connectorClassesList = computed(() => {
|
46
49
|
|
@@ -89,6 +92,7 @@ export const RenderTreeNode = designComponent({
|
|
89
92
|
*/
|
90
93
|
onClickNodeContent: () => {
|
91
94
|
if (props.treeNode.empty) {return;}
|
95
|
+
if (tree.draggier.value?.isDragging()) {return;}
|
92
96
|
tree.hooks.onClickNodeContent.exec({ treeNode: props.treeNode, el: refs.el! });
|
93
97
|
},
|
94
98
|
/**
|
@@ -124,7 +128,7 @@ export const RenderTreeNode = designComponent({
|
|
124
128
|
/>
|
125
129
|
}
|
126
130
|
</div>
|
127
|
-
{tree.props.draggable && (
|
131
|
+
{tree.props.draggable && !tree.props.customDraggier && (
|
128
132
|
<div
|
129
133
|
className={classnames(['tree-node-draggier', { 'tree-node-draggier-disable': !tree.utils.isAllowDraggable(props.treeNode) }])}
|
130
134
|
onMouseDown={handler.onMousedownDraggier.value}
|
@@ -3,6 +3,7 @@
|
|
3
3
|
align-items: center;
|
4
4
|
line-height: 22px;
|
5
5
|
padding-bottom: 1px;
|
6
|
+
position: relative;
|
6
7
|
|
7
8
|
.tree-node-operator > div, .tree-node-content {
|
8
9
|
transition: background-color linear 150ms, color linear 150ms;
|
@@ -88,19 +89,43 @@
|
|
88
89
|
.tree-node-content {
|
89
90
|
padding: 5px 8px;
|
90
91
|
color: plv(text-2);
|
92
|
+
}
|
91
93
|
|
92
|
-
|
94
|
+
.tree-node-operator, .tree-node-content {
|
95
|
+
position: relative;
|
96
|
+
z-index: 2;
|
97
|
+
}
|
98
|
+
|
99
|
+
&:after {
|
100
|
+
position: absolute;
|
101
|
+
top: 1px;
|
102
|
+
bottom: 1px;
|
103
|
+
left: 0;
|
104
|
+
right: 0;
|
105
|
+
z-index: 1;
|
106
|
+
border-radius: plv(border-radius-normal);
|
107
|
+
content: '';
|
108
|
+
transition: background-color ease 0.3s;
|
109
|
+
}
|
110
|
+
|
111
|
+
&:hover:not(.tree-node-current):not(.tree-node-single-check) {
|
112
|
+
cursor: pointer;
|
113
|
+
|
114
|
+
&:after {
|
93
115
|
background-color: plv(background-hover);
|
94
|
-
|
116
|
+
content: '';
|
95
117
|
}
|
96
118
|
}
|
97
119
|
|
98
|
-
&.tree-node-current, &.tree-node-single-check {
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
120
|
+
&.tree-node-current, &.tree-node-single-check, &.tree-node-multi-check {
|
121
|
+
|
122
|
+
.tree-node-operator, .tree-node-content {
|
123
|
+
color: plv(primary-6);
|
124
|
+
}
|
125
|
+
|
126
|
+
&:after {
|
127
|
+
background-color: plv(primary-light-1);
|
128
|
+
content: '';
|
104
129
|
}
|
105
130
|
}
|
106
131
|
|
@@ -168,9 +193,16 @@
|
|
168
193
|
}
|
169
194
|
|
170
195
|
&.tree-expander-cover {
|
196
|
+
@include comp(tree-node) {
|
197
|
+
&:not(.tree-node-lead) {
|
198
|
+
.tree-node-expander {
|
199
|
+
background-color: plv(secondary-2);
|
200
|
+
}
|
201
|
+
}
|
202
|
+
}
|
203
|
+
|
171
204
|
.tree-node-expander {
|
172
205
|
border-radius: 2px;
|
173
|
-
background-color: plv(secondary-2);
|
174
206
|
transform: scale(0.75);
|
175
207
|
}
|
176
208
|
}
|
@@ -216,6 +248,7 @@
|
|
216
248
|
@include comp(tree-draggier-indicator) {
|
217
249
|
position: fixed;
|
218
250
|
pointer-events: none;
|
251
|
+
z-index: 10;
|
219
252
|
|
220
253
|
&[data-available=true] {
|
221
254
|
background-color: plv(primary-6);
|
@@ -63,6 +63,8 @@ export interface iTreeProps {
|
|
63
63
|
getNodeIcon?: (node: iTreeNode) => string,
|
64
64
|
/*是否开启拖拽节点功能*/
|
65
65
|
draggable?: boolean,
|
66
|
+
/*自定义draggier按钮*/
|
67
|
+
customDraggier?: boolean,
|
66
68
|
/*判断节点是否可以拖拽*/
|
67
69
|
isAllowDraggable?: (treeNode: iTreeNode) => boolean | void,
|
68
70
|
/*判断节点是否可以放置*/
|
@@ -327,7 +327,11 @@ export function createTreeCore(
|
|
327
327
|
hooks.onClickExpandIcon.use(({ treeNode }) => {methods.toggleExpand(treeNode);})
|
328
328
|
);
|
329
329
|
effects.push(
|
330
|
-
hooks.onClickNodeContent.use(({ treeNode }) => {
|
330
|
+
hooks.onClickNodeContent.use(({ treeNode }) => {
|
331
|
+
methods.singleSelect(treeNode);
|
332
|
+
if (props.expandOnClickNode) {methods.toggleExpand(treeNode);}
|
333
|
+
if (props.checkOnClickNode) {methods.toggleCheck(treeNode);}
|
334
|
+
})
|
331
335
|
);
|
332
336
|
effects.push(
|
333
337
|
hooks.onClickCheckbox.use(({ treeNode }) => {
|
@@ -14,6 +14,8 @@ import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
|
|
14
14
|
import {onParentElementsScroll} from "../../utils/onParentElementsScroll";
|
15
15
|
import {addClass} from "plain-utils/dom/addClass";
|
16
16
|
import {iTreeHooks} from "./createTreeHooks";
|
17
|
+
import {ClientZoom} from "../ClientZoom";
|
18
|
+
import {delay} from "plain-utils/utils/delay";
|
17
19
|
|
18
20
|
export function createTreeDraggier(
|
19
21
|
{
|
@@ -108,6 +110,8 @@ export function createTreeDraggier(
|
|
108
110
|
*/
|
109
111
|
const shadowTreeNode = (() => {
|
110
112
|
|
113
|
+
const reactiveState = reactive({ dragging: false, });
|
114
|
+
|
111
115
|
let staticState = null as null | {
|
112
116
|
startNode: iTreeNode, // 拖拽开始的时候节点
|
113
117
|
rowElement: HTMLElement, // 拖拽开始的row对象
|
@@ -222,71 +226,78 @@ export function createTreeDraggier(
|
|
222
226
|
if (!rowElement) {
|
223
227
|
throw new Error(`tree draggier: can't find row element with selector: .${rowClass}`);
|
224
228
|
}
|
229
|
+
const { clientX, clientY } = ClientZoom.getClientPosition(e);
|
225
230
|
staticState = {
|
226
231
|
startNode: node,
|
227
232
|
rowElement,
|
228
233
|
start: {
|
229
|
-
x:
|
230
|
-
y:
|
234
|
+
x: clientX,
|
235
|
+
y: clientY,
|
231
236
|
},
|
232
237
|
data: null,
|
233
238
|
};
|
239
|
+
reactiveState.dragging = true;
|
234
240
|
/**
|
235
241
|
* 拖拽结束之后,处理拖拽数据
|
236
242
|
* @author 韦胜健
|
237
243
|
* @date 2023/6/1 21:13
|
238
244
|
*/
|
239
245
|
draggierEffects.push(async () => {
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
246
|
+
await (async () => {
|
247
|
+
if (!!staticState?.data) {
|
248
|
+
const { startNode, } = staticState;
|
249
|
+
const { moveNode, dropType, droppable, isHideDraggier } = staticState.data.move;
|
250
|
+
if (!droppable || isHideDraggier) {
|
251
|
+
return;
|
252
|
+
}
|
253
|
+
const newParentNode = dropType === eTreeDropType.inner ? moveNode : moveNode.parent;
|
254
|
+
const oldParentNode = startNode.parent;
|
255
|
+
const newSiblings = dropType === eTreeDropType.inner ? methods.getReactiveChildrenData(moveNode) : methods.getParentChildrenData(moveNode);
|
256
|
+
const newSiblingsBak = [...newSiblings];
|
257
|
+
const oldSiblings = methods.getParentChildrenData(startNode);
|
258
|
+
const oldSiblingsBak = [...oldSiblings];
|
259
|
+
|
260
|
+
methods.removeSelf(startNode!);
|
261
|
+
switch (dropType) {
|
262
|
+
case eTreeDropType.prev:
|
263
|
+
methods.previousSibling(moveNode!, startNode!);
|
264
|
+
break;
|
265
|
+
case eTreeDropType.inner:
|
266
|
+
methods.unshiftChild(moveNode!, startNode!);
|
267
|
+
await methods.expand(moveNode!);
|
268
|
+
break;
|
269
|
+
case eTreeDropType.next:
|
270
|
+
methods.nextSibling(moveNode!, startNode!);
|
271
|
+
await methods.collapse(moveNode);
|
272
|
+
break;
|
273
|
+
}
|
274
|
+
await nextTick();
|
275
|
+
await Promise.all([
|
276
|
+
methods.refreshCheckStatus(startNode!.parent),
|
277
|
+
methods.refreshCheckStatus(moveNode!.parent)
|
278
|
+
]);
|
279
|
+
await hooks.onDragChange.exec({
|
280
|
+
data: startNode.data,
|
281
|
+
newParent: newParentNode?.data,
|
282
|
+
oldParent: oldParentNode?.data,
|
283
|
+
node: startNode,
|
284
|
+
newParentNode,
|
285
|
+
oldParentNode,
|
286
|
+
newSiblings,
|
287
|
+
oldSiblings,
|
288
|
+
newSiblingsBak,
|
289
|
+
oldSiblingsBak,
|
290
|
+
undo: () => {
|
291
|
+
newSiblings.splice(0, newSiblings.length, ...newSiblingsBak);
|
292
|
+
oldSiblings.splice(0, oldSiblings.length, ...oldSiblingsBak);
|
293
|
+
},
|
294
|
+
});
|
266
295
|
}
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
await hooks.onDragChange.exec({
|
273
|
-
data: startNode.data,
|
274
|
-
newParent: newParentNode?.data,
|
275
|
-
oldParent: oldParentNode?.data,
|
276
|
-
node: startNode,
|
277
|
-
newParentNode,
|
278
|
-
oldParentNode,
|
279
|
-
newSiblings,
|
280
|
-
oldSiblings,
|
281
|
-
newSiblingsBak,
|
282
|
-
oldSiblingsBak,
|
283
|
-
undo: () => {
|
284
|
-
newSiblings.splice(0, newSiblings.length, ...newSiblingsBak);
|
285
|
-
oldSiblings.splice(0, oldSiblings.length, ...oldSiblingsBak);
|
286
|
-
},
|
287
|
-
});
|
288
|
-
}
|
289
|
-
staticState = null;
|
296
|
+
})();
|
297
|
+
delay().then(() => {
|
298
|
+
staticState = null;
|
299
|
+
reactiveState.dragging = false;
|
300
|
+
});
|
290
301
|
});
|
291
302
|
};
|
292
303
|
|
@@ -302,7 +313,8 @@ export function createTreeDraggier(
|
|
302
313
|
|
303
314
|
if (!isDragging) {
|
304
315
|
/*拖拽超过一定距离的时候才开始拖拽,避免与点击事件冲突*/
|
305
|
-
|
316
|
+
const { clientY } = ClientZoom.getClientPosition(e);
|
317
|
+
if (!!e && Math.abs(clientY - staticState.start.y) > 5) {
|
306
318
|
isDragging = true;
|
307
319
|
initDraggierState();
|
308
320
|
}
|
@@ -323,9 +335,10 @@ export function createTreeDraggier(
|
|
323
335
|
staticState.data.move.isHideDraggier = true;
|
324
336
|
staticState.data.cloneTreeNode.style.opacity = '0';
|
325
337
|
} else {
|
338
|
+
const { clientX, clientY } = ClientZoom.getClientPosition(e);
|
326
339
|
staticState.data.move.isHideDraggier = false;
|
327
|
-
staticState.data.move.x =
|
328
|
-
staticState.data.move.y =
|
340
|
+
staticState.data.move.x = clientX;
|
341
|
+
staticState.data.move.y = clientY;
|
329
342
|
staticState.data.move.moveNode = node;
|
330
343
|
staticState.data.move.contentRect = (e.currentTarget as HTMLElement).querySelector(`.${contentClass}`)!.getBoundingClientRect();
|
331
344
|
const percent = (staticState.data.move.y - staticState.data.move.contentRect.top) / staticState.data.move.contentRect.height;
|
@@ -366,7 +379,7 @@ export function createTreeDraggier(
|
|
366
379
|
indicatorHandler.update();
|
367
380
|
};
|
368
381
|
|
369
|
-
const isDragging = () =>
|
382
|
+
const isDragging = () => reactiveState.dragging;
|
370
383
|
|
371
384
|
const getState = () => staticState;
|
372
385
|
|
@@ -384,7 +397,8 @@ export function createTreeDraggier(
|
|
384
397
|
document.removeEventListener('mouseup', draggierEffects.clear);
|
385
398
|
});
|
386
399
|
},
|
387
|
-
onMousemoveRow: null as null | ((e: iMouseEvent, node: iTreeNode) => void)
|
400
|
+
onMousemoveRow: null as null | ((e: iMouseEvent, node: iTreeNode) => void),
|
401
|
+
isDragging: () => shadowTreeNode.isDragging(),
|
388
402
|
});
|
389
403
|
|
390
404
|
return ret;
|
@@ -254,6 +254,7 @@ export function createTreeMethods(
|
|
254
254
|
* @date 2022/9/22 19:56
|
255
255
|
*/
|
256
256
|
refreshCheckStatus: async (keyOrNode: iTreeKeyOrNode, emitChange = true) => {
|
257
|
+
if (!props.multiple) {return;}
|
257
258
|
const checkKeys: string[] = [];
|
258
259
|
const unCheckKeys: string[] = [];
|
259
260
|
await nextTick();
|
@@ -29,9 +29,10 @@ export const TreePropsOptions = {
|
|
29
29
|
defaultExpandAll: { type: Boolean as PropType<iTreeProps["defaultExpandAll"]> },
|
30
30
|
getNodeIcon: { type: Function as PropType<iTreeProps["getNodeIcon"]> },
|
31
31
|
draggable: { type: Boolean as PropType<iTreeProps["draggable"]> },
|
32
|
+
customDraggier: { type: Boolean as PropType<iTreeProps["customDraggier"]> },
|
32
33
|
isAllowDraggable: { type: Function as PropType<iTreeProps["isAllowDraggable"]> },
|
33
34
|
isAllowDroppable: { type: Function as PropType<iTreeProps["isAllowDroppable"]> },
|
34
|
-
leafIcon: { type: String as PropType<iTreeProps["leafIcon"]>, default: 'pi-file' as string },
|
35
|
+
leafIcon: { type: String as PropType<iTreeProps["leafIcon"]>, default: 'pi-drive-file' as string },
|
35
36
|
folderCollapseIcon: { type: String as PropType<iTreeProps["folderCollapseIcon"]>, default: 'pi-caret-right' as string },
|
36
37
|
folderExpandIcon: { type: String as PropType<iTreeProps["folderExpandIcon"]>, default: 'pi-down' as string },
|
37
38
|
expanderCover: { type: Boolean as PropType<iTreeProps["expanderCover"]>, default: true },
|
@@ -0,0 +1,91 @@
|
|
1
|
+
import {cacheComputed, ComponentPropsType, computed, designComponent, getComponentCls, iHTMLDivElement, iMouseEvent, PropType, useClassCache, useRefs} from "plain-design-composition";
|
2
|
+
import {Icon} from "../Icon";
|
3
|
+
import {iTreeNode} from "../TreeCore/createTreeNode";
|
4
|
+
import './tree-node-with-menu.scss';
|
5
|
+
import {Tree} from "../Tree";
|
6
|
+
import {useTooltip} from "../useTooltip";
|
7
|
+
import {iTreeNodeWithMenuOption} from "./treeNodeWithMenu.utils";
|
8
|
+
import {Dropdown} from "../Dropdown";
|
9
|
+
import {DropdownOption} from "../DropdownOption";
|
10
|
+
|
11
|
+
export const TreeNodeWithMenu = designComponent({
|
12
|
+
name: 'tree-node-with-menu',
|
13
|
+
props: {
|
14
|
+
treeNode: { type: Object as PropType<iTreeNode>, required: true },
|
15
|
+
dropdownOptions: { type: Array as PropType<iTreeNodeWithMenuOption[]> },
|
16
|
+
dropdownAttrs: { type: Object as PropType<ComponentPropsType<typeof Dropdown>> },
|
17
|
+
},
|
18
|
+
setup({ props }) {
|
19
|
+
|
20
|
+
const { refs, onRef } = useRefs({ content: iHTMLDivElement });
|
21
|
+
|
22
|
+
const tree = Tree.use.inject();
|
23
|
+
|
24
|
+
const isDraggable = cacheComputed(() => tree.props.draggable && tree.utils.isAllowDraggable(props.treeNode));
|
25
|
+
|
26
|
+
const classes = useClassCache(() => [
|
27
|
+
getComponentCls('tree-node-with-menu'),
|
28
|
+
{
|
29
|
+
'tree-node-with-menu-draggable': isDraggable.value,
|
30
|
+
}
|
31
|
+
]);
|
32
|
+
|
33
|
+
const dropdownAttrs = computed(() => {
|
34
|
+
return {
|
35
|
+
trigger: 'hover' as const,
|
36
|
+
placement: 'right-start' as const,
|
37
|
+
...props.dropdownAttrs,
|
38
|
+
};
|
39
|
+
});
|
40
|
+
|
41
|
+
const handler = {
|
42
|
+
onMousedownDraggier: computed(() => !tree.draggier.value ? undefined : ((e: iMouseEvent) => {
|
43
|
+
tree.draggier.value!.onMousedownDraggier(e, props.treeNode);
|
44
|
+
})),
|
45
|
+
};
|
46
|
+
|
47
|
+
useTooltip({
|
48
|
+
overflow: true,
|
49
|
+
tooltip: () => ({
|
50
|
+
reference: refs.content,
|
51
|
+
message: props.treeNode.label()
|
52
|
+
}),
|
53
|
+
});
|
54
|
+
|
55
|
+
return () => (
|
56
|
+
<div className={classes.value}>
|
57
|
+
<div className="tree-node-with-menu-content" ref={onRef.content}>{props.treeNode.label()}</div>
|
58
|
+
{(() => {
|
59
|
+
let btn = (
|
60
|
+
<div className="tree-node-with-menu-button" onMouseDown={handler.onMousedownDraggier.value}>
|
61
|
+
<Icon icon="pi-drag-dot-vertical"/>
|
62
|
+
</div>
|
63
|
+
);
|
64
|
+
let ret = btn;
|
65
|
+
if (!!props.dropdownOptions?.length && !tree.draggier.value?.isDragging()) {
|
66
|
+
ret = (
|
67
|
+
<Dropdown
|
68
|
+
{...dropdownAttrs.value}
|
69
|
+
v-slots={{
|
70
|
+
default: () => btn,
|
71
|
+
popper: () => (
|
72
|
+
props.dropdownOptions?.map((option, index) => {
|
73
|
+
const { renderDefault, renderContent, ...leftOption } = option;
|
74
|
+
const vSlots = {} as any;
|
75
|
+
if (!!renderDefault) {vSlots.default = () => renderDefault();}
|
76
|
+
if (!!renderContent) {vSlots.content = () => renderContent();}
|
77
|
+
return <DropdownOption key={index} {...leftOption} v-slots={vSlots}/>;
|
78
|
+
})
|
79
|
+
)
|
80
|
+
}}
|
81
|
+
/>
|
82
|
+
);
|
83
|
+
}
|
84
|
+
return ret;
|
85
|
+
})()}
|
86
|
+
</div>
|
87
|
+
);
|
88
|
+
},
|
89
|
+
});
|
90
|
+
|
91
|
+
export default TreeNodeWithMenu;
|
@@ -0,0 +1,39 @@
|
|
1
|
+
@include comp(tree-node-with-menu) {
|
2
|
+
display: flex;
|
3
|
+
align-items: center;
|
4
|
+
|
5
|
+
.tree-node-with-menu-content {
|
6
|
+
flex: 1;
|
7
|
+
overflow: hidden;
|
8
|
+
text-overflow: ellipsis;
|
9
|
+
white-space: nowrap;
|
10
|
+
}
|
11
|
+
|
12
|
+
.tree-node-with-menu-button {
|
13
|
+
height: 1em;
|
14
|
+
width: 1em;
|
15
|
+
display: flex;
|
16
|
+
align-items: center;
|
17
|
+
justify-content: center;
|
18
|
+
cursor: pointer;
|
19
|
+
user-select: none;
|
20
|
+
//transition: all ease 0.3s;
|
21
|
+
}
|
22
|
+
|
23
|
+
&.tree-node-with-menu-draggable {
|
24
|
+
.tree-node-with-menu-button {
|
25
|
+
cursor: row-resize;
|
26
|
+
padding-right: 6px;
|
27
|
+
}
|
28
|
+
}
|
29
|
+
}
|
30
|
+
|
31
|
+
@include comp(tree-node) {
|
32
|
+
&:not(:hover) {
|
33
|
+
.tree-node-with-menu-button {
|
34
|
+
opacity: 0;
|
35
|
+
width: 0;
|
36
|
+
pointer-events: none;
|
37
|
+
}
|
38
|
+
}
|
39
|
+
}
|
@@ -0,0 +1,12 @@
|
|
1
|
+
import {iMouseEvent, RenderNode} from "plain-design-composition";
|
2
|
+
|
3
|
+
export interface iTreeNodeWithMenuOption {
|
4
|
+
label?: string,
|
5
|
+
disabled?: boolean,
|
6
|
+
readonly?: boolean,
|
7
|
+
icon?: string,
|
8
|
+
val?: any,
|
9
|
+
onClick?: (e: iMouseEvent) => void
|
10
|
+
renderDefault?: () => RenderNode,
|
11
|
+
renderContent?: () => RenderNode,
|
12
|
+
}
|