更新依赖

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-cookie": "^3.0.5",
         "js-fast-way": "^0.4.6",
@@ -43,7 +43,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",
         "mitt": "^3.0.1",
         "postcss": "^8.4.35",
         "sass": "^1.71.1",

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240301165002"
+  "value": "20240312100336"
 }

src/components/message/index.vue

@@ -15,7 +15,6 @@
 
 <script setup>
 import { ref, watch } from 'vue'
-import { HcLottie } from 'hc-vue3-ui'
 //参数
 const props = defineProps({
     type: {

src/layout/index.scss

@@ -505,3 +505,13 @@ html.dark {
         }
     }
 }
+
+//没有 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%;
+    }
+}

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' : '']">
         <div v-if="appTheme === 'dark'" class="hc-app-bg-box">
             <img :src="appViewBg" alt="">
         </div>
@@ -53,7 +53,7 @@
 <script setup>
 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'
@@ -61,6 +61,7 @@ import website from '~src/config'
 
 //初始组合式
 const router = useRouter()
+const useRoutes = useRoute()
 const store = useAppStore()
 
 const reloadRouter = ref(true)
@@ -78,23 +79,31 @@ import MenuBar from '~src/layout/modules/MenuBar.vue'
 import appViewBg from '~src/assets/view/bg.png'
 
 // logo
-const appLogoIcon = ref(store.getLogoIcon)
 const appLogoName = ref(store.getLogoName)
 const appTheme = ref(store.getTheme)
 
 //菜单数据
 const menuBarKey = ref('')
 const menuBarData = ref([])
+const isLayout = ref('')
 
 //渲染完成
 onMounted(() => {
+    const layout = useRoutes?.query?.layout, layout2 = store.isLayout
+    isLayout.value = layout ?? layout2
     initButtons()
 })
 
-//监听
+//监听layout
 watch(() => [
-    store.getTheme,
-], ([theme]) => {
+    useRoutes?.query?.layout,
+    store.isLayout,
+], ([layout, layout2]) => {
+    isLayout.value = layout ?? layout2
+}, { deep: true })
+
+//监听
+watch(() => store.getTheme, (theme) => {
     appTheme.value = theme
 })
 

src/store/index.js

@@ -40,6 +40,7 @@ export const useAppStore = defineStore('main', {
         isDatavBg: true, //datav背景
         isScreenShort: false,
         barMenuName: '',
+        isLayout: getStoreValue('isLayout') || '', //是否显示layout
     }),
     getters: {
         //系统信息
@@ -72,6 +73,7 @@ export const useAppStore = defineStore('main', {
         getOrderServiceTipModal: state => state.orderServiceTipModal,
         getCollapse: state => state.isCollapse,
         getIsDatavTour: state => state.isDatavTour,
+        getIsLayout: state => state.isLayout,
     },
     actions: {
         //系统信息
@@ -183,6 +185,10 @@ export const useAppStore = defineStore('main', {
         setIsDatavBg(value) {
             this.isDatavBg = value
         },
+        setIsLayout(value) {
+            this.isLayout = value
+            setStoreValue('isLayout', value)
+        },
         //清除缓存和token
         clearStoreData() {
             //清除状态

src/views/file/collection.vue

@@ -382,7 +382,7 @@
         <HcReport :show="isReport" :data="reportData" @finish="reportFinish" @hide="isReport = false" />
 
         <!-- 在线验签 -->
-        <hc-new-drawer v-model="isOnlineVerifyDrawer" modal-class="hc-online-verify-drawer" to-id="app" append-to-body @close="onlineVerifyDrawerClose">
+        <hc-new-drawer v-model="isOnlineVerifyDrawer" modal-class="hc-online-verify-drawer" to-id="app" @close="onlineVerifyDrawerClose">
             <hc-new-card>
                 <template #header>
                     <div class="online-verify-title">这是标题名称</div>
@@ -609,9 +609,9 @@ const ElTreeMenuClick = async ({ data, keys }) => {
                 { icon: 'refresh', label: '目录同步', key: 'sync' },
                 { icon: 'refresh', label: '文件同步', key: 'fileSync' },
                 { icon: 'sort-asc', label: '排序', key: 'sort' },
-             
+
             ]
-        
+
     } else {
         // 声像节点显示声像文件同步菜单
         // if (data?.storageType === 5 && data?.associationType === 3) {
@@ -639,7 +639,7 @@ const ElTreeMenuClick = async ({ data, keys }) => {
                 { icon: 'refresh', label: '目录同步', key: 'sync' },
                 { icon: 'sort-asc', label: '排序', key: 'sort' },
             ]
-     
+
     }
 }
 //回车搜索

src/views/home/auth.vue

@@ -34,18 +34,21 @@ store.clearStoreData()
 //变量
 const loading = ref(true)
 const isErrorShow = ref(false)
+const toUrl = ref('/datav')
 
 //渲染完成
 onMounted(() => {
-    // http://档案的域名/#/auth-token?token=xxx&tid=xxx&pid=xxx&cid=xxx
-    const { token, tid, pid, cid, bg } = getObjValue(useRoutes.query)
+    // http://档案的域名/#/auth-token?token=xxx&tid=xxx&pid=xxx&cid=xxx&bg=no&layout=no&url=xxx
+    const { token, tid, pid, cid, bg, layout, url } = getObjValue(useRoutes.query)
     if (!isNullES(token)) {
         isErrorShow.value = false
+        toUrl.value = url ?? '/datav'
         //缓存数据
         store.setTokenVal(token)
         store.setProjectId(pid)
         store.setContractId(cid)
         store.setIsDatavBg(bg !== 'no')
+        store.setIsLayout(layout)
         //处理授权登录
         setLoginByTokenData(token, tid)
     } else {
@@ -77,7 +80,7 @@ const loginByTokenApi = async (form) => {
         await setUserAppInfo(res)
         loading.value = false
         isErrorShow.value = false
-        await router.push({name: 'datav'})
+        await router.push({ path: '/datav' })
     } else {
         window.$message?.error('授权登录失败')
         isErrorShow.value = true

yarn.lock

@@ -1071,10 +1071,10 @@ escape-string-regexp@^4.0.0:
   resolved "http://39.108.216.210:9000/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   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"
@@ -1371,10 +1371,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"
@@ -2318,7 +2327,7 @@ sortablejs@1.14.0:
   resolved "http://39.108.216.210:9000/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"
   integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
 
-sortablejs@^1.15.2:
+sortablejs@^1.15.1, sortablejs@^1.15.2:
   version "1.15.2"
   resolved "http://39.108.216.210:9000/sortablejs/-/sortablejs-1.15.2.tgz#4e9f7bda4718bd1838add9f1866ec77169149809"
   integrity sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==