Merge branch 'dev'

# Conflicts:
#	src/views/system/Menu/Setting/utils.ts

src/views/device/Instance/Detail/Function/index.vue

@@ -1,6 +1,6 @@
 <template>
     <j-empty
-        v-if="!metadata || (metadata && !metadata.functions.length)"
+        v-if="!metadata || (metadata && !metadata.functions?.length)"
         style="margin-top: 50px"
     >
         <template #description>

src/views/device/Instance/Detail/Parsing/index.vue

@@ -318,10 +318,17 @@ const debug = () => {
     }
 };
 
-onMounted(() => {
+// onMounted(() => {
+//     getDeviceCode();
+//     getTopic();
+// });
+
+watch(() => instanceStore.current?.id, () => {
+  if (instanceStore.current?.id) {
     getDeviceCode();
     getTopic();
-});
+  }
+}, { immediate: true })
 </script>
 
 <style scoped lang='less'>

src/views/device/Instance/Detail/Running/Property/Save.vue

@@ -1,5 +1,5 @@
 <template>
-    <j-modal 
+    <j-modal
         :maskClosable="false"
         :visible="true"
         title="编辑"
@@ -7,80 +7,111 @@
         @cancel="handleCancel"
         :confirmLoading="loading"
     >
-        <j-alert message="当数据来源为设备时，填写的值将下发到设备" type="warning" showIcon />
+        <j-alert
-        <j-form :rules="rules" layout="vertical" ref="formRef" :model="modelRef" style="margin-top: 20px">
+            message="当数据来源为设备时，填写的值将下发到设备"
-            <j-form-item name="propertyValue" :label="data?.name || '自定义属性'">
+            type="warning"
+            showIcon
+        />
+        <j-form
+            :rules="rules"
+            layout="vertical"
+            ref="formRef"
+            :model="modelRef"
+            style="margin-top: 20px"
+        >
+            <j-form-item
+                name="propertyValue"
+                :label="data?.name || '自定义属性'"
+            >
                 <ValueItem
                     v-model:modelValue="modelRef.propertyValue"
                     :itemType="data?.valueType?.type || data?.dataType"
-                    :options="
+                    :options="options"
-                        (data?.valueType?.type || data?.dataType) === 'enum'
-                            ? (data?.valueType?.elements || []).map((item) => {
-                                    return {
-                                        label: item?.text,
-                                        value: item?.value
-                                    };
-                                })
-                            : undefined
-                    "
                 />
             </j-form-item>
         </j-form>
-    </j-modal> 
+    </j-modal>
 </template>
 
 <script lang="ts" setup>
-import { setProperty } from '@/api/device/instance'
+import { setProperty } from '@/api/device/instance';
-import { useInstanceStore } from "@/store/instance"
+import { useInstanceStore } from '@/store/instance';
 import { message } from 'jetlinks-ui-components';
 
 const props = defineProps({
     data: {
         type: Object,
-        default: () => {}
+        default: () => {},
-    }
+    },
-})
+});
 
 const emit = defineEmits(['close']);
 
-const loading = ref<boolean>(false)
+const loading = ref<boolean>(false);
-const instanceStore = useInstanceStore()
+const instanceStore = useInstanceStore();
 
 const formRef = ref();
 
 const modelRef = reactive({
-    propertyValue: undefined
+    propertyValue: undefined,
 });
 
 const handleCancel = () => {
-    emit('close')
+    emit('close');
-}
+};
+
+const options = computed(() => {
+    const _type = props.data?.valueType?.type || props.data?.dataType;
+    if (_type === 'enum') {
+        return (props.data?.valueType?.elements || []).map((item: any) => {
+            return {
+                label: item?.text,
+                value: item?.value,
+            };
+        });
+    }
+    if (_type === 'boolean') {
+        return [
+            {
+                label: props.data?.valueType?.falseText,
+                value: props.data?.valueType?.falseValue,
+            },
+            {
+                label: props.data?.valueType?.trueText,
+                value: props.data?.valueType?.trueValue,
+            }
+        ];
+    }
+    return undefined;
+});
 
 const rules = {
     propertyValue: [
         {
             required: true,
             message: '该字段是必填字段',
-        }
+        },
     ],
-}
+};
 
 const handleSave = () => {
     formRef.value
         .validate()
         .then(async () => {
             loading.value = true;
-            const resp = await setProperty(instanceStore.current?.id || '', {[props.data?.id]: toRaw(modelRef)?.propertyValue}).finally(() => {
+            const resp = await setProperty(instanceStore.current?.id || '', {
-                loading.value = false
+                [props.data?.id]: toRaw(modelRef)?.propertyValue,
-            })
+            }).finally(() => {
+                loading.value = false;
+            });
             if (resp.status === 200) {
                 message.success('操作成功！');
-                emit('close')
+                emit('close');
                 formRef.value.resetFields();
             }
         })
         .catch((err: any) => {
             console.log('error', err);
         });
-}
+};
 </script>

src/views/device/Instance/Detail/Running/Property/index.vue

@@ -5,6 +5,7 @@
             :request="query"
             :params="_params"
             :bodyStyle="{ padding: '0 0 0 20px' }"
+            :scroll="{y : 400}"
         >
             <template #headerTitle>
                 <j-input-search
@@ -75,7 +76,7 @@
 </template>
 
 <script lang="ts" setup>
-import _, { groupBy, toArray } from 'lodash-es';
+import _, { groupBy, throttle, toArray } from 'lodash-es';
 import { PropertyData } from '../../../typings';
 import PropertyCard from './PropertyCard.vue';
 import ValueRender from './ValueRender.vue';
@@ -137,7 +138,7 @@ const _params = reactive({
 
 const subRef = ref();
 
-const list = ref<any[]>([]);
+// const list = ref<any[]>([]);
 
 const getActions = (data: Partial<Record<string, any>>) => {
     const arr = [];
@@ -213,15 +214,21 @@ const getActions = (data: Partial<Record<string, any>>) => {
     return arr;
 };
 
-// const valueChange = (arr: Record<string, any>[]) => {
+const valueChange = (arr: Record<string, any>[]) => {
-//     (arr || [])
+    (arr || [])
-//         .sort((a: any, b: any) => a.timestamp - b.timestamp)
+        .sort((a: any, b: any) => a.timestamp - b.timestamp)
-//         .forEach((item: any) => {
+        .forEach((item: any) => {
-//             const { value } = item;
+            const { value } = item;
-//             propertyValue.value[value?.property] = { ...item, ...value };
+            propertyValue.value[value?.property] = { ...item, ...value };
-//         });
+        });
-//     list.value = []
+};
-// };
+
+let messageCache = new Map()
+
+const throttleFn = throttle(() => {
+    const _list = [...messageCache.values()]
+    valueChange(_list)
+}, 500)
 
 const subscribeProperty = () => {
     const id = `instance-info-property-${instanceStore.current.id}-${
@@ -235,22 +242,26 @@ const subscribeProperty = () => {
     })
         ?.pipe(map((res: any) => res.payload))
         .subscribe((payload) => {
-            list.value = [...list.value, payload];
+            if(payload.value?.property) {
-            unref(list)
+                messageCache.set(payload.value?.property, payload)
-                .sort((a: any, b: any) => a.timestamp - b.timestamp)
+                throttleFn()
-                .forEach((item: any) => {
+            }
-                    const { value } = item;
+            // unref(list)
-                    propertyValue.value[value?.property] = {
+            //     .sort((a: any, b: any) => a.timestamp - b.timestamp)
-                        ...item,
+            //     .forEach((item: any) => {
-                        ...value,
+            //         const { value } = item;
-                    };
+            //         propertyValue.value[value?.property] = {
-                });
+            //             ...item,
+            //             ...value,
+            //         };
+            //     });
             // list.value = [...list.value, payload];
             // throttle(valueChange(list.value), 500);
         });
 };
 
 const getDashboard = async () => {
+    if(!dataSource.value?.length) return 
     const param = [
         {
             dashboard: 'device',
@@ -287,6 +298,7 @@ const getDashboard = async () => {
             });
         propertyValue.value = { ...unref(propertyValue), ...obj };
     }
+    subRef.value && subRef.value?.unsubscribe();
     subscribeProperty();
     loading.value = false;
 };
@@ -302,9 +314,11 @@ const query = (params: Record<string, any>) =>
             });
             arr = _.cloneDeep(li);
         }
+        dataSource.value = arr.slice(_from, _to)
+        messageCache.clear()
         resolve({
             result: {
-                data: arr.slice(_from, _to),
+                data: dataSource.value,
                 pageIndex: params.pageIndex || 0,
                 pageSize: params.pageSize || 12,
                 total: arr.length,

src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue

@@ -17,7 +17,7 @@
                 <FunctionItem
                     :builtInList="builtInList"
                     @change="onChange"
-                    :source="record.source"
+                    v-model:source="record.source"
                     :data="record"
                     v-model:value="record.value"
                 />

src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue

@@ -152,8 +152,8 @@ const checkDeviceDelete = async () => {
 
   if (item!.message!.messageType === 'WRITE_PROPERTY') {
     let hasProperties = false
+    const propertiesKey = Object.keys(item!.message!.properties!)?.[0]
     if (item!.message!.properties && metadata.properties.length) {
-      const propertiesKey = Object.keys(item!.message!.properties!)?.[0]
       hasProperties = metadata.properties?.some((item: any) => item.id === propertiesKey)
     }
     if (!hasProperties) {
@@ -162,6 +162,22 @@ const checkDeviceDelete = async () => {
       formTouchOff()
       return
     }
+    // 判断值-内置参数
+    const _value = item!.message!.properties?.[propertiesKey]
+    if(_value.source === 'upper') {
+      const _params = {
+        branch: props.thenName,
+        branchGroup: props.branchesName,
+        action: props.name - 1,
+      };
+      const option = (await getBuildInData(_params, _data.value))(_value?.value!, 'id')
+      if(!option) {
+        _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.message!.properties![propertiesKey] = undefined
+        _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.changeData = true
+        formTouchOff()
+        return
+      }
+    }
   }
 
   if (item!.message!.messageType === 'INVOKE_FUNCTION') {

src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue

@@ -274,7 +274,7 @@ const getUser = async (_source: string, _triggerType: string) => {
             children: relationResp.result.map((item: any) => {
                 const obj = {
                     ...item,
-                    value: item.id,
+                    value: item.relation,
                     key: item.id,
                     title: item.name,
                     isRelation: true,

src/views/system/Menu/Setting/utils.ts

@@ -40,7 +40,7 @@ export const mergeArr = (oldData: Array<any>, newData: Array<any>) => {
         }
 
         if(oldItem && newItem){
-            oldItem = { ...oldData,...omit(newItem, ['children'])} 
+            oldItem.sortIndex = newItem?.sortIndex
         }
 
         if (!oldItem.children && newItem.children) {