From ce4d63be55efa0e2489e4c6356c1b36a7f5f112f Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 27 Apr 2023 16:25:08 +0800
Subject: [PATCH 01/10] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96oauth=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts       |  8 ++++---
 src/utils/request.ts      | 19 +++++++++++-----
 src/views/oauth/index.vue | 47 ++++++++++++++++++++++++---------------
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 1ecbc43e..fb09a885 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,5 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
-import menus, { AccountCenterBindPath, InitHomePath, LoginPath } from './menu'
+import menus, { AccountCenterBindPath, InitHomePath, LoginPath, OauthPath } from './menu'
 import { cleanToken, getToken } from '@/utils/comm'
 import { useUserInfo } from '@/store/userInfo'
 import { useSystem } from '@/store/system'
@@ -14,12 +14,14 @@ const router = createRouter({
   }
 })
 
-const filterPath = [ InitHomePath, AccountCenterBindPath ]
+const filterPath = [ InitHomePath ]
+const noTokenPath = [ AccountCenterBindPath, OauthPath ]
 
 router.beforeEach((to, from, next) => {
   // TODO 切换路由取消请求
   const token = getToken()
-  if (to.path === AccountCenterBindPath) {
+  console.log(to.path, noTokenPath.includes(to.path))
+  if (noTokenPath.includes(to.path)) {
     next()
   } else if (token) {
     if (to.path === LoginPath) {
diff --git a/src/utils/request.ts b/src/utils/request.ts
index a74fb062..c7ffca50 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -13,7 +13,16 @@ interface AxiosResponseRewrite<T = any[]> extends AxiosResponse<T, any> {
 
 export const SUCCESS_CODE = 200 // 成功代码
 
-const filterApiUrl = ['/system/version', '/system/config/front', '/authorize/captcha/config', '/application/sso/_all', '/authorize/captcha/image', '/application/sso/bind-code', '/authorize/login']
+const filterApiUrl = [
+  '/system/version',
+  '/system/config/front',
+  '/authorize/captcha/config',
+  '/application/sso/_all',
+  '/authorize/captcha/image',
+  '/application/sso/bind-code',
+  '/authorize/login',
+  '/application/'
+]
 
 export const request = axios.create({
   withCredentials: false,
@@ -148,10 +157,10 @@ const errorHandler = (error: any) => {
     } else if (status === 401) {
       showNotification('Unauthorized', '用户未登录', '401')
       setTimeout(() => {
-        cleanToken()
-        router.replace({
-          path: LoginPath
-        })
+        // cleanToken()
+        // router.replace({
+        //   path: LoginPath
+        // })
       }, 0)
     } else if (status === 404) {
       showNotification(error?.code, error?.response?.data?.message, '404')
diff --git a/src/views/oauth/index.vue b/src/views/oauth/index.vue
index 547796f1..4e431e68 100644
--- a/src/views/oauth/index.vue
+++ b/src/views/oauth/index.vue
@@ -74,7 +74,7 @@
 import { TOKEN_KEY } from '@/utils/variable'
 import { config, code, getOAuth2, initApplication, authLogin } from '@/api/login'
 import { getMe_api } from '@/api/home'
-import { getImage } from '@/utils/comm'
+import { getImage, getToken } from '@/utils/comm'
 
 const spinning = ref(true)
 const isLogin = ref(false)
@@ -106,11 +106,14 @@ const captcha = reactive<{base64?: string, key?: string }>({
 
 const getApplication = async (clientId: string) => {
   const res = await initApplication(clientId)
-  if (res.success) {
+  if (res.success && res.result) {
     appName.value = res.result.name
   }
 }
 
+/**
+ * 获取验证码配置
+ */
 const getCode = async () => {
   const resp = await config()
   if (resp.result?.enabled) {
@@ -138,26 +141,33 @@ const changeAccount = () => {
 }
 
 const getLoginUser = async (data?: any) => {
-  const res = await getMe_api()
-  if (res.success) {
-    userName.value = res.result?.user.name
-    isLogin.value = true
-    getApplication(data.client_id || params.value.client_id)
-    if (data.internal === 'true' || internal.value === 'true') { // 是否走oauth2
-      goOAuth2Fn(data)
+  console.log(getToken())
+  if (getToken()) { // 未登录
+    const res = await getMe_api()
+    if (res.success) {
+      userName.value = res.result?.user.name
+      isLogin.value = true
+      getApplication(data.client_id || params.value.client_id)
+      if (data.internal === 'true' || internal.value === 'true') { // 是否走oauth2
+        goOAuth2Fn(data)
+      }
+    } else if (res.status === 401) {
+      setTimeout(() => {
+        spinning.value = false
+      })
+      getCode()
+      getApplication(data.client_id || params.value.client_id)
+    } else {
+      setTimeout(() => {
+        spinning.value = false
+      })
     }
-  } else if (res.status === 401) {
-    setTimeout(() => {
-      spinning.value = false
-    })
-    getCode()
-    getApplication(data.client_id || params.value.client_id)
   } else {
+    getApplication(data.client_id || params.value.client_id)
     setTimeout(() => {
       spinning.value = false
     })
   }
-
 }
 
 const getQueryVariable = (variable: any) => {
@@ -178,9 +188,9 @@ const doLogin = async () => {
     ...formModel
   })
   if (res.success) {
-    getLoginUser()
     const token = res.result.token
     localStorage.setItem(TOKEN_KEY, token)
+    getLoginUser()
     goOAuth2Fn()
   } else {
     getCode()
@@ -189,6 +199,7 @@ const doLogin = async () => {
 
 const initPage = async () => {
   let redirectUrl
+  // 获取url中的配置信息
   const items = {
     client_id: getQueryVariable('client_id'),
     state: getQueryVariable('state'),
@@ -204,7 +215,7 @@ const initPage = async () => {
     redirectUrl = items.redirect_uri
     console.log(origin, items.redirect_uri)
   }
-
+  // 获取用户信息
   getLoginUser({
     ...items,
     internal: getQueryVariable('internal'),

From b59ad04c37280b9e403a661ac60ba5e90db53537 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 27 Apr 2023 17:51:44 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Diot=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.ts          |  2 +-
 src/router/index.ts       |  1 -
 src/views/oauth/index.vue | 68 ++++++++++++++++++++++++++-------------
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/config/config.ts b/config/config.ts
index 9a3c3b8a..6b94b56b 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -6,7 +6,7 @@ export default {
   title: 'Jetlinks', // 浏览器标签页title
   layout: {
     title: '物联网平台', // 平台title
-    logo: '/icons/icon-192x192.png', // 平台logo
+    logo: '/logo.png', // 平台logo
     siderWidth: 208, // 左侧菜单栏宽度
     headerHeight: 48, // 头部高度
     collapsedWidth: 48,
diff --git a/src/router/index.ts b/src/router/index.ts
index fb09a885..1641803e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -20,7 +20,6 @@ const noTokenPath = [ AccountCenterBindPath, OauthPath ]
 router.beforeEach((to, from, next) => {
   // TODO 切换路由取消请求
   const token = getToken()
-  console.log(to.path, noTokenPath.includes(to.path))
   if (noTokenPath.includes(to.path)) {
     next()
   } else if (token) {
diff --git a/src/views/oauth/index.vue b/src/views/oauth/index.vue
index 4e431e68..6fc36ac6 100644
--- a/src/views/oauth/index.vue
+++ b/src/views/oauth/index.vue
@@ -14,9 +14,10 @@
                   <div class='oauth-content-header'>
                     <img :src='headerImg' />
                   </div>
+                  <h2>授权登录</h2>
                   <div class='oauth-content-content'>
                     <div class='oauth-content-content-text'>
-                      您正在授权登录,{{ appName }}将获得以下权限:
+                      您正在授权登录, {{ appName }} 将获得以下权限:
                     </div>
                     <ul>
                       <li>关联{{userName}}账号</li>
@@ -32,15 +33,16 @@
                   <div class='oauth-content-header'>
                     <img :src='headerImg' />
                   </div>
+                  <h2>授权登录</h2>
                   <div class='oauth-content-login'>
-                    <j-form layout='horizontal' size='large' :model='formModel' >
-                      <j-form-item name='username'>
+                    <j-form layout='vertical' :model='formModel' ref='formRef' >
+                      <j-form-item label='用户名' name='username' required :rules='[{ required: true, message: "请输入用户名"}]'>
                         <j-input placeholder='用户名' v-model:value='formModel.username' />
                       </j-form-item>
-                      <j-form-item name='password'>
+                      <j-form-item label='密码' name='password' required :rules='[{ required: true, message: "请输入密码"}]'>
                         <j-input-password placeholder='密码' v-model:value='formModel.password' />
                       </j-form-item>
-                      <j-form-item name='verifyCode' v-if='captcha.base64'>
+                      <j-form-item name='verifyCode' v-if='captcha.base64' required :rules='[{ required: true, message: "请输入验证码"}]'>
                         <j-input placeholder='请输入验证码' v-model:value='formModel.verifyCode' >
                           <template #addonAfter>
                             <img
@@ -72,9 +74,10 @@
 
 <script setup lang='ts' name='Oauth'>
 import { TOKEN_KEY } from '@/utils/variable'
-import { config, code, getOAuth2, initApplication, authLogin } from '@/api/login'
+import { config, code, getOAuth2, initApplication, authLogin, settingDetail } from '@/api/login'
 import { getMe_api } from '@/api/home'
 import { getImage, getToken } from '@/utils/comm'
+import Config from '../../../config/config'
 
 const spinning = ref(true)
 const isLogin = ref(false)
@@ -85,6 +88,9 @@ const userName = ref('-')
 const internal = ref('false')
 const params = ref()
 
+document.title = `OAuth授权-${Config.title}`;
+headerImg.value = getImage(Config.layout.logo)
+
 type LoginParam = {
   username: string;
   password: string;
@@ -104,6 +110,8 @@ const captcha = reactive<{base64?: string, key?: string }>({
   key: undefined
 })
 
+const formRef = ref()
+
 const getApplication = async (clientId: string) => {
   const res = await initApplication(clientId)
   if (res.success && res.result) {
@@ -141,7 +149,6 @@ const changeAccount = () => {
 }
 
 const getLoginUser = async (data?: any) => {
-  console.log(getToken())
   if (getToken()) { // 未登录
     const res = await getMe_api()
     if (res.success) {
@@ -182,19 +189,21 @@ const getQueryVariable = (variable: any) => {
   return '';
 }
 
-const doLogin = async () => {
-  const res = await authLogin({
-    verifyKey: captcha.key,
-    ...formModel
+const doLogin = () => {
+  formRef.value.validate().then( async data => {
+    const res = await authLogin({
+      verifyKey: captcha.key,
+      ...formModel
+    })
+    if (res.success) {
+      const token = res.result.token
+      localStorage.setItem(TOKEN_KEY, token)
+      getLoginUser()
+      // goOAuth2Fn()
+    } else {
+      getCode()
+    }
   })
-  if (res.success) {
-    const token = res.result.token
-    localStorage.setItem(TOKEN_KEY, token)
-    getLoginUser()
-    goOAuth2Fn()
-  } else {
-    getCode()
-  }
 }
 
 const initPage = async () => {
@@ -213,7 +222,6 @@ const initPage = async () => {
     const url = `${origin.join('/')}${items.redirect_uri?.split('redirect=')[1]}`
     // redirectUrl = `${items.redirect_uri?.split('redirect_uri=')[0]}?redirect=${url}`
     redirectUrl = items.redirect_uri
-    console.log(origin, items.redirect_uri)
   }
   // 获取用户信息
   getLoginUser({
@@ -229,9 +237,22 @@ const initPage = async () => {
   }
 }
 
-document.title = 'OAuth授权-jetlinks';
-headerImg.value = getImage('/logo.png')
+const getSettingDetail = () => {
+  settingDetail('front').then((res: any) => {
+    if (res.status === 200) {
+      const ico: any = document.querySelector('link[rel="icon"]');
+      ico.href = res.result.ico;
+      headerImg.value = res.result.logo
+      if (res.result.title) {
+        document.title = `OAuth授权-${res.result.title}`;
+      } else {
+        document.title = 'OAuth授权';
+      }
+    }
+  });
+}
 
+getSettingDetail()
 getCode()
 initPage()
 
@@ -320,7 +341,8 @@ initPage()
       gap: 24px;
     }
     .oauth-content-login {
-      max-width: 300px;
+      width: 100%;
+      padding: 0 24px;
     }
   }
 }

From 7ae187ba6301ae7ab2b70e52dad71167398ebd8d Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Fri, 28 Apr 2023 15:08:01 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B6=85=E6=97=B6=E6=96=87=E6=A1=88=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index c7ffca50..757a934a 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -166,7 +166,11 @@ const errorHandler = (error: any) => {
       showNotification(error?.code, error?.response?.data?.message, '404')
     }
   } else if (error.response === undefined) {
-    showNotification(error.message, (error.stack + '').substr(0, 90), undefined)
+    if (error.message.includes('timeout')) {
+      showNotification(error.message, '接口响应超时', undefined)
+    } else {
+      showNotification(error.message, (error.stack + '').substr(0, 90), undefined)
+    }
   }
   return Promise.reject(error)
 }

From 3fb2b4b9567f9a40db0d2395b066788b46ca3487 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Fri, 28 Apr 2023 17:20:18 +0800
Subject: [PATCH 04/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Menu/Setting/index.vue | 47 +++++++++++++------------
 src/views/system/Menu/Setting/utils.ts  | 14 ++++++++
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/views/system/Menu/Setting/index.vue b/src/views/system/Menu/Setting/index.vue
index cad1e29d..c26096f3 100644
--- a/src/views/system/Menu/Setting/index.vue
+++ b/src/views/system/Menu/Setting/index.vue
@@ -10,30 +10,31 @@
             <div class="content">
                 <j-card title="菜单配置" style="width: 80%">
                     <div class="tree">
+                      <j-scrollbar>
                         <j-tree
-                            v-if="treeData.length !== 0"
-                            show-line
-                            defaultExpandAll
-                            multiple
-                            draggable
-                            :tree-data="treeData"
-                            :height="520"
-                            @select="onSelect"
-                            :selectedKeys="selectedKeys"
-                            @drop="onDrop"
-                            @dragend="onDragend"
+                          v-if="treeData.length !== 0"
+                          show-line
+                          defaultExpandAll
+                          multiple
+                          draggable
+                          :tree-data="treeData"
+                          @select="onSelect"
+                          :selectedKeys="selectedKeys"
+                          @drop="onDrop"
+                          @dragend="onDragend"
                         >
-                            <template #title="row">
-                                <div class="tree-content">
-                                    <div class="tree-content-title">
-                                        <AIcon type="HolderOutlined" />
-                                        <div style="margin-left: 8px">
-                                            {{ row.name }}
-                                        </div>
-                                    </div>
+                          <template #title="row">
+                            <div class="tree-content">
+                              <div class="tree-content-title">
+                                <AIcon type="HolderOutlined" />
+                                <div style="margin-left: 8px">
+                                  {{ row.name }}
                                 </div>
-                            </template>
+                              </div>
+                            </div>
+                          </template>
                         </j-tree>
+                      </j-scrollbar>
                     </div>
                 </j-card>
             </div>
@@ -70,6 +71,7 @@ import {
     getMaxDepth,
     mergeArr,
     findAllParentsAndChildren,
+    handleSorts
 } from './utils';
 import BaseMenu from '@/views/init-home/data/baseMenu';
 import type { AntTreeNodeDropEvent } from 'ant-design-vue/es/tree';
@@ -134,9 +136,9 @@ function filterTree(nodes: Array<any>, selectedKeys: Array<any>) {
 
 const handleOk = async () => {
     const _dataArr = filterTree(cloneDeep(treeData.value), selectedKeys.value);
-
+    const _dataSorts = handleSorts(_dataArr)
     loading.value = true;
-    const res = await updateMenus(_dataArr).catch(() => {});
+    const res = await updateMenus(_dataSorts).catch(() => {});
     if (res?.status === 200) {
         onlyMessage('操作成功', 'success');
     }
@@ -260,6 +262,7 @@ onMounted(() => {
         border-radius: 4px;
         overflow: hidden;
         width: 100%;
+        height: 540px;
 
         &-content {
             display: flex;
diff --git a/src/views/system/Menu/Setting/utils.ts b/src/views/system/Menu/Setting/utils.ts
index 1b48299c..c49f6661 100644
--- a/src/views/system/Menu/Setting/utils.ts
+++ b/src/views/system/Menu/Setting/utils.ts
@@ -304,3 +304,17 @@ export const getNodeDepth = (node: any) => {
     }
     return depth;
 };
+
+
+export const handleSorts = (node: any[]) => {
+    if (!node) return []
+    return node.map((item, index) => {
+        if (item.index !== index) {
+            item.sortIndex = index
+            if (item.children) {
+                item.children = handleSorts(item.children)
+            }
+        }
+        return item
+    })
+}
\ No newline at end of file

From d66ea9c8a8e361b0501525267ac545711397ad82 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 4 May 2023 15:30:13 +0800
Subject: [PATCH 05/10] fix: bug#12763

---
 build.sh                                      |  4 ++--
 src/views/oauth/index.vue                     |  8 +++----
 .../Save/components/DropdownButton/Menus.vue  | 13 ++++++------
 .../Save/components/ParamsDropdown/index.vue  | 21 ++++++++++++-------
 .../Save/components/ParamsDropdown/typings.ts |  4 ++++
 .../Save/components/Terms/ParamsItem.vue      |  1 +
 6 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/build.sh b/build.sh
index 8849f58c..bf6d3418 100644
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:1.0.0 .
-docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:1.0.0
+docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1 .
+docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1
diff --git a/src/views/oauth/index.vue b/src/views/oauth/index.vue
index 6fc36ac6..53b71bb6 100644
--- a/src/views/oauth/index.vue
+++ b/src/views/oauth/index.vue
@@ -154,8 +154,8 @@ const getLoginUser = async (data?: any) => {
     if (res.success) {
       userName.value = res.result?.user.name
       isLogin.value = true
-      getApplication(data.client_id || params.value.client_id)
-      if (data.internal === 'true' || internal.value === 'true') { // 是否走oauth2
+      getApplication(data?.client_id || params.value.client_id)
+      if (data?.internal === 'true' || internal.value === 'true') { // 是否走oauth2
         goOAuth2Fn(data)
       }
     } else if (res.status === 401) {
@@ -163,14 +163,14 @@ const getLoginUser = async (data?: any) => {
         spinning.value = false
       })
       getCode()
-      getApplication(data.client_id || params.value.client_id)
+      getApplication(data?.client_id || params.value.client_id)
     } else {
       setTimeout(() => {
         spinning.value = false
       })
     }
   } else {
-    getApplication(data.client_id || params.value.client_id)
+    getApplication(data?.client_id || params.value.client_id)
     setTimeout(() => {
       spinning.value = false
     })
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
index a4e76bda..0b2c811d 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
@@ -1,6 +1,6 @@
 <template>
   <j-menu class='scene-dropdown-menus' @click='click' :selectedKeys='[myValue]'>
-    <j-menu-item v-for='item in myOptions' :key='item.value' :title='item.label'>
+    <j-menu-item v-for='item in myOptions' :key='item[valueName]' :value='item.value' :title='item.label'>
       <div>
         <Ellipsis >
           {{ item.label }}
@@ -63,12 +63,11 @@ const handleBoolean = (key: string) => {
 }
 
 const click = (e: any) => {
-  let _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key
-  if (isString(_key) && _key.startsWith('[') && _key.endsWith(']')) {
-    _key = JSON.parse(_key)
-  }
-  const option = getOption(myOptions.value, _key, props.valueName)
-  myValue.value = e.key
+  let _key = ['true', 'false'].includes(e.item?.value) ? handleBoolean(e.item?.value) : e.item?.value
+  const findKeyValue = e.key
+  const findKey = ['true', 'false'].includes(findKeyValue) ? handleBoolean(findKeyValue) : findKeyValue
+  const option = getOption(myOptions.value, findKey, props.valueName)
+  myValue.value = findKeyValue
   emit('update:value', _key)
   emit('click', _key, {
     key: _key,
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
index fe4b3c77..47e5654a 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -39,7 +39,7 @@
                   v-if='(["metric", "upper"].includes(item.key) ?  metricOptions : options).length'
                   :options='["metric", "upper"].includes(item.key) ?  metricOptions : options'
                   :value='myValue'
-                  :valueName='valueName'
+                  :valueName='props.source === "metric" ? "id" : valueName'
                   @click='onSelect'
                 />
                 <div class='scene-select-empty' v-else>
@@ -114,7 +114,7 @@ const visible = ref(false)
 
 nextTick(() => {
   mySource.value = props.source
-  myValue.value = props.value
+  myValue.value =  props.source === 'metric' ? props.metric : props.value
 })
 
 const tabsChange = (e: string) => {
@@ -143,6 +143,7 @@ const valueItemChange = (e: string) => {
 const onSelect = (e: string, option: any) => {
   visible.value = false
   label.value = option[props.labelName]
+  console.log(e, option)
   emit('update:value', e)
   emit('select', e, label.value, { 0: label.value }, option)
 }
@@ -160,18 +161,22 @@ const visibleChange = (v: boolean) => {
 
 watchEffect(() => {
   const _options = ['metric', 'upper'].includes(props.source) ? props.metricOptions : props.options
-  const option = getOption(_options, props.value as string, props.valueName) // 回显label值
-  myValue.value = props.value
+  const isMetric = props.source === 'metric' // 是否为指标值
+  const _value = isMetric ? props.metric : props.value
+  const _valueName = isMetric ? 'id' : props.valueName
+  const option = getOption(_options, _value as string, _valueName) // 回显label值
+  myValue.value = isMetric ? props.metric : props.value
   mySource.value = props.source
+  console.log(option)
   if (option) {
     label.value = option[props.labelName] || option.name
     treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName)
   } else {
-    let doubleNull = false
-    if (isArray(props.value)) {
-      doubleNull = !!props.value.filter(item => !!item).length
+    if (isMetric) { // 处理指标值回显
+      label.value = props.metric !== undefined ? props.value : props.placeholder
+    } else {
+      label.value = props.value !== undefined ? props.value : props.placeholder
     }
-    label.value = props.value !== undefined && !doubleNull ? props.value : props.placeholder
   }
 })
 
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts
index 35974dbb..02010315 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts
@@ -53,5 +53,9 @@ export const defaultSetting = {
   tabsOptions: {
     type: Array as PropType<Array<TabsOption>>,
     default: () => []
+  },
+  metric: {
+    type: String,
+    default: undefined
   }
 }
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index f3cce4e1..2e7ace7c 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -54,6 +54,7 @@
         :options='valueOptions'
         :metricOptions='metricOption'
         :tabsOptions='tabsOptions'
+        :metric='paramsValue.value?.metric'
         v-model:value='paramsValue.value.value'
         v-model:source='paramsValue.value.source'
         @select='valueSelect'

From 2a4ba56ce4cf1da89f19ef0ff435ff07255b29df Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 4 May 2023 15:38:32 +0800
Subject: [PATCH 06/10] fix: bug#12884

---
 .../rule-engine/Scene/Save/action/Notify/variableItem/User.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
index d2bc13b6..27b809b2 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
@@ -344,7 +344,7 @@ const onChange = (
         }
     } else {
       const item = treeDataMap.get(_value)
-      const _isRelation = item.isRelation
+      const _isRelation = item?.isRelation
         _values = getObj(_source, _value, _isRelation);
     }
     emit('update:value', _values);

From 69a9ce08664475d41fca081cc9adb65733eb7eda Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 4 May 2023 16:31:39 +0800
Subject: [PATCH 07/10] fix: bug#11981

---
 .../Instance/Detail/Info/components/Tags/index.vue    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/device/Instance/Detail/Info/components/Tags/index.vue b/src/views/device/Instance/Detail/Info/components/Tags/index.vue
index c52bbdb7..4316a707 100644
--- a/src/views/device/Instance/Detail/Info/components/Tags/index.vue
+++ b/src/views/device/Instance/Detail/Info/components/Tags/index.vue
@@ -19,7 +19,7 @@
                 <template #label>
                     <Ellipsis>{{ `${item.name}（${item.key})` }}</Ellipsis>
                 </template>
-                <Ellipsis>{{ item?.value }}</Ellipsis>
+                <Ellipsis>{{ findName(item) }}</Ellipsis>
             </j-descriptions-item>
         </j-descriptions>
         <Save v-if="visible" @close="visible = false" @save="saveBtn" />
@@ -46,4 +46,13 @@ const saveBtn = () => {
         instanceStore.refresh(instanceStore.current.id);
     }
 };
+
+const findName = (item: any) => {
+  let name = undefined
+  if (item.dataType) {
+    const _element = item.dataType.elements?.find((a: any) => a.value === item.value)
+    name = _element?.text
+  }
+  return name
+}
 </script>

From 4200ea9711b9a1966064c6e08f92f142a56ca789 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 4 May 2023 16:40:49 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E8=83=8C=E6=99=AF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/ComprehensiveHome/index.vue | 2 +-
 src/views/home/components/PlatformPicCard.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/home/components/ComprehensiveHome/index.vue b/src/views/home/components/ComprehensiveHome/index.vue
index 9084ccc1..0cf23b9c 100644
--- a/src/views/home/components/ComprehensiveHome/index.vue
+++ b/src/views/home/components/ComprehensiveHome/index.vue
@@ -14,7 +14,7 @@
                     <j-col :span="12"><DeviceCountCard /></j-col>
                     <j-col :span="12"><BasicCountCard /></j-col>
                     <j-col :span="24" style="margin-top: 24px">
-                        <PlatformPicCard image="/images/home/content1.svg" />
+                        <PlatformPicCard image="/images/home/content.png" />
                     </j-col>
                 </j-row>
             </j-col>
diff --git a/src/views/home/components/PlatformPicCard.vue b/src/views/home/components/PlatformPicCard.vue
index 4d59b4e4..085a764e 100644
--- a/src/views/home/components/PlatformPicCard.vue
+++ b/src/views/home/components/PlatformPicCard.vue
@@ -45,7 +45,7 @@ const props = defineProps({
         width: 100%;
         height: calc(100% - 50px);
         margin-top: 40px;
-        background-size: contain;
+        background-size: 95%;
         background-position: center;
         background-repeat: no-repeat;
     }

From 0fca64771a24bfcce23ea1ebc075b0997cc2cdfa Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 4 May 2023 16:48:04 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E4=BD=9C=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rule-engine/Scene/Save/action/ListItem/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
index 923d1cdc..c923dba6 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
@@ -84,7 +84,7 @@ const onSave = (data: any, options?: any) => {
         key: data.key,
         options: {
           ...options,
-          columns: options.otherColumns.filter((item?: string) => item)
+          columns: options.otherColumns?.filter((item?: string) => item) || []
         },
     };
     emit('add', item)

From 030c6b792140f9f62bdedda105a30af6885cbfa4 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 4 May 2023 18:06:46 +0800
Subject: [PATCH 10/10] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E4=BD=9C=E8=81=94=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/action/ListItem/CheckItem.vue  | 63 +++++++++++++++++--
 .../Scene/Save/action/ListItem/Item.vue       | 12 ++--
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
index 2ea815b5..981c7909 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
@@ -11,6 +11,7 @@ import { query as deviceQuery } from '@/api/device/instance'
 import noticeConfig from '@/api/notice/config'
 import noticeTemplate from '@/api/notice/template'
 import { Form } from 'jetlinks-ui-components'
+import { EventEmitter, EventSubscribeKeys } from '@/views/rule-engine/Scene/Save/util'
 const sceneStore = useSceneStore();
 const { data: _data } = storeToRefs(sceneStore);
 
@@ -31,6 +32,8 @@ const props = defineProps({
   },
 });
 
+const sub = ref()
+
 const rules = [{
   validator(_: any, v?: ActionsType) {
     console.log('validator',v)
@@ -62,7 +65,6 @@ const checkDeviceDelete = async () => {
     return
   }
   if (item?.selector === 'fixed') {
-    console.log(item)
     const deviceList = item!.selectorValues?.map(item => item.value) || []
     const deviceResp = await deviceQuery({ terms: [{ terms: [{ column: 'id', termType: 'in', value: deviceList.toString() }]}]})
     if (deviceResp.success && (deviceResp.result as any)?.total < (item!.selectorValues?.length || 0)) { // 某一个设备被删除
@@ -71,6 +73,19 @@ const checkDeviceDelete = async () => {
       return
     }
   }
+
+  if (item!.source === 'upper') { // 如果是按变量，校验上一个设备输出的产品id
+    if (props.name === 0) {
+      formTouchOff()
+      return
+    } else {
+      const prevItem = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].device
+      if (prevItem?.productId !== item?.productId) {
+        formTouchOff()
+        return
+      }
+    }
+  }
 }
 
 /**
@@ -92,14 +107,52 @@ const checkNoticeDelete = async () => {
   }
 }
 
-nextTick(() => {
+const check = () => {
   const _executor = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.executor
-  if (_executor === 'device' && _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.device) {
+  if (_executor === 'device' && _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.device) { // 设备输出，并且有值
     checkDeviceDelete()
   } else if (_executor === 'notify' && _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.notify) {
-    checkNoticeDelete
+    checkNoticeDelete()
   }
-})
+}
+
+const checkPrevData = (data: any) => {
+  console.log(data)
+  const _executor = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.executor
+  if (_executor === 'device' && _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.device) { // 设备输出，并且有值
+    // 校验内置参数
+    // 按变量时，需校验产品id是否一致
+
+  } else if (_executor === 'notify' && _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.notify) {
+    // 校验内置参数
+  }
+}
+
+const subscribe = (newName: number, oldName: number) => {
+  const _key = EventSubscribeKeys({
+    branch: props.branchesName,
+    branchGroup: props.thenName,
+    action: props.name - 1
+  })
+
+  if (sub.value) {
+    const oldKey = EventSubscribeKeys({
+      branch: props.branchesName,
+      branchGroup: props.thenName,
+      action: oldName - 1
+    })
+
+    sub.value.unSubscribe(oldKey, checkPrevData)
+  }
+
+  sub.value = EventEmitter.subscribe(_key, checkPrevData)
+}
+
+watch(() => props.name, (newName, oldName) => {
+  // subscribe(newName, oldName || 0)
+}, { immediate: true })
+
+check()
 
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
index 133e2256..f3464456 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -445,11 +445,11 @@ const emit = defineEmits(['delete', 'update']);
 const visible = ref<boolean>(false);
 const triggerVisible = ref<boolean>(false);
 const actionType = ref('');
-const eventEmitterKey = EventEmitterKeys({
+const eventEmitterKey = ref(EventEmitterKeys({
   branch: props.branchesName,
   branchGroup: props.thenName,
   action: props.name
-})
+}))
 const formItemContext = Form.useInjectFormItemContext()
 const termsOptions = computed(() => {
     if (!props.parallel) {
@@ -464,7 +464,7 @@ const termsOptions = computed(() => {
 
 const onDelete = () => {
     const key = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].key
-    EventEmitter.emit(key!, { isDelete: true })
+    EventEmitter.emit(key!, { isDelete: true }) // 发布消息
     if (props.name !== 0 && !props.parallel) { // 清空上一个串行执行动作中的options.termsColumns和terms
       _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].options!.termsColumns = []
       _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].options!.terms = []
@@ -524,7 +524,6 @@ const onType = (_type: string) => {
  */
 const onSave = (data: ActionsType, options: any) => {
   const { key, terms } = _data.value.branches![props.branchesName].then?.[props.thenName].actions?.[props.name]
-  console.log({...props.options, ...options})
 
   const columns = new Set([...(props.options?.termsColumns || []), ...(options.otherColumns.filter((item?: string) => item))])
 
@@ -535,14 +534,11 @@ const onSave = (data: ActionsType, options: any) => {
     terms
   }
 
-  console.log(actionItem)
   _data.value.branches![props.branchesName].then[props.thenName].actions.splice(props.name, 1, actionItem)
 
   visible.value = false;
 
-  if (props.parallel === false) { // 串行
-    EventEmitter.emit(eventEmitterKey, data)
-  }
+  EventEmitter.emit(eventEmitterKey.value, data) // 发布消息
 };
 
 /**