pansyjs · wangxingkang · Jun 2, 2019 · Jun 2, 2019 · Jun 2, 2019 · Jun 2, 2019
diff --git a/.stylelintrc b/.stylelintrc
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -0,0 +1,15 @@
+{
+  "extends": [
+    "stylelint-config-standard",
+    "stylelint-config-rational-order",
+    "stylelint-config-prettier"
+  ],
+  "plugins": [
+    "stylelint-order",
+    "stylelint-declaration-block-no-ignored-properties"
+  ],
+  "rules": {
+    "no-descending-specificity": null,
+    "plugin/declaration-block-no-ignored-properties": true
+  }
+}
diff --git a/README.md b/README.md
@@ -7,14 +7,14 @@
 <h1 align="center">React Admin Template</h1>
 
 <p align="center">
+  <a href="http://umijs.org">
+    <img src="https://img.shields.io/badge/build%20with-umi-028fe4.svg" alt="react">
+  </a>
   <a href="https://github.com/facebook/react">
     <img src="https://img.shields.io/badge/react-16.8.1-brightgreen.svg" alt="react">
   </a>
   <a href="https://github.com/ant-design/ant-design">
-    <img src="https://img.shields.io/badge/ant--design-3.17.0-brightgreen.svg" alt="antd">
-  </a>
-  <a href="https://github.com/umijs/umi">
-    <img src="https://img.shields.io/badge/umi-2.6.17-brightgreen.svg" alt="umi">
+    <img src="https://img.shields.io/badge/ant--design-3.19.2-brightgreen.svg" alt="antd">
   </a>
   <a href="https://github.com/Microsoft/TypeScript">
     <img src="https://img.shields.io/badge/typescript-3.4.2-brightgreen.svg" alt="typescript">

diff --git a/config/config.ts b/config/config.ts
@@ -12,7 +12,7 @@ export default {
   },
   treeShaking: true,
   define: {
-    BASE_URL: serverConfig[SERVER_ENV] || serverConfig.production
+    BASE_URL: serverConfig[SERVER_ENV] || serverConfig.localhost
   },
   // 路由配置
   routes,

diff --git a/config/router.config.ts b/config/router.config.ts
@@ -84,15 +84,13 @@ export default [
             path: '/permission/policies',
             name: 'policies',
             component: './permission/policies/policies',
-            authority: ['permission/policyList'],
-            hideChildrenInMenu: true,
-            routes: [
-              {
-                path: '/permission/policies/create',
-                name: 'create',
-                component: './permission/policies/create',
-              },
-            ]
+            authority: ['permission/policyList']
+          },
+          {
+            path: '/permission/policies/create',
+            name: 'policy-create',
+            hideInMenu: true,
+            component: './permission/policies/create',
           }
         ],
       },
@@ -104,13 +102,13 @@ export default [
           {
             path: '/system/user',
             name: 'user',
-            authority: ['system/action1'],
+            authority: '*',
             component: './system/users'
           },
           {
             path: '/system/group',
             name: 'group',
-            authority: ['system/action2'],
+            authority: '*',
             component: './system/groups'
           }
         ],

diff --git a/config/server.config.ts b/config/server.config.ts
@@ -1,6 +1,8 @@
 // 后端接口配置
 export default {
+  // 本地开发使用
+  localhost: '',
+  dev: '',
+  test: '',
   production: '',
-  development: '',
-  test: ''
 }
diff --git a/package.json b/package.json
@@ -6,21 +6,21 @@
     "bootstrap": "yarn || npm i",
     "clean": "rimraf dist",
     "start": "cross-env PORT=8080 umi dev",
-    "build": "cross-env SERVER_ENV=development umi build",
+    "build": "umi build",
+    "build:dev": "cross-env SERVER_ENV=dev umi build",
     "build:test": "cross-env SERVER_ENV=test umi build",
     "build:prod": "cross-env SERVER_ENV=production umi build",
     "build:web": "yarn build && cd ./dist && anywhere -h localhost -p 8080",
     "gh-pages": "yarn build:prod && gh-pages -d dist",
     "lint-staged": "lint-staged",
     "lint-staged:ts": "npm run tsc",
     "lint:ts": "tslint --project tsconfig.json --format codeFrame",
-    "lint:style": "stylelint \"src/**/*.less\" --syntax less",
+    "lint:style": "stylelint --fix 'src/**/*.less' --syntax less",
     "docker:build": "./scripts/docker-build.sh",
     "tsc": "tsc",
     "test": "umi test",
     "test:component": "umi test ./src/components",
-    "deploy": "rm -rf node_modules/gh-pages/.cache && gh-pages -d dist",
-    "build:view": "npm run build && cd ./dist && anywhere -p 8080",
+    "deploy": "yarn build && rm -rf node_modules/gh-pages/.cache && gh-pages -d dist",
     "prettier": "prettier --write ./src/**/**/**/*"
   },
   "repository": "https://github.com/ts-react/react-admin-template.git",
@@ -30,7 +30,7 @@
     "@antv/data-set": "^0.10.1",
     "@jiumao/dharma": "^0.0.5",
     "@jiumao/policy": "^1.0.5",
-    "antd": "^3.19.1",
+    "antd": "^3.19.2",
     "axios": "^0.18.0",
     "bizcharts": "^3.5.2",
     "braft-editor": "^2.2.9",
@@ -93,10 +93,13 @@
     "mockjs": "^1.0.1-beta3",
     "prettier": "^1.17.0",
     "rimraf": "^2.6.2",
-    "stylelint": "^9.4.0",
-    "stylelint-config-prettier": "^3.3.0",
-    "stylelint-config-standard": "^18.2.0",
-    "typescript": "^3.4.2",
+    "stylelint": "^10.0.1",
+    "stylelint-config-prettier": "^5.2.0",
+    "stylelint-config-rational-order": "^0.1.2",
+    "stylelint-config-standard": "^18.3.0",
+    "stylelint-declaration-block-no-ignored-properties": "^2.1.0",
+    "stylelint-order": "^3.0.0",
+    "typescript": "^3.5.1",
     "umi": "^2.6.17",
     "umi-plugin-react": "^1.7.5",
     "umi-types": "^0.3.2"

diff --git a/src/components/drawer-wrapper/drawer-wrapper.less b/src/components/drawer-wrapper/drawer-wrapper.less
@@ -5,25 +5,25 @@
 .@{prefix-cls} {
   .ant-drawer-body {
     height: 100%;
-    padding: 0;
     min-height: 300px;
+    padding: 0;
   }
 
   &__title {
+    height: @layout-header-height;
     margin: 0;
     color: rgba(0, 0, 0, 0.85);
     font-weight: 500;
     font-size: 16px;
-    height: @layout-header-height;
     line-height: @layout-header-height;
   }
 
   &__header {
     position: relative;
-    padding: 0 24px;
     height: @layout-header-height;
-    line-height: @layout-header-height;
+    padding: 0 24px;
     color: rgba(0,0,0,0.65);
+    line-height: @layout-header-height;
     background: @white;
     border-bottom: 1px solid #e8e8e8;
     border-radius: 4px 4px 0 0;
@@ -61,16 +61,16 @@
     padding: 16px 24px;
      }
 
-  &__footer {
-    background: #fff;
-    width: 100%;
-    border-top: 1px solid #efefef;
-    overflow: hidden;
-    padding: 0 24px;
-    height: @layout-header-height;;
-    line-height: @layout-header-height;;
+  &__footer {;
     position: absolute;
     bottom: 0;
+    width: 100%;
+    height: @layout-header-height;
+    padding: 0 24px;
+    overflow: hidden;;
+    line-height: @layout-header-height;
+    background: #fff;
+    border-top: 1px solid #efefef;
 
     button + button {
       margin-left: 10px;

diff --git a/src/components/exception/exception.less b/src/components/exception/exception.less
@@ -17,8 +17,8 @@
 
     &::before,
     &::after {
-      content: ' ';
       display: table;
+      content: ' ';
     }
 
     &::after {

diff --git a/src/components/global-header/global-header.less b/src/components/global-header/global-header.less
@@ -11,15 +11,15 @@
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   &__right {
-    z-index: 9;
-    max-width: 410px;
     position: absolute;
-    right: 15px;
     top: 0;
-    height: @layout-header-height;
+    right: 15px;
+    z-index: 9;
     display: flex;
     align-items: center;
     justify-content: flex-end;
+    max-width: 410px;
+    height: @layout-header-height;
   }
 
   &__action {

diff --git a/src/components/notice-icon/index.tsx b/src/components/notice-icon/index.tsx
diff --git a/src/components/notice-icon/notice-icon.less b/src/components/notice-icon/notice-icon.less
diff --git a/src/components/notice-icon/notice-icon.tsx b/src/components/notice-icon/notice-icon.tsx
diff --git a/src/components/notice-icon/notice-list.less b/src/components/notice-icon/notice-list.less
diff --git a/src/components/notice-icon/notice-list.tsx b/src/components/notice-icon/notice-list.tsx
diff --git a/src/components/pattern-lock/pattern-lock.less b/src/components/pattern-lock/pattern-lock.less
@@ -0,0 +1,7 @@
+@import '~antd/lib/style/themes/default.less';
+
+@prefix-cls: ~'lotus-pattern-lock';
+
+.@{prefix-cls} {
+  position: relative;
+}
diff --git a/src/components/pattern-lock/pattern-lock.tsx b/src/components/pattern-lock/pattern-lock.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
+import './pattern-lock.less';
 
 interface IProps {
   prefixCls: string;

diff --git a/src/components/screen-lock/screen-lock.less b/src/components/screen-lock/screen-lock.less
@@ -0,0 +1,7 @@
+@import '~antd/lib/style/themes/default.less';
+
+@prefix-cls: ~'lotus-screen-lock';
+
+.@{prefix-cls} {
+  position: relative;
+}