From f97daebba423903654f01b47b9b1dad449360619 Mon Sep 17 00:00:00 2001
From: wormtql <584130248@qq.com>
Date: Sun, 15 May 2022 22:57:17 +0800
Subject: [PATCH] A lot of trivial things

---
 .browserslistrc                                          | 5 +++++
 .../target_functions/anemo/jean_default.rs               | 2 +-
 .../target_functions/electro/keqing_default.rs           | 7 ++++---
 package.json                                             | 9 ++-------
 src/assets/_gen_tf.js                                    | 2 +-
 src/components/select/SelectCharacter.vue                | 6 ++++--
 src/pages/MainPage/MainPage.vue                          | 4 ++++
 src/pages/MainPage/SideBar.vue                           | 9 +++++++++
 8 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 .browserslistrc

diff --git a/.browserslistrc b/.browserslistrc
new file mode 100644
index 00000000..aec22225
--- /dev/null
+++ b/.browserslistrc
@@ -0,0 +1,5 @@
+> 1%
+last 2 versions
+not dead
+not ie 11
+chrome > 58
diff --git a/mona/src/target_functions/target_functions/anemo/jean_default.rs b/mona/src/target_functions/target_functions/anemo/jean_default.rs
index c86099f0..6383c7c2 100644
--- a/mona/src/target_functions/target_functions/anemo/jean_default.rs
+++ b/mona/src/target_functions/target_functions/anemo/jean_default.rs
@@ -58,7 +58,7 @@ impl TargetFunctionMetaTrait for JeanDefaultTargetFunction {
         ItemConfig {
             name: "recharge_demand",
             title: ItemConfig::DEFAULT_RECHARGE_TITLE,
-            config: ItemConfigType::Float { min: 0.0, max: 1.0, default: 1.6 }
+            config: ItemConfigType::Float { min: 1.0, max: 3.0, default: 1.0 }
         }
     ]);
 
diff --git a/mona/src/target_functions/target_functions/electro/keqing_default.rs b/mona/src/target_functions/target_functions/electro/keqing_default.rs
index 254defa7..428cc0d4 100644
--- a/mona/src/target_functions/target_functions/electro/keqing_default.rs
+++ b/mona/src/target_functions/target_functions/electro/keqing_default.rs
@@ -103,9 +103,10 @@ impl TargetFunction for KeqingDefaultTargetFunction {
         let dmg_q = Keqing::damage::<SimpleDamageBuilder>(&context, S::Q2, &config).normal.expectation;
         let dmg_charged = Keqing::damage::<SimpleDamageBuilder>(&context, S::Charged11, &config).normal.expectation;
 
-        let recharge = attribute.get_value(AttributeName::Recharge);
-        let r = recharge.min(1.4);
+        // let recharge = attribute.get_value(AttributeName::Recharge);
+        // let r = recharge.min(1.4);
 
-        r * dmg_q * 19.53 * 0.2 + dmg_charged * 2.094 * 0.8
+        // r * dmg_q * 19.53 * 0.2 + dmg_charged * 2.094 * 0.8
+        dmg_q * 19.53 * 0.2 + dmg_charged * 2.094 * 0.8
     }
 }
diff --git a/package.json b/package.json
index 7b8a26fb..2ac2b1c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "genshin_artifacts",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "private": true,
   "scripts": {
     "serve": "cross-env ENV_FILE=.env.development.yaml vue-cli-service serve",
@@ -77,10 +77,5 @@
       "parser": "babel-eslint"
     },
     "rules": {}
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
+  }
 }
diff --git a/src/assets/_gen_tf.js b/src/assets/_gen_tf.js
index 5272a8a6..9c69d32f 100644
--- a/src/assets/_gen_tf.js
+++ b/src/assets/_gen_tf.js
@@ -706,7 +706,7 @@ export default {
             
             {"default":0.5,"max":1.0,"min":0.0,"name":"damage_weight","title":"治疗-伤害比重（0：纯治疗，1：纯伤害）","type":"float"},
             
-            {"default":1.6,"max":1.0,"min":0.0,"name":"recharge_demand","title":"充能需求","type":"float"},
+            {"default":1.0,"max":3.0,"min":1.0,"name":"recharge_demand","title":"充能需求","type":"float"},
             
         ],
     },
diff --git a/src/components/select/SelectCharacter.vue b/src/components/select/SelectCharacter.vue
index 82089cef..7871b497 100644
--- a/src/components/select/SelectCharacter.vue
+++ b/src/components/select/SelectCharacter.vue
@@ -32,8 +32,10 @@ import qualityColors from "@const/quality_colors";
 export default {
     name: "SelectCharacter",
     props: ["value"],
-    created() {
-        this.characterByElement = characterByElement;
+    data() {
+        return {
+            characterByElement
+        }
     },
     methods: {
         element2Chs(element) {
diff --git a/src/pages/MainPage/MainPage.vue b/src/pages/MainPage/MainPage.vue
index b4668d24..01487776 100644
--- a/src/pages/MainPage/MainPage.vue
+++ b/src/pages/MainPage/MainPage.vue
@@ -68,6 +68,10 @@ export default {
 <style scoped lang="scss">
 $contentPadding: 24px;
 
+.main {
+    //background-color: #faf6ff;
+}
+
 @media only screen and (min-width: 992px) {
     .root-div {
         display: flex;
diff --git a/src/pages/MainPage/SideBar.vue b/src/pages/MainPage/SideBar.vue
index 60e7b6f8..47952785 100644
--- a/src/pages/MainPage/SideBar.vue
+++ b/src/pages/MainPage/SideBar.vue
@@ -90,6 +90,15 @@ export default {
         doRoute: {
             type: Boolean,
             default: true,
+        },
+        enableMinimize: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            minimized: false,
         }
     },
     methods: {