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

😎1、修复机构编辑时字典对应 2、增加openapi-ts-request组件 3、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-03-23 23:06:49 +08:00
parent 16a49a8540
commit e31ee5c6a7
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.3" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.3" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.29" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.31" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.29" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.31" />
<PackageReference Include="Furion.Pure" Version="4.9.7.29" /> <PackageReference Include="Furion.Pure" Version="4.9.7.31" />
<PackageReference Include="Hardware.Info" Version="101.0.1" /> <PackageReference Include="Hardware.Info" Version="101.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
@ -73,8 +73,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.1.0" /> <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.2.0" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.1.0" /> <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.2.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.1.0" /> <PackageReference Include="Lazy.Captcha.Core" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.3" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.3" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.3" />

7
Web/openapi-ts-request.config.ts Normal file
View File

@ -0,0 +1,7 @@
import type { GenerateServiceProps } from 'openapi-ts-request';
export default {
schemaPath: 'http://localhost:5005/swagger/Default/swagger.json', // swagger.json 文件路径
serversPath: './src/apis', // 接口文件路径
requestLibPath: 'import request from "/@/utils/axios-utils"', // 请求方法路径
} as GenerateServiceProps;

4
Web/package.json
View File

@ -14,7 +14,8 @@
"build-api": "cd api_build/ && build.bat", "build-api": "cd api_build/ && build.bat",
"build-approvalFlow-api": "cd api_build/ && build.bat approvalFlow", "build-approvalFlow-api": "cd api_build/ && build.bat approvalFlow",
"build-dingTalk-api": "cd api_build/ && build.bat dingTalk", "build-dingTalk-api": "cd api_build/ && build.bat dingTalk",
"build-goView-api": "cd api_build/ && build.bat goView" "build-goView-api": "cd api_build/ && build.bat goView",
"openapi": "openapi-ts"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
@ -100,6 +101,7 @@
"eslint-plugin-vue": "^10.0.0", "eslint-plugin-vue": "^10.0.0",
"globals": "^16.0.0", "globals": "^16.0.0",
"less": "^4.2.2", "less": "^4.2.2",
"openapi-ts-request": "^1.2.0",
"prettier": "^3.5.3", "prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.14.0", "rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.86.0", "sass": "^1.86.0",

1
Web/src/views/system/org/component/editOrg.vue
View File

@ -97,7 +97,6 @@ const cascaderProps = { checkStrictly: true, emitPath: false, value: 'id', label
onMounted(async () => { onMounted(async () => {
let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('org_type'); let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('org_type');
state.orgTypeList = resDicData.data.result; state.orgTypeList = resDicData.data.result;
console.log(state.orgTypeList);
}); });
// 打开弹窗 // 打开弹窗

8
Web/src/views/system/org/index.vue
View File

@ -9,19 +9,19 @@
<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%"> <el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6"> <el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item :label="$t('message.list.organizationName')" prop="name"> <el-form-item :label="$t('message.list.organizationName')">
<el-input v-model="state.queryParams.name" :placeholder="$t('message.list.organizationName')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="state.queryParams.name" :placeholder="$t('message.list.organizationName')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6"> <el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item :label="$t('message.list.organizationCode')" prop="code"> <el-form-item :label="$t('message.list.organizationCode')">
<el-input v-model="state.queryParams.code" :placeholder="$t('message.list.organizationCode')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="state.queryParams.code" :placeholder="$t('message.list.organizationCode')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6"> <el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item :label="$t('message.list.organizationType')" prop="type"> <el-form-item :label="$t('message.list.organizationType')">
<el-select v-model="state.queryParams.type" filterable clearable class="w100" @clear="state.queryParams.type = undefined"> <el-select v-model="state.queryParams.type" filterable clearable class="w100" @clear="state.queryParams.type = undefined">
<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" /> <el-option v-for="item in state.orgTypeList" :key="item.id" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>