fmui-base 2.0.44 → 2.0.46

package/lib/db/db.js

@@ -878,7 +878,7 @@ context.create('form', {
 
 context.create('reactGrid', {
   getPortalPage: {
-    // mockUrl: 'query/reactGridInfo.json',
+    mockUrl: 'query/reactGridInfo.json',
     url: _variables2.default.URLS.getPortalPage,
     method: 'GET',
     header: {

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

@@ -498,6 +498,8 @@ var MyGrid = function (_React$Component) {
       } else if (type == 'bssx') {
         //办事事项
         location.hash = "officehall";
+      } else if (type == "jxzt") {
+        location.hash = "officehall";
       }
     }
 
@@ -629,7 +631,7 @@ var MyGrid = function (_React$Component) {
               { className: isShowList.indexOf('AI') > -1 ? 't-FAC' : 't-DN', onClick: function onClick() {
                   t.gotoYd();
                 } },
-              _react2.default.createElement('i', { className: 'iconfont icon-zhineng' }),
+              _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-sousuo1' }),
               _react2.default.createElement(
                 'div',
                 { className: 't-FS12 t-MT4' },
@@ -957,8 +959,6 @@ var MyGrid = function (_React$Component) {
               )
             )
           );
-        } else {
-          componentContent = '';
         }
       }
       if (item.portletCode === 'xwzx') {
@@ -1074,10 +1074,7 @@ var MyGrid = function (_React$Component) {
               ) : _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
             );
           });
-        } else {
-          componentContent = '';
         }
-
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           componentContent = _react2.default.createElement(
             _Tab2.default,
@@ -1262,7 +1259,7 @@ var MyGrid = function (_React$Component) {
             _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
                 'div',
                 { className: '', 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\u65E5\u7A0B'
+                item.title
               ), key: '0' })
           )
         );
@@ -1440,7 +1437,7 @@ var MyGrid = function (_React$Component) {
             _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
                 'div',
                 { className: '', 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\u4F1A\u8BAE'
+                item.title
               ), key: '0' })
           )
         );
@@ -1467,12 +1464,11 @@ var MyGrid = function (_React$Component) {
             _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
                 'div',
                 { className: '', 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" : '' } },
-                '\u4E8B\u9879\u53D1\u8D77'
+                item.title
               ), key: '0' })
           )
         );
-        componentContent = '';
-        if (t.state[item.portletCode + '_' + item.id]) {
+        if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           componentContent = _react2.default.createElement(
             _Grid2.default,
             { col: personalSetting.cols * 1, className: 'sxbl_buttons' },
@@ -1498,7 +1494,7 @@ var MyGrid = function (_React$Component) {
             _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
                 'div',
                 { className: '', 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" : '' } },
-                '\u56FE\u8868'
+                item.title
               ), key: '0' })
           )
         );
@@ -1521,12 +1517,12 @@ var MyGrid = function (_React$Component) {
             _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
                 'div',
                 { className: '', 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\u4E8B\u9879'
+                item.title
               ), key: '0' })
           )
         );
         var wdsxList = '';
-        if (t.state[item.portletCode + '_' + item.id]) {
+        if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           wdsxList = t.state[item.portletCode + '_' + item.id].map(function (item) {
             return _react2.default.createElement(
               'div',
@@ -1566,12 +1562,12 @@ var MyGrid = function (_React$Component) {
               )
             );
           });
+          componentContent = _react2.default.createElement(
+            'div',
+            { className: 'list-RT-label wdsx-list' },
+            wdsxList
+          );
         }
-        componentContent = _react2.default.createElement(
-          'div',
-          { className: 'list-RT-label wdsx-list' },
-          wdsxList
-        );
       }
       if (item.portletCode === 'jxzt') {
         componentHead = _react2.default.createElement(
@@ -1589,7 +1585,7 @@ var MyGrid = function (_React$Component) {
             _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
                 'div',
                 { className: '', 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" : '' } },
-                '\u7CBE\u9009\u4E13\u9898'
+                item.title
               ), key: '0' })
           )
         );
@@ -1605,7 +1601,7 @@ var MyGrid = function (_React$Component) {
               { title: '\u6807\u9898', code: item.code, className: 't-image-slide-item t-R10', style: { backgroundImage: 'url(' + imgUrlPath + ')' } },
               _react2.default.createElement(
                 'p',
-                { className: 't-FS20 t-ML20 t-PT20 t-MB10 t-FCf' },
+                { className: 't-FS20 t-ML20 t-PT20 t-MB10' },
                 item.name
               )
             );

package/lib/react_grid/react_grid.less

@@ -23,6 +23,7 @@
 
     div {
       max-width: 81px;
+      height: inherit;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -197,7 +198,7 @@
       }
     
       .t-grid {
-        margin: 8px;
+        margin: 0 8px;
         border: none;
     
         .t-grid-row {
@@ -482,7 +483,7 @@
   }
 
   .jxzt-content {
-    margin: 16px;
+    margin: 0 16px;
     .t-image-slide-item {
       // height: 91px !important;
       background-image: url(/mobile/fmui/images/notice-card-bg.png);

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