更新版本 v2.15.11

.github/workflows/build_docker_image.yml

@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: latest
+          version: 7
 
       - uses: actions/setup-node@v3
         with:
@@ -99,7 +99,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: latest
+          version: 7
       - uses: actions/setup-node@v3
         with:
           cache: 'pnpm'

back/api/cron.ts

@@ -152,6 +152,21 @@ export default (app: Router) => {
     }
   });
 
+  route.get(
+    '/detail',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        const cronService = Container.get(CronService);
+        const data = await cronService.find(req.query as any);
+        return res.send({ code: 200, data });
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
   route.post(
     '/',
     celebrate({

back/loaders/initData.ts

@@ -4,8 +4,7 @@ import { Container } from 'typedi';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-import groupBy from 'lodash/groupBy';
-import { DependenceModel } from '../data/dependence';
+import { DependenceModel, DependenceStatus } from '../data/dependence';
 import { Op } from 'sequelize';
 import config from '../config';
 import { CrontabViewModel, CronViewType } from '../data/cronView';
@@ -42,16 +41,14 @@ export default async () => {
     order: [['type', 'DESC']],
     raw: true,
   }).then(async (docs) => {
-    const groups = groupBy(docs, 'type');
-    const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
-    for (const key of keys) {
-      const group = groups[key];
-      const depIds = group.map((x) => x.id);
-      await dependenceService.reInstall(depIds as number[]);
-    }
+    await DependenceModel.update(
+      { status: DependenceStatus.installing, log: [] },
+      { where: { id: docs.map((x) => x.id!) } },
+    );
+    dependenceService.installDependenceOneByOne(docs);
   });
 
-  // 初始化时执行一次所有的ql repo 任务
+  // 初始化时执行一次所有的 ql repo 任务
   CrontabModel.findAll({
     where: {
       isDisabled: { [Op.ne]: 1 },

back/loaders/initTask.ts

@@ -11,7 +11,7 @@ export default async () => {
   const subscriptionService = Container.get(SubscriptionService);
 
   // 生成内置token
-  let tokenCommand = `ts-node-transpile-only ${config.rootPath}/back/token.ts`;
+  let tokenCommand = `tsx ${config.rootPath}/back/token.ts`;
   const tokenFile = `${config.rootPath}static/build/token.js`;
   if (await fileExist(tokenFile)) {
     tokenCommand = `node ${tokenFile}`;
@@ -41,6 +41,7 @@ export default async () => {
   }
 
   // 运行所有订阅
+  await subscriptionService.setSshConfig();
   const subs = await subscriptionService.list();
   for (const sub of subs) {
     subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);

back/services/cron.ts

@@ -41,8 +41,9 @@ export default class CronService {
   }
 
   public async update(payload: Crontab): Promise<Crontab> {
-    payload.saved = false;
-    const newDoc = await this.updateDb(payload);
+    const tab = new Crontab(payload);
+    tab.saved = false;
+    const newDoc = await this.updateDb(tab);
     await this.set_crontab();
     return newDoc;
   }
@@ -244,8 +245,11 @@ export default class CronService {
       const filterKeys: any = Object.keys(filterQuery);
       for (const key of filterKeys) {
         let q: any = {};
-        if (filterKeys[key]) {
-          q[key] = filterKeys[key];
+        if (!filterQuery[key]) continue;
+        if (key === 'status' && filterQuery[key].includes(2)) {
+          q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
+        } else {
+          q[key] = filterQuery[key];
         }
         query[Op.and].push(q);
       }
@@ -260,6 +264,15 @@ export default class CronService {
     }
   }
 
+  public async find({ log_path }: { log_path: string }): Promise<Crontab | null> {
+    try {
+      const result = await CrontabModel.findOne({ where: { log_path } });
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
+
   public async crontabs(params?: {
     searchValue: string;
     page: string;
@@ -428,7 +441,7 @@ export default class CronService {
     if (logFileExist) {
       return getFileContentByName(`${absolutePath}`);
     } else {
-      return '任务未运行或运行失败，请尝试手动运行';
+      return '任务未运行';
     }
   }
 
@@ -452,7 +465,6 @@ export default class CronService {
     } else {
       return [];
     }
-
   }
 
   private make_command(tab: Crontab) {

back/services/cronView.ts

@@ -31,7 +31,7 @@ export default class CronViewService {
   }
 
   public async update(payload: CrontabView): Promise<CrontabView> {
-    const newDoc = await this.updateDb(payload);
+    const newDoc = await this.updateDb(new CrontabView(payload));
     return newDoc;
   }
 

back/services/dependence.ts

@@ -99,7 +99,7 @@ export default class DependenceService {
     }
   }
 
-  private installDependenceOneByOne(
+  public installDependenceOneByOne(
     docs: Dependence[],
     isInstall: boolean = true,
     force: boolean = false,

back/services/env.ts

@@ -16,7 +16,7 @@ import { Op } from 'sequelize';
 
 @Service()
 export default class EnvService {
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public async create(payloads: Env[]): Promise<Env[]> {
     const envs = await this.envs();
@@ -49,7 +49,7 @@ export default class EnvService {
   }
 
   public async update(payload: Env): Promise<Env> {
-    const newDoc = await this.updateDb(payload);
+    const newDoc = await this.updateDb(new Env(payload));
     await this.set_envs();
     return newDoc;
   }
@@ -98,7 +98,11 @@ export default class EnvService {
 
   private async checkPosition(position: number, edge: number = 0) {
     const precisionPosition = parseFloat(position.toPrecision(16));
-    if (precisionPosition < minPosition || precisionPosition > maxPosition || Math.abs(precisionPosition - edge) < minPosition) {
+    if (
+      precisionPosition < minPosition ||
+      precisionPosition > maxPosition ||
+      Math.abs(precisionPosition - edge) < minPosition
+    ) {
       const envs = await this.envs();
       let position = initPosition;
       for (const env of envs) {

back/services/notify.ts

@@ -161,7 +161,7 @@ export default class NotificationService {
       this.title,
     )}/${encodeURIComponent(
       this.content,
-    )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}`;
     const res: any = await got
       .get(url, {
         ...this.gotOption,
@@ -484,11 +484,11 @@ export default class NotificationService {
 
     return {
       formatUrl: url
-        .replaceAll('$title', encodeURIComponent(this.title))
-        .replaceAll('$content', encodeURIComponent(this.content)),
+        ?.replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$content', encodeURIComponent(this.content)),
       formatBody: body
-        .replaceAll('$title', this.title)
-        .replaceAll('$content', this.content),
+        ?.replaceAll('$title', this.title)
+        ?.replaceAll('$content', this.content),
     };
   }
 }

back/services/subscription.ts

@@ -104,7 +104,7 @@ export default class SubscriptionService {
     }
   }
 
-  private async setSshConfig() {
+  public async setSshConfig() {
     const docs = await SubscriptionModel.findAll();
     this.sshKeyService.setSshConfig(docs);
   }

docker/Dockerfile

@@ -49,7 +49,7 @@ RUN set -x \
     && git config --global user.name "qinglong" \
     && git config --global http.postBuffer 524288000 \
     && npm install -g pnpm \
-    && pnpm add -g pm2 ts-node typescript tslib \
+    && pnpm add -g pm2 tsx \
     && rm -rf /root/.pnpm-store \
     && rm -rf /root/.local/share/pnpm/store \
     && rm -rf /root/.cache \

docker/docker-entrypoint.sh

@@ -9,9 +9,8 @@ export isFirstStartServer=true
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
-cp -fv $nginx_conf /etc/nginx/nginx.conf
-cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
-sed -i "s,QL_BASE_URL,${qlBaseUrl},g" /etc/nginx/conf.d/front.conf
+init_nginx
+
 pm2 l &>/dev/null
 
 patch_version &>/dev/null
@@ -42,13 +41,13 @@ echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
   echo -e "======================7. 启动bot========================\n"
-  nohup ql bot >$dir_log/bot.log 2>&1 &
+  nohup ql -l bot >$dir_log/bot.log 2>&1 &
   echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
   echo -e "======================8. 执行自定义脚本========================\n"
-  nohup ql extra >$dir_log/extra.log 2>&1 &
+  nohup ql -l extra >$dir_log/extra.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 

docker/front.conf

@@ -13,6 +13,7 @@ map $http_upgrade $connection_upgrade {
 
 server {
   listen 5700;
+  IPV6_CONFIG
   root /ql/static/dist;
   ssl_session_timeout 5m;
 

package.json

@@ -5,6 +5,7 @@
     "start:front": "max dev",
     "start:back": "nodemon",
     "start:public": "ts-node --transpile-only ./back/public.ts",
+    "start:schedule": "ts-node --transpile-only ./back/schedule.ts",
     "build:front": "max build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
@@ -92,7 +93,7 @@
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "6.38.22",
-    "@monaco-editor/react": "4.4.6",
+    "@monaco-editor/react": "4.2.1",
     "@react-hook/resize-observer": "^1.2.6",
     "@sentry/react": "^7.12.1",
     "@types/body-parser": "^1.19.2",
@@ -115,10 +116,10 @@
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
     "@types/uuid": "^8.3.4",
-    "@umijs/max": "^4.0.42",
+    "@umijs/max": "^4.0.55",
     "@umijs/ssr-darkreader": "^4.9.45",
     "ansi-to-react": "^6.1.6",
-    "antd": "^4.24.7",
+    "antd": "^4.24.8",
     "antd-img-crop": "^4.2.3",
     "codemirror": "^5.65.2",
     "compression-webpack-plugin": "9.2.0",
@@ -142,10 +143,11 @@
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.6.0",
     "tslib": "^2.4.0",
+    "tsx": "^3.12.3",
     "typescript": "4.8.4",
     "umi-request": "^1.4.0",
     "vh-check": "^2.0.5",
-    "virtuallist-antd": "^0.7.6",
+    "virtualizedtableforantd4": "1.3.0",
     "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }

sample/notify.js

@@ -296,6 +296,16 @@ async function sendNotify(
 ) {
   //提供6种通知
   desp += author; //增加作者信息，防止被贩卖等
+
+  // 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔
+  let skipTitle = process.env.SKIP_PUSH_TITLE
+  if(skipTitle) {
+    if(skipTitle.split('\n').includes(text)) {
+      console.info(text + "在SKIP_PUSH_TITLE环境变量内，跳过推送！");
+      return
+    }
+  }
+
   await Promise.all([
     serverNotify(text, desp), //微信server酱
     pushPlusNotify(text, desp), //pushplus(推送加)
@@ -523,7 +533,7 @@ function BarkNotify(text, desp, params = {}) {
       const options = {
         url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
           desp,
-        )}?icon=${BARK_ICON}?sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
+        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
           params,
         )}`,
         headers: {

sample/notify.py

@@ -164,7 +164,8 @@ def dingding_bot(title: str, content: str) -> None:
 
     timestamp = str(round(time.time() * 1000))
     secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8")
-    string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET"))
+    string_to_sign = "{}\n{}".format(
+        timestamp, push_config.get("DD_BOT_SECRET"))
     string_to_sign_enc = string_to_sign.encode("utf-8")
     hmac_code = hmac.new(
         secret_enc, string_to_sign_enc, digestmod=hashlib.sha256
@@ -220,7 +221,7 @@ def go_cqhttp(title: str, content: str) -> None:
         print("go-cqhttp 推送失败！")
 
 
-def gotify(title:str,content:str)  -> None:
+def gotify(title: str, content: str) -> None:
     """
     使用 gotify 推送消息。
     """
@@ -230,8 +231,9 @@ def gotify(title:str,content:str)  -> None:
     print("gotify 服务启动")
 
     url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
-    data = {"title": title,"message": content,"priority": push_config.get("GOTIFY_PRIORITY")}
-    response = requests.post(url,data=data).json()
+    data = {"title": title, "message": content,
+            "priority": push_config.get("GOTIFY_PRIORITY")}
+    response = requests.post(url, data=data).json()
 
     if response.get("id"):
         print("gotify 推送成功！")
@@ -269,10 +271,10 @@ def serverJ(title: str, content: str) -> None:
     print("serverJ 服务启动")
 
     data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if push_config.get("PUSH_KEY").index("SCT") != -1:
+    if push_config.get("PUSH_KEY").find("SCT") != -1:
         url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
     else:
-        url = f'https://sc.ftqq.com/${push_config.get("PUSH_KEY")}.send'
+        url = f'https://sc.ftqq.com/{push_config.get("PUSH_KEY")}.send'
     response = requests.post(url, data=data).json()
 
     if response.get("errno") == 0 or response.get("code") == 0:
@@ -289,7 +291,8 @@ def pushdeer(title: str, content: str) -> None:
         print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
         return
     print("PushDeer 服务启动")
-    data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
+    data = {"text": title, "desp": content, "type": "markdown",
+            "pushkey": push_config.get("DEER_KEY")}
     url = 'https://api2.pushdeer.com/message/push'
     if push_config.get("DEER_URL"):
         url = push_config.get("DEER_URL")
@@ -320,7 +323,6 @@ def chat(title: str, content: str) -> None:
         print("Chat 推送失败！错误信息：", response)
 
 
-
 def pushplus_bot(title: str, content: str) -> None:
     """
     通过 push+ 推送消息。
@@ -348,7 +350,8 @@ def pushplus_bot(title: str, content: str) -> None:
 
         url_old = "http://pushplus.hxtrip.com/send"
         headers["Accept"] = "application/json"
-        response = requests.post(url=url_old, data=body, headers=headers).json()
+        response = requests.post(
+            url=url_old, data=body, headers=headers).json()
 
         if response["code"] == 200:
             print("PUSHPLUS(hxtrip) 推送成功！")
@@ -367,7 +370,8 @@ def qmsg_bot(title: str, content: str) -> None:
     print("qmsg 服务启动")
 
     url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}'
-    payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
+    payload = {
+        "msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
     response = requests.post(url=url, params=payload).json()
 
     if response["code"] == 0:
@@ -553,14 +557,14 @@ def aibotk(title: str, content: str) -> None:
         data = {
             "apiKey": push_config.get("AIBOTK_KEY"),
             "roomName": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n{title}\n{content}'}
         }
     else:
         url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
         data = {
             "apiKey": push_config.get("AIBOTK_KEY"),
             "name": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n${title}\n${content}' }
+            "message": {"type": 1, "content": f'【青龙快讯】\n\n{title}\n{content}'}
         }
     body = json.dumps(data).encode(encoding="utf-8")
     headers = {"Content-Type": "application/json"}
@@ -582,14 +586,19 @@ def smtp(title: str, content: str) -> None:
     print("SMTP 邮件 服务启动")
 
     message = MIMEText(content, 'plain', 'utf-8')
-    message['From'] = formataddr((Header(push_config.get("SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
-    message['To'] = formataddr((Header(push_config.get("SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
+    message['From'] = formataddr((Header(push_config.get(
+        "SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
+    message['To'] = formataddr((Header(push_config.get(
+        "SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
     message['Subject'] = Header(title, 'utf-8')
 
     try:
-        smtp_server = smtplib.SMTP_SSL(push_config.get("SMTP_SERVER")) if push_config.get("SMTP_SSL") == 'true' else smtplib.SMTP(push_config.get("SMTP_SERVER"))
-        smtp_server.login(push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD"))
-        smtp_server.sendmail(push_config.get("SMTP_EMAIL"), push_config.get("SMTP_EMAIL"), message.as_bytes())
+        smtp_server = smtplib.SMTP_SSL(push_config.get("SMTP_SERVER")) if push_config.get(
+            "SMTP_SSL") == 'true' else smtplib.SMTP(push_config.get("SMTP_SERVER"))
+        smtp_server.login(push_config.get("SMTP_EMAIL"),
+                          push_config.get("SMTP_PASSWORD"))
+        smtp_server.sendmail(push_config.get("SMTP_EMAIL"),
+                             push_config.get("SMTP_EMAIL"), message.as_bytes())
         smtp_server.close()
         print("SMTP 邮件 推送成功！")
     except Exception as e:
@@ -647,13 +656,21 @@ def send(title: str, content: str) -> None:
         print(f"{title} 推送内容为空！")
         return
 
+    # 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔
+    skipTitle = os.getenv("SKIP_PUSH_TITLE")
+    if skipTitle:
+        if (title in re.split("\n", skipTitle)):
+            print(f"{title} 在SKIP_PUSH_TITLE环境变量内，跳过推送！")
+            return
+
     hitokoto = push_config.get("HITOKOTO")
 
     text = one() if hitokoto else ""
     content += "\n\n" + text
 
     ts = [
-        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
+        threading.Thread(target=mode, args=(
+            title, content), name=mode.__name__)
         for mode in notify_function
     ]
     [t.start() for t in ts]

shell/api.sh

@@ -1,15 +1,24 @@
 #!/usr/bin/env bash
 
+create_token() {
+  local token_command="tsx ${dir_root}/back/token.ts"
+  local token_file="${dir_root}static/build/token.js"
+  if [[ -f $token_file ]]; then
+    token_command="node ${token_file}"
+  fi
+  token=$(eval "$token_command")
+}
+
 get_token() {
   if [[ -f $file_auth_token ]]; then
     token=$(cat $file_auth_token | jq -r .value)
-  else
-    local token_command="ts-node-transpile-only ${dir_root}/back/token.ts"
-    local token_file="${dir_root}static/build/token.js"
-    if [[ -f $token_file ]]; then
-      token_command="node ${token_file}"
+    local expiration=$(cat $file_auth_token | jq -r .expiration)
+    local currentTimeStamp=$(date +%s)
+    if [[ $currentTimeStamp -ge $expiration ]]; then
+      create_token
     fi
-    token=$(eval "$token_command")
+  else
+    create_token
   fi
 }
 
@@ -199,4 +208,27 @@ notify_api() {
   fi
 }
 
+find_cron_api() {
+  local params=$1
+  local currentTimeStamp=$(date +%s)
+  local api=$(
+    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
+      -H "Accept: application/json" \
+      -H "Authorization: Bearer $token" \
+      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
+      -H "Content-Type: application/json;charset=UTF-8" \
+      -H "Origin: http://0.0.0.0:5700" \
+      -H "Referer: http://0.0.0.0:5700/crontab" \
+      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
+      --compressed
+  )
+  data=$(echo "$api" | jq -r .data)
+  if [[ $data == 'null' ]]; then
+    echo -e ""
+  else
+    name=$(echo "$api" | jq -r .data.name)
+    echo -e "$name"
+  fi
+}
+
 get_token

shell/bot.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-
 if [[ -z ${BotRepoUrl} ]]; then
   url="https://github.com/SuMaiKaDe/bot.git"
   repo_path="${dir_repo}/dockerbot"

shell/check.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-. $dir_shell/api.sh
-
 reset_env() {
   echo -e "---> 1. 开始检测配置文件\n"
   fix_config
@@ -29,9 +25,7 @@ copy_dep() {
   echo -e "---> 通知文件复制完成\n"
 
   echo -e "---> 2. 复制nginx配置文件\n"
-  cp -fv $nginx_conf /etc/nginx/nginx.conf
-  cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_BASE_URL,${qlBaseUrl},g" /etc/nginx/conf.d/front.conf
+  init_nginx
   echo -e "---> 配置文件复制完成\n"
 }
 
@@ -70,9 +64,8 @@ check_pm2() {
   pm2_log
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/api/user?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:5600/api/system?t=$currentTimeStamp" \
       -H 'Accept: */*' \
-      -H "Authorization: Bearer $token" \
       -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36' \
       -H 'Referer: http://0.0.0.0:5700/crontab' \
       -H 'Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7' \

shell/otask.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-. $dir_shell/api.sh
-
 trap "single_hanle" 2 20 15 14
 single_hanle() {
   handle_task_after "$@"

shell/pub.sh

@@ -11,7 +11,7 @@ echo -e "提交master代码"
 git push
 
 echo -e "更新cdn文件"
-ts-node sample/tool.ts
+tsx sample/tool.ts
 
 string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"

shell/rmlog.sh

@@ -1,12 +1,8 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
-dir_shell=$QL_DIR/shell
-. $dir_shell/share.sh
-
 days=$1
 
-## 删除运行js脚本的旧日志
+## 删除运行脚本的旧日志
 remove_js_log() {
   local log_full_path_list=$(find $dir_log/ -name "*.log")
   local diff_time
@@ -18,7 +14,17 @@ remove_js_log() {
       else
         diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
       fi
-      [[ $diff_time -gt $((${days} * 86400)) ]] && rm -vf $log
+      if [[ $diff_time -gt $((${days} * 86400)) ]]; then
+        local log_path=$(echo "$log" | sed "s,${dir_log}/,,g")
+        local result=$(find_cron_api "log_path=$log_path")
+        echo -e "查询文件 $log_path"
+        if [[ -z $result ]]; then
+          echo -e "删除中~"
+          rm -vf $log
+        else
+          echo -e "正在被 $result 使用，跳过~"
+        fi
+      fi
     fi
   done
 }

shell/share.sh

@@ -330,8 +330,8 @@ git_pull_scripts() {
 
   set_proxy "$proxy"
   git fetch --all
+  git pull 1>/dev/null
   exit_status=$?
-  git pull &>/dev/null
   unset_proxy
 
   cd $dir_current
@@ -357,7 +357,7 @@ reset_romote_url() {
 
 reset_branch() {
   local branch="$1"
-  local part_cmd=""
+  local part_cmd="HEAD"
   if [[ $branch ]]; then
     part_cmd="origin/${branch}"
     git checkout -B "$branch" &>/dev/null
@@ -431,16 +431,17 @@ format_timestamp() {
 }
 
 patch_version() {
+  # 兼容pnpm@7
+  pnpm setup &>/dev/null
+  source ~/.bashrc
+
   if [[ $PipMirror ]]; then
     pip3 config set global.index-url $PipMirror
   fi
   if [[ $NpmMirror ]]; then
-    npm config set registry $NpmMirror
+    pnpm config set registry $NpmMirror
   fi
 
-  # 兼容pnpm@7
-  pnpm setup &>/dev/null
-  source ~/.bashrc
   pnpm install -g &>/dev/null
 
   if [[ -f "$dir_root/db/cookie.db" ]]; then
@@ -450,7 +451,7 @@ patch_version() {
     echo
   fi
 
-  pnpm add -g pm2 ts-node typescript tslib
+  pnpm add -g pm2 tsx
 
   git config --global pull.rebase false
 
@@ -481,6 +482,19 @@ patch_version() {
   fi
 }
 
+init_nginx() {
+  cp -fv $nginx_conf /etc/nginx/nginx.conf
+  cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
+  sed -i "s,QL_BASE_URL,${qlBaseUrl},g" /etc/nginx/conf.d/front.conf
+  
+  ipv6=$(ip a | grep inet6)
+  ipv6Str=""
+  if [[ $ipv6 ]]; then
+    ipv6Str="listen [::]:5700 ipv6only=on;"
+  fi
+  sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
+}
+
 init_env
 detect_termux
 detect_macos

shell/task.sh

@@ -15,7 +15,11 @@ define_program() {
   elif [[ $file_param == *.sh ]]; then
     which_program="bash"
   elif [[ $file_param == *.ts ]]; then
-    which_program="ts-node-transpile-only"
+    if ! type tsx &>/dev/null; then
+      which_program="ts-node-transpile-only"
+    else
+      which_program="tsx"
+    fi
   else
     which_program=""
   fi
@@ -57,7 +61,11 @@ handle_log_path() {
 
 format_params() {
   time_format="%Y-%m-%d %H:%M:%S"
-  mtime_format="%Y-%m-%d %H:%M:%S.%3N"
+  if [[ $is_macos -eq 1 ]]; then
+    mtime_format=$time_format
+  else
+    mtime_format="%Y-%m-%d %H:%M:%S.%3N"
+  fi
   timeoutCmd=""
   if type timeout &>/dev/null; then
     timeoutCmd="timeout --foreground -s 14 -k 10s $command_timeout_time "

shell/update.sh

@@ -152,28 +152,37 @@ update_raw() {
   local autoAddCron="$3"
   local autoDelCron="$4"
 
-  if [[ ! $autoAddCron ]];then
+  if [[ ! $autoAddCron ]]; then
     autoAddCron=${AutoAddCron}
   fi
-  if [[ ! $autoDelCron ]];then
+  if [[ ! $autoDelCron ]]; then
     autoDelCron=${AutoDelCron}
   fi
 
+  local proxyStr=""
+  if [[ $proxy ]]; then
+    if [[ $url == http:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy}\""
+    elif [[ $url == https:* ]]; then
+      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
+    fi
+  fi
+
   local raw_url="$url"
   local suffix="${raw_url##*.}"
   local raw_file_name="${uniq_path}.${suffix}"
   echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
 
-  wget -q --no-check-certificate -e "http_proxy=${proxy};https_proxy=${proxy}" -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
 
   if [[ $? -eq 0 ]]; then
     mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
     echo -e "下载 ${raw_file_name} 成功...\n"
+    cd $dir_raw
+    local filename="raw_${raw_file_name}"
+    local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* $filename" | perl -pe "s|.*ID=(.*) $cmd_task.* $filename\.*|\1|" | head -1 | awk -F " " '{print $1}')
+    cp -f $raw_file_name $dir_scripts/${filename}
     if [[ -z $cron_id ]] && [[ ${autoAddCron} == true ]]; then
-      cd $dir_raw
-      local filename="raw_${raw_file_name}"
-      local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* $filename" | perl -pe "s|.*ID=(.*) $cmd_task.* $filename\.*|\1|" | head -1 | awk -F " " '{print $1}')
-      cp -f $raw_file_name $dir_scripts/${filename}
       cron_line=$(
         perl -ne "{
                       print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
@@ -203,13 +212,10 @@ update_raw() {
 
 ## 调用用户自定义的extra.sh
 run_extra_shell() {
-  if [[ ${EnableExtraShell} == true ]]; then
-    if [[ -f $file_extra_shell ]]; then
-      echo -e "--------------------------------------------------------------\n"
-      . $file_extra_shell
-    else
-      echo -e "$file_extra_shell文件不存在，跳过执行...\n"
-    fi
+  if [[ -f $file_extra_shell ]]; then
+    . $file_extra_shell
+  else
+    echo -e "$file_extra_shell文件不存在，跳过执行...\n"
   fi
 }
 
@@ -229,10 +235,10 @@ usage() {
 
 ## 更新qinglong
 update_qinglong() {
-  local mirror="github"
-  local githubStatus=$(curl -s -m 2 -IL "https://github.com" | grep 200)
+  local mirror="gitee"
+  local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
   if [[ ! -z $githubStatus ]]; then
-    mirror="gitee"
+    mirror="github"
   fi
   echo -e "使用 ${mirror} 源更新...\n"
   export isFirstStartServer=false
@@ -300,11 +306,11 @@ diff_scripts() {
   local extensions="$6"
   local autoAddCron="$7"
   local autoDelCron="$8"
-  
-  if [[ ! $autoAddCron ]];then
+
+  if [[ ! $autoAddCron ]]; then
     autoAddCron=${AutoAddCron}
   fi
-  if [[ ! $autoDelCron ]];then
+  if [[ ! $autoDelCron ]]; then
     autoDelCron=${AutoDelCron}
   fi
 

src/components/vlist.tsx

@@ -0,0 +1,404 @@
+import React, {
+  useRef,
+  useEffect,
+  useContext,
+  createContext,
+  useReducer,
+  useState,
+  useMemo,
+} from 'react';
+import { throttle, isNumber, debounce } from 'lodash';
+
+const initialState = {
+  // 行高度
+  rowHeight: 0,
+  // 当前的scrollTop
+  curScrollTop: 0,
+  // 总行数
+  totalLen: 0,
+};
+
+function reducer(state, action) {
+  const { curScrollTop, totalLen, ifScrollTopClear, scrollTop } = action;
+
+  let stateScrollTop = state.curScrollTop;
+  switch (action.type) {
+    // 改变trs 即 改变渲染的列表trs
+    case 'changeTrs':
+      return {
+        ...state,
+        curScrollTop,
+      };
+    // 更改totalLen
+    case 'changeTotalLen':
+      if (totalLen === 0) {
+        stateScrollTop = 0;
+      }
+
+      return {
+        ...state,
+        totalLen,
+        curScrollTop: stateScrollTop,
+      };
+
+    case 'reset':
+      return {
+        ...state,
+        curScrollTop: ifScrollTopClear ? 0 : scrollTop ?? state.curScrollTop,
+      };
+    default:
+      throw new Error();
+  }
+}
+
+// ==============全局常量 ================== //
+const DEFAULT_VID = 'vtable';
+const vidMap = new Map();
+let preData = 0;
+
+// ===============context ============== //
+const ScrollContext = createContext({
+  dispatch: undefined,
+  renderLen: 1,
+  start: 0,
+  offsetStart: 0,
+  // =============
+  rowHeight: initialState.rowHeight,
+  totalLen: 0,
+  vid: DEFAULT_VID,
+});
+
+// =============组件 =================== //
+
+function VCell(props: any): JSX.Element {
+  const { children, ...restProps } = props;
+
+  return (
+    <td {...restProps}>
+      <div>{children[1]}</div>
+    </td>
+  );
+}
+
+function VRow(props: any, ref: any): JSX.Element {
+  const { rowHeight } = useContext(ScrollContext);
+
+  const { children, style, ...restProps } = props;
+
+  const trRef = useRef<HTMLTableRowElement>(null);
+
+  return (
+    <tr
+      {...restProps}
+      ref={Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef}
+      style={{
+        ...style,
+        height: rowHeight || 'auto',
+        boxSizing: 'border-box',
+      }}
+    >
+      {children}
+    </tr>
+  );
+}
+
+function VWrapper(props: any): JSX.Element {
+  const { children, ...restProps } = props;
+
+  const { renderLen, start, dispatch, vid, totalLen } =
+    useContext(ScrollContext);
+
+  const contents = useMemo(() => {
+    return children[1];
+  }, [children]);
+
+  const contentsLen = useMemo(() => {
+    return contents?.length ?? 0;
+  }, [contents]);
+
+  useEffect(() => {
+    if (totalLen !== contentsLen) {
+      dispatch({
+        type: 'changeTotalLen',
+        totalLen: contentsLen ?? 0,
+      });
+    }
+  }, [contentsLen, dispatch, vid, totalLen]);
+
+  let tempNode = null;
+  if (Array.isArray(contents) && contents.length) {
+    tempNode = [
+      children[0],
+      contents.slice(start, start + (renderLen ?? 1)).map((item) => {
+        if (Array.isArray(item)) {
+          // 兼容antd v4.3.5 --- rc-table 7.8.1及以下
+          return item[0];
+        }
+        // 处理antd ^v4.4.0  --- rc-table ^7.8.2
+        return item;
+      }),
+    ];
+  } else {
+    tempNode = children;
+  }
+
+  return <tbody {...restProps}>{tempNode}</tbody>;
+}
+
+function VTable(props: any, otherParams): JSX.Element {
+  const { style, children, ...rest } = props;
+  const { width, ...rest_style } = style;
+
+  const { vid, scrollY, resetScrollTopWhenDataChange, rowHeight, scrollTop } =
+    otherParams ?? {};
+
+  const [state, dispatch] = useReducer(reducer, {
+    ...initialState,
+    curScrollTop: scrollTop,
+    rowHeight,
+  });
+
+  const wrap_tableRef = useRef<HTMLDivElement>(null);
+  const tableRef = useRef<HTMLTableElement>(null);
+
+  const ifChangeRef = useRef(false);
+
+  // 数据的总条数
+  const [totalLen, setTotalLen] = useState<number>(
+    children[1]?.props?.data?.length ?? 0,
+  );
+
+  useEffect(() => {
+    setTotalLen(state.totalLen);
+  }, [state.totalLen]);
+
+  // 组件卸载的清除操作
+  useEffect(() => {
+    return () => {
+      vidMap.delete(vid);
+    };
+  }, [vid]);
+
+  // 数据变更
+  useEffect(() => {
+    ifChangeRef.current = true;
+    // console.log('数据变更')
+    if (isNumber(children[1]?.props?.data?.length)) {
+      dispatch({
+        type: 'changeTotalLen',
+        totalLen: children[1]?.props?.data?.length ?? 0,
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [children[1].props.data]);
+
+  // table总高度
+  const tableHeight = useMemo<string | number>(() => {
+    let temp: string | number = 'auto';
+
+    if (rowHeight && totalLen) {
+      temp = rowHeight * totalLen;
+    }
+    return temp;
+  }, [totalLen]);
+
+  // table的scrollY值
+  const [tableScrollY, setTableScrollY] = useState(0);
+
+  // tableScrollY 随scrollY / tableHeight 进行变更
+  useEffect(() => {
+    let temp = 0;
+
+    if (typeof scrollY === 'string') {
+      temp =
+        (wrap_tableRef.current?.parentNode as HTMLElement)?.offsetHeight ?? 0;
+    } else {
+      temp = scrollY;
+    }
+
+    // if (isNumber(tableHeight) && tableHeight < temp) {
+    //   temp = tableHeight;
+    // }
+
+    // 处理tableScrollY <= 0的情况
+    if (temp <= 0) {
+      temp = 0;
+    }
+
+    setTableScrollY(temp);
+  }, [scrollY, tableHeight]);
+
+  // 渲染的条数
+  const renderLen = useMemo<number>(() => {
+    let temp = 1;
+    if (rowHeight && totalLen && tableScrollY) {
+      if (tableScrollY <= 0) {
+        temp = 0;
+      } else {
+        const tempRenderLen = ((tableScrollY / rowHeight) | 0) + 10;
+        // console.log('tempRenderLen', tempRenderLen)
+        // temp = tempRenderLen > totalLen ? totalLen : tempRenderLen;
+        temp = tempRenderLen;
+      }
+    }
+
+    return temp;
+  }, [totalLen, tableScrollY]);
+
+  // 渲染中的第一条
+  let start = rowHeight ? (state.curScrollTop / rowHeight) | 0 : 0;
+
+  start = start < 5 ? 0 : start - 5 + 1;
+
+  // 偏移量
+  let offsetStart = state.curScrollTop % (rowHeight * 5);
+
+  if (start > 0) {
+    offsetStart = offsetStart % rowHeight;
+  }
+  // console.log(offsetStart)
+  // offsetStart= offsetStart%rowHeight
+  // 用来优化向上滚动出现的空白
+  if (state.curScrollTop && state.curScrollTop >= rowHeight * 5) {
+    // start -= 1
+    // if (offsetStart >= rowHeight) {
+    //   offsetStart +=
+    // } else {
+    offsetStart += rowHeight * 4;
+    // }
+  } else {
+    start = 0;
+  }
+
+  // console.log(state.curScrollTop, start, offsetStart)
+
+  // 数据变更 操作scrollTop
+  useEffect(() => {
+    const scrollNode = wrap_tableRef.current?.parentNode as HTMLElement;
+    if (ifChangeRef?.current) {
+      // console.log(scrollNode)
+      ifChangeRef.current = false;
+
+      if (resetScrollTopWhenDataChange) {
+        // 重置scrollTop
+        if (scrollNode) {
+          scrollNode.scrollTop = 0;
+        }
+
+        dispatch({ type: 'reset', ifScrollTopClear: true });
+      } else {
+        // console.log(preData)
+        // scrollNode.scrollTop = preData+53
+        // 不重置scrollTop 不清空curScrollTop
+        dispatch({ type: 'reset', ifScrollTopClear: false });
+      }
+    }
+
+    if (vidMap.has(vid)) {
+      vidMap.set(vid, {
+        ...vidMap.get(vid),
+        scrollNode,
+      });
+    }
+  }, [totalLen, resetScrollTopWhenDataChange, vid, children]);
+
+  useEffect(() => {
+    const throttleScroll = throttle((e) => {
+      const scrollTop: number = e?.target?.scrollTop ?? 0;
+      // const scrollHeight: number = e?.target?.scrollHeight ?? 0
+      // const clientHeight: number = e?.target?.clientHeight ?? 0
+      if (scrollTop) {
+        preData = scrollTop;
+      }
+      // 到底了 没有滚动条就不会触发reachEnd. 建议设置scrolly高度少点或者数据量多点.
+      // 若renderLen大于totalLen, 置空curScrollTop. => table paddingTop会置空.
+      dispatch({
+        type: 'changeTrs',
+        curScrollTop: renderLen <= totalLen ? scrollTop : 0,
+      });
+    }, 60);
+
+    const ref = wrap_tableRef?.current?.parentNode as HTMLElement;
+
+    if (ref) {
+      ref.addEventListener('scroll', throttleScroll, { passive: true });
+    }
+
+    return () => {
+      ref.removeEventListener('scroll', throttleScroll);
+    };
+  }, [renderLen, totalLen]);
+
+  return (
+    <div
+      className="virtuallist"
+      ref={wrap_tableRef}
+      style={{
+        width: '100%',
+        position: 'relative',
+        height: tableHeight,
+        boxSizing: 'border-box',
+        paddingTop: state.curScrollTop,
+      }}
+    >
+      <ScrollContext.Provider
+        value={{
+          dispatch,
+          start,
+          offsetStart,
+          renderLen,
+          totalLen,
+          vid,
+          rowHeight,
+        }}
+      >
+        <table
+          {...rest}
+          ref={tableRef}
+          style={{
+            ...rest_style,
+            width,
+            position: 'relative',
+            transform: `translateY(-${offsetStart}px)`,
+          }}
+        >
+          {children}
+        </table>
+      </ScrollContext.Provider>
+    </div>
+  );
+}
+
+// ================导出===================
+export function VList(props: {
+  height: number;
+  // 唯一标识
+  vid?: string;
+  rowHeight: number | string;
+  reset?: boolean;
+  scrollTop?: number | string;
+}): any {
+  const { vid = DEFAULT_VID, rowHeight, height, reset, scrollTop } = props;
+
+  const resetScrollTopWhenDataChange = reset ?? true;
+
+  if (!vidMap.has(vid)) {
+    vidMap.set(vid, { _id: vid });
+  }
+
+  return {
+    table: (p) =>
+      VTable(p, {
+        vid,
+        scrollY: height,
+        rowHeight,
+        resetScrollTopWhenDataChange,
+        scrollTop,
+      }),
+    body: {
+      wrapper: VWrapper,
+      row: VRow,
+      cell: VCell,
+    },
+  };
+}

src/hooks/useTableScrollHeight.ts

@@ -1,16 +1,19 @@
 import { MutableRefObject, useLayoutEffect, useState } from 'react';
-import useResizeObserver from '@react-hook/resize-observer'
+import useResizeObserver from '@react-hook/resize-observer';
 import { getTableScroll } from '@/utils';
 
-export default <T extends HTMLElement>(target: MutableRefObject<T>, extraHeight?: number) => {
-  const [height, setHeight] = useState<number>()
+export default <T extends HTMLElement>(
+  target: MutableRefObject<T>,
+  extraHeight?: number,
+) => {
+  const [height, setHeight] = useState<number>(0);
 
   useResizeObserver(target, (entry) => {
-    let _targe = entry.target as any
-    if (!_targe.classList.contains('ant-table-wrapper')) {
-      _targe = entry.target.querySelector('.ant-table-wrapper')
+    let _target = entry.target as any;
+    if (!_target.classList.contains('ant-table-wrapper')) {
+      _target = entry.target.querySelector('.ant-table-wrapper');
     }
-    setHeight(getTableScroll({ extraHeight, target: _targe as HTMLElement }))
-  })
-  return height
-}
+    setHeight(getTableScroll({ extraHeight, target: _target as HTMLElement }));
+  });
+  return height;
+};

src/layouts/index.less

@@ -9,6 +9,22 @@
     url('../assets/fonts/SourceCodePro-Regular.ttf') format('truetype');
 }
 
+body {
+  // 禁止手机页面下拉刷新
+  overflow: hidden;
+
+  // 禁止手机页面弹簧效果
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+
+#root {
+  height: 100vh;
+  height: calc(100vh - var(--vh-offset, 0px));
+  -webkit-overflow-scrolling: touch;
+}
+
 .ant-modal-body {
   max-height: calc(80vh - 110px);
   max-height: calc(80vh - var(--vh-offset, 110px));
@@ -350,6 +366,34 @@ pre {
   padding: 0 !important;
 }
 
-.virtuallist .ant-table-tbody > tr > td > div {
-  white-space: unset !important;
+.virtuallist {
+  .ant-table-tbody > tr > td > div {
+    white-space: unset !important;
+  }
+}
+
+.virtuallist .ant-table-tbody > tr > td > div {
+  box-sizing: border-box;
+  white-space: nowrap;
+  vertical-align: middle;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+}
+
+.virtuallist .ant-table-tbody > tr > td.ant-table-row-expand-icon-cell > div {
+  overflow: inherit;
+}
+
+.ant-table-bordered .virtuallist > table > .ant-table-tbody > tr > td {
+  border-right: 1px solid #f0f0f0;
+}
+
+.ant-table-column-title {
+  flex: unset;
+}
+
+.ant-table-column-sorters,
+.ant-table-filter-column {
+  justify-content: unset;
 }

src/pages/crontab/index.less

@@ -155,7 +155,7 @@
 .view-create-modal-sorts {
   display: flex;
 
-  .ant-space-item:nth-child(2) {
+  .ant-space-item:nth-child(1) {
     flex: 1;
   }
 }
@@ -177,6 +177,7 @@ tr.drop-over-upward td {
 .view-filters-container.active {
   .filter-item > div > .ant-form-item-control {
     margin-left: 40px;
+    width: calc(100% - 40px);
   }
 }
 
@@ -191,3 +192,9 @@ tr.drop-over-upward td {
     margin: -24px;
   }
 }
+
+.crontab-wrapper {
+  tbody .ant-table-cell {
+    height: 69px !important;
+  }
+}

src/pages/crontab/index.tsx

@@ -53,7 +53,7 @@ import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import { getCommandScript, parseCrontab } from '@/utils';
 import { ColumnProps } from 'antd/lib/table';
-import { VList } from 'virtuallist-antd';
+import { useVT } from 'virtualizedtableforantd4';
 
 const { Text, Paragraph } = Typography;
 const { Search } = Input;
@@ -107,7 +107,6 @@ const Crontab = () => {
       dataIndex: 'name',
       key: 'name',
       width: 150,
-      align: 'center' as const,
       render: (text: string, record: any) => (
         <>
           <a
@@ -163,14 +162,12 @@ const Crontab = () => {
       dataIndex: 'command',
       key: 'command',
       width: 300,
-      align: 'center' as const,
       render: (text, record) => {
         return (
           <Paragraph
             style={{
               wordBreak: 'break-all',
               marginBottom: 0,
-              textAlign: 'left',
             }}
             ellipsis={{ tooltip: text, rows: 2 }}
           >
@@ -193,14 +190,12 @@ const Crontab = () => {
       dataIndex: 'schedule',
       key: 'schedule',
       width: 110,
-      align: 'center' as const,
       sorter: {
         compare: (a, b) => a.schedule.localeCompare(b.schedule),
       },
     },
     {
       title: '最后运行时间',
-      align: 'center' as const,
       dataIndex: 'last_execution_time',
       key: 'last_execution_time',
       width: 150,
@@ -230,7 +225,6 @@ const Crontab = () => {
     },
     {
       title: '最后运行时长',
-      align: 'center' as const,
       width: 120,
       dataIndex: 'last_running_time',
       key: 'last_running_time',
@@ -247,7 +241,6 @@ const Crontab = () => {
     },
     {
       title: '下次运行时间',
-      align: 'center' as const,
       width: 150,
       sorter: {
         compare: (a: any, b: any) => {
@@ -267,7 +260,6 @@ const Crontab = () => {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
       width: 88,
       filters: [
         {
@@ -329,7 +321,6 @@ const Crontab = () => {
     {
       title: '操作',
       key: 'action',
-      align: 'center' as const,
       width: 100,
       render: (text, record, index) => {
         const isPc = !isPhone;
@@ -424,9 +415,9 @@ const Crontab = () => {
     }crons?searchValue=${searchText}&page=${page}&size=${size}&filters=${JSON.stringify(
       filters,
     )}`;
-    if (sorter && sorter.field) {
+    if (sorter && sorter.column && sorter.order) {
       url += `&sorter=${JSON.stringify({
-        field: sorter.field,
+        field: sorter.column.key,
         type: sorter.order === 'ascend' ? 'ASC' : 'DESC',
       })}`;
     }
@@ -921,12 +912,10 @@ const Crontab = () => {
     setViewConf(view ? view : null);
   };
 
-  const vComponents = useMemo(() => {
-    return VList({
-      height: tableScrollHeight!,
-      resetTopWhenDataChange: false,
-    });
-  }, [tableScrollHeight]);
+  const [vt] = useVT(
+    () => ({ scroll: { y: tableScrollHeight } }),
+    [tableScrollHeight],
+  );
 
   return (
     <PageContainer
@@ -1062,7 +1051,7 @@ const Crontab = () => {
           rowSelection={rowSelection}
           rowClassName={getRowClassName}
           onChange={onPageChange}
-          components={vComponents}
+          components={isPhone ? undefined : vt}
         />
       </div>
       <CronLogModal

src/pages/crontab/logModal.tsx

@@ -54,7 +54,7 @@ const CronLogModal = ({
             log &&
               !logEnded(log) &&
               !log.includes('重启面板') &&
-              !log.includes('任务未运行或运行失败，请尝试手动运行'),
+              !log.includes('任务未运行'),
           );
           setExecuting(hasNext);
           autoScroll();

src/pages/crontab/viewCreateModal.tsx

@@ -70,6 +70,7 @@ const ViewCreateModal = ({
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
   const [filterRelation, setFilterRelation] = useState<'and' | 'or'>('and');
+  const filtersValue = Form.useWatch('filters', form);
 
   const handleOk = async (values: any) => {
     setLoading(true);
@@ -126,7 +127,7 @@ const ViewCreateModal = ({
   };
 
   const typeElement = (
-    <Select>
+    <Select style={{ width: 80 }}>
       {SORTTYPES.map((x) => (
         <Select.Option key={x.name} value={x.value}>
           {x.name}
@@ -204,7 +205,7 @@ const ViewCreateModal = ({
                       position: 'absolute',
                       top: '50%',
                       translate: '-50% -50%',
-                      padding: '0 0 0 3px',
+                      padding: '0 3px',
                       cursor: 'pointer',
                     }}
                     onClick={() => {
@@ -221,9 +222,9 @@ const ViewCreateModal = ({
                 </div>
               )}
               <div>
-                {fields.map(({ key, name, ...restField }, index) => (
+                {fields.map(({ key, name, ...restField }) => (
                   <Form.Item
-                    label={index === 0 ? '筛选条件' : ''}
+                    label={name === 0 ? '筛选条件' : ''}
                     key={key}
                     style={{ marginBottom: 0 }}
                     required
@@ -232,9 +233,6 @@ const ViewCreateModal = ({
                     <Space
                       className="view-create-modal-filters"
                       align="baseline"
-                      style={
-                        fields.length > 1 ? { width: 'calc(100% - 40px)' } : {}
-                      }
                     >
                       <Form.Item
                         {...restField}
@@ -251,55 +249,18 @@ const ViewCreateModal = ({
                         {operationElement}
                       </Form.Item>
                       <Form.Item
-                        noStyle
-                        shouldUpdate={(prevValues, nextValues) => {
-                          const preOperation =
-                            EOperation[
-                              get(prevValues, ['filters', name, 'operation'])
-                            ];
-                          const nextOperation =
-                            EOperation[
-                              get(nextValues, ['filters', name, 'operation'])
-                            ];
-                          const flag = preOperation !== nextOperation;
-                          if (flag) {
-                            form.setFieldValue(
-                              ['filters', name, 'value'],
-                              nextOperation === 'select' ? [] : '',
-                            );
-                          }
-                          return flag;
-                        }}
+                        {...restField}
+                        name={[name, 'value']}
+                        rules={[{ required: true, message: '请输入内容' }]}
                       >
-                        {() => {
-                          const property = form.getFieldValue([
-                            'filters',
-                            index,
-                            'property',
-                          ]) as 'status';
-                          const operate = form.getFieldValue([
-                            'filters',
-                            name,
-                            'operation',
-                          ]);
-                          return (
-                            <Form.Item
-                              {...restField}
-                              name={[name, 'value']}
-                              rules={[
-                                { required: true, message: '请输入内容' },
-                              ]}
-                            >
-                              {EOperation[operate] === 'select' ? (
-                                statusElement(property)
-                              ) : (
-                                <Input placeholder="请输入内容" />
-                              )}
-                            </Form.Item>
-                          );
-                        }}
+                        {EOperation[filtersValue[name]['operation']] ===
+                        'select' ? (
+                          statusElement(filtersValue[name]['property'])
+                        ) : (
+                          <Input placeholder="请输入内容" />
+                        )}
                       </Form.Item>
-                      {index !== 0 && (
+                      {name !== 0 && (
                         <MinusCircleOutlined onClick={() => remove(name)} />
                       )}
                     </Space>
@@ -321,39 +282,77 @@ const ViewCreateModal = ({
         </Form.List>
         <Form.List name="sorts">
           {(fields, { add, remove }) => (
-            <>
-              {fields.map(({ key, name, ...restField }, index) => (
-                <Form.Item
-                  label={index === 0 ? '排序方式' : ''}
-                  key={key}
-                  style={{ marginBottom: 0 }}
+            <div
+              style={{ position: 'relative' }}
+              className={`view-filters-container ${
+                fields.length > 1 ? 'active' : ''
+              }`}
+            >
+              {fields.length > 1 && (
+                <div
+                  style={{
+                    position: 'absolute',
+                    width: 50,
+                    borderRadius: 10,
+                    border: '1px solid rgb(190, 220, 255)',
+                    borderRight: 'none',
+                    height: 56 * (fields.length - 1),
+                    top: 46,
+                    left: 15,
+                  }}
                 >
-                  <Space className="view-create-modal-sorts" align="baseline">
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'property']}
-                      rules={[{ required: true }]}
-                    >
-                      {propertyElement(PROPERTIES, { width: 240 })}
-                    </Form.Item>
-                    <Form.Item
-                      {...restField}
-                      name={[name, 'type']}
-                      rules={[{ required: true }]}
-                    >
-                      {typeElement}
-                    </Form.Item>
-                    <MinusCircleOutlined onClick={() => remove(name)} />
-                  </Space>
+                  <Button
+                    type="primary"
+                    size="small"
+                    style={{
+                      position: 'absolute',
+                      top: '50%',
+                      translate: '-50% -50%',
+                      padding: '0 3px',
+                      cursor: 'pointer',
+                    }}
+                  >
+                    <>
+                      <span>{ViewFilterRelation[filterRelation]}</span>
+                    </>
+                  </Button>
+                </div>
+              )}
+              <div>
+                {fields.map(({ key, name, ...restField }) => (
+                  <Form.Item
+                    label={name === 0 ? '排序方式' : ''}
+                    key={key}
+                    style={{ marginBottom: 0 }}
+                    className="filter-item"
+                  >
+                    <Space className="view-create-modal-sorts" align="baseline">
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'property']}
+                        rules={[{ required: true }]}
+                      >
+                        {propertyElement(PROPERTIES)}
+                      </Form.Item>
+                      <Form.Item
+                        {...restField}
+                        name={[name, 'type']}
+                        rules={[{ required: true }]}
+                      >
+                        {typeElement}
+                      </Form.Item>
+                      <MinusCircleOutlined onClick={() => remove(name)} />
+                    </Space>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <a onClick={() => add({ property: 'command', type: 'ASC' })}>
+                    <PlusOutlined />
+                    新增排序方式
+                  </a>
                 </Form.Item>
-              ))}
-              <Form.Item>
-                <a onClick={() => add({ property: 'command', type: 'ASC' })}>
-                  <PlusOutlined />
-                  新增排序方式
-                </a>
-              </Form.Item>
-            </>
+              </div>
+            </div>
           )}
         </Form.List>
       </Form>

src/pages/crontab/viewManageModal.tsx

@@ -80,23 +80,17 @@ const ViewManageModal = ({
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      align: 'center' as const,
-      render: (text) => (
-        <div style={{ textAlign: 'left', paddingLeft: 30 }}>{text}</div>
-      ),
     },
     {
       title: '类型',
       dataIndex: 'type',
       key: 'type',
-      align: 'center' as const,
       render: (v) => (v === 1 ? '系统' : '个人'),
     },
     {
       title: '显示',
       key: 'isDisabled',
       dataIndex: 'isDisabled',
-      align: 'center' as const,
       width: 100,
       render: (text: string, record: any, index: number) => {
         return (
@@ -111,7 +105,6 @@ const ViewManageModal = ({
       title: '操作',
       key: 'action',
       width: 100,
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         return record.type !== 1 ? (
           <Space size="middle">

src/pages/dependence/index.tsx

@@ -32,7 +32,6 @@ import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 
-
 const { Text } = Typography;
 const { Search } = Input;
 
@@ -57,7 +56,6 @@ const Dependence = () => {
   const columns: any = [
     {
       title: '序号',
-      align: 'center' as const,
       width: 50,
       render: (text: string, record: any, index: number) => {
         return <span style={{ cursor: 'text' }}>{index + 1} </span>;
@@ -67,13 +65,11 @@ const Dependence = () => {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      align: 'center' as const,
     },
     {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         return (
           <Space size="middle" style={{ cursor: 'text' }}>
@@ -91,13 +87,11 @@ const Dependence = () => {
       title: '备注',
       dataIndex: 'remark',
       key: 'remark',
-      align: 'center' as const,
     },
     {
       title: '创建时间',
       key: 'timestamp',
       dataIndex: 'timestamp',
-      align: 'center' as const,
       render: (text: string, record: any) => {
         const language = navigator.language || navigator.languages[0];
         const time = record.createdAt || record.timestamp;
@@ -120,7 +114,6 @@ const Dependence = () => {
     {
       title: '操作',
       key: 'action',
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
@@ -169,7 +162,7 @@ const Dependence = () => {
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [type, setType] = useState('nodejs');
   const tableRef = useRef<any>();
-  const tableScrollHeight = useTableScrollHeight(tableRef, 59)
+  const tableScrollHeight = useTableScrollHeight(tableRef, 59);
 
   const getDependencies = () => {
     setLoading(true);

src/pages/env/index.tsx

@@ -39,7 +39,7 @@ import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import Copy from '../../components/copy';
-import { VList } from 'virtuallist-antd';
+import { useVT } from 'virtualizedtableforantd4';
 
 const { Text } = Typography;
 const { Search } = Input;
@@ -71,7 +71,6 @@ const Env = () => {
   const columns: any = [
     {
       title: '序号',
-      align: 'center' as const,
       width: 60,
       render: (text: string, record: any, index: number) => {
         return <span style={{ cursor: 'text' }}>{index + 1} </span>;
@@ -81,14 +80,12 @@ const Env = () => {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      align: 'center' as const,
       sorter: (a: any, b: any) => a.name.localeCompare(b.name),
     },
     {
       title: '值',
       dataIndex: 'value',
       key: 'value',
-      align: 'center' as const,
       width: '35%',
       render: (text: string, record: any) => {
         return (
@@ -105,7 +102,6 @@ const Env = () => {
       title: '备注',
       dataIndex: 'remarks',
       key: 'remarks',
-      align: 'center' as const,
       render: (text: string, record: any) => {
         return (
           <Tooltip title={text} placement="topLeft">
@@ -118,7 +114,6 @@ const Env = () => {
       title: '更新时间',
       dataIndex: 'timestamp',
       key: 'timestamp',
-      align: 'center' as const,
       width: 165,
       ellipsis: {
         showTitle: false,
@@ -153,7 +148,6 @@ const Env = () => {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
       width: 70,
       filters: [
         {
@@ -180,7 +174,6 @@ const Env = () => {
       title: '操作',
       key: 'action',
       width: 120,
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (
@@ -331,16 +324,13 @@ const Env = () => {
     getEnvs();
   };
 
-  const vComponents = useMemo(() => {
-    return VList({
-      height: tableScrollHeight!,
-      resetTopWhenDataChange: false,
-    });
-  }, [tableScrollHeight]);
+  const [vt, setVT] = useVT(
+    () => ({ scroll: { y: tableScrollHeight } }),
+    [tableScrollHeight],
+  );
 
-  const DragableBodyRow = (props: any) => {
+  const DragableBodyRow = React.forwardRef((props: any, ref) => {
     const { index, moveRow, className, style, ...restProps } = props;
-    const ref = useRef();
     const [{ isOver, dropClassName }, drop] = useDrop({
       accept: type,
       collect: (monitor) => {
@@ -368,31 +358,27 @@ const Env = () => {
 
     useEffect(() => {
       drop(drag(ref));
-    }, [drag, drop]);
+    }, [ref]);
 
-    const components = useMemo(() => vComponents.body.row, []);
+    return (
+      <tr
+        ref={ref}
+        className={`${className}${isOver ? dropClassName : ''}`}
+        style={{ cursor: 'move', ...style }}
+        {...restProps}
+      />
+    );
+  });
 
-    const tempProps = useMemo(() => {
-      return {
-        ref: ref,
-        className: `${className}${isOver ? dropClassName : ''}`,
-        style: { cursor: 'move', ...style },
-        ...restProps,
-      };
-    }, [className, dropClassName, restProps, style, isOver]);
-
-    return <> {components(tempProps, ref)} </>;
-  };
-
-  const components = useMemo(() => {
-    return {
-      ...vComponents,
-      body: {
-        ...vComponents.body,
-        row: DragableBodyRow,
-      },
-    };
-  }, [vComponents]);
+  useEffect(
+    () =>
+      setVT({
+        body: {
+          row: DragableBodyRow,
+        },
+      }),
+    [],
+  );
 
   const moveRow = useCallback(
     (dragIndex: number, hoverIndex: number) => {
@@ -542,69 +528,70 @@ const Env = () => {
         style: headerStyle,
       }}
     >
-      {selectedRowIds.length > 0 && (
-        <div style={{ marginBottom: 16 }}>
-          <Button
-            type="primary"
-            style={{ marginBottom: 5 }}
-            onClick={modifyName}
-          >
-            批量修改变量名称
-          </Button>
-          <Button
-            type="primary"
-            style={{ marginBottom: 5, marginLeft: 8 }}
-            onClick={delEnvs}
-          >
-            批量删除
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => exportEnvs()}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量导出
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateEnvs(0)}
-            style={{ marginLeft: 8, marginBottom: 5 }}
-          >
-            批量启用
-          </Button>
-          <Button
-            type="primary"
-            onClick={() => operateEnvs(1)}
-            style={{ marginLeft: 8, marginRight: 8 }}
-          >
-            批量禁用
-          </Button>
-          <span style={{ marginLeft: 8 }}>
-            已选择
-            <a>{selectedRowIds?.length}</a>项
-          </span>
-        </div>
-      )}
-      <DndProvider backend={HTML5Backend}>
-        <Table
-          ref={tableRef}
-          columns={columns}
-          rowSelection={rowSelection}
-          pagination={false}
-          dataSource={value}
-          rowKey="id"
-          size="middle"
-          scroll={{ x: 1000, y: tableScrollHeight }}
-          components={components}
-          loading={loading}
-          onRow={(record: any, index: number | undefined) => {
-            return {
-              index,
-              moveRow,
-            } as any;
-          }}
-        />
-      </DndProvider>
+      <div ref={tableRef}>
+        {selectedRowIds.length > 0 && (
+          <div style={{ marginBottom: 16 }}>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5 }}
+              onClick={modifyName}
+            >
+              批量修改变量名称
+            </Button>
+            <Button
+              type="primary"
+              style={{ marginBottom: 5, marginLeft: 8 }}
+              onClick={delEnvs}
+            >
+              批量删除
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => exportEnvs()}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量导出
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateEnvs(0)}
+              style={{ marginLeft: 8, marginBottom: 5 }}
+            >
+              批量启用
+            </Button>
+            <Button
+              type="primary"
+              onClick={() => operateEnvs(1)}
+              style={{ marginLeft: 8, marginRight: 8 }}
+            >
+              批量禁用
+            </Button>
+            <span style={{ marginLeft: 8 }}>
+              已选择
+              <a>{selectedRowIds?.length}</a>项
+            </span>
+          </div>
+        )}
+        <DndProvider backend={HTML5Backend}>
+          <Table
+            columns={columns}
+            rowSelection={rowSelection}
+            pagination={false}
+            dataSource={value}
+            rowKey="id"
+            size="middle"
+            scroll={{ x: 1000, y: tableScrollHeight }}
+            components={vt}
+            loading={loading}
+            onRow={(record: any, index: number | undefined) => {
+              return {
+                index,
+                moveRow,
+              } as any;
+            }}
+          />
+        </DndProvider>
+      </div>
       <EnvModal
         visible={isModalVisible}
         handleCancel={handleCancel}

src/pages/setting/checkUpdate.tsx

@@ -47,9 +47,8 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
           </div>
         </>
       ),
-      okText: '确认',
-      cancelText: '强制更新',
-      onCancel() {
+      okText: '强制更新',
+      onOk() {
         showUpdatingModal();
         request
           .put(`${config.apiPrefix}system/update`)
@@ -103,6 +102,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
       width: 600,
       maskClosable: false,
       closable: false,
+      keyboard: false,
       okButtonProps: { disabled: true },
       title: '更新中...',
       centered: true,

src/pages/setting/index.less

@@ -27,11 +27,3 @@
     }
   }
 }
-
-.ql-setting-container {
-  .ant-tabs-content-holder {
-    max-height: calc(100vh - 114px);
-    max-height: calc(100vh - var(--vh-offset, 114px));
-    overflow-y: auto;
-  }
-}

src/pages/setting/index.tsx

@@ -49,13 +49,11 @@ const Setting = () => {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      align: 'center' as const,
     },
     {
       title: 'Client ID',
       dataIndex: 'client_id',
       key: 'client_id',
-      align: 'center' as const,
       render: (text: string, record: any) => {
         return <Text copyable>{record.client_id}</Text>;
       },
@@ -64,7 +62,6 @@ const Setting = () => {
       title: 'Client Secret',
       dataIndex: 'client_secret',
       key: 'client_secret',
-      align: 'center' as const,
       render: (text: string, record: any) => {
         return <Text copyable={{ text: record.client_secret }}>*******</Text>;
       },
@@ -73,22 +70,16 @@ const Setting = () => {
       title: '权限',
       dataIndex: 'scopes',
       key: 'scopes',
-      align: 'center' as const,
       width: '40%',
       render: (text: string, record: any) => {
-        return (
-          <div style={{ textAlign: 'left' }}>
-            {record.scopes.map((scope: any) => {
-              return <Tag key={scope}>{(config.scopesMap as any)[scope]}</Tag>;
-            })}
-          </div>
-        );
+        return record.scopes.map((scope: any) => {
+          return <Tag key={scope}>{(config.scopesMap as any)[scope]}</Tag>;
+        });
       },
     },
     {
       title: '操作',
       key: 'action',
-      align: 'center' as const,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;
         return (

src/pages/setting/loginLog.tsx

@@ -18,7 +18,6 @@ enum LoginStatusColor {
 const columns = [
   {
     title: '序号',
-    align: 'center' as const,
     width: 50,
     render: (text: string, record: any, index: number) => {
       return index + 1;
@@ -28,7 +27,6 @@ const columns = [
     title: '登录时间',
     dataIndex: 'timestamp',
     key: 'timestamp',
-    align: 'center' as const,
     render: (text: string, record: any) => {
       return new Date(record.timestamp).toLocaleString();
     },
@@ -37,25 +35,23 @@ const columns = [
     title: '登录地址',
     dataIndex: 'address',
     key: 'address',
-    align: 'center' as const,
   },
   {
     title: '登录IP',
     dataIndex: 'ip',
     key: 'ip',
-    align: 'center' as const,
   },
   {
     title: '登录设备',
     dataIndex: 'platform',
     key: 'platform',
-    align: 'center' as const,
+    width: 80,
   },
   {
     title: '登录状态',
     dataIndex: 'status',
     key: 'status',
-    align: 'center' as const,
+    width: 80,
     render: (text: string, record: any) => {
       return (
         <Tag color={LoginStatusColor[record.status]} style={{ marginRight: 0 }}>
@@ -76,6 +72,7 @@ const LoginLog = ({ data }: any) => {
         rowKey="id"
         size="middle"
         scroll={{ x: 768 }}
+        sticky
       />
     </>
   );

src/pages/subscription/index.tsx

@@ -68,7 +68,6 @@ const Subscription = () => {
       dataIndex: 'name',
       key: 'name',
       width: 150,
-      align: 'center' as const,
       sorter: {
         compare: (a: any, b: any) => a.name.localeCompare(b.name),
         multiple: 2,
@@ -78,7 +77,6 @@ const Subscription = () => {
       title: '链接',
       dataIndex: 'url',
       key: 'url',
-      align: 'center' as const,
       sorter: {
         compare: (a: any, b: any) => a.name.localeCompare(b.name),
         multiple: 2,
@@ -89,7 +87,6 @@ const Subscription = () => {
             style={{
               wordBreak: 'break-all',
               marginBottom: 0,
-              textAlign: 'left',
             }}
             ellipsis={{ tooltip: text, rows: 2 }}
           >
@@ -103,7 +100,6 @@ const Subscription = () => {
       dataIndex: 'type',
       key: 'type',
       width: 130,
-      align: 'center' as const,
       render: (text: string, record: any) => {
         return (SubscriptionType as any)[record.type];
       },
@@ -113,7 +109,6 @@ const Subscription = () => {
       dataIndex: 'branch',
       key: 'branch',
       width: 130,
-      align: 'center' as const,
       render: (text: string, record: any) => {
         return record.branch || '-';
       },
@@ -121,7 +116,6 @@ const Subscription = () => {
     {
       title: '定时规则',
       width: 180,
-      align: 'center' as const,
       render: (text: string, record: any) => {
         if (record.schedule_type === 'interval') {
           const { type, value } = record.interval_schedule;
@@ -134,7 +128,6 @@ const Subscription = () => {
       title: '状态',
       key: 'status',
       dataIndex: 'status',
-      align: 'center' as const,
       width: 110,
       filters: [
         {
@@ -189,7 +182,6 @@ const Subscription = () => {
     {
       title: '操作',
       key: 'action',
-      align: 'center' as const,
       width: 130,
       render: (text: string, record: any, index: number) => {
         const isPc = !isPhone;

src/pages/subscription/modal.tsx

@@ -243,6 +243,7 @@ const SubscriptionModal = ({
     if (text.startsWith('ql ')) {
       e.preventDefault();
     }
+    onPaste(e);
   }, []);
 
   const formatParams = (sub) => {
@@ -294,9 +295,9 @@ const SubscriptionModal = ({
       confirmLoading={loading}
     >
       <Form form={form} name="form_in_modal" layout="vertical">
-        <Form.Item name="name" label="名称">
+        <Form.Item name="name" label="名称" rules={[{ required: true }]}>
           <Input
-            placeholder="支持拷贝ql repo/raw命令，粘贴导入"
+            placeholder="支持拷贝 ql repo/raw 命令，粘贴导入"
             onPaste={onNamePaste}
           />
         </Form.Item>

src/utils/index.ts

@@ -183,7 +183,7 @@ export function getTableScroll({
   extraHeight,
   target,
 }: { extraHeight?: number; target?: HTMLElement } = {}) {
-  if (typeof extraHeight == 'undefined') {
+  if (typeof extraHeight === 'undefined') {
     //  47 + 40 + 12
     extraHeight = 99;
   }

src/utils/init.ts

@@ -1,7 +1,6 @@
 import * as Sentry from '@sentry/react';
 import { Integrations } from '@sentry/tracing';
 import { loader } from '@monaco-editor/react';
-import * as monaco from 'monaco-editor';
 
 export function init(version: string) {
   // sentry监控 init
@@ -27,7 +26,9 @@ export function init(version: string) {
 
   // monaco 编辑器配置cdn和locale
   loader.config({
-    monaco,
+    paths: {
+      vs: 'https://cdn.staticfile.org/monaco-editor/0.33.0/min/vs',
+    },
     'vs/nls': {
       availableLanguages: {
         '*': 'zh-cn',

version.yaml

@@ -1,10 +1,9 @@
-version: 2.15.8
-changeLogLink: https://t.me/jiao_long/364
+version: 2.15.11
+changeLogLink: https://t.me/jiao_long/366
 changeLog: |
-  1. 修复环境变量位置重置逻辑
-  2. 日志名称增加毫秒
-  3. 修复添加文件类型订阅
-  4. 修复订阅生成 ssh 配置逻辑
-  5. 任务增加关联订阅
-  6. 修复订阅自动增加/删除任务参数默认值
-  7. 其他优化
+  1. 优化手机端操作，更丝滑
+  2. 修复 python Server酱 推送
+  3. 修改初始化依赖安装逻辑
+  4. 修复删除视图筛选条件
+  5. 修改定时任务和环境变量列表滚动
+  6. 其他优化