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

src/views/DataCollect/Dashboard/components/Card.vue

@@ -52,6 +52,7 @@ const data: any = ref({
 
 const pickerTimeChange = () => {
     data.value.time.type = undefined;
+    console.log(1);
 };
 
 const getEcharts = async (val: any) => {
@@ -108,6 +109,7 @@ const handleOptions = (x = [], y = []) => {
 watch(
     () => data.value.time.type,
     (value) => {
+        if (value === undefined) return;
         const date = getTimeByType(value);
         data.value.time.time = [dayjs(date), dayjs(new Date())];
     },

src/views/link/DashBoard/components/Cpu.vue

@@ -165,6 +165,7 @@ const handleCpuOptions = (optionsData: any, xAxis: any) => {
 watch(
     () => data.value.type,
     (value) => {
+        if (value === undefined) return;
         const date = getTimeByType(value);
         data.value.time = [dayjs(date), dayjs(new Date())];
     },

src/views/link/DashBoard/components/Jvm.vue

@@ -169,6 +169,7 @@ const handleJVMOptions = (optionsData: any, xAxis: any) => {
 watch(
     () => data.value.type,
     (value) => {
+        if (value === undefined) return;
         const date = getTimeByType(value);
         data.value.time = [dayjs(date), dayjs(new Date())];
     },

src/views/link/DashBoard/components/Network.vue

@@ -183,6 +183,7 @@ const handleNetworkOptions = (optionsData: any, xAxis: any) => {
 watch(
     () => data.value.time.type,
     (value) => {
+        if (value === undefined) return;
         const date = getTimeByType(value);
         data.value.time.time = [dayjs(date), dayjs(new Date())];
     },

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

@@ -58,7 +58,7 @@
                         @change="propertySelect"
                     >
                         <j-select-option
-                            v-for="item in metadata?.properties.filter((i) =>
+                            v-for="item in (metadata?.properties || []).filter((i) =>
                                 i?.expands?.type?.includes('read'),
                             ) || []"
                             :value="item?.id"

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

@@ -171,15 +171,12 @@ const handleClick = (_detail: any) => {
     }
 };
 
-watch(() => props.value?.[0]?.value, (newVal) => {
+onMounted(() => {
-    if(newVal){
+    if(props.value?.[0]?.value){
-        detail(newVal).then(resp => {
+        detail(props.value?.[0]?.value).then(resp => {
             emit('change', resp.result);
         })
     }
-}, {
-    deep: true,
-    immediate: true
 })
 
 watchEffect(() => {

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

@@ -180,6 +180,11 @@ const onValueChange = () => {
     emits('update:value', [{ value: newValue, name: '标签' }]);
     emits('change', [{ value: newValue, name: '标签' }], _data);
 };
+
+// onMounted(() => {
+//     // console.log(tagList.value, props.tagData, props.value)
+//     // emits('change', props.value, _data);
+// })
 </script>
 
 <style lang="less" scoped>

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

@@ -285,6 +285,7 @@ const onTagChange = (val: any[], arr: any[]) => {
             i.name
         }为${i.value}`;
     });
+    console.log(tagName)
     emits(
         'save',
         unref(modelRef),

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

@@ -69,7 +69,6 @@ import Product from './Product.vue';
 import Device from './device/index.vue';
 import Action from './actions/index.vue';
 import { onlyMessage } from '@/utils/comm';
-import { detail } from '@/api/device/product';
 
 import { useSceneStore } from '@/store/scene';
 import { storeToRefs } from 'pinia';