fmui-base 2.2.54 → 2.2.56

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.56: 手写签名按钮自定义，画笔上下抖动问题修复
+- 2.2.55: 流程列表分类搜索
 - 2.2.54: 手写签名样式调整
 - 2.2.53: 表单字段支持手写签名
 - 2.2.52: 时间字段宏值赋值不生效

package/lib/form/form.js

@@ -1131,12 +1131,16 @@ var PageHome = function (_React$Component) {
         var uploadFileLimit = "";
         var canDownload = "";
         var imagetype = ""; // 0 图片上传 1 手写签名
+        var uploadButtonName = ""; //签批按钮名称
 
         if (formDataAttr) {
           uploadFileNumLimit = formDataAttr.uploadFileNumLimit; //上传个数限制
           uploadFileLimit = formDataAttr.uploadFileLimit; //上传类型限制
           canDownload = formDataAttr.canDownload; //是否下载
           imagetype = formDataAttr.imagetype; // 0 图片上传 1 手写签名
+          if (formDataAttr.uploadButtonName && formDataAttr.uploadButtonName != "") {
+            uploadButtonName = formDataAttr.uploadButtonName; //签批按钮名称
+          }
         }
         if (value) {
           value = value.replace(/\|/g, ",");
@@ -1162,6 +1166,7 @@ var PageHome = function (_React$Component) {
           itemParam.canDownload = "0";
         }
         itemParam.imagetype = imagetype;
+        itemParam.uploadButtonName = uploadButtonName ? uploadButtonName : "打开签批";
         console.log("imagetype===" + imagetype);
       } else if (itemType == 'poppage') {
         //弹出选择
@@ -3667,6 +3672,7 @@ var PageHome = function (_React$Component) {
                   dir: t.state.module,
                   uploadType: 'image',
                   title: '\u624B\u5199\u7B7E\u6279',
+                  buttomName: t.state.itemParam.uploadButtonName,
                   onChange: function onChange(value) {
                     t.handleChangePic(t.state.itemParam.key, value);
                   }

package/lib/process_list/processList.js

@@ -704,9 +704,9 @@ var PageHome = function (_React$Component2) {
         data.title = from.title;
       }
       if (cate == undefined) {
-        data.category = this.state.category0;
+        data.categoryCode = this.state.category0;
       } else {
-        data.category = from.category;
+        data.categoryCode = from.category;
       }
       return data;
     }
@@ -727,9 +727,9 @@ var PageHome = function (_React$Component2) {
         data.title = from.title;
       }
       if (cate == undefined) {
-        data.category = this.state.category1;
+        data.categoryCode = this.state.category1;
       } else {
-        data.category = from.category;
+        data.categoryCode = from.category;
       }
       return data;
     }
@@ -750,9 +750,9 @@ var PageHome = function (_React$Component2) {
         data.title = from.title;
       }
       if (cate == undefined) {
-        data.category = this.state.category2;
+        data.categoryCode = this.state.category2;
       } else {
-        data.category = from.category;
+        data.categoryCode = from.category;
       }
       return data;
     }
@@ -773,9 +773,9 @@ var PageHome = function (_React$Component2) {
         data.title = from.title;
       }
       if (cate == undefined) {
-        data.category = this.state.category4;
+        data.categoryCode = this.state.category4;
       } else {
-        data.category = from.category;
+        data.categoryCode = from.category;
       }
       return data;
     }
@@ -796,9 +796,9 @@ var PageHome = function (_React$Component2) {
         data.title = from.title;
       }
       if (cate == undefined) {
-        data.category = this.state.category4;
+        data.categoryCode = this.state.category4;
       } else {
-        data.category = from.category;
+        data.categoryCode = from.category;
       }
       return data;
     }

package/lib/signature/draw.js

@@ -54,10 +54,6 @@ function Draw(canvas, degree) {
   context.lineJoin = 'round';
   Object.assign(context, config);
 
-  var _canvas$getBoundingCl = canvas.getBoundingClientRect(),
-      left = _canvas$getBoundingCl.left,
-      top = _canvas$getBoundingCl.top;
-
   var point = {};
   var isMobile = /phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone/i.test(navigator.userAgent);
   // 移动端性能太弱, 去掉模糊以提高手写渲染速度
@@ -87,8 +83,10 @@ function Draw(canvas, degree) {
       }
       if (signal === 1 || pressed) {
         e = isMobile ? e.touches[0] : e;
-        point.x = e.clientX - left;
-        point.y = e.clientY - top;
+        // 实时获取 canvas 的位置，避免滚动/旋转后偏移导致抖动
+        var rect = canvas.getBoundingClientRect();
+        point.x = e.clientX - rect.left;
+        point.y = e.clientY - rect.top;
         paint(signal);
       }
     };

package/lib/signature/sign.js

@@ -54,6 +54,7 @@ var Page = function (_React$Component) {
         var baseContext = document.getElementById("context").value;
         var token = getLoginUserInfo().token;
         var fileId = _this.props.fileId == null || _this.props.fileId == '' || _this.props.fileId == undefined ? "" : _this.props.fileId;
+        var buttomName = _this.props.buttomName == null || _this.props.buttomName == '' || _this.props.buttomName == undefined ? "" : _this.props.buttomName;
         var readOnly = _this.props.readOnly || false;
         _this.state = {
             token: token,
@@ -61,6 +62,7 @@ var Page = function (_React$Component) {
             degree: 0,
             baseContext: baseContext,
             fileId: fileId,
+            buttomName: buttomName == "" ? "打开签批" : _this.props.buttomName,
             disabled: true,
             imageUrl: '/static/fmui/images/signArea.png',
             readOnly: readOnly
@@ -303,7 +305,7 @@ var Page = function (_React$Component) {
                     _react2.default.createElement(
                         'span',
                         { onClick: t.checkAfter.bind(t), className: t.state.readOnly ? 't-DN' : "t-FCblue t-FR" },
-                        t.state.fileId == "" ? "去手写签名" : "重写签名"
+                        t.state.buttomName
                     )
                 ),
                 _react2.default.createElement(

package/package.json

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