diff --git a/mayfly_go_web/src/assets/iconfont/iconfont.js b/mayfly_go_web/src/assets/iconfont/iconfont.js
index a5702aac..d3bb9224 100644
--- a/mayfly_go_web/src/assets/iconfont/iconfont.js
+++ b/mayfly_go_web/src/assets/iconfont/iconfont.js
@@ -1,5 +1,5 @@
(window._iconfont_svg_string_3953964 =
- ''),
+ ''),
(function (c) {
var t = (t = document.getElementsByTagName('script'))[t.length - 1],
a = t.getAttribute('data-injectcss'),
diff --git a/mayfly_go_web/src/assets/iconfont/iconfont.json b/mayfly_go_web/src/assets/iconfont/iconfont.json
index 2df2c56f..f2f09cd6 100644
--- a/mayfly_go_web/src/assets/iconfont/iconfont.json
+++ b/mayfly_go_web/src/assets/iconfont/iconfont.json
@@ -88,6 +88,20 @@
"font_class": "gauss",
"unicode": "e683",
"unicode_decimal": 59011
+ },
+ {
+ "icon_id": "34836637",
+ "name": "kingbase",
+ "font_class": "kingbase",
+ "unicode": "e882",
+ "unicode_decimal": 59522
+ },
+ {
+ "icon_id": "33047500",
+ "name": "vastbase",
+ "font_class": "vastbase",
+ "unicode": "e62b",
+ "unicode_decimal": 58923
}
]
}
diff --git a/mayfly_go_web/src/components/pagetable/PageTable.vue b/mayfly_go_web/src/components/pagetable/PageTable.vue
index 61e167f1..af848d74 100644
--- a/mayfly_go_web/src/components/pagetable/PageTable.vue
+++ b/mayfly_go_web/src/components/pagetable/PageTable.vue
@@ -189,7 +189,7 @@ const emit = defineEmits(['update:queryForm', 'update:selectionData', 'pageChang
export interface PageTableProps {
size?: string;
- pageApi: Api; // 请求表格数据的 api
+ pageApi?: Api; // 请求表格数据的 api
columns: TableColumn[]; // 列配置项 ==> 必传
showSelection?: boolean;
selectable?: (row: any) => boolean; // 是否可选
@@ -257,7 +257,7 @@ const changeSimpleFormItem = (searchItem: SearchItem) => {
nowSearchItem.value = searchItem;
};
-const { tableData, total, loading, search, reset, getTableData, handlePageNumChange, handlePageSizeChange } = usePageTable(
+let { tableData, total, loading, search, reset, getTableData, handlePageNumChange, handlePageSizeChange } = usePageTable(
props.pageable,
props.pageApi,
queryForm,
@@ -288,6 +288,13 @@ watch(isShowSearch, () => {
calcuTableHeight();
});
+watch(
+ () => props.data,
+ (newValue: any) => {
+ tableData = newValue;
+ }
+);
+
onMounted(async () => {
calcuTableHeight();
useEventListener(window, 'resize', calcuTableHeight);
diff --git a/mayfly_go_web/src/views/ops/component/TagTree.vue b/mayfly_go_web/src/views/ops/component/TagTree.vue
index da7768ee..0ccbb3df 100644
--- a/mayfly_go_web/src/views/ops/component/TagTree.vue
+++ b/mayfly_go_web/src/views/ops/component/TagTree.vue
@@ -104,7 +104,11 @@ const loadTags = async () => {
const tags = await tagApi.getResourceTagPaths.request({ resourceType: props.resourceType });
const tagNodes = [];
for (let tagPath of tags) {
- tagNodes.push(new TagTreeNode(tagPath, tagPath, props.tagPathNodeType));
+ let isLeaf = false;
+ if (!props.tagPathNodeType?.hasLoadNodesFunc) {
+ isLeaf = true;
+ }
+ tagNodes.push(new TagTreeNode(tagPath, tagPath, props.tagPathNodeType).withIsLeaf(isLeaf));
}
return tagNodes;
};
diff --git a/mayfly_go_web/src/views/ops/component/TagTreeResourceSelect.vue b/mayfly_go_web/src/views/ops/component/TagTreeResourceSelect.vue
index bbb5b12e..0c87f86c 100644
--- a/mayfly_go_web/src/views/ops/component/TagTreeResourceSelect.vue
+++ b/mayfly_go_web/src/views/ops/component/TagTreeResourceSelect.vue
@@ -14,6 +14,9 @@
v-model="modelValue"
@change="changeNode"
>
+
+
+
@@ -33,7 +36,7 @@