Merge pull request #188 from suyuan32/dev

Dev
suyuan32 · Mar 5, 2024 · 495fea4 · 495fea4
2 parents 7da9318 + bfd5d2e
commit 495fea4
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 27 deletions.
diff --git 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"
   ]
 }
diff --git 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
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en" id="htmlRoot">
   <head>
     <meta charset="UTF-8" />

diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

diff --git 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'],
 ];