Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-view!221

@@ -112,6 +112,8 @@ export const getDeviceList = (params: any, data?: object) =>
 export const getVideoUrl = (id: string) =>
 export const getVideoUrl = (id: string) =>
   defHttp.get({
   defHttp.get({
     url: `${Api.VIDEOURL}${id}`
     url: `${Api.VIDEOURL}${id}`
+  }, {
+    withShareToken: true
   })
   })
 
 
 //获取行政区域
 //获取行政区域

@@ -31,6 +31,8 @@ export const getVideoControlStart = ({
       url: `${Api.GET_VIDEO_CONTROL_START}/${deviceId}/${channelId}`,
       url: `${Api.GET_VIDEO_CONTROL_START}/${deviceId}/${channelId}`,
       timeout: 30 * 1000,
       timeout: 30 * 1000,
     },
     },
-    {}
+    {
+      withShareToken: true
+    }
   );
   );
 };
 };

@@ -80,7 +80,7 @@
           stroke-dasharray="5, 1"
           stroke-dasharray="5, 1"
         />
         />
         <text x="50" y="55" text-anchor="middle" :style="{ fill: textColor, opacity: 1 }" font-size="14">
         <text x="50" y="55" text-anchor="middle" :style="{ fill: textColor, opacity: 1 }" font-size="14">
-          {{ dataset + unit }}
+          {{ dataset }}{{ unit }}
         </text>
         </text>
       </g>
       </g>
     </svg>
     </svg>
@@ -90,6 +90,9 @@
 import { PropType, toRefs, ref } from 'vue'
 import { PropType, toRefs, ref } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartDataFetch } from '@/hooks'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -99,7 +102,7 @@ const props = defineProps({
 })
 })
 const { w, h } = toRefs(props.chartConfig.attr)
 const { w, h } = toRefs(props.chartConfig.attr)
 
 
-const { mainCicleColor, subCicleColor, dataset, unit, textColor } = toRefs(props.chartConfig.option)
+const { mainCicleColor, subCicleColor, dataset, unit, textColor } = toRefs(props.chartConfig.option as typeof option )
 
 
 const id = Number(Math.random().toString().substring(2, 10) + Date.now()).toString(36)
 const id = Number(Math.random().toString().substring(2, 10) + Date.now()).toString(36)
 
 
@@ -108,6 +111,11 @@ const dur = ref(3)
 const polygonId = ref(`decoration-9-polygon-${id}`)
 const polygonId = ref(`decoration-9-polygon-${id}`)
 
 
 const defaultColor = ref(['rgba(3, 166, 224, 0.8)', 'rgba(3, 166, 224, 0.5)'])
 const defaultColor = ref(['rgba(3, 166, 224, 0.8)', 'rgba(3, 166, 224, 0.5)'])
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -659,6 +659,8 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartDataFetch } from '@/hooks'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -672,6 +674,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { dataset, unitStr, colorConfig, openAnim, duration, fontConfig } = toRefs(
 const { dataset, unitStr, colorConfig, openAnim, duration, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -449,6 +449,8 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -462,6 +464,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -235,6 +235,8 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -248,6 +250,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -2566,6 +2566,8 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -2579,6 +2581,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -1796,6 +1796,9 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
+
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -1809,6 +1812,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -267,6 +267,8 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -280,6 +282,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -595,6 +595,8 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -608,6 +610,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -290,6 +290,8 @@
 import { PropType, toRefs } from 'vue'
 import { PropType, toRefs } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import { option } from './config'
 import { option } from './config'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartDataFetch } from '@/hooks'
 
 
 const props = defineProps({
 const props = defineProps({
   chartConfig: {
   chartConfig: {
@@ -303,6 +305,11 @@ const { w, h } = toRefs(props.chartConfig.attr)
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
 const { colorConfig, openAnim, duration, dataset, unitStr, fontConfig } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
+    dataset.value = newData
+})
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>