Skip to content

Commit

Permalink
feat: 添加弹框、分页、面包屑、选项卡、手风琴等路由页面
Browse files Browse the repository at this point in the history
  • Loading branch information
myzhoulang authored and ICELI committed Apr 21, 2017
1 parent ad281c9 commit a46f380
Show file tree
Hide file tree
Showing 42 changed files with 993 additions and 614 deletions.
16 changes: 11 additions & 5 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,35 @@ var app = angular.module('app', ['ng.element', 'ui.router', 'ngResource', 'ngAni
var router = [
["notFound", require("./router/error/404.js")],

["home", require("./router/home/index.js")],

["about", require("./router/about/about.js")],

["help", require("./router/help/help.js")],


// ["home.index", require("./router/home/home")],
["home", require("./router/home/index.js")],
["home.chart", require("./router/chart/chart.js")],

["home.ueditor", require("./router/ueditor/ueditor.js")],
["home.news", require("./router/news/news.js")],
["home.news.list", require("./router/news/news.list.js")],
["home.news.detail", require("./router/news/news.detail.js")],
["home.news.save", require("./router/news/news.save.js")],
["home.chart", require("./router/chart/chart.js")],
["home.scroll", require("./router/scroll/scroll.js")],
["home.search", require("./router/search/search.js")],

["home.tab", require("./router/tab/tab.js")],
["home.pagintion", require("./router/pagintion/pagintion.js")],
["home.accordion", require("./router/accordion/accordion.js")],
["home.dialog", require("./router/dialog/dialog.js")],
["home.layzimg", require("./router/layzimg/layzimg.js")],
["home.imgerror", require("./router/imgError/imgError.js")],

["home.switch", require("./router/switch/switch.js")],
["home.rate", require("./router/rate/rate.js")],
["home.alert", require("./router/alert/alert.js")],
["home.crumb", require("./router/crumb/crumb.js")],
["home.anchor", require("./router/anchor/anchor.js")],
["home.tooltip", require("./router/tooltip/tooltip.js")]
];

Expand Down Expand Up @@ -59,8 +65,8 @@ app.config(function ($controllerProvider, $httpProvider, $locationProvider, $url

// 优化路由地址,开启SEO
$locationProvider.html5Mode(true).hashPrefix('!');
$urlRouterProvider.when('', '/');
$urlRouterProvider.otherwise('/404');
$urlRouterProvider.when('/', '/chart');
// $urlRouterProvider.otherwise('/404');

// 配置路由
router.forEach(function (item) {
Expand Down
11 changes: 10 additions & 1 deletion src/asset/css/jmui/_dialogs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@
/*border-top: 1px solid #ccc;*/
}

.dialog-footer .btn {
.dialog-footer .jm-btn {
margin-left: 8px;
}

.modal-backdrop{
opacity: .5;
filter: alpha(opacity=50);
}

.dialog{
background: #fff;
}
19 changes: 10 additions & 9 deletions src/asset/css/jmui/_page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

.jm-page .p-skip .jm-form-control {
float: left;
width: 32px;
height: 32px;
width: 24px;
height: 24px;
margin: 0 3px;
line-height: 32px;
line-height: 24px;
font-size: 14px;
text-align: center;
border: 1px solid #ddd;
Expand All @@ -31,7 +31,7 @@
float: left;
height: 36px;
line-height: 36px;
padding: 0 14px;
padding: 0 8px;
margin-right: 5px;
font-size: 14px;
color: #ccc;
Expand All @@ -47,8 +47,8 @@
border: 1px solid #ddd;
background: #f7f7f7;
float: left;
padding: 0 14px;
line-height: 30px;
padding: 0 8px;
line-height: 24px;
font-size: 14px;
margin-right: 5px;
}
Expand Down Expand Up @@ -84,14 +84,15 @@

.jm-page .p-skip .btn {
float: left;
height: 30px;
height: 24px;
margin-left: 10px;
font-size: 14px;
line-height: 1;
}

.jm-page em {
float: left;
line-height: 32px;
line-height: 24px;
font-style: normal;
}

Expand All @@ -103,7 +104,7 @@
text-decoration: none;
cursor: pointer;
border: 1px solid #DDD;
padding: 4px 13px 5px;
padding: 4px 10px 5px;
color: #666;
background-color: #f7f7f7;
background-repeat: repeat-x;
Expand Down
85 changes: 46 additions & 39 deletions src/asset/css/website/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ body {
width: 100%;
bottom: 0;
left: 0;
background-color: #324057;


a{
color: #fff;
}
}

.page-container {
Expand All @@ -41,45 +47,46 @@ body {
position: relative;
}

[ui-view].ng-enter,
[ui-view].ng-leave {
position: absolute;
left: 0;
right: 0;
top:0;
-webkit-transition: all .5s ease-in-out;
-moz-transition: all .5s ease-in-out;
-o-transition: all .5s ease-in-out;
transition: all .5s ease-in-out;
}

[ui-view].ng-enter {
opacity: 0;
-webkit-transform: scale(0.5, 0.5);
-moz-transform: scale(0.5, 0.5);
transform: scale(0.5, 0.5);
}

[ui-view].ng-enter-active {
opacity: 1;
-webkit-transform: scale(1, 1);
-moz-transform: scale(1, 1);
transform: scale(1, 1);
}

[ui-view].ng-leave {
opacity: 1;
//-webkit-transform: translate(0, 0);
//-moz-transform: translate(0, 0);
// transform:translate3d(0, 0, 0);
}

[ui-view].ng-leave-active {
opacity: 0;
//-webkit-transform: translate(100px, 0);
//-moz-transform: translate(100px, 0);
//transform: translate(100px, 0);
}
//[ui-view].ng-enter,
//[ui-view].ng-leave {
// position: absolute;
// left: 0;
// right: 0;
// top:0;
// -webkit-transition: all .5s ease-in-out;
// -moz-transition: all .5s ease-in-out;
// -o-transition: all .5s ease-in-out;
// transition: all .5s ease-in-out;
//}
//
//[ui-view].ng-enter {
// //opacity: 0;
// -webkit-transform: scale(0.5, 0.5);
// -moz-transform: scale(0.5, 0.5);
// transform: scale(0.5, 0.5);
//}
//
//[ui-view].ng-enter-active {
// //opacity: 1;
// -webkit-transform: scale(1, 1);
// -moz-transform: scale(1, 1);
// transform: scale(1, 1);
//}
//
//[ui-view].ng-leave {
// display: none;
// //opacity: 1;
// //-webkit-transform: translate(0, 0);
// //-moz-transform: translate(0, 0);
// // transform:translate3d(0, 0, 0);
//}
//
//[ui-view].ng-leave-active {
// //opacity: 0;
// //-webkit-transform: translate(100px, 0);
// //-moz-transform: translate(100px, 0);
// //transform: translate(100px, 0);
//}

#header {
padding: 8px 0;
Expand Down
94 changes: 46 additions & 48 deletions src/component/accordion/index.js
Original file line number Diff line number Diff line change
@@ -1,52 +1,50 @@
/*global require, angular*/
// 手风琴
(function () {
"use strict";
require('./index.scss');
angular.module('jmui.accordion', [])
.directive('jmAccordions', function () {
return {
restrict: 'AE',
transclude: true,
replace: true,
template: '<div class="jm-accordions"><ul class="list-unstyled" ng-transclude></ul></div>',
controller: function ($scope, $element, $attrs) {
var accordions = this.$accordions = [];
// $scope.open = '123'
this.toggleAccrdion = function (accordion) {
angular.forEach(accordions, function (item) {
if (accordion !== item) {
item.open = false;
}
});
};

angular.module('jmui.accordion', [])
.directive('jmAccordions', function () {
return {
restrict: 'AE',
transclude: true,
replace: true,
template: '<div class="jm-accordions"><ul class="list-unstyled" ng-transclude></ul></div>',
controller: function ($scope, $element, $attrs) {
var accordions = this.$accordions = [];
// $scope.open = '123'
this.toggleAccrdion = function (accordion) {
angular.forEach(accordions, function (item) {
if (accordion !== item) {
item.open = false;
}
});
};

this.addAccordions = function (accordion) {
accordions.push(accordion);
};
},
link: function (scope, ele, attrs) {}
};
})
.directive('jmAccordion', function () {
return {
restrict: 'AE',
require: '^jmAccordions',
template: '<li ng-class="{open: open}" class="jm-accordion" ><div ng-transclude></div></li>',
transclude: true,
replace: true,
controller: function ($scope, $transclude) {},
this.addAccordions = function (accordion) {
accordions.push(accordion);
};
},
link: function (scope, ele, attrs) {
}
};
})
.directive('jmAccordion', function () {
return {
restrict: 'AE',
require: '^jmAccordions',
template: '<li ng-class="{open: open}" class="jm-accordion" ><div ng-transclude></div></li>',
transclude: true,
replace: true,
controller: function ($scope, $transclude) {
},

compile: function (tEl, tAttr, transclude) {
return function postlink(scope, ele, attrs, ctrl) {
scope.open = false;
ctrl.addAccordions(scope);
scope.toggle = function ($event) {
scope.open = !scope.open;
ctrl.toggleAccrdion(scope);
};
compile: function (tEl, tAttr, transclude) {
return function postlink(scope, ele, attrs, ctrl) {
scope.open = false;
ctrl.addAccordions(scope);
scope.toggle = function ($event) {
scope.open = !scope.open;
ctrl.toggleAccrdion(scope);
};
}
};
});
}());
};
}
};
});
64 changes: 64 additions & 0 deletions src/component/accordion/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/* 手风琴*/
.jm-accordions {
border:1px solid #c9c9c9;
}

.jm-accordions .jm-accordion {
background: #fff;

.jm-accordion-title{
position: relative;
padding-left: 30px;
}

.jm-icon-enter{
position: absolute;
left: 10px;
transition: all .3s linear;
}
}

.jm-accordions .jm-accordion + .jm-accordion {
border-top:1px solid #c9c9c9;
}

.jm-accordions .jm-accordion-title {
cursor: default;
padding: 20px 30px;
}

.jm-accordions .jm-accordion-content {
// display: none;
overflow: hidden;
border-top:1px solid #c9c9c9;
}

.jm-accordions .jm-accordion-content p {
padding: 20px;
}

.jm-accordions .jm-accordion.open {
.jm-icon-enter{
transform: rotate(90deg);
}
}

.jm-accordions .jm-accordion.open .jm-accordion-content {
}

.jm-accordions.jm-accordions-vertical {
width: 800px;
}






.jm-accordion-content{ transition:all linear .3s; opacity:1; height: 200px; }
.jm-accordion-content.ng-hide{ opacity:0;}
.jm-accordion-content.ng-hide { }
.jm-accordion-content.ng-hide-add { opacity:1; height: 200px; display: block;}
.jm-accordion-content.ng-hide-add.ng-hide-add-active { opacity:0; height: 0; }
.jm-accordion-content.ng-hide-remove { opacity:0; height: 0; display: block;}
.jm-accordion-content.ng-hide-remove.ng-hide-remove-active {opacity:1; height: 200px; }
Loading

0 comments on commit a46f380

Please sign in to comment.