From 056ede3f974f7c0414cbd6855048fe57711e3ca0 Mon Sep 17 00:00:00 2001
From: zh <972939975@qq.com>
Date: Wed, 19 Nov 2025 17:53:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/public/sdk/custom/css/index.css | 1 +
src/renderer/public/tree/jquery.ztree.core.js | 4 +
src/renderer/public/tree/newFuzzySearch.js | 4 +
src/renderer/src/axios/index.ts | 6 +-
src/renderer/src/common/addMapSource.ts | 19 ++-
src/renderer/src/views/TS/list.vue | 2 +-
.../components/bottomSide/bottomSide.vue | 9 +-
.../components/leftSide/leftSideFirst.vue | 123 +++++++++---------
.../components/leftSide/leftSideSecond.vue | 7 +-
.../components/propertyBox/addGroundText.vue | 28 +++-
.../components/propertyBox/addStandText.vue | 33 +++--
.../propertyBox/defaultLabelStyle/index.vue | 4 +-
.../propertyBox/defaultLabelStyle/style.ts | 2 +-
.../propertyBox/defaultStyle/style.ts | 2 +-
.../components/propertyBox/groundText.vue | 1 +
.../components/propertyBox/standText.vue | 56 ++++----
.../tree/components/hooks/renderVector.ts | 4 +-
.../src/views/components/tree/hooks/tree.ts | 1 +
.../views/components/tree/hooks/treeNode.ts | 5 +-
.../src/views/components/tree/index.vue | 4 +
src/renderer/src/views/home/index.vue | 67 ++++++----
21 files changed, 234 insertions(+), 148 deletions(-)
diff --git a/src/renderer/public/sdk/custom/css/index.css b/src/renderer/public/sdk/custom/css/index.css
index a3893dc..f28e3c0 100644
--- a/src/renderer/public/sdk/custom/css/index.css
+++ b/src/renderer/public/sdk/custom/css/index.css
@@ -511,6 +511,7 @@
overflow-y: auto;
scrollbar-gutter: stable;
width: calc(100% + 1px);
+ height: 194px;
}
.YJ-custom-base-dialog>.content .table .align-center,
diff --git a/src/renderer/public/tree/jquery.ztree.core.js b/src/renderer/public/tree/jquery.ztree.core.js
index 2937bdc..de322c6 100644
--- a/src/renderer/public/tree/jquery.ztree.core.js
+++ b/src/renderer/public/tree/jquery.ztree.core.js
@@ -688,6 +688,9 @@
},
nodeTitle: function (setting, node) {
var t = setting.data.key.title === '' ? setting.data.key.name : setting.data.key.title
+ if(!node[t]) {
+ t = setting.data.key.name
+ }
var rawTitle = '' + node[t]
if (typeof setting.data.render.title === 'function') {
return setting.data.render.title.call(this, rawTitle, node)
@@ -1489,6 +1492,7 @@
html.push('')
},
makeDOMNodeNameBefore: function (html, setting, node) {
+ console.log('=================', setting, node)
var title = data.nodeTitle(setting, node),
url = view.makeNodeUrl(setting, node),
fontcss = view.makeNodeFontCss(setting, node),
diff --git a/src/renderer/public/tree/newFuzzySearch.js b/src/renderer/public/tree/newFuzzySearch.js
index 24ae383..1b4a813 100644
--- a/src/renderer/public/tree/newFuzzySearch.js
+++ b/src/renderer/public/tree/newFuzzySearch.js
@@ -96,6 +96,10 @@ window.newFuzzySearch = function (
let str = '' + h + ''
return str
})
+ item.title = item.oldname.replace(F, function (h) {
+ let str = h
+ return str
+ })
// let a = item.name
// a = '' + a + ""
diff --git a/src/renderer/src/axios/index.ts b/src/renderer/src/axios/index.ts
index bba3cd4..d28fe27 100644
--- a/src/renderer/src/axios/index.ts
+++ b/src/renderer/src/axios/index.ts
@@ -85,8 +85,12 @@ service.interceptors.response.use(
if (response.data.code == 401) {
router.push('/')
localStorage.removeItem('Authorization')
+ ElMessage({
+ message: "登录过期，请重新登录",
+ type: 'error'
+ })
}
- if (![0, 200].includes(response.data.code)) {
+ else if (![0, 200].includes(response.data.code)) {
ElMessage({
message: response.data.msg || response.data.message,
type: 'error'
diff --git a/src/renderer/src/common/addMapSource.ts b/src/renderer/src/common/addMapSource.ts
index a940fd9..d225190 100644
--- a/src/renderer/src/common/addMapSource.ts
+++ b/src/renderer/src/common/addMapSource.ts
@@ -10,13 +10,22 @@ export const addMapSource = async ({type, id, sourceName = '未命名对象', op
let options: any = await initMapData(type, opt, null)
let selectedNodes = window.treeObj.getSelectedNodes()
let node = selectedNodes && selectedNodes[selectedNodes.length - 1]
+ function getParentId(nd: any) {
+ if (nd.sourceType === 'directory') {
+ return nd.id
+ } else {
+ let parentNode = window.treeObj.getNodeByParam("id", nd.parentId, null);
+ if(parentNode) {
+ return getParentId(parentNode)
+ }
+ else {
+ return
+ }
+ }
+ }
let parentId
if (node) {
- if (node.sourceType === 'directory') {
- parentId = node.id
- } else {
- parentId = node.parentId
- }
+ parentId = getParentId(node)
}
delete options.host
if(options.attribute && options.attribute.rtmp) {
diff --git a/src/renderer/src/views/TS/list.vue b/src/renderer/src/views/TS/list.vue
index 9fe342e..be9e0a3 100644
--- a/src/renderer/src/views/TS/list.vue
+++ b/src/renderer/src/views/TS/list.vue
@@ -149,7 +149,7 @@ let pageSize: any = ref(10)
let pageNum: any = ref(1)
let total: any = ref(0)
const back = () => {
- ipcRenderer.send('toggle-fullscreen', false)
+ // ipcRenderer.send('toggle-fullscreen', false)
router.push({path: '/home'})
}
const handleSizeChange = (val) => {
diff --git a/src/renderer/src/views/components/bottomSide/bottomSide.vue b/src/renderer/src/views/components/bottomSide/bottomSide.vue
index c6c9669..e577989 100644
--- a/src/renderer/src/views/components/bottomSide/bottomSide.vue
+++ b/src/renderer/src/views/components/bottomSide/bottomSide.vue
@@ -1,8 +1,8 @@