Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
33249b1e
提交
33249b1e
编写于
6月 12, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
1e9cca60
变更
12
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
337 行增加
和
285 行删除
+337
-285
package.json
app_web/package.json
+1
-1
app-form-group.vue
app_web/src/components/app-form-group/app-form-group.vue
+33
-25
app-transfer.less
app_web/src/components/app-transfer/app-transfer.less
+20
-6
app-transfer.vue
app_web/src/components/app-transfer/app-transfer.vue
+253
-247
yarn.lock
app_web/yarn.lock
+4
-4
SysApp.java
...core/src/main/java/cn/ibizlab/core/uaa/domain/SysApp.java
+1
-2
SysAuthLog.java
.../src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java
+8
-0
SysPermission.java
...c/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java
+4
-0
SysRole.java
...ore/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java
+3
-0
SysRolePermission.java
...in/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java
+3
-0
SysUser.java
...ore/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java
+4
-0
SysUserRole.java
...src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java
+3
-0
未找到文件。
app_web/package.json
浏览文件 @
33249b1e
...
...
@@ -26,7 +26,7 @@
"element-ui"
:
"^2.13.0"
,
"file-saver"
:
"^2.0.2"
,
"font-awesome"
:
"^4.7.0"
,
"ibiz-gantt-elastic"
:
"^1.0.1
6
"
,
"ibiz-gantt-elastic"
:
"^1.0.1
7
"
,
"ibiz-vue-lib"
:
"^0.1.10"
,
"interactjs"
:
"^1.9.4"
,
"moment"
:
"^2.24.0"
,
...
...
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @
33249b1e
...
...
@@ -28,21 +28,25 @@
<dropdown-menu
slot=
'list'
v-if=
"uiActionGroup.details && Array.isArray(uiActionGroup.details)"
>
<dropdown-item
v-for=
"(detail,index) in (uiActionGroup.details)"
:key=
"index"
:name=
"detail.name"
>
<span
class=
'item'
@
click=
"doUIAction($event, detail)"
>
<template
v-if=
"detail.icon && !Object.is(detail.icon, '')"
>
<i
:class=
"detail.icon"
></i>
</
template
>
<
template
v-if=
"!(detail.icon && !Object.is(detail.icon, ''))"
>
<div
v-if=
"detail.img && !Object.is(detail.img, '')"
>
<img
:src=
"detail.img"
/>
</div>
<template
v-if=
"detail.isShowIcon"
>
<template
v-if=
"detail.icon && !Object.is(detail.icon, '')"
>
<i
:class=
"detail.icon"
></i>
</
template
>
<
template
v-if=
"!(detail.icon && !Object.is(detail.icon, ''))"
>
<div
v-if=
"detail.img && !Object.is(detail.img, '')"
>
<img
:src=
"detail.img"
/>
</div>
</
template
>
</template>
<span>
<
template
v-if=
"uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"
>
{{
$t
(
`${uiActionGroup.langbase
}
.uiactions.${detail.uiactiontag
}
`
)
}}
<
/template
>
<
template
v
-
if
=
"!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"
>
{{
detail
.
caption
}}
<
template
v-if=
"detail.isShowCaption"
>
<template
v-if=
"uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"
>
{{
$t
(
`${uiActionGroup.langbase
}
.uiactions.${detail.uiactiontag
}
`
)
}}
<
/template
>
<
template
v
-
if
=
"!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"
>
{{
detail
.
caption
}}
<
/template
>
<
/template
>
<
/span
>
<
/span
>
...
...
@@ -55,21 +59,25 @@
<
template
v
-
if
=
"uiActionGroup.details && Array.isArray(uiActionGroup.details)"
>
<
div
v
-
for
=
"(detail,index) in uiActionGroup.details"
:
key
=
"index"
>
<
span
class
=
'item'
@
click
=
"doUIAction($event, detail)"
>
<
template
v
-
if
=
"detail.icon && !Object.is(detail.icon, '')"
>
<
i
:
class
=
"detail.icon"
><
/i
>
<
/template
>
<
template
v
-
if
=
"!(detail.icon && !Object.is(detail.icon, ''))"
>
<
div
v
-
if
=
"detail.img && !Object.is(detail.img, '')"
>
<
img
:
src
=
"detail.img"
/>
<
/div
>
<
/template
>
<
template
v
-
if
=
"detail.isShowIcon"
>
<
template
v
-
if
=
"detail.icon && !Object.is(detail.icon, '')"
>
<
i
:
class
=
"detail.icon"
><
/i
>
<
/template
>
<
template
v
-
if
=
"!(detail.icon && !Object.is(detail.icon, ''))"
>
<
div
v
-
if
=
"detail.img && !Object.is(detail.img, '')"
>
<
img
:
src
=
"detail.img"
/>
<
/div
>
<
/template
>
<
/template
>
&
nbsp
;
<
span
>
<
template
v
-
if
=
"uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"
>
{{
$t
(
`${uiActionGroup.langbase
}
.uiactions.${detail.uiactiontag
}
`
)
}}
<
/template
>
<
template
v
-
if
=
"!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"
>
{{
detail
.
caption
}}
<
template
v
-
if
=
"detail.isShowCaption"
>
<
template
v
-
if
=
"uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')"
>
{{
$t
(
`${uiActionGroup.langbase
}
.uiactions.${detail.uiactiontag
}
`
)
}}
<
/template
>
<
template
v
-
if
=
"!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))"
>
{{
detail
.
caption
}}
<
/template
>
<
/template
>
<
/span
>
<
/span
>
...
...
app_web/src/components/app-transfer/app-transfer.less
浏览文件 @
33249b1e
.ivu-select-dropdown {
padding: 0px;
.hidden {
display: none;
}
}
\ No newline at end of file
.transfer-select{
.ivu-select-dropdown {
padding: 0px;
.hidden {
display: none;
}
.el-transfer{
min-width: 100% !important;
display: flex;
justify-content: space-between;
.el-transfer-panel{
min-width: 25%;
}
.el-transfer__buttons{
align-self: center;
}
}
}
}
app_web/src/components/app-transfer/app-transfer.vue
浏览文件 @
33249b1e
此差异已折叠。
点击以展开。
app_web/yarn.lock
浏览文件 @
33249b1e
...
...
@@ -5238,10 +5238,10 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
ibiz-gantt-elastic@^1.0.1
6
:
version "1.0.1
6
"
resolved "https://registry.
npm.taobao.org/ibiz-gantt-elastic/download/ibiz-gantt-elastic-1.0.16.tgz#e2de7e8d4bdb3c292cfbc97c4f970c8ecfe6c43b
"
integrity sha
1-4t5+jUvbPCks+8l8T5cMjs/mxDs
=
ibiz-gantt-elastic@^1.0.1
7
:
version "1.0.1
7
"
resolved "https://registry.
yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.17.tgz#447cce5db2e0127d2336c20370fc251992520c6f
"
integrity sha
512-AJOYXZGM020wafn60RJLM2yKmtT2BjCpBKkZ0PONcxdqW/kCyXOqEo3c3/PBtFEkJx/8KGTayB013BOdGI1+uQ=
=
dependencies:
dayjs "^1.8.16"
resize-observer-polyfill "^1.5.1"
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysApp.java
浏览文件 @
33249b1e
...
...
@@ -7,6 +7,7 @@ import java.util.Map;
import
java.math.BigInteger
;
import
java.util.HashMap
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
/**
* [应用] 对象
*/
@Builder
@Getter
@Setter
@NoArgsConstructor
...
...
@@ -109,7 +109,6 @@ public class SysApp extends EntityBase implements Serializable {
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java
浏览文件 @
33249b1e
...
...
@@ -7,6 +7,7 @@ import java.util.Map;
import
java.math.BigInteger
;
import
java.util.HashMap
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
@@ -114,6 +115,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this
.
username
=
username
;
this
.
modify
(
"username"
,
username
);
}
/**
* 设置 [用户名称]
*/
...
...
@@ -121,6 +123,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this
.
personname
=
personname
;
this
.
modify
(
"personname"
,
personname
);
}
/**
* 设置 [域]
*/
...
...
@@ -128,6 +131,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this
.
domain
=
domain
;
this
.
modify
(
"domain"
,
domain
);
}
/**
* 设置 [IP地址]
*/
...
...
@@ -135,6 +139,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this
.
ipaddr
=
ipaddr
;
this
.
modify
(
"ipaddr"
,
ipaddr
);
}
/**
* 设置 [MAC地址]
*/
...
...
@@ -142,6 +147,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this
.
macaddr
=
macaddr
;
this
.
modify
(
"macaddr"
,
macaddr
);
}
/**
* 设置 [客户端]
*/
...
...
@@ -149,6 +155,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this
.
useragent
=
useragent
;
this
.
modify
(
"useragent"
,
useragent
);
}
/**
* 设置 [认证结果]
*/
...
...
@@ -157,6 +164,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
this
.
modify
(
"authcode"
,
authcode
);
}
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java
浏览文件 @
33249b1e
...
...
@@ -7,6 +7,7 @@ import java.util.Map;
import
java.math.BigInteger
;
import
java.util.HashMap
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
@@ -105,6 +106,7 @@ public class SysPermission extends EntityMP implements Serializable {
this
.
permissionname
=
permissionname
;
this
.
modify
(
"sys_permissionname"
,
permissionname
);
}
/**
* 设置 [资源类别]
*/
...
...
@@ -112,6 +114,7 @@ public class SysPermission extends EntityMP implements Serializable {
this
.
permissiontype
=
permissiontype
;
this
.
modify
(
"permissiontype"
,
permissiontype
);
}
/**
* 设置 [系统]
*/
...
...
@@ -120,6 +123,7 @@ public class SysPermission extends EntityMP implements Serializable {
this
.
modify
(
"pssystemid"
,
pssystemid
);
}
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java
浏览文件 @
33249b1e
...
...
@@ -7,6 +7,7 @@ import java.util.Map;
import
java.math.BigInteger
;
import
java.util.HashMap
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
@@ -89,6 +90,7 @@ public class SysRole extends EntityMP implements Serializable {
this
.
rolename
=
rolename
;
this
.
modify
(
"sys_rolename"
,
rolename
);
}
/**
* 设置 [备注]
*/
...
...
@@ -97,6 +99,7 @@ public class SysRole extends EntityMP implements Serializable {
this
.
modify
(
"memo"
,
memo
);
}
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java
浏览文件 @
33249b1e
...
...
@@ -7,6 +7,7 @@ import java.util.Map;
import
java.math.BigInteger
;
import
java.util.HashMap
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
@@ -134,6 +135,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
this
.
roleid
=
roleid
;
this
.
modify
(
"sys_roleid"
,
roleid
);
}
/**
* 设置 [权限表标识]
*/
...
...
@@ -142,6 +144,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
this
.
modify
(
"sys_permissionid"
,
permissionid
);
}
/**
* 获取 [角色权限关系表标识]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java
浏览文件 @
33249b1e
...
...
@@ -7,6 +7,7 @@ import java.util.Map;
import
java.math.BigInteger
;
import
java.util.HashMap
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
@@ -77,6 +78,7 @@ public class SysUser extends EntityMP implements Serializable {
this
.
username
=
username
;
this
.
modify
(
"username"
,
username
);
}
/**
* 设置 [用户姓名]
*/
...
...
@@ -84,6 +86,7 @@ public class SysUser extends EntityMP implements Serializable {
this
.
personname
=
personname
;
this
.
modify
(
"personname"
,
personname
);
}
/**
* 设置 [密码]
*/
...
...
@@ -92,6 +95,7 @@ public class SysUser extends EntityMP implements Serializable {
this
.
modify
(
"password"
,
password
);
}
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java
浏览文件 @
33249b1e
...
...
@@ -7,6 +7,7 @@ import java.util.Map;
import
java.math.BigInteger
;
import
java.util.HashMap
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
@@ -120,6 +121,7 @@ public class SysUserRole extends EntityMP implements Serializable {
this
.
roleid
=
roleid
;
this
.
modify
(
"sys_roleid"
,
roleid
);
}
/**
* 设置 [用户标识]
*/
...
...
@@ -128,6 +130,7 @@ public class SysUserRole extends EntityMP implements Serializable {
this
.
modify
(
"sys_userid"
,
userid
);
}
/**
* 获取 [用户角色关系标识]
*/
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录