fmui-base 2.0.42 → 2.0.43

package/lib/form/table.js

@@ -1032,6 +1032,7 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'forSubCalculateExpList',
 		value: function forSubCalculateExpList(data, itemParam, uniqueName) {
+			var that = this;
 			var calculateExpList = data.subCalculateExpList;
 			if (calculateExpList) {
 				var calculateExpValue = calculateExpList[uniqueName];
@@ -1151,10 +1152,10 @@ var PageHome = function (_React$Component) {
 											res = Number(res).toFixed(decimalPlace) + '';
 										} else {
 											if (fieldArray.length == 0) {
-												var aDP = getActualDecimalPlace(exp);
+												var aDP = that.getActualDecimalPlace(exp);
 												res = res.toFixed(aDP) + '';
 											} else {
-												var maxDP = getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
+												var maxDP = that.getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
 												res = res.toFixed(maxDP) + '';
 											}
 										}

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

@@ -93,10 +93,6 @@ var MyGrid = function (_React$Component) {
       var t = _this;
       // 部件的初始化信息
       _db2.default.reactGrid.getPortalPage({ id: t.state.portalId, module: t.state.module }).then(function (res) {
-        // console.log('====================================');
-        // console.log(res, 'resresresresres');
-        // console.log('====================================');
-
         _this.setState({
           data: res
         });
@@ -104,9 +100,6 @@ var MyGrid = function (_React$Component) {
           if (item.portletCode == 'banner') {
             _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
           } else if (item.portletCode == 'cyyy') {
-            console.log('====================================');
-            console.log(item.id, '//////////////////////////');
-            console.log('====================================');
             t.getShoucangAppInfo(item.id);
             t.getComAppInfo(item.id);
           } else if (item.portletCode !== 'tbgl') {
@@ -125,12 +118,9 @@ var MyGrid = function (_React$Component) {
     };
 
     _this.getShoucangAppInfo = function (id) {
-      console.log('====================================');
-      console.log(id, 'ididididididididiididiididiididididi');
-      console.log('====================================');
       _db2.default.reactGrid.getNewHomePageCollectAppInfoList({ showClient: "DING" }).then(function (result) {
         _this.setState(_defineProperty({}, 'wdsc' + '_' + id, result.data), function () {
-          console.log(_this.state, 'mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm');
+          // console.log(this.state, 'mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm');
         });
       }).catch(function (error) {});
     };
@@ -246,8 +236,8 @@ var MyGrid = function (_React$Component) {
       bssxPer_show: true, //办事事项_个人_是否显示
       bssxOrg_show: true, //办事事项_个人_是否显示,
       cyyyUsuTab_show: true, //常用应用_是否显示
-      cyyyPerTab_show: true //我的收藏_是否显示
-
+      cyyyPerTab_show: true, //我的收藏_是否显示
+      activeIndex_mail: 0
 
     };
     return _this;
@@ -547,6 +537,24 @@ var MyGrid = function (_React$Component) {
         }
       }
     }
+  }, {
+    key: 'handleChange',
+    value: function handleChange(id, obj) {
+      var _this3 = this;
+
+      debugger;
+      var t = this;
+      console.log({
+        activeIndex: obj.active,
+        preActiveIndex: obj.preActive,
+        data: id
+      });
+      this.setState(_defineProperty({}, 'activeIndex_mail_' + id, obj.active), function () {
+        console.log('====================================');
+        console.log(_this3.state);
+        console.log('====================================');
+      });
+    }
   }, {
     key: 'portalContent',
     value: function portalContent(item) {
@@ -562,7 +570,6 @@ var MyGrid = function (_React$Component) {
         var pathUrl = "";
         var colNum = t.state.todoList.length > 0 ? t.state.todoList.length : 5;
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].bannerImg) {
-          debugger;
           var pathUrlId = t.state[item.portletCode + '_' + item.id].bannerImg;
           pathUrl = localStorage.getItem('context') + '/api/m/plugin/attachment/mobile/viewImage?token=' + localStorage.getItem('token') + '&fid=' + pathUrlId;
         } else {
@@ -1167,7 +1174,12 @@ var MyGrid = function (_React$Component) {
         componentContent = _react2.default.createElement(
           'div',
           null,
-          _react2.default.createElement(
+          t.state['activeIndex_mail_' + item.data] && t.state['activeIndex_mail_' + item.data] == "0" ? _react2.default.createElement(
+            'p',
+            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'gryj') },
+            '\u66F4\u591A',
+            _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
+          ) : _react2.default.createElement(
             'p',
             { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
             '\u66F4\u591A',
@@ -1175,7 +1187,7 @@ var MyGrid = function (_React$Component) {
           ),
           _react2.default.createElement(
             _Tab2.default,
-            { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1" },
+            { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1", onChange: t.handleChange.bind(this, item.id) },
             personMailTab,
             publicMailTab
           )

package/lib/react_grid/react_grid.less

@@ -65,6 +65,9 @@
     // width: 100% !important;
     // margin: 0 10px;
     overflow: auto;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
     // background-color: #fff;
   }
 

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.42",
+  "version": "2.0.43",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",