Merge remote-tracking branch 'origin/release' into release
# Conflicts: # frontend/src/views/machine/controlSource/index.vue
This commit is contained in:
@@ -6,9 +6,9 @@
|
||||
:pagination="false"
|
||||
:toolButton="false"
|
||||
:data="tableData"
|
||||
:row-key="id"
|
||||
row-key="id"
|
||||
:style="{ height: '250px',maxHeight: '400px',overflow:'hidden'}"
|
||||
|
||||
:expand-row-keys="['0']"
|
||||
>
|
||||
<!-- 表格 header 按钮 -->
|
||||
<template #tableHeader='scope'>
|
||||
@@ -70,6 +70,28 @@ watch(() => props.parameterStr, (newData) => {
|
||||
}
|
||||
})
|
||||
|
||||
const defaultExpandRowKeys =computed(() => {
|
||||
return '548c00d2e4744c38aee938cb08e2ff3b'
|
||||
})
|
||||
|
||||
const getDefaultKey = (data: any[]) => {
|
||||
if (!data || data.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const firstElement = data[0];
|
||||
|
||||
return findFirstLeafNode(firstElement);
|
||||
}
|
||||
|
||||
const findFirstLeafNode = (node: any): any => {
|
||||
if (!node.children || node.children.length === 0) {
|
||||
return node.id;
|
||||
}
|
||||
|
||||
return findFirstLeafNode(node.children[0]);
|
||||
}
|
||||
|
||||
const getTableList = () => {
|
||||
if (props.parameterStr) {
|
||||
originalParameterArr = JSON.parse(props.parameterStr)
|
||||
|
||||
Reference in New Issue
Block a user