fmui-base 2.1.0-beta.0 → 2.1.0-beta.2

package/README.md

@@ -1,31 +1,9 @@
 ## 移动端组件
 
----
+---npm publish --tag beta
 
 ## 更新日志
-- 1.0.43：移动端支持默认选中参与人
-- 1.0.42：项目模块扩展开发;流程活动节点可以设置流程办理默认的提醒内容
-- 1.0.41：上传附件敏感词拦截;
-- 1.0.40：修复审批验签重复问题;
-- 1.0.39：移动审批扩展;选人组件问题修复
-- 1.0.38：移动审批自动通过;选人组件增加政治面貌和职务
-- 1.0.37：移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置
-- 1.0.36：移动审批保存时不校验必填项;关联字段功能实现;移动端子表扩展功能开发
-- 1.0.35：流程支持CA加签验签问题修复
-- 1.0.34：退回流程支持上传附件;流程支持CA加签验签
-- 1.0.33：表单说明字段额外扩展样式实现
-- 1.0.32：去掉批量办理标题旁的new icon;矩阵式表单额外扩展样式实现
-- 1.0.31：修复pc企业微信客户端预览查看问题
-- 1.0.30：流程批量办理增加必填校验，流程组件在钉钉PC客户端办理后关闭页面修改;日期组件增加区间选项
-- 1.0.29：流程项目开发外扩展js修改
-- 1.0.28：选人个人群组适配
-- 1.0.27：流程批示意见问题修复
-- 1.0.26：流程项目开发外扩展js
-- 1.0.25：流程列表增加类型all情况下查所有流程问题修改
-- 1.0.24：流程列表增加类型all全局待办module编码，增加流程表单外扩展js
-- 1.0.23：流程列表批量办理按钮增加配置项可控制隐藏
-- 1.0.22：修改流程列表统一待办和搜索
-- 1.0.21：修改流程列表统一待办
-- 1.0.20：修改推送打开作废流程提示
-- 1.0.19：修改流程图请求参数，增加流程实例id
+- 2.1.0-beta.2：修改上传组件样式
+- 2.1.0-beta.1：修改基础组件样式
+- 2.1.0-beta.0：2.0beta版本提交
 

package/lib/db/variables.js

@@ -104,6 +104,7 @@ exports.default = {
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",
+    approvalCardIcon: context + "/mobile/fmui/images/approvalCard.png",
     SQLX: {
         qjsq: 'qjsq', //请假申请
         bxsq: 'baoxiu', //保修申请

package/lib/form/form.js

@@ -53,6 +53,10 @@ var _Boxs = require('saltui/lib/Boxs');
 
 var _Boxs2 = _interopRequireDefault(_Boxs);
 
+var _Field = require('saltui/lib/Field');
+
+var _Field2 = _interopRequireDefault(_Field);
+
 var _FoldablePane = require('saltui/lib/FoldablePane');
 
 var _FoldablePane2 = _interopRequireDefault(_FoldablePane);
@@ -92,13 +96,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+_Field2.default;
 // import Slot from 'saltui/lib/Slot';
 
 // import SelectFileNo from '../select-fileno/pageHome';
 // import SelectSerialNumber from '../select-serialnumber/pageHome';
 //import 'babel-polyfill';
-
-
 var HBox = _Boxs2.default.HBox,
     Box = _Boxs2.default.Box;
 //import 'babel-polyfill';
@@ -122,6 +126,16 @@ var PageHome = function (_React$Component) {
     var form = props.form;
     var data = props.data;
     var status = props.status;
+    var dataType = props.dataType; //数据类型，main:主表，sub：子表，
+    if (!dataType) {
+      dataType = "main";
+    }
+    var prefixName = dataType;
+    if (dataType == "sub") {
+      var keyNo = props.keyNo;
+      var subTblName = props.subTblName;
+      prefixName = dataType + "_" + subTblName + "_" + keyNo;
+    }
     var commentField = props.commentField;
     /* alert(commentField);*/
     var context = document.getElementById("context").value;
@@ -145,6 +159,8 @@ var PageHome = function (_React$Component) {
         id: '',
         key: ''
       },
+      dataType: dataType,
+      prefixName: prefixName,
       loaded: false,
       commentList: [],
       phraseListNew: [],
@@ -255,7 +271,6 @@ var PageHome = function (_React$Component) {
       if (!dataType) {
         dataType = "main";
       }
-      if (dataType == "sub") {}
 
       var tableName = data.mainTblName;
       var itemParam = {}; //元素参数
@@ -906,6 +921,10 @@ var PageHome = function (_React$Component) {
             popCode = form.popuserMap.popCode;
             chooseWay = form.popuserMap.chooseWay;
             itemParam.chooseObj = form.popuserMap.chooseObj;
+            //表单默认值
+            if (form.popuserMap.defaultUserScopeJson) {
+              itemParam.defaultValue = JSON.parse(form.popuserMap.defaultUserScopeJson);
+            }
           } else {
             popCode = form.popuserMap.chooseObj;
             chooseWay = form.popuserMap.chooseWay;
@@ -2192,7 +2211,7 @@ var PageHome = function (_React$Component) {
             ),
             _react2.default.createElement(
               Box,
-              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: 't-P16 t-FCddblue' },
+              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: 't-P16 t-FCblue' },
               '\u5220\u9664'
             )
           ),
@@ -2393,7 +2412,7 @@ var PageHome = function (_React$Component) {
             { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle == null ? {} : t.state.itemParam.formStyleObj.contentStyle },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH' },
+              { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
               _react2.default.createElement(_TextareaField2.default, {
                 className: 't-W100',
                 required: t.state.itemParam.required,
@@ -2413,7 +2432,7 @@ var PageHome = function (_React$Component) {
             { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle == null ? {} : t.state.itemParam.formStyleObj.contentStyle },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH' },
+              { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
               _react2.default.createElement(_TextField2.default, {
                 className: 't-W100',
                 required: t.state.itemParam.required,
@@ -2456,7 +2475,7 @@ var PageHome = function (_React$Component) {
             { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH' },
+              { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
               _react2.default.createElement(_TextareaField2.default, {
                 className: 't-W100',
                 required: t.state.itemParam.required,
@@ -2475,7 +2494,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'textarea' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2499,7 +2518,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'radio' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2524,7 +2543,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'checkbox' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2550,7 +2569,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'select' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2578,7 +2597,7 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH' },
+              { id: t.state.prefixName + "_" + t.state.itemParam.key, className: 't-FBH' },
               _react2.default.createElement(_DatetimeField2.default, {
                 className: 't-W100',
                 label: t.state.itemParam.title,
@@ -2595,7 +2614,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'datetimeStep' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2647,7 +2666,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'poppage' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2673,7 +2692,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'popuser' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2709,22 +2728,21 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'upload' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH' },
+              { className: 't-W100' },
               _react2.default.createElement(
-                'div',
-                { className: 't-W100' },
+                _Field2.default,
+                { label: t.state.itemParam.title, layout: 'h', multiLine: true },
                 _react2.default.createElement(_upload2.default, {
                   ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
                   required: t.state.itemParam.required,
                   canAdd: t.state.itemParam.readOnly == true ? false : true,
                   canDel: t.state.itemParam.readOnly == true ? false : true,
-                  label: t.state.itemParam.title,
                   initList: t.state.itemParam.value,
                   initIds: t.state.itemParam.initIds,
                   dir: t.state.module,
@@ -2743,22 +2761,21 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'image' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH' },
+              { className: 't-W100' },
               _react2.default.createElement(
-                'div',
-                { className: 't-W100' },
+                _Field2.default,
+                { label: t.state.itemParam.title, layout: 'h', multiLine: true },
                 _react2.default.createElement(_upload2.default, {
                   ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
                   required: t.state.itemParam.required,
                   canAdd: t.state.itemParam.readOnly == true ? false : true,
                   canDel: t.state.itemParam.readOnly == true ? false : true,
-                  label: t.state.itemParam.title,
                   initList: t.state.itemParam.value,
                   initIds: t.state.itemParam.initIds,
                   dir: t.state.module,
@@ -2778,7 +2795,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'comment' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2803,7 +2820,7 @@ var PageHome = function (_React$Component) {
                   { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10' : 't-DN' },
                   _react2.default.createElement(
                     'div',
-                    { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-FCddblue t-P6 t-FS16 commonwords' : 't-DN', onClick: this.selectCommonwords.bind(this) },
+                    { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-FCblue t-P6 t-FS16 commonwords' : 't-DN', onClick: this.selectCommonwords.bind(this) },
                     '\u5E38\u7528\u8BED'
                   ),
                   _react2.default.createElement(_TextareaField2.default, {
@@ -2846,7 +2863,7 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               HBox,
-              { vAlign: 'center', className: 't-LH40  t-FCddblue t-BCf dd-bottom-border t-PL16 t-PR16', onClick: this.noticeClick.bind(this, t.state.itemParam.explainUrl) },
+              { vAlign: 'center', className: 't-LH40  t-FCblue t-BCf dd-bottom-border t-PL16 t-PR16', onClick: this.noticeClick.bind(this, t.state.itemParam.explainUrl) },
               _react2.default.createElement(
                 Box,
                 { flex: 1, className: 't-PR' },
@@ -2865,7 +2882,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'switch' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2885,7 +2902,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'positioning' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },
@@ -2910,7 +2927,7 @@ var PageHome = function (_React$Component) {
           )
         ) : this.state.itemParam.itemType == 'weboffice' ? _react2.default.createElement(
           'div',
-          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
             _Group2.default.List,
             { borderTopNone: true },

package/lib/form/subForm.js

@@ -271,28 +271,28 @@ var PageHome = function (_React$Component) {
       var itemParam = this.state.itemParam;
       var data = this.props.data;
       var subTblList = data.subTbl; //子表
-      /* var calculateExpList = data.calculateExpList;//计算公式列表 
-       var calculateExpList1 = value.calculateExpList;//计算公式列表
-       if(calculateExpList1){
-       	for(var key in calculateExpList1){
-       		  var calculateExpValue;
-                 if(calculateExpList){
-                   calculateExpValue = calculateExpList[key];
-                   if(!calculateExpValue){
-                     calculateExpValue = [];
-                   }
-                 }else{
-                   calculateExpList = {};
-                   calculateExpValue = [];
-                 }
-                 for(var j=0;j<calculateExpList1[key].length;j++){
-               	  calculateExpValue.push(calculateExpList1[key][j]);
-                 }
-                 calculateExpList[key] = calculateExpValue;
-       		  
-       	}
-       	
-       	data.calculateExpList = calculateExpList;
+      /* var calculateExpList = data.calculateExpList;//计算公式列表 
+       var calculateExpList1 = value.calculateExpList;//计算公式列表
+       if(calculateExpList1){
+       	for(var key in calculateExpList1){
+       		  var calculateExpValue;
+                 if(calculateExpList){
+                   calculateExpValue = calculateExpList[key];
+                   if(!calculateExpValue){
+                     calculateExpValue = [];
+                   }
+                 }else{
+                   calculateExpList = {};
+                   calculateExpValue = [];
+                 }
+                 for(var j=0;j<calculateExpList1[key].length;j++){
+               	  calculateExpValue.push(calculateExpList1[key][j]);
+                 }
+                 calculateExpList[key] = calculateExpValue;
+       		  
+       	}
+       	
+       	data.calculateExpList = calculateExpList;
        }*/
 
       this.dealwithSubData(subTblList, subTblNo, value);
@@ -648,7 +648,7 @@ var PageHome = function (_React$Component) {
             ),
             _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 t-FCddblue' },
+              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: t.state.itemParam.subtableReadonly || subForm.length == 1 ? 't-DN' : 't-P16 t-FCblue' },
               '\u5220\u9664'
             )
           ),
@@ -656,7 +656,7 @@ var PageHome = function (_React$Component) {
             'div',
             { className: item.show ? "" : "t-DN" },
             item.form.map(function (item2, j) {
-              return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
+              return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
             })
           )
         );
@@ -751,7 +751,7 @@ var PageHome = function (_React$Component) {
           ),
           _react2.default.createElement(
             Box,
-            { className: 't-FCddblue' },
+            null,
             _react2.default.createElement('i', { className: this.state.itemParam.show ? "iconfont icon-arrow-down t-FS18 t-FCc" : "iconfont icon-arrow-up t-rotate-90 t-FS18 t-FCc" })
           )
         ),

package/lib/form/table.js

@@ -1569,7 +1569,7 @@ var PageHome = function (_React$Component) {
 								{ className: t.props.commentField == "default" ? 't-PL10' : 't-DN' },
 								_react2.default.createElement(
 									'div',
-									{ className: 't-FCddblue t-P6 t-FS16 commonwords', onClick: this.selectCommonwords.bind(this) },
+									{ className: 't-FCblue t-P6 t-FS16 commonwords', onClick: this.selectCommonwords.bind(this) },
 									'\u5E38\u7528\u8BED'
 								),
 								_react2.default.createElement(_TextareaField2.default, {
@@ -1625,7 +1625,7 @@ var PageHome = function (_React$Component) {
 							{ className: t.props.commentField == "default" ? 't-PL10 t-PT10 t-FB1' : 't-DN' },
 							_react2.default.createElement(
 								'div',
-								{ className: 't-FCddblue t-P6 t-FS16 commonwords', onClick: this.selectCommonwords.bind(this) },
+								{ className: 't-FCblue t-P6 t-FS16 commonwords', onClick: this.selectCommonwords.bind(this) },
 								'\u5E38\u7528\u8BED'
 							),
 							_react2.default.createElement(_TextareaField2.default, {

package/lib/form_info/formInfo.js

@@ -762,17 +762,17 @@ var PageHome = function (_React$Component) {
                 activityId = "";
             }
 
-            /*            let sysMailSetting=content.sysMailSetting;
-                    var remindersLists=[];
-                    if(sysMailSetting=='1' || sysMailSetting=='2'){
-                        var option = {};
-                        option.value = "0";
-                        option.content = '邮件';
-                        option.disable = false;
-                        option.checked = false;
-                        remindersLists.push(option);
-                    }*/ /*
-                        var evoRemind2 = this.state.evoRemind;
+            /*            let sysMailSetting=content.sysMailSetting;
+                    var remindersLists=[];
+                    if(sysMailSetting=='1' || sysMailSetting=='2'){
+                        var option = {};
+                        option.value = "0";
+                        option.content = '邮件';
+                        option.disable = false;
+                        option.checked = false;
+                        remindersLists.push(option);
+                    }*/ /*
+                        var evoRemind2 = this.state.evoRemind;
                         var sysSMSsetting2 = this.state.sysSMSsetting;*/
             var remindersLists = [];
             if (sysSMSsetting == '1' || sysSMSsetting == '2') {
@@ -1192,8 +1192,8 @@ var PageHome = function (_React$Component) {
             return "";
         }
 
-        /**
-         * 提交按钮的点击事件（获得下一个活动节点列表）
+        /**
+         * 提交按钮的点击事件（获得下一个活动节点列表）
          */
 
     }, {
@@ -1651,13 +1651,13 @@ var PageHome = function (_React$Component) {
                                     if (participantList != null && participantList != "" && participantList.length > 0) {
                                         for (var i = 0; i < participantList.length; i++) {
                                             if (participantList[i].type != "user") {
-                                                /* var children = participantList[i];
-                                                 for(var j=0; j<children.length; j++ ){
-                                                     var personValueItem = {scopeType:"user",scopeValue:children[j].id,scopeName:children[j].userName,imageId:""};
-                                                     if(commonUsedId.indexOf(children[j].id) == -1){
-                                                         commonUsedId += children[j].id+',';
-                                                         commonUsedData.push(personValueItem);
-                                                     }
+                                                /* var children = participantList[i];
+                                                 for(var j=0; j<children.length; j++ ){
+                                                     var personValueItem = {scopeType:"user",scopeValue:children[j].id,scopeName:children[j].userName,imageId:""};
+                                                     if(commonUsedId.indexOf(children[j].id) == -1){
+                                                         commonUsedId += children[j].id+',';
+                                                         commonUsedData.push(personValueItem);
+                                                     }
                                                  }*/
                                             } else if (participantList[i].secretLevel == 0 || participantList[i].secretLevel || !participantList[i].orgId) {
                                                 var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
@@ -2571,13 +2571,13 @@ var PageHome = function (_React$Component) {
                 }
                 var sshortMessage = '0';
                 var sendShortMessage = t.state.sendShortMessage;
-                /*if(sendShortMessage.length>0){
-                    sshortMessage=sendShortMessage[0].value;
+                /*if(sendShortMessage.length>0){
+                    sshortMessage=sendShortMessage[0].value;
                 }*/
                 var cshortMessage = '0';
                 var circulateShortMessage = t.state.circulateShortMessage;
-                /* if(circulateShortMessage.length>0){
-                     cshortMessage=circulateShortMessage[0].value;
+                /* if(circulateShortMessage.length>0){
+                     cshortMessage=circulateShortMessage[0].value;
                  }*/
                 var param = {
                     taskId: this.state.taskId,
@@ -2630,8 +2630,8 @@ var PageHome = function (_React$Component) {
                     var selectBackActivity = this.state.selectBackActivity;
                     var shortMessage = '0';
                     var backShortMessage = this.state.backShortMessage;
-                    /* if(backShortMessage.length>0){
-                         shortMessage=backShortMessage[0].value;
+                    /* if(backShortMessage.length>0){
+                         shortMessage=backShortMessage[0].value;
                      }*/
                     var param = {
                         taskId: this.state.taskId,
@@ -2662,13 +2662,13 @@ var PageHome = function (_React$Component) {
                 var editFormData = this.state.editFormData;
                 var sshortMessage = '0';
                 var sendShortMessage = t.state.sendShortMessage;
-                /*if(sendShortMessage.length>0){
-                    sshortMessage=sendShortMessage[0].value;
+                /*if(sendShortMessage.length>0){
+                    sshortMessage=sendShortMessage[0].value;
                 }*/
                 var cshortMessage = '0';
                 var circulateShortMessage = t.state.circulateShortMessage;
-                /*if(circulateShortMessage.length>0){
-                    cshortMessage=circulateShortMessage[0].value;
+                /*if(circulateShortMessage.length>0){
+                    cshortMessage=circulateShortMessage[0].value;
                 }*/
                 var param = {
                     taskId: this.state.taskId,
@@ -3625,8 +3625,8 @@ var PageHome = function (_React$Component) {
             }
             var shortMessage = '0';
             var circulateShortMessage = t.state.circulateShortMessage;
-            /* if(circulateShortMessage.length>0){
-                 shortMessage=circulateShortMessage[0].value;
+            /* if(circulateShortMessage.length>0){
+                 shortMessage=circulateShortMessage[0].value;
              }*/
             _Dialog2.default.confirm({
                 locale: 'zh_CN',
@@ -4184,7 +4184,7 @@ var PageHome = function (_React$Component) {
                     var buttonIsMore = false;
                     var buttonList = [];
                     var sysWatermark = _this2.state.sysWatermark;
-                    /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
+                    /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
                      buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
                     if (buttonCodeList.length > 4) {
                         buttonList.push({ name: '更多', type: 'secondary', display: 'banner', no: -1 });
@@ -4540,22 +4540,22 @@ var PageHome = function (_React$Component) {
             });
         }
 
-        /*//修改审批意见
-        changeSpyj(newValue) {
-            let regRule= /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
-            if(newValue.match(regRule)){
-                Toast.show({
-                    type: 'error',
-                    content: '不能输入表情',
-                });
-                return false;
-            }
-            if(newValue.length>200){
-                newValue=newValue.substring(0,200);
-            }
-            this.setState({
-                spyj: newValue,
-            });
+        /*//修改审批意见
+        changeSpyj(newValue) {
+            let regRule= /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
+            if(newValue.match(regRule)){
+                Toast.show({
+                    type: 'error',
+                    content: '不能输入表情',
+                });
+                return false;
+            }
+            if(newValue.length>200){
+                newValue=newValue.substring(0,200);
+            }
+            this.setState({
+                spyj: newValue,
+            });
         }*/
 
         //修改催办内容
@@ -4635,8 +4635,8 @@ var PageHome = function (_React$Component) {
             });
         }
 
-        /**
-        * 取消操作
+        /**
+        * 取消操作
         **/
 
     }, {
@@ -5247,7 +5247,7 @@ var PageHome = function (_React$Component) {
                         { className: this.state.nextActivityList.length == 0 && this.state.nextRadomList.length == 0 ? '' : '', style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
                         _react2.default.createElement(
                             'span',
-                            { className: 't-FCddblue' },
+                            { className: 't-FCblue' },
                             _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
                             '\u5BA1\u6279\u73AF\u8282'
                         )
@@ -5397,7 +5397,7 @@ var PageHome = function (_React$Component) {
                         { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
                         _react2.default.createElement(
                             'span',
-                            { className: 't-FCddblue' },
+                            { className: 't-FCblue' },
                             _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
                             '\u8F6C\u4EA4\u73AF\u8282'
                         )