diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/app.less b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/app.less index 0c48611..7988aaa 100644 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/app.less +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/app.less @@ -19,5 +19,7 @@ @import './lib/table.less'; @import './lib/form.less'; @import './lib/select.less'; +@import './lib/dropdown.less'; +@import './lib/tree-layout.less'; @import './theme/primary.less'; // @import './lib/font-weight.less'; diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/dropdown.less b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/dropdown.less new file mode 100644 index 0000000..9927f9c --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/dropdown.less @@ -0,0 +1,6 @@ +@import (reference) '~@/assets/style/extend.less'; +.ant-dropdown-trigger { + .anticon-down { + transform: scaleY(.75); + } +} diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/form.less b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/form.less index cda89de..3bbb6c1 100644 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/form.less +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/form.less @@ -110,6 +110,11 @@ opacity: 1; color: fade(darken(@primary-color, 38.2%), 61.8%); } + .has-error { + .ant-form-explain { + color: @error-color; + } + } // 上下布局 .yo-form--vertical { display: block; diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/table.less b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/table.less index 3b92909..f5b8b2b 100644 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/table.less +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/table.less @@ -76,7 +76,15 @@ } .yo-table-actions { display: inline-block; - >a { - color: darken(@primary-color, 20%); + + vertical-align: middle; + &--inner { + display: flex; + align-items: center; + + height: 18px; + >a { + color: darken(@primary-color, 20%); + } } } diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/tree-layout.less b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/tree-layout.less new file mode 100644 index 0000000..19f3b36 --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/lib/tree-layout.less @@ -0,0 +1,24 @@ +@import (reference) '~@/assets/style/extend.less'; +.yo-tree-layout { + position: absolute; + top: 0; + left: 0; + + width: 100%; + height: 100%; + .ant-layout-sider { + background-color: @white; + .swiper-container { + position: absolute; + top: @layout-header-height - 20px; + left: 0; + bottom: 0; + + width: 100%; + .swiper-slide { + height: auto; + min-height: 100%; + } + } + } +} diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/main.less b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/main.less index 7b77274..4bcfa5c 100644 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/main.less +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/assets/style/main.less @@ -203,59 +203,63 @@ } } } - .ant-layout-sider { - height: 100%; - - background-color: @nav-background; - .ant-layout-sider-children { - display: flex; - flex-direction: column; - } - .logo { - font-size: @font-size-lg * 1.5; - font-weight: 500; - line-height: @layout-header-height + 10px; - - z-index: 5; - - display: flex; - overflow: hidden; - align-items: center; - flex: 0 0 @layout-header-height + 10px; - - height: @layout-header-height + 10px; - padding: 0 @padding-md 0 @padding-lg; - - color: @logo-color; - background-color: @nav-background; - box-shadow: @logo-box-shadow; - img { - max-height: 100%; - } - span { - margin-left: @padding-sm; - - transition: @animation-duration-slow; - transition-property: opacity; - } - } - &.ant-layout-sider-collapsed { - .logo { - span { - opacity: 0; - } - } - } - .swiper-container { - flex: 1 1 100%; - - width: 100%; + >section { + >.ant-layout-sider { height: 100%; - box-shadow: 2px 0 8px @nav-box-shadow-color; - } - .swiper-slide { - height: auto; + background-color: @nav-background; + .ant-layout-sider-children { + display: flex; + flex-direction: column; + } + .logo { + font-size: @font-size-lg * 1.5; + font-weight: 500; + line-height: @layout-header-height + 10px; + + z-index: 5; + + display: flex; + overflow: hidden; + align-items: center; + flex: 0 0 @layout-header-height + 10px; + + height: @layout-header-height + 10px; + padding: 0 @padding-md 0 @padding-lg; + + color: @logo-color; + background-color: @nav-background; + box-shadow: @logo-box-shadow; + img { + max-height: 100%; + } + span { + margin-left: @padding-sm; + + transition: @animation-duration-slow; + transition-property: opacity; + } + } + &.ant-layout-sider-collapsed { + .logo { + span { + opacity: 0; + } + } + } + .swiper-container { + z-index: 10; + + flex: 1 1 100%; + + width: 100%; + height: 100%; + + box-shadow: 2px 0 8px @nav-box-shadow-color; + } + .swiper-slide { + height: auto; + } } } } diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/appManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/appManage.js deleted file mode 100644 index 0840a01..0000000 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/appManage.js +++ /dev/null @@ -1,7 +0,0 @@ -export default { - getAppPage: ['/sysApp/page', 'get'], - sysAppAdd: '/sysApp/add', - sysAppEdit: '/sysApp/edit', - sysAppDelete: '/sysApp/delete', - sysAppSetAsDefault: '/sysApp/setAsDefault' -} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/dictManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/dictManage.js deleted file mode 100644 index 8d880c1..0000000 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/dictManage.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - sysDictTypeDropDown: ['/sysDictType/dropDown', 'get'], -} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/index.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/index.js index 3ab4b54..8547672 100644 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/index.js +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/index.js @@ -11,15 +11,15 @@ * [url]必填,为接口地址,[method]选填,为请求方式(不区分大小写),默认为POST */ -import loginManage from './loginManage' -import dictManage from './dictManage' -import appManage from './appManage' -import orgManage from './orgManage' -import roleManage from './roleManage' -import userManage from './userManage' -import menuManage from './menuManage' -import vislogManage from './vislogManage' -import posManage from './posManage' +import loginManage from './sys/loginManage' +import dictManage from './sys/dictManage' +import appManage from './sys/appManage' +import orgManage from './sys/orgManage' +import roleManage from './sys/roleManage' +import userManage from './sys/userManage' +import menuManage from './sys/menuManage' +import vislogManage from './sys/vislogManage' +import posManage from './sys/posManage' export default { ...loginManage, diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/loginManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/loginManage.js deleted file mode 100644 index f8009d0..0000000 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/loginManage.js +++ /dev/null @@ -1,5 +0,0 @@ -export default { - login: '/login', - logout: ['/logout', 'get'], - getLoginUser: ['/getLoginUser', 'get'], -} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/appManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/appManage.js new file mode 100644 index 0000000..be031ca --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/appManage.js @@ -0,0 +1,34 @@ +export default { + /** + * 系统应用列表 + */ + getAppPage: ['/sysApp/page', 'get'], + /** + * 系统应用列表 + */ + getAppList: ['/sysApp/list', 'get'], + /** + * 新增系统应用 + */ + sysAppAdd: ['/sysApp/add', 'post'], + /** + * 编辑系统应用 + * + */ + sysAppEdit: ['/sysApp/edit', 'post'], + /** + * 删除系统应用 + */ + sysAppDelete: ['/sysApp/delete', 'post'], + /** + * 设为默认应用 + */ + sysAppSetAsDefault: ['/sysApp/setAsDefault', 'post'], + /** + * 修改应用状态 + */ + sysAppChangeStatus: ['/sysApp/changeStatus', 'post'], +} + + + diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/configManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/configManage.js new file mode 100644 index 0000000..a64cf5e --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/configManage.js @@ -0,0 +1,26 @@ +export default { + /** + * 分页查询配置列表 + */ + sysConfigPage: ['/sysConfig/page', 'get'], + /** + * 添加系统参数配置 + */ + sysConfigAdd: ['/sysConfig/add', 'post'], + /** + * 编辑系统参数配置 + */ + sysConfigEdit: ['/sysConfig/edit', 'post'], + /** + * 删除系统参数配置 + */ + sysConfigDelete: ['/sysConfig/delete', 'post'], + /** + * 获取字典类型下所有字典,举例,返回格式为:[{code:"M",value:"男"},{code:"F",value:"女"}] + */ + sysDictTypeDropDown: ['/sysDictType/dropDown', 'get'], + /** + * 获取系统的所有任务列表 + */ + sysTimersGetActionClasses: ['/sysTimers/getActionClasses', 'get'], +} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/dictDataManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/dictDataManage.js new file mode 100644 index 0000000..cce61de --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/dictDataManage.js @@ -0,0 +1,18 @@ +export default { + /** + * 查询系统字典值 + */ + sysDictDataPage: ['/sysDictData/page', 'get'], + /** + * 添加系统字典值 + */ + sysDictDataAdd: ['/sysDictData/add', 'post'], + /** + * 编辑系统字典值 + */ + sysDictDataEdit: ['/sysDictData/edit', 'post'], + /** + * 删除系统字典值 + */ + sysDictDataDelete: ['/sysDictData/delete', 'post'], +} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/dictManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/dictManage.js new file mode 100644 index 0000000..f9f97f2 --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/dictManage.js @@ -0,0 +1,26 @@ +export default { + /** + * 分页查询系统字典类型 + */ + sysDictTypePage: ['/sysDictType/page', 'get'], + /** + * 添加系统字典类型 + */ + sysDictTypeAdd: ['/sysDictType/add', 'post'], + /** + * 编辑系统字典类型 + */ + sysDictTypeEdit: ['/sysDictType/edit', 'post'], + /** + * 删除系统字典类型 + */ + sysDictTypeDelete: ['/sysDictType/delete', 'post'], + /** + * 获取字典类型下所有字典,举例,返回格式为:[{code:"M",value:"男"},{code:"F",value:"女"}] + */ + sysDictTypeDropDown: ['/sysDictType/dropDown', 'get'], + /** + * 获取所有字典,启动时加入缓存使用 + */ + sysDictTypeTree: ['/sysDictType/tree', 'get'], +} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/emailManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/emailManage.js new file mode 100644 index 0000000..42e4071 --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/emailManage.js @@ -0,0 +1,10 @@ +export default { + /** + * 发送邮件 + */ + emailSendEmail: ['/email/sendEmail', 'post'], + /** + * 发送html邮件 + */ + emailSendEmailHtml: ['/email/sendEmailHtml', 'post'], +} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/fileManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/fileManage.js new file mode 100644 index 0000000..b224ea8 --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/fileManage.js @@ -0,0 +1,32 @@ +export default { + /** + * 分页查询文件信息表 + */ + sysFileInfoPage: ['/sysFileInfo/page', 'get'], + /** + * 获取全部文件信息表 + */ + sysFileInfoList: ['/sysFileInfo/list', 'get'], + /** + * 上传文件 + */ + sysFileInfoUpload: ['/sysFileInfo/upload', 'post'], + /** + * 下载文件 + */ + sysFileInfoDownload: ['/sysFileInfo/download', 'get'], + + /** + * 查看图片 + */ + sysFileInfoPreview: ['/sysFileInfo/preview', 'get'], + + /** + * 查看详情文件信息表 + */ + sysFileInfoDetail: ['/sysFileInfo/detail', 'get'], + /** + * 删除文件信息表 + */ + sysFileInfoDelete: ['/sysFileInfo/delete', 'post'], +} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/loginManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/loginManage.js new file mode 100644 index 0000000..f206df8 --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/loginManage.js @@ -0,0 +1,34 @@ +export default { + /** + * 登录 + */ + login: ['/login', 'post'], + /** + * 登出 + */ + logout: ['/logout', 'get'], + /** + * 获取登录用户信息 + */ + getLoginUser: ['/getLoginUser', 'get'], + /** + * 获取租户开关 + */ + getTenantOpen: ['/getTenantOpen', 'get'], + /** + * 获取短信验证码 + */ + getSmsCaptcha: ['/getSmsCaptcha', 'get'], + /** + * 获取验证码开关 + */ + getCaptchaOpen: ['/getCaptchaOpen', 'get'], + /** + * 获取验证图片 以及token + */ + reqGet: ['/captcha/get', 'post'], + /** + * 滑动或者点选验证 + */ + reqCheck: ['/captcha/check', 'post'], +} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/menuManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/menuManage.js similarity index 100% rename from Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/menuManage.js rename to Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/menuManage.js diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/orgManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/orgManage.js similarity index 100% rename from Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/orgManage.js rename to Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/orgManage.js diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/posManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/posManage.js similarity index 100% rename from Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/posManage.js rename to Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/posManage.js diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/roleManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/roleManage.js similarity index 100% rename from Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/roleManage.js rename to Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/roleManage.js diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/userManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/userManage.js new file mode 100644 index 0000000..065f28e --- /dev/null +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/userManage.js @@ -0,0 +1,40 @@ +export default { + getUserPage: ['/sysUser/page', 'get'], + sysUserAdd: '/sysUser/add', + sysUserEdit: '/sysUser/edit', + sysUserDetail: '/sysUser/detail', + sysUserDelete: '/sysUser/delete', + sysUserOwnRole: ['/sysUser/ownRole', 'get'], + sysUserGrantRole: '/sysUser/grantRole', + sysUserOwnData: ['/sysUser/ownData', 'get'], + sysUserGrantData: '/sysUser/grantData', + sysUserChangeStatus: '/sysUser/changeStatus', + sysUserResetPwd: '/sysUser/resetPwd', + sysUserUpdatePwd: '/sysUser/updatePwd', + sysUserSelector: ['/sysUser/selector', 'get'], + sysUserUpdateAvatar: '/sysUser/updateAvatar', + sysUserUpdateInfo: '/sysUser/updateInfo', +} + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/vislogManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/vislogManage.js similarity index 100% rename from Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/vislogManage.js rename to Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/sys/vislogManage.js diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/userManage.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/userManage.js deleted file mode 100644 index f5d3a46..0000000 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/common/api/requests/userManage.js +++ /dev/null @@ -1,6 +0,0 @@ -export default { - getUserPage: ['/sysUser/page', 'get'], - sysUserAdd: '/sysUser/add', - sysUserEdit: '/sysUser/edit', - sysUserDetail: '/sysUser/detail', -} \ No newline at end of file diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/components/yoTableActions/index.js b/Api/Ewide.Core/Ewide.Core.Web.Src/src/components/yoTableActions/index.js index 2e32bcb..bc5c203 100644 --- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/components/yoTableActions/index.js +++ b/Api/Ewide.Core/Ewide.Core.Web.Src/src/components/yoTableActions/index.js @@ -14,7 +14,9 @@ export default { return (