Merge branch 'agile' of https://github.com/iapt-platform/mint into agile

dashboard/src/components/anthology/EditableTocTree.tsx

@@ -26,6 +26,7 @@ import { fullUrl, randomString } from "../../utils";
 interface IWidget {
   anthologyId?: string;
   studioName?: string;
+  myStudioName?: string;
   anthology?: IAnthologyDataResponse;
   onSelect?: Function;
 }
@@ -33,6 +34,7 @@ const EditableTocTreeWidget = ({
   anthologyId,
   anthology,
   studioName,
+  myStudioName,
   onSelect,
 }: IWidget) => {
   const [tocData, setTocData] = useState<ListNodeData[]>([]);
@@ -105,7 +107,7 @@ const EditableTocTreeWidget = ({
         addOnArticle={addArticle}
         addFileButton={
           <ArticleListModal
-            studioName={studioName}
+            studioName={myStudioName}
             trigger={<Button icon={<FolderOpenOutlined />}>添加</Button>}
             multiple={false}
             onSelect={(id: string, title: string) => {

dashboard/src/components/article/EditableTree.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { useEffect } from "react";
-import { message, Tree } from "antd";
+import { message, Modal, Tree } from "antd";
 import type { DataNode, TreeProps } from "antd/es/tree";
 import { Key } from "antd/lib/table/interface";
 import { DeleteOutlined, SaveOutlined } from "@ant-design/icons";
@@ -159,7 +159,8 @@ const EditableTreeWidget = ({
   onTitleClick,
 }: IWidget) => {
   const intl = useIntl();
-
+  const [checkKeys, setCheckKeys] = useState<string[]>([]);
+  const [checkNodes, setCheckNodes] = useState<TreeNodeData[]>([]);
   const [gData, setGData] = useState<TreeNodeData[]>([]);
   const [listTreeData, setListTreeData] = useState<ListNodeData[]>();
   const [keys, setKeys] = useState<Key>("");
@@ -234,6 +235,12 @@ const EditableTreeWidget = ({
     setGData(data);
   }, [treeData]);
 
+  const onCheck: TreeProps["onCheck"] = (checkedKeys, info) => {
+    console.log("onCheck", checkedKeys, info);
+    setCheckKeys(checkedKeys as string[]);
+    setCheckNodes(info.checkedNodes as TreeNodeData[]);
+  };
+
   const onDragEnter: TreeProps["onDragEnter"] = (info) => {
     console.log(info);
     // expandedKeys 需要受控时设置
@@ -343,10 +350,11 @@ const EditableTreeWidget = ({
         <Button
           icon={<DeleteOutlined />}
           danger
+          disabled={checkKeys.length === 0}
           onClick={() => {
             const delTree = (node: TreeNodeData[]): boolean => {
               for (let index = 0; index < node.length; index++) {
-                if (node[index].key === keys) {
+                if (checkKeys.includes(node[index].key)) {
                   node.splice(index, 1);
                   return true;
                 } else {
@@ -358,13 +366,28 @@ const EditableTreeWidget = ({
               }
               return false;
             };
-            const tmp = [...gData];
-            const find = delTree(tmp);
 
-            console.log("delete", keys, find, tmp);
-            setGData(tmp);
-            const list = treeToList(tmp);
-            setListTreeData(list);
+            Modal.confirm({
+              title: "从文集移除下列文章吗？(文章不会被删除)",
+              content: (
+                <>
+                  {checkNodes.map((item, id) => (
+                    <div key={id}>
+                      {id + 1} {item.title}
+                    </div>
+                  ))}
+                </>
+              ),
+              onOk() {
+                const tmp = [...gData];
+                const find = delTree(tmp);
+
+                console.log("delete", keys, find, tmp);
+                setGData(tmp);
+                const list = treeToList(tmp);
+                setListTreeData(list);
+              },
+            });
           }}
         >
           {intl.formatMessage({ id: "buttons.remove" })}
@@ -383,13 +406,16 @@ const EditableTreeWidget = ({
       </Space>
       <Divider></Divider>
       <Tree
+        showLine
         showIcon
+        checkable
         rootClassName="draggable-tree"
         draggable
         blockNode
         selectable={false}
         onDragEnter={onDragEnter}
         onDrop={onDrop}
+        onCheck={onCheck}
         onSelect={(selectedKeys: Key[]) => {
           if (selectedKeys.length > 0) {
             setKeys(selectedKeys[0]);

dashboard/src/pages/studio/anthology/edit.tsx

@@ -67,6 +67,7 @@ const Widget = () => {
               children: (
                 <EditableTocTree
                   studioName={anthologyInfo?.studio.realName}
+                  myStudioName={studioname}
                   anthologyId={anthology_id}
                   anthology={anthologyInfo}
                 />

documents/development/LOCAL.md

@@ -12,13 +12,13 @@
 ## 镜像准备
 
 ```bash
-# 解压镜像
-cat palm-jammy.tar.xz.?? | tar jx
+# 合并镜像分卷
+cat palm-spring-TIMESTAMP.tar.?? > palm-spring-TIMESTAMP.tar
 # 导入镜像
-podman load -i palm-jammy-TIMESTAMP.tar
+podman load -i palm-spring-TIMESTAMP.tar
 # 启动容器
 cd ~/workspace
-./YOUR_PROJECT/docker/jammy/start.sh
+./YOUR_PROJECT/docker/spring/start.sh
 ```
 
 ## 容器准备
@@ -27,7 +27,7 @@ cd ~/workspace
 
   ```bash
   $ cd ~/workspace
-  $ ./mint/docker/jammy/start.sh
+  $ ./mint/docker/spring/start.sh
   > supervisord -c /etc/supervisor/supervisord.conf # 启动服务
   > /etc/redis/clusters-init.sh # 初始化redis集群
   ```