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 2024-11-15 15:42:10 +08:00
parent e75edd5536
commit 4d7866b98f
11 changed files with 452 additions and 1926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Entity/SysDictType.cs
View File

@ -52,7 +52,7 @@ public partial class SysDictType : EntityBase
/// 是否是内置字典（Y-是，N-否） /// 是否是内置字典（Y-是，N-否）
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "是否是内置字典", DefaultValue = "1")] [SugarColumn(ColumnDescription = "是否是内置字典", DefaultValue = "1")]
public YesNoEnum SysFlag { get; set; } = YesNoEnum.Y; public virtual YesNoEnum SysFlag { get; set; } = YesNoEnum.Y;
/// <summary> /// <summary>
/// 字典值集合 /// 字典值集合

4
Admin.NET/Admin.NET.Core/Service/Dict/Dto/DictTypeInput.cs
View File

@ -25,6 +25,10 @@ public class PageDictTypeInput : BasePageInput
public class AddDictTypeInput : SysDictType public class AddDictTypeInput : SysDictType
{ {
/// <summary>
/// 是否是内置字典（Y-是，N-否）
/// </summary>
public override YesNoEnum SysFlag { get; set; } = YesNoEnum.N;
} }
public class UpdateDictTypeInput : AddDictTypeInput public class UpdateDictTypeInput : AddDictTypeInput

30
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.11.10", "lastBuildTime": "2024.11.15",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -42,10 +42,10 @@
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"jwchat": "^2.0.3", "jwchat": "^2.0.3",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"md-editor-v3": "^4.21.3", "md-editor-v3": "^5.0.1",
"mitt": "^3.0.1", "mitt": "^3.0.1",
"monaco-editor": "^0.52.0", "monaco-editor": "^0.52.0",
"mqtt": "^5.10.1", "mqtt": "^5.10.2",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"ol": "^10.2.1", "ol": "^10.2.1",
"pinia": "^2.2.6", "pinia": "^2.2.6",
@ -63,7 +63,7 @@
"vue": "^3.5.12", "vue": "^3.5.12",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
"vue-demi": "0.14.6", "vue-demi": "0.14.6",
"vue-draggable-plus": "^0.5.6", "vue-draggable-plus": "^0.6.0",
"vue-grid-layout": "3.0.0-beta1", "vue-grid-layout": "3.0.0-beta1",
"vue-i18n": "^10.0.4", "vue-i18n": "^10.0.4",
"vue-json-pretty": "^2.4.0", "vue-json-pretty": "^2.4.0",
@ -71,8 +71,8 @@
"vue-router": "^4.4.5", "vue-router": "^4.4.5",
"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.2.49", "vxe-pc-ui": "^4.2.55",
"vxe-table": "^4.7.59", "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",
"xe-utils": "^3.5.31", "xe-utils": "^3.5.31",
@ -85,24 +85,24 @@
"@types/node": "^20.16.5", "@types/node": "^20.16.5",
"@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.13.0", "@typescript-eslint/eslint-plugin": "^8.14.0",
"@typescript-eslint/parser": "^8.13.0", "@typescript-eslint/parser": "^8.14.0",
"@vitejs/plugin-vue": "^5.1.4", "@vitejs/plugin-vue": "^5.2.0",
"@vitejs/plugin-vue-jsx": "^4.0.1", "@vitejs/plugin-vue-jsx": "^4.1.0",
"@vue/compiler-sfc": "^3.5.12", "@vue/compiler-sfc": "^3.5.12",
"code-inspector-plugin": "^0.17.8", "code-inspector-plugin": "^0.18.0",
"eslint": "^9.14.0", "eslint": "^9.14.0",
"eslint-plugin-vue": "^9.29.1", "eslint-plugin-vue": "^9.31.0",
"globals": "^15.12.0", "globals": "^15.12.0",
"less": "^4.2.0", "less": "^4.2.0",
"prettier": "^3.3.3", "prettier": "^3.3.3",
"rollup-plugin-visualizer": "^5.12.0", "rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.80.6", "sass": "^1.81.0",
"terser": "^5.36.0", "terser": "^5.36.0",
"typescript": "^5.6.3", "typescript": "^5.6.3",
"vite": "^5.4.10", "vite": "^5.4.11",
"vite-plugin-cdn-import": "^1.0.1", "vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.0", "vite-plugin-compression2": "^1.3.1",
"vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-vue-setup-extend": "^0.4.0",
"vue-eslint-parser": "^9.4.3" "vue-eslint-parser": "^9.4.3"
}, },

1868
Web/src/api-services/apis/sys-file-api.ts
View File

File diff suppressed because one or more lines are too long

12
Web/src/api-services/models/add-dict-type-input.ts
View File

@ -125,12 +125,6 @@ export interface AddDictTypeInput {
*/ */
status?: StatusEnum; status?: StatusEnum;
/**
* @type {YesNoEnum}
* @memberof AddDictTypeInput
*/
sysFlag?: YesNoEnum;
/** /**
* 字典值集合 * 字典值集合
* *
@ -138,4 +132,10 @@ export interface AddDictTypeInput {
* @memberof AddDictTypeInput * @memberof AddDictTypeInput
*/ */
children?: Array<SysDictData> | null; children?: Array<SysDictData> | null;
/**
* @type {YesNoEnum}
* @memberof AddDictTypeInput
*/
sysFlag?: YesNoEnum;
} }

4
Web/src/api-services/models/create-entity-input.ts
View File

@ -25,7 +25,6 @@ export interface CreateEntityInput {
* *
* @type {string} * @type {string}
* @memberof CreateEntityInput * @memberof CreateEntityInput
* @example student
*/ */
tableName?: string | null; tableName?: string | null;
@ -34,7 +33,6 @@ export interface CreateEntityInput {
* *
* @type {string} * @type {string}
* @memberof CreateEntityInput * @memberof CreateEntityInput
* @example Student
*/ */
entityName?: string | null; entityName?: string | null;
@ -43,7 +41,6 @@ export interface CreateEntityInput {
* *
* @type {string} * @type {string}
* @memberof CreateEntityInput * @memberof CreateEntityInput
* @example AutoIncrementEntity
*/ */
baseClassName?: string | null; baseClassName?: string | null;
@ -52,7 +49,6 @@ export interface CreateEntityInput {
* *
* @type {string} * @type {string}
* @memberof CreateEntityInput * @memberof CreateEntityInput
* @example Web.Application
*/ */
position?: string | null; position?: string | null;

5
Web/src/api-services/models/create-seed-data-input.ts
View File

@ -33,7 +33,6 @@ export interface CreateSeedDataInput {
* *
* @type {string} * @type {string}
* @memberof CreateSeedDataInput * @memberof CreateSeedDataInput
* @example student
*/ */
tableName?: string | null; tableName?: string | null;
@ -42,7 +41,6 @@ export interface CreateSeedDataInput {
* *
* @type {string} * @type {string}
* @memberof CreateSeedDataInput * @memberof CreateSeedDataInput
* @example Student
*/ */
entityName?: string | null; entityName?: string | null;
@ -51,7 +49,6 @@ export interface CreateSeedDataInput {
* *
* @type {string} * @type {string}
* @memberof CreateSeedDataInput * @memberof CreateSeedDataInput
* @example Student
*/ */
seedDataName?: string | null; seedDataName?: string | null;
@ -60,7 +57,6 @@ export interface CreateSeedDataInput {
* *
* @type {string} * @type {string}
* @memberof CreateSeedDataInput * @memberof CreateSeedDataInput
* @example Web.Application
*/ */
position?: string | null; position?: string | null;
@ -69,7 +65,6 @@ export interface CreateSeedDataInput {
* *
* @type {string} * @type {string}
* @memberof CreateSeedDataInput * @memberof CreateSeedDataInput
* @example Web.Application
*/ */
suffix?: string | null; suffix?: string | null;

424
Web/src/api-services/models/sys-file-upload-file-body.ts
View File

@ -25,7 +25,411 @@ import { SysUser } from './sys-user';
* @export * @export
* @interface SysFileUploadFileBody * @interface SysFileUploadFileBody
*/ */
export interface SysFileUploadFileBody { export interface SysFileUploadFileBody extends SysUser {
/**
* 雪花Id
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
id?: number;
/**
* 创建时间
*
* @type {Date}
* @memberof SysFileUploadFileBody
*/
createTime?: Date;
/**
* 更新时间
*
* @type {Date}
* @memberof SysFileUploadFileBody
*/
updateTime?: Date | null;
/**
* 创建者Id
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
createUserId?: number | null;
/**
* 创建者姓名
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
createUserName?: string | null;
/**
* 修改者Id
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
updateUserId?: number | null;
/**
* 修改者姓名
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
updateUserName?: string | null;
/**
* 软删除
*
* @type {boolean}
* @memberof SysFileUploadFileBody
*/
isDelete?: boolean;
/**
* 租户Id
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
tenantId?: number | null;
/**
* 账号
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
account: string;
/**
* 真实姓名
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
realName?: string | null;
/**
* 昵称
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
nickName?: string | null;
/**
* 头像
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
avatar?: string | null;
/**
* @type {GenderEnum}
* @memberof SysFileUploadFileBody
*/
sex?: GenderEnum;
/**
* 年龄
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
age?: number;
/**
* 出生日期
*
* @type {Date}
* @memberof SysFileUploadFileBody
*/
birthday?: Date | null;
/**
* 民族
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
nation?: string | null;
/**
* 手机号码
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
phone?: string | null;
/**
* @type {CardTypeEnum}
* @memberof SysFileUploadFileBody
*/
cardType?: CardTypeEnum;
/**
* 身份证号
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
idCardNum?: string | null;
/**
* 邮箱
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
email?: string | null;
/**
* 地址
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
address?: string | null;
/**
* @type {CultureLevelEnum}
* @memberof SysFileUploadFileBody
*/
cultureLevel?: CultureLevelEnum;
/**
* 政治面貌
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
politicalOutlook?: string | null;
/**
* 毕业院校
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
college?: string | null;
/**
* 办公电话
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
officePhone?: string | null;
/**
* 紧急联系人
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
emergencyContact?: string | null;
/**
* 紧急联系人电话
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
emergencyPhone?: string | null;
/**
* 紧急联系人地址
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
emergencyAddress?: string | null;
/**
* 个人简介
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
introduction?: string | null;
/**
* 排序
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
orderNo?: number;
/**
* @type {StatusEnum}
* @memberof SysFileUploadFileBody
*/
status?: StatusEnum;
/**
* 备注
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
remark?: string | null;
/**
* @type {AccountTypeEnum}
* @memberof SysFileUploadFileBody
*/
accountType?: AccountTypeEnum;
/**
* 直属机构Id
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
orgId?: number;
/**
* @type {SysOrg}
* @memberof SysFileUploadFileBody
*/
sysOrg?: SysOrg;
/**
* 直属主管Id
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
managerUserId?: number | null;
/**
* 职位Id
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
posId?: number;
/**
* 工号
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
jobNum?: string | null;
/**
* 职级
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
posLevel?: string | null;
/**
* 职称
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
posTitle?: string | null;
/**
* 擅长领域
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
expertise?: string | null;
/**
* 办公区域
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
officeZone?: string | null;
/**
* 办公室
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
office?: string | null;
/**
* 入职日期
*
* @type {Date}
* @memberof SysFileUploadFileBody
*/
joinDate?: Date | null;
/**
* 最新登录Ip
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
lastLoginIp?: string | null;
/**
* 最新登录地点
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
lastLoginAddress?: string | null;
/**
* 最新登录时间
*
* @type {Date}
* @memberof SysFileUploadFileBody
*/
lastLoginTime?: Date | null;
/**
* 最新登录设备
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
lastLoginDevice?: string | null;
/**
* 电子签名
*
* @type {string}
* @memberof SysFileUploadFileBody
*/
signature?: string | null;
/**
* Token版本号
*
* @type {number}
* @memberof SysFileUploadFileBody
*/
tokenVersion?: number;
/**
* 最新密码修改时间
*
* @type {Date}
* @memberof SysFileUploadFileBody
*/
lastChangePasswordTime?: Date | null;
/** /**
* 文件 * 文件
@ -489,12 +893,6 @@ export interface SysFileUploadFileBody {
*/ */
createOrgDirectorSysOrgDirectorId?: number; createOrgDirectorSysOrgDirectorId?: number;
/**
* @type {SysUser}
* @memberof SysFileUploadFileBody
*/
createOrgDirectorSysOrgDirector?: SysUser;
/** /**
* 经度 * 经度
* *
@ -883,12 +1281,6 @@ export interface SysFileUploadFileBody {
*/ */
createOrgDirectorManagerUserSysOrgDirectorId?: number; createOrgDirectorManagerUserSysOrgDirectorId?: number;
/**
* @type {SysUser}
* @memberof SysFileUploadFileBody
*/
createOrgDirectorManagerUserSysOrgDirector?: SysUser;
/** /**
* 经度 * 经度
* *
@ -1023,12 +1415,6 @@ export interface SysFileUploadFileBody {
*/ */
createOrgDirectorManagerUserManagerUserId?: number; createOrgDirectorManagerUserManagerUserId?: number;
/**
* @type {SysUser}
* @memberof SysFileUploadFileBody
*/
createOrgDirectorManagerUserManagerUser?: SysUser;
/** /**
* 职位Id * 职位Id
* *

16
Web/src/api-services/models/sys-oauth-user.ts
View File

@ -85,14 +85,6 @@ export interface SysOAuthUser {
*/ */
isDelete?: boolean; isDelete?: boolean;
/**
* 邮箱
*
* @type {string}
* @memberof SysOAuthUser
*/
email?: string | null;
/** /**
* 系统用户Id * 系统用户Id
* *
@ -155,6 +147,14 @@ export interface SysOAuthUser {
*/ */
avatar?: string | null; avatar?: string | null;
/**
* 邮箱
*
* @type {string}
* @memberof SysOAuthUser
*/
email?: string | null;
/** /**
* 手机号码 * 手机号码
* *

12
Web/src/api-services/models/update-dict-type-input.ts
View File

@ -125,12 +125,6 @@ export interface UpdateDictTypeInput {
*/ */
status?: StatusEnum; status?: StatusEnum;
/**
* @type {YesNoEnum}
* @memberof UpdateDictTypeInput
*/
sysFlag?: YesNoEnum;
/** /**
* 字典值集合 * 字典值集合
* *
@ -138,4 +132,10 @@ export interface UpdateDictTypeInput {
* @memberof UpdateDictTypeInput * @memberof UpdateDictTypeInput
*/ */
children?: Array<SysDictData> | null; children?: Array<SysDictData> | null;
/**
* @type {YesNoEnum}
* @memberof UpdateDictTypeInput
*/
sysFlag?: YesNoEnum;
} }

1
Web/src/stores/userInfo.ts
View File

@ -138,7 +138,6 @@ export const useUserInfo = defineStore('userInfo', {
const ds = this.getDictDatasByCode(typePCode); const ds = this.getDictDatasByCode(typePCode);
for (const element of ds) { for (const element of ds) {
if (element.code === _code) { if (element.code === _code) {
console.log(element);
return element; return element;
} }
} }