更新依赖

package.json

@@ -15,10 +15,10 @@
     "dependencies": {
         "axios": "^1.6.8",
         "crypto-js": "^4.2.0",
-        "dayjs": "^1.11.10",
+        "dayjs": "^1.11.11",
         "echarts": "^5.5.0",
-        "element-plus": "^2.7.1",
-        "hc-vue3-ui": "^3.8.8",
+        "element-plus": "^2.7.2",
+        "hc-vue3-ui": "^3.8.9",
         "js-base64": "^3.7.7",
         "js-fast-way": "0.4.9",
         "js-md5": "^0.8.3",

public/plugins/element-plus/theme-chalk/src/autocomplete.scss

@@ -5,6 +5,11 @@
 @use 'common/var' as *;
 
 @include b(autocomplete) {
+  @include set-component-css-var('input', $input);
+}
+
+@include b(autocomplete) {
+  width: getCssVar('input-width');
   position: relative;
   display: inline-block;
 

public/plugins/element-plus/theme-chalk/src/col.scss

@@ -12,16 +12,12 @@
   }
 }
 
-.#{$namespace}-col-0 {
-  display: none;
-  // to avoid introducing !important syntax, redundant css rule is required due to selector priority.
-  @include when(guttered) {
-    display: none;
-  }
-}
-
 @for $i from 0 through 24 {
   .#{$namespace}-col-#{$i} {
+    display: if($i == 0, none, block);
+    @include when(guttered) {
+      display: if($i == 0, none, block);
+    }
     max-width: (math.div(1, 24) * $i * 100) * 1%;
     flex: 0 0 (math.div(1, 24) * $i * 100) * 1%;
   }

public/plugins/element-plus/theme-chalk/src/mixins/_col.scss

@@ -5,16 +5,11 @@
 
 @mixin col-size($size) {
   @include res($size) {
-    .#{$namespace}-col-#{$size}-0 {
-      display: none;
-      @include when(guttered) {
-        display: none;
-      }
-    }
     @for $i from 0 through 24 {
       .#{$namespace}-col-#{$size}-#{$i} {
-        @if $i != 0 {
-          display: block;
+        display: if($i == 0, none, block);
+        @include when(guttered) {
+          display: if($i == 0, none, block);
         }
         max-width: (math.div(1, 24) * $i * 100) * 1%;
         flex: 0 0 (math.div(1, 24) * $i * 100) * 1%;

src/views/data-fill/components/nodeTree/index.vue

@@ -39,12 +39,12 @@
 </template>
 
 <script setup>
-import { nextTick, onActivated, onMounted, ref, watch } from 'vue'
+import { nextTick, onMounted, ref, watch } from 'vue'
 import TreeNodeChildren from './children.vue'
 import wbsApi from '~api/data-fill/wbs'
 import { getArrValue, getObjValue, getRandom, isArrItem } from 'js-fast-way'
 import { useRoute } from 'vue-router'
-import { getStoreValue, setStoreValue } from '~src/utils/storage'
+import { getStoreValue } from '~src/utils/storage'
 
 //参数
 const props = defineProps({
@@ -107,7 +107,6 @@ watch(() => [
 
 //渲染完成
 onMounted(() => {
-    const useRoutes = useRoute()
     tableOwner.value = getStoreValue('tableOwner')
     classifyType.value = getStoreValue('classifyType')
     getTreeOneLevel()

src/views/data-fill/wbs.vue

@@ -134,7 +134,7 @@
                 </hc-tab-card>
             </div>
         </div>
-        <HcNewCard v-if="wbsTypeTabKey === 'map'" id-ref="wbs-node-tree-card-target">
+        <hc-new-card v-if="wbsTypeTabKey === 'map'" id-ref="wbs-node-tree-card-target">
             <template #header>
                 <HcTooltip keys="wbs_views_division_btn">
                     <el-button class="mr-10" hc-btn type="primary" @click="divisionClick">
@@ -167,7 +167,7 @@
                     <div class="dot-view blue">已填报-未上报</div>
                 </div>
             </template>
-            <HcDrawer v-model="isDrawer" action-ui="text-center" to-id="wbs-node-tree-card-target" @close="drawerClose">
+            <HcDrawer v-model="isDrawer" to-id="wbs-node-tree-card-target" @close="drawerClose">
                 <!-- 清表列表 -->
                 <el-scrollbar v-if="ListItemDatas.length > 0" ref="ListItemScrollRef">
                     <CollapseForm
@@ -244,13 +244,10 @@
                     </el-button>
                 </template>
             </HcDrawer>
-        </HcNewCard>
+        </hc-new-card>
 
         <!-- 查看图纸 -->
-        <hc-drag-modal
-            :is-show="drawingsShow" close-icon lefts="145" title="查看图纸" tops="100" ui="hc-image-preview-box"
-            widths="380px" @close="drawingsClose"
-        >
+        <hc-drag-modal :is-show="drawingsShow" close-icon lefts="145" title="查看图纸" tops="100" ui="hc-image-preview-box" widths="380px" @close="drawingsClose">
             <div class="hc-image-preview-view">
                 <!-- <el-image-viewer :url-list="[nodeDataInfo.fileUrl]" /> -->
                 <el-image :src="drawList" />

yarn.lock

@@ -226,11 +226,6 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.23.9":
-  version "7.23.9"
-  resolved "http://39.108.216.210:9000/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
-  integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
-
 "@babel/parser@^7.24.0", "@babel/parser@^7.24.1":
   version "7.24.1"
   resolved "http://39.108.216.210:9000/@babel/parser/-/parser-7.24.1.tgz#1e416d3627393fab1cb5b0f2f1796a100ae9133a"
@@ -942,17 +937,6 @@
   resolved "http://39.108.216.210:9000/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz"
   integrity sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==
 
-"@vue/compiler-core@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/compiler-core/-/compiler-core-3.4.21.tgz#868b7085378fc24e58c9aed14c8d62110a62be1a"
-  integrity sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==
-  dependencies:
-    "@babel/parser" "^7.23.9"
-    "@vue/shared" "3.4.21"
-    entities "^4.5.0"
-    estree-walker "^2.0.2"
-    source-map-js "^1.0.2"
-
 "@vue/compiler-core@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/compiler-core/-/compiler-core-3.4.25.tgz#691f59ee5014f6f2a2488fd4465f892e1e82f729"
@@ -964,14 +948,6 @@
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
 
-"@vue/compiler-dom@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz#0077c355e2008207283a5a87d510330d22546803"
-  integrity sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==
-  dependencies:
-    "@vue/compiler-core" "3.4.21"
-    "@vue/shared" "3.4.21"
-
 "@vue/compiler-dom@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.25.tgz#b367e0c84e11d9e9f70beabdd6f6b2277fde375f"
@@ -980,21 +956,6 @@
     "@vue/compiler-core" "3.4.25"
     "@vue/shared" "3.4.25"
 
-"@vue/compiler-sfc@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz#4af920dc31ab99e1ff5d152b5fe0ad12181145b2"
-  integrity sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==
-  dependencies:
-    "@babel/parser" "^7.23.9"
-    "@vue/compiler-core" "3.4.21"
-    "@vue/compiler-dom" "3.4.21"
-    "@vue/compiler-ssr" "3.4.21"
-    "@vue/shared" "3.4.21"
-    estree-walker "^2.0.2"
-    magic-string "^0.30.7"
-    postcss "^8.4.35"
-    source-map-js "^1.0.2"
-
 "@vue/compiler-sfc@3.4.25", "@vue/compiler-sfc@^3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.25.tgz#ceab148f81571c8b251e8a8b75a9972addf1db8b"
@@ -1010,14 +971,6 @@
     postcss "^8.4.38"
     source-map-js "^1.2.0"
 
-"@vue/compiler-ssr@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz#b84ae64fb9c265df21fc67f7624587673d324fef"
-  integrity sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==
-  dependencies:
-    "@vue/compiler-dom" "3.4.21"
-    "@vue/shared" "3.4.21"
-
 "@vue/compiler-ssr@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.25.tgz#7fdd540bfdf2d4a3d6cb107b7ba4c77228d36331"
@@ -1036,13 +989,6 @@
   resolved "http://39.108.216.210:9000/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
   integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==
 
-"@vue/reactivity@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/reactivity/-/reactivity-3.4.21.tgz#affd3415115b8ebf4927c8d2a0d6a24bccfa9f02"
-  integrity sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==
-  dependencies:
-    "@vue/shared" "3.4.21"
-
 "@vue/reactivity@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/reactivity/-/reactivity-3.4.25.tgz#74983b146e06ce3341d15382669350125375d36f"
@@ -1050,14 +996,6 @@
   dependencies:
     "@vue/shared" "3.4.25"
 
-"@vue/runtime-core@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.21.tgz#3749c3f024a64c4c27ecd75aea4ca35634db0062"
-  integrity sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==
-  dependencies:
-    "@vue/reactivity" "3.4.21"
-    "@vue/shared" "3.4.21"
-
 "@vue/runtime-core@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.25.tgz#c5545d469ae0827dc471a1376f97c6ace41081ec"
@@ -1066,15 +1004,6 @@
     "@vue/reactivity" "3.4.25"
     "@vue/shared" "3.4.25"
 
-"@vue/runtime-dom@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz#91f867ef64eff232cac45095ab28ebc93ac74588"
-  integrity sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==
-  dependencies:
-    "@vue/runtime-core" "3.4.21"
-    "@vue/shared" "3.4.21"
-    csstype "^3.1.3"
-
 "@vue/runtime-dom@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.25.tgz#9bc195e4860edcd0db4303cbba5a160922b963fd"
@@ -1084,14 +1013,6 @@
     "@vue/shared" "3.4.25"
     csstype "^3.1.3"
 
-"@vue/server-renderer@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.21.tgz#150751579d26661ee3ed26a28604667fa4222a97"
-  integrity sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==
-  dependencies:
-    "@vue/compiler-ssr" "3.4.21"
-    "@vue/shared" "3.4.21"
-
 "@vue/server-renderer@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.25.tgz#6cfc96ee631104951d5d6c09a8f1e7cef3ef3972"
@@ -1100,11 +1021,6 @@
     "@vue/compiler-ssr" "3.4.25"
     "@vue/shared" "3.4.25"
 
-"@vue/shared@3.4.21":
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.21.tgz#de526a9059d0a599f0b429af7037cd0c3ed7d5a1"
-  integrity sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==
-
 "@vue/shared@3.4.25":
   version "3.4.25"
   resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.25.tgz#243ba8543e7401751e0ca319f75a80f153edd273"
@@ -1529,7 +1445,12 @@ csstype@^3.1.3:
   resolved "http://39.108.216.210:9000/csstype/-/csstype-3.1.3.tgz"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-dayjs@^1.11.10, dayjs@^1.11.3:
+dayjs@^1.11.11:
+  version "1.11.11"
+  resolved "http://39.108.216.210:9000/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
+  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
+
+dayjs@^1.11.3:
   version "1.11.10"
   resolved "http://39.108.216.210:9000/dayjs/-/dayjs-1.11.10.tgz"
   integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
@@ -1598,10 +1519,10 @@ electron-to-chromium@^1.4.668:
   resolved "http://39.108.216.210:9000/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz#27577b88ccccc810e09b05093345cf1830f1bd65"
   integrity sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==
 
-element-plus@^2.7.1:
-  version "2.7.1"
-  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.7.1.tgz#c6d7328e9fa72bbb29751874b6e439b693c1bcd4"
-  integrity sha512-yk/vXFwJp0flMrd2kfcR0XlumhwtPjB19HJvwcf0n3DvRE7UK8LeSK14LVghSzk0TzPsFFElweMnZEEv7+MYuQ==
+element-plus@^2.7.2:
+  version "2.7.2"
+  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.7.2.tgz#a5361ab0de49ea1e3c91955e4da3916a358b3bcf"
+  integrity sha512-AdEzBU/A68iUleio0MkQ46JeU5SeQvFFd915GJFScJmUEo5AmYg3OQ4pVjcu+p3b3Nupg9MC5Wa4xjAiC51kUg==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.3.1"
@@ -2025,19 +1946,19 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^3.8.8:
-  version "3.8.8"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.8.8.tgz#8e4555a8ef6a69bddb01adb19d83007b94f59693"
-  integrity sha512-3NZ77xC8LY2Ze2lsqI1ZZI+7VKSLsKpBs/5Yd2sdTNpUP0LRL0yPp5BGt80TJsnK0d31yyHQ6+TmFG1sCrXEwA==
+hc-vue3-ui@^3.8.9:
+  version "3.8.9"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.8.9.tgz#14f0966a7a482f8d26325c8754d18d215522ae07"
+  integrity sha512-OX4BnxfMRtaw/V9psWQw7gZVUorUhPe/h32jTbwBJeIvI2eHUsJE5Pw2NmDZNvVU8UrAsbUPn14/7LlDzbqf2w==
   dependencies:
     axios "^1.6.8"
-    dayjs "^1.11.10"
+    dayjs "^1.11.11"
     js-base64 "^3.7.7"
-    js-fast-way "^0.4.7"
+    js-fast-way "^0.4.9"
     js-md5 "^0.8.3"
     sortablejs "^1.15.1"
     split.js "^1.6.5"
-    vue "3.4.21"
+    vue "3.4.25"
 
 html2canvas@1.4.1:
   version "1.4.1"
@@ -2161,16 +2082,11 @@ js-base64@^3.7.7:
   resolved "http://39.108.216.210:9000/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79"
   integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==
 
-js-fast-way@0.4.9:
+js-fast-way@0.4.9, js-fast-way@^0.4.9:
   version "0.4.9"
   resolved "http://39.108.216.210:9000/js-fast-way/-/js-fast-way-0.4.9.tgz#2f80881707c1058bbcdfc1d65b0364823230e43b"
   integrity sha512-Y4nwTg+PK9keRiPRyItzzxHSVoQ6r3Y9YQbPzyqrj8DJ8nCRL5Z/Wynz722TGwu71zKeaU3Nwj9pTRhy5Ps80w==
 
-js-fast-way@^0.4.7:
-  version "0.4.7"
-  resolved "http://39.108.216.210:9000/js-fast-way/-/js-fast-way-0.4.7.tgz#da775d7c9b85b9e59687505a3eba227208d77203"
-  integrity sha512-g04eNkRpH3/b5Tz6PTdaFCELn5mlqKmpzAT/M4ircBMA7JcQGpk63KOkvw7OT43iIpzMvZsorQK3qmCWTzyLMg==
-
 js-md5@^0.8.3:
   version "0.8.3"
   resolved "http://39.108.216.210:9000/js-md5/-/js-md5-0.8.3.tgz"
@@ -2313,13 +2229,6 @@ magic-string@^0.30.10:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
-magic-string@^0.30.7:
-  version "0.30.7"
-  resolved "http://39.108.216.210:9000/magic-string/-/magic-string-0.30.7.tgz#0cecd0527d473298679da95a2d7aeb8c64048505"
-  integrity sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.15"
-
 magic-string@^0.30.8:
   version "0.30.8"
   resolved "http://39.108.216.210:9000/magic-string/-/magic-string-0.30.8.tgz#14e8624246d2bedba70d5462aa99ac9681844613"
@@ -2615,15 +2524,6 @@ postcss@^8.4.27:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.35:
-  version "8.4.35"
-  resolved "http://39.108.216.210:9000/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
-  integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
 postcss@^8.4.38:
   version "8.4.38"
   resolved "http://39.108.216.210:9000/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
@@ -3098,17 +2998,6 @@ vue-router@^4.3.2:
   dependencies:
     "@vue/devtools-api" "^6.5.1"
 
-vue@3.4.21:
-  version "3.4.21"
-  resolved "http://39.108.216.210:9000/vue/-/vue-3.4.21.tgz#69ec30e267d358ee3a0ce16612ba89e00aaeb731"
-  integrity sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==
-  dependencies:
-    "@vue/compiler-dom" "3.4.21"
-    "@vue/compiler-sfc" "3.4.21"
-    "@vue/runtime-dom" "3.4.21"
-    "@vue/server-renderer" "3.4.21"
-    "@vue/shared" "3.4.21"
-
 vue@3.4.25:
   version "3.4.25"
   resolved "http://39.108.216.210:9000/vue/-/vue-3.4.25.tgz#e59d4ed36389647b52ff2fd7aa84bb6691f4205b"