更新版本 v2.17.2

back/api/dependence.ts

@@ -134,4 +134,20 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.put(
+    '/cancel',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const dependenceService = Container.get(DependenceService);
+        await dependenceService.cancel(req.body);
+        return res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

back/config/util.ts

@@ -360,6 +360,31 @@ export function parseHeaders(headers: string) {
   return parsed;
 }
 
+function parseString(input: string): Record<string, string> {
+  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
+  const matches: Record<string, string> = {};
+
+  let match;
+  while ((match = regex.exec(input)) !== null) {
+    const [, key, value] = match;
+    const _key = key.trim();
+    if (!_key || matches[_key]) {
+      continue;
+    }
+
+    const _value = value.trim();
+
+    try {
+      const jsonValue = JSON.parse(_value);
+      matches[_key] = jsonValue;
+    } catch (error) {
+      matches[_key] = _value;
+    }
+  }
+
+  return matches;
+}
+
 export function parseBody(
   body: string,
   contentType:
@@ -372,28 +397,7 @@ export function parseBody(
     return body;
   }
 
-  const parsed: any = {};
-  let key;
-  let val;
-  let i;
-
-  body &&
-    body.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim();
-      val = line.substring(i + 1).trim();
-
-      if (!key || parsed[key]) {
-        return;
-      }
-
-      try {
-        const jsonValue = JSON.parse(val);
-        parsed[key] = jsonValue;
-      } catch (error) {
-        parsed[key] = val;
-      }
-    });
+  const parsed = parseString(body);
 
   switch (contentType) {
     case 'multipart/form-data':
@@ -435,8 +439,8 @@ export async function killTask(pid: number) {
   }
 }
 
-export async function getPid(name: string) {
-  const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
+export async function getPid(cmd: string) {
+  const taskCommand = `ps -eo pid,command | grep "${cmd}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
   const pid = await promiseExec(taskCommand);
   return pid ? Number(pid) : undefined;
 }

back/data/dependence.ts

@@ -32,6 +32,7 @@ export enum DependenceStatus {
   'removed',
   'removeFailed',
   'queued',
+  'cancelled',
 }
 
 export enum DependenceTypes {

back/services/dependence.ts

@@ -14,7 +14,12 @@ import {
 import { spawn } from 'cross-spawn';
 import SockService from './sock';
 import { FindOptions, Op } from 'sequelize';
-import { fileExist, promiseExecSuccess } from '../config/util';
+import {
+  fileExist,
+  getPid,
+  killTask,
+  promiseExecSuccess,
+} from '../config/util';
 import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
 
@@ -86,11 +91,21 @@ export default class DependenceService {
   }
 
   public async dependencies(
-    { searchValue, type }: { searchValue: string; type: string },
-    sort: any = { position: -1 },
+    {
+      searchValue,
+      type,
+      status,
+    }: { searchValue: string; type: string; status: string },
+    sort: any = [],
     query: any = {},
   ): Promise<Dependence[]> {
-    let condition = { ...query, type: DependenceTypes[type as any] };
+    let condition = {
+      ...query,
+      type: DependenceTypes[type as any],
+    };
+    if (status) {
+      condition.status = status.split(',').map(Number);
+    }
     if (searchValue) {
       const encodeText = encodeURI(searchValue);
       const reg = {
@@ -106,7 +121,7 @@ export default class DependenceService {
       };
     }
     try {
-      const result = await this.find(condition);
+      const result = await this.find(condition, sort);
       return result as any;
     } catch (error) {
       throw error;
@@ -134,6 +149,28 @@ export default class DependenceService {
     return docs;
   }
 
+  public async cancel(ids: number[]) {
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      taskLimit.removeQueuedDependency(doc);
+      const depInstallCommand = InstallDependenceCommandTypes[doc.type];
+      const depUnInstallCommand = unInstallDependenceCommandTypes[doc.type];
+      const installCmd = `${depInstallCommand} ${doc.name.trim()}`;
+      const unInstallCmd = `${depUnInstallCommand} ${doc.name.trim()}`;
+      const pids = await Promise.all([
+        getPid(installCmd),
+        getPid(unInstallCmd),
+      ]);
+      for (const pid of pids) {
+        pid && (await killTask(pid));
+      }
+    }
+    await DependenceModel.update(
+      { status: DependenceStatus.cancelled },
+      { where: { id: ids } },
+    );
+  }
+
   private async find(query: any, sort: any = []): Promise<Dependence[]> {
     const docs = await DependenceModel.findAll({
       where: { ...query },
@@ -168,8 +205,14 @@ export default class DependenceService {
     isInstall: boolean = true,
     force: boolean = false,
   ) {
-    return taskLimit.runOneByOne(() => {
+    return taskLimit.runDependeny(dependency, () => {
       return new Promise(async (resolve) => {
+        if (taskLimit.firstDependencyId !== dependency.id) {
+          return resolve(null);
+        }
+
+        taskLimit.removeQueuedDependency(dependency);
+
         const depIds = [dependency.id!];
         const status = isInstall
           ? DependenceStatus.installing
@@ -317,7 +360,17 @@ export default class DependenceService {
               ? DependenceStatus.installFailed
               : DependenceStatus.removeFailed;
           }
-          await DependenceModel.update({ status }, { where: { id: depIds } });
+          const docs = await DependenceModel.findAll({ where: { id: depIds } });
+          const _docIds = docs
+            .filter((x) => x.status !== DependenceStatus.cancelled)
+            .map((x) => x.id!);
+
+          if (_docIds.length > 0) {
+            await DependenceModel.update(
+              { status },
+              { where: { id: _docIds } },
+            );
+          }
 
           // 如果删除依赖成功或者强制删除
           if ((isSucceed || force) && !isInstall) {

back/shared/pLimit.ts

@@ -2,11 +2,19 @@ import PQueue, { QueueAddOptions } from 'p-queue-cjs';
 import os from 'os';
 import { AuthDataType, SystemModel } from '../data/system';
 import Logger from '../loaders/logger';
+import { Dependence } from '../data/dependence';
 
+interface IDependencyFn<T> {
+  (): Promise<T>;
+  dependency?: Dependence;
+}
 class TaskLimit {
-  private oneLimit = new PQueue({ concurrency: 1 });
+  private dependenyLimit = new PQueue({ concurrency: 1 });
+  private queuedDependencyIds = new Set<number>([]);
   private updateLogLimit = new PQueue({ concurrency: 1 });
-  private cronLimit = new PQueue({ concurrency: Math.max(os.cpus().length, 4) });
+  private cronLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
 
   get cronLimitActiveCount() {
     return this.cronLimit.pending;
@@ -16,6 +24,10 @@ class TaskLimit {
     return this.cronLimit.size;
   }
 
+  get firstDependencyId() {
+    return [...this.queuedDependencyIds.values()][0];
+  }
+
   constructor() {
     this.setCustomLimit();
     this.handleEvents();
@@ -26,21 +38,19 @@ class TaskLimit {
       Logger.info(
         `[schedule][任务加入队列] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
       );
-    })
+    });
     this.cronLimit.on('active', () => {
       Logger.info(
-        `[schedule][开始处理任务] 运行中任务数: ${this.cronLimitActiveCount + 1}, 等待中任务数: ${this.cronLimitPendingCount}`,
-      );
-    })
-    this.cronLimit.on('completed', (param) => {
-      Logger.info(
-        `[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`,
+        `[schedule][开始处理任务] 运行中任务数: ${
+          this.cronLimitActiveCount + 1
+        }, 等待中任务数: ${this.cronLimitPendingCount}`,
       );
     });
-    this.cronLimit.on('error', error => {
-      Logger.error(
-        `[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`,
-      );
+    this.cronLimit.on('completed', (param) => {
+      Logger.info(`[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`);
+    });
+    this.cronLimit.on('error', (error) => {
+      Logger.error(`[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`);
     });
     this.cronLimit.on('next', () => {
       Logger.info(
@@ -48,12 +58,16 @@ class TaskLimit {
       );
     });
     this.cronLimit.on('idle', () => {
-      Logger.info(
-        `[schedule][任务队列] 空闲中...`,
-      );
+      Logger.info(`[schedule][任务队列] 空闲中...`);
     });
   }
 
+  public removeQueuedDependency(dependency: Dependence) {
+    if (this.queuedDependencyIds.has(dependency.id!)) {
+      this.queuedDependencyIds.delete(dependency.id!);
+    }
+  }
+
   public async setCustomLimit(limit?: number) {
     if (limit) {
       this.cronLimit.concurrency = limit;
@@ -68,15 +82,27 @@ class TaskLimit {
     }
   }
 
-  public async runWithCronLimit<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+  public async runWithCronLimit<T>(
+    fn: () => Promise<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
     return this.cronLimit.add(fn, options);
   }
 
-  public runOneByOne<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
-    return this.oneLimit.add(fn, options);
+  public runDependeny<T>(
+    dependency: Dependence,
+    fn: IDependencyFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    this.queuedDependencyIds.add(dependency.id!);
+    fn.dependency = dependency;
+    return this.dependenyLimit.add(fn, options);
   }
 
-  public updateDepLog<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+  public updateDepLog<T>(
+    fn: () => Promise<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
     return this.updateLogLimit.add(fn, options);
   }
 }

docker/310.Dockerfile

@@ -53,7 +53,8 @@ RUN set -x \
   && rm -rf /root/.pnpm-store \
   && rm -rf /root/.local/share/pnpm/store \
   && rm -rf /root/.cache \
-  && rm -rf /root/.npm
+  && rm -rf /root/.npm \
+  && ulimit -c 0
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \

docker/Dockerfile

@@ -57,7 +57,8 @@ RUN set -x \
   && rm -rf /root/.pnpm-store \
   && rm -rf /root/.local/share/pnpm/store \
   && rm -rf /root/.cache \
-  && rm -rf /root/.npm
+  && rm -rf /root/.npm \
+  && ulimit -c 0
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \

sample/notify.js

@@ -816,7 +816,18 @@ function ChangeUserId(desp) {
   }
 }
 
-function qywxamNotify(text, desp) {
+async function qywxamNotify(text, desp) {
+  const MAX_LENGTH = 900;
+  if (desp.length > MAX_LENGTH) {
+    let d = desp.substr(0, MAX_LENGTH) + "\n==More==";
+    await do_qywxamNotify(text, d);
+    await qywxamNotify(text, desp.substr(MAX_LENGTH));
+  } else {
+    return await do_qywxamNotify(text,desp);
+  }
+}
+
+function do_qywxamNotify(text, desp) {
   return new Promise((resolve) => {
     if (QYWX_AM) {
       const QYWX_AM_AY = QYWX_AM.split(',');
@@ -1315,6 +1326,31 @@ function webhookNotify(text, desp) {
   });
 }
 
+function parseString(input) {
+  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
+  const matches = {};
+
+  let match;
+  while ((match = regex.exec(input)) !== null) {
+    const [, key, value] = match;
+    const _key = key.trim();
+    if (!_key || matches[_key]) {
+      continue;
+    }
+
+    const _value = value.trim();
+
+    try {
+      const jsonValue = JSON.parse(_value);
+      matches[_key] = jsonValue;
+    } catch (error) {
+      matches[_key] = _value;
+    }
+  }
+
+  return matches;
+}
+
 function parseHeaders(headers) {
   if (!headers) return {};
 
@@ -1344,28 +1380,7 @@ function parseBody(body, contentType) {
     return body;
   }
 
-  const parsed = {};
-  let key;
-  let val;
-  let i;
-
-  body &&
-    body.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim();
-      val = line.substring(i + 1).trim();
-
-      if (!key || parsed[key]) {
-        return;
-      }
-
-      try {
-        const jsonValue = JSON.parse(val);
-        parsed[key] = jsonValue;
-      } catch (error) {
-        parsed[key] = val;
-      }
-    });
+  const parsed = parseString(body);
 
   switch (contentType) {
     case 'multipart/form-data':

sample/notify.py

@@ -578,7 +578,9 @@ def aibotk(title: str, content: str) -> None:
         or not push_config.get("AIBOTK_TYPE")
         or not push_config.get("AIBOTK_NAME")
     ):
-        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
+        print(
+            "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送"
+        )
         return
     print("智能微秘书 服务启动")
 
@@ -748,29 +750,25 @@ def parse_headers(headers):
     return parsed
 
 
+def parse_string(input_string):
+    matches = {}
+    pattern = r'(\w+):\s*((?:(?!\n\w+:).)*)'
+    regex = re.compile(pattern)
+    for match in regex.finditer(input_string):
+        key, value = match.group(1).strip(), match.group(2).strip()
+        try:
+            json_value = json.loads(value)
+            matches[key] = json_value
+        except:
+            matches[key] = value
+    return matches
+
+
 def parse_body(body, content_type):
     if not body or content_type == "text/plain":
         return body
 
-    parsed = {}
-    lines = body.split("\n")
-
-    for line in lines:
-        i = line.find(":")
-        if i == -1:
-            continue
-
-        key = line[:i].strip()
-        val = line[i + 1 :].strip()
-
-        if not key or key in parsed:
-            continue
-
-        try:
-            json_value = json.loads(val)
-            parsed[key] = json_value
-        except:
-            parsed[key] = val
+    parsed = parse_string(input_string)
 
     if content_type == "application/x-www-form-urlencoded":
         data = urlencode(parsed, doseq=True)

src/components/iconfont.tsx

@@ -1,7 +1,7 @@
 import { createFromIconfontCN } from '@ant-design/icons';
 
 const IconFont = createFromIconfontCN({
-  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_ob5y15ewlyq.js'],
+  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_lc939gab1iq.js'],
 });
 
 export default IconFont;

src/locales/en-US.json

@@ -100,12 +100,14 @@
   "删除中": "Deleting",
   "已删除": "Deleted",
   "删除失败": "Deletion Failed",
+  "已取消": "Cancelled",
   "序号": "Number",
   "备注": "Remarks",
   "更新时间": "Update Time",
   "创建时间": "Creation Time",
   "确认删除依赖": "Confirm to delete the dependency",
   "确认重新安装": "Confirm to reinstall",
+  "确认取消安装": "Confirm to cancel install",
   "确认删除选中的依赖吗": "Confirm to delete the selected dependencies?",
   "确认重新安装选中的依赖吗": "Confirm to reinstall the selected dependencies?",
   "请输入名称": "Please enter a name",
@@ -394,6 +396,7 @@
   "系统": "System",
   "个人": "Personal",
   "重新安装": "Reinstall",
+  "取消安装": "Cancel Install",
   "强制删除": "Force Delete",
   "全部任务": "All Tasks",
   "关联订阅": "Associate Subscription",

src/locales/zh-CN.json

@@ -100,12 +100,14 @@
   "删除中": "删除中",
   "已删除": "已删除",
   "删除失败": "删除失败",
+  "已取消": "已取消",
   "序号": "序号",
   "备注": "备注",
   "更新时间": "更新时间",
   "创建时间": "创建时间",
   "确认删除依赖": "确认删除依赖",
   "确认重新安装": "确认重新安装",
+  "确认取消安装": "确认取消安装",
   "确认删除选中的依赖吗": "确认删除选中的依赖吗",
   "确认重新安装选中的依赖吗": "确认重新安装选中的依赖吗",
   "请输入名称": "请输入名称",
@@ -394,6 +396,7 @@
   "系统": "系统",
   "个人": "个人",
   "重新安装": "重新安装",
+  "取消安装": "取消安装",
   "强制删除": "强制删除",
   "全部任务": "全部任务",
   "关联订阅": "关联订阅",

src/pages/dependence/index.tsx

@@ -22,6 +22,7 @@ import {
   FileTextOutlined,
   CloseCircleOutlined,
   ClockCircleOutlined,
+  MinusCircleOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -36,20 +37,12 @@ import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import dayjs from 'dayjs';
 import WebSocketManager from '@/utils/websocket';
+import { DependenceStatus, Status } from './type';
+import IconFont from '@/components/iconfont';
 
 const { Text } = Typography;
 const { Search } = Input;
 
-enum Status {
-  '安装中',
-  '已安装',
-  '安装失败',
-  '删除中',
-  '已删除',
-  '删除失败',
-  '队列中',
-}
-
 enum StatusColor {
   'processing',
   'success',
@@ -85,6 +78,10 @@ const StatusMap: Record<number, { icon: React.ReactNode; color: string }> = {
     icon: <ClockCircleOutlined />,
     color: 'default',
   },
+  7: {
+    icon: <MinusCircleOutlined />,
+    color: 'default',
+  },
 };
 
 const Dependence = () => {
@@ -108,6 +105,40 @@ const Dependence = () => {
       key: 'status',
       width: 120,
       dataIndex: 'status',
+      filters: [
+        {
+          text: intl.get('队列中'),
+          value: DependenceStatus.queued,
+        },
+        {
+          text: intl.get('安装中'),
+          value: DependenceStatus.installing,
+        },
+        {
+          text: intl.get('已安装'),
+          value: DependenceStatus.installed,
+        },
+        {
+          text: intl.get('安装失败'),
+          value: DependenceStatus.installFailed,
+        },
+        {
+          text: intl.get('删除中'),
+          value: DependenceStatus.removing,
+        },
+        {
+          text: intl.get('已删除'),
+          value: DependenceStatus.removed,
+        },
+        {
+          text: intl.get('删除失败'),
+          value: DependenceStatus.removeFailed,
+        },
+        {
+          text: intl.get('已取消'),
+          value: DependenceStatus.cancelled,
+        },
+      ],
       render: (text: string, record: any, index: number) => {
         return (
           <Space size="middle" style={{ cursor: 'text' }}>
@@ -154,35 +185,46 @@ const Dependence = () => {
         const isPc = !isPhone;
         return (
           <Space size="middle">
-            <Tooltip title={isPc ? intl.get('日志') : ''}>
-              <a
-                onClick={() => {
-                  setLogDependence({ ...record, timestamp: Date.now() });
-                }}
-              >
-                <FileTextOutlined />
-              </a>
-            </Tooltip>
-            {record.status !== Status.安装中 &&
-              record.status !== Status.删除中 && (
-                <>
-                  <Tooltip title={isPc ? intl.get('重新安装') : ''}>
-                    <a onClick={() => reInstallDependence(record, index)}>
-                      <BugOutlined />
-                    </a>
-                  </Tooltip>
+            {![Status.队列中, Status.已取消].includes(record.status) && (
+              <Tooltip title={isPc ? intl.get('日志') : ''}>
+                <a
+                  onClick={() => {
+                    setLogDependence({ ...record, timestamp: Date.now() });
+                  }}
+                >
+                  <FileTextOutlined />
+                </a>
+              </Tooltip>
+            )}
+            {[Status.队列中, Status.安装中, Status.删除中].includes(
+              record.status,
+            ) ? (
+              <Tooltip title={isPc ? intl.get('取消安装') : ''}>
+                <a onClick={() => cancelDependence(record)}>
+                  <IconFont type="ql-icon-quxiaoanzhuang" />
+                </a>
+              </Tooltip>
+            ) : (
+              <>
+                <Tooltip title={isPc ? intl.get('重新安装') : ''}>
+                  <a onClick={() => reInstallDependence(record, index)}>
+                    <BugOutlined />
+                  </a>
+                </Tooltip>
+                {Status.已安装 === record.status && (
                   <Tooltip title={isPc ? intl.get('删除') : ''}>
                     <a onClick={() => deleteDependence(record, index)}>
                       <DeleteOutlined />
                     </a>
                   </Tooltip>
-                  <Tooltip title={isPc ? intl.get('强制删除') : ''}>
-                    <a onClick={() => deleteDependence(record, index, true)}>
-                      <DeleteFilled />
-                    </a>
-                  </Tooltip>
-                </>
-              )}
+                )}
+                <Tooltip title={isPc ? intl.get('强制删除') : ''}>
+                  <a onClick={() => deleteDependence(record, index, true)}>
+                    <DeleteFilled />
+                  </a>
+                </Tooltip>
+              </>
+            )}
           </Space>
         );
       },
@@ -200,11 +242,15 @@ const Dependence = () => {
   const tableRef = useRef<HTMLDivElement>(null);
   const tableScrollHeight = useTableScrollHeight(tableRef, 59);
 
-  const getDependencies = () => {
+  const getDependencies = (status?: number[]) => {
     setLoading(true);
     request
       .get(
-        `${config.apiPrefix}dependencies?searchValue=${searchText}&type=${type}`,
+        `${
+          config.apiPrefix
+        }dependencies?searchValue=${searchText}&type=${type}&status=${
+          status || ''
+        }`,
       )
       .then(({ code, data }) => {
         if (code === 200) {
@@ -289,6 +335,31 @@ const Dependence = () => {
     });
   };
 
+  const cancelDependence = (record: any) => {
+    Modal.confirm({
+      title: intl.get('确认取消安装'),
+      content: (
+        <>
+          {intl.get('确认取消安装')}{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          {intl.get('吗')}
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}dependencies/cancel`, [record.id])
+          .then(() => {
+            getDependencies();
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
   const handleCancel = (dependence?: any[]) => {
     setIsModalVisible(false);
     dependence && handleDependence(dependence);
@@ -420,7 +491,7 @@ const Dependence = () => {
             }
             return _result;
           });
-        }, 5000);
+        }, 300);
         return;
       }
     }
@@ -538,6 +609,9 @@ const Dependence = () => {
             size="middle"
             scroll={{ x: 768, y: tableScrollHeight }}
             loading={loading}
+            onChange={(pagination, filters) => {
+              getDependencies(filters?.status as number[]);
+            }}
           />
         </DndProvider>
       </div>

src/pages/dependence/logModal.tsx

@@ -10,6 +10,7 @@ import {
 import { PageLoading } from '@ant-design/pro-layout';
 import Ansi from 'ansi-to-react';
 import WebSocketManager from '@/utils/websocket';
+import { Status } from './type';
 
 const DependenceLogModal = ({
   dependence,
@@ -96,7 +97,11 @@ const DependenceLogModal = ({
 
   const handleMessage = (payload: any) => {
     const { message, references } = payload;
-    if (references.length > 0 && references.includes(dependence.id)) {
+    if (
+      references.length > 0 &&
+      references.includes(dependence.id) &&
+      [Status.删除中, Status.安装中].includes(dependence.status)
+    ) {
       if (message.includes('结束时间')) {
         setExecuting(false);
         setIsRemoveFailed(message.includes('删除失败'));
@@ -108,11 +113,13 @@ const DependenceLogModal = ({
   useEffect(() => {
     const ws = WebSocketManager.getInstance();
     ws.subscribe('installDependence', handleMessage);
+    ws.subscribe('uninstallDependence', handleMessage);
 
     return () => {
       ws.unsubscribe('installDependence', handleMessage);
+      ws.unsubscribe('uninstallDependence', handleMessage);
     };
-  }, []);
+  }, [dependence]);
 
   useEffect(() => {
     setIsPhone(document.body.clientWidth < 768);

src/pages/dependence/type.ts

@@ -0,0 +1,21 @@
+export enum DependenceStatus {
+  'installing',
+  'installed',
+  'installFailed',
+  'removing',
+  'removed',
+  'removeFailed',
+  'queued',
+  'cancelled',
+}
+
+export enum Status {
+  '安装中',
+  '已安装',
+  '安装失败',
+  '删除中',
+  '已删除',
+  '删除失败',
+  '队列中',
+  '已取消',
+}

src/pages/log/index.tsx

@@ -68,13 +68,13 @@ const Log = () => {
   };
 
   const onSelect = (value: any, node: any) => {
-    setCurrentNode(node);
-    setSelect(value);
-
     if (node.key === select || !value) {
       return;
     }
 
+    setCurrentNode(node);
+    setSelect(value);
+
     if (node.type === 'directory') {
       setValue(intl.get('请选择日志文件'));
       return;

src/pages/script/index.tsx

@@ -115,13 +115,13 @@ const Script = () => {
   };
 
   const onSelect = (value: any, node: any) => {
-    setSelect(node.key);
-    setCurrentNode(node);
-
     if (node.key === select || !value) {
       return;
     }
 
+    setSelect(node.key);
+    setCurrentNode(node);
+
     if (node.type === 'directory') {
       setValue(intl.get('请选择脚本文件'));
       return;

version.yaml

@@ -1,13 +1,7 @@
-version: 2.17.1
-changeLogLink: https://t.me/jiao_long/402
-publishTime: 2024-02-07 23:00
+version: 2.17.2
+changeLogLink: https://t.me/jiao_long/403
+publishTime: 2024-03-02 17:00
 changeLog: |
-  1. 系统设置增加重启
-  2. 修复 debian 系统内更新源代码分支错误
-  3. 修复启动时依赖配置未初始化
-  4. 修复未开启一言时多余空行, 通知渠道改发送前检查，感谢 https://github.com/Cp0204
-  5. Dockerfile 添加发布端口和数据卷 https://github.com/Akimio521
-  6. 修复有反向代理时脚本管理获取文件可能失败
-  7. 脚本管理重命名增加默认值，增加新建(mod+o)、删除快捷键(mod+d)
-  8. 修复对比工具保存文件
-  9. 其他 bug 修复
+  1. 依赖管理支持队列中依赖取消安装，支持状态筛选
+  2. 修复 webhook 通知 body 拆分逻辑
+  3. 企业微信有长度限制，超长的进行分段提交 https://github.com/pharaoh2012