fmui-base 2.1.78 → 2.1.80

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.80：审批按钮扩展方法，公众号隐藏附件下载按钮，子表支持扩展按钮
+- 2.1.79：审批支持传阅范围设置
 - 2.1.78：自动编号重复赋值问题处理
 - 2.1.77：转交报错处理
 - 2.1.76：扩展选人回显选中

package/lib/form/subForm.js

@@ -161,6 +161,7 @@ var PageHome = function (_React$Component) {
 
       itemParam.children = form['children'];
       itemParam.fieldControll = this.props.fieldControll;
+      itemParam.extButtonList = form['extButtonList'] ? form['extButtonList'] : [];
 
       //判断字段属性
       var fieldControllJson = this.props.fieldControll;
@@ -731,6 +732,7 @@ var PageHome = function (_React$Component) {
               { flex: 1, className: _this2.state.isHideSubTblHeadTblList.indexOf(subTblName) == -1 ? "t-LH46 t-FC9" : "t-DN" },
               i + 1
             ),
+            _this2.getDetaiExtOperate(i),
             _react2.default.createElement(
               Box,
               { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: t.state.itemParam.subtableReadonly || subForm.length == 1 ? 't-DN' : 't-P16 theme-color' },
@@ -747,6 +749,44 @@ var PageHome = function (_React$Component) {
         );
       });
     }
+    //子表扩展按钮
+
+  }, {
+    key: 'getDetaiExtOperate',
+    value: function getDetaiExtOperate(index) {
+      var _this3 = this;
+
+      var t = this;
+      console.log("getDetaiExtOperate===");
+      var subForm = this.state.itemParam.subForm;
+      var extButtonList = this.state.itemParam.extButtonList;
+      // extButtonList = [{'buttonName':'扩展1','buttonFun':'kuozhan1'},{'buttonName':'扩展3','buttonFun':'kuozhan3'}];
+      if (!extButtonList) {
+        extButtonList = [];
+      }
+
+      return extButtonList.map(function (item, i) {
+        return _react2.default.createElement(
+          'div',
+          { className: 'dd-drug-list' },
+          _react2.default.createElement(
+            Box,
+            { 'data-key': i, onClick: _this3.extOperate.bind(_this3, index, _this3.state.itemParam, item.buttonFun), className: 't-P16 theme-color' },
+            item.buttonName
+          )
+        );
+      });
+    }
+
+    //子表扩展按钮方法
+
+  }, {
+    key: 'extOperate',
+    value: function extOperate(i, itemParam, buttonFun) {
+      if (typeof FlowCommon.subFormItemExtOperate === "function") {
+        FlowCommon.subFormItemExtOperate(this.state, i, itemParam, buttonFun, this);
+      }
+    }
   }, {
     key: 'replaceDollar',
     value: function replaceDollar(str) {

package/lib/process_info/processInfo.js

@@ -444,6 +444,8 @@ var PageHome = function (_React$Component) {
             mobileFlowChar: '0', //是否开启流程图  1开启 0禁用
             readScopeId: '',
             readScopeList: [],
+            readRangeType: '', //传阅范围 0全部 2本组织及下属组织 4自定义
+            readRangeList: '', //传阅范围为自定义时的limitData
             isRemoveCommentFormHtml: '0', //是否隐藏无数据的批示意见  1隐藏  
             allActivity: [], //所有环节名称
             designActivity: '', //选择的提醒环节id
@@ -794,6 +796,8 @@ var PageHome = function (_React$Component) {
                     var form = content.form;
                     var readScopeId = '';
                     var readScopeList = [];
+                    var readRangeType = '';
+                    var readRangeList = '';
                     var isRemoveCommentFormHtml = '0';
                     var subProcessCode = '';
                     var dataInherit = '';
@@ -807,6 +811,12 @@ var PageHome = function (_React$Component) {
                     if (content.readScopeList && typeof content.readScopeList != "undefined") {
                         readScopeList = content.readScopeList;
                     }
+                    if (content.readRangeType && typeof content.readRangeType != "undefined") {
+                        readRangeType = content.readRangeType;
+                    }
+                    if (content.readRangeList && typeof content.readRangeList != "undefined") {
+                        readRangeList = content.readRangeList;
+                    }
                     var commentUpload = '';
                     if (content.commentUpload && typeof content.commentUpload != "undefined") {
                         commentUpload = content.commentUpload;
@@ -1382,6 +1392,8 @@ var PageHome = function (_React$Component) {
                         mobileFlowChar: mobileFlowChar,
                         readScopeId: readScopeId,
                         readScopeList: readScopeList,
+                        readRangeType: readRangeType,
+                        readRangeList: readRangeList,
                         isRemoveCommentFormHtml: isRemoveCommentFormHtml,
                         commentUpload: commentUpload,
                         subProcessCode: subProcessCode,
@@ -1474,7 +1486,7 @@ var PageHome = function (_React$Component) {
                 content.buttons = buttons;
             }
             if (typeof FlowCommon.dealwithCommonButton === "function") {
-                FlowCommon.dealwithCommonButton(t.state, function (extensionButtonList, contentNew) {
+                FlowCommon.dealwithCommonButton(t.state, content, function (extensionButtonList, contentNew) {
                     //项目开发扩展
                     if (!contentNew) {
                         contentNew = content;
@@ -1486,7 +1498,7 @@ var PageHome = function (_React$Component) {
                         }
                     } catch (e) {}
                     if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithCommonButtonExt"] === "function") {
-                        mobileExt["dealwithCommonButtonExt"](t.state, contentNew, extensionButtonList, function (contentNewExt, extensionButtonListExt) {
+                        mobileExt["dealwithCommonButtonExt"](t.state, contentNew, function (contentNewExt, extensionButtonListExt) {
                             t.dealwithButtonsFunc(contentNewExt, extensionButtonListExt);
                         });
                     } else {
@@ -1499,7 +1511,20 @@ var PageHome = function (_React$Component) {
                     });
                 }, content);
             } else {
-                t.dealwithButtonsFunc(content, []);
+                // t.dealwithButtonsFunc(content,[]);
+                var mobileExt;
+                try {
+                    if (formKey) {
+                        mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+                    }
+                } catch (e) {}
+                if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithCommonButtonExt"] === "function") {
+                    mobileExt["dealwithCommonButtonExt"](t.state, content, function (contentNewExt, extensionButtonListExt) {
+                        t.dealwithButtonsFunc(contentNewExt, extensionButtonListExt);
+                    });
+                } else {
+                    t.dealwithButtonsFunc(content, []);
+                }
             }
         }
 
@@ -6186,6 +6211,27 @@ var PageHome = function (_React$Component) {
                     //  this.setState({
 
                     //  });
+                    var mobileExt;
+                    var mobileFormExt;
+                    var formKey = _this2.state.formKey;
+                    var module = _this2.state.module;
+                    try {
+                        if (module) {
+                            mobileExt = typeof eval(module + "_mobileExt") !== 'undefined' ? eval(module + "_mobileExt") : null;
+                        }
+                    } catch (e) {}
+                    if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithCommonButtonEndExt"] === "function") {
+                        content = mobileExt["dealwithCommonButtonEndExt"](content);
+                    }
+                    try {
+                        if (formKey) {
+                            mobileFormExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+                        }
+                    } catch (e) {}
+                    if (typeof mobileFormExt !== 'undefined' && typeof mobileFormExt["dealwithCommonButtonEndExt"] === "function") {
+                        content = mobileFormExt["dealwithCommonButtonEndExt"](content);
+                    }
+
                     var buttonCodeList = content;
                     var actionSheetButtonOpt = [];
                     var actionSheetButtonOptName = [];
@@ -6297,6 +6343,7 @@ var PageHome = function (_React$Component) {
                             }
                         }
                     }
+
                     _this2.setState({
                         buttonCodeList: content,
                         buttonList: buttonList,
@@ -7724,6 +7771,8 @@ var PageHome = function (_React$Component) {
                             chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
                             checkType: 'checkbox',
                             defaultValue: this.state.readScopeList,
+                            limitData: this.state.readRangeList,
+                            queryLimit: this.state.readRangeList && this.state.readRangeList != '' ? '5' : '',
                             ref: "selectMember_circulate1",
                             isDelete: true,
                             onChange: this.getCirculatePerson.bind(this)
@@ -7952,6 +8001,8 @@ var PageHome = function (_React$Component) {
                             chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
                             checkType: 'checkbox',
                             defaultValue: this.state.readScopeList,
+                            limitData: this.state.readRangeList,
+                            queryLimit: this.state.readRangeList && this.state.readRangeList != '' ? '5' : '',
                             ref: "selectMember_circulate",
                             isDelete: true,
                             onChange: this.circulateCallback.bind(this)

package/lib/upload/upload.js

@@ -120,6 +120,10 @@ var PageHome = function (_React$Component) {
         var canDel = props.canDel;
         //可下载
         var canDownload = props.canDownload;
+        // 公众号不展示下载按钮
+        if (getLoginUserInfo().thirdMenuType == 'WeChat') {
+            canDownload = false;
+        }
 
         //单次返回,默认返回所有
         var returnOnce = props.returnOnce;

package/package.json

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