自定义修改

Larvan2 · Jan 28, 2024 · 5b76143 · 5b76143
1 parent 43fae3a
commit 5b76143
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -17,14 +17,11 @@ jobs:
           node-version: '18.x'
           cache: pnpm
       - name: Install package and build
-        run: |
-          pnpm install --no-frozen-lockfile
-          pnpm build
+        run: npm install -g pnpm && pnpm i && pnpm build
       - name: Deploy
         uses: crazy-max/ghaction-github-pages@v2
         with:
           target_branch: gh-pages
           build_dir: public
-          fqdn: yacd.metacubex.one
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/src/components/ConnectionTable.module.scss b/src/components/ConnectionTable.module.scss
@@ -26,21 +26,24 @@
 }
 
 .break {
+  /* 上边下边 | 左边右边 */
+  max-width: 13em;
+  min-width: 9em;
   word-wrap: break-word;
-  word-break: break-all;
-  align-items: center;
-  text-align: left;
+  overflow-wrap: break-word;
 }
 
 .td {
   /* 上边下边 | 左边右边 */
   padding: 10px 5px;
   font-size: 0.9em;
-  // max-width: 14em;
-  min-width: 9em;
+  max-width: 18em;
+  min-width: 10em;
   cursor: default;
   text-align: left;
   vertical-align: middle;
+  overflow: hidden;
+  text-overflow: ellipsis;
   white-space: nowrap;
 
   &:hover {

diff --git a/src/components/ConnectionTable.scss b/src/components/ConnectionTable.scss
@@ -2,7 +2,6 @@
   td.ctrl {
     min-width: 4em;
     text-align: center;
-    display: flex;
     justify-content: center;
     align-items: center;
 
@@ -20,4 +19,8 @@
     min-width: 7em;
     text-align: center;
   }
+
+  td.process {
+    text-align: center;
+  }
 }
diff --git a/src/components/Connections.tsx b/src/components/Connections.tsx
@@ -174,16 +174,9 @@ function modifyChains(chains: string[]): string {
 
   if (chains.length === 1) {
     return chains[0];
+  } else {
+    return `${chains.pop()} :: ${chains[0]}`;
   }
-
-  //倒序
-  if (chains.length === 2) {
-    return `${chains[1]} -> ${chains[0]}`;
-  }
-
-  const first = chains.pop();
-  const last = chains.shift();
-  return `${first} -> ${last}`;
 }
 
 function renderTableOrPlaceholder(columns, hiddenColumns, conns: FormattedConn[]) {
@@ -203,6 +196,7 @@ function ConnQty({ qty }) {
 const sortDescFirst = true;
 const hiddenColumnsOrigin = ['id'];
 const columnsOrigin = [
+  { Header: 'c_ctrl', accessor: 'ctrl' },
   { accessor: 'id', show: false },
   { Header: 'c_type', accessor: 'type' },
   { Header: 'c_process', accessor: 'process' },
@@ -217,7 +211,6 @@ const columnsOrigin = [
   { Header: 'c_source', accessor: 'source' },
   { Header: 'c_destination_ip', accessor: 'destinationIP' },
   { Header: 'c_sni', accessor: 'sniffHost' },
-  { Header: 'c_ctrl', accessor: 'ctrl' },
 ];
 
 const savedHiddenColumns = localStorage.getItem('hiddenColumns');

diff --git a/src/components/proxies/ProxyLatency.module.scss b/src/components/proxies/ProxyLatency.module.scss
@@ -5,6 +5,6 @@
   color: #eee;
   font-size: 0.75em;
   @media (--breakpoint-not-small) {
-    font-size: 0.8em;
+    font-size: 1em;
   }
 }
diff --git a/src/components/proxies/ProxyProvider.tsx b/src/components/proxies/ProxyProvider.tsx
@@ -101,7 +101,7 @@ function ProxyProviderImpl({
           display: 'flex',
           alignItems: 'center',
           flexWrap: 'wrap',
-          justifyContent: 'space-between',
+          justifyContent: 'start',
         }}
       >
         <CollapsibleSectionHeader