From 5fa13ddff8fde6fc9f61a6cd3f9eeb6eb57974ff Mon Sep 17 00:00:00 2001 From: Ryan Su Date: Sat, 2 Mar 2024 09:31:21 +0800 Subject: [PATCH 1/3] fix: model mismatch error --- .vscode/settings.json | 20 ++++---------------- index.html | 2 +- src/api/fms/model/cloudFileModel.ts | 2 +- src/api/mcms/model/emailLogModel.ts | 2 +- src/api/mcms/model/smsLogModel.ts | 2 +- src/api/member/model/memberModel.ts | 2 +- src/api/sys/model/tokenModel.ts | 2 +- src/api/sys/model/userModel.ts | 2 +- 8 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 44a71368..a4efb3b7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -55,14 +55,7 @@ "**/yarn.lock": true }, "stylelint.enable": true, - "stylelint.validate": [ - "css", - "less", - "postcss", - "scss", - "vue", - "sass" - ], + "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"], "path-intellisense.mappings": { "/@/": "${workspaceRoot}/src" }, @@ -101,20 +94,15 @@ }, "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "i18n-ally.localesPaths": [ - "src/locales/lang" - ], + "i18n-ally.localesPaths": ["src/locales/lang"], "i18n-ally.keystyle": "nested", "i18n-ally.sortKeys": true, "i18n-ally.namespace": true, "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}", - "i18n-ally.enabledParsers": ["json","ts","js"], + "i18n-ally.enabledParsers": ["json", "ts", "js"], "i18n-ally.sourceLanguage": "en", "i18n-ally.displayLanguage": "zh-CN", - "i18n-ally.enabledFrameworks": [ - "vue", - "react" - ], + "i18n-ally.enabledFrameworks": ["vue", "react"], "cSpell.words": [ "antd", "antv", diff --git a/index.html b/index.html index 53410098..6d63648a 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + diff --git a/src/api/fms/model/cloudFileModel.ts b/src/api/fms/model/cloudFileModel.ts index f3679d41..00e73432 100644 --- a/src/api/fms/model/cloudFileModel.ts +++ b/src/api/fms/model/cloudFileModel.ts @@ -4,7 +4,7 @@ import { BaseListResp } from '@/api/model/baseModel'; * @description: CloudFile info response */ export interface CloudFileInfo { - id: string; + id?: string; createdAt?: number; updatedAt?: number; state?: boolean; diff --git a/src/api/mcms/model/emailLogModel.ts b/src/api/mcms/model/emailLogModel.ts index be00a7e1..8f64ac5d 100644 --- a/src/api/mcms/model/emailLogModel.ts +++ b/src/api/mcms/model/emailLogModel.ts @@ -4,7 +4,7 @@ import { BaseListResp } from '@/api/model/baseModel'; * @description: EmailLog info response */ export interface EmailLogInfo { - id: string; + id?: string; createdAt?: number; updatedAt?: number; target?: string; diff --git a/src/api/mcms/model/smsLogModel.ts b/src/api/mcms/model/smsLogModel.ts index c622b24c..1a759c85 100644 --- a/src/api/mcms/model/smsLogModel.ts +++ b/src/api/mcms/model/smsLogModel.ts @@ -4,7 +4,7 @@ import { BaseListResp } from '@/api/model/baseModel'; * @description: SmsLog info response */ export interface SmsLogInfo { - id: string; + id?: string; createdAt?: number; updatedAt?: number; phoneNumber?: string; diff --git a/src/api/member/model/memberModel.ts b/src/api/member/model/memberModel.ts index 9c9937ac..fe560c02 100644 --- a/src/api/member/model/memberModel.ts +++ b/src/api/member/model/memberModel.ts @@ -4,7 +4,7 @@ import { BaseListResp } from '@/api/model/baseModel'; * @description: Member info response */ export interface MemberInfo { - id: string; + id?: string; createdAt?: number; updatedAt?: number; status?: number; diff --git a/src/api/sys/model/tokenModel.ts b/src/api/sys/model/tokenModel.ts index ebaab6e6..300cc548 100644 --- a/src/api/sys/model/tokenModel.ts +++ b/src/api/sys/model/tokenModel.ts @@ -4,7 +4,7 @@ import { BaseListResp } from '@/api/model/baseModel'; * @description: Token info response */ export interface TokenInfo { - id: string; + id?: string; createdAt?: number; updatedAt?: number; status?: number; diff --git a/src/api/sys/model/userModel.ts b/src/api/sys/model/userModel.ts index 872256cc..be889c9b 100644 --- a/src/api/sys/model/userModel.ts +++ b/src/api/sys/model/userModel.ts @@ -4,7 +4,7 @@ import { BaseListResp } from '@/api/model/baseModel'; * @description: User info response */ export interface UserInfo { - id: string; + id?: string; createdAt?: number; updatedAt?: number; status?: number; From 1624771cb1e20a166a7df03fb47b877d6b1d1325 Mon Sep 17 00:00:00 2001 From: Ryan SU Date: Sun, 3 Mar 2024 11:13:28 +0800 Subject: [PATCH 2/3] fix: remove unuse recommend --- .vscode/extensions.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 3f7ad41a..e570e257 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -8,7 +8,6 @@ "lokalise.i18n-ally", "antfu.iconify", "antfu.unocss", - "mikestead.dotenv", - "vue.vscode-typescript-vue-plugin" + "mikestead.dotenv" ] } From bfd5d2e5e2b1d796310a956920e22700dfbb2b10 Mon Sep 17 00:00:00 2001 From: Ryan Su Date: Tue, 5 Mar 2024 17:28:23 +0800 Subject: [PATCH 3/3] chore: update version --- package.json | 2 +- src/views/dashboard/workbench/components/data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9b2961c2..7ce7c761 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-admin", - "version": "1.3.8", + "version": "1.3.10", "homepage": "https://github.com/suyuan32/simple-admin-backend-ui", "bugs": { "url": "https://github.com/suyuan32/simple-admin-backend-ui/issues" diff --git a/src/views/dashboard/workbench/components/data.ts b/src/views/dashboard/workbench/components/data.ts index ab8e84eb..005b824d 100644 --- a/src/views/dashboard/workbench/components/data.ts +++ b/src/views/dashboard/workbench/components/data.ts @@ -52,5 +52,5 @@ export const navItems: NavItem[] = [ export const systemInfoData = [ ['sys.sys.Name', 'Simple Admin'], - ['sys.sys.version', 'V 1.3.8'], + ['sys.sys.version', 'V 1.3.10'], ];