Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

src/components/BatchDropdown/index.vue

@@ -75,11 +75,9 @@ const handleMenuClick = (e: any) => {
     if(!(val?.popConfirm || val?.onClick)){
         emits('update:isCheck', true);
         emits('change', true);
-    }
-    if (val?.popConfirm) {
-        visible.value = false;
-    } else {
         visible.value = true;
+    } else {
+        visible.value = false;
     }
     _item.value = (val || {}) as any;
 };

src/components/Layout/BasicLayoutPage.vue

@@ -15,7 +15,7 @@
             >
               {{ slotProps.route.breadcrumbName }}
             </a>
-            <span v-else style='cursor: pointer' >{{ slotProps.route.breadcrumbName }}</span>
+            <span v-else style='cursor: default' >{{ slotProps.route.breadcrumbName }}</span>
         </template>
         <template #rightContentRender>
             <div class="right-content">

src/store/scene.ts

@@ -109,7 +109,7 @@ export const useSceneStore = defineStore('scene', () => {
         ...result,
         trigger: result.trigger || {},
         branches: cloneDeep(assignmentKey(branches)),
-        options: result.options ? {...defaultOptions, ...result.options } : defaultOptions,
+        options: result.options ? {...cloneDeep(defaultOptions), ...result.options } : cloneDeep(defaultOptions),
       }
     }
   }

src/utils/request.ts

@@ -158,10 +158,7 @@ const errorHandler = (error: any) => {
                 description: '用户未登录'
             })
             setTimeout(() => {
-                debugger
+                location.href = `/#${LoginPath}`
-                router.push({
-                    path: LoginPath
-                })
             }, 0)
         }
     } else if (error.response === undefined) {
@@ -180,10 +177,13 @@ request.interceptors.request.use(config => {
     const token = LocalStore.get(TOKEN_KEY)
     // const token = store.$state.tokenAlias
     if (!token) {
+        // setTimeout(() => {
+        //     router.replace({
+        //         path: LoginPath
+        //     })
+        // }, 0)
         setTimeout(() => {
-            router.replace({
+            location.href = `/#${LoginPath}`
-                path: LoginPath
-            })
         }, 0)
         return config
     }

src/views/iot-card/CardManagement/index.vue

@@ -572,7 +572,7 @@ const columns = [
         search: {
             type: 'select',
             options: [
-                { label: '正常', value: 'using' },
+                { label: '激活', value: 'using' },
                 { label: '未激活', value: 'toBeActivated' },
                 { label: '停机', value: 'deactivate' },
                 { label: '其它', value: 'using,toBeActivated,deactivate' },

yarn.lock

@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#77bd58156212d793fdebe41fc8864eeed5db7182"
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#f2e62df4054e513df39e3355592d95e356438328"
-  integrity sha512-VXuCMJlMV/bbmBhPtBzY/BUBIvGebQbguLPE06xps79i5Pjq46+HBW8VPsJ9MwvyMhYkhzPlQJu9Ft7v5uo+yA==
+  integrity sha512-vfQ8g8nEJueDkHCVcg9WeWDDjnPklyigbobB1CQArfHLd5O4x6vLFWvF69k0yqytCvIOXB13CzhLtMnv68pC5w==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"