diff --git a/.gitignore b/.gitignore index afe69d5..1db50c6 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,22 @@ all/docker/java/jdk1.8.0_144/ all/docker/wiremock/ ### ms-web### -node_modules/ \ No newline at end of file +node_modules/ +npm-debug.log +.DS_Store +node_modules/ +/dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +/test/unit/coverage/ +/test/e2e/reports/ +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln \ No newline at end of file diff --git a/ms-web/.gitignore b/ms-web/.gitignore deleted file mode 100644 index dfb4167..0000000 --- a/ms-web/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.DS_Store -node_modules/ -/dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -/test/unit/coverage/ -/test/e2e/reports/ -selenium-debug.log - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln diff --git a/ms-web/README.md b/ms-web/README.md index c5d7ef7..2ca9fbb 100644 --- a/ms-web/README.md +++ b/ms-web/README.md @@ -26,5 +26,27 @@ npm run e2e # run all tests npm test ``` - -For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). +# the project develop +```bash +# 安装element-ui +npm i element-ui -S +后续配置请查看element-ui官网 +# 安装less +npm install less less-loader --save-dev +安装成功后,打开 build/webpack.base.conf.js ,在 module.exports = 的对象的 module.rules 后面添加一段: +module.exports = { + // 此处省略无数行,已有的的其他的内容 + module: { + rules: [ + // 此处省略无数行,已有的的其他的规则 + { + test: /\.less$/, + loader: "style-loader!css-loader!less-loader", + } + ] + } +} +最后,在代码中的 style 标签中 加上 lang="less" 属性即可~ + +``` diff --git a/ms-web/build/webpack.base.conf.js b/ms-web/build/webpack.base.conf.js index 99b5169..e675f9c 100644 --- a/ms-web/build/webpack.base.conf.js +++ b/ms-web/build/webpack.base.conf.js @@ -74,6 +74,10 @@ module.exports = { limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } + }, + { + test: /\.less$/, + loader: "style-loader!css-loader!less-loader", } ] }, diff --git a/ms-web/index.html b/ms-web/index.html index 1945198..689ee71 100644 --- a/ms-web/index.html +++ b/ms-web/index.html @@ -7,6 +7,5 @@
- diff --git a/ms-web/package.json b/ms-web/package.json index 93558ce..80aec53 100644 --- a/ms-web/package.json +++ b/ms-web/package.json @@ -55,6 +55,8 @@ "html-webpack-plugin": "^2.30.1", "jest": "^21.2.0", "jest-serializer-vue": "^0.3.0", + "less": "^2.7.3", + "less-loader": "^4.0.5", "nightwatch": "^0.9.12", "node-notifier": "^5.1.2", "optimize-css-assets-webpack-plugin": "^3.2.0", diff --git a/ms-web/src/App.vue b/ms-web/src/App.vue index a423627..e370f91 100644 --- a/ms-web/src/App.vue +++ b/ms-web/src/App.vue @@ -5,13 +5,18 @@ diff --git a/ms-web/src/assets/icon/demo.css b/ms-web/src/assets/icon/demo.css new file mode 100644 index 0000000..3d9cbe7 --- /dev/null +++ b/ms-web/src/assets/icon/demo.css @@ -0,0 +1,370 @@ +*{margin: 0;padding: 0;list-style: none;} +/* +KISSY CSS Reset +理念:1. reset 的目的不是清除浏览器的默认样式,这仅是部分工作。清除和重置是紧密不可分的。 +2. reset 的目的不是让默认样式在所有浏览器下一致,而是减少默认样式有可能带来的问题。 +3. reset 期望提供一套普适通用的基础样式。但没有银弹,推荐根据具体需求,裁剪和修改后再使用。 +特色:1. 适应中文;2. 基于最新主流浏览器。 +维护:玉伯, 正淳 + */ + +/** 清除内外边距 **/ +body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, /* structural elements 结构元素 */ +dl, dt, dd, ul, ol, li, /* list elements 列表元素 */ +pre, /* text formatting elements 文本格式元素 */ +form, fieldset, legend, button, input, textarea, /* form elements 表单元素 */ +th, td /* table elements 表格元素 */ { + margin: 0; + padding: 0; +} + +/** 设置默认字体 **/ +body, +button, input, select, textarea /* for ie */ { + font: 12px/1.5 tahoma, arial, \5b8b\4f53, sans-serif; +} +h1, h2, h3, h4, h5, h6 { font-size: 100%; } +address, cite, dfn, em, var { font-style: normal; } /* 将斜体扶正 */ +code, kbd, pre, samp { font-family: courier new, courier, monospace; } /* 统一等宽字体 */ +small { font-size: 12px; } /* 小于 12px 的中文很难阅读,让 small 正常化 */ + +/** 重置列表元素 **/ +ul, ol { list-style: none; } + +/** 重置文本格式元素 **/ +a { text-decoration: none; } +a:hover { text-decoration: underline; } + + +/** 重置表单元素 **/ +legend { color: #000; } /* for ie6 */ +fieldset, img { border: 0; } /* img 搭车:让链接里的 img 无边框 */ +button, input, select, textarea { font-size: 100%; } /* 使得表单元素在 ie 下能继承字体大小 */ +/* 注:optgroup 无法扶正 */ + +/** 重置表格元素 **/ +table { border-collapse: collapse; border-spacing: 0; } + +/* 清除浮动 */ +.ks-clear:after, .clear:after { + content: '\20'; + display: block; + height: 0; + clear: both; +} +.ks-clear, .clear { + *zoom: 1; +} + +.main { + padding: 30px 100px; +width: 960px; +margin: 0 auto; +} +.main h1{font-size:36px; color:#333; text-align:left;margin-bottom:30px; border-bottom: 1px solid #eee;} + +.helps{margin-top:40px;} +.helps pre{ + padding:20px; + margin:10px 0; + border:solid 1px #e7e1cd; + background-color: #fffdef; + overflow: auto; +} + +.icon_lists{ + width: 100% !important; + +} + +.icon_lists li{ + float:left; + width: 100px; + height:180px; + text-align: center; + list-style: none !important; +} +.icon_lists .icon{ + font-size: 42px; + line-height: 100px; + margin: 10px 0; + color:#333; + -webkit-transition: font-size 0.25s ease-out 0s; + -moz-transition: font-size 0.25s ease-out 0s; + transition: font-size 0.25s ease-out 0s; + +} +.icon_lists .icon:hover{ + font-size: 100px; +} + + + +.markdown { + color: #666; + font-size: 14px; + line-height: 1.8; +} + +.highlight { + line-height: 1.5; +} + +.markdown img { + vertical-align: middle; + max-width: 100%; +} + +.markdown h1 { + color: #404040; + font-weight: 500; + line-height: 40px; + margin-bottom: 24px; +} + +.markdown h2, +.markdown h3, +.markdown h4, +.markdown h5, +.markdown h6 { + color: #404040; + margin: 1.6em 0 0.6em 0; + font-weight: 500; + clear: both; +} + +.markdown h1 { + font-size: 28px; +} + +.markdown h2 { + font-size: 22px; +} + +.markdown h3 { + font-size: 16px; +} + +.markdown h4 { + font-size: 14px; +} + +.markdown h5 { + font-size: 12px; +} + +.markdown h6 { + font-size: 12px; +} + +.markdown hr { + height: 1px; + border: 0; + background: #e9e9e9; + margin: 16px 0; + clear: both; +} + +.markdown p, +.markdown pre { + margin: 1em 0; +} + +.markdown > p, +.markdown > blockquote, +.markdown > .highlight, +.markdown > ol, +.markdown > ul { + width: 80%; +} + +.markdown ul > li { + list-style: circle; +} + +.markdown > ul li, +.markdown blockquote ul > li { + margin-left: 20px; + padding-left: 4px; +} + +.markdown > ul li p, +.markdown > ol li p { + margin: 0.6em 0; +} + +.markdown ol > li { + list-style: decimal; +} + +.markdown > ol li, +.markdown blockquote ol > li { + margin-left: 20px; + padding-left: 4px; +} + +.markdown code { + margin: 0 3px; + padding: 0 5px; + background: #eee; + border-radius: 3px; +} + +.markdown pre { + border-radius: 6px; + background: #f7f7f7; + padding: 20px; +} + +.markdown pre code { + border: none; + background: #f7f7f7; + margin: 0; +} + +.markdown strong, +.markdown b { + font-weight: 600; +} + +.markdown > table { + border-collapse: collapse; + border-spacing: 0px; + empty-cells: show; + border: 1px solid #e9e9e9; + width: 95%; + margin-bottom: 24px; +} + +.markdown > table th { + white-space: nowrap; + color: #333; + font-weight: 600; + +} + +.markdown > table th, +.markdown > table td { + border: 1px solid #e9e9e9; + padding: 8px 16px; + text-align: left; +} + +.markdown > table th { + background: #F7F7F7; +} + +.markdown blockquote { + font-size: 90%; + color: #999; + border-left: 4px solid #e9e9e9; + padding-left: 0.8em; + margin: 1em 0; + font-style: italic; +} + +.markdown blockquote p { + margin: 0; +} + +.markdown .anchor { + opacity: 0; + transition: opacity 0.3s ease; + margin-left: 8px; +} + +.markdown .waiting { + color: #ccc; +} + +.markdown h1:hover .anchor, +.markdown h2:hover .anchor, +.markdown h3:hover .anchor, +.markdown h4:hover .anchor, +.markdown h5:hover .anchor, +.markdown h6:hover .anchor { + opacity: 1; + display: inline-block; +} + +.markdown > br, +.markdown > p > br { + clear: both; +} + + +.hljs { + display: block; + background: white; + padding: 0.5em; + color: #333333; + overflow-x: auto; +} + +.hljs-comment, +.hljs-meta { + color: #969896; +} + +.hljs-string, +.hljs-variable, +.hljs-template-variable, +.hljs-strong, +.hljs-emphasis, +.hljs-quote { + color: #df5000; +} + +.hljs-keyword, +.hljs-selector-tag, +.hljs-type { + color: #a71d5d; +} + +.hljs-literal, +.hljs-symbol, +.hljs-bullet, +.hljs-attribute { + color: #0086b3; +} + +.hljs-section, +.hljs-name { + color: #63a35c; +} + +.hljs-tag { + color: #333333; +} + +.hljs-title, +.hljs-attr, +.hljs-selector-id, +.hljs-selector-class, +.hljs-selector-attr, +.hljs-selector-pseudo { + color: #795da3; +} + +.hljs-addition { + color: #55a532; + background-color: #eaffea; +} + +.hljs-deletion { + color: #bd2c00; + background-color: #ffecec; +} + +.hljs-link { + text-decoration: underline; +} + +pre{ + background: #fff; +} + + + + + diff --git a/ms-web/src/assets/icon/demo_fontclass.html b/ms-web/src/assets/icon/demo_fontclass.html new file mode 100644 index 0000000..6c62fc5 --- /dev/null +++ b/ms-web/src/assets/icon/demo_fontclass.html @@ -0,0 +1,52 @@ + + + + + + IconFont + + + + +
+

IconFont 图标

+
    + +
  • + +
    Password
    +
    .el-icon-ms-password
    +
  • + +
  • + +
    username
    +
    .el-icon-ms-username
    +
  • + +
+ +

font-class引用

+
+ +

font-class是unicode使用方式的一种变种,主要是解决unicode书写不直观,语意不明确的问题。

+

与unicode使用方式相比,具有如下特点:

+
    +
  • 兼容性良好,支持ie8+,及所有现代浏览器。
  • +
  • 相比于unicode语意明确,书写更直观。可以很容易分辨这个icon是什么。
  • +
  • 因为使用class来定义图标,所以当要替换图标时,只需要修改class里面的unicode引用。
  • +
  • 不过因为本质上还是使用的字体,所以多色图标还是不支持的。
  • +
+

使用步骤如下:

+

第一步:引入项目下面生成的fontclass代码:

+ + +
<link rel="stylesheet" type="text/css" href="./iconfont.css">
+

第二步:挑选相应图标并获取类名,应用于页面:

+
<i class="iconfont el-icon-ms-xxx"></i>
+
+

"iconfont"是你项目下的font-family。可以通过编辑项目查看,默认是"iconfont"。

+
+
+ + diff --git a/ms-web/src/assets/icon/demo_symbol.html b/ms-web/src/assets/icon/demo_symbol.html new file mode 100644 index 0000000..2400e0b --- /dev/null +++ b/ms-web/src/assets/icon/demo_symbol.html @@ -0,0 +1,79 @@ + + + + + + IconFont + + + + + + +
+

IconFont 图标

+
    + +
  • + +
    Password
    +
    #el-icon-ms-password
    +
  • + +
  • + +
    username
    +
    #el-icon-ms-username
    +
  • + +
+ + +

symbol引用

+
+ +

这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇文章 + 这种用法其实是做了一个svg的集合,与另外两种相比具有如下特点:

+
    +
  • 支持多色图标了,不再受单色限制。
  • +
  • 通过一些技巧,支持像字体那样,通过font-size,color来调整样式。
  • +
  • 兼容性较差,支持 ie9+,及现代浏览器。
  • +
  • 浏览器渲染svg的性能一般,还不如png。
  • +
+

使用步骤如下:

+

第一步:引入项目下面生成的symbol代码:

+
<script src="./iconfont.js"></script>
+

第二步:加入通用css代码(引入一次就行):

+
<style type="text/css">
+.icon {
+   width: 1em; height: 1em;
+   vertical-align: -0.15em;
+   fill: currentColor;
+   overflow: hidden;
+}
+</style>
+

第三步:挑选相应图标并获取类名,应用于页面:

+
<svg class="icon" aria-hidden="true">
+  <use xlink:href="#el-icon-ms-xxx"></use>
+</svg>
+        
+
+ + diff --git a/ms-web/src/assets/icon/demo_unicode.html b/ms-web/src/assets/icon/demo_unicode.html new file mode 100644 index 0000000..eb7a7d0 --- /dev/null +++ b/ms-web/src/assets/icon/demo_unicode.html @@ -0,0 +1,90 @@ + + + + + + IconFont + + + + + +
+

IconFont 图标

+
    + +
  • + +
    Password
    +
    &#xe663;
    +
  • + +
  • + +
    username
    +
    &#xe653;
    +
  • + +
+

unicode引用

+
+ +

unicode是字体在网页端最原始的应用方式,特点是:

+
    +
  • 兼容性最好,支持ie6+,及所有现代浏览器。
  • +
  • 支持按字体的方式去动态调整图标大小,颜色等等。
  • +
  • 但是因为是字体,所以不支持多色。只能使用平台里单色的图标,就算项目里有多色图标也会自动去色。
  • +
+
+

注意:新版iconfont支持多色图标,这些多色图标在unicode模式下将不能使用,如果有需求建议使用symbol的引用方式

+
+

unicode使用步骤如下:

+

第一步:拷贝项目下面生成的font-face

+
@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.eot');
+  src: url('iconfont.eot?#iefix') format('embedded-opentype'),
+  url('iconfont.woff') format('woff'),
+  url('iconfont.ttf') format('truetype'),
+  url('iconfont.svg#iconfont') format('svg');
+}
+
+

第二步:定义使用iconfont的样式

+
.iconfont{
+  font-family:"iconfont" !important;
+  font-size:16px;font-style:normal;
+  -webkit-font-smoothing: antialiased;
+  -webkit-text-stroke-width: 0.2px;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+

第三步:挑选相应图标并获取字体编码,应用于页面

+
<i class="iconfont">&#x33;</i>
+ +
+

"iconfont"是你项目下的font-family。可以通过编辑项目查看,默认是"iconfont"。

+
+
+ + + + diff --git a/ms-web/src/assets/icon/iconfont.css b/ms-web/src/assets/icon/iconfont.css new file mode 100644 index 0000000..cc6ed00 --- /dev/null +++ b/ms-web/src/assets/icon/iconfont.css @@ -0,0 +1,30 @@ + +@font-face {font-family: "iconfont"; + src: url('iconfont.eot?t=1513750823590'); /* IE9*/ + src: url('iconfont.eot?t=1513750823590#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'), + url('iconfont.ttf?t=1513750823590') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('iconfont.svg?t=1513750823590#iconfont') format('svg'); /* iOS 4.1- */ +} + +.iconfont { + font-family:"iconfont" !important; + font-size:16px; + font-style:normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +[class^="el-icon-ms"], [class*=" el-icon-ms"] { + font-family:"fontFamily" !important; + /* 以下内容参照第三方图标库本身的规则 */ + font-size: 18px; + font-style:normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.el-icon-ms-password:before { content: "\e663"; } + +.el-icon-ms-username:before { content: "\e653"; } + diff --git a/ms-web/src/assets/icon/iconfont.eot b/ms-web/src/assets/icon/iconfont.eot new file mode 100644 index 0000000..7ab87f9 Binary files /dev/null and b/ms-web/src/assets/icon/iconfont.eot differ diff --git a/ms-web/src/assets/icon/iconfont.js b/ms-web/src/assets/icon/iconfont.js new file mode 100644 index 0000000..0fb1b53 --- /dev/null +++ b/ms-web/src/assets/icon/iconfont.js @@ -0,0 +1 @@ +(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window) \ No newline at end of file diff --git a/ms-web/src/assets/icon/iconfont.svg b/ms-web/src/assets/icon/iconfont.svg new file mode 100644 index 0000000..fe57cf7 --- /dev/null +++ b/ms-web/src/assets/icon/iconfont.svg @@ -0,0 +1,39 @@ + + + + + +Created by iconfont + + + + + + + + + + + + + + + + + + + + + diff --git a/ms-web/src/assets/icon/iconfont.ttf b/ms-web/src/assets/icon/iconfont.ttf new file mode 100644 index 0000000..c323bfa Binary files /dev/null and b/ms-web/src/assets/icon/iconfont.ttf differ diff --git a/ms-web/src/assets/icon/iconfont.woff b/ms-web/src/assets/icon/iconfont.woff new file mode 100644 index 0000000..e7eccf6 Binary files /dev/null and b/ms-web/src/assets/icon/iconfont.woff differ diff --git a/ms-web/src/components/HelloWorld.vue b/ms-web/src/components/HelloWorld.vue deleted file mode 100644 index 731219b..0000000 --- a/ms-web/src/components/HelloWorld.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/ms-web/src/components/SignIn.vue b/ms-web/src/components/SignIn.vue new file mode 100644 index 0000000..5fcd1df --- /dev/null +++ b/ms-web/src/components/SignIn.vue @@ -0,0 +1,73 @@ + + + + + + + diff --git a/ms-web/src/main.js b/ms-web/src/main.js index 9f20678..318035e 100644 --- a/ms-web/src/main.js +++ b/ms-web/src/main.js @@ -5,6 +5,7 @@ import App from './App' import router from './router' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' + Vue.use(ElementUI) Vue.config.productionTip = false diff --git a/ms-web/src/router/index.js b/ms-web/src/router/index.js index 5fa7f9d..f6f7a20 100644 --- a/ms-web/src/router/index.js +++ b/ms-web/src/router/index.js @@ -1,6 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' -import HelloWorld from '@/components/HelloWorld' +import SignIn from '@/components/SignIn' Vue.use(Router) @@ -8,8 +8,8 @@ export default new Router({ routes: [ { path: '/', - name: 'HelloWorld', - component: HelloWorld + name: 'SignIn', + component: SignIn } ] }) diff --git a/ms-web/test/unit/specs/HelloWorld.spec.js b/ms-web/test/unit/specs/HelloWorld.spec.js index d3e6a58..587c6f8 100644 --- a/ms-web/test/unit/specs/HelloWorld.spec.js +++ b/ms-web/test/unit/specs/HelloWorld.spec.js @@ -1,7 +1,7 @@ import Vue from 'vue' import HelloWorld from '@/components/HelloWorld' -describe('HelloWorld.vue', () => { +describe('SignIn.vue', () => { it('should render correct contents', () => { const Constructor = Vue.extend(HelloWorld) const vm = new Constructor().$mount()