+
+
+ —
+
+
{{- range .Fields}} {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
@@ -23,9 +28,36 @@
- {{- else }}
+ {{- else}}
-
+
+
+ {{- if eq .FieldType "float64" "int"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+ —
+
+ {{- else}}
+ {{- if .DictType}}
+
+
+
+ {{- else}}
+
+ {{- end }}
+ {{- end}}
+ {{- else if eq .FieldType "time.Time"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+ —
+
+ {{- else}}
+
+ {{- end}}
+ {{- else}}
+
+ {{- end}}
+
{{ end }}{{ end }}{{ end }}
{{ "{{ t('general.search') }}" }}
@@ -69,7 +101,12 @@
{{- else if eq .FieldType "bool" }}
{{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}
- {{- else }}
+
+ {{- else if eq .FieldType "time.Time" }}
+
+ {{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}
+
+ {{- else }}
{{- end }}
{{- end }}
diff --git a/server/service/example/exa_breakpoint_continue.go b/server/service/example/exa_breakpoint_continue.go
index 7363c7a2b..8a35983cf 100644
--- a/server/service/example/exa_breakpoint_continue.go
+++ b/server/service/example/exa_breakpoint_continue.go
@@ -56,7 +56,11 @@ func (e *FileUploadAndDownloadService) CreateFileChunk(id uint, fileChunkPath st
func (e *FileUploadAndDownloadService) DeleteFileChunk(fileMd5 string, filePath string) error {
var chunks []example.ExaFileChunk
var file example.ExaFile
- err := global.GVA_DB.Where("file_md5 = ? ", fileMd5).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
+ err := global.GVA_DB.Where("file_md5 = ? ", fileMd5).First(&file).
+ Updates(map[string]interface{}{
+ "IsFinish": true,
+ "file_path": filePath,
+ }).Error
if err != nil {
return err
}
diff --git a/server/service/system/jwt_black_list.go b/server/service/system/jwt_black_list.go
index 18fee92ea..836addc39 100644
--- a/server/service/system/jwt_black_list.go
+++ b/server/service/system/jwt_black_list.go
@@ -2,12 +2,12 @@ package system
import (
"context"
- "time"
"go.uber.org/zap"
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+ "github.com/flipped-aurora/gin-vue-admin/server/utils"
)
type JwtService struct{}
@@ -60,7 +60,11 @@ func (jwtService *JwtService) GetRedisJWT(userName string) (redisJWT string, err
func (jwtService *JwtService) SetRedisJWT(jwt string, userName string) (err error) {
// 此处过期时间等于jwt过期时间
- timer := time.Duration(global.GVA_CONFIG.JWT.ExpiresTime) * time.Second
+ dr, err := utils.ParseDuration(global.GVA_CONFIG.JWT.ExpiresTime)
+ if err != nil {
+ return err
+ }
+ timer := dr
err = global.GVA_REDIS.Set(context.Background(), userName, jwt, timer).Err()
return err
}
diff --git a/server/service/system/sys_api.go b/server/service/system/sys_api.go
index 5bcf61534..3e35d94a8 100644
--- a/server/service/system/sys_api.go
+++ b/server/service/system/sys_api.go
@@ -3,7 +3,6 @@ package system
import (
"errors"
"fmt"
-
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
@@ -44,7 +43,15 @@ func (apiService *ApiService) DeleteApi(api system.SysApi) (err error) {
if err != nil {
return err
}
- CasbinServiceApp.ClearCasbin(1, entity.Path, entity.Method)
+ success := CasbinServiceApp.ClearCasbin(1, entity.Path, entity.Method)
+ if !success {
+ return errors.New(entity.Path + ":" + entity.Method + "casbin同步清理失败")
+ }
+ e := CasbinServiceApp.Casbin()
+ err = e.InvalidateCache()
+ if err != nil {
+ return err
+ }
return nil
}
@@ -166,10 +173,22 @@ func (apiService *ApiService) UpdateApi(api system.SysApi) (err error) {
//@return: err error
func (apiService *ApiService) DeleteApisByIds(ids request.IdsReq) (err error) {
- err = global.GVA_DB.Delete(&[]system.SysApi{}, "id in ?", ids.Ids).Error
+ var apis []system.SysApi
+ err = global.GVA_DB.Find(&apis, "id in ?", ids.Ids).Delete(&apis).Error
+ if err != nil {
+ return err
+ } else {
+ for _, sysApi := range apis {
+ success := CasbinServiceApp.ClearCasbin(1, sysApi.Path, sysApi.Method)
+ if !success {
+ return errors.New(sysApi.Path + ":" + sysApi.Method + "casbin同步清理失败")
+ }
+ }
+ e := CasbinServiceApp.Casbin()
+ err = e.InvalidateCache()
+ if err != nil {
+ return err
+ }
+ }
return err
}
-
-func (apiService *ApiService) DeleteApiByIds(ids []string) (err error) {
- return global.GVA_DB.Delete(&system.SysApi{}, "id in ?", ids).Error
-}
diff --git a/server/service/system/sys_auto_code.go b/server/service/system/sys_auto_code.go
index 2a5bf34cd..1ec127966 100644
--- a/server/service/system/sys_auto_code.go
+++ b/server/service/system/sys_auto_code.go
@@ -10,7 +10,6 @@ import (
"go/parser"
"go/token"
"io"
- "io/ioutil"
"log"
"mime/multipart"
"os"
@@ -201,7 +200,7 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru
builder.WriteString(strings.Replace(ext, ".", "", -1))
}
builder.WriteString("\n\n")
- data, err := ioutil.ReadAll(f)
+ data, err := io.ReadAll(f)
if err != nil {
return nil, err
}
@@ -372,7 +371,7 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
//@return: []string, error
func (autoCodeService *AutoCodeService) GetAllTplFile(pathName string, fileList []string) ([]string, error) {
- files, err := ioutil.ReadDir(pathName)
+ files, err := os.ReadDir(pathName)
for _, fi := range files {
if fi.IsDir() {
fileList, err = autoCodeService.GetAllTplFile(pathName+"/"+fi.Name(), fileList)
@@ -816,7 +815,7 @@ func ImportReference(filepath, importCode, structName, packageName, groupName st
log.Fatal(err)
}
// 写回数据
- return ioutil.WriteFile(filepath, buffer.Bytes(), 0o600)
+ return os.WriteFile(filepath, buffer.Bytes(), 0o600)
}
// CreatePlug 自动创建插件模板
diff --git a/server/service/system/sys_autocode_history.go b/server/service/system/sys_autocode_history.go
index 078111f22..a77673232 100644
--- a/server/service/system/sys_autocode_history.go
+++ b/server/service/system/sys_autocode_history.go
@@ -5,6 +5,7 @@ import (
"fmt"
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
"path/filepath"
+ "strconv"
"strings"
"time"
@@ -67,7 +68,17 @@ func (autoCodeHistoryService *AutoCodeHistoryService) RollBack(info *systemReq.R
return err
}
// 清除API表
- err := ApiServiceApp.DeleteApiByIds(strings.Split(md.ApiIDs, ";"))
+
+ ids := request.IdsReq{}
+ idsStr := strings.Split(md.ApiIDs, ";")
+ for i := range idsStr[0 : len(idsStr)-1] {
+ id, err := strconv.Atoi(idsStr[i])
+ if err != nil {
+ return err
+ }
+ ids.Ids = append(ids.Ids, id)
+ }
+ err := ApiServiceApp.DeleteApisByIds(ids)
if err != nil {
global.GVA_LOG.Error("ClearTag DeleteApiByIds:", zap.Error(err))
}
diff --git a/server/service/system/sys_casbin.go b/server/service/system/sys_casbin.go
index 8959b531b..2dbd357a5 100644
--- a/server/service/system/sys_casbin.go
+++ b/server/service/system/sys_casbin.go
@@ -35,6 +35,10 @@ func (casbinService *CasbinService) UpdateCasbin(AuthorityID uint, casbinInfos [
if !success {
return errors.New("存在相同api,添加失败,请联系管理员")
}
+ err := e.InvalidateCache()
+ if err != nil {
+ return err
+ }
return nil
}
@@ -49,6 +53,11 @@ func (casbinService *CasbinService) UpdateCasbinApi(oldPath string, newPath stri
"v1": newPath,
"v2": newMethod,
}).Error
+ e := casbinService.Casbin()
+ err = e.InvalidateCache()
+ if err != nil {
+ return err
+ }
return err
}
@@ -89,11 +98,11 @@ func (casbinService *CasbinService) ClearCasbin(v int, p ...string) bool {
//@return: *casbin.Enforcer
var (
- syncedEnforcer *casbin.SyncedEnforcer
+ cachedEnforcer *casbin.CachedEnforcer
once sync.Once
)
-func (casbinService *CasbinService) Casbin() *casbin.SyncedEnforcer {
+func (casbinService *CasbinService) Casbin() *casbin.CachedEnforcer {
once.Do(func() {
a, _ := gormadapter.NewAdapterByDB(global.GVA_DB)
text := `
@@ -117,8 +126,9 @@ func (casbinService *CasbinService) Casbin() *casbin.SyncedEnforcer {
zap.L().Error("字符串加载模型失败!", zap.Error(err))
return
}
- syncedEnforcer, _ = casbin.NewSyncedEnforcer(m, a)
+ cachedEnforcer, _ = casbin.NewCachedEnforcer(m, a)
+ cachedEnforcer.SetExpireTime(60 * 60)
+ _ = cachedEnforcer.LoadPolicy()
})
- _ = syncedEnforcer.LoadPolicy()
- return syncedEnforcer
+ return cachedEnforcer
}
diff --git a/server/service/system/sys_menu.go b/server/service/system/sys_menu.go
index 5af5b7588..8e13b04b6 100644
--- a/server/service/system/sys_menu.go
+++ b/server/service/system/sys_menu.go
@@ -218,3 +218,18 @@ func (menuService *MenuService) GetMenuAuthority(info *request.GetAuthorityId) (
// err = global.GVA_DB.Raw(sql, authorityId).Scan(&menus).Error
return menus, err
}
+
+// UserAuthorityDefaultRouter 用户角色默认路由检查
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (menuService *MenuService) UserAuthorityDefaultRouter(user *system.SysUser) {
+ var menuIds []string
+ err := global.GVA_DB.Model(&system.SysAuthorityMenu{}).Where("sys_authority_authority_id = ?", user.AuthorityId).Pluck("sys_base_menu_id", &menuIds).Error
+ if err != nil {
+ return
+ }
+ var am system.SysBaseMenu
+ err = global.GVA_DB.First(&am, "name = ? and id in (?)", user.Authority.DefaultRouter, menuIds).Error
+ if errors.Is(err, gorm.ErrRecordNotFound) {
+ user.Authority.DefaultRouter = "404"
+ }
+}
diff --git a/server/service/system/sys_user.go b/server/service/system/sys_user.go
index 7a386820c..aef734fa3 100644
--- a/server/service/system/sys_user.go
+++ b/server/service/system/sys_user.go
@@ -32,6 +32,7 @@ func (userService *UserService) Register(u system.SysUser) (userInter system.Sys
}
//@author: [piexlmax](https://github.com/piexlmax)
+//@author: [SliverHorn](https://github.com/SliverHorn)
//@function: Login
//@description: 用户登录
//@param: u *model.SysUser
@@ -48,26 +49,8 @@ func (userService *UserService) Login(u *system.SysUser) (userInter *system.SysU
if ok := utils.BcryptCheck(u.Password, user.Password); !ok {
return nil, errors.New("密码错误")
}
-
- var SysAuthorityMenus []system.SysAuthorityMenu
- err = global.GVA_DB.Where("sys_authority_authority_id = ?", user.AuthorityId).Find(&SysAuthorityMenus).Error
- if err != nil {
- return
- }
-
- var MenuIds []string
-
- for i := range SysAuthorityMenus {
- MenuIds = append(MenuIds, SysAuthorityMenus[i].MenuId)
- }
-
- var am system.SysBaseMenu
- ferr := global.GVA_DB.First(&am, "name = ? and id in (?)", user.Authority.DefaultRouter, MenuIds).Error
- if errors.Is(ferr, gorm.ErrRecordNotFound) {
- user.Authority.DefaultRouter = "404"
- }
+ MenuServiceApp.UserAuthorityDefaultRouter(&user)
}
-
return &user, err
}
@@ -183,6 +166,7 @@ func (userService *UserService) SetUserInfo(req system.SysUser) error {
}
//@author: [piexlmax](https://github.com/piexlmax)
+//@author: [SliverHorn](https://github.com/SliverHorn)
//@function: GetUserInfo
//@description: 获取用户信息
//@param: uuid uuid.UUID
@@ -194,24 +178,7 @@ func (userService *UserService) GetUserInfo(uuid uuid.UUID) (user system.SysUser
if err != nil {
return reqUser, err
}
-
- var SysAuthorityMenus []system.SysAuthorityMenu
- err = global.GVA_DB.Where("sys_authority_authority_id = ?", reqUser.AuthorityId).Find(&SysAuthorityMenus).Error
- if err != nil {
- return
- }
-
- var MenuIds []string
-
- for i := range SysAuthorityMenus {
- MenuIds = append(MenuIds, SysAuthorityMenus[i].MenuId)
- }
-
- var am system.SysBaseMenu
- ferr := global.GVA_DB.First(&am, "name = ? and id in (?)", reqUser.Authority.DefaultRouter, MenuIds).Error
- if errors.Is(ferr, gorm.ErrRecordNotFound) {
- reqUser.Authority.DefaultRouter = "404"
- }
+ MenuServiceApp.UserAuthorityDefaultRouter(&user)
return reqUser, err
}
diff --git a/server/source/system/user.go b/server/source/system/user.go
index 79c49ebe1..17351c6a7 100644
--- a/server/source/system/user.go
+++ b/server/source/system/user.go
@@ -54,7 +54,7 @@ func (i *initUser) InitializeData(ctx context.Context) (next context.Context, er
UUID: uuid.NewV4(),
Username: "admin",
Password: adminPassword,
- NickName: "超级管理员",
+ NickName: "Mr.奇淼",
HeaderImg: "https://qmplusimg.henrongyi.top/gva_header.jpg",
AuthorityId: 888,
Phone: "17611111111",
@@ -64,7 +64,7 @@ func (i *initUser) InitializeData(ctx context.Context) (next context.Context, er
UUID: uuid.NewV4(),
Username: "a303176530",
Password: password,
- NickName: "QMPlusUser",
+ NickName: "用户1",
HeaderImg: "https:///qmplusimg.henrongyi.top/1572075907logo.png",
AuthorityId: 9528,
Phone: "17611111111",
diff --git a/server/utils/breakpoint_continue.go b/server/utils/breakpoint_continue.go
index d5f05629f..e4d834eec 100644
--- a/server/utils/breakpoint_continue.go
+++ b/server/utils/breakpoint_continue.go
@@ -1,7 +1,6 @@
package utils
import (
- "io/ioutil"
"os"
"strconv"
)
@@ -75,7 +74,7 @@ func makeFileContent(content []byte, fileName string, FileDir string, contentNum
//@return: error, string
func MakeFile(fileName string, FileMd5 string) (string, error) {
- rd, err := ioutil.ReadDir(breakpointDir + FileMd5)
+ rd, err := os.ReadDir(breakpointDir + FileMd5)
if err != nil {
return finishDir + fileName, err
}
@@ -86,7 +85,7 @@ func MakeFile(fileName string, FileMd5 string) (string, error) {
}
defer fd.Close()
for k := range rd {
- content, _ := ioutil.ReadFile(breakpointDir + FileMd5 + "/" + fileName + "_" + strconv.Itoa(k))
+ content, _ := os.ReadFile(breakpointDir + FileMd5 + "/" + fileName + "_" + strconv.Itoa(k))
_, err = fd.Write(content)
if err != nil {
_ = os.Remove(finishDir + fileName)
diff --git a/server/utils/human_duration.go b/server/utils/human_duration.go
new file mode 100644
index 000000000..3a2c9b28c
--- /dev/null
+++ b/server/utils/human_duration.go
@@ -0,0 +1,23 @@
+package utils
+
+import (
+ "strconv"
+ "strings"
+ "time"
+)
+
+func ParseDuration(d string) (time.Duration, error) {
+ dr, err := time.ParseDuration(d)
+ if err == nil {
+ return dr, nil
+ }
+ if strings.HasSuffix(d, "d") {
+ h := strings.TrimSuffix(d, "d")
+ hour, _ := strconv.Atoi(h)
+ dr = time.Hour * 24 * time.Duration(hour)
+ return dr, nil
+ }
+
+ dv, err := strconv.ParseInt(d, 10, 64)
+ return time.Duration(dv), err
+}
diff --git a/server/utils/injection_code.go b/server/utils/injection_code.go
index ddbe4927b..8427256c1 100644
--- a/server/utils/injection_code.go
+++ b/server/utils/injection_code.go
@@ -6,7 +6,7 @@ import (
"go/ast"
"go/parser"
"go/token"
- "io/ioutil"
+ "os"
"strings"
)
@@ -28,7 +28,7 @@ const (
//@return: error
func AutoInjectionCode(filepath string, funcName string, codeData string) error {
- srcData, err := ioutil.ReadFile(filepath)
+ srcData, err := os.ReadFile(filepath)
if err != nil {
return err
}
@@ -113,7 +113,7 @@ func AutoInjectionCode(filepath string, funcName string, codeData string) error
srcData = append(append(srcData[:indexPos], insertData...), remainData...)
// 写回数据
- return ioutil.WriteFile(filepath, srcData, 0o600)
+ return os.WriteFile(filepath, srcData, 0o600)
}
func checkExist(srcData *[]byte, startPos int, endPos int, blockStmt *ast.BlockStmt, target string) bool {
@@ -153,7 +153,7 @@ func checkExist(srcData *[]byte, startPos int, endPos int, blockStmt *ast.BlockS
}
func AutoClearCode(filepath string, codeData string) error {
- srcData, err := ioutil.ReadFile(filepath)
+ srcData, err := os.ReadFile(filepath)
if err != nil {
return err
}
@@ -161,7 +161,7 @@ func AutoClearCode(filepath string, codeData string) error {
if err != nil {
return err
}
- return ioutil.WriteFile(filepath, srcData, 0o600)
+ return os.WriteFile(filepath, srcData, 0o600)
}
func cleanCode(clearCode string, srcData string) ([]byte, error) {
diff --git a/server/utils/jwt.go b/server/utils/jwt.go
index 569717766..1f9de19e5 100644
--- a/server/utils/jwt.go
+++ b/server/utils/jwt.go
@@ -4,9 +4,10 @@ import (
"errors"
"time"
+ jwt "github.com/golang-jwt/jwt/v4"
+
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
- "github.com/golang-jwt/jwt/v4"
)
type JWT struct {
@@ -27,13 +28,15 @@ func NewJWT() *JWT {
}
func (j *JWT) CreateClaims(baseClaims request.BaseClaims) request.CustomClaims {
+ bf, _ := ParseDuration(global.GVA_CONFIG.JWT.BufferTime)
+ ep, _ := ParseDuration(global.GVA_CONFIG.JWT.ExpiresTime)
claims := request.CustomClaims{
BaseClaims: baseClaims,
- BufferTime: global.GVA_CONFIG.JWT.BufferTime, // 缓冲时间1天 缓冲时间内会获得新的token刷新令牌 此时一个用户会存在两个有效令牌 但是前端只留一个 另一个会丢失
+ BufferTime: int64(bf), // 缓冲时间1天 缓冲时间内会获得新的token刷新令牌 此时一个用户会存在两个有效令牌 但是前端只留一个 另一个会丢失
StandardClaims: jwt.StandardClaims{
- NotBefore: time.Now().Unix() - 1000, // 签名生效时间
- ExpiresAt: time.Now().Unix() + global.GVA_CONFIG.JWT.ExpiresTime, // 过期时间 7天 配置文件
- Issuer: global.GVA_CONFIG.JWT.Issuer, // 签名的发行者
+ NotBefore: time.Now().Unix() - 1000, // 签名生效时间
+ ExpiresAt: time.Now().Add(ep).Unix(), // 过期时间 7天 配置文件
+ Issuer: global.GVA_CONFIG.JWT.Issuer, // 签名的发行者
},
}
return claims
diff --git a/server/utils/plugin/plugin_uinx.go b/server/utils/plugin/plugin_uinx.go
index 8317f1f01..793187787 100644
--- a/server/utils/plugin/plugin_uinx.go
+++ b/server/utils/plugin/plugin_uinx.go
@@ -45,6 +45,7 @@ func LoadPlugin(path string) error {
return err
}
if fileInfo.IsDir() {
+ // TODO 返回的参数不一样暂时不修改(https://golang.google.cn/doc/go1.16#ioutil)
fileSlice, err := ioutil.ReadDir(path)
if err != nil {
return err
diff --git a/web/package.json b/web/package.json
index 08173684d..76a94b539 100644
--- a/web/package.json
+++ b/web/package.json
@@ -19,6 +19,7 @@
"js-cookie": "^3.0.1",
"marked": "^2.0.0",
"mitt": "^3.0.0",
+ "nprogress": "^0.2.0",
"path": "^0.12.7",
"pinia": "^2.0.9",
"qs": "^6.8.0",
diff --git a/web/src/main.js b/web/src/main.js
index 1a19294f9..c5f833181 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -13,6 +13,18 @@ import auth from '@/directive/auth'
import { store } from '@/pinia'
import App from './App.vue'
import i18n from './i18n' // added by mohamed hassan to multilangauge
+/**
+ * @description 导入加载进度条，防止首屏加载时间过长，用户等待
+ *
+ * */
+import Nprogress from 'nprogress'
+import 'nprogress/nprogress.css'
+Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
+Nprogress.start()
+
+/**
+ * 无需在这块结束，会在路由中间件中结束此块内容
+ * */
const app = createApp(App)
app.config.productionTip = false
diff --git a/web/src/permission.js b/web/src/permission.js
index 619584149..954cfd5a0 100644
--- a/web/src/permission.js
+++ b/web/src/permission.js
@@ -2,6 +2,7 @@ import { useUserStore } from '@/pinia/modules/user'
import { useRouterStore } from '@/pinia/modules/router'
import getPageTitle from '@/utils/page'
import router from '@/router'
+import Nprogress from 'nprogress'
let asyncRouterFlag = 0
@@ -37,6 +38,7 @@ async function handleKeepAlive(to) {
}
router.beforeEach(async(to, from) => {
+ Nprogress.start()
const userStore = useUserStore()
to.meta.matched = [...to.matched]
handleKeepAlive(to)
@@ -99,3 +101,13 @@ router.beforeEach(async(to, from) => {
}
}
})
+
+router.afterEach(() => {
+ // 路由加载完成后关闭进度条
+ Nprogress.done()
+})
+
+router.onError(() => {
+ // 路由发生错误后销毁进度条
+ Nprogress.remove()
+})
diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
index 2865b622a..aa6b1a232 100644
--- a/web/src/pinia/modules/user.js
+++ b/web/src/pinia/modules/user.js
@@ -77,7 +77,7 @@ export const useUserStore = defineStore('user', () => {
asyncRouters.forEach(asyncRouter => {
router.addRoute(asyncRouter)
})
- router.push({ name: userInfo.value.authority.defaultRouter })
+ await router.push({ name: userInfo.value.authority.defaultRouter })
loadingInstance.value.close()
return true
}
diff --git a/web/src/style/base.scss b/web/src/style/base.scss
index f6a2eae8d..b3bda02ed 100644
--- a/web/src/style/base.scss
+++ b/web/src/style/base.scss
@@ -58,4 +58,8 @@
.keyword{
width: 220px;
margin: 0 0 0 30px;
-}
\ No newline at end of file
+}
+
+#nprogress .bar {
+ background: #4D70FF !important; //自定义颜色
+}
diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index 1a42bed02..689bf8366 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -461,22 +461,6 @@ a {
text-decoration: none;
}
-a:link {
- color: #fff;
-}
-
-a:visited {
- color: #fff;
-}
-
-a:hover {
- color: #fff;
-}
-
-a:active {
- color: #fff;
-}
-
input::-ms-clear {
display: none;
}
@@ -597,7 +581,7 @@ li {
}
.aside {
.el-menu--collapse {
- >.el-menu-item{
+ >.el-menu-item {
display: flex;
justify-content: center;
}
diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index 464c83e62..0d670c427 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -28,6 +28,7 @@
ref="loginForm"
:model="loginFormData"
:rules="rules"
+ :validate-on-rule-change="false"
@keyup.enter="submitForm"
>
diff --git a/web/src/view/systemTools/autoCode/component/fieldDialog.vue b/web/src/view/systemTools/autoCode/component/fieldDialog.vue
index 981c20ad7..1466cd2d2 100644
--- a/web/src/view/systemTools/autoCode/component/fieldDialog.vue
+++ b/web/src/view/systemTools/autoCode/component/fieldDialog.vue
@@ -58,7 +58,10 @@
:key="item.value"
:label="item.label"
:value="item.value"
- :disabled="middleDate.fieldType!=='string'&&item.value==='LIKE'"
+ :disabled="
+ (middleDate.fieldType!=='string'&&item.value==='LIKE')||
+ ((middleDate.fieldType!=='int'&&middleDate.fieldType!=='time.Time'&&middleDate.fieldType!=='float64')&&(item.value==='BETWEEN' || item.value==='NOT BETWEEN'))
+ "
/>
@@ -133,6 +136,14 @@ const typeSearchOptions = ref([
{
label: 'LIKE',
value: 'LIKE'
+ },
+ {
+ label: 'BETWEEN',
+ value: 'BETWEEN'
+ },
+ {
+ label: 'NOT BETWEEN',
+ value: 'NOT BETWEEN'
}
])
const typeOptions = ref([