fix: bug#12763

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

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
     })

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,

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
   }
 })
 

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
   }
 }

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'