Commit 19eed2f1ad44abd5c6289d47ccaf0895ec0d77ee

Authored by xp.Huang
2 parents 598787bd 71cb984f

Merge branch 'main_dev' into 'main'

Main dev merge main

See merge request yunteng/thingskit-front!719

Too many changes to show.

To preserve performance only 3 of 512 files are displayed.

@@ -42,3 +42,6 @@ VITE_GLOB_ALARM_NOTIFY_DURATION = 5 @@ -42,3 +42,6 @@ VITE_GLOB_ALARM_NOTIFY_DURATION = 5
42 42
43 # Should Disabled Task Center Execute Interval Unit (Second) 43 # Should Disabled Task Center Execute Interval Unit (Second)
44 VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false 44 VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false
  45 +
  46 +# Software version number
  47 +VITE_GLOB_SOFTWARE_VERSION_NUMBER = 123
@@ -54,3 +54,6 @@ VITE_GLOB_ALARM_NOTIFY_DURATION = 5 @@ -54,3 +54,6 @@ VITE_GLOB_ALARM_NOTIFY_DURATION = 5
54 54
55 # Should Disabled Task Center Execute Interval Unit (Second) 55 # Should Disabled Task Center Execute Interval Unit (Second)
56 VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false 56 VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false
  57 +
  58 +# software version number
  59 +VITE_GLOB_SOFTWARE_VERSION_NUMBER = 123
@@ -5,7 +5,9 @@ @@ -5,7 +5,9 @@
5 "public/resource/tinymce/langs" 5 "public/resource/tinymce/langs"
6 ], 6 ],
7 "cSpell.words": [ 7 "cSpell.words": [
  8 + "Cmds",
8 "COAP", 9 "COAP",
  10 + "echarts",
9 "edrx", 11 "edrx",
10 "EFENTO", 12 "EFENTO",
11 "fingerprintjs", 13 "fingerprintjs",
@@ -23,6 +25,8 @@ @@ -23,6 +25,8 @@
23 "vben", 25 "vben",
24 "videojs", 26 "videojs",
25 "VITE", 27 "VITE",
  28 + "vnode",
  29 + "vueuse",
26 "windicss" 30 "windicss"
27 ] 31 ]
28 } 32 }