chore: 更新依赖项

issue9 · Feb 1, 2025 · 03af49a · 03af49a
1 parent 6ad547c
commit 03af49a
Show file tree

Hide file tree

Showing 9 changed files with 426 additions and 140 deletions.
diff --git a/admin/package.json b/admin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@cmfx/admin",
-    "version": "0.8.6",
+    "version": "0.8.7",
     "type": "module",
     "description": "适用于 cmfx 的后台管理框架",
     "author": {
@@ -103,28 +103,28 @@
         "@solidjs/router": "^0.15.3",
         "bowser": "^2.11.0",
         "echarts": "^5.6.0",
-        "intl-messageformat": "^10.7.12",
-        "material-symbols": "^0.27.2",
+        "intl-messageformat": "^10.7.14",
+        "material-symbols": "^0.28.1",
         "qr-code-styling": "^1.9.1",
         "quill": "^2.0.3",
         "solid-js": "^1.9.4",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
         "yaml": "^2.7.0"
     },
     "devDependencies": {
-        "@types/node": "^22.10.7",
-        "@vitest/coverage-v8": "^3.0.2",
+        "@types/node": "^22.13.0",
+        "@vitest/coverage-v8": "^3.0.4",
         "autoprefixer": "^10.4.20",
         "cssnano": "^7.0.6",
         "jsdom": "^26.0.0",
         "postcss": "^8.5.1",
         "tailwindcss": "^3.4.17",
         "typescript": "^5.7.3",
-        "vite": "^6.0.7",
+        "vite": "^6.0.11",
         "vite-plugin-dts": "^4.5.0",
         "vite-plugin-solid": "^2.11.0",
         "vite-plugin-static-copy": "^2.2.0",
-        "vitest": "^3.0.2",
+        "vitest": "^3.0.4",
         "vitest-fetch-mock": "^0.4.3"
     }
-}
+}
diff --git a/cmd/admin/package.json b/cmd/admin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@cmfx/admin-demo",
-    "version": "0.8.6",
+    "version": "0.8.7",
     "type": "module",
     "author": {
         "name": "caixw",
@@ -22,19 +22,19 @@
     },
     "dependencies": {
         "@solidjs/router": "^0.15.3",
-        "@cmfx/admin": "0.8.6",
+        "@cmfx/admin": "0.8.7",
         "solid-js": "^1.9.4"
     },
     "devDependencies": {
-        "@types/node": "^22.10.7",
+        "@types/node": "^22.13.0",
         "@vitejs/plugin-basic-ssl": "^1.2.0",
         "autoprefixer": "^10.4.20",
         "cssnano": "^7.0.6",
         "postcss": "^8.5.1",
         "solid-devtools": "^0.33.0",
         "tailwindcss": "^3.4.17",
         "typescript": "^5.7.3",
-        "vite": "^6.0.7",
+        "vite": "^6.0.11",
         "vite-plugin-solid": "^2.11.0"
     }
 }
diff --git a/cmfx/cmfx.go b/cmfx/cmfx.go
@@ -15,7 +15,7 @@ import (
 )
 
 // Version 表示当前框架的版本
-const Version = "0.8.6"
+const Version = "0.8.7"
 
 // 400
 const (

diff --git a/cmfx/locales/und.yaml b/cmfx/locales/und.yaml
@@ -163,6 +163,12 @@ messages:
     - key: forbidden can not delete yourself detail
       message:
         msg: forbidden can not delete yourself detail
+    - key: forbidden must be author
+      message:
+        msg: forbidden must be author
+    - key: forbidden must be author detail
+      message:
+        msg: forbidden must be author detail
     - key: forbidden state not allow
       message:
         msg: forbidden state not allow
@@ -310,6 +316,12 @@ messages:
     - key: must be a dir
       message:
         msg: must be a dir
+    - key: must be between (%v,%v)
+      message:
+        msg: must be between (%v,%v)
+    - key: must be between [%v,%v]
+      message:
+        msg: must be between [%v,%v]
     - key: must be empty
       message:
         msg: must be empty

diff --git a/cmfx/locales/zh.yaml b/cmfx/locales/zh.yaml
@@ -170,6 +170,12 @@ messages:
     - key: forbidden can not delete yourself detail
       message:
         msg: 不允许删除自身
+    - key: forbidden must be author
+      message:
+        msg: 只能由作者操作
+    - key: forbidden must be author detail
+      message:
+        msg: 该操作只能由作者进行操作。
     - key: forbidden state not allow
       message:
         msg: 当前状态不允许该操作
@@ -319,6 +325,12 @@ messages:
     - key: must be a dir
       message:
         msg: 必须得是个目录
+    - key: must be between (%v,%v)
+      message:
+        msg: 值必须介于 (%v,%v) 之间
+    - key: must be between [%v,%v]
+      message:
+        msg: 值必须介于 [%v,%v] 之间
     - key: must be empty
       message:
         msg: 必须为空

diff --git a/cmfx/modules/member/module.go b/cmfx/modules/member/module.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/issue9/orm/v6"
+	"github.com/issue9/orm/v6/sqlbuilder"
 	"github.com/issue9/web"
 	"github.com/issue9/web/openapi"
 
@@ -313,3 +314,11 @@ func (m *Module) SetType(tx *orm.Tx, uid, t int64) error {
 	_, err := e.Update(&infoPO{ID: uid, Type: t}, "type")
 	return err
 }
+
+// LeftJoin 将 以 LEFT JOIN 的形式插入到 sql 语句中
+//
+// alias 为 [infoPO] 表的别名，on 为 LEFT JOIN 的条件。
+func (m *Module) LeftJoin(sql *sqlbuilder.SelectStmt, alias, on string) {
+	sql.Columns(alias+".birthday", alias+".sex", alias+".nickname", alias+".avatar", alias+".inviter", alias+".level", alias+".type").
+		Join("LEFT", m.UserModule().Module().DB().TablePrefix()+(&infoPO{}).TableName(), alias, on)
+}
diff --git a/cmfx/modules/system/module.go b/cmfx/modules/system/module.go
@@ -97,12 +97,12 @@ func Load(mod *cmfx.Module, conf *Config, adminL *admin.Module) *Module {
 				Desc(web.Phrase("get api list api"), nil)
 		})).
 		Post("/systat", m.adminPostSystat, resGetStat, mod.API(func(o *openapi.Operation) {
-			o.Tag("system", "systat").
+			o.Tag("system", "systat", "sse").
 				Desc(web.Phrase("subscribe system stat api"), nil).
 				ResponseEmpty("201")
 		})).
 		Delete("/systat", m.adminDeleteSystat, resGetStat, mod.API(func(o *openapi.Operation) {
-			o.Tag("system", "systat").
+			o.Tag("system", "systat", "sse").
 				Desc(web.Phrase("unsubscribe system stat api"), nil).
 				ResponseEmpty("204")
 		})).
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     )
     // Version 表示当前框架的版本
-    const Version = "0.8.6"
+    const Version = "0.8.7"
     // 400
     const (
@@ Expand Down @@