gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、修复配置改变时图表不更新的问题 2、修复切换选项卡时刷新的问题 3、修复标题logo居中问题 4、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2024-12-12 01:45:06 +08:00
parent 99d3429294
commit 512f0d6c7a
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -29,7 +29,7 @@
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" /> <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
<PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.2" /> <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.2" />
<PackageReference Include="Magicodes.IE.Word" Version="2.7.5.2" /> <PackageReference Include="Magicodes.IE.Word" Version="2.7.5.2" />
<PackageReference Include="MailKit" Version="4.8.0" /> <PackageReference Include="MailKit" Version="4.9.0" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" /> <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
<PackageReference Include="MiniExcel" Version="1.35.0" /> <PackageReference Include="MiniExcel" Version="1.35.0" />
<PackageReference Include="MiniWord" Version="0.8.0" /> <PackageReference Include="MiniWord" Version="0.8.0" />
@ -46,7 +46,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" /> <PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.0" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1138" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1139" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

6
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2024.12.10", "lastBuildTime": "2024.12.12",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -74,7 +74,7 @@
"vue-router": "^4.5.0", "vue-router": "^4.5.0",
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.3.23", "vxe-pc-ui": "^4.3.27",
"vxe-table": "^4.8.10", "vxe-table": "^4.8.10",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7", "vxe-table-plugin-export-xlsx": "^4.0.7",
@ -85,7 +85,7 @@
"@iconify/vue": "^4.2.0", "@iconify/vue": "^4.2.0",
"@plugin-web-update-notification/vite": "^1.7.1", "@plugin-web-update-notification/vite": "^1.7.1",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.17.9", "@types/node": "^20.17.10",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.18.0", "@typescript-eslint/eslint-plugin": "^8.18.0",

4
Web/src/components/scEcharts/index.vue
View File

@ -31,7 +31,9 @@ export default {
option: { option: {
deep: true, deep: true,
handler(v) { handler(v) {
unwarp(this.myChart).setOption(v); this.$nextTick(() => {
unwarp(this.myChart).setOption(v);
});
}, },
}, },
}, },

6
Web/src/layout/logo/index.vue
View File

@ -36,11 +36,11 @@ const onThemeConfigChange = () => {
<style scoped lang="scss"> <style scoped lang="scss">
.layout-logo { .layout-logo {
width: 300px; width: 220px;
height: 50px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
margin-left: 15px; justify-content: center;
box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px; box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px;
color: var(--el-color-primary); color: var(--el-color-primary);
font-size: 16px; font-size: 16px;
@ -58,7 +58,7 @@ const onThemeConfigChange = () => {
} }
} }
&-medium-img { &-medium-img {
width: 12%; width: 15%;
margin-right: 5px; margin-right: 5px;
padding: 3px; padding: 3px;
} }

13
Web/src/layout/routerView/parent.vue
View File

@ -65,16 +65,17 @@ const getIframeListRoutes = async () => {
onBeforeMount(() => { onBeforeMount(() => {
state.keepAliveNameList = keepAliveNames.value; state.keepAliveNameList = keepAliveNames.value;
mittBus.on('onTagsViewRefreshRouterView', (fullPath: string) => { mittBus.on('onTagsViewRefreshRouterView', (fullPath: string) => {
const cacheList = cachedViews.value;
if (route.meta.isKeepAlive) cachedViews.value = cachedViews.value?.filter((name: string) => route.name !== name);
state.keepAliveNameList = keepAliveNames.value.filter((name: string) => route.name !== name); state.keepAliveNameList = keepAliveNames.value.filter((name: string) => route.name !== name);
state.refreshRouterViewKey = ''; state.refreshRouterViewKey = '';
state.iframeRefreshKey = ''; state.iframeRefreshKey = '';
cachedViews.value = []; nextTick(() => {
setTimeout(() => { if (route.meta.isKeepAlive) cachedViews.value = cacheList;
state.iframeRefreshKey = fullPath;
state.refreshRouterViewKey = fullPath;
cachedViews.value = [<string>route.name];
state.keepAliveNameList = keepAliveNames.value; state.keepAliveNameList = keepAliveNames.value;
}, 10); state.refreshRouterViewKey = fullPath;
state.iframeRefreshKey = fullPath;
});
}); });
}); });
// 页面加载时 // 页面加载时