diff --git a/package.json b/package.json index 81db932..d48a19b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "diagram-js": "12.3.0", "didi": "9.0.2", "echarts": "5.5.0", - "element-plus": "2.9.0", + "element-plus": "2.9.1", "file-saver": "2.0.5", "fuse.js": "7.0.0", "highlight.js": "11.9.0", diff --git a/src/views/boardGenerate/index.vue b/src/views/boardGenerate/index.vue index eaee8a8..e455660 100644 --- a/src/views/boardGenerate/index.vue +++ b/src/views/boardGenerate/index.vue @@ -1,5 +1,5 @@ - + @@ -264,9 +264,13 @@ - + + + + @@ -285,7 +289,7 @@ - + @@ -411,14 +415,60 @@ - + 配置表格 + + + 配置动画 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -434,9 +484,38 @@ + + + + + + + + + + + + + + + + 置顶 + 上移一层 + 下移一层 + 复制 + 删除 + + + + + + {{ i.name }} + + + @@ -493,6 +572,28 @@ + + + + + + + + + 添加 + + + + + + + + + + + + + + + + diff --git a/src/views/boardGenerate/tool.js b/src/views/boardGenerate/tool.js index 63a58e0..b58b947 100644 --- a/src/views/boardGenerate/tool.js +++ b/src/views/boardGenerate/tool.js @@ -36,7 +36,16 @@ const getOption = (e) => { } else if (e === 'img') { return { imgSrc: '' }; } else if (e === 'scrollTable' || e === 'table') { - return { tableOptions: [] }; + return { + tableOptions: [], + tableClassOption: {}, + thHeight: '20px', + tdHeight: '20px', + thColor: '#fff', + tdColor: ['#fff'], + thBgColor: '#fff', + tdBgColor: ['#000'] + }; } else { return {}; } @@ -67,7 +76,7 @@ const getNodeSize = (e) => { const tool = () => { const nodeType = ref(''); - const customData = ref(''); + const customData = ref({ script: '' }); const { addNodes, screenToFlowCoordinate, onNodesInitialized, updateNode } = useVueFlow(); const onDragStart = (event, type, data) => { if (event.dataTransfer) { @@ -76,7 +85,7 @@ const tool = () => { } nodeType.value = type; - customData.value = data; + customData.value = { ...customData.value, ...(data || {}) }; document.addEventListener('drop', onDragEnd); }; const onDragEnd = () => { @@ -138,5 +147,5 @@ export const options = { } } return false; - } + },getId };