mirror of
https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git
synced 2025-08-02 07:10:38 +08:00
修复过滤器逻辑错误
This commit is contained in:
Peng-YM
parent
bd6d0849e4
commit
f007bc7c23
91
backend/.idea/workspace.xml
generated
91
backend/.idea/workspace.xml
generated
@ -21,7 +21,7 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="8b97a098-48b2-4e64-a9ef-522fe2d30b52" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web/src/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/config.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/sub-store.js" beforeDir="false" afterPath="$PROJECT_DIR$/sub-store.js" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -81,6 +81,7 @@
|
||||
<workItem from="1598778633049" duration="8638000" />
|
||||
<workItem from="1598795202964" duration="3825000" />
|
||||
<workItem from="1598806004385" duration="1065000" />
|
||||
<workItem from="1598846615232" duration="1305000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
@ -100,162 +101,178 @@
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state width="850" height="374" key="GridCell.Tab.0.bottom" timestamp="1598805773766">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.bottom" timestamp="1598847923491">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.0.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358068" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.bottom/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773766" />
|
||||
<state width="849" height="374" key="GridCell.Tab.0.bottom/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677769" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.bottom/53.23.1739.1097@53.23.1739.1097" timestamp="1598847099126" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.bottom/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923491" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.0.bottom/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615905" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598779162353" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390883" />
|
||||
<state width="840" height="374" key="GridCell.Tab.0.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598324500703" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.center" timestamp="1598805773766">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.center" timestamp="1598847923490">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.0.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358067" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.center/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773766" />
|
||||
<state width="849" height="374" key="GridCell.Tab.0.center/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677768" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.center/53.23.1739.1097@53.23.1739.1097" timestamp="1598847099125" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.center/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923490" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.0.center/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615903" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598779162352" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390882" />
|
||||
<state width="840" height="374" key="GridCell.Tab.0.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598324500702" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.left" timestamp="1598805773765">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.left" timestamp="1598847923490">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.0.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358067" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.left/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773765" />
|
||||
<state width="849" height="374" key="GridCell.Tab.0.left/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677768" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.left/53.23.1739.1097@53.23.1739.1097" timestamp="1598847099124" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.left/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923490" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.0.left/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615899" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598779162352" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390882" />
|
||||
<state width="840" height="374" key="GridCell.Tab.0.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598324500701" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.right" timestamp="1598805773766">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.right" timestamp="1598847923491">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.0.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358068" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.right/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773766" />
|
||||
<state width="849" height="374" key="GridCell.Tab.0.right/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677769" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.right/53.23.1739.1097@53.23.1739.1097" timestamp="1598847099125" />
|
||||
<state width="850" height="374" key="GridCell.Tab.0.right/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923491" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.0.right/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615904" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598779162352" />
|
||||
<state width="843" height="374" key="GridCell.Tab.0.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390883" />
|
||||
<state width="840" height="374" key="GridCell.Tab.0.right/70.23.1722.1097@70.23.1722.1097" timestamp="1598324500702" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.bottom" timestamp="1598805773767">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.bottom" timestamp="1598847923350">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.1.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.bottom/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773767" />
|
||||
<state width="849" height="374" key="GridCell.Tab.1.bottom/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677681" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.bottom/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923350" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.bottom/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615752" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987679" />
|
||||
<state width="843" height="374" key="GridCell.Tab.1.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390883" />
|
||||
<state width="840" height="374" key="GridCell.Tab.1.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292666" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.center" timestamp="1598805773766">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.center" timestamp="1598847923349">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.1.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.center/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773766" />
|
||||
<state width="849" height="374" key="GridCell.Tab.1.center/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677681" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.center/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923349" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.center/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615751" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987678" />
|
||||
<state width="843" height="374" key="GridCell.Tab.1.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390883" />
|
||||
<state width="840" height="374" key="GridCell.Tab.1.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292666" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.left" timestamp="1598805773766">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.left" timestamp="1598847923349">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.1.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.left/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773766" />
|
||||
<state width="849" height="374" key="GridCell.Tab.1.left/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677680" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.left/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923349" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.left/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615751" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987678" />
|
||||
<state width="843" height="374" key="GridCell.Tab.1.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390883" />
|
||||
<state width="840" height="374" key="GridCell.Tab.1.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292665" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.right" timestamp="1598805773766">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.right" timestamp="1598847923349">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.1.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.right/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773766" />
|
||||
<state width="849" height="374" key="GridCell.Tab.1.right/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677681" />
|
||||
<state width="850" height="374" key="GridCell.Tab.1.right/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923349" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.right/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615752" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.1.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987679" />
|
||||
<state width="843" height="374" key="GridCell.Tab.1.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390883" />
|
||||
<state width="840" height="374" key="GridCell.Tab.1.right/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292666" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.bottom" timestamp="1598805773767">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.bottom" timestamp="1598847923351">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.2.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358071" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.bottom/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773767" />
|
||||
<state width="849" height="374" key="GridCell.Tab.2.bottom/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677682" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.bottom/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923351" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.bottom/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615753" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987679" />
|
||||
<state width="843" height="374" key="GridCell.Tab.2.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390884" />
|
||||
<state width="840" height="374" key="GridCell.Tab.2.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292666" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.center" timestamp="1598805773767">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.center" timestamp="1598847923350">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.2.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358070" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.center/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773767" />
|
||||
<state width="849" height="374" key="GridCell.Tab.2.center/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677682" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.center/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923350" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.center/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615753" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987679" />
|
||||
<state width="843" height="374" key="GridCell.Tab.2.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390884" />
|
||||
<state width="840" height="374" key="GridCell.Tab.2.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292666" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.left" timestamp="1598805773767">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.left" timestamp="1598847923350">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.2.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358070" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.left/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773767" />
|
||||
<state width="849" height="374" key="GridCell.Tab.2.left/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677681" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.left/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923350" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.left/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615752" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987679" />
|
||||
<state width="843" height="374" key="GridCell.Tab.2.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390883" />
|
||||
<state width="840" height="374" key="GridCell.Tab.2.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292666" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.right" timestamp="1598805773767">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.right" timestamp="1598847923350">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.2.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358070" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.right/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773767" />
|
||||
<state width="849" height="374" key="GridCell.Tab.2.right/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677682" />
|
||||
<state width="850" height="374" key="GridCell.Tab.2.right/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923350" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.right/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615753" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.2.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987679" />
|
||||
<state width="843" height="374" key="GridCell.Tab.2.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390884" />
|
||||
<state width="840" height="374" key="GridCell.Tab.2.right/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292666" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.bottom" timestamp="1598805773768">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.bottom" timestamp="1598847923351">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.3.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358072" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.bottom/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773768" />
|
||||
<state width="849" height="374" key="GridCell.Tab.3.bottom/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677682" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.bottom/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923351" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.bottom/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615755" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987680" />
|
||||
<state width="843" height="374" key="GridCell.Tab.3.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390884" />
|
||||
<state width="840" height="374" key="GridCell.Tab.3.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292667" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.center" timestamp="1598805773768">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.center" timestamp="1598847923351">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.3.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358071" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.center/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773768" />
|
||||
<state width="849" height="374" key="GridCell.Tab.3.center/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677682" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.center/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923351" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.center/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615754" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987680" />
|
||||
<state width="843" height="374" key="GridCell.Tab.3.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390884" />
|
||||
<state width="840" height="374" key="GridCell.Tab.3.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292667" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.left" timestamp="1598805773767">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.left" timestamp="1598847923351">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.3.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358071" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.left/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773767" />
|
||||
<state width="849" height="374" key="GridCell.Tab.3.left/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677682" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.left/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923351" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.left/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615753" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987680" />
|
||||
<state width="843" height="374" key="GridCell.Tab.3.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390884" />
|
||||
<state width="840" height="374" key="GridCell.Tab.3.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598233292667" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.right" timestamp="1598805773768">
|
||||
<screen x="51" y="23" width="1741" height="1097" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.right" timestamp="1598847923351">
|
||||
<screen x="55" y="23" width="1737" height="1097" />
|
||||
</state>
|
||||
<state width="840" height="374" key="GridCell.Tab.3.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358072" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.right/51.23.1741.1097@51.23.1741.1097" timestamp="1598805773768" />
|
||||
<state width="849" height="374" key="GridCell.Tab.3.right/53.23.1739.1097@53.23.1739.1097" timestamp="1598791677682" />
|
||||
<state width="850" height="374" key="GridCell.Tab.3.right/55.23.1737.1097@55.23.1737.1097" timestamp="1598847923351" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.right/60.23.1732.1097@60.23.1732.1097" timestamp="1598446615754" />
|
||||
<state width="1709" height="374" key="GridCell.Tab.3.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598527987680" />
|
||||
<state width="843" height="374" key="GridCell.Tab.3.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598663390884" />
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
* 2. 节点过滤，重命名，排序等。
|
||||
* 3. 订阅拆分，组合。
|
||||
*/
|
||||
const $ = API("sub-store");
|
||||
const $ = API("sub-store", true);
|
||||
// Constants
|
||||
const SUBS_KEY = "subs";
|
||||
const COLLECTIONS_KEY = "collections";
|
||||
@ -1455,7 +1455,7 @@ function SortOperator(order = 'asc') {
|
||||
}
|
||||
|
||||
// sort by keywords
|
||||
function KeywordSortOperator(...keywords) {
|
||||
function KeywordSortOperator(keywords) {
|
||||
return {
|
||||
name: "Keyword Sort Operator",
|
||||
func: proxies => proxies.sort((a, b) => {
|
||||
@ -1482,7 +1482,7 @@ function getKeywordOrder(keywords, str) {
|
||||
|
||||
// rename by keywords
|
||||
// keywords: [{old: "old", now: "now"}]
|
||||
function KeywordRenameOperator(...keywords) {
|
||||
function KeywordRenameOperator(keywords) {
|
||||
return {
|
||||
name: "Keyword Rename Operator",
|
||||
func: proxies => {
|
||||
@ -1498,7 +1498,7 @@ function KeywordRenameOperator(...keywords) {
|
||||
|
||||
// rename by regex
|
||||
// keywords: [{expr: "string format regex", now: "now"}]
|
||||
function RegexRenameOperator(...regex) {
|
||||
function RegexRenameOperator(regex) {
|
||||
return {
|
||||
name: "Regex Rename Operator",
|
||||
func: proxies => {
|
||||
@ -1514,7 +1514,7 @@ function RegexRenameOperator(...regex) {
|
||||
|
||||
// delete keywords operator
|
||||
// keywords: ['a', 'b', 'c']
|
||||
function KeywordDeleteOperator(...keywords) {
|
||||
function KeywordDeleteOperator(keywords) {
|
||||
const keywords_ = keywords.map(k => {
|
||||
return {
|
||||
old: k,
|
||||
@ -1529,7 +1529,7 @@ function KeywordDeleteOperator(...keywords) {
|
||||
|
||||
// delete regex operator
|
||||
// regex: ['a', 'b', 'c']
|
||||
function RegexDeleteOperator(...regex) {
|
||||
function RegexDeleteOperator(regex) {
|
||||
const regex_ = regex.map(r => {
|
||||
return {
|
||||
expr: r,
|
||||
@ -1576,7 +1576,7 @@ function ScriptOperator(script) {
|
||||
|
||||
/**************************** Filters ***************************************/
|
||||
// filter by keywords
|
||||
function KeywordFilter(...keywords) {
|
||||
function KeywordFilter(keywords) {
|
||||
return {
|
||||
name: "Keyword Filter",
|
||||
func: (proxies) => {
|
||||
@ -1585,7 +1585,7 @@ function KeywordFilter(...keywords) {
|
||||
}
|
||||
}
|
||||
|
||||
function DiscardKeywordFilter(...keywords) {
|
||||
function DiscardKeywordFilter(keywords) {
|
||||
return {
|
||||
name: "Discard Keyword Filter",
|
||||
func: proxies => {
|
||||
@ -1597,7 +1597,7 @@ function DiscardKeywordFilter(...keywords) {
|
||||
|
||||
// filter useless proxies
|
||||
function UselessFilter() {
|
||||
const KEYWORDS = ["流量", "时间", "应急", "过期", "Bandwidth", "expire"];
|
||||
const KEYWORDS = ["网址", "流量", "时间", "应急", "过期", "Bandwidth", "expire"];
|
||||
return {
|
||||
name: "Useless Filter",
|
||||
func: DiscardKeywordFilter(KEYWORDS).func
|
||||
@ -1605,7 +1605,7 @@ function UselessFilter() {
|
||||
}
|
||||
|
||||
// filter by regions
|
||||
function RegionFilter(...regions) {
|
||||
function RegionFilter(regions) {
|
||||
const REGION_MAP = {
|
||||
"HK": "🇭🇰",
|
||||
"TW": "🇹🇼",
|
||||
@ -1628,7 +1628,7 @@ function RegionFilter(...regions) {
|
||||
}
|
||||
|
||||
// filter by regex
|
||||
function RegexFilter(...regex) {
|
||||
function RegexFilter(regex) {
|
||||
return {
|
||||
name: "Regex Filter",
|
||||
func: (proxies) => {
|
||||
@ -1637,7 +1637,7 @@ function RegexFilter(...regex) {
|
||||
}
|
||||
}
|
||||
|
||||
function DiscardRegexFilter(...regex) {
|
||||
function DiscardRegexFilter(regex) {
|
||||
return {
|
||||
name: "Discard Regex Filter",
|
||||
func: proxies => {
|
||||
@ -1648,7 +1648,7 @@ function DiscardRegexFilter(...regex) {
|
||||
}
|
||||
|
||||
// filter by proxy types
|
||||
function TypeFilter(...types) {
|
||||
function TypeFilter(types) {
|
||||
return {
|
||||
name: "Type Filter",
|
||||
func: (proxies) => {
|
||||
@ -2110,7 +2110,7 @@ function express(port = 3000) {
|
||||
const DEFAULT_HEADERS = {
|
||||
"Content-Type": "text/plain;charset=UTF-8",
|
||||
"Access-Control-Allow-Origin": "*",
|
||||
"Access-Control-Allow-Methods": "*",
|
||||
'Access-Control-Allow-Methods': 'POST,GET,OPTIONS,PATCH,PUT,DELETE',
|
||||
"Access-Control-Allow-Headers": "Origin, X-Requested-With, Content-Type, Accept"
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user