Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/package.json

@@ -23,6 +23,7 @@
     "file-saver": "^2.0.2",
     "moment": "^2.29.4",
     "npm": "^6.13.7",
+    "secure-ls": "^1.2.6",
     "voca": "^1.4.0",
     "vue": "^2.6.14",
     "vue-barcode": "^1.3.0",
@@ -32,7 +33,8 @@
     "vue-seamless-scroll": "^1.1.23",
     "vue-text-format": "^1.2.6",
     "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "vuex-persistedstate": "^4.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

sample-form-client-ui/admin/src/App.vue

@@ -60,6 +60,7 @@ export default {
           homeUrl: "http://192.168.0.24:8080/#/",
           serverUrl: "http://192.168.0.98:11078/",
         },
+        devicenum: "B8-13-32-86-9F-04",
       };
       this.WebSocketMq(obj);
     }

sample-form-client-ui/admin/src/api/index.js

@@ -19,25 +19,45 @@ export const getHomeInfo = (data) => {
 export const getdeptList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
+  let deviceCode = local.getLocal("devicenum");
   return request({
     url: `${baseUrl}sampleform/home/depts`,
     method: "post",
     data: {
       siteId,
+      deviceCode,
       ...data,
     },
   });
 };
 
 // 查询事项列表
+// export const getWriteMatterList = (data) => {
+//   let baseUrl = local.getLocal("serverUrl");
+//   let siteId = local.getLocal("siteId");
+//   let devicenum = local.getLocal("devicenum");
+//   return request({
+//     url: `${baseUrl}sampleform/matter/list`,
+//     method: "post",
+//     data: {
+//       siteId,
+//       devicenum,
+//       ...data,
+//     },
+//   });
+// };
+
+// 查询设备关联事项列表
 export const getWriteMatterList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
+  let deviceCode = local.getLocal("devicenum");
   return request({
-    url: `${baseUrl}sampleform/matter/list`,
+    url: `${baseUrl}sampleform/device/matter/datum/list`,
     method: "post",
     data: {
       siteId,
+      deviceCode,
       ...data,
     },
   });

sample-form-client-ui/admin/src/assets/css/common.css

@@ -361,7 +361,7 @@
 }
 .matter-fullName {
   display: inline-block;
-  width: 86px;
+  width: 100px;
   height: 30px;
   text-align: center;
   line-height: 30px;

sample-form-client-ui/admin/src/components/MateralsList.vue

@@ -131,14 +131,12 @@ export default {
 }
 .title {
   font-size: 28px;
-  font-family: Source Han Sans CN;
   font-weight: 500;
   color: #333333;
   .matter-name {
     display: inline-block;
     // width: 1000px;
-    font-size: 20px;
-    font-family: Source Han Sans CN;
+    font-size: 24px;
     line-height: 34px;
     color: #777777;
     // overflow: hidden;
@@ -185,8 +183,7 @@ export default {
     width: 100%;
     margin-top: 18px;
     margin-bottom: 8px;
-    font-size: 24px;
-    font-family: Source Han Sans CN;
+    font-size: 28px;
     color: #333333;
     letter-spacing: 1px;
     overflow: hidden;
@@ -196,8 +193,7 @@ export default {
   }
   .matterDatumList-name {
     width: 100%;
-    font-size: 18px;
-    font-family: Source Han Sans CN;
+    font-size: 22px;
     color: #777777;
     line-height: 30px;
     letter-spacing: 1px;
@@ -214,7 +210,6 @@ export default {
     background-color: #e6effd;
     border-radius: 8px;
     font-size: 20px;
-    font-family: Source Han Sans CN;
     color: var(--main-theme-color);
     text-align: center;
     line-height: 50px;

sample-form-client-ui/admin/src/components/PageTop.vue

@@ -20,7 +20,7 @@ export default {};
   margin-top: 20px;
   margin-bottom: 40px;
   .count {
-    font-size: 26px;
+    font-size: 30px;
     font-family: Source Han Sans CN;
     color: #333333;
   }

sample-form-client-ui/admin/src/pages/home/Home.vue

@@ -476,26 +476,6 @@ export default {
       left: 50%;
       transform: translate(-50%, -50%);
     }
-    .tab-box {
-      width: 340px;
-      height: 50px;
-      padding: 3px;
-      margin-top: 10px;
-      background: #efe6e6;
-      border-radius: 8px;
-      .tab-item {
-        width: 50%;
-        height: 100%;
-        border-radius: 8px;
-        text-align: center;
-        font-size: 22px;
-        color: #333;
-        cursor: pointer;
-      }
-      .active {
-        background-color: #fff;
-      }
-    }
     .ranking-list {
       padding: 0px 14px;
       .ranking-item {
@@ -503,9 +483,10 @@ export default {
         margin-bottom: 10px;
         line-height: 56px;
         border-radius: 8px;
-        font-size: 22px;
+        font-size: 28px;
         color: var(--main-theme-color);
         letter-spacing: 2px;
+        cursor: pointer;
         &:nth-child(2n-1) {
           background-color: #fff;
         }
@@ -596,9 +577,10 @@ export default {
           margin-bottom: 4px;
           line-height: 45px;
           border-radius: 8px;
-          font-size: 20px;
+          font-size: 26px;
           color: var(--main-theme-color);
           letter-spacing: 2px;
+          cursor: pointer;
           &:nth-child(2n) {
             background-color: #f6f9fe;
           }

sample-form-client-ui/admin/src/pages/layouts/Layouts.vue

@@ -17,7 +17,7 @@ export default {
     startTimer() {
       let that = this;
       clearInterval(that.timeOut);
-      this.timeOut = setInterval(function () {
+      this.timeOut = setTimeout(function () {
         that.$router.push({ path: "/" });
       }, 1000 * 60 * 2);
     },
@@ -40,7 +40,7 @@ export default {
     document.body.removeEventListener("keyup", this.startTimer);
     document.body.removeEventListener("click", this.startTimer);
     document.body.removeEventListener("touchend", this.startTimer);
-    clearInterval(this.timeOut);
+    clearTimeout(this.timeOut);
   },
 };
 </script>

sample-form-client-ui/admin/src/pages/showpage/MatterList.vue

@@ -238,7 +238,7 @@ export default {
       }
       .for-short {
         margin-bottom: 10px;
-        font-size: 24px;
+        font-size: 28px;
         font-weight: 500;
         line-height: 36px;
         color: #333333;
@@ -253,10 +253,10 @@ export default {
       }
       .name {
         margin-bottom: 10px;
-        font-size: 18px;
+        font-size: 22px;
         font-family: Source Han Sans CN;
         color: #888888;
-        line-height: 24px;
+        line-height: 30px;
         letter-spacing: 1px;
         display: -webkit-box;
         -webkit-box-orient: vertical;
@@ -265,7 +265,7 @@ export default {
       }
 
       .materials {
-        font-size: 18px;
+        font-size: 20px;
         font-family: Source Han Sans CN;
         color: #333333;
         line-height: 30px;

sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue

@@ -253,11 +253,11 @@ export default {
       color: var(--main-theme-color);
       position: absolute;
       right: 28px;
+      cursor: pointer;
     }
     .apply-num {
       margin-bottom: 20px;
       font-size: 18px;
-      font-family: Source Han Sans CN;
       color: #666666;
     }
     .matter-name {
@@ -267,13 +267,14 @@ export default {
       background: #f2f6fe;
       border-radius: 4px;
       line-height: 38px;
+      font-size: 22px;
       color: var(--main-theme-color);
     }
     .materails-item {
       height: 42px;
       line-height: 40px;
-      font-size: 18px;
-      font-family: Source Han Sans CN;
+      font-size: 22px;
+      cursor: pointer;
       color: #333333;
     }
     .line {
@@ -311,7 +312,6 @@ export default {
       box-shadow: 6px -1px 10px 0px rgba(11, 92, 233, 0.11);
       border-radius: 0px 38px 8px 0px;
       font-size: 24px;
-      font-family: Source Han Sans CN;
       color: #ffffff;
       cursor: pointer;
       position: absolute;
@@ -335,15 +335,13 @@ export default {
     // }
   }
   .short {
-    font-size: 26px;
-    font-family: Source Han Sans CN;
+    font-size: 34px;
     color: var(--main-theme-color);
   }
   .full-name {
     margin-top: 10px;
     margin-bottom: 24px;
-    font-size: 20px;
-    font-family: Source Han Sans CN;
+    font-size: 30px;
     color: #888888;
   }
   // .preview-img {

sample-form-client-ui/admin/src/pages/showpage/components/LeftMenus.vue

@@ -68,7 +68,7 @@ export default {
 }
 .dept-item {
   text-align: center;
-  font-size: 26px;
+  font-size: 30px;
   color: #333333;
   cursor: pointer;
   .dept-name {

sample-form-client-ui/admin/src/store/index.js

 import Vue from "vue";
 import Vuex from "vuex";
-
+import createPersistedState from "vuex-persistedstate";
+import SecureLS from "secure-ls";
+var ls = new SecureLS({ isCompression: false });
 Vue.use(Vuex);
 
 export default new Vuex.Store({
@@ -27,4 +29,18 @@ export default new Vuex.Store({
   },
   actions: {},
   modules: {},
+  // 持久化插件
+  plugins: [
+    // createPersistedState({
+    //   storage: window.sessionStorage,
+    // }),
+    createPersistedState({
+      key: "info",
+      storage: {
+        getItem: (key) => ls.get(key),
+        setItem: (key, value) => ls.set(key, value),
+        removeItem: (key) => ls.remove(key),
+      },
+    }),
+  ],
 });

sample-form-client-ui/admin/yarn.lock

@@ -3124,6 +3124,11 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+crypto-js@^3.1.6:
+  version "3.3.0"
+  resolved "https://registry.npmmirror.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b"
+  integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==
+
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -3361,6 +3366,11 @@ deepmerge@^1.2.0, deepmerge@^1.5.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
   integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
 
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
 default-gateway@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
@@ -6214,6 +6224,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lz-string@^1.4.4:
+  version "1.5.0"
+  resolved "https://registry.npmmirror.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
+  integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.npmmirror.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8503,6 +8518,14 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.0.0"
 
+secure-ls@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.npmmirror.com/secure-ls/-/secure-ls-1.2.6.tgz#0c54a4c7fa8317c3c101accbf6bb38d8d2072e46"
+  integrity sha512-g8vUSKl6elSfyAUHodybnNkuZW+mUYEOWj4SZIDg+xoQ1dq5ddktBoOFrtxQBUl88ZyAJOtGWQ1PRaOxkTAuZQ==
+  dependencies:
+    crypto-js "^3.1.6"
+    lz-string "^1.4.4"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -8661,6 +8684,11 @@ shell-quote@^1.7.3:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
   integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
 
+shvl@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/shvl/-/shvl-2.0.3.tgz#eb4bd37644f5684bba1fc52c3010c96fb5e6afd1"
+  integrity sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -9843,6 +9871,14 @@ vuedraggable@^2.24.3:
   dependencies:
     sortablejs "1.10.2"
 
+vuex-persistedstate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz#127165f85f5b4534fb3170a5d3a8be9811bd2a53"
+  integrity sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==
+  dependencies:
+    deepmerge "^4.2.2"
+    shvl "^2.0.3"
+
 vuex@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"

sample-form-manager-ui/admin/package.json

@@ -23,6 +23,7 @@
     "file-saver": "^2.0.2",
     "moment": "^2.29.4",
     "npm": "^6.13.7",
+    "secure-ls": "^1.2.6",
     "voca": "^1.4.0",
     "vue": "^2.6.14",
     "vue-barcode": "^1.3.0",
@@ -30,7 +31,8 @@
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.1",
     "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "vuex-persistedstate": "^4.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

sample-form-manager-ui/admin/public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>智慧政务一体化综合管理平台</title>
+    <title>样表管理系统</title>
   </head>
   <body>
     <noscript>

sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue

@@ -8,7 +8,7 @@
         <div class="left">
           <div class="header mb20">
             已选择事项<span class="header-count primary"
-              >（已选择：事项{{ devMatterList.length }}个 | 材料12个）</span
+              >（已选择：事项{{ devMatterList.length }}个）</span
             >
           </div>
           <!-- 列表 -->

sample-form-manager-ui/admin/src/store/index.js

-import Vue from 'vue'
-import Vuex from 'vuex'
-
-Vue.use(Vuex)
+import Vue from "vue";
+import Vuex from "vuex";
+import createPersistedState from "vuex-persistedstate";
+import SecureLS from "secure-ls";
+var ls = new SecureLS({ isCompression: false });
+Vue.use(Vuex);
 
 export default new Vuex.Store({
   state: {
     menus: [], // 菜单
-    siteId:'', // 站点id
-    deptList:[], // 部门列表
+    siteId: "", // 站点id
+    deptList: [], // 部门列表
   },
   getters: {
-    siteId(state){
-      return state.siteId
+    siteId(state) {
+      return state.siteId;
+    },
+    deptList(state) {
+      return state.deptList;
     },
-    deptList(state){
-      return state.deptList
-    }
   },
   mutations: {
     SET_MENUS(state, menus) {
-      state.menus = menus
+      state.menus = menus;
     },
-    SET_SITEID(state,siteId){
-      state.siteId = siteId
+    SET_SITEID(state, siteId) {
+      state.siteId = siteId;
+    },
+    SET_deptList(state, deptList) {
+      state.deptList = deptList;
     },
-    SET_deptList(state,deptList){
-      state.deptList = deptList
-    }
-  },
-  actions: {
   },
-  modules: {
-  }
-})
+  actions: {},
+  modules: {},
+  // 持久化插件
+  plugins: [
+    // createPersistedState({
+    //   storage: window.sessionStorage,
+    // }),
+    createPersistedState({
+      key: "info",
+      storage: {
+        getItem: (key) => ls.get(key),
+        setItem: (key, value) => ls.set(key, value),
+        removeItem: (key) => ls.remove(key),
+      },
+    }),
+  ],
+});

sample-form-manager-ui/admin/yarn.lock

@@ -3111,6 +3111,11 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+crypto-js@^3.1.6:
+  version "3.3.0"
+  resolved "https://registry.npmmirror.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b"
+  integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==
+
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -3348,6 +3353,11 @@ deepmerge@^1.2.0, deepmerge@^1.5.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
   integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
 
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
 default-gateway@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
@@ -6201,6 +6211,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lz-string@^1.4.4:
+  version "1.5.0"
+  resolved "https://registry.npmmirror.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
+  integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.npmmirror.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8490,6 +8505,14 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.0.0"
 
+secure-ls@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.npmmirror.com/secure-ls/-/secure-ls-1.2.6.tgz#0c54a4c7fa8317c3c101accbf6bb38d8d2072e46"
+  integrity sha512-g8vUSKl6elSfyAUHodybnNkuZW+mUYEOWj4SZIDg+xoQ1dq5ddktBoOFrtxQBUl88ZyAJOtGWQ1PRaOxkTAuZQ==
+  dependencies:
+    crypto-js "^3.1.6"
+    lz-string "^1.4.4"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -8648,6 +8671,11 @@ shell-quote@^1.7.3:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
   integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
 
+shvl@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmmirror.com/shvl/-/shvl-2.0.3.tgz#eb4bd37644f5684bba1fc52c3010c96fb5e6afd1"
+  integrity sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -9811,6 +9839,14 @@ vuedraggable@^2.24.3:
   dependencies:
     sortablejs "1.10.2"
 
+vuex-persistedstate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz#127165f85f5b4534fb3170a5d3a8be9811bd2a53"
+  integrity sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==
+  dependencies:
+    deepmerge "^4.2.2"
+    shvl "^2.0.3"
+
 vuex@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"