diff --git a/resources/java/app/application.yml b/resources/java/app/application.yml index 7753f07..41e4c70 100644 --- a/resources/java/app/application.yml +++ b/resources/java/app/application.yml @@ -1,7 +1,7 @@ server: host: 127.0.0.1 port: 8848 - path: C:\Users\MSI\AppData\Roaming\dzsp_shijingjun_offline_Y_save + path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save poi: global: enabled: false diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts index 37cb211..0c43d34 100644 --- a/src/renderer/components.d.ts +++ b/src/renderer/components.d.ts @@ -20,12 +20,10 @@ declare module 'vue' { ElDialog: typeof import('element-plus/es')['ElDialog'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] - ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSlider: typeof import('element-plus/es')['ElSlider'] 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..8eb1166 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' @@ -104,7 +108,7 @@ service.interceptors.response.use( pendingRequests.delete(key) } // 统一错误处理 - const {response} = error + const { response } = error if (response) { return Promise.reject(response) 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 f9ad98b..61c6af0 100644 --- a/src/renderer/src/views/TS/list.vue +++ b/src/renderer/src/views/TS/list.vue @@ -150,7 +150,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 @@