Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/packages/components/Tasks/Tasks/TaskBanner/config.ts

@@ -73,6 +73,6 @@ export default class Config extends PublicConfigClass implements CreateComponent
   public attr = { ...chartInitConfig, w: 400, h: 527, zIndex: 1 }
   public chartConfig = cloneDeep(TaskBannerConfig)
   public option = cloneDeep(option)
-  public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, }
+  public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from fm_fireclueinfo where "Id" = #{Id}' }, }
   public filter = "return res.result;"
 }

src/packages/components/Tasks/Tasks/TaskRadio/config.ts

@@ -23,6 +23,6 @@ export default class Config extends PublicConfigClass implements CreateComponent
   public attr = { ...chartInitConfig, w: 484, h: 40, zIndex: 1 }
   public chartConfig = cloneDeep(TaskRadioConfig)
   public option = cloneDeep(option)
-  public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, }
+  public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from fm_fireclueinfo where "Id" = #{Id}' }, }
   public filter = "return res.result;"
 }

src/packages/components/Tasks/Tasks/TaskRadio/index.vue

@@ -7,10 +7,12 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, toRefs } from 'vue'
+import { PropType, toRefs, onMounted } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartDataFetch } from '@/hooks';
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore';
+import { EventBus } from '@/utils/eventBus';
+import { replaceSqlParams } from '@/utils/sqlHandler';
 
 const props = defineProps({
   chartConfig: {
@@ -29,9 +31,19 @@ const {
   dataset
 } = toRefs(props.chartConfig.option)
 // 数据callback处理（预览时触发）
-useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
+
-  props.chartConfig.option.dataValue = JSON.stringify(resData);
+onMounted(()=>{
-});
+  const sql = props.chartConfig.request?.requestSQLContent?.sql;
+  // 组件通信 获取列表中的信息
+  EventBus.on(props.chartConfig.id+'dataupdate', (data) => {
+    props.chartConfig.request.requestSQLContent.sql = replaceSqlParams(sql,{Id:data.id})
+    // 数据callback处理（预览时触发）
+    useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any) => {  
+      props.chartConfig.option.dataset.dataValue = resData;
+    });
+  });
+})
+
 </script>
 
 <style lang="scss" scoped>

src/packages/components/Tasks/Tasks/TaskTextArea/config.ts

@@ -17,6 +17,6 @@ export default class Config extends PublicConfigClass implements CreateComponent
   public attr = { ...chartInitConfig, w: 437, h: 93, zIndex: 1 }
   public chartConfig = cloneDeep(TaskTextAreaConfig)
   public option = cloneDeep(option)
-  public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, }
+  public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from fm_fireclueinfo where "Id" = #{Id}' }, }
   public filter = "return res.result;"
 }

src/packages/components/Tasks/Tasks/TaskTextArea/index.vue

@@ -12,10 +12,12 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, toRefs } from 'vue'
+import { PropType, toRefs, onMounted } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartDataFetch } from '@/hooks';
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore';
+import { EventBus } from '@/utils/eventBus';
+import { replaceSqlParams } from '@/utils/sqlHandler';
 
 const props = defineProps({
   chartConfig: {
@@ -33,10 +35,17 @@ const {
   dataset
 } = toRefs(props.chartConfig.option)
 
-// 数据callback处理（预览时触发）
+onMounted(()=>{
-useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
+  const sql = props.chartConfig.request?.requestSQLContent?.sql;
-  props.chartConfig.option.dataset = resData;
+  // 组件通信 获取列表中的信息
-});
+  EventBus.on(props.chartConfig.id+'dataupdate', (data) => {
+    props.chartConfig.request.requestSQLContent.sql = replaceSqlParams(sql,{Id:data.id})
+    // 数据callback处理（预览时触发）
+    useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any) => {  
+      props.chartConfig.option.dataset.dataset = resData;
+    });
+  });
+})
 </script>
 
 <style lang="scss" scoped>