fmui-base 2.0.36 → 2.0.38

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

@@ -109,9 +109,7 @@ var MyGrid = function (_React$Component) {
               _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
             });
           } else if (item.portletCode == 'banner') {
-            _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)), function () {
-              console.log(_this.state, '///////////////////////////');
-            });
+            _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
           }
         });
       });
@@ -403,7 +401,7 @@ var MyGrid = function (_React$Component) {
     key: 'skip2Zhuanti',
     value: function skip2Zhuanti(item) {
       var code = item.data.props.code;
-      location.hash = "topicservice/" + item.code;
+      location.hash = "topicservice/" + code;
     }
 
     //跳转到我的事项
@@ -603,7 +601,7 @@ var MyGrid = function (_React$Component) {
                 }) : '',
                 _react2.default.createElement(
                   'div',
-                  { className: 'systemItem', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting") },
+                  { className: 'systemItem', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting", personalSetting.cols) },
                   _react2.default.createElement(
                     'div',
                     { className: 'iconblock t-iconBCred' },
@@ -753,7 +751,7 @@ var MyGrid = function (_React$Component) {
           { className: 'component-bssx' },
           _react2.default.createElement(
             'p',
-            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
+            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.jumpPage.bind(this, "/officehall") },
             '\u66F4\u591A',
             _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
           ),
@@ -1088,10 +1086,20 @@ var MyGrid = function (_React$Component) {
           );
         }
         componentContent = _react2.default.createElement(
-          _Tab2.default,
-          { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1" },
-          personMailTab,
-          publicMailTab
+          'div',
+          null,
+          _react2.default.createElement(
+            'p',
+            { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
+            '\u66F4\u591A',
+            _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
+          ),
+          _react2.default.createElement(
+            _Tab2.default,
+            { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1" },
+            personMailTab,
+            publicMailTab
+          )
         );
       }
       if (item.portletCode === 'grrc') {
@@ -1166,9 +1174,11 @@ var MyGrid = function (_React$Component) {
           calendarDom,
           grrcList
         );
-        setTimeout(function () {
-          t.initCleader(t.state[item.portletCode + '_' + item.id], item.id);
-        }, 600);
+        if (t.state[item.portletCode + '_' + item.id]) {
+          setTimeout(function () {
+            t.initCleader(t.state[item.portletCode + '_' + item.id], item.id);
+          }, 600);
+        }
       }
       if (item.portletCode === 'grhy') {
         var grhyContent = '';
@@ -1446,15 +1456,15 @@ var MyGrid = function (_React$Component) {
       return _react2.default.createElement(
         'div',
         { className: 'react-grid-component', key: item.id, style: {
-            borderTopLeftRadius: styleSetting.otherSet.radius.topLeft,
-            borderTopRightRadius: styleSetting.otherSet.radius.topRight,
-            borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft,
-            borderBottomRightRadius: styleSetting.otherSet.radius.bottomRight,
-            paddingLeft: styleSetting.pl,
-            paddingright: styleSetting.pr,
-            paddingTop: styleSetting.pt,
-            paddingBottom: styleSetting.pb,
-            background: styleSetting.bgColor ? styleSetting.bgColor : ''
+            borderTopLeftRadius: styleSetting.otherSet.radius.topLeft + 'px',
+            borderTopRightRadius: styleSetting.otherSet.radius.topRight + 'px',
+            borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft + 'px',
+            borderBottomRightRadius: styleSetting.otherSet.radius.bottomRight + 'px',
+            paddingLeft: styleSetting.otherSet.paddingSet.pl + 'px',
+            paddingright: styleSetting.otherSet.paddingSet.pr + 'px',
+            paddingTop: styleSetting.otherSet.paddingSet.pt + 'px',
+            paddingBottom: styleSetting.otherSet.paddingSet.pb + 'px',
+            backgroundColor: styleSetting.otherSet.bgColor
           } },
         styleSetting.titleSet.titleStatus == 1 ? componentHead : '',
         componentContent
@@ -1537,9 +1547,7 @@ var MyGrid = function (_React$Component) {
             margin: [0, 10]
           },
           this.state.data.map(function (item) {
-            console.log('====================================');
-            console.log(t.portalContent(item), ' t.portalContent(item) t.portalContent(item)');
-            console.log('====================================');
+
             return t.portalContent(item) || null;
 
             // 添加一个默认返回值，以避免未指定键的错误

package/lib/react_grid/react_grid.less

@@ -232,7 +232,7 @@
   .systemItem {
     display: inline-block;
     text-align: center;
-    // width: 25%;
+    width: fit-content;
     vertical-align: top;
     padding-top: 25px;
 
@@ -467,9 +467,9 @@
   }
 
   .jxzt-content {
+    margin: 16px;
     .t-image-slide-item {
-      margin: 16px;
-      height: 91px !important;
+      // height: 91px !important;
       background-image: url(/mobile/fmui/images/notice-card-bg.png);
       background-size: 100% 100%;
       border-radius: 10px;
@@ -635,14 +635,19 @@
     margin-bottom: 10px;
   }
 
-  .calendar-content .canChoose-active span {
+  .calendar-content .canChoose-active span ,.calendar-content div.today span{
     color:#713938 !important;
-    // background: #F6F6F6 !important;
+  }
+  .calendar-content .canChoose-active span  {
+    background: #F6F6F6 !important;
+  }
+
+  .calendar-content div.today span {
     background: transparent !important;
   }
 
   .calendar-content span.hasEvent:before {
-    color: #FAB88D;
+    color: #FAB88D !important;
   }
 
   .rc-list {

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