Browse Source

更新依赖

ZaiZai 1 year ago
parent
commit
13b7e33eb1
5 changed files with 47 additions and 18 deletions
  1. 2 2
      package.json
  2. 2 3
      src/components/message/index.vue
  3. 10 0
      src/layout/index.scss
  4. 10 4
      src/layout/index.vue
  5. 23 9
      yarn.lock

+ 2 - 2
package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.5.0",
         "element-plus": "^2.6.1",
-        "hc-vue3-ui": "^3.2.8",
+        "hc-vue3-ui": "^3.4.0",
         "js-base64": "^3.7.7",
         "js-fast-way": "0.4.6",
         "js-md5": "^0.8.3",
@@ -37,7 +37,7 @@
         "autoprefixer": "^10.4.18",
         "cssnano": "^6.1.0",
         "eslint": "^8.57.0",
-        "eslint-plugin-vue": "^9.22.0",
+        "eslint-plugin-vue": "^9.23.0",
         "postcss": "^8.4.35",
         "sass": "^1.71.1",
         "tailwindcss": "3.4.1",

+ 2 - 3
src/components/message/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="hc-message-box">
         <div class="hc-lottie-box delete">
-            <HcLottie v-if="isType === 'delete'" type="delete" style="height: 200px" />
-            <HcLottie v-if="isType === 'warning'" type="warning" style="height: 140px" />
+            <hc-lottie v-if="isType === 'delete'" type="delete" style="height: 200px" />
+            <hc-lottie v-if="isType === 'warning'" type="warning" style="height: 140px" />
         </div>
         <div class="title">{{ titles }}</div>
         <div class="text">{{ text }}</div>
@@ -11,7 +11,6 @@
 
 <script setup>
 import { ref, watch } from 'vue'
-import { HcLottie } from 'hc-vue3-ui'
 //参数
 const props = defineProps({
     type: {

+ 10 - 0
src/layout/index.scss

@@ -500,3 +500,13 @@ html.dark {
         color: white;
     }
 }
+
+//没有 layout
+.hc-layout-box.is-no-layout {
+    .hc-layout-header, .hc-layout-aside, .hc-router-menu-bar {
+        display: none !important;
+    }
+    .hc-layout-container .hc-layout-main .hc-main-page {
+        height: 100%;
+    }
+}

+ 10 - 4
src/layout/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-container class="hc-layout-box">
+    <el-container class="hc-layout-box" :class="[!isNullES(isLayout) && isLayout === 'no' ? 'is-no-layout' : '']">
         <el-header class="hc-layout-header">
             <div class="hc-layout-header-logo" :style="`width: ${isCollapse ? '0px' : '200px'};`" @click="logoClick">
                 <!-- <img id="logo-icon" :src="appLogoIcon" alt=""> -->
@@ -44,15 +44,16 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { nextTick, onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { initButtons } from '~sto/app'
 import HcSocket from '~src/plugins/HcSocket'
 import { getObjValue, isNullES } from 'js-fast-way'
 
 //初始组合式
 const router = useRouter()
+const useRoutes = useRoute()
 const store = useAppStore()
 
 const reloadRouter = ref(true)
@@ -67,18 +68,23 @@ import RouterMenu from './modules/RouterMenu.vue'
 import MenuBar from '~src/layout/modules/MenuBar.vue'
 
 // logo
-const appLogoIcon = ref(store.getLogoIcon)
 const appLogoName = ref(store.getLogoName)
 
 //菜单数据
 const menuBarKey = ref('')
 const menuBarData = ref([])
+const isLayout = ref(useRoutes?.query?.layout)
 
 //渲染完成
 onMounted(() => {
     initButtons()
 })
 
+//监听layout
+watch(() => useRoutes?.query?.layout, (layout) => {
+    isLayout.value = layout
+}, { deep: true })
+
 //路由信息
 const routerMenuLoad = ({ key }) => {
     menuBarKey.value = key

+ 23 - 9
yarn.lock

@@ -1066,10 +1066,10 @@ escape-string-regexp@^4.0.0:
   resolved "http://39.108.216.210:9000/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-plugin-vue@^9.22.0:
-  version "9.22.0"
-  resolved "http://39.108.216.210:9000/eslint-plugin-vue/-/eslint-plugin-vue-9.22.0.tgz#e8a625adb0b6ce3b65635dd74fec8345146f8e26"
-  integrity sha512-7wCXv5zuVnBtZE/74z4yZ0CM8AjH6bk4MQGm7hZjUC2DBppKU5ioeOk5LGSg/s9a1ZJnIsdPLJpXnu1Rc+cVHg==
+eslint-plugin-vue@^9.23.0:
+  version "9.23.0"
+  resolved "http://39.108.216.210:9000/eslint-plugin-vue/-/eslint-plugin-vue-9.23.0.tgz#1354a33b0cd21e0cb373557ff73c5d7a6698fbcd"
+  integrity sha512-Bqd/b7hGYGrlV+wP/g77tjyFmp81lh5TMw0be9093X02SyelxRRfCI6/IsGq/J7Um0YwB9s0Ry0wlFyjPdmtUw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     natural-compare "^1.4.0"
@@ -1366,10 +1366,19 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-hc-vue3-ui@^3.2.8:
-  version "3.2.8"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.2.8.tgz#e5cbab7fa802a3d85354129855a8cacda1a858ce"
-  integrity sha512-PJmL+l5LH6h3c/+ZAqH7kj3h/3olDm79Y/a4nD1Dq6joD0nY3v3WQmDbR7HAJ3an9tpmDFzJqNPtSRfHe7PHjw==
+hc-vue3-ui@^3.4.0:
+  version "3.4.0"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.4.0.tgz#ed86cc070ca775486815453e96d7f90ff7be06c2"
+  integrity sha512-PugGUa7UMd+ufKzWURJLNzl2d79WwLGGEqWYLX+eUajKanN++ZrXGjxxdxNN1MTZz7BumBePWjXH5/L+PoXHmA==
+  dependencies:
+    axios "^1.6.7"
+    dayjs "^1.11.10"
+    js-base64 "^3.7.7"
+    js-fast-way "^0.4.6"
+    js-md5 "^0.8.3"
+    sortablejs "^1.15.1"
+    split.js "^1.6.5"
+    vue "3.4.21"
 
 html2canvas@1.4.1:
   version "1.4.1"
@@ -1495,7 +1504,7 @@ 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.6:
+js-fast-way@0.4.6, js-fast-way@^0.4.6:
   version "0.4.6"
   resolved "http://39.108.216.210:9000/js-fast-way/-/js-fast-way-0.4.6.tgz#13eceb9286f90e72d8eedb542c9c4743d286414a"
   integrity sha512-/N0hXqMTxByMa1tT4Ozq7t7AO/ggaYmhDVQJko2AuynvOQTVyzRn6adoH3SrzR2wUcjfTLjU1J7PAMKLZBYzuw==
@@ -2293,6 +2302,11 @@ sortablejs@1.14.0:
   resolved "http://39.108.216.210:9000/sortablejs/-/sortablejs-1.14.0.tgz"
   integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
 
+sortablejs@^1.15.1:
+  version "1.15.2"
+  resolved "http://39.108.216.210:9000/sortablejs/-/sortablejs-1.15.2.tgz#4e9f7bda4718bd1838add9f1866ec77169149809"
+  integrity sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==
+
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2:
   version "1.0.2"
   resolved "http://39.108.216.210:9000/source-map-js/-/source-map-js-1.0.2.tgz"