Merge branch 'fix/select-empty' into 'main_dev'

perf(src/views): 优化公共接口选择其他接口，表单数据还缓存上一次的数据

See merge request yunteng/thingskit-view!254

@@ -62,6 +62,8 @@ const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSe
 
 
 const { queryCondition } = toRefs(props.chartConfig.option)
 const { queryCondition } = toRefs(props.chartConfig.option)
 
 
+const { limit, startTs, endTs, interval, agg } = toRefs(props.chartConfig.request.requestParams.Params)
+
 use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
 use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
 
 
 const chartEditStore = useChartEditStore()
 const chartEditStore = useChartEditStore()
@@ -286,6 +288,23 @@ const handleAggChange = (value: string) => {
 }
 }
 
 
 onMounted(() => {
 onMounted(() => {
+  if (Reflect.get(props.chartConfig.request.requestParams.Params, 'startTs')) {
+    queryCondition.value.timeRange[0] = startTs.value
+    getPacketIntervalByRange(queryCondition.value.timeRange)
+  }
+  if (Reflect.get(props.chartConfig.request.requestParams.Params, 'endTs')) {
+    queryCondition.value.timeRange[1] = endTs.value
+    getPacketIntervalByRange(queryCondition.value.timeRange)
+  }
+  if (Reflect.get(props.chartConfig.request.requestParams.Params, 'agg')) {
+    queryCondition.value.agg = agg.value
+  }
+  if (Reflect.get(props.chartConfig.request.requestParams.Params, 'interval')) {
+    queryCondition.value.interval = interval.value
+  }
+  if (Reflect.get(props.chartConfig.request.requestParams.Params, 'limit')) {
+    queryCondition.value.limit = limit.value
+  }
   seriesDataMaxLength = dataJson.source.length
   seriesDataMaxLength = dataJson.source.length
   if (props.chartConfig.option.isCarousel) {
   if (props.chartConfig.option.isCarousel) {
     addPieInterval(undefined, true)
     addPieInterval(undefined, true)

@@ -6,6 +6,7 @@ import { chartInitConfig } from '@/settings/designSetting'
 
 
 export const option = {
 export const option = {
   dataset: 80,
   dataset: 80,
+  valueRange: [0, 100],
   unitStr: '个',
   unitStr: '个',
   openAnim: true,
   openAnim: true,
   duration: 3,
   duration: 3,

@@ -12,6 +12,12 @@
         <n-input-number :min="0.1" step="0.5" v-model:value="optionData.duration"></n-input-number>
         <n-input-number :min="0.1" step="0.5" v-model:value="optionData.duration"></n-input-number>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
+    <setting-item-box name="范围">
+      <setting-item name="范围">
+        <n-input-number :min="0" :max="99" v-model:value="optionData.valueRange[0]" />
+        <n-input-number :min="1" :max="100" v-model:value="optionData.valueRange[1]" />
+      </setting-item>
+    </setting-item-box>
     <setting-item-box name="数据源">
     <setting-item-box name="数据源">
       <setting-item name="数据">
       <setting-item name="数据">
         <n-input-number :min="0" :max="100" v-model:value="optionData.dataset" />
         <n-input-number :min="0" :max="100" v-model:value="optionData.dataset" />

@@ -260,7 +260,7 @@
               d="M202.38 399.21C205.97 399.21 208.88 402.12 208.88 405.71C208.88 409.3 205.97 412.21 202.38 412.21C198.79 412.21 195.88 409.3 195.88 405.71C195.88 402.12 198.79 399.21 202.38 399.21L202.38 399.21Z"
               d="M202.38 399.21C205.97 399.21 208.88 402.12 208.88 405.71C208.88 409.3 205.97 412.21 202.38 412.21C198.79 412.21 195.88 409.3 195.88 405.71C195.88 402.12 198.79 399.21 202.38 399.21L202.38 399.21Z"
             />
             />
             <animateMotion
             <animateMotion
-            path="M0,0 L0 -5 L0 -13 L0 -15 L0 -17 L0 -19 L0 -22 L0 -26 L0 -36
+              path="M0,0 L0 -5 L0 -13 L0 -15 L0 -17 L0 -19 L0 -22 L0 -26 L0 -36
             L0 -46 L0 -50  L0 -59 L0 -60 L0 -69 L0 -71 L0 -79 L0 -89 L0 -91 L0 -122 L0 -132 L0 -142 L0 -162 L0 -172 L0 -182 L0 -192
             L0 -46 L0 -50  L0 -59 L0 -60 L0 -69 L0 -71 L0 -79 L0 -89 L0 -91 L0 -122 L0 -132 L0 -142 L0 -162 L0 -172 L0 -182 L0 -192
             "
             "
               begin="1.5s"
               begin="1.5s"
@@ -278,7 +278,7 @@
               d="M231.69 443.18C235.28 443.18 238.19 446.09 238.19 449.68C238.19 453.27 235.28 456.18 231.69 456.18C228.1 456.18 225.19 453.27 225.19 449.68C225.19 446.09 228.1 443.18 231.69 443.18L231.69 443.18Z"
               d="M231.69 443.18C235.28 443.18 238.19 446.09 238.19 449.68C238.19 453.27 235.28 456.18 231.69 456.18C228.1 456.18 225.19 453.27 225.19 449.68C225.19 446.09 228.1 443.18 231.69 443.18L231.69 443.18Z"
             />
             />
             <animateMotion
             <animateMotion
-            path="M0,0 L0 -5 L0 -13 L0 -15 L0 -17 L0 -19 L0 -22 L0 -26 L0 -36
+              path="M0,0 L0 -5 L0 -13 L0 -15 L0 -17 L0 -19 L0 -22 L0 -26 L0 -36
             L0 -46 L0 -50  L0 -59 L0 -60 L0 -69 L0 -71 L0 -79 L0 -89 L0 -91 L0 -122 L0 -132 L0 -142 L0 -162 L0 -172 L0 -182 L0 -192
             L0 -46 L0 -50  L0 -59 L0 -60 L0 -69 L0 -71 L0 -79 L0 -89 L0 -91 L0 -122 L0 -132 L0 -142 L0 -162 L0 -172 L0 -182 L0 -192
             "
             "
               begin="1.5s"
               begin="1.5s"
@@ -296,7 +296,7 @@
               d="M231.69 443.18C235.28 443.18 238.19 446.09 238.19 449.68C238.19 453.27 235.28 456.18 231.69 456.18C228.1 456.18 225.19 453.27 225.19 449.68C225.19 446.09 228.1 443.18 231.69 443.18L231.69 443.18Z"
               d="M231.69 443.18C235.28 443.18 238.19 446.09 238.19 449.68C238.19 453.27 235.28 456.18 231.69 456.18C228.1 456.18 225.19 453.27 225.19 449.68C225.19 446.09 228.1 443.18 231.69 443.18L231.69 443.18Z"
             />
             />
             <animateMotion
             <animateMotion
-            path="M0,0 L0 -5 L0 -13 L0 -15 L0 -17 L0 -19 L0 -22 L0 -26 L0 -36
+              path="M0,0 L0 -5 L0 -13 L0 -15 L0 -17 L0 -19 L0 -22 L0 -26 L0 -36
             L0 -46 L0 -50  L0 -59 L0 -60 L0 -69 L0 -71 L0 -79 L0 -89 L0 -91 L0 -122 L0 -132 L0 -142 L0 -162 L0 -172 L0 -182 L0 -192
             L0 -46 L0 -50  L0 -59 L0 -60 L0 -69 L0 -71 L0 -79 L0 -89 L0 -91 L0 -122 L0 -132 L0 -142 L0 -162 L0 -172 L0 -182 L0 -192
             "
             "
               begin="1.5s"
               begin="1.5s"
@@ -656,7 +656,7 @@
   </div>
   </div>
 </template>
 </template>
 <script setup lang="ts">
 <script setup lang="ts">
-import { PropType, toRefs } from 'vue'
+import { PropType, toRefs, watch } 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 { useChartDataFetch } from '@/hooks'
@@ -671,13 +671,29 @@ const props = defineProps({
 
 
 const { w, h } = toRefs(props.chartConfig.attr)
 const { w, h } = toRefs(props.chartConfig.attr)
 
 
-const { dataset, unitStr, colorConfig, openAnim, duration, fontConfig } = toRefs(
+const { dataset, unitStr, colorConfig, openAnim, duration, fontConfig, valueRange } = toRefs(
   props.chartConfig.option as typeof option
   props.chartConfig.option as typeof option
 )
 )
 
 
+watch(()=>dataset.value,(newData)=>{
+  if((Number(newData)) >= valueRange.value[1]){
+    newData = valueRange.value[1]
+  }
+  if((Number(newData)) <= valueRange.value[0]){
+    newData = valueRange.value[0]
+  }
+  dataset.value = newData as number
+})
+
 // 预览更新
 // 预览更新
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
-    dataset.value = newData
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number | string) => {
+  if((Number(newData)) >= valueRange.value[1]){
+    newData = valueRange.value[1]
+  }
+  if((Number(newData)) <= valueRange.value[0]){
+    newData = valueRange.value[0]
+  }
+  dataset.value = newData as number
 })
 })
 </script>
 </script>
 
 

@@ -448,9 +448,17 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
       Reflect.deleteProperty(params, key)
       Reflect.deleteProperty(params, key)
     })
     })
     params[BuiltInVariable.SELECT_TIME_AGGREGATION] = {}
     params[BuiltInVariable.SELECT_TIME_AGGREGATION] = {}
+    params[BuiltInVariable.SELECT_TIME_AGGREGATION].agg = null 
+    params[BuiltInVariable.SELECT_TIME_AGGREGATION].limit = 7 
+    params[BuiltInVariable.SELECT_TIME_AGGREGATION].interval = null 
+    getSelectDeviceAttr.value.value = null
+    getSelectOrgTree.value.value = null
+    getSelectDeviceProfile.value.value = null
+    getSelectDevice.value.value = null
   }
   }
 
 
   const setDynamicFormValue = (params: Recordable) => {
   const setDynamicFormValue = (params: Recordable) => {
+    clearParams()
     setParams(params)
     setParams(params)
     getOrgOption()
     getOrgOption()
     getDeviceProfileOption()
     getDeviceProfileOption()