Merge remote-tracking branch 'origin/dev' into dev2

sso-manage-console-web/src/assets/styles/console.css

@@ -1,791 +1,4 @@
-html,body {
-  color: #505050;
-  line-height: 1.75em;
-  background: #ebebeb;
-  position: relative;
-  font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "WenQuanYi Micro Hei", "Microsoft YaHei UI", "Microsoft YaHei", sans-serif;
-}
-
-body {
-	overflow: hidden;
-}
-
-h1,h2,h3,h4,h5,h6 {
-	margin-top: 0;
-	font-size: 100%;
-	line-height: 1.7;
-}
-
-h1,h2,h3 {
-	color: #333;
-}
-a {
-  color: #5078cb;
-  outline: none;
-}
-a:hover {
-  color: #5078cb;
-}
-a:active,
-a:focus,
-a img {
-  outline: none;
-}
-.btn,.btn:focus {
-	outline: none;
-	-webkit-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;
-}
-
-.btn-default {
-  border: 1px solid #5078cb;
-  background: #5078cb;
-  color: #ffffff;
-}
-.btn-default:hover {
-  border: 1px solid #303030;
-  background: #303030;
-  color: #ffffff;
-}
-.btn-default[disabled] {
-  border: 1px solid #303030;
-  background: #303030;
-  color: #ffffff;
-}
-
-.btn-blank {
-  border: 1px solid #ccc;
-  background: #fff;
-  color: #333;
-}
-.btn-blank:hover,.btn-blank[disabled] {
-  border: 1px solid #adadad;
-  background: #e6e6e6;
-  color: #333;
-}
-.x-text-muted {
-	color: #b9b9b7;
-}
-.x-text-small {
-	font-size: 12px !important;
-}
-/* main-navigation */
-.x-navigation {
-  text-align: center;
-  background: #ffffff;
-  border-top: 1px solid #ebebeb;
-  margin-bottom: 30px;
-  border-bottom: 2px solid #e1e1e1;
-}
-.x-navigation .navbar-brand {
-	height: inherit;
-	line-height: inherit;
-	font-family: "\5FAE\8F6F\96C5\9ED1";
-	font-size: 24px;
-	font-weight: 700;
-	text-transform: uppercase;
-	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
-	background: url("../images/icon_brand.png") no-repeat left center;
-	padding-left: 80px
-}
-.x-navigation .x-menu {
-  padding: 0;
-  margin: 0;
-}
-.x-navigation .x-menu li {
-  list-style: none;
-  display: inline-block;
-  position: relative;
-}
-.x-navigation .x-menu li.nav-current {
-  border-bottom: 2px solid #5078cb;
-  margin-bottom: -2px;
-}
-.x-navigation .x-menu li a {
-  color: #505050;
-  line-height: 4em;
-  display: block;
-  padding: 0 21px;
-}
-.x-navigation .x-menu li:hover > a {
-  color: #5078cb;
-  text-decoration: none;
-}
-.x-navigation .x-menu li ul {
-  visibility: hidden;
-  background: #ffffff;
-  text-align: left;
-  padding: 7px 0px;
-  margin: 0;
-  position: absolute;
-  left: 0;
-  top: 120%;
-  width: 200px;
-  z-index: 999;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  -webkit-transition: all 0.2s ease;
-       -o-transition: all 0.2s ease;
-          transition: all 0.2s ease;
-}
-.x-navigation .x-menu li ul li {
-  display: block;
-  margin: 0;
-}
-.x-navigation .x-menu li ul li a {
-  line-height: 2.5em;
-  color: #505050;
-}
-.x-navigation .x-menu li ul:hover > a {
-  color: #5078cb;
-}
-.x-navigation .x-menu li:hover ul {
-  visibility: visible;
-  opacity: 1;
-  filter: alpha(opacity=100);
-  top: 100%;
-}
-@media (max-width: 767px) {
-  .x-navigation {
-    text-align: left;
-  }
-  .x-navigation .x-menu li {
-    display: block;
-  }
-  .x-navigation .x-menu li:hover > a {
-    color: #5078cb;
-    text-decoration: none;
-  }
-  .x-navigation .x-menu li ul {
-    visibility: visible;
-    padding: 0px 0px 0px 20px;
-    margin: 0;
-    position: relative;
-    top: 0;
-    width: 100%;
-    opacity: 1;
-    filter: alpha(opacity=100);
-  }
-}
-
-.container {
-	width: 990px !important;
-}
-
-.x-container {
-	position: fixed;
-	top: 59px;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	padding: 30px 0;
-	overflow-y: auto;
-}
-
-.x-content-wrap {
-	position: relative;
-	background-color: #fff;
-	border: 1px solid #e6e6e6;
-	border-radius: 4px;
-}
-
-.x-content {
-	padding: 0 0 20px;
-	border-right: 1px solid #e6e6e6;
-}
-
-.x-nav-tabs {
-	position: relative;
-	z-index: 1;
-	min-height: 63px;
-	min-height: 32px\9;
-	margin: 0;
-	padding: 30px 0 0;
-	border-color: #e6e6e6;
-}
-
-.x-nav-tabs>li {
-	margin: 0 4px 0 0;
-	font-size: 14px;
-}
-
-.x-navbar-right>li {
-	float: right;
-}
-
-.x-nav-tabs>li>a {
-	line-height: 30px;
-	padding: 0 13px;
-	background-color: #fff;
-	border: none;
-	cursor: pointer;
-	color: #666;
-}
-
-.x-nav-tabs>li.active a {
-	line-height: 30px;
-	background-color: #fff;
-	border: none;
-	border-bottom: 2px solid #5078cb;
-	font-weight: 700;
-	color: #333;
-}
-
-.x-nav-tabs>li>a:hover {
-	border: none;
-	border-bottom: 2px solid #5078cb;
-	background-color: #fff;
-	color: #333;
-}
-
-.x-nav-tabs>li.active a:hover,.x-nav-tabs>li.active a:focus,.x-nav-tabs>li>a:focus
-	{
-	border: none;
-	border-bottom: 2px solid #5078cb;
-	background-color: #fff;
-}
-
-.x-nav-tabs h2 {
-	position: absolute;
-	top: 16px;
-	left: 20px;
-	margin: 0;
-	font-size: 20px;
-}
-/* list view*/
-.x-list .x-item,.x-list-2x .x-item {
-    position: relative;
-    min-height: 123px;
-    padding: 20px 20px 20px 100px;
-    border-bottom: 1px solid #f5f5f5;
-}
-
-.x-list .x-item:hover,.x-list-2x .x-item:hover {
-	background: #f8f6f2;
-}
-
-.x-list-2x .x-item {
-	float: left;
-	width: 50%;
-}
-
-.x-list-3x .x-item {
-	float: left;
-	width: 33.33%;
-}
-
-.x-img-list .x-item {
-	padding-left: 332px
-}
-
-.x-list .x-item .x-icon,.x-list-2x .x-item .x-icon,.x-list .x-item .x-img {
-    position: absolute;
-    left: 20px;
-    top: 30px;
-    text-align: center;
-	color: #bbb
-}
-
-.x-list .x-item .x-img {
-	top: 15px;
-	bottom: 15px;
-	padding: 7px;
-	box-shadow: 0 0 8px #ddd;
-}
-
-.x-list .x-item .x-title,.x-list-2x .x-item .x-title {
-	font-size: 16px
-}
-
-.x-list .x-item .x-icon i,.x-list-2x .x-item .x-icon i {
-	width: 50px;
-	height: 50px;
-	line-height: 50px;
-	font-size: 22px;
-	background-color: #e9e9e9;
-	border-radius: 4px;
-}
-
-.x-list .x-item .x-img img{
-	width: 288px;
-	height: 95px;
-}
-
-.x-data-list,.x-img-list {
-    width: 100%;
-    height: auto;
-}
-
-.x-data-list .x-item,.x-img-list .x-item {
-    position: relative;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    z-index: 0;
-    min-height: 45px;
-}
-
-.x-img-list .x-item {
-	min-height: 140px
-}
-
-.x-data-list .x-item .x-icon {
-    top: 20px;
-}
-
-.pagination {
-    margin: 20px 20px 0;
-}
-
-.pagination>li>a, .pagination>li>span {
-    background-color: #fafafa;
-    color: #999;
-    border-color: #e6e6e6;
-    cursor: pointer
-}
-
-.pagination>.active>a, .pagination>.active>span, .pagination>.active>a:hover, .pagination>.active>span:hover, .pagination>.active>a:focus, .pagination>.active>span:focus {
-    background-color: #499ef3;
-    color: #fff;
-    border-color: #499ef3;
-}
-
-.x-side-bar {
-	margin-left: -1px;
-	padding: 20px;
-	border-left: 1px solid #e6e6e6;
-}
-
-.x-side-bar a {
-	cursor: pointer;
-}
-
-.x-side-bar a:hover {
-	color: #5078cb;
-	text-decoration: none;
-}
-
-.x-side-bar .x-mod {
-	padding: 20px 0;
-	border-top: 1px solid #E2E2E2;
-}
-
-.x-side-bar .x-mod:first-child {
-	padding-top: 0;
-	border-top: none;
-}
-
-.x-side-bar .x-mod .x-mod-head {
-	position: relative;
-}
-
-.x-side-bar .x-mod .x-mod-head:after {
-	content: "";
-    width: 60px;
-    height: 1px;
-    background: #5078cb;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-}
-
-.x-side-bar .x-mod .x-mod-head h4 {
-	font-size: 20px;
-	margin-top: 0;
-    padding-bottom: 8px;
-    border-bottom: 1px solid #ebebeb;
-}
-
-.x-side-bar .x-mod .x-mod-head .x-more {
-	font-size: 12px;
-	position: absolute;
-	right: 5px;
-	top: 5px;
-}
-
-.x-side-bar .x-mod .x-mod-body {
-	margin-top: 20px;
-}
-
-.x-side-bar .x-mod dl {
-	height: auto;
-	overflow: hidden;
-	margin: 20px 0;
-}
-
-.x-side-bar .x-mod dt {
-	width: 32px;
-	height: 32px;
-	margin-right: 10px;
-}
-
-.x-side-bar .x-mod dt i {
-	width: 100%;
-	text-align: center;
-	height: 32px;
-	line-height: 32px;
-	border-radius: 4px;
-	background-color: #e9e9e9;
-	color: #bbb
-}
-
-.x-side-bar .x-mod dd {
-	width: 155px;
-	font-size: 12px;
-	color: #999;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-}
-
-.x-text-ellipsis {
-	width: 100px;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-}
-
-.x-side-bar .x-mod p {
-	margin-bottom: 0;
-}
-
-.x-side-bar .x-mod .x-mod-footer {
-	margin-top: 15px;
-}
-
-/*progress*/
-
-.x-empty {
-	margin: 0 auto;
-    padding-top: 10%;
-    padding-bottom: 15%;
-    text-align: center;
-    text-shadow: 0 2px 0 #fff,0 -2px 0 #f8f6f2;
-}
-
-.x-empty i {
-    font-size: 120px;
-    color: #d9d7d3;
-}
-
-.x-empty p {
-    color: #92908d;
-    text-shadow: 0 0 0;
-}
-
-.x-text-container {
-	padding: 5% 0;
-    width: 85%;
-    margin: 0 auto;
-    text-shadow: 0 2px 0 #fff,0 -2px 0 #f8f6f2;
-}
-
-.x-tab-pane {
-	display: none;
-}
-
-.x-tab-pane.active {
-	display: block;
-}
-
-.x-label-default {
-    display: inline-block;
-    height: 20px;
-    line-height: 16px;
-    padding: 2px 5px;
-    background-color: #99cfff;
-    font-size: 12px;
-    color: #fff;
-    border-radius: 4px;
-}
-
-.x-listbox {
-	position: relative;
-	width: 150px;
-}
-
-.x-listbox>button,.x-listbox>ul {
-	min-width: 100%;
-}
-
-.x-listbox>.btn {
-	text-align: right;
-	padding: 6px 14px;
-}
-
-.x-listbox .active {
-	float: left
-}
-
-.btn-sm {
-	padding: 1px 4px;
-	font-size: 12px;
-}
-
-.x-modal-dialog {
-	float: right;
-	width: 62%;
-	height: 100%;
-	margin: 0;
-}
-.x-modal-dialog .modal-content {
-	height: 100%;
-	border-radius: 0;
-	border: none
-}
-.x-modal-dialog .modal-body {
-	position: absolute;
-	top: 63px;
-	left: 0;
-	bottom: 67px;
-	right: 0;
-	overflow-y: auto
-}
-.modal.fade .x-modal-dialog {
-  -webkit-transform: translate(100%, 0);
-      -ms-transform: translate(100%, 0);
-       -o-transform: translate(100%, 0);
-          transform: translate(100%, 0);
-}
-.modal.in .x-modal-dialog {
-  -webkit-transform: translate(0, 0);
-      -ms-transform: translate(0, 0);
-       -o-transform: translate(0, 0);
-          transform: translate(0, 0);
-}
-.x-modal-dialog .modal-footer {
-	position: absolute;
-	left: 0;
-	bottom: 0;
-	width: 100%
-}
-.x-form input[type=checkbox],.x-form input[type=radio] {
-	margin-top: 6px
-}
-
-.x-menu {
-	list-style-type: disc;
-    list-style-position: inside;
-    padding: 5px 10px;
-    margin: 5px 0 0 0;
-}
-
-.x-menu .x-menu {
-	color: #999;
-	list-style-type: square;
-	padding: 5px 15px;
-}
-
-.help-block.x-menu {
-    color: #999;
-    background-color: #e9e9e9;
-    border-radius: 4px;
-}
-
-.help-block input[type=file] {
-	display: inline;
-}
-
-.x-dropdown .dropdown-toggle {
-	cursor: pointer
-}
-
-.x-dropdown .dropdown-menu {
-	display: inherit;
-	visibility: hidden;
-	opacity: 0
-}
-
-.x-dropdown:hover .dropdown-menu {
-	display: block;
-	position: absolute;
-	visibility: visible;
-	opacity: 1
-}
-.x-group-header {
-	position: relative;
-	margin-bottom: 15px
-}
-.x-group-header h4{
-	font-size: 16px;
-    font-weight: 600;
-    margin-top: 0;
-    padding-bottom: 8px;
-    border-bottom: 1px solid #ebebeb;
-}
-.x-group-header:after {
-	content: "";
-    width: 100px;
-    height: 1px;
-    background: #5078cb;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-}
-.x-dl-horizontal dt:after {
-	content: " :"
-}
-.x-dl-horizontal dd {
-	margin-bottom: 15px
-}
-/*image view*/
-.x-floating-wrap {
-	position: fixed;
-	z-index: 99998;
-	background: #000;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	opacity: 0.5;
-}
-.x-floating {
-	position: fixed;
-	z-index: 99999;
-	top: 60px;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	text-align: center;
-	vertical-align: middle;
-}
-.x-floating img {
-	margin: auto auto;
-	max-width: 800px;
-	max-height: 600px;
-}
-
-.x-close-wrap {
-	position: fixed;
-	top: 0;
-	right: 0;
-	z-index: 100000;
-	width: 120px;
-  	height: 120px;
-	margin: -60px -60px 0 0;
-	border-radius: 100%;
-	background: #000;
-	opacity: .3
-}
-
-.x-close-wrap a {
-	position: absolute;
-	left: 25px;
-	bottom: 25px;
-	font-size: 42px;
-	color: #fff
-}
-
-.x-close-wrap:hover {
-	opacity: .7
-}
-/*loading*/
-.x-loading-wrap {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: #000;
-	z-index: 99998;
-  	opacity: .5
-}
-
-.x-loading {
-	position: fixed;
-	top: 0;
-	left: 50%;
-	margin: -120px 0 0 -120px;
-	width: 240px;
-  	height: 240px;
-  	color: #f4645f;
-  	z-index: 99999;
-}
-
-.top-center .x-loading {
-	top: 0;
-	left: 50%;
-}
-
-.right-center .x-loading {
-	top: 50%;
-	left: 100%;
-}
-
-.bottom-center .x-loading {
-	top: 100%;
-	left: 50%;
-}
-
-.x-loading:after {
-	display: table;
-	clear: both;
-	line-height: 0;
-	content: ""
-}
-
-.x-loading>div {
-  	width: 240px;
-  	height: 240px;
-}
-
-.x-loading>div:nth-child(2) {
-  	-webkit-animation-delay: .2s;
-  	animation-delay: .2s;
-}
-
-.x-loading>div:nth-child(3) {
-  	-webkit-animation-delay: .4s;
-  	animation-delay: .4s;
-}
-
-.x-loading>div {
-	position: absolute;
-	top: 60px;
-	left: 60px;
-	float: left;
-	width: 120px;
-	height: 120px;
-	border-radius: 100%;
-	opacity: 0;
-	-webkit-animation: ball-scale-multiple 1s 0s linear infinite;
-	animation: ball-scale-multiple 1s 0s linear infinite;
-}
-
-.x-loading>div {
-  	box-sizing: content-box;
-  	background: #fff;
-  	border: 1px solid #5078cb;
-}
-
-@-webkit-keyframes ball-scale-multiple {
-	0% {
-		opacity:0;
-		-webkit-transform:scale(0);
-		transform:scale(0)
-	}
-	5% {
-		opacity:.75
-	}
-	100% {
-		opacity:0;
-		-webkit-transform:scale(1);
-		transform:scale(1)
-	}
-}
-
-@keyframes ball-scale-multiple {
-	0% {
-		opacity:0;
-		-webkit-transform:scale(0);
-		transform:scale(0)
-	}
-	5% {
-		opacity:.75
-	}
-	100% {
-		opacity:0;
-		-webkit-transform:scale(1);
-		transform:scale(1)
-	}
+/* Element UI Custom CSS */
+.el-dialog__wrapper .el-dialog__body {
+  padding: 22px 0 22px 40px;
 }

sso-manage-console-web/src/components/accounts/appeals/AppealHome.vue

@@ -94,11 +94,11 @@
           <span v-else>{{scope.row.type}}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!--<el-table-column
         prop="fromApp"
         label="申诉来源"
         width="100">
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
         prop="submitDate"
         label="申诉时间"
@@ -637,10 +637,10 @@
     font-weight: normal;
     font-family: "SimHei", sans-serif;
   }
-  .el-dialog__body {
+  .el-dialog__wrapper .el-dialog__body {
     padding: 22px 0 22px 40px;
   }
-  .el-dialog__footer {
+  .el-dialog__wrapper .el-dialog__footer {
     text-align: center;
   }
   .el-dialog__footer .el-button {

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseAdmin.vue

@@ -385,7 +385,7 @@
     font-weight: normal;
     font-family: "SimHei", sans-serif;
   }
-  .el-dialog__body {
+  .el-dialog__wrapper .el-dialog__body {
     padding: 22px 0 22px 40px;
   }
   .el-select .el-input__inner {
@@ -399,7 +399,7 @@
     border-radius: 0;
     border: none;
   }
-  .el-dialog__footer {
+  .el-dialog__wrapper .el-dialog__footer {
     text-align: center;
   }
   .el-dialog__footer .el-button {

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseAuth.vue

@@ -161,7 +161,7 @@
     font-weight: normal;
     font-family: "SimHei", sans-serif;
   }
-  .el-dialog__body {
+  .el-dialog__wrapper .el-dialog__body {
     padding: 22px 0 22px 40px;
   }
   .input-fail-pass-reason {
@@ -183,7 +183,7 @@
     border-radius: 0;
     border: none;
   }
-  .el-dialog__footer {
+  .el-dialog__wrapper .el-dialog__footer {
     text-align: center;
   }
   .el-dialog__footer .el-button {

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseMembers.vue

@@ -441,7 +441,7 @@
     font-weight: normal;
     font-family: "SimHei", sans-serif;
   }
-  .el-dialog__body {
+  .el-dialog__wrapper .el-dialog__body {
     padding: 22px 0 22px 40px;
   }
   .el-select .el-input__inner {
@@ -455,7 +455,7 @@
     border-radius: 0;
     border: none;
   }
-  .el-dialog__footer {
+  .el-dialog__wrapper .el-dialog__footer {
     text-align: center;
   }
   .el-dialog__footer .el-button {

sso-manage-console-web/src/components/accounts/users/UserAuth.vue

@@ -156,7 +156,7 @@
     font-weight: normal;
     font-family: "SimHei", sans-serif;
   }
-  .el-dialog__body {
+  .el-dialog__wrapper .el-dialog__body {
     padding: 22px 0 22px 40px;
   }
   .input-fail-pass-reason {
@@ -178,7 +178,7 @@
     border-radius: 0;
     border: none;
   }
-  .el-dialog__footer {
+  .el-dialog__wrapper .el-dialog__footer {
     text-align: center;
   }
   .el-dialog__footer .el-button {

sso-manage-console-web/src/components/accounts/users/UserHome.vue

@@ -84,6 +84,7 @@
         </el-table-column>
         <el-table-column
           prop="fromApp"
+          :formatter="getAppNameFromMap"
           label="注册来源">
         </el-table-column>
       </el-table>
@@ -203,6 +204,9 @@
       },
       fromAppOptions () {
         return this.$store.getters.fromAppOptions
+      },
+      uidAppNameMap () {
+        return this.$store.getters.uidAppNameMap || {}
       }
     },
     watch: {
@@ -289,6 +293,12 @@
         }
         str += date.getSeconds()
         return str
+      },
+      getAppNameFromMap (row, column, uid) {
+        if (uid && uid !== '') {
+          return this.uidAppNameMap[uid]
+        }
+        return ''
       }
     }
   }
@@ -360,10 +370,10 @@
     font-weight: normal;
     font-family: "SimHei", sans-serif;
   }
-  .el-dialog__body {
+  .el-dialog__wrapper .el-dialog__body {
     padding: 22px 0 22px 40px;
   }
-  .el-dialog__footer {
+  .el-dialog__wrapper .el-dialog__footer {
     text-align: center;
   }
   .el-dialog__footer .el-button {

sso-manage-console-web/src/main.js

@@ -8,7 +8,7 @@ import 'bootstrap/dist/css/bootstrap.min.css'
 import 'font-awesome/css/font-awesome.min.css'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
-// import './assets/styles/console.css'
+import './assets/styles/console.css'
 
 Vue.config.productionTip = false
 

sso-manage-console-web/src/store/modules/enterprises.js

@@ -7,13 +7,11 @@ const state = {
   allApps: []
 }
 
-const validStatus = ['未申请', '申诉中', '未申请', '未申请']
-
 // Getters
 const getters = {
   enAdmin: state => {
     const enterprise = state.savedEnterprise || {}
-    const admin = state.savedEnterprise.admin || {}
+    const admin = enterprise.admin || {}
     const messages = []
 
     messages.push({ label: '个人UU', value: admin.userUU || '' })
@@ -72,6 +70,19 @@ const getters = {
       options.push(option)
     }
     return options
+  },
+  uidAppNameMap: state => {
+    const allApps = state.allApps
+    const map = {}
+
+    for (const app of allApps) {
+      if (app.uid && app.description) {
+        map[app.uid] = app.description
+      } else if (app.uid && !app.description) {
+        map[app.uid] = '账户中心'
+      }
+    }
+    return map
   }
 }