Merge pull request #39 from ecomfe/dev

v0.2.1
ecomfe · Sep 1, 2014 · cee1c2d · cee1c2d
2 parents 6a491f9 + 69feb99
commit cee1c2d
Show file tree

Hide file tree

Showing 41 changed files with 1,295 additions and 293 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+* 0.2.1
+    - 优化了样式
+    - 增加了 `Sidebar` 的默认处理
+    - 增加了 NMP 权限模块的支持
+    - 增加了列表页的局部刷新功能和 `AuthPanel` 控件
+    - 补充 `system/user` 模块的接口
+    - 修复 `TableTip` 的一些问题
+    - `navigator` 升级，修复子 Tab 的权限问题导致的跳转错误
+    - 系统初始化时增加自定义接口的读取
+
 * 0.2.0
     - 修复 merge 错误
     - 跳升版本

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bat-ria",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "RIA extension for Brand Ads Team",
   "main": "main.js",
   "scripts": {

diff --git a/src/css/common.less b/src/css/common.less
@@ -4,20 +4,23 @@
 
 // Basic status
 @bat-success-color: #008000;
-@bat-warning-color: #FF9A00;
-@bat-alert-color: #FF0000;
-@bat-aux-color: #9C9A9C;
+@bat-warning-color: #ff9a00;
+@bat-alert-color: #ff0000;
+@bat-aux-color: #9c9a9c;
 
-// Link colors
-@bat-link-color: #3377AA;
-@bat-link-hover-color: #FF6600;
+// link colors
+@bat-link-color: #3377aa;
+@bat-link-hover-color: #ff6600;
 
-// Background & border color
-@bat-border-blue: #BAD5F1;
-@bat-border-light-blue: #DBEBFA;
-@bat-bg-dark-blue: #B6D2F1;
-@bat-bg-blue: #E7F1FB;
-@bat-bg-light-blue: #F1F6FC;
+// background & border color
+@bat-border-blue: #bad5f1;
+@bat-border-light-blue: #dbebfa;
+@bat-bg-dark-blue: #b6d2f1;
+@bat-bg-blue: #e7f1fb;
+@bat-bg-light-blue: #f1f6fc;
+
+// text colors
+@bat-text-blue: #0c3ca0;
 
 
 /**
@@ -221,11 +224,23 @@ hr {
     &.nav-sub-current {
         display: block;
     }
+
+    & > .nav-sub-separate:last-child {
+        display: none;
+    }
 }
 
 @sys-userinfo-color: #FFFFFF;
 .user-info {
-    color: darken(@sys-userinfo-color, 10);
+    color: darken(@sys-userinfo-color, 20);
+
+    span {
+        color: #FFF;
+    }
+
+    a:hover {
+        text-decoration: underline;
+    }
 }
 
 /**
@@ -234,3 +249,34 @@ hr {
 .copyright {
     text-align: center;
 }
+
+
+/**
+ * Forbidden / Not Found
+ */
+.forbidden-message,
+.not-found-message {
+    width: 540px;
+    height: 131px;
+    margin: 100px auto;
+    padding-left: 110px;
+    font-size: 14px;
+    .clearfix();
+
+    .message-text {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        .font-family(heading);
+        font-size: 32px;
+        line-height: 48px;
+        color: @bat-text-blue;
+    }
+}
+
+.forbidden-message {
+    background: url(../img/coupui.png) no-repeat 0 -265px;
+}
+
+.not-found-message {
+    background: url(../img/coupui.png) no-repeat 0 -133px;
+}
diff --git a/src/css/form.less b/src/css/form.less
@@ -6,8 +6,9 @@
     .form-header {
         background-color: @bat-bg-light-blue;
         padding: 8px 10px;
+        line-height: 26px;
         font-weight: 700;
-        
+
         & + .form-body {
             border-top: 1px solid @bat-border-blue;
         }
@@ -73,4 +74,4 @@
     .form-segment + & {
         padding-left: 0;
     }
-}
+}
diff --git a/src/css/list.less b/src/css/list.less
@@ -5,6 +5,11 @@
 
 .list-header {
     border-bottom: none;
+
+    h3 {
+        line-height: 26px;
+        font-weight: 700;
+    }
 }
 
 /* 列表头部 > 摘要数据区域 */
@@ -59,10 +64,27 @@
 
 /* 列表头部 > 列表操作列区域 */
 .list-operation {
+    position: relative;
+    margin-left: 12px;
     .bat-linkify();
+
+    &:before {
+        content: "|";
+        display: inline;
+        position: absolute;
+        left: -8px;
+        color: @bat-aux-color;
+    }
+
+    &:first-child {
+        margin-left: 0;
+        &:before {
+            display: none;
+        }
+    }
 }
 
 .list-operation-separator {
     margin: 0 5px;
     color: @bat-aux-color;
-}
+}
diff --git a/src/css/main.less b/src/css/main.less
@@ -1,7 +1,6 @@
 @import "./mixins.less";
 @import "./common.less";
+@import "../ui/css/ui.less";
 @import "./ui.less";
 @import "./list.less";
 @import "./form.less";
-
-@import "../ui/css/ui.less";
diff --git a/src/css/mixins.less b/src/css/mixins.less
@@ -8,4 +8,9 @@
     &:hover {
         color: @bat-link-hover-color;
     }
-}
+}
+
+.bat-disabled() {
+    color: @bat-aux-color;
+    cursor: not-allowed;
+}
diff --git a/src/css/ui.less b/src/css/ui.less
@@ -53,10 +53,12 @@
     }
 }
 
+// esui/Pager
 .ui-pager-main li {
     font-family: inherit;
 }
 
+// esui/Table
 .ui-table-cell-editable {
     .ellipsis();
 }
@@ -74,6 +76,7 @@
     margin: 0 auto;
 }
 
+// esui/Dialog
 .ui-dialog-title {
     font-size: 12px;
 }
@@ -94,6 +97,7 @@
     padding: 10px 0 10px 6px
 }
 
+// esui/Button
 .skin-spring-button {
     height: 26px;
     line-height: 26px;
@@ -112,6 +116,15 @@ button.skin-link-button:hover {
     height: 26px;
 }
 
+.skin-spring-button-disabled {
+    &,
+    &:hover,
+    &:active {
+        .linear-gradient-background(top, #a9d796, #a9d796);
+        border-color: #8ac971;
+    }
+}
+
 .skin-spring-add-disabled {
     &,
     &:hover,
@@ -133,20 +146,12 @@ button.skin-link-button:hover {
         top, #f6f6f6, #FFF, "../img/esui-btn-download.png", 9px, center, #f6f6f6);
 }
 
+// esui/RangeCalendar
 .ui-rangecalendar {
     .linear-gradient-background (top, #ffffff, #f6f6f6, #ffffff);
 }
 
-.ui-uploader {
-    display: inline-block;
-    *width: 150px;
-    white-space: normal;
-}
-
-.ui-uploader-input-container {
-    *float: left;
-}
-
+// esui/BoxGroup
 .ui-checkbox,
 .ui-radio,
 .ui-boxgroup-checkbox,
@@ -156,6 +161,7 @@ button.skin-link-button:hover {
     }
 }
 
+// esui/Textbox
 .ui-textbox {
     &,
     & input,
@@ -164,6 +170,7 @@ button.skin-link-button:hover {
     }
 }
 
+// esui/Tab
 .ui-tab-horizontal {
     .ui-tab-navigator {
         .clearfix();
@@ -190,6 +197,7 @@ button.skin-link-button:hover {
     }
 }
 
+// esui/Toast
 .ui-toast-content {
     padding: 0 10px;
     font-size: 12px;
@@ -215,6 +223,7 @@ button.skin-link-button:hover {
     }
 }
 
+// esui/Select
 .ui-select-validity-label-invalid {
     display: inline-block;
     margin: 0;
@@ -224,6 +233,7 @@ button.skin-link-button:hover {
     color: #C00;
 }
 
+// esui/Wizard
 .skin-default-wizard {
     .ui-wizard-node {
         padding-right: 8px;
@@ -267,5 +277,57 @@ button.skin-link-button:hover {
 
     .ui-wizard-node-done span {
         background-color: @bat-bg-blue;
-    }    
-}
+    }
+}
+
+// esui/Crumb
+.ui-crumb-node-last {
+    font-weight: 700;
+}
+
+
+// bat-ria/Uploader
+.ui-uploader {
+    display: inline-block;
+    *width: 150px;
+    white-space: normal;
+}
+
+.ui-uploader-input-container {
+    *float: left;
+}
+
+// bat-ria/RichSelector inside esui/Sidebar
+.ui-sidebar {
+    .ui-richselector-empty-text {
+        padding: 0 10px;
+        line-height: 30px;
+    }
+
+    .ui-tree-richselector {
+
+        .ui-tree-node-indicator-level-0 {
+            display: none;
+        }
+
+        .ui-richselector-query-list {
+            .ui-tree-item-content {
+                color: @bat-link-color;
+            }
+
+            .ui-tree-content-wrapper-selected {
+                .ui-tree-item-content {
+                    color: @bat-link-color;
+                    font-weight: 700;
+                }
+            }
+        }
+
+        .ui-richselector-query-list {
+            .ui-tree-content-wrapper-selected,
+            .ui-tree-content-wrapper:hover {
+                background: @bat-bg-light-blue;
+            }
+        }
+    }
+}
diff --git a/src/extension/hooks.js b/src/extension/hooks.js
@@ -10,9 +10,7 @@ define(function (require) {
 
     function getAderArgMap() {
         var user = require('../system/user');
-        var aderId = user.ader && user.ader.id
-            || URI.parseQuery(document.location.search).aderId
-            || user.visitor && user.visitor.id;
+        var aderId = user.getAderId();
         return aderId ? { aderId: aderId } : {};
     }