@voplus/morpho-workspace 1.1.0-dev013 → 1.1.0-dev016

package/es/modules/board/components/Board/index.js

@@ -1,28 +1,28 @@
+import { BoardListContextState, BoardtListContext, useBoardColumnListEffect, useBoardColumnStore } from "../../../../data/board";
+import { CreateDateFilter, DocumentStatusFilter, FlagFilter } from "@voplus/morpho-document/es/controls/filters";
 import { DragDropContext, Droppable } from "react-beautiful-dnd";
-import { FilterOptionsContext, FilterOptionsContextState } from "@voplus/morpho-ui/es/data";
-import { FilterViewContext, FilterViewContextState } from "@voplus/morpho-ui/es/data/FilterViewContext";
 import { Input, Spin } from "@voplus/antd";
+import { ListDataContext, useCreateListDataState } from "@voplus/morpho-ui/es/data";
 import { Observer, useObserver } from "mobx-react-lite";
 import React, { useEffect, useState } from "react";
 import { faCheck, faTimes } from "@fortawesome/pro-light-svg-icons";
-import { useBoardColumnListEffect, useBoardColumnStore } from "../../../../data/board";
 import BoardColumn from "../BoardColumn";
 import Card from "@voplus/morpho-ui/es/controls/Card";
 import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
-import FilterView from "@voplus/morpho-ui/es/controls/FilterView";
+import ListHeader from "@voplus/morpho-ui/es/components/layout/ListView/headers/ListHeader";
 import { Scrollbars } from "react-custom-scrollbars";
 import SearchHeader from "@voplus/morpho-ui/es/components/layout/ListView/components/SearchHeader";
-import SortViewDropdown from "@voplus/morpho-ui/es/components/layout/ListView/controls/SortViewDropdown";
 import { State } from "./state";
 import styles from "./index.less";
-import { toJS } from "mobx";
 import { useDocumentStore } from "@voplus/morpho-document";
 const Board = (props) => {
     const boards = useBoardColumnStore();
     const documentStore = useDocumentStore();
     const [state] = useState(new State(boards, documentStore));
-    /** BoardColumn-links filters list options */
-    const [listoptions] = useState(new FilterOptionsContextState());
+    /** 建立 ListView 和useTaskListEffect所需的ListDataState. 会根据parentId重建所以不需reset. */
+    const list = useCreateListDataState({}, []);
+    /**把store 传给子级 DocumentItem*/
+    const [lists] = useState(new BoardListContextState());
     state.props = props;
     useEffect(state.subscribeOnBoardCreateCallback, []);
     useBoardColumnListEffect(list => {
@@ -30,20 +30,6 @@ const Board = (props) => {
     }, {
         Filters: [{ c: "ParentNodeId", o: "=", l: "And", v1: props.parentId }]
     });
-    /** BoardColumn filters sort */
-    const onSort = (value) => {
-        listoptions.sort = value;
-    };
-    /** BoardColumn filters status */
-    const onFilter = (value) => {
-        const { status } = value;
-        listoptions.replace({
-            c: "LinkStatus",
-            o: "contains",
-            l: "And",
-            v1: toJS(JSON.stringify(status))
-        });
-    };
     /** BoardColumn filters name */
     const onSearch = (value) => {
         if (state.timeout) {
@@ -51,7 +37,12 @@ const Board = (props) => {
         }
         state.timeout = setTimeout(() => {
             state.timeout = null;
-            listoptions.replace({ c: "Name", o: "contains", l: "And", v1: toJS(JSON.stringify(value)) });
+            lists.replace({
+                c: "Name",
+                o: "contains",
+                l: "And",
+                v1: value
+            });
         }, 1500);
     };
     const board = useObserver(() => (React.createElement(Droppable, { droppableId: props.parentId, type: "COLUMN", direction: "horizontal" }, provided => (React.createElement(Scrollbars, { autoHide: true },
@@ -64,26 +55,28 @@ const Board = (props) => {
                 }, 
                 // eslint-disable-next-line @typescript-eslint/unbound-method
                 ref: provided.innerRef }, provided.droppableProps), (_a = state.boardcolumns) === null || _a === void 0 ? void 0 :
-                _a.map((item, index) => (React.createElement(BoardColumn, { key: item.id, index: index, id: item.id, reload: state.reload, colorStyle: state.colorList[index % 6], destination: state.destination, source: state.source }))),
+                _a.map((item, index) => (React.createElement(BoardColumn, { key: item.id, index: index, id: item.id, reload: state.reload, colorStyle: state.colorList[index % 6], destination: state.destination, source: state.source, onIds: (v) => state.onIds(v) }))),
                 provided.placeholder));
         }))))));
-    const [filterViewState] = useState(new FilterViewContextState());
-    return useObserver(() => (React.createElement(FilterOptionsContext.Provider, { value: listoptions },
-        React.createElement("div", { className: styles["board_header"] },
-            React.createElement(SearchHeader, { onChange: onSearch }),
-            React.createElement("div", null,
-                React.createElement(SortViewDropdown, { onSort: onSort }),
-                React.createElement(FilterViewContext.Provider, { value: filterViewState },
-                    React.createElement(FilterView, { className: "margin-left-10", onFilter: onFilter })))),
-        React.createElement("div", { className: styles["board-list"] },
-            React.createElement(DragDropContext, { onDragEnd: (result) => state.onDragEnd(result) }, board),
-            state.addBoardColumnAble && (React.createElement(Spin, { spinning: state.addLoading },
-                React.createElement(Card, { className: "add-board-able", padding: "0 15px", style: { borderTop: ` solid 2px #3AC43A` } },
-                    React.createElement(Input, { placeholder: "STATUS NAME", value: state.name, onChange: e => (state.name = e.target.value) }),
-                    React.createElement(FAIcon, { icon: faCheck, onClick: () => state.onSave() }),
-                    React.createElement(FAIcon, { icon: faTimes, onClick: () => (state.addBoardColumnAble = false) })))),
-            React.createElement("div", { className: "add-board" },
-                React.createElement("div", { onClick: () => (state.addBoardColumnAble = true) }, "+ ADD"))))));
+    return useObserver(() => (React.createElement(BoardtListContext.Provider, { value: lists },
+        React.createElement(ListDataContext.Provider, { value: list },
+            React.createElement("div", { className: styles["board-context"] },
+                React.createElement(ListHeader, { header: React.createElement(SearchHeader, { onChange: onSearch }), filterViewProps: {
+                        columns: [
+                            React.createElement(CreateDateFilter, { key: "createDateFilter" }),
+                            React.createElement(FlagFilter, { key: "flagFilter" }),
+                            React.createElement(DocumentStatusFilter, { key: "documentStatusFilter" })
+                        ]
+                    }, addAble: false }),
+                React.createElement("div", { className: "board-list" },
+                    React.createElement(DragDropContext, { onDragEnd: (result) => state.onDragEnd(result) }, board),
+                    React.createElement("div", { className: "add-board-controls" }, state.addBoardColumnAble && (React.createElement(Spin, { spinning: state.addLoading },
+                        React.createElement(Card, { className: "add-board-able", padding: "0 15px", style: { borderTop: ` solid 2px #3AC43A` } },
+                            React.createElement(Input, { placeholder: "STATUS NAME", value: state.name, onChange: e => (state.name = e.target.value) }),
+                            React.createElement(FAIcon, { icon: faCheck, onClick: () => state.onSave() }),
+                            React.createElement(FAIcon, { icon: faTimes, onClick: () => (state.addBoardColumnAble = false) }))))),
+                    React.createElement("div", { className: "add-board" },
+                        React.createElement("div", { onClick: () => (state.addBoardColumnAble = true) }, "+ ADD"))))))));
 };
 export default Board;
 //# sourceMappingURL=index.js.map

package/es/modules/board/components/Board/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/Board/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/Board/index.tsx"],"names":[],"mappings":"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"}

package/es/modules/board/components/Board/index.less

@@ -1,67 +1,99 @@
-.board-list {
+.board-context {
 	height: 100%;
 	display: flex;
-	justify-content: space-between;
-	margin: 10px;
-	padding: 0 10px;
+	flex-direction: column;
 	:global {
-		.board-sortDnD {
-			flex: 1;
+		.list-view-header {
 			display: flex;
-			> div {
-				flex: 1;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10px 20px;
+			border-bottom: 1px solid #f2f2f2;
+			background: #ffffff;
+			.view-title {
+				color: #000;
+				font-size: 16px;
+				font-weight: 600;
 			}
-		}
-		.add-board {
-			width: 100px;
-			min-width: 100px;
-			font-size: 16px;
-			text-align: center;
-			line-height: 50px;
-			margin: 8px 0;
-			> div {
+			.plus-icon {
+				display: inline-block;
+				padding: 4px;
+				margin-left: 10px;
+				font-size: 13px;
+				line-height: 1px;
+				background: #1abc9c;
 				cursor: pointer;
 			}
-		}
-		.ant-spin-nested-loading {
-			margin: 8px 0 8px 8px;
-			> div > .ant-spin {
-				height: 50px;
+			.margin-left-10 {
+				margin-left: 10px;
 			}
 		}
-		.add-board-able {
+		.board-list {
+			height: 100%;
 			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 50px;
-			color: #000000;
-			line-height: 50px;
-			padding: 0 10px;
-			background: #ffffff;
-			margin-bottom: 15px;
-			min-width: 150px;
-			.ant-input {
-				padding: 0;
-				border: none;
+			justify-content: space-between;
+			padding: 10px 12px;
+
+			.board-sortDnD {
+				flex: 1;
+				display: flex;
+				> div {
+					flex: 1;
+				}
 			}
-			.ant-input:focus {
-				box-shadow: none;
+			.add-board {
+				width: 100px;
+				min-width: 100px;
+				font-size: 16px;
+				text-align: center;
+				line-height: 50px;
+				margin: 8px 0;
+				> div {
+					cursor: pointer;
+				}
 			}
-			.svg-inline--fa {
-				cursor: pointer;
-				margin-left: 8px;
+			.add-board-controls {
+				.ant-spin-nested-loading {
+					margin: 8px 0 8px 8px;
+					> div > .ant-spin {
+						height: 50px;
+					}
+				}
+			}
+			.add-board-able {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 50px;
+				color: #000000;
+				line-height: 50px;
+				padding: 0 10px;
+				background: #ffffff;
+				margin-bottom: 15px;
+				min-width: 150px;
+				.ant-input {
+					padding: 0;
+					border: none;
+				}
+				.ant-input:focus {
+					box-shadow: none;
+				}
+				.svg-inline--fa {
+					cursor: pointer;
+					margin-left: 8px;
+				}
+			}
+			.ant-calendar {
+				max-width: 250px;
 			}
-		}
-		.ant-calendar {
-			max-width: 250px;
 		}
 	}
 }
-.board_header {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 10px 20px;
-	border-bottom: 1px solid #f2f2f2;
-	background-color: #ffffff;
-}
+// .board_header {
+// 	display: flex;
+// 	justify-content: space-between;
+// 	align-items: center;
+// 	padding: 10px 20px;
+// 	border-bottom: 1px solid #f2f2f2;
+// 	background-color: #ffffff;
+// }

package/es/modules/board/components/Board/state.d.ts

@@ -1,14 +1,21 @@
-import { DocumentStore } from "@voplus/morpho-document";
-import { IBoardColumn, BoardColumnStore } from "../../../../data/board";
+import { BoardColumnStore, IBoardColumn } from "../../../../data/board";
+import { DocumentStore, IDocument } from "@voplus/morpho-document";
+import { FilterOption } from "@voplus/morpho-data";
 export declare type BoardListProps = {
     parentId: string;
 };
+export interface IBoardIds {
+    id: string;
+    ids: string[];
+}
 export declare class State {
     private _store;
     private _docStore;
     props: BoardListProps;
     constructor(_store: BoardColumnStore, _docStore: DocumentStore);
     boardcolumns: IBoardColumn[];
+    /** board ids */
+    ids: IBoardIds[];
     /** search filter 1.5秒 */
     timeout: any;
     /** add BoardColumn name */
@@ -24,11 +31,21 @@ export declare class State {
     destination: any;
     /** BoardColumn head border-top color */
     colorList: string[];
-    onBoardColumnCreated: (s: BoardColumnStore, t: import("@voplus/morpho-document").IDocument) => void;
-    onBoardColumnDeleted: (s: BoardColumnStore, t: import("@voplus/morpho-document").IDocument) => void;
+    /** documentlist filter name */
+    filterName: string;
+    filterList?: FilterOption[];
+    onBoardColumnCreated: (s: DocumentStore, t: IDocument) => void;
+    onBoardColumnDeleted: (s: DocumentStore, t: IDocument) => void;
     subscribeOnBoardCreateCallback: () => () => void;
     /** add BoardColumn save */
     onSave: () => Promise<any>;
     /** 拖拽方法 */
-    onDragEnd(result: any): void;
+    onDragEnd(result: any): Promise<void>;
+    /** 存储ids 放便拖拽后查找 afterId */
+    onIds(v: any): void;
+    /**
+     * document filters
+     * @return document filters
+     */
+    get filters(): any[];
 }

package/es/modules/board/components/Board/state.js

@@ -1,118 +1,177 @@
 import { __decorate } from "tslib";
-import { action, observable } from "mobx";
+import { action, computed, observable } from "mobx";
 import { message } from "@voplus/antd";
-export class State {
-    constructor(_store, _docStore) {
-        this._store = _store;
-        this._docStore = _docStore;
-        this.boardcolumns = [];
-        /** search filter 1.5秒 */
-        this.timeout = null;
-        /** add BoardColumn name */
-        this.name = "";
-        this.reload = false;
-        /** add BoardColumn save loading */
-        this.addLoading = false;
-        /** add BoardColumn */
-        this.addBoardColumnAble = false;
-        /** BoardColumn head border-top color */
-        this.colorList = ["#765FEE", "#fe4066", "#FFC832", "#FF8F5E", "#16ecec", "#FFC832"];
-        this.onBoardColumnCreated = (s, t) => {
-            if (t.parentId === this.props.parentId) {
-                this.boardcolumns.push(t);
-                this.reload = true;
-            }
-        };
-        this.onBoardColumnDeleted = (s, t) => {
-            this.boardcolumns = this.boardcolumns.filter(item => item.id !== t.id);
-        };
-        this.subscribeOnBoardCreateCallback = () => {
-            this._store.ItemCreatedEvent.subscribe(this.onBoardColumnCreated);
-            this._store.ItemDeletedEvent.subscribe(this.onBoardColumnDeleted);
-            return () => {
-                this._store.ItemCreatedEvent.unsubscribe(this.onBoardColumnCreated);
-                this._store.ItemDeletedEvent.unsubscribe(this.onBoardColumnDeleted);
-            };
-        };
-        /** add BoardColumn save */
-        this.onSave = async () => {
-            if (!this.name)
-                return message.warning("Title is required");
-            this.addLoading = true;
-            await this._store.create({ Name: this.name, ParentId: this.props.parentId });
+let State = /** @class */ (() => {
+    class State {
+        constructor(_store, _docStore) {
+            this._store = _store;
+            this._docStore = _docStore;
+            this.boardcolumns = [];
+            /** board ids */
+            this.ids = [];
+            /** search filter 1.5秒 */
+            this.timeout = null;
+            /** add BoardColumn name */
             this.name = "";
+            this.reload = false;
+            /** add BoardColumn save loading */
             this.addLoading = false;
-        };
-    }
-    /** 拖拽方法 */
-    onDragEnd(result) {
-        // dropped nowhere
-        if (!result.destination) {
-            return;
+            /** add BoardColumn */
+            this.addBoardColumnAble = false;
+            /** BoardColumn head border-top color */
+            this.colorList = ["#765FEE", "#fe4066", "#FFC832", "#FF8F5E", "#16ecec", "#FFC832"];
+            /** documentlist filter name */
+            this.filterName = "";
+            this.filterList = [];
+            this.onBoardColumnCreated = (s, t) => {
+                if (t.parentId === this.props.parentId && t.type == "BoardColumn") {
+                    this.boardcolumns.push(t);
+                    this.reload = true;
+                }
+            };
+            this.onBoardColumnDeleted = (s, t) => {
+                if (t.type == "BoardColumn")
+                    this.boardcolumns = this.boardcolumns.filter(item => item.id !== t.id);
+            };
+            this.subscribeOnBoardCreateCallback = () => {
+                this._docStore.DocumentCreatedEvent.subscribe(this.onBoardColumnCreated);
+                this._docStore.DocumentDeletedEvent.subscribe(this.onBoardColumnDeleted);
+                return () => {
+                    this._docStore.DocumentCreatedEvent.unsubscribe(this.onBoardColumnCreated);
+                    this._docStore.DocumentDeletedEvent.unsubscribe(this.onBoardColumnDeleted);
+                };
+            };
+            /** add BoardColumn save */
+            this.onSave = async () => {
+                if (!this.name)
+                    return message.warning("Title is required");
+                this.addLoading = true;
+                await this._store.create({ Name: this.name, ParentId: this.props.parentId });
+                this.name = "";
+                this.addLoading = false;
+            };
         }
-        const { source, destination, draggableId } = result;
-        // did not move anywhere - can bail early
-        if (source.droppableId === destination.droppableId && source.index === destination.index) {
-            return;
+        /** 拖拽方法 */
+        async onDragEnd(result) {
+            // dropped nowhere
+            if (!result.destination) {
+                return;
+            }
+            const { source, destination, draggableId } = result;
+            // did not move anywhere - can bail early
+            if (source.droppableId === destination.droppableId && source.index === destination.index) {
+                return;
+            }
+            // reordering column
+            if (result.type === "COLUMN") {
+                if (destination.index === 0) {
+                    this._docStore.moveAfter(draggableId, "");
+                }
+                else {
+                    const afterId = this.boardcolumns.length - 1 === destination.index
+                        ? this.boardcolumns[destination.index].id
+                        : this.boardcolumns[destination.index - 1].id;
+                    this._docStore.moveAfter(draggableId, afterId);
+                }
+                const [removed] = this.boardcolumns.splice(source.index, 1);
+                this.boardcolumns.splice(destination.index, 0, removed);
+                return;
+            }
+            // destination,source 数据 传给SubDocumentList 进行reordering list
+            this.source = { parentId: source.droppableId, id: draggableId };
+            this.destination = {
+                parentId: destination.droppableId,
+                id: draggableId,
+                index: destination.index
+            };
+            let afterId = "";
+            const idsList = this.ids.filter(item => item.id === destination.droppableId);
+            const index = destination.index - 1;
+            if (index >= 0) {
+                afterId = idsList[0].ids[index];
+            }
+            if (destination.droppableId === source.droppableId) {
+                this._docStore.moveAfter(draggableId, afterId);
+            }
+            else {
+                await this._docStore.move([draggableId], destination.droppableId);
+                if (afterId !== "") {
+                    this._docStore.moveAfter(draggableId, afterId);
+                }
+            }
         }
-        // reordering column
-        if (result.type === "COLUMN") {
-            if (destination.index === 0) {
-                this._docStore.moveAfter(draggableId, "");
+        /** 存储ids 放便拖拽后查找 afterId */
+        onIds(v) {
+            const index = this.ids.findIndex(i => i.id === v.id);
+            if (index == -1) {
+                this.ids.push({ id: v.id, ids: v.ids });
             }
             else {
-                const afterId = this.boardcolumns.length - 1 === destination.index
-                    ? this.boardcolumns[destination.index].id
-                    : this.boardcolumns[destination.index - 1].id;
-                this._docStore.moveAfter(draggableId, afterId);
+                this.ids[index] = { id: v.id, ids: v.ids };
+            }
+        }
+        /**
+         * document filters
+         * @return document filters
+         */
+        get filters() {
+            let filters = [];
+            if (this.filterName) {
+                filters.push({ c: "Name", o: "contains", v1: this.filterName, l: "And" });
             }
-            const [removed] = this.boardcolumns.splice(source.index, 1);
-            this.boardcolumns.splice(destination.index, 0, removed);
-            return;
+            filters = [...filters, ...this.filterList];
+            return filters;
         }
-        const linkId = draggableId.split("/")[0];
-        const rightId = draggableId.split("/")[1];
-        this._docStore.moveLinks(destination.droppableId, source.droppableId, [{ Type: "Association", RightId: rightId, Position: destination.index }], [linkId]);
-        this.source = { id: source.droppableId, linkId: linkId };
-        this.destination = {
-            id: destination.droppableId,
-            rightId: rightId,
-            linkId: linkId,
-            index: destination.index
-        };
     }
-}
-__decorate([
-    observable
-], State.prototype, "boardcolumns", void 0);
-__decorate([
-    observable
-], State.prototype, "timeout", void 0);
-__decorate([
-    observable
-], State.prototype, "name", void 0);
-__decorate([
-    observable
-], State.prototype, "reload", void 0);
-__decorate([
-    observable
-], State.prototype, "addLoading", void 0);
-__decorate([
-    observable
-], State.prototype, "addBoardColumnAble", void 0);
-__decorate([
-    observable
-], State.prototype, "source", void 0);
-__decorate([
-    observable
-], State.prototype, "destination", void 0);
-__decorate([
-    observable
-], State.prototype, "colorList", void 0);
-__decorate([
-    action
-], State.prototype, "onSave", void 0);
-__decorate([
-    action
-], State.prototype, "onDragEnd", null);
+    __decorate([
+        observable
+    ], State.prototype, "boardcolumns", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "ids", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "timeout", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "name", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "reload", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "addLoading", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "addBoardColumnAble", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "source", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "destination", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "colorList", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "filterName", void 0);
+    __decorate([
+        observable
+    ], State.prototype, "filterList", void 0);
+    __decorate([
+        action
+    ], State.prototype, "onSave", void 0);
+    __decorate([
+        action
+    ], State.prototype, "onDragEnd", null);
+    __decorate([
+        action
+    ], State.prototype, "onIds", null);
+    __decorate([
+        computed
+    ], State.prototype, "filters", null);
+    return State;
+})();
+export { State };
 //# sourceMappingURL=state.js.map