fix: 修改执行动作设备输出-内置参数

src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue

@@ -7,7 +7,7 @@
         :pagination="false"
     >
         <template #bodyCell="{ column, text, record }">
-            <div style="width: 280px">
+            <div>
                 <template v-if="['valueType', 'name'].includes(column.dataIndex)">
                     <span>{{ text }}</span>
                 </template>

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

@@ -214,7 +214,7 @@ defineExpose({ saveBtn });
 
 <style lang="less" scoped>
 .function {
-    padding: 15px;
+    padding: 24px 15px 0 15px;
     background-color: #e7eaec;
 }
 </style>

src/views/device/Instance/Detail/Diagnose/Message/index.vue

@@ -30,7 +30,7 @@
         <j-col :span="8">
             <div class="right-log">
                 <TitleComponent data="日志" />
-                <div :style="{ marginTop: '10px' }">
+                <div class="right-log-box">
                     <template v-if="logList.length">
                         <Log
                             v-for="item in logList"
@@ -38,7 +38,9 @@
                             :key="item.key"
                         />
                     </template>
-                    <j-empty v-else />
+                    <div v-else class="right-log-box-empty">
+                        <j-empty />
+                    </div>
                 </div>
             </div>
         </j-col>
@@ -187,8 +189,21 @@ onUnmounted(() => {
     padding-left: 20px;
     border-left: 1px solid rgba(0, 0, 0, 0.09);
     overflow: hidden;
-    max-height: 600px;
+    height: 100%;
     overflow-y: auto;
     min-height: 400px;
+
+    .right-log-box {
+        padding-top: 10px;
+        height: calc(100% - 40px);
+        width: 100%;
+        .right-log-box-empty {
+            height: 100%;
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    }
 }
 </style>

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

@@ -36,10 +36,10 @@
                         placeholder="请选择"
                         :options="handleOptions"
                         :tabsOptions="tabOptions"
-                        :metricOption="upperOptions"
+                        :metricOptions="upperOptions"
                         v-model:value="propertyModelRef.propertiesValue"
                         v-model:source="propertyModelRef.source"
-                        @change="onValueChange"
+                        @select="onValueChange"
                     >
                         <template v-slot="{ label }">
                             <j-input :value="label" />

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

@@ -52,7 +52,7 @@
                     <j-select
                         showSearch
                         placeholder="请选择属性"
-                        v-model:value="modelRef.message.properties"
+                        v-model:value="modelRef.message.properties[0]"
                     >
                         <j-select-option
                             v-for="item in metadata?.properties || []"
@@ -80,9 +80,9 @@ import TopCard from '../device/TopCard.vue';
 import { detail } from '@/api/device/instance';
 import EditTable from './EditTable.vue';
 import WriteProperty from './WriteProperty.vue';
-import { queryBuiltInParams } from '@/api/rule-engine/scene';
 import { useSceneStore } from '@/store/scene';
 import { storeToRefs } from 'pinia';
+import { getParams } from '../../../util'
 
 const sceneStore = useSceneStore();
 const { data } = storeToRefs(sceneStore);
@@ -121,7 +121,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    branchesName: {
         type: Number,
         default: 0,
     },
@@ -131,7 +131,7 @@ const formRef = ref();
 
 const modelRef = reactive({
     message: {
-        messageType: undefined,
+        messageType: 'INVOKE_FUNCTION',
         functionId: undefined,
         properties: undefined,
         inputs: [],
@@ -166,7 +166,7 @@ const _property = computed(() => {
                 Object.keys(modelRef.message.properties || {})?.[0] === item.id
             );
         }
-        return modelRef.message?.properties === item.id;
+        return modelRef.message?.properties?.[0] === item.id;
     });
     return _item;
 });
@@ -178,18 +178,26 @@ const _function = computed(() => {
     return _item;
 });
 
+const queryBuiltIn = async () => {
+    const _params = {
+        branch: props.thenName,
+        branchGroup: props.branchesName,
+        action: props.name - 1,
+    };
+    const _data = await getParams(_params, unref(data));
+    builtInList.value = _data
+};
+
 const onMessageTypeChange = (val: string) => {
-    if (['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(val)) {
+    const flag = ['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(val)
-        const _params = {
+    modelRef.message = {
-            branch: props.thenName,
+        messageType: val,
-            branchGroup: props.branchGroup,
+        functionId: undefined,
-            action: props.name - 1,
+        properties:(flag ? undefined : []) as any,
-        };
+        inputs: [],
-        queryBuiltInParams(unref(data), _params).then((res: any) => {
+    };
-            if (res.status === 200) {
+    if (flag) {
-                builtInList.value = res.result;
+        queryBuiltIn();
-            }
-        });
     }
 };
 
@@ -223,10 +231,9 @@ watch(
     (newVal) => {
         if (newVal?.messageType) {
             modelRef.message = newVal;
-            if (newVal.messageType === 'READ_PROPERTY') {
+            if (['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(newVal.messageType)) {
-                modelRef.message.properties = newVal.properties?.[0];
+                queryBuiltIn();
             }
-            onMessageTypeChange(newVal.messageType);
         }
     },
     { immediate: true },
@@ -238,18 +245,16 @@ const onFormSave = () => {
             .validate()
             .then((_data: any) => {
                 // 处理三种情况的值的格式
-                const _properties = _data.message.properties || modelRef.message.properties
                 const obj = {
                     message: {
                         ...modelRef.message,
                         ..._data.message,
-                        properties: _data.message.messageType === 'READ_PROPERTY' ? [_properties] : _properties,
                         propertiesName:
                             deviceMessageType.value === 'INVOKE_FUNCTION'
                                 ? _function.value?.name
                                 : _property.value?.name,
                     },
-                }
+                };
                 resolve(obj);
             })
             .catch((err: any) => {

src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue

@@ -61,7 +61,7 @@
                         </j-button>
                         <j-button
                             danger
-                            v-if="tagData.length > 1"
+                            v-if="tagList.length > 1"
                             style="padding: 0 8px"
                             @click="deleteItem(index)"
                         >
@@ -109,6 +109,7 @@ const addItem = () => {
 
 const deleteItem = (_index: number) => {
     tagList.value.splice(_index, 1);
+    onValueChange();
 };
 
 const onTypeSelect = (key: any, _index: number) => {
@@ -168,26 +169,23 @@ watch(
 );
 
 const onValueChange = () => {
-    const newValue = tagList.value
+    const _data = tagList.value.filter((item) => !!item.value);
-        .filter((item) => !!item.value)
+    const newValue = _data.map((item: any) => {
-        .map((item: any) => {
+        return {
-            return {
+            column: item.id,
-                column: item.id,
+            type: item.type,
-                type: item.type,
+            value: item.value,
-                value: item.value,
+        };
-            };
+    });
-        });
+    const arr = _data.map((item: any) => {
-    const arr = newValue
+        return {
-        .filter((item) => !!item.value)
+            column: item.name,
-        .map((item: any) => {
+            type: item.type,
-            return {
+            value: item.value,
-                column: item.name,
+        };
-                type: item.type,
+    });
-                value: item.value,
-            };
-        });
     emits('update:value', [{ value: newValue, name: '标签' }]);
-    emits('change', [{ value: newValue, name: '标签' }], undefined);
+    emits('change', [{ value: newValue, name: '标签' }], arr);
 };
 </script>
 

src/views/rule-engine/Scene/Save/action/Device/device/index.vue

@@ -30,7 +30,10 @@
                 name="selectorValues"
                 :rules="[{ required: true, message: '请选择关系' }]"
             >
-                <RelationSelect @change="onRelationChange" v-model:value="modelRef.selectorValues" />
+                <RelationSelect
+                    @change="onRelationChange"
+                    v-model:value="modelRef.selectorValues"
+                />
             </j-form-item>
             <j-form-item
                 v-else-if="modelRef.selector === 'tag'"
@@ -75,12 +78,13 @@
 import { useSceneStore } from '@/store/scene';
 import TopCard from './TopCard.vue';
 import { storeToRefs } from 'pinia';
-import { queryBuiltInParams } from '@/api/rule-engine/scene';
 import { getImage } from '@/utils/comm';
 import NoticeApi from '@/api/notice/config';
 import Device from './Device.vue';
 import Tag from './Tag.vue';
-import RelationSelect from './RelationSelect.vue'
+import RelationSelect from './RelationSelect.vue';
+import { getParams } from '../../../util';
+import { handleParamsData } from '../../../components/Terms/util';
 
 const props = defineProps({
     values: {
@@ -95,7 +99,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    branchesName: {
         type: Number,
         default: 0,
     },
@@ -185,15 +189,18 @@ const filterTree = (nodes: any[]) => {
 const sourceChangeEvent = async () => {
     const _params = {
         branch: props.thenName,
-        branchGroup: props.branchGroup,
+        branchGroup: props.branchesName,
         action: props.name - 1,
     };
-    const resp = await queryBuiltInParams(unref(data), _params);
+    //判断相同产品才有按变量
-    if (resp.status === 200) {
+    const productId =
-        const array = filterTree(resp.result as any[]);
+        data.value?.branches?.[props.branchesName].then?.[props.thenName]
-        //判断相同产品才有按变量
+            ?.actions?.[props.name > 0 ? props.name - 1 : 0]?.device?.productId;
-        // if (props.formProductId === DeviceModel.productId)// TODO
+    if (productId === props.values?.productDetail?.id) {
-        builtInList.value = [] // array;
+        const _data = await getParams(_params, unref(data));
+        builtInList.value = handleParamsData(filterTree(_data), 'id');
+    } else {
+        builtInList.value = [];
     }
 };
 
@@ -277,16 +284,13 @@ const onTagChange = (val: any[], arr: any[]) => {
         modelRef.deviceId = 'deviceId';
         modelRef.source = 'fixed';
     }
-    if (arr) {
+    emits('save', unref(modelRef), {}, arr ? { tagList: arr } : {});
-        tagList.value = arr;
-    }
-    emits('save', unref(modelRef), {}, {tagList: tagList.value});
 };
 
 const onVariableChange = (val: any, node: any) => {
     modelRef.deviceId = val;
-    emits('save', unref(modelRef), node);
     modelRef.selectorValues = [{ value: val, name: node.description }] as any;
+    emits('save', unref(modelRef), node);
 };
 
 watchEffect(() => {

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

@@ -29,7 +29,7 @@
                 v-else-if="current === 1"
                 :name="name"
                 :parallel="parallel"
-                :branchGroup="branchGroup"
+                :branchesName="branchesName"
                 :thenName="thenName"
                 :values="DeviceModel"
                 @save="onDeviceSave"
@@ -38,7 +38,7 @@
             <Action
                 v-else-if="current === 2"
                 :name="name"
-                :branchGroup="branchGroup"
+                :branchesName="branchesName"
                 :thenName="thenName"
                 :values="DeviceModel"
                 ref="actionRef"
@@ -91,7 +91,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    branchesName: {
         type: Number,
         default: 0,
     },
@@ -132,18 +132,18 @@ const onCancel = () => {
 
 const onSave = (_data: any) => {
     const item: any = {
-      selector: DeviceModel.selector,
+        selector: DeviceModel.selector,
-      source: DeviceModel.source,
+        source: DeviceModel.source,
-      selectorValues: DeviceModel.selectorValues,
+        selectorValues: DeviceModel.selectorValues,
-      productId: DeviceModel.productId,
+        productId: DeviceModel.productId,
-      message: _data.message,
+        message: _data.message,
     };
     //处理按变量
     if (DeviceModel.selector === 'variable') {
-      item.selector = 'fixed';
+        item.selector = 'fixed';
     }
     if (DeviceModel.selector === 'relation') {
-      item.upperKey = 'scene.deviceId';
+        item.upperKey = 'scene.deviceId';
     }
     const _options: any = {
         name: '-', //设备名称
@@ -158,7 +158,8 @@ const onSave = (_data: any) => {
         columns: [],
         otherColumns: [],
     };
-    _options.name = DeviceModel.deviceDetail?.name || DeviceModel.selectorValues?.[0]?.name;
+    _options.name =
+        DeviceModel.deviceDetail?.name || DeviceModel.selectorValues?.[0]?.name;
     const _type = _data.message.messageType;
     if (_type === 'INVOKE_FUNCTION') {
         _options.type = '执行';
@@ -183,7 +184,14 @@ const onSave = (_data: any) => {
         }
     }
     if (_options.selector === 'tag') {
-        _options.tagList = DeviceModel.tagList.map((it) => ({
+        // const arr = _data.map((item: any) => {
+        //     return {
+        //         column: item.name,
+        //         type: item.type,
+        //         value: item.value,
+        //     };
+        // });
+        _options.taglist = DeviceModel.tagList.map((it) => ({
             name: it.column || it.name,
             type: it.type ? (it.type === 'and' ? '并且' : '或者') : '',
             value: it.value,
@@ -205,10 +213,8 @@ const save = async (step?: number) => {
         if (deviceRef.value) {
             await deviceRef.value?.onFormSave();
             current.value = 2;
-        } else {
+        } else if (DeviceModel.selectorValues.length) {
-            if(DeviceModel.selector === 'fixed' && DeviceModel.selectorValues?.length){
+            current.value = 2;
-                current.value = 2;
-            }
         }
     } else {
         if (actionRef.value) {
@@ -233,7 +239,7 @@ const prev = () => {
 const saveClick = () => save();
 
 const onDeviceSave = (_data: any, _detail: any, obj?: any) => {
-    Object.assign(DeviceModel, {..._data, ...obj});
+    Object.assign(DeviceModel, { ..._data, ...obj });
     DeviceModel.deviceDetail = _detail;
 };
 
@@ -245,6 +251,28 @@ watch(
             detail(newValue.productId).then((resp) => {
                 if (resp.status === 200) {
                     DeviceModel.productDetail = resp.result;
+                    if (
+                        DeviceModel.selector === 'tag' &&
+                        DeviceModel.selectorValues[0]?.value
+                    ) {
+                        const metadata = JSON.parse(
+                            DeviceModel.productDetail?.metadata || '{}',
+                        );
+                        const tags = metadata.tags || [];
+                        const arr = DeviceModel.selectorValues[0]?.value
+                            .filter((item: any) => !!item.value)
+                            .map((item: any) => {
+                                return {
+                                    column:
+                                        tags.find(
+                                            (i: any) => i.id === item.column,
+                                        )?.name || item.column,
+                                    type: item.type,
+                                    value: item.value,
+                                };
+                            });
+                        DeviceModel.tagList = arr;
+                    }
                 }
             });
         }

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

@@ -19,14 +19,16 @@
                     v-if="data?.executor === 'alarm'"
                 >
                     <template v-if="data?.alarm?.mode === 'trigger'">
-                        满足条件后将触发<j-button style="padding: 0;"
+                        满足条件后将触发<j-button
+                            style="padding: 0"
                             type="link"
                             @click.stop="triggerVisible = true"
                             >关联此场景的告警</j-button
                         >
                     </template>
                     <template v-else>
-                        满足条件后将解除<j-button style="padding: 0;"
+                        满足条件后将解除<j-button
+                            style="padding: 0"
                             type="link"
                             @click.stop="triggerVisible = true"
                             >关联此场景的告警</j-button
@@ -278,10 +280,16 @@
                             />
                             {{ data?.options?.type }}
                             <span
-                                v-for="i in data?.options?.taglist || []"
+                                v-for="(i, _index) in data?.options?.taglist ||
+                                []"
                                 :key="i.value"
                             >
-                                {{ i.type }}
+                                {{
+                                    _index !== 0 &&
+                                    _index !==
+                                        (data?.options?.taglist || []).length &&
+                                    i.type
+                                }}
                                 {{ i.name }}为{{ i.value }}
                             </span>
                             的{{ data?.options?.productName }}
@@ -318,28 +326,33 @@
             </j-popconfirm>
         </div>
         <template v-if="!isLast && type === 'serial'">
-            <div :class='["actions-item-filter-warp", termsOptions.length ? "filter-border" : ""]'>
+            <div
-              <template v-if='termsOptions.length'>
+                :class="[
-                <div class='actions-item-filter-warp-tip'>
+                    'actions-item-filter-warp',
-                  满足此条件后执行后续动作
+                    termsOptions.length ? 'filter-border' : '',
+                ]"
+            >
+                <template v-if="termsOptions.length">
+                    <div class="actions-item-filter-warp-tip">
+                        满足此条件后执行后续动作
+                    </div>
+                    <div class="actions-item-filter-overflow">
+                        <FilterGroup
+                            v-for="(item, index) in termsOptions"
+                            :key="item.key"
+                            :branchName="branchesName"
+                            :thenName="thenName"
+                            :actionName="name"
+                            :name="index"
+                            :isLast="index === termsOptions.length - 1"
+                            :isFirst="index === 0"
+                        />
+                    </div>
+                </template>
+                <div v-else class="filter-add-button">
+                    <AIcon type="PlusOutlined" style="padding-right: 4px" />
+                    <span>添加过滤条件</span>
                 </div>
-                <div class='actions-item-filter-overflow'>
-                  <FilterGroup
-                    v-for='(item, index) in termsOptions'
-                    :key='item.key'
-                    :branchName='branchesName'
-                    :thenName='thenName'
-                    :actionName='name'
-                    :name='index'
-                    :isLast='index === termsOptions.length - 1'
-                    :isFirst='index === 0'
-                  />
-                </div>
-              </template>
-              <div v-else class='filter-add-button'>
-                <AIcon type='PlusOutlined' style='padding-right: 4px;' />
-                <span>添加过滤条件</span>
-              </div>
             </div>
         </template>
         <!-- 编辑 -->
@@ -379,8 +392,8 @@ import ActionTypeComponent from '../Modal/ActionTypeComponent.vue';
 import TriggerAlarm from '../TriggerAlarm/index.vue';
 import { useSceneStore } from '@/store/scene';
 import { storeToRefs } from 'pinia';
-import { iconMap, itemNotifyIconMap, typeIconMap } from './util'
+import { iconMap, itemNotifyIconMap, typeIconMap } from './util';
-import FilterGroup from './FilterGroup.vue'
+import FilterGroup from './FilterGroup.vue';
 
 const sceneStore = useSceneStore();
 const { data: _data } = storeToRefs(sceneStore);
@@ -391,8 +404,8 @@ const props = defineProps({
         default: 0,
     },
     thenName: {
-      type: Number,
+        type: Number,
-      default: 0,
+        default: 0,
     },
     name: {
         type: Number,
@@ -422,11 +435,15 @@ const triggerVisible = ref<boolean>(false);
 const actionType = ref('');
 
 const termsOptions = computed(() => {
-  if (!props.parallel) { // 串行
+    if (!props.parallel) {
-    return _data.value.branches![props.branchesName].then?.[props.thenName].actions?.[props.name].terms || []
+        // 串行
-  }
+        return (
-  return []
+            _data.value.branches![props.branchesName].then?.[props.thenName]
-})
+                .actions?.[props.name].terms || []
+        );
+    }
+    return [];
+});
 
 const onDelete = () => {
     emit('delete');
@@ -464,12 +481,14 @@ const onPropsCancel = () => {
     actionType.value = '';
 };
 
-watch(() => props.data, () => {
+watch(
-  if (props.data) {
+    () => props.data,
-
+    () => {
-  }
+        if (props.data) {
-}, { immediate: true, deep: true})
+        }
-
+    },
+    { immediate: true, deep: true },
+);
 </script>
 
 <style lang="less" scoped>
@@ -590,16 +609,16 @@ watch(() => props.data, () => {
     }
 
     .actions-item-filter-warp-tip {
-      position: absolute;
+        position: absolute;
-      top: 0;
+        top: 0;
-      left: 16px;
+        left: 16px;
-      z-index: 2;
+        z-index: 2;
-      color: rgba(0, 0, 0, 0.55);
+        color: rgba(0, 0, 0, 0.55);
-      font-weight: 800;
+        font-weight: 800;
-      font-size: 14px;
+        font-size: 14px;
-      line-height: 1;
+        line-height: 1;
-      background-color: #fff;
+        background-color: #fff;
-      transform: translateY(-50%);
+        transform: translateY(-50%);
     }
 
     .actions-item-filter-overflow {
@@ -610,11 +629,11 @@ watch(() => props.data, () => {
         row-gap: 16px;
     }
 
-    .filter-add-button{
+    .filter-add-button {
-      width: 100%;
+        width: 100%;
-      color: rgba(0, 0, 0, 0.3);
+        color: rgba(0, 0, 0, 0.3);
-      text-align: center;
+        text-align: center;
-      cursor: pointer;
+        cursor: pointer;
     }
 
     .terms-params {

src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <template v-if="actionType === 'device'">
-            <Device v-bind="props" :value="data?.device" @cancel="onCancel" @save="onPropsOk" :thenName="branchesName" />
+            <Device v-bind="props" :value="data?.device" @cancel="onCancel" @save="onPropsOk" />
         </template>
         <template v-else-if="actionType === 'notify'">
             <Notify :options="data?.options" :value="data?.notify" @cancel="onCancel" @save="onPropsOk" />
@@ -24,7 +24,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    thenName: {
         type: Number,
         default: 0,
     },

src/views/rule-engine/Scene/Save/action/Modal/index.vue

@@ -47,7 +47,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    thenName: {
         type: Number,
         default: 0,
     },

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

@@ -279,7 +279,6 @@ const onChange = (
     } else {
         _values = getObj(_source, _value, isRelation);
     }
-    console.log(_values, '_values')
     emit('update:value', _values);
     emit('change', { sendTo: _names.filter((item) => !!item).join(',') });
 };