[optimize] static-filter layout

Hiram-Wong · Feb 7, 2025 · 0829adc · 0829adc
1 parent bd1c87d
commit 0829adc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/renderer/src/locales/lang/en_US/pages/lab.ts b/src/renderer/src/locales/lang/en_US/pages/lab.ts
@@ -163,9 +163,9 @@ export default {
       excludeKeys: 'ExcludeKeys',
       try: 'Try',
       ctry: 'ClassTry',
-      br: 'batchResults「ClassTry」',
-      tf: 'currentFilter',
-      ms: 'createMatchsList',
+      br: 'CombinationResults',
+      tf: 'CurrentFilter',
+      ms: 'CreateFilter',
       reg: 'Reg',
       plot: 'Plot',
       area: 'Area',

diff --git a/src/renderer/src/locales/lang/zh_CN/pages/lab.ts b/src/renderer/src/locales/lang/zh_CN/pages/lab.ts
@@ -143,10 +143,10 @@ export default {
       filterInfo: '详细',
       excludeKeys: '键移除',
       try: '执行',
-      ctry: '大类执行',
-      br: '批量结果「大类执行后」',
-      tf: '当前过滤',
-      ms: '生成正则列表',
+      ctry: '分类执行',
+      br: '组合结果',
+      tf: '当前筛选',
+      ms: '生成筛选列表',
       reg: '正则',
       plot: '剧情',
       area: '地区',

diff --git a/src/renderer/src/pages/lab/components/staticFilter/index.vue b/src/renderer/src/pages/lab/components/staticFilter/index.vue
@@ -14,7 +14,7 @@
       <div class="left">
         <div class="edit">
           <div class="code-op">
-            <div class="code-op-item">
+            <div class="code-op-item card">
               <reqHtml class="item source" v-model:data="reqFormData" @source="htmlSourceEvent"/>
             </div>
             <div class="code-op-item card">
@@ -30,10 +30,6 @@
                 :placeholder="$t('pages.lab.staticFilter.placeholder.linkTip')" class="input w-100%" />
               <t-button block @click="actionClass">{{ $t('pages.lab.staticFilter.rule.ctry') }}</t-button>
             </div>
-            <div class="code-op-item card">
-              <t-button block :loading="active.batchFetchLoading" @click="batchResults">{{
-                $t('pages.lab.staticFilter.rule.br') }}</t-button>
-            </div>
             <div class="code-op-item card">
               <t-textarea v-model="form.filter" :label="$t('pages.lab.staticFilter.rule.filter')"
                 :placeholder="$t('pages.lab.staticFilter.placeholder.filterTip')" class="input w-100%"
@@ -51,6 +47,9 @@
                 :placeholder="$t('pages.lab.staticFilter.rule.reg')" class="input w-100%" />
               <t-button block @click="actionFilter">{{ $t('pages.lab.staticFilter.rule.tf') }}</t-button>
             </div>
+            <div class="code-op-item card">
+              <t-button block :loading="active.batchFetchLoading" @click="batchResults">{{ $t('pages.lab.staticFilter.rule.br') }}</t-button>
+            </div>
           </div>
         </div>
       </div>
@@ -174,15 +173,16 @@ const demoConfEvent = () => {
   reqFormData.value.url = "https://www.dianying101.xyz/index.php/vod/show/id/1.html";
   form.value.class_parse = String.raw`.myui-header__menu li.hidden-sm;a&&Text;a&&href;/type/id/(\d+).html`;
   form.value.reurl = "https://www.dianying101.xyz/index.php/vod/show/id/fyclass.html";
-  form.value.cate_exclude = "更新|热搜榜";
+  form.value.cate_exclude = "首页|更新|热搜榜";
   form.value.filter = "body&&.myui-screen__list";
   form.value.filterInfo = ";.text-muted&&Text;body&&a;a&&Text;a&&href";
   form.value.matchs = {
-    剧情: 'show(.*?)/id',
-    地区: 'show(.*?)/id',
-    语言: '(/lang.*?)\.html@@',
     年份: '(/year.*?)\.html@@',
+    语言: '(/lang.*?)\.html@@',
     字母: '(/letter.*?)\.html@@',
+    类型: '',
+    剧情: 'show(.*?)/id',
+    地区: 'show(.*?)/id',
     排序: '(/by.*?)/id'
   };
 };