apply-clients 4.0.65 → 4.1.0-weinan

package/src/bootstrap/less/themeOne.less

@@ -0,0 +1,36 @@
+//登录样式
+@import "aofeng/themeOne/loginStyle.less";
+//系统主框架
+@import "aofeng/themeOne/systemStyle.less";
+//二分模板
+@import "aofeng/themeOne/BinaryTemplate.less";
+
+//功能内容标准
+@import "aofeng/standard.less";
+
+/*
+
+@font-face {
+  font-family: 'TRENDSTRENDS';  //重命名字体名
+  src: url('../fonts/trendstrends.ttf');  //引入字体
+}
+
+
+@font-face {
+  font-family: 'PINGFANG-MEDIUM';  //重命名字体名
+  src: url('../fonts/pingfang-medium.ttf');  //引入字体
+}
+@font-face {
+  font-family: 'PINGFANG-BOLD';  //重命名字体名
+  src: url('../fonts/pingfang-bold.ttf');  //引入字体
+}
+@font-face {
+  font-family: 'PINGFANG-REGULAR';  //重命名字体名
+  src: url('../fonts/pingfang-regular.ttf');  //引入字体
+}
+
+@font-face {
+  font-family: PingFang;
+  src:url('../fonts/PingFangSC-Regular.ttf');
+}
+*/

package/src/bootstrap/less/themeTwo.less

@@ -0,0 +1,29 @@
+@import "aofeng/themeTwo/newStyle1.less";
+
+
+
+/*
+@font-face {
+  font-family: 'TRENDSTRENDS';  //重命名字体名
+  src: url('../fonts/trendstrends.ttf');  //引入字体
+}
+
+
+@font-face {
+  font-family: 'PINGFANG-MEDIUM';  //重命名字体名
+  src: url('../fonts/pingfang-medium.ttf');  //引入字体
+}
+@font-face {
+  font-family: 'PINGFANG-BOLD';  //重命名字体名
+  src: url('../fonts/pingfang-bold.ttf');  //引入字体
+}
+@font-face {
+  font-family: 'PINGFANG-REGULAR';  //重命名字体名
+  src: url('../fonts/pingfang-regular.ttf');  //引入字体
+}
+
+@font-face {
+  font-family: PingFang;
+  src:url('../fonts/PingFangSC-Regular.ttf');
+}
+*/

package/src/bootstrap/less/variables.less

@@ -694,7 +694,8 @@
 // 修改后
 @list-group-bg:                 #4C637B;
 //** `.list-group-item` border color
-@list-group-border:             #697D93;
+// @list-group-border:             #697D93;
+@list-group-border:             #4a7cae;
 //** List group border radius
 @list-group-border-radius:      @border-radius-base;
 

package/src/components/Util.js

@@ -21,6 +21,10 @@ export function getAttendanceState (item, timeToWork, timeToGo) {
   }
 }
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
 export function toStandardYearMonth () {
   let dt = new Date()
   let month = dt.getMonth() + 1