diff --git a/src/components/webtopo-svgedit/components/left-panel/index.vue b/src/components/webtopo-svgedit/components/left-panel/index.vue index 7982bc2..3190946 100644 --- a/src/components/webtopo-svgedit/components/left-panel/index.vue +++ b/src/components/webtopo-svgedit/components/left-panel/index.vue @@ -55,8 +55,8 @@ import SvgAnalysis from '../../../svg-analysis/index.vue'; import { EGlobalStoreIntention } from '../../../../store/global/types'; const globalStore = useGlobalStore(); - const select_lib = ref('电力系统'); - const config_center = ref(globalStore.config_center.电力系统); + const select_lib = ref('svg文件'); + const config_center = ref(globalStore.config_center.svg文件); const activeNames = ref(['stateful', 'stateless']); const libChange = (val: any) => { config_center.value = []; diff --git a/src/config-center/index.ts b/src/config-center/index.ts index 06288c4..ee851b8 100644 --- a/src/config-center/index.ts +++ b/src/config-center/index.ts @@ -1,6 +1,9 @@ -import { power_system_config_center } from './power-system'; +import { power_system_config_center } from './svg-file'; import { IConfigCenter } from './types'; export const configCenter: IConfigCenter = { - 电力系统: power_system_config_center + svg文件: power_system_config_center, + vue组件: [], + 自定义组件: [], + 图表: [] }; diff --git a/src/config-center/power-system/stateful/circuit-breaker/index.ts b/src/config-center/power-system/stateful/circuit-breaker/index.ts deleted file mode 100644 index 346302f..0000000 --- a/src/config-center/power-system/stateful/circuit-breaker/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { EConfigItemPropsType, EConfigItemStateType, IConfigItem } from '../../../types'; - -export const power_system_circuit_breaker: IConfigItem = { - name: 'circuit-breaker', - title: '断路器', - props: { - fill: { - title: '填充色', - type: EConfigItemPropsType.Color, - val: '#ff0000' - } - }, - state: { - type: EConfigItemStateType.Switch, - default: false - } -}; diff --git a/src/config-center/power-system/stateless/index.ts b/src/config-center/power-system/stateless/index.ts deleted file mode 100644 index abd5c45..0000000 --- a/src/config-center/power-system/stateless/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { IConfigComponentGroup } from '../../types'; -import { power_system_alternator } from './alternator'; -import { power_system_traction_transformer } from './traction-transformer'; -export const stateless_group: IConfigComponentGroup = { - groupType: 'stateless', - title: '无状态', - list: [power_system_alternator, power_system_traction_transformer] -}; diff --git a/src/config-center/power-system/index.ts b/src/config-center/svg-file/index.ts similarity index 100% rename from src/config-center/power-system/index.ts rename to src/config-center/svg-file/index.ts diff --git a/src/config-center/svg-file/stateful/circuit-breaker/index.ts b/src/config-center/svg-file/stateful/circuit-breaker/index.ts new file mode 100644 index 0000000..bfd6998 --- /dev/null +++ b/src/config-center/svg-file/stateful/circuit-breaker/index.ts @@ -0,0 +1,24 @@ +import { EConfigItemPropsType, EDoneJsonType, IConfigItem } from '../../../types'; + +export const circuit_breaker_svg_file: IConfigItem = { + name: 'circuit-breaker', + title: '断路器', + type: EDoneJsonType.File, + props: { + fill: { + title: '填充色', + type: EConfigItemPropsType.Switch, + val: '#ff0000', + options: [ + { + value: '#ff0000', + label: '关' + }, + { + value: '#00ff00', + label: '开' + } + ] + } + } +}; diff --git a/src/config-center/power-system/stateful/index.ts b/src/config-center/svg-file/stateful/index.ts similarity index 60% rename from src/config-center/power-system/stateful/index.ts rename to src/config-center/svg-file/stateful/index.ts index b7a16db..89f5cf3 100644 --- a/src/config-center/power-system/stateful/index.ts +++ b/src/config-center/svg-file/stateful/index.ts @@ -1,8 +1,8 @@ import { IConfigComponentGroup } from '../../types'; -import { power_system_circuit_breaker } from './circuit-breaker'; +import { circuit_breaker_svg_file } from './circuit-breaker'; export const stateful_group: IConfigComponentGroup = { groupType: 'stateful', title: '有状态', - list: [power_system_circuit_breaker] + list: [circuit_breaker_svg_file] }; diff --git a/src/config-center/power-system/stateless/alternator/index.ts b/src/config-center/svg-file/stateless/alternator/index.ts similarity index 51% rename from src/config-center/power-system/stateless/alternator/index.ts rename to src/config-center/svg-file/stateless/alternator/index.ts index 3124a29..1c1771b 100644 --- a/src/config-center/power-system/stateless/alternator/index.ts +++ b/src/config-center/svg-file/stateless/alternator/index.ts @@ -1,8 +1,9 @@ -import { EConfigItemPropsType, IConfigItem } from '../../../types'; +import { EConfigItemPropsType, EDoneJsonType, IConfigItem } from '../../../types'; -export const power_system_alternator: IConfigItem = { +export const alternator_svg_file: IConfigItem = { name: 'alternator', title: '发电机', + type: EDoneJsonType.File, props: { fill: { title: '填充色', diff --git a/src/config-center/svg-file/stateless/index.ts b/src/config-center/svg-file/stateless/index.ts new file mode 100644 index 0000000..7d92d82 --- /dev/null +++ b/src/config-center/svg-file/stateless/index.ts @@ -0,0 +1,8 @@ +import { IConfigComponentGroup } from '../../types'; +import { alternator_svg_file } from './alternator'; +import { traction_transformer_svg_file } from './traction-transformer'; +export const stateless_group: IConfigComponentGroup = { + groupType: 'stateless', + title: '无状态', + list: [alternator_svg_file, traction_transformer_svg_file] +}; diff --git a/src/config-center/power-system/stateless/traction-transformer/index.ts b/src/config-center/svg-file/stateless/traction-transformer/index.ts similarity index 51% rename from src/config-center/power-system/stateless/traction-transformer/index.ts rename to src/config-center/svg-file/stateless/traction-transformer/index.ts index 0eb6bda..da2a140 100644 --- a/src/config-center/power-system/stateless/traction-transformer/index.ts +++ b/src/config-center/svg-file/stateless/traction-transformer/index.ts @@ -1,8 +1,9 @@ -import { EConfigItemPropsType, IConfigItem } from '../../../types'; +import { EConfigItemPropsType, EDoneJsonType, IConfigItem } from '../../../types'; -export const power_system_traction_transformer: IConfigItem = { +export const traction_transformer_svg_file: IConfigItem = { name: 'traction-transformer', title: '牵引变', + type: EDoneJsonType.File, props: { fill: { title: '填充色', diff --git a/src/config-center/types.ts b/src/config-center/types.ts index bb2164f..3466afb 100644 --- a/src/config-center/types.ts +++ b/src/config-center/types.ts @@ -19,24 +19,23 @@ export interface IConfigItem { name: string; title: string; props: IConfigItemProps; - state?: IConfigItemState; + type: EDoneJsonType; } export interface IConfigItemProps { [key: string]: { title: string; type: EConfigItemPropsType; val: string; + options?: { value: any; label: string }[]; }; } export enum EConfigItemPropsType { Input = 'Input', Color = 'Color', - InputNumber = 'InputNumber' + InputNumber = 'InputNumber', + Switch = 'Switch' //此类型option默认索引0为关闭 } -export interface IConfigItemState { - type: EConfigItemStateType; - default: any; -} -export enum EConfigItemStateType { - Switch = 'Switch' +export enum EDoneJsonType { + File = 'File', + StraightLine = 'StraightLine' } diff --git a/src/store/config/index.ts b/src/store/config/index.ts index da47553..a7a8951 100644 --- a/src/store/config/index.ts +++ b/src/store/config/index.ts @@ -10,8 +10,8 @@ export const useConfigStore = defineStore('config-store', { background_color: '#fff', scale: 1, position_center: { - x: -50, - y: -50 + x: -295, + y: -95 } } };