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

😎1、优化字典组件 2、代码优化及升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-09-03 01:26:31 +08:00
parent 55f887752f
commit b878a3d2c6
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.6" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.116" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.116" />
<PackageReference Include="Furion.Pure" Version="4.9.7.116" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.117" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.117" />
<PackageReference Include="Furion.Pure" Version="4.9.7.117" />
<PackageReference Include="Hardware.Info" Version="101.0.1.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />

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

@ -14,8 +14,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Furion.Xunit" Version="4.9.7.116" />
<PackageReference Include="Furion.Pure" Version="4.9.7.116">
<PackageReference Include="Furion.Xunit" Version="4.9.7.117" />
<PackageReference Include="Furion.Pure" Version="4.9.7.117">
<ExcludeAssets>compile</ExcludeAssets>
</PackageReference>
<PackageReference Include="xunit.assert" Version="2.9.3" />

22
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.09.01",
"lastBuildTime": "2025.09.03",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -26,7 +26,7 @@
"@vue-office/docx": "^1.6.3",
"@vue-office/excel": "^1.7.14",
"@vue-office/pdf": "^2.0.10",
"@vueuse/core": "^13.8.0",
"@vueuse/core": "^13.9.0",
"@vxe-ui/plugin-export-xlsx": "^4.3.0",
"@vxe-ui/plugin-render-element": "^4.1.0",
"@wangeditor/editor": "^5.1.23",
@ -69,7 +69,7 @@
"uuid": "^11.1.0",
"vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10",
"vue": "^3.5.20",
"vue": "^3.5.21",
"vue-clipboard3": "^2.0.0",
"vue-demi": "0.14.10",
"vue-draggable-plus": "^0.6.0",
@ -81,8 +81,8 @@
"vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.9.11",
"vxe-table": "^4.16.3",
"vxe-pc-ui": "^4.9.13",
"vxe-table": "^4.16.4",
"xe-utils": "^3.7.8",
"xlsx-js-style": "^1.2.0"
},
@ -93,11 +93,11 @@
"@types/node": "^22.18.0",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.41.0",
"@typescript-eslint/parser": "^8.41.0",
"@typescript-eslint/eslint-plugin": "^8.42.0",
"@typescript-eslint/parser": "^8.42.0",
"@vitejs/plugin-vue": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.1.1",
"@vue/compiler-sfc": "^3.5.20",
"@vue/compiler-sfc": "^3.5.21",
"cli-progress": "^3.12.0",
"code-inspector-plugin": "^1.2.6",
"colors": "^1.4.0",
@ -109,10 +109,10 @@
"prettier": "^3.6.2",
"rollup-plugin-visualizer": "^6.0.3",
"sass": "^1.91.0",
"terser": "^5.43.1",
"terser": "^5.44.0",
"typescript": "^5.9.2",
"vite": "^7.1.3",
"vite-auto-i18n-plugin": "^1.1.7",
"vite": "^7.1.4",
"vite-auto-i18n-plugin": "^1.1.8",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^2.2.1",
"vite-plugin-vue-setup-extend": "^0.4.0",

2
Web/src/components/sysDict/sysDict.vue
View File

@ -572,7 +572,7 @@ watch(() => [userStore.dictList, userStore.constList, props.data, state], initDa
</template>
<!-- 渲染选择器 -->
<el-select v-else-if="props.renderAs === 'select'" v-model="state.value" v-bind="$attrs" :multiple="props.multiple" @change="updateValue">
<el-select v-else-if="props.renderAs === 'select'" v-model="state.value" v-bind="$attrs" :multiple="props.multiple" @change="updateValue" filterable allow-create default-first-option clearable>
<el-option v-for="(item, index) in formattedDictData" :key="index" :label="getDisplayText(item)" :value="item.value" :disabled="item.disabled" />
</el-select>

10
Web/src/views/system/dict/index.vue
View File

@ -69,6 +69,11 @@
<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
<el-form :model="state.queryParamsDictData" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%">
<el-row :gutter="10">
<el-col class="mb5" :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
<el-form-item label="文本" prop="code">
<el-input v-model="state.queryParamsDictData.label" placeholder="文本" clearable @keyup.enter.native="handleQueryDictData(true)" />
</el-form-item>
</el-col>
<el-col class="mb5" :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
<el-form-item label="字典值" prop="value">
<el-input v-model="state.queryParamsDictData.value" placeholder="字典值" clearable @keyup.enter.native="handleQueryDictData(true)" />
@ -79,11 +84,6 @@
<el-input v-model="state.queryParamsDictData.code" placeholder="编码" clearable @keyup.enter.native="handleQueryDictData(true)" />
</el-form-item>
</el-col>
<el-col class="mb5" :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
<el-form-item label="文本" prop="code">
<el-input v-model="state.queryParamsDictData.label" placeholder="文本" clearable @keyup.enter.native="handleQueryDictData(true)" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider style="height: calc(100% - 5px); margin: 0 10px" direction="vertical" />