fmui-base 2.0.62 → 2.0.63

package/lib/db/db.js

@@ -921,6 +921,20 @@ context.create('reactGrid', {
     }
   },
 
+  // 常用应用(频次)
+  getNewComAppInfo: {
+    url: _variables2.default.URLS.getNewComAppInfo,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
+  },
   getNewHomePageTodoData: {
     // mockUrl: 'query/getNewHomePageTodoData.json',
     url: _variables2.default.URLS.getNewHomePageTodoData,

package/lib/db/variables.js

@@ -112,6 +112,7 @@ exports.default = {
 
         getPortalPage: portalUrlPrefix + "getPortalPage" + '?token=' + getLoginUserInfo().token, //移动门户部件详情
         getComponentInfoListAll: portalAllUrlPrefix + "getComponentInfoList" + '?token=' + getLoginUserInfo().token, //获取首页部件信息
+        getNewComAppInfo: portalAllUrlPrefix + "getNewComAppInfo" + '?token=' + getLoginUserInfo().token, //首页部件常用应用
         getNewHomePageTodoData: portalAllUrlPrefix + "getNewHomePageTodoData" + '?token=' + getLoginUserInfo().token,
         getNewHomePageCollectAppInfoList: portalAllUrlPrefix + "getNewHomePageCollectAppInfoList" + '?token=' + getLoginUserInfo().token,
         getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token,

package/lib/form/form.js

@@ -2684,14 +2684,6 @@ var PageHome = function (_React$Component) {
         });
       }
     }
-
-    //常用语设置跳转
-
-  }, {
-    key: 'skipToCommonwordsSet',
-    value: function skipToCommonwordsSet() {
-      pageSkip('mobile/modules/mobileoffice/dist/index.html', '#/hospitalmanage/personal/setting/listPhrase');
-    }
   }, {
     key: 'phraseItemClick',
     value: function phraseItemClick(commonwords) {
@@ -3219,20 +3211,11 @@ var PageHome = function (_React$Component) {
                 _react2.default.createElement(_List2.default, { list: t.state.itemParam.value }),
                 _react2.default.createElement(
                   'div',
-                  { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },
+                  { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10' : 't-DN' },
                   _react2.default.createElement(
                     'div',
-                    { className: t.state.commentField == this.state.itemParam.uniqueName ? 'theme-color t-P6 t-FS16 commonwords' : 't-DN' },
-                    _react2.default.createElement(
-                      'div',
-                      { onClick: this.selectCommonwords.bind(this) },
-                      '\u5E38\u7528\u8BED'
-                    ),
-                    _react2.default.createElement(
-                      'div',
-                      { onClick: this.skipToCommonwordsSet.bind(this) },
-                      '\u7F16\u8F91'
-                    )
+                    { className: t.state.commentField == this.state.itemParam.uniqueName ? 'theme-color t-P6 t-FS16 commonwords' : 't-DN', onClick: this.selectCommonwords.bind(this) },
+                    '\u5E38\u7528\u8BED'
                   ),
                   _react2.default.createElement(
                     'div',

package/lib/form/table.js

@@ -1482,14 +1482,6 @@ var PageHome = function (_React$Component) {
 				});
 			}
 		}
-
-		//常用语设置跳转
-
-	}, {
-		key: 'skipToCommonwordsSet',
-		value: function skipToCommonwordsSet() {
-			pageSkip('mobile/modules/mobileoffice/dist/index.html', '#/hospitalmanage/personal/setting/listPhrase');
-		}
 	}, {
 		key: 'phraseItemClick',
 		value: function phraseItemClick(commonwords) {
@@ -1646,20 +1638,11 @@ var PageHome = function (_React$Component) {
 							_react2.default.createElement(_List2.default, { list: t.props.commentDefaultList }),
 							_react2.default.createElement(
 								'div',
-								{ className: t.props.commentField == "default" ? 't-PL10 t-PR10' : 't-DN' },
+								{ className: t.props.commentField == "default" ? 't-PL10' : 't-DN' },
 								_react2.default.createElement(
 									'div',
-									{ className: 'theme-color t-P6 t-FS16 commonwords' },
-									_react2.default.createElement(
-										'div',
-										{ onClick: this.selectCommonwords.bind(this) },
-										'\u5E38\u7528\u8BED'
-									),
-									_react2.default.createElement(
-										'div',
-										{ onClick: this.skipToCommonwordsSet.bind(this) },
-										'\u7F16\u8F91'
-									)
+									{ className: 'theme-color t-P6 t-FS16 commonwords', onClick: this.selectCommonwords.bind(this) },
+									'\u5E38\u7528\u8BED'
 								),
 								_react2.default.createElement(_TextareaField2.default, {
 									readOnly: false,

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

@@ -115,11 +115,11 @@ var MyGrid = function (_React$Component) {
               t.getShoucangAppInfo(item.id);
               t.getComAppInfo(item.id);
             } else if (item.portletCode !== 'tbgl') {
-              var params = {
+              var _params = {
                 code: item.portletCode,
                 ppId: item.id
               };
-              _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
+              _db2.default.reactGrid.getComponentInfoListAll(_params).then(function (res) {
                 _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
               });
             }
@@ -138,6 +138,18 @@ var MyGrid = function (_React$Component) {
           duration: 2000
         });
       });
+
+      var params = {};
+      _db2.default.reactGrid.getNewHomePageTodoData(params).then(function (content) {
+        var openModule = content.hpOpenModule ? content.hpOpenModule : "";
+        localStorage.setItem('hpOpenModule', openModule);
+        var todoData = content.todoData != null ? content.todoData.entity : {};
+        var pageTitle = todoData.pageTitle;
+        if (!pageTitle || pageTitle == '') {
+          pageTitle = '一网通办管理平台';
+        }
+        setPageTitle(pageTitle);
+      });
     };
 
     _this.getShoucangAppInfo = function (id) {
@@ -176,11 +188,12 @@ var MyGrid = function (_React$Component) {
         thirdMenuType = 'DING';
       }
       params.showClient = thirdMenuType;
-      _db2.default.reactGrid.getComponentInfoListAll(params).then(function (result) {
-        if (result.data) {
-          _this.setState(_defineProperty({}, 'cyyy' + '_' + id, result.data));
-          var appOftenListlocal = JSON.stringify(result.data);
-          localStorage.setItem(['cyyy' + '_' + id], appOftenListlocal);
+      _db2.default.reactGrid.getNewComAppInfo(params).then(function (content) {
+        if (content.data) {
+          _this.setState(_defineProperty({}, 'cyyy' + '_' + id, content.data));
+          var appOftenListlocal = JSON.stringify(content.data);
+          // localStorage.setItem(['cyyy' + '_' + id], appOftenListlocal);
+          localStorage.setItem('appOftenList', appOftenListlocal);
         }
       }).catch(function (error) {
         console.error(error);
@@ -291,13 +304,12 @@ var MyGrid = function (_React$Component) {
     value: function getRemindCount() {
       var _this2 = this;
 
-      _db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo,unreadMaild,unreadPubMail,toBeAttended" }).then(function (content) {
-        if (content.undo || content.approveundo || content.toBeAttendedCount || content.unreadPubMailCount) {
-          console.log('====================================');
-          console.log(content, 'contentcontentcontent');
-          console.log('====================================');
+      _db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo,unreadMail,unreadPubMail,toBeAttended,approveundo" }).then(function (content) {
+        if (content.undo || content.approveundo || content.toBeAttendedCount || content.unreadPubMailCount || content.unreadMail) {
+
           _this2.setState({
             undo: content.undo,
+            unreadMail: content.unreadMail,
             approveundo: content.approveundo,
             toBeAttendedCount: content.toBeAttendedCount,
             unreadPubMailCount: content.unreadPubMailCount
@@ -731,7 +743,7 @@ var MyGrid = function (_React$Component) {
                       { className: 'iconblock t-iconBC' + ele.iconColor },
                       _react2.default.createElement(
                         _Badge2.default,
-                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
+                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : ele.name == '邮件' ? t.state.unreadMail : '' },
                         _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
                       )
                     ),
@@ -781,7 +793,7 @@ var MyGrid = function (_React$Component) {
                       { className: 'iconblock t-iconBC' + ele.iconColor },
                       _react2.default.createElement(
                         _Badge2.default,
-                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
+                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : ele.name == '邮件' ? t.state.unreadMail : '' },
                         _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
                       )
                     ),

package/lib/react_grid/react_grid.less

@@ -394,6 +394,11 @@
     .t-badge {
       width: 100%;
     }
+
+    .t-badge .badge-inner {
+      line-height: 13px;
+      border: 2px solid #fff;
+    }
   }
 
   .react-app-collect {

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