diff --git a/readme/collect-data.png b/readme/collect-data.png deleted file mode 100644 index a03101cc..00000000 Binary files a/readme/collect-data.png and /dev/null differ diff --git a/src/enums/storageEnum.ts b/src/enums/storageEnum.ts index b0818a24..f4128f47 100644 --- a/src/enums/storageEnum.ts +++ b/src/enums/storageEnum.ts @@ -12,5 +12,7 @@ export enum StorageEnum { // 工作台布局配置 GO_CHART_LAYOUT_STORE = 'GO_CHART_LAYOUT', // 工作台需要保存的数据 - GO_CHART_STORAGE_LIST = 'GO_CHART_STORAGE_LIST' + GO_CHART_STORAGE_LIST = 'GO_CHART_STORAGE_LIST', + // 数据收集 + GO_DATA_COLLECT = 'GO_DATA_COLLECT' } diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index e7624804..86d33147 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -114,6 +114,11 @@ export interface PublicConfigType extends requestConfig { filter?: string setPosition: Function } +export interface dataCollectComponent { + componentId: string + field: string + [key: string]: any +} export interface CreateComponentType extends PublicConfigType { key: string @@ -122,6 +127,7 @@ export interface CreateComponentType extends PublicConfigType { eventList?: Array methodList?: Array eventConfig?: EventConfig + dataCollectComponentList?: Array } // 获取组件实例类中某个key对应value类型的方法 diff --git a/src/store/modules/dataCollectStore/dataCollectStore.d.ts b/src/store/modules/dataCollectStore/dataCollectStore.d.ts new file mode 100644 index 00000000..fdc47c51 --- /dev/null +++ b/src/store/modules/dataCollectStore/dataCollectStore.d.ts @@ -0,0 +1,7 @@ +export enum DataCollectStoreEnums { +} + +export interface DataCollectStoreType { + model: Record>, + mountedComponentSet: Set +} diff --git a/src/store/modules/dataCollectStore/dataCollectStore.ts b/src/store/modules/dataCollectStore/dataCollectStore.ts new file mode 100644 index 00000000..adfe1189 --- /dev/null +++ b/src/store/modules/dataCollectStore/dataCollectStore.ts @@ -0,0 +1,24 @@ +import { defineStore } from 'pinia' +import { DataCollectStoreType, DataCollectStoreEnums } from './dataCollectStore.d' + +// 全局设置 +export const useDataCollectStore = defineStore({ + id: 'useDataCollectStore', + state: (): DataCollectStoreType => { + return { + mountedComponentSet: new Set(), + model: {} + } + }, + getters: { + + }, + actions: { + clearAll(){ + this.mountedComponentSet.clear() + }, + recordMountedComponent(id: string){ + this.mountedComponentSet.add(id) + } + } +}) diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataForeignKey/index.ts b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataForeignKey/index.ts new file mode 100644 index 00000000..299ddbb7 --- /dev/null +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataForeignKey/index.ts @@ -0,0 +1,3 @@ +import ChartDataForeignKey from './index.vue' + +export { ChartDataForeignKey } diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataForeignKey/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataForeignKey/index.vue new file mode 100644 index 00000000..07813878 --- /dev/null +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataForeignKey/index.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/views/chart/ContentConfigurations/components/ChartData/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/index.vue index 20569814..96320909 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/index.vue @@ -13,7 +13,10 @@ > - + @@ -22,6 +25,7 @@ import { SettingItemBox } from '@/components/Pages/ChartItemSetting' import { useTargetData } from '../hooks/useTargetData.hook' import { ChartDataStatic } from './components/ChartDataStatic/index' import { ChartDataAjax } from './components/ChartDataAjax/index' +import { ChartDataForeignKey } from './components/ChartDataForeignKey/index' import { SelectCreateDataType, SelectCreateDataEnum } from './index.d' import { RequestDataTypeEnum } from '@/enums/httpEnum' diff --git a/src/views/preview/components/PreviewRenderList/PreViewRenderItem.vue b/src/views/preview/components/PreviewRenderList/PreViewRenderItem.vue index d76b99e6..e1aeed21 100644 --- a/src/views/preview/components/PreviewRenderList/PreViewRenderItem.vue +++ b/src/views/preview/components/PreviewRenderList/PreViewRenderItem.vue @@ -11,7 +11,7 @@ diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue index fbe74eca..ab32cddc 100644 --- a/src/views/preview/index.vue +++ b/src/views/preview/index.vue @@ -28,7 +28,7 @@