fmui-base 2.0.49 → 2.0.50

package/lib/poppage/tree/tree.js

@@ -187,9 +187,9 @@ var Page = function (_React$Component2) {
     //this.initData();
 
 
-    /*// 子组件初始化
-    initState() {
-     }*/
+    /*// 子组件初始化
+    initState() {
+      }*/
 
     //初始化数据
 

package/lib/react_grid/react_grid.js

@@ -556,6 +556,9 @@ var MyGrid = function (_React$Component) {
         }
       }
     }
+
+    // 区分个人邮件和公共邮件
+
   }, {
     key: 'handleChange',
     value: function handleChange(id, obj) {
@@ -576,6 +579,9 @@ var MyGrid = function (_React$Component) {
         this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_gryj_' + id, true), _defineProperty(_setState4, 'activeIndex_ggyj_' + id, false), _setState4));
       }
     }
+
+    // 部件内容渲染处理函数
+
   }, {
     key: 'portalContent',
     value: function portalContent(item) {
@@ -658,7 +664,7 @@ var MyGrid = function (_React$Component) {
             }.bind(this)) : ''
           )
         );
-
+        // backgroundImage直接判断有无会报错，单独return
         return _react2.default.createElement(
           'div',
           { className: 'react-grid-component', key: item.id, style: {
@@ -691,10 +697,10 @@ var MyGrid = function (_React$Component) {
                   { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
                   '\u5E38\u7528\u5E94\u7528'
                 ) },
-              _react2.default.createElement(
+              t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? _react2.default.createElement(
                 _Grid2.default,
                 { col: personalSetting.cols * 1, className: t.state.showcyyy ? '' : 't-DN' },
-                t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? t.state[item.portletCode + '_' + item.id].map(function (ele) {
+                t.state[item.portletCode + '_' + item.id].map(function (ele) {
                   return _react2.default.createElement(
                     'div',
                     { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
@@ -709,11 +715,7 @@ var MyGrid = function (_React$Component) {
                       ele.name
                     )
                   );
-                }) : _react2.default.createElement(
-                  'div',
-                  null,
-                  _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
-                ),
+                }),
                 _react2.default.createElement(
                   'div',
                   { className: t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? 'systemItem' : 't-DN', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting", personalSetting.cols * 1, item.id) },
@@ -728,6 +730,10 @@ var MyGrid = function (_React$Component) {
                     '\u66F4\u591A'
                   )
                 )
+              ) : _react2.default.createElement(
+                'div',
+                null,
+                _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
               )
             ),
             _react2.default.createElement(
@@ -737,10 +743,10 @@ var MyGrid = function (_React$Component) {
                   { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
                   '\u6211\u7684\u6536\u85CF'
                 ) },
-              _react2.default.createElement(
+              t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? _react2.default.createElement(
                 _Grid2.default,
                 { col: personalSetting.cols * 1 },
-                t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? t.state['wdsc' + '_' + item.id].map(function (ele) {
+                t.state['wdsc' + '_' + item.id].map(function (ele) {
                   return _react2.default.createElement(
                     'div',
                     { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
@@ -755,14 +761,10 @@ var MyGrid = function (_React$Component) {
                       ele.name
                     )
                   );
-                }) : _react2.default.createElement(
-                  'div',
-                  null,
-                  _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
-                ),
+                }),
                 _react2.default.createElement(
                   'div',
-                  { className: t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? 'systemItem' : 't-DN', onClick: t.jumpPage.bind(this, "/appCollect") },
+                  { className: 'systemItem', onClick: t.jumpPage.bind(this, "/appCollect") },
                   _react2.default.createElement(
                     'div',
                     { className: 'iconblock t-iconBCred' },
@@ -774,6 +776,10 @@ var MyGrid = function (_React$Component) {
                     '\u66F4\u591A'
                   )
                 )
+              ) : _react2.default.createElement(
+                'div',
+                null,
+                _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
               )
             )
           )

package/lib/react_grid/react_grid.less

@@ -7,7 +7,7 @@
   }
 
   .t-tab-bar {
-    padding-left: 6px;
+    padding-left: 10px;
   }
 
   .t-tab-bar .t-tab-tab {
@@ -15,14 +15,15 @@
     min-width: 95px;
     color: #888;
     flex: initial;
-    padding: 0 10px;
+    // padding: 0 8px;
     height: 33px;
     line-height: 20px;
     display: block;
     background-color: transparent;
 
     div {
-      max-width: 81px;
+      max-width: 95px;
+      padding: 0 5px;
       height: inherit;
       white-space: nowrap;
       overflow: hidden;
@@ -39,7 +40,7 @@
 
   .t-tab-ink-bar {
     // background-color: @theme-color  !important;
-    margin-left: -36px;
+    margin-left: -41px;
     border-radius: 4px;
     height: 4px;
     width: 25px !important;
@@ -59,7 +60,7 @@
   }
 
   .t-tab-nav-wrap .t-tab-ink-bar {
-    margin-left: -28px;
+    margin-left: -31px;
   }
 
   .react-grid-item.cssTransforms {
@@ -987,6 +988,10 @@
     background:#713938;
   }
 
+  .list-RT-label .list-item {
+    margin: 10px 16px;
+  }
+
   .rightMore {
     position: absolute;
     right: 10px;
@@ -1041,5 +1046,6 @@
   .t-grid-item+.t-grid-item {
     border-left: none !important;
   }
+
 }
 

package/lib/select-fileno/pageHome.js

@@ -626,7 +626,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'closMask',
     value: function closMask() {
-      /* $("#App").removeAttr("style");
+      /* $("#App").removeAttr("style");
        $(document).scrollTop(this.props.top);*/
     }
   }, {

package/lib/select-serialnumber/pageHome.js

@@ -540,7 +540,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'closMask',
     value: function closMask() {
-      /* $("#App").removeAttr("style");
+      /* $("#App").removeAttr("style");
        $(document).scrollTop(this.props.top);*/
     }
   }, {

package/lib/select-serialnumber/pageHome1.js

@@ -538,7 +538,7 @@ var Page = function (_Component) {
   }, {
     key: 'closMask',
     value: function closMask() {
-      /* $("#App").removeAttr("style");
+      /* $("#App").removeAttr("style");
        $(document).scrollTop(this.props.top);*/
     }
   }, {

package/lib/signature/draw.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-/**
- * Created by louizhai on 17/6/30.
- * description: Use canvas to draw.
+/**
+ * Created by louizhai on 17/6/30.
+ * description: Use canvas to draw.
  */
 function Draw(canvas, degree) {
   var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};

package/lib/signature/sign.less

@@ -1,73 +1,73 @@
-.page-demo {
-  color:#666;
-}
-
-
-#canvasBox {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-.greet {
-  padding: 20px;
-  font-size: 20px;
-  user-select: none;
-}
-.greet a {
-  cursor: pointer;
-}
-.greet select {
-  font-size: 18px;
-}
-canvas {
-  flex: 1;
-  //border: 0.5px solid #ccc;
-  cursor: crosshair;
-}
-
-
-
-
-@media screen and (orientation: portrait) {
-  .dd-write-sign-page {
-    position: absolute;
-    width: 100vh;
-    height: 100vw;
-    top: 0;
-    left: 100vw;
-    -webkit-transform: rotate(90deg);
-    -moz-transform: rotate(90deg);
-    -ms-transform: rotate(90deg);
-    transform: rotate(90deg);
-    transform-origin: 0% 0%;
-  }
-}
-
-@media screen and (orientation: landscape) {
-  .dd-write-sign-page {
-    -webkit-transform: rotate(0);
-    -moz-transform: rotate(0);
-    -ms-transform: rotate(0);
-    transform: rotate(0)
-  }
-}
-
-.dd-write-sign {
-  height: calc(~"100% - 83px");
-}
-
-.dd-write-sign-del.t-text-button {
-  height: 32px;
-  line-height: 32px;
-
-  .iconfont {
-    height: 32px;
-  }
-}
-.img-border{
-  border:1px solid #ccc;
-
-}
-
-
-
+.page-demo {
+  color:#666;
+}
+
+
+#canvasBox {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.greet {
+  padding: 20px;
+  font-size: 20px;
+  user-select: none;
+}
+.greet a {
+  cursor: pointer;
+}
+.greet select {
+  font-size: 18px;
+}
+canvas {
+  flex: 1;
+  //border: 0.5px solid #ccc;
+  cursor: crosshair;
+}
+
+
+
+
+@media screen and (orientation: portrait) {
+  .dd-write-sign-page {
+    position: absolute;
+    width: 100vh;
+    height: 100vw;
+    top: 0;
+    left: 100vw;
+    -webkit-transform: rotate(90deg);
+    -moz-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    transform: rotate(90deg);
+    transform-origin: 0% 0%;
+  }
+}
+
+@media screen and (orientation: landscape) {
+  .dd-write-sign-page {
+    -webkit-transform: rotate(0);
+    -moz-transform: rotate(0);
+    -ms-transform: rotate(0);
+    transform: rotate(0)
+  }
+}
+
+.dd-write-sign {
+  height: calc(~"100% - 83px");
+}
+
+.dd-write-sign-del.t-text-button {
+  height: 32px;
+  line-height: 32px;
+
+  .iconfont {
+    height: 32px;
+  }
+}
+.img-border{
+  border:1px solid #ccc;
+
+}
+
+
+

package/lib/signature//346/211/213/345/206/231/347/255/276/345/220/215/344/275/277/347/224/250/346/226/207/346/241/243.md

@@ -1,12 +1,12 @@
-# 手写签名使用文档
-
-1. 安装fmui 0.0.36-ygy以上的版本
-2. 引用： import Sign from 'fmui/lib/signature';
-3. 写标签 
-```
-<Sign upload={(val)=>{alert(val)}}/>
-```
-4. 参数 
-	- upload ： (必填项)回调方法，返回参数为生成手写签名图片的id
-	- title : (必填项)显示的输入框标题
+# 手写签名使用文档
+
+1. 安装fmui 0.0.36-ygy以上的版本
+2. 引用： import Sign from 'fmui/lib/signature';
+3. 写标签 
+```
+<Sign upload={(val)=>{alert(val)}}/>
+```
+4. 参数 
+	- upload ： (必填项)回调方法，返回参数为生成手写签名图片的id
+	- title : (必填项)显示的输入框标题
 	- fileId : 初始化签名图片文件id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.0.49",
+  "version": "2.0.50",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",